AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2025-01-12 17:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that only whitelisted extensions are used in WebGPU (#2127)

Browse Source 
Fixes #2058
This commit is contained in:
Ryan Harrison 2018-11-28 10:49:05 -05:00 committed by GitHub
parent 703305b1a5
commit 3ee605d7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/val/validate_extensions.cpp
View File

@ -21,6 +21,8 @@
#include <vector>
#include "source/diagnostic.h"
#include "source/enum_string_mapping.h"
#include "source/extensions.h"
#include "source/latest_version_glsl_std_450_header.h"
#include "source/latest_version_opencl_std_header.h"
#include "source/opcode.h"
@ -42,6 +44,21 @@ uint32_t GetSizeTBitWidth(const ValidationState_t& _) {
} // anonymous namespace
spv_result_t ValidateExtension(ValidationState_t& _, const Instruction* inst) {
if (spvIsWebGPUEnv(_.context()->target_env)) {
std::string extension = GetExtensionString(&(inst->c_inst()));
if (extension != ExtensionToString(kSPV_KHR_vulkan_memory_model)) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "For WebGPU, the only valid parameter to OpExtension is "
<< "\"" << ExtensionToString(kSPV_KHR_vulkan_memory_model)
<< "\".";
}
}
return SPV_SUCCESS;
}
spv_result_t ValidateExtInstImport(ValidationState_t& _,
const Instruction* inst) {
if (spvIsWebGPUEnv(_.context()->target_env)) {
@ -2001,6 +2018,7 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
spv_result_t ExtensionPass(ValidationState_t& _, const Instruction* inst) {
const SpvOp opcode = inst->opcode();
if (opcode == SpvOpExtension) return ValidateExtension(_, inst);
if (opcode == SpvOpExtInstImport) return ValidateExtInstImport(_, inst);
if (opcode == SpvOpExtInst) return ValidateExtInst(_, inst);

18
test/val/val_webgpu_test.cpp
View File

@ -258,6 +258,24 @@ TEST_F(ValidateWebGPU, NonWhitelistedExtendedInstructionsImportBad) {
"OpExtInstImport \"OpenCL.std\"\n"));
}
TEST_F(ValidateWebGPU, NonVulkanKHRMemoryModelExtensionBad) {
std::string spirv = R"(
OpCapability Shader
OpCapability VulkanMemoryModelKHR
OpExtension "SPV_KHR_8bit_storage"
OpExtension "SPV_KHR_vulkan_memory_model"
OpMemoryModel Logical VulkanKHR
)";
CompileSuccessfully(spirv);
EXPECT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_WEBGPU_0));
EXPECT_THAT(getDiagnosticString(),
HasSubstr("For WebGPU, the only valid parameter to OpExtension "
"is \"SPV_KHR_vulkan_memory_model\".\n OpExtension "
"\"SPV_KHR_8bit_storage\"\n"));
}
} // namespace
} // namespace val
} // namespace spvtools