Skip to content

[HLSL] Move DXILResourceImplicitBinding pass closer to DXIL Resource Analysis #140981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 29, 2025
Merged

[HLSL] Move DXILResourceImplicitBinding pass closer to DXIL Resource Analysis #140981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a922b55
[HLSL] Moving DXILResourceImplicitBinding pass right before DXIL Reso…
hekota May 22, 2025
33e5bf2
Merge branch 'main' into move-impl-binding-pass
hekota May 22, 2025
2edef3b
Merge branch 'main' into move-impl-binding-pass
hekota May 27, 2025
62e0e8e
code review feedback
hekota May 28, 2025
7d37cff
Merge branch 'main' into move-impl-binding-pass
hekota May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions llvm/lib/Target/DirectX/DXILResourceImplicitBinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,17 @@ PreservedAnalyses DXILResourceImplicitBinding::run(Module &M,

DXILResourceBindingInfo &DRBI = AM.getResult<DXILResourceBindingAnalysis>(M);
DXILResourceTypeMap &DRTM = AM.getResult<DXILResourceTypeAnalysis>(M);
if (DRBI.hasImplicitBinding())
if (assignBindings(M, DRBI, DRTM))
return PreservedAnalyses::none();
return PreservedAnalyses::all();

if (!DRBI.hasImplicitBinding())
return PreservedAnalyses::all();

if (!assignBindings(M, DRBI, DRTM))
return PreservedAnalyses::all();

PreservedAnalyses PA;
PA.preserve<DXILResourceBindingAnalysis>();
PA.preserve<DXILResourceTypeAnalysis>();
return PA;
}

namespace {
Expand All @@ -163,6 +170,8 @@ class DXILResourceImplicitBindingLegacy : public ModulePass {
void getAnalysisUsage(llvm::AnalysisUsage &AU) const override {
AU.addRequired<DXILResourceTypeWrapperPass>();
AU.addRequired<DXILResourceBindingWrapperPass>();
AU.addPreserved<DXILResourceTypeWrapperPass>();
AU.addPreserved<DXILResourceBindingWrapperPass>();
}
};

Expand Down
1 change: 1 addition & 0 deletions llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ class DXILTranslateMetadataLegacy : public ModulePass {
AU.addPreserved<DXILResourceWrapperPass>();
AU.addPreserved<DXILMetadataAnalysisWrapperPass>();
AU.addPreserved<ShaderFlagsAnalysisWrapper>();
AU.addPreserved<DXILResourceBindingWrapperPass>();
}

bool runOnModule(Module &M) override {
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/DirectX/DirectXTargetMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ class DirectXPassConfig : public TargetPassConfig {
FunctionPass *createTargetRegisterAllocator(bool) override { return nullptr; }
void addCodeGenPrepare() override {
addPass(createDXILFinalizeLinkageLegacyPass());
addPass(createDXILResourceImplicitBindingLegacyPass());
addPass(createDXILResourceAccessLegacyPass());
addPass(createDXILIntrinsicExpansionLegacyPass());
addPass(createDXILCBufferAccessLegacyPass());
Expand All @@ -114,6 +113,7 @@ class DirectXPassConfig : public TargetPassConfig {
addPass(createScalarizerPass(DxilScalarOptions));
addPass(createDXILForwardHandleAccessesLegacyPass());
addPass(createDXILLegalizeLegacyPass());
addPass(createDXILResourceImplicitBindingLegacyPass());
addPass(createDXILTranslateMetadataLegacyPass());
addPass(createDXILPostOptimizationValidationLegacyPass());
addPass(createDXILOpLoweringLegacyPass());
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/DirectX/llc-pipeline.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

; CHECK-NEXT: ModulePass Manager
; CHECK-NEXT: DXIL Finalize Linkage
; CHECK-NEXT: DXIL Resource Binding Analysis
; CHECK-NEXT: DXIL Resource Implicit Binding
; CHECK-NEXT: FunctionPass Manager
; CHECK-NEXT: DXIL Resource Access
; CHECK-NEXT: DXIL Intrinsic Expansion
Expand All @@ -27,6 +25,8 @@
; CHECK-NEXT: Scalarize vector operations
; CHECK-NEXT: DXIL Forward Handle Accesses
; CHECK-NEXT: DXIL Legalizer
; CHECK-NEXT: DXIL Resource Binding Analysis
; CHECK-NEXT: DXIL Resource Implicit Binding
; CHECK-NEXT: DXIL Resources Analysis
; CHECK-NEXT: DXIL Module Metadata analysis
; CHECK-NEXT: DXIL Shader Flag Analysis
Expand Down