Skip to content

Commit e4d21ae

Browse files
authored
[DirectX] Move DXIL Resource Access Pass before Intrinsic Expansion Pass (llvm#139562)
Move dxil resource access legacy pass before intrinsic expansion legacy pass so TypedBuffer Loads and Stores will be created before intrinsic expansion. This is to facilitate llvm#104423
1 parent 36b4ffe commit e4d21ae

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

llvm/lib/Target/DirectX/DirectXTargetMachine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ class DirectXPassConfig : public TargetPassConfig {
104104
void addCodeGenPrepare() override {
105105
addPass(createDXILFinalizeLinkageLegacyPass());
106106
addPass(createDXILResourceImplicitBindingLegacyPass());
107+
addPass(createDXILResourceAccessLegacyPass());
107108
addPass(createDXILIntrinsicExpansionLegacyPass());
108109
addPass(createDXILCBufferAccessLegacyPass());
109110
addPass(createDXILDataScalarizationLegacyPass());
110111
addPass(createDXILFlattenArraysLegacyPass());
111-
addPass(createDXILResourceAccessLegacyPass());
112112
ScalarizerPassOptions DxilScalarOptions;
113113
DxilScalarOptions.ScalarizeLoadStore = true;
114114
addPass(createScalarizerPass(DxilScalarOptions));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
; CHECK-NEXT: DXIL Finalize Linkage
1717
; CHECK-NEXT: DXIL Resource Binding Analysis
1818
; CHECK-NEXT: DXIL Resource Implicit Binding
19+
; CHECK-NEXT: FunctionPass Manager
20+
; CHECK-NEXT: DXIL Resource Access
1921
; CHECK-NEXT: DXIL Intrinsic Expansion
2022
; CHECK-NEXT: DXIL CBuffer Access
2123
; CHECK-NEXT: DXIL Data Scalarization
2224
; CHECK-NEXT: DXIL Array Flattener
2325
; CHECK-NEXT: FunctionPass Manager
24-
; CHECK-NEXT: DXIL Resource Access
2526
; CHECK-NEXT: Dominator Tree Construction
2627
; CHECK-NEXT: Scalarize vector operations
2728
; CHECK-NEXT: DXIL Forward Handle Accesses

0 commit comments

Comments
 (0)