Skip to content

[SPIR-V] Fix vk::BufferPointer bitfield stores #8713

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

Open
Diego Novillo (dnovillo) wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −2
Open

[SPIR-V] Fix vk::BufferPointer bitfield stores #8713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions tools/clang/lib/SPIRV/SpirvBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ SpirvStore *SpirvBuilder::createStore(SpirvInstruction *address,
}

SpirvInstruction *source = value;
SpirvLoad *bitfieldLoad = nullptr;
const auto &bitfieldInfo = address->getBitfieldInfo();
if (bitfieldInfo.hasValue()) {
// Generate SPIR-V type for value. This is required to know the final
Expand All @@ -313,11 +314,12 @@ SpirvStore *SpirvBuilder::createStore(SpirvInstruction *address,
lowerTypeVisitor.visitInstruction(value);
context.addToInstructionsWithLoweredType(value);

auto *base = createLoad(value->getResultType(), address, loc, range);
source = createBitFieldInsert(/*QualType*/ {}, base, value,
bitfieldLoad = createLoad(value->getResultType(), address, loc, range);
source = createBitFieldInsert(/*QualType*/ {}, bitfieldLoad, value,
bitfieldInfo->offsetInBits,
bitfieldInfo->sizeInBits, loc, range);
source->setResultType(value->getResultType());
source->setAstResultType(value->getAstResultType());
Comment on lines +317 to +322
}

auto *instruction =
Expand All @@ -337,6 +339,8 @@ SpirvStore *SpirvBuilder::createStore(SpirvInstruction *address,
std::tie(align, size) = alignmentCalc.getAlignmentAndSize(
source->getAstResultType(), address->getLayoutRule(), llvm::None,
&stride);
if (bitfieldLoad)
bitfieldLoad->setAlignment(align);
instruction->setAlignment(align);
}

Expand Down
20 changes: 20 additions & 0 deletions tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.bitfield.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// RUN: %dxc -spirv -E main -T cs_6_7 %s | FileCheck %s

struct Foo {
uint a : 16;
uint b : 16;
};

[[vk::push_constant]] struct Pc {
vk::BufferPointer<Foo> ptr;
} pc;

[numthreads(1, 1, 1)]
void main() {
pc.ptr.Get().a = 123;
}

// CHECK: [[FIELD:%[0-9]+]] = OpAccessChain %_ptr_PhysicalStorageBuffer_uint {{%[0-9]+}} %int_0
// CHECK: [[OLD:%[0-9]+]] = OpLoad %uint [[FIELD]] Aligned 4
// CHECK: [[NEW:%[0-9]+]] = OpBitFieldInsert %uint [[OLD]] %uint_123 %uint_0 %uint_16
// CHECK: OpStore [[FIELD]] [[NEW]] Aligned 4
Loading