Skip to content

Commit 1c5f6cf

Browse files
bognerbogner
authored
[DirectX] Rename backend DXIL resource analysis passes to DXILResourceMD*. NFC
These passes will be replaced soon as we move to the target extension based resource handling in the DirectX backend, but removing them now before the replacement stuff is all up and running would be very disruptive. However, we do need to move these passes out of the way to avoid symbol conflicts with the new DXILResourceAnalysis in the Analysis library. Note: I tried an even simpler hack in #100698 but it doesn't really work. A rename is the most expedient path forward here. Pull Request: #101393
1 parent 307d124 commit 1c5f6cf

10 files changed

+34
-32
lines changed

‎llvm/lib/Target/DirectX/DXILPrepare.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class DXILPrepareModule : public ModulePass {
246246
DXILPrepareModule() : ModulePass(ID) {}
247247
void getAnalysisUsage(AnalysisUsage &AU) const override {
248248
AU.addPreserved<ShaderFlagsAnalysisWrapper>();
249-
AU.addPreserved<DXILResourceWrapper>();
249+
AU.addPreserved<DXILResourceMDWrapper>();
250250
}
251251
static char ID; // Pass identification.
252252
};

‎llvm/lib/Target/DirectX/DXILPrettyPrinter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ class DXILPrettyPrinter : public llvm::ModulePass {
4141
bool runOnModule(Module &M) override;
4242
void getAnalysisUsage(AnalysisUsage &AU) const override {
4343
AU.setPreservesAll();
44-
AU.addRequired<DXILResourceWrapper>();
44+
AU.addRequired<DXILResourceMDWrapper>();
4545
}
4646
};
4747
} // namespace
4848

4949
char DXILPrettyPrinter::ID = 0;
5050
INITIALIZE_PASS_BEGIN(DXILPrettyPrinter, "dxil-pretty-printer",
5151
"DXIL Metadata Pretty Printer", true, true)
52-
INITIALIZE_PASS_DEPENDENCY(DXILResourceWrapper)
52+
INITIALIZE_PASS_DEPENDENCY(DXILResourceMDWrapper)
5353
INITIALIZE_PASS_END(DXILPrettyPrinter, "dxil-pretty-printer",
5454
"DXIL Metadata Pretty Printer", true, true)
5555

5656
bool DXILPrettyPrinter::runOnModule(Module &M) {
57-
dxil::Resources &Res = getAnalysis<DXILResourceWrapper>().getDXILResource();
57+
dxil::Resources &Res = getAnalysis<DXILResourceMDWrapper>().getDXILResource();
5858
Res.print(OS);
5959
return false;
6060
}

‎llvm/lib/Target/DirectX/DXILResourceAnalysis.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ using namespace llvm;
1818

1919
#define DEBUG_TYPE "dxil-resource-analysis"
2020

