Skip to content

[SPIRV] Get alignemnt from pointee type for vk::BufferPoitner store #7501

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
s-perron merged 1 commit into from
Jun 2, 2025
Merged

[SPIRV] Get alignemnt from pointee type for vk::BufferPoitner store #7501

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
2 changes: 1 addition & 1 deletion tools/clang/lib/SPIRV/SpirvBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ SpirvStore *SpirvBuilder::createStore(SpirvInstruction *address,
AlignmentSizeCalculator alignmentCalc(astContext, spirvOptions);
uint32_t align, size, stride;
std::tie(align, size) = alignmentCalc.getAlignmentAndSize(
address->getAstResultType(), address->getLayoutRule(), llvm::None,
source->getAstResultType(), address->getLayoutRule(), llvm::None,
&stride);
instruction->setAlignment(align);
}
Expand Down
9 changes: 7 additions & 2 deletions tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.read.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,18 @@ struct TestPushConstant_t
float4 MainPs(void) : SV_Target0
{
float4 vTest = g_PushConstants.m_nBufferDeviceAddress.Get().g_vTestFloat4;
return vTest;
float f = vk::BufferPointer<float,4>(0xdeadbeefull).Get();
return vTest+f;
}

// CHECK: [[FUN]] = OpFunction
// CHECK: [[X1:%[_0-9A-Za-z]*]] = OpAccessChain [[PPGLOBALS]] [[GPC]] [[S0]]
// CHECK: [[X2:%[_0-9A-Za-z]*]] = OpLoad [[PGLOBALS]] [[X1]]
// CHECK: [[X3:%[_0-9A-Za-z]*]] = OpAccessChain [[PV4FLOAT2]] [[X2]] [[S1]]
// CHECK: [[X4:%[_0-9A-Za-z]*]] = OpLoad [[V4FLOAT]] [[X3]] Aligned 16
// CHECK: OpStore [[OUT]] [[X4]]
// CHECK: [[TEMP_PTR:%[_0-9A-Za-z]*]] = OpConvertUToPtr %_ptr_PhysicalStorageBuffer_float %ulong_3735928559
// CHECK: [[LD:%[_0-9A-Za-z]*]] = OpLoad %float [[TEMP_PTR]] Aligned 4
// CHECK: [[CONSTRUCT:%[_0-9A-Za-z]*]] = OpCompositeConstruct [[V4FLOAT]] [[LD]] [[LD]] [[LD]] [[LD]]
// CHECK: [[ADD:%[_0-9A-Za-z]*]] = OpFAdd [[V4FLOAT]] [[X4]] [[CONSTRUCT]]
// CHECK: OpStore [[OUT]] [[ADD]]
// CHECK: OpFunctionEnd
3 changes: 3 additions & 0 deletions tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.write.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ float4 MainPs(void) : SV_Target0
{
float4 vTest = float4(1.0,0.0,0.0,0.0);
g_PushConstants.m_nBufferDeviceAddress.Get().g_vTestFloat4 = vTest;
vk::BufferPointer<float,4>(0xdeadbeefull).Get() = 4.5f;
return vTest;
}

Expand All @@ -48,5 +49,7 @@ float4 MainPs(void) : SV_Target0
// CHECK: [[X2:%[_0-9A-Za-z]*]] = OpLoad [[PGLOBALS]] [[X1]]
// CHECK: [[X3:%[_0-9A-Za-z]*]] = OpAccessChain [[PV4FLOAT2]] [[X2]] [[S1]]
// CHECK: OpStore [[X3]] [[CV4FLOAT]] Aligned 16
// CHECK: [[TEMP_PTR:%[_0-9A-Za-z]*]] = OpConvertUToPtr %_ptr_PhysicalStorageBuffer_float %ulong_3735928559
// CHECK: OpStore [[TEMP_PTR]] %float_4_5 Aligned 4
// CHECK: OpStore [[OUT]] [[CV4FLOAT]]
// CHECK: OpFunctionEnd