Skip to content

Commit a1decfe

Browse files
authored
[HLSL][NFC] Rename getBindingMap to getResourceMap and update pass name (#137256)
The DXILResourceMap stores more information about resource instances than just their binding.
1 parent f9d4e7e commit a1decfe

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

llvm/include/llvm/Analysis/DXILResource.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ class DXILResourceWrapperPass : public ModulePass {
573573
DXILResourceWrapperPass();
574574
~DXILResourceWrapperPass() override;
575575

576-
const DXILResourceMap &getBindingMap() const { return *Map; }
577-
DXILResourceMap &getBindingMap() { return *Map; }
576+
const DXILResourceMap &getResourceMap() const { return *Map; }
577+
DXILResourceMap &getResourceMap() { return *Map; }
578578

579579
void getAnalysisUsage(AnalysisUsage &AU) const override;
580580
bool runOnModule(Module &M) override;

llvm/lib/Analysis/DXILResource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ void DXILResourceWrapperPass::dump() const { print(dbgs(), nullptr); }
946946
#endif
947947

948948
INITIALIZE_PASS(DXILResourceWrapperPass, "dxil-resources",
949-
"DXIL Resource Binding Analysis", false, true)
949+
"DXIL Resources Analysis", false, true)
950950
char DXILResourceWrapperPass::ID = 0;
951951

952952
ModulePass *llvm::createDXILResourceWrapperPassPass() {

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void DXContainerGlobals::addRootSignature(Module &M,
180180

181181
void DXContainerGlobals::addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV) {
182182
const DXILResourceMap &DRM =
183-
getAnalysis<DXILResourceWrapperPass>().getBindingMap();
183+
getAnalysis<DXILResourceWrapperPass>().getResourceMap();
184184
DXILResourceTypeMap &DRTM =
185185
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
186186

llvm/lib/Target/DirectX/DXILOpLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ class DXILOpLoweringLegacy : public ModulePass {
829829
public:
830830
bool runOnModule(Module &M) override {
831831
DXILResourceMap &DRM =
832-
getAnalysis<DXILResourceWrapperPass>().getBindingMap();
832+
getAnalysis<DXILResourceWrapperPass>().getResourceMap();
833833
DXILResourceTypeMap &DRTM =
834834
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
835835

llvm/lib/Target/DirectX/DXILPrettyPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ INITIALIZE_PASS_END(DXILPrettyPrinterLegacy, "dxil-pretty-printer",
291291

292292
bool DXILPrettyPrinterLegacy::runOnModule(Module &M) {
293293
const DXILResourceMap &DRM =
294-
getAnalysis<DXILResourceWrapperPass>().getBindingMap();
294+
getAnalysis<DXILResourceWrapperPass>().getResourceMap();
295295
DXILResourceTypeMap &DRTM =
296296
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
297297
prettyPrintResources(OS, DRM, DRTM);

llvm/lib/Target/DirectX/DXILShaderFlags.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ PreservedAnalyses ShaderFlagsAnalysisPrinter::run(Module &M,
338338
bool ShaderFlagsAnalysisWrapper::runOnModule(Module &M) {
339339
DXILResourceTypeMap &DRTM =
340340
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
341-
DXILResourceMap &DRM = getAnalysis<DXILResourceWrapperPass>().getBindingMap();
341+
DXILResourceMap &DRM =
342+
getAnalysis<DXILResourceWrapperPass>().getResourceMap();
342343
const ModuleMetadataInfo MMDI =
343344
getAnalysis<DXILMetadataAnalysisWrapperPass>().getModuleMetadata();
344345

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ class DXILTranslateMetadataLegacy : public ModulePass {
412412

413413
bool runOnModule(Module &M) override {
414414
DXILResourceMap &DRM =
415-
getAnalysis<DXILResourceWrapperPass>().getBindingMap();
415+
getAnalysis<DXILResourceWrapperPass>().getResourceMap();
416416
DXILResourceTypeMap &DRTM =
417417
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
418418
const ModuleShaderFlags &ShaderFlags =

llvm/test/CodeGen/DirectX/llc-pipeline.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
; CHECK-NEXT: Scalarize vector operations
2525
; CHECK-NEXT: DXIL Forward Handle Accesses
2626
; CHECK-NEXT: DXIL Legalizer
27-
; CHECK-NEXT: DXIL Resource Binding Analysis
27+
; CHECK-NEXT: DXIL Resources Analysis
2828
; CHECK-NEXT: DXIL Module Metadata analysis
2929
; CHECK-NEXT: DXIL Shader Flag Analysis
3030
; CHECK-NEXT: DXIL Translate Metadata

0 commit comments

Comments
 (0)