Skip to content

[SPIR-V] Add capability for non-uniform indexing for StructuredBuffer types. #163424

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
Oct 17, 2025
Merged

[SPIR-V] Add capability for non-uniform indexing for StructuredBuffer types. #163424

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42145c7
[HLSL][SPIR-V] Add capability for non-uniform indexing for types.
luciechoi Oct 14, 2025
3c89a34
Do not use dynamic indexing when the index is a constant
luciechoi Oct 17, 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
14 changes: 12 additions & 2 deletions llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,18 @@ void addOpAccessChainReqs(const MachineInstr &Instr,
return;
}

bool IsNonUniform =
hasNonUniformDecoration(Instr.getOperand(0).getReg(), MRI);
if (StorageClass == SPIRV::StorageClass::StorageClass::StorageBuffer) {
if (IsNonUniform)
Handler.addRequirements(
SPIRV::Capability::StorageBufferArrayNonUniformIndexingEXT);
else
Handler.addRequirements(
SPIRV::Capability::StorageBufferArrayDynamicIndexing);
return;
}

Register PointeeTypeReg = ResTypeInst->getOperand(2).getReg();
MachineInstr *PointeeType = MRI.getUniqueVRegDef(PointeeTypeReg);
if (PointeeType->getOpcode() != SPIRV::OpTypeImage &&
Expand All @@ -1208,8 +1220,6 @@ void addOpAccessChainReqs(const MachineInstr &Instr,
return;
}

bool IsNonUniform =
hasNonUniformDecoration(Instr.getOperand(0).getReg(), MRI);
if (isUniformTexelBuffer(PointeeType)) {
if (IsNonUniform)
Handler.addRequirements(
Expand Down
0 ...iformIdx/StructuredBufferNonUniformIdx.ll → ...es/NonUniformIdx/RWBufferNonUniformIdx.ll
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions llvm/test/CodeGen/SPIRV/hlsl-resources/NonUniformIdx/RWStructuredBufferNonUniformIdx.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

; CHECK-DAG: OpCapability Shader
; CHECK-DAG: OpCapability ShaderNonUniformEXT
; CHECK-DAG: OpCapability StorageBufferArrayNonUniformIndexingEXT
; CHECK-DAG: OpDecorate {{%[0-9]+}} NonUniformEXT
; CHECK-DAG: OpDecorate {{%[0-9]+}} NonUniformEXT
; CHECK-DAG: OpDecorate {{%[0-9]+}} NonUniformEXT
Expand Down