Skip to content

[DirectX] Handle <1 x ...> loads in DXILResourceAccess #137076

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 2 commits into from
Apr 24, 2025
Merged

[DirectX] Handle <1 x ...> loads in DXILResourceAccess #137076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d90e820
[DirectX] Handle <1 x ...> loads in DXILResourceAccess
bogner Apr 23, 2025
2e2c918
fixup! [DirectX] Handle <1 x ...> loads in DXILResourceAccess
bogner Apr 24, 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
7 changes: 7 additions & 0 deletions llvm/lib/Target/DirectX/DXILResourceAccess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ static void createTypedBufferLoad(IntrinsicInst *II, LoadInst *LI,
if (Offset)
V = Builder.CreateExtractElement(V, Offset);

// If we loaded a <1 x ...> instead of a scalar (presumably to feed a
// shufflevector), then make sure we're maintaining the resulting type.
if (auto *VT = dyn_cast<FixedVectorType>(LI->getType()))
if (VT->getNumElements() == 1 && !isa<FixedVectorType>(V->getType()))
V = Builder.CreateInsertElement(PoisonValue::get(VT), V,
Builder.getInt32(0));

LI->replaceAllUsesWith(V);
}

Expand Down
48 changes: 47 additions & 1 deletion llvm/test/CodeGen/DirectX/ResourceAccess/load_typedbuffer.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ target triple = "dxil-pc-shadermodel6.6-compute"

declare void @use_float4(<4 x float>)
declare void @use_float(float)
declare void @use_float1(<1 x float>)

; CHECK-LABEL: define void @load_float4
; CHECK-LABEL: define void @load_float4(
define void @load_float4(i32 %index, i32 %elemindex) {
%buffer = call target("dx.TypedBuffer", <4 x float>, 1, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v4f32_1_0_0(
Expand Down Expand Up @@ -35,3 +36,48 @@ define void @load_float4(i32 %index, i32 %elemindex) {

ret void
}

; CHECK-LABEL: define void @load_float(
define void @load_float(i32 %index) {
%buffer = call target("dx.TypedBuffer", float, 1, 0, 0)
@llvm.dx.resource.handlefrombinding(i32 0, i32 0, i32 1, i32 0, i1 false)

; CHECK-NOT: @llvm.dx.resource.getpointer
%ptr = call ptr @llvm.dx.resource.getpointer(
target("dx.TypedBuffer", float, 1, 0, 0) %buffer, i32 %index)

; CHECK: %[[LOAD:.*]] = call { float, i1 } @llvm.dx.resource.load.typedbuffer.f32.tdx.TypedBuffer_f32_1_0_0t(target("dx.TypedBuffer", float, 1, 0, 0) %buffer, i32 %index)
; CHECK: %[[VALUE:.*]] = extractvalue { float, i1 } %[[LOAD]], 0
; CHECK: call void @use_float(float %[[VALUE]])
%data = load float, ptr %ptr
call void @use_float(float %data)

; CHECK: %[[LOAD:.*]] = call { float, i1 } @llvm.dx.resource.load.typedbuffer.f32.tdx.TypedBuffer_f32_1_0_0t(target("dx.TypedBuffer", float, 1, 0, 0) %buffer, i32 %index)
; CHECK: %[[VALUE:.*]] = extractvalue { float, i1 } %[[LOAD]], 0
; CHECK: %[[VEC:.*]] = insertelement <1 x float> poison, float %[[VALUE]], i32 0
; CHECK: call void @use_float1(<1 x float> %[[VEC]])
%vec_data = load <1 x float>, ptr %ptr
call void @use_float1(<1 x float> %vec_data)

ret void
}

; CHECK-LABEL: define void @load_float1(
define void @load_float1(i32 %index) {
%buffer = call target("dx.TypedBuffer", <1 x float>, 1, 0, 0)
@llvm.dx.resource.handlefrombinding(i32 0, i32 0, i32 1, i32 0, i1 false)

; CHECK-NOT: @llvm.dx.resource.getpointer
%ptr = call ptr @llvm.dx.resource.getpointer(
target("dx.TypedBuffer", <1 x float>, 1, 0, 0) %buffer, i32 %index)

; CHECK: %[[LOAD:.*]] = call { <1 x float>, i1 } @llvm.dx.resource.load.typedbuffer.v1f32.tdx.TypedBuffer_v1f32_1_0_0t(target("dx.TypedBuffer", <1 x float>, 1, 0, 0) %buffer, i32 %index)
; CHECK: %[[VALUE:.*]] = extractvalue { <1 x float>, i1 } %[[LOAD]], 0
; CHECK: %[[SHUF:.*]] = shufflevector <1 x float> %[[VALUE]], <1 x float> poison, <4 x i32> zeroinitializer
; CHECK: call void @use_float4(<4 x float> %[[SHUF]])
%load = load <1 x float>, ptr %ptr
%shuf = shufflevector <1 x float> %load, <1 x float> poison, <4 x i32> zeroinitializer
call void @use_float4(<4 x float> %shuf)

ret void
}
Loading