Skip to content

spirv-val: Fix Offset not checking if in struct #6701

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
spencer-lunarg wants to merge 1 commit into
base: main
Choose a base branch
from
+141 −12
Open

spirv-val: Fix Offset not checking if in struct #6701

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
22 changes: 14 additions & 8 deletions source/val/validate_annotation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ bool IsMemberDecorationOnly(spv::Decoration dec) {
case spv::Decoration::RowMajor:
case spv::Decoration::ColMajor:
case spv::Decoration::MatrixStride:
// SPIR-V spec bug? Offset is generated on variables when dealing with
// transform feedback.
// case spv::Decoration::Offset:
case spv::Decoration::Offset:
case spv::Decoration::OffsetIdEXT:
return true;
default:
break;
Expand Down Expand Up @@ -328,7 +327,13 @@ spv_result_t ValidateDecorate(ValidationState_t& _, const Instruction* inst) {
}

if (target->opcode() != spv::Op::OpDecorationGroup) {
if (IsMemberDecorationOnly(decoration)) {
// SPIR-V spec bug? (...example lost in time)
Copy link
Copy Markdown
Contributor Author

@spencer-lunarg spencer-lunarg May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... not sure where this is coming from, probably something when someone gets to #6594

Copy link
Copy Markdown
Contributor Author

@spencer-lunarg spencer-lunarg May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... guess the smoke test found more

@alan-baker what do you want to do here, clearly something is wrong as the Offset is not following the

image

unless it was modified for all these various extension cases, but I guess don't understand what

layout(binding = 0, offset = 4) uniform atomic_uint countArr[4];

even means and where the memory for these offsets are all defined

Copy link
Copy Markdown
Contributor

@alan-baker alan-baker May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll want to double check this PR against CTS. I remember the lack of spec language and existing tests was frustrating.

Copy link
Copy Markdown
Contributor Author

@spencer-lunarg spencer-lunarg May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://gitlab.khronos.org/spirv/SPIR-V/-/issues/937

// Offset is generated on variables when dealing with transform feedback.
const bool tf_exception =
decoration == spv::Decoration::Offset &&
_.HasCapability(spv::Capability::TransformFeedback);

if (IsMemberDecorationOnly(decoration) && !tf_exception) {
return _.diag(SPV_ERROR_INVALID_ID, inst)
<< _.SpvDecorationString(decoration)
<< " can only be applied to structure members";
Expand Down Expand Up @@ -409,11 +414,12 @@ spv_result_t ValidateDecorateId(ValidationState_t& _, const Instruction* inst) {
}
}

// No member decorations take id parameters, so we don't bother checking if
// we are using a member only decoration here.
if (IsMemberDecorationOnly(decoration)) {
return _.diag(SPV_ERROR_INVALID_ID, inst)
<< _.SpvDecorationString(decoration)
<< " can only be applied to structure members";
}

// TODO: Add validations for these decorations.
// UniformId is covered elsewhere.
return SPV_SUCCESS;
}

Expand Down
78 changes: 78 additions & 0 deletions test/val/val_annotation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,6 +1157,84 @@ INSTANTIATE_TEST_SUITE_P(ValidateVulkanInterpolationStorageClass,
VulkanInterpolationStorageClass,
Values("Flat", "NoPerspective", "Centroid", "Sample"));

TEST_F(DecorationTest, OffsetOnStruct) {
const std::string text = R"(
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %main "main" %x
OpExecutionMode %main LocalSize 1 1 1
OpDecorate %ssbo Block
OpDecorate %ssbo Offset 0
OpMemberDecorate %ssbo 0 Offset 0
OpMemberDecorate %ssbo 1 Offset 4
OpMemberDecorate %ssbo 2 Offset 8
OpDecorate %x Binding 0
OpDecorate %x DescriptorSet 0
%void = OpTypeVoid
%3 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%ssbo = OpTypeStruct %uint %uint %uint
%uint_2 = OpConstant %uint 2
%_arr_ssbo_uint_2 = OpTypeArray %ssbo %uint_2
%_ptr_StorageBuffer__arr_ssbo_uint_2 = OpTypePointer StorageBuffer %_arr_ssbo_uint_2
%x = OpVariable %_ptr_StorageBuffer__arr_ssbo_uint_2 StorageBuffer
%int = OpTypeInt 32 1
%int_1 = OpConstant %int 1
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint
%main = OpFunction %void None %3
%5 = OpLabel
%16 = OpAccessChain %_ptr_StorageBuffer_uint %x %int_1 %int_1
OpStore %16 %uint_0
OpReturn
OpFunctionEnd
)";

CompileSuccessfully(text, SPV_ENV_VULKAN_1_3);
EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_3));
EXPECT_THAT(getDiagnosticString(),
HasSubstr("Offset can only be applied to structure members"));
}

TEST_F(DecorationTest, OffsetOnArray) {
const std::string text = R"(
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %main "main" %x
OpExecutionMode %main LocalSize 1 1 1
OpDecorate %ssbo Block
OpMemberDecorate %ssbo 0 Offset 0
OpMemberDecorate %ssbo 1 Offset 4
OpMemberDecorate %ssbo 2 Offset 8
OpDecorate %x Binding 0
OpDecorate %x DescriptorSet 0
OpDecorate %_arr_ssbo_uint_2 Offset 0
%void = OpTypeVoid
%3 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%ssbo = OpTypeStruct %uint %uint %uint
%uint_2 = OpConstant %uint 2
%_arr_ssbo_uint_2 = OpTypeArray %ssbo %uint_2
%_ptr_StorageBuffer__arr_ssbo_uint_2 = OpTypePointer StorageBuffer %_arr_ssbo_uint_2
%x = OpVariable %_ptr_StorageBuffer__arr_ssbo_uint_2 StorageBuffer
%int = OpTypeInt 32 1
%int_1 = OpConstant %int 1
%uint_0 = OpConstant %uint 0
%_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint
%main = OpFunction %void None %3
%5 = OpLabel
%16 = OpAccessChain %_ptr_StorageBuffer_uint %x %int_1 %int_1
OpStore %16 %uint_0
OpReturn
OpFunctionEnd
)";

