AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-30 06:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv-val: Vulkan 64-bit OpAtomicStore check (#4163)

Browse Source
This commit is contained in:
sfricke-samsung 2021-03-08 11:34:06 -08:00 committed by GitHub
parent e6a9f4e430
commit c6da5e343c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/val/validate_atomics.cpp
View File

@ -225,6 +225,16 @@ spv_result_t AtomicsPass(ValidationState_t& _, const Instruction* inst) {
"be: Uniform, Workgroup, Image, StorageBuffer, or " "be: Uniform, Workgroup, Image, StorageBuffer, or "
"PhysicalStorageBuffer."; "PhysicalStorageBuffer.";
} }
// Can't use result_type because OpAtomicStore doesn't have a result
if (opcode == SpvOpAtomicStore && _.GetBitWidth(data_type) == 64 &&
_.IsIntScalarType(data_type) &&
!_.HasCapability(SpvCapabilityInt64Atomics)) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< spvOpcodeString(opcode)
<< ": 64-bit atomics require the Int64Atomics "
"capability";
}
} else if (storage_class == SpvStorageClassFunction) { } else if (storage_class == SpvStorageClassFunction) {
return _.diag(SPV_ERROR_INVALID_DATA, inst) return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< spvOpcodeString(opcode) << spvOpcodeString(opcode)

13
test/val/val_atomics_test.cpp
View File

@ -537,6 +537,19 @@ TEST_F(ValidateAtomics, AtomicLoadVulkanInt64) {
"AtomicLoad: 64-bit atomics require the Int64Atomics capability")); "AtomicLoad: 64-bit atomics require the Int64Atomics capability"));
} }
TEST_F(ValidateAtomics, AtomicStoreVulkanInt64) {
const std::string body = R"(
OpAtomicStore %u64_var %device %relaxed %u64_1
)";
CompileSuccessfully(GenerateShaderCode(body), SPV_ENV_VULKAN_1_0);
ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_0));
EXPECT_THAT(
getDiagnosticString(),
HasSubstr(
"AtomicStore: 64-bit atomics require the Int64Atomics capability"));
}
TEST_F(ValidateAtomics, VK_KHR_shader_atomic_int64Success) { TEST_F(ValidateAtomics, VK_KHR_shader_atomic_int64Success) {
const std::string body = R"( const std::string body = R"(
%val1 = OpAtomicUMin %u64 %u64_var %device %relaxed %u64_1 %val1 = OpAtomicUMin %u64 %u64_var %device %relaxed %u64_1