21-
dxil::Resources DXILResourceAnalysis::run(Module &M,
22-
ModuleAnalysisManager &AM) {
21+
dxil::Resources DXILResourceMDAnalysis::run(Module &M,
22+
ModuleAnalysisManager &AM) {
2323
dxil::Resources R;
2424
R.collect(M);
2525
return R;
2626
}
2727

28-
AnalysisKey DXILResourceAnalysis::Key;
28+
AnalysisKey DXILResourceMDAnalysis::Key;
2929

30-
PreservedAnalyses DXILResourcePrinterPass::run(Module &M,
31-
ModuleAnalysisManager &AM) {
32-
dxil::Resources Res = AM.getResult<DXILResourceAnalysis>(M);
30+
PreservedAnalyses DXILResourceMDPrinterPass::run(Module &M,
31+
ModuleAnalysisManager &AM) {
32+
dxil::Resources Res = AM.getResult<DXILResourceMDAnalysis>(M);
3333
Res.print(OS);
3434
return PreservedAnalyses::all();
3535
}
3636

37-
char DXILResourceWrapper::ID = 0;
38-
INITIALIZE_PASS_BEGIN(DXILResourceWrapper, DEBUG_TYPE,
37+
char DXILResourceMDWrapper::ID = 0;
38+
INITIALIZE_PASS_BEGIN(DXILResourceMDWrapper, DEBUG_TYPE,
3939
"DXIL resource Information", true, true)
40-
INITIALIZE_PASS_END(DXILResourceWrapper, DEBUG_TYPE,
40+
INITIALIZE_PASS_END(DXILResourceMDWrapper, DEBUG_TYPE,
4141
"DXIL resource Information", true, true)
4242

43-
bool DXILResourceWrapper::runOnModule(Module &M) {
43+
bool DXILResourceMDWrapper::runOnModule(Module &M) {
4444
Resources.collect(M);
4545
return false;
4646
}
4747

48-
DXILResourceWrapper::DXILResourceWrapper() : ModulePass(ID) {}
48+
DXILResourceMDWrapper::DXILResourceMDWrapper() : ModulePass(ID) {}
4949

50-
void DXILResourceWrapper::print(raw_ostream &OS, const Module *) const {
50+
void DXILResourceMDWrapper::print(raw_ostream &OS, const Module *) const {
5151
Resources.print(OS);
5252
}

‎llvm/lib/Target/DirectX/DXILResourceAnalysis.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,36 @@
2020

2121
namespace llvm {
2222
/// Analysis pass that exposes the \c DXILResource for a module.
23-
class DXILResourceAnalysis : public AnalysisInfoMixin<DXILResourceAnalysis> {
24-
friend AnalysisInfoMixin<DXILResourceAnalysis>;
23+
class DXILResourceMDAnalysis
24+
: public AnalysisInfoMixin<DXILResourceMDAnalysis> {
25+
friend AnalysisInfoMixin<DXILResourceMDAnalysis>;
2526
static AnalysisKey Key;
2627

2728
public:
2829
typedef dxil::Resources Result;
2930
dxil::Resources run(Module &M, ModuleAnalysisManager &AM);
3031
};
3132

32-
/// Printer pass for the \c DXILResourceAnalysis results.
33-
class DXILResourcePrinterPass : public PassInfoMixin<DXILResourcePrinterPass> {
33+
/// Printer pass for the \c DXILResourceMDAnalysis results.
34+
class DXILResourceMDPrinterPass
35+
: public PassInfoMixin<DXILResourceMDPrinterPass> {
3436
raw_ostream &OS;
3537

3638
public:
37-
explicit DXILResourcePrinterPass(raw_ostream &OS) : OS(OS) {}
39+
explicit DXILResourceMDPrinterPass(raw_ostream &OS) : OS(OS) {}
3840
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
3941
static bool isRequired() { return true; }
4042
};
4143

4244
/// The legacy pass manager's analysis pass to compute DXIL resource
4345
/// information.
44-
class DXILResourceWrapper : public ModulePass {
46+
class DXILResourceMDWrapper : public ModulePass {
4547
dxil::Resources Resources;
4648

4749
public:
4850
static char ID; // Pass identification, replacement for typeid
4951

50-
DXILResourceWrapper();
52+
DXILResourceMDWrapper();
5153

5254
dxil::Resources &getDXILResource() { return Resources; }
5355
const dxil::Resources &getDXILResource() const { return Resources; }

‎llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DXILTranslateMetadata : public ModulePass {
3333

3434
void getAnalysisUsage(AnalysisUsage &AU) const override {
3535
AU.setPreservesAll();
36-
AU.addRequired<DXILResourceWrapper>();
36+
AU.addRequired<DXILResourceMDWrapper>();
3737
AU.addRequired<ShaderFlagsAnalysisWrapper>();
3838
}
3939

@@ -51,7 +51,7 @@ bool DXILTranslateMetadata::runOnModule(Module &M) {
5151
dxil::createDXILVersionMD(M);
5252

5353
const dxil::Resources &Res =
54-
getAnalysis<DXILResourceWrapper>().getDXILResource();
54+
getAnalysis<DXILResourceMDWrapper>().getDXILResource();
5555
Res.write(M);
5656

5757
const uint64_t Flags = static_cast<uint64_t>(
@@ -69,7 +69,7 @@ ModulePass *llvm::createDXILTranslateMetadataPass() {
6969

7070
INITIALIZE_PASS_BEGIN(DXILTranslateMetadata, "dxil-metadata-emit",
7171
"DXIL Metadata Emit", false, false)
72-
INITIALIZE_PASS_DEPENDENCY(DXILResourceWrapper)
72+
INITIALIZE_PASS_DEPENDENCY(DXILResourceMDWrapper)
7373
INITIALIZE_PASS_DEPENDENCY(ShaderFlagsAnalysisWrapper)
7474
INITIALIZE_PASS_END(DXILTranslateMetadata, "dxil-metadata-emit",
7575
"DXIL Metadata Emit", false, false)

‎llvm/lib/Target/DirectX/DirectX.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void initializeDXILTranslateMetadataPass(PassRegistry &);
4747
ModulePass *createDXILTranslateMetadataPass();
4848

4949
/// Initializer for DXILTranslateMetadata.
50-
void initializeDXILResourceWrapperPass(PassRegistry &);
50+
void initializeDXILResourceMDWrapperPass(PassRegistry &);
5151

5252
/// Pass to pretty print DXIL metadata.
5353
ModulePass *createDXILPrettyPrinterPass(raw_ostream &OS);

‎llvm/lib/Target/DirectX/DirectXPassRegistry.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#define MODULE_ANALYSIS(NAME, CREATE_PASS)
1818
#endif
1919
MODULE_ANALYSIS("dx-shader-flags", dxil::ShaderFlagsAnalysis())
20-
MODULE_ANALYSIS("dxil-resource", DXILResourceAnalysis())
20+
MODULE_ANALYSIS("dxil-resource-md", DXILResourceMDAnalysis())
2121
#undef MODULE_ANALYSIS
2222

2323
#ifndef MODULE_PASS
2424
#define MODULE_PASS(NAME, CREATE_PASS)
2525
#endif
2626
// TODO: rename to print<foo> after NPM switch
2727
MODULE_PASS("print-dx-shader-flags", dxil::ShaderFlagsAnalysisPrinter(dbgs()))
28-
MODULE_PASS("print-dxil-resource", DXILResourcePrinterPass(dbgs()))
28+
MODULE_PASS("print-dxil-resource-md", DXILResourceMDPrinterPass(dbgs()))
2929
#undef MODULE_PASS

‎llvm/lib/Target/DirectX/DirectXTargetMachine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeDirectXTarget() {
4646
initializeDXContainerGlobalsPass(*PR);
4747
initializeDXILOpLoweringLegacyPass(*PR);
4848
initializeDXILTranslateMetadataPass(*PR);
49-
initializeDXILResourceWrapperPass(*PR);
49+
initializeDXILResourceMDWrapperPass(*PR);
5050
initializeShaderFlagsAnalysisWrapperPass(*PR);
5151
}
5252

‎llvm/test/CodeGen/DirectX/UAVMetadata.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; RUN: opt -S -dxil-metadata-emit < %s | FileCheck %s
2-
; RUN: opt -S --passes="print-dxil-resource" < %s 2>&1 | FileCheck %s --check-prefix=PRINT
2+
; RUN: opt -S --passes="print-dxil-resource-md" < %s 2>&1 | FileCheck %s --check-prefix=PRINT
33
; RUN: llc %s --filetype=asm -o - < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,PRINT
44

55
target datalayout = "e-m:e-p:32:32-i1:32-i8:8-i16:16-i32:32-i64:64-f16:16-f32:32-f64:64-n8:16:32:64"

‎llvm/test/CodeGen/DirectX/cbuf.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; RUN: opt -S -dxil-metadata-emit < %s | FileCheck %s --check-prefix=DXILMD
2-
; RUN: opt -S --passes="print-dxil-resource" < %s 2>&1 | FileCheck %s --check-prefix=PRINT
2+
; RUN: opt -S --passes="print-dxil-resource-md" < %s 2>&1 | FileCheck %s --check-prefix=PRINT
33

44
target datalayout = "e-m:e-p:32:32-i1:32-i8:8-i16:16-i32:32-i64:64-f16:16-f32:32-f64:64-n8:16:32:64"
55
target triple = "dxil-unknown-shadermodel6.7-library"

0 commit comments

Comments
 (0)