CompileSuccessfully(text, SPV_ENV_VULKAN_1_3);
EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_3));
EXPECT_THAT(getDiagnosticString(),
HasSubstr("Offset can only be applied to structure members"));
}

} // namespace
} // namespace val
} // namespace spvtools
53 changes: 49 additions & 4 deletions test/val/val_extension_spv_ext_descriptor_heap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,10 @@ TEST_F(ValidateSpvEXTDescriptorHeap, BufferPointerEXTStorageClass) {
"type with a Storage Class of Uniform or StorageBuffer."));
}

TEST_F(ValidateSpvEXTDescriptorHeap, BufferPointerEXTLayout) {
// TODO - Seems like VUID-StandaloneSpirv-Result-11346 is wrong because
Copy link
Copy Markdown
Contributor Author

@spencer-lunarg spencer-lunarg May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://gitlab.khronos.org/vulkan/vulkan/-/issues/4837

something is wrong here

// AllowsLayout() shows Uniform and StorageBuffer (the only two allowed)
// are always explicit layout
TEST_F(ValidateSpvEXTDescriptorHeap, DISABLED_BufferPointerEXTLayout) {
const std::string str = R"(
OpCapability Shader
OpCapability UntypedPointersKHR
Expand All @@ -1167,12 +1170,13 @@ TEST_F(ValidateSpvEXTDescriptorHeap, BufferPointerEXTLayout) {
OpDecorate %U Block
OpMemberDecorate %U 0 Offset 0
OpDecorateId %_runtimearr_17 ArrayStrideIdEXT %18
OpDecorate %_ptr_UniformConstant Offset 0
; OpDecorate %_ptr_Uniform Offset 0
Copy link
Copy Markdown
Contributor

@alan-baker alan-baker May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree this shouldn't be there.

%_runtimearr_17 and %U do need explicit layouts (and have it). The pointers should not be laid out though.

%void = OpTypeVoid
%3 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%_ptr_Output_uint = OpTypePointer Output %uint
%o = OpVariable %_ptr_Output_uint Output
%_ptr_Uniform = OpTypeUntypedPointerKHR Uniform
%_ptr_UniformConstant = OpTypeUntypedPointerKHR UniformConstant
%resource_heap = OpUntypedVariableKHR %_ptr_UniformConstant UniformConstant
%int = OpTypeInt 32 1
Expand All @@ -1185,8 +1189,8 @@ TEST_F(ValidateSpvEXTDescriptorHeap, BufferPointerEXTLayout) {
%main = OpFunction %void None %3
%5 = OpLabel
%16 = OpUntypedAccessChainKHR %_ptr_UniformConstant %_runtimearr_17 %resource_heap %int_9
%20 = OpBufferPointerEXT %_ptr_UniformConstant %16
%21 = OpUntypedAccessChainKHR %_ptr_UniformConstant %U %20 %int_0
%20 = OpBufferPointerEXT %_ptr_Uniform %16
%21 = OpUntypedAccessChainKHR %_ptr_Uniform %U %20 %int_0
%22 = OpLoad %uint %21
OpStore %o %22
OpReturn
Expand Down Expand Up @@ -2417,6 +2421,47 @@ TEST_F(ValidateSpvEXTDescriptorHeap, ArrayStrideSpecConstantZero) {
EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_4));
}

// https://github.com/KhronosGroup/SPIRV-Tools/issues/6696
TEST_F(ValidateSpvEXTDescriptorHeap, OffsetIdOnArray) {
const std::string str = R"(
OpCapability Shader
OpCapability UntypedPointersKHR
OpCapability DescriptorHeapEXT
OpCapability Sampled1D
OpExtension "SPV_KHR_untyped_pointers"
OpExtension "SPV_EXT_descriptor_heap"
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %1 "main" %2
OpExecutionMode %1 LocalSize 1 1 1
OpDecorate %2 BuiltIn ResourceHeapEXT
OpDecorateId %7 OffsetIdEXT %4
%11 = OpTypeVoid
%12 = OpTypeFunction %11
%13 = OpTypeInt 32 0
%16 = OpConstant %13 0
%4 = OpConstant %13 0
%20 = OpTypeImage %13 1D 0 0 0 1 Unknown
%21 = OpTypeBufferEXT StorageBuffer
%22 = OpTypeSampler
%23 = OpTypeSampledImage %20
%7 = OpTypeRuntimeArray %20
%24 = OpTypeUntypedPointerKHR UniformConstant
%25 = OpTypeUntypedPointerKHR StorageBuffer
%2 = OpUntypedVariableKHR %24 UniformConstant
%1 = OpFunction %11 None %12
%26 = OpLabel
%27 = OpUntypedAccessChainKHR %24 %7 %2 %16
%28 = OpLoad %20 %27
OpReturn
OpFunctionEnd
)";
CompileSuccessfully(str.c_str(), SPV_ENV_VULKAN_1_4);
EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_4));
EXPECT_THAT(
getDiagnosticString(),
HasSubstr("OffsetIdEXT can only be applied to structure members"));
}

} // namespace
} // namespace val
} // namespace spvtools
Loading