mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-10-18 19:20:05 +00:00
63f57d95d6
* SPIR-V 1.4 headers, add SPV_ENV_UNIVERSAL_1_4 * Support --target-env spv1.4 in help for command line tools * Support asm/dis of UniformId decoration * Validate UniformId decoration * Fix version check on instructions and operands Also register decorations used with OpDecorateId * Extension lists can differ between enums that match Example: SubgroupMaskEq vs SubgroupMaskEqKHR * Validate scope value for Uniform decoration, for SPIR-V 1.4 * More unioning of exts * Preserve grammar order within an enum value * 1.4: Validate OpSelect over composites * Tools default to 1.4 * Add asm/dis test for OpCopyLogical * 1.4: asm/dis tests for PtrEqual, PtrNotEqual, PtrDiff * Basic asm/Dis test for OpCopyMemory * Test asm/dis OpCopyMemory with 2-memory access Add asm/dis tests for OpCopyMemorySized Requires grammar update to add second optional memory access operand to OpCopyMemory and OpCopyMemorySized * Validate one or two memory accesses on OpCopyMemory* * Check av/vis on CopyMemory source and target memory access This is a proposed rule. See https://gitlab.khronos.org/spirv/SPIR-V/issues/413 * Validate operation for OpSpecConstantOp * Validate NonWritable decoration Also permit NonWritable on members of UBO and SSBO. * SPIR-V 1.4: NonWrtiable can decorate Function and Private vars * Update optimizer CLI tests for SPIR-V 1.4 * Testing tools: Give expected SPIR-V version in message * SPIR-V 1.4 validation for entry point interfaces * Allow only unique interfaces * Allow all global variables * Check that all statically used global variables are listed * new tests * Add validation fixture CompileFailure * Add 1.4 validation for pointer comparisons * New tests * Validate with image operands SignExtend, ZeroExtend Since we don't actually know the image texel format, we can't fully validate. We need more context. But we can make sure we allow the new image operands in known-good cases. * Validate OpCopyLogical * Recursively checks subtypes * new tests * Add SPIR-V 1.4 tests for NoSignedWrap, NoUnsignedWrap * Allow scalar conditions in 1.4 with OpSelect * Allows scalar conditions with vector operands * new tests * Validate uniform id scope as an execution scope * Validate the values of memory and execution scopes are valid scope values * new test * Remove SPIR-V 1.4 Vulkan 1.0 environment * SPIR-V 1.4 requires Vulkan 1.1 * FIX: include string for spvLog * FIX: validate nonwritable * FIX: test case suite for member decorate string * FIX: test case for hlsl functionality1 * Validation test fixture: ease debugging * Use binary version for SPIR-V 1.4 specific features * Switch checks based on the SPIR-V version from the target environment to instead use the version from the binary * Moved header parsing into the ValidationState_t constructor (where version based features are set) * Added new versions of tests that assemble a 1.3 binary and validate a 1.4 environment * Fix test for update to SPIR-V 1.4 headers * Fix formatting * Ext inst lookup: Add Vulkan 1.1 env with SPIR-V 1.4 * Update spirv-val help * Operand version checks should use module version Use the module version instead of the target environment version. * Fix comment about two-access form of OpCopyMemory
313 lines
9.4 KiB
C++
313 lines
9.4 KiB
C++
// Copyright (c) 2015-2016 The Khronos Group Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "source/spirv_target_env.h"
|
|
|
|
#include <cstring>
|
|
#include <string>
|
|
|
|
#include "source/spirv_constant.h"
|
|
#include "spirv-tools/libspirv.h"
|
|
|
|
const char* spvTargetEnvDescription(spv_target_env env) {
|
|
switch (env) {
|
|
case SPV_ENV_UNIVERSAL_1_0:
|
|
return "SPIR-V 1.0";
|
|
case SPV_ENV_VULKAN_1_0:
|
|
return "SPIR-V 1.0 (under Vulkan 1.0 semantics)";
|
|
case SPV_ENV_UNIVERSAL_1_1:
|
|
return "SPIR-V 1.1";
|
|
case SPV_ENV_OPENCL_1_2:
|
|
return "SPIR-V 1.0 (under OpenCL 1.2 Full Profile semantics)";
|
|
case SPV_ENV_OPENCL_EMBEDDED_1_2:
|
|
return "SPIR-V 1.0 (under OpenCL 1.2 Embedded Profile semantics)";
|
|
case SPV_ENV_OPENCL_2_0:
|
|
return "SPIR-V 1.0 (under OpenCL 2.0 Full Profile semantics)";
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_0:
|
|
return "SPIR-V 1.0 (under OpenCL 2.0 Embedded Profile semantics)";
|
|
case SPV_ENV_OPENCL_2_1:
|
|
return "SPIR-V 1.0 (under OpenCL 2.1 Full Profile semantics)";
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_1:
|
|
return "SPIR-V 1.0 (under OpenCL 2.1 Embedded Profile semantics)";
|
|
case SPV_ENV_OPENCL_2_2:
|
|
return "SPIR-V 1.2 (under OpenCL 2.2 Full Profile semantics)";
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_2:
|
|
return "SPIR-V 1.2 (under OpenCL 2.2 Embedded Profile semantics)";
|
|
case SPV_ENV_OPENGL_4_0:
|
|
return "SPIR-V 1.0 (under OpenGL 4.0 semantics)";
|
|
case SPV_ENV_OPENGL_4_1:
|
|
return "SPIR-V 1.0 (under OpenGL 4.1 semantics)";
|
|
case SPV_ENV_OPENGL_4_2:
|
|
return "SPIR-V 1.0 (under OpenGL 4.2 semantics)";
|
|
case SPV_ENV_OPENGL_4_3:
|
|
return "SPIR-V 1.0 (under OpenGL 4.3 semantics)";
|
|
case SPV_ENV_OPENGL_4_5:
|
|
return "SPIR-V 1.0 (under OpenGL 4.5 semantics)";
|
|
case SPV_ENV_UNIVERSAL_1_2:
|
|
return "SPIR-V 1.2";
|
|
case SPV_ENV_UNIVERSAL_1_3:
|
|
return "SPIR-V 1.3";
|
|
case SPV_ENV_VULKAN_1_1:
|
|
return "SPIR-V 1.3 (under Vulkan 1.1 semantics)";
|
|
case SPV_ENV_WEBGPU_0:
|
|
return "SPIR-V 1.3 (under WIP WebGPU semantics)";
|
|
case SPV_ENV_UNIVERSAL_1_4:
|
|
return "SPIR-V 1.4";
|
|
case SPV_ENV_VULKAN_1_1_SPIRV_1_4:
|
|
return "SPIR-V 1.4 (under Vulkan 1.1 semantics)";
|
|
}
|
|
return "";
|
|
}
|
|
|
|
uint32_t spvVersionForTargetEnv(spv_target_env env) {
|
|
switch (env) {
|
|
case SPV_ENV_UNIVERSAL_1_0:
|
|
case SPV_ENV_VULKAN_1_0:
|
|
case SPV_ENV_OPENCL_1_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_1_2:
|
|
case SPV_ENV_OPENCL_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_0:
|
|
case SPV_ENV_OPENCL_2_1:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_1:
|
|
case SPV_ENV_OPENGL_4_0:
|
|
case SPV_ENV_OPENGL_4_1:
|
|
case SPV_ENV_OPENGL_4_2:
|
|
case SPV_ENV_OPENGL_4_3:
|
|
case SPV_ENV_OPENGL_4_5:
|
|
return SPV_SPIRV_VERSION_WORD(1, 0);
|
|
case SPV_ENV_UNIVERSAL_1_1:
|
|
return SPV_SPIRV_VERSION_WORD(1, 1);
|
|
case SPV_ENV_UNIVERSAL_1_2:
|
|
case SPV_ENV_OPENCL_2_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_2:
|
|
return SPV_SPIRV_VERSION_WORD(1, 2);
|
|
case SPV_ENV_UNIVERSAL_1_3:
|
|
case SPV_ENV_VULKAN_1_1:
|
|
case SPV_ENV_WEBGPU_0:
|
|
return SPV_SPIRV_VERSION_WORD(1, 3);
|
|
case SPV_ENV_UNIVERSAL_1_4:
|
|
case SPV_ENV_VULKAN_1_1_SPIRV_1_4:
|
|
return SPV_SPIRV_VERSION_WORD(1, 4);
|
|
}
|
|
return SPV_SPIRV_VERSION_WORD(0, 0);
|
|
}
|
|
|
|
bool spvParseTargetEnv(const char* s, spv_target_env* env) {
|
|
auto match = [s](const char* b) {
|
|
return s && (0 == strncmp(s, b, strlen(b)));
|
|
};
|
|
if (match("vulkan1.1spv1.4")) {
|
|
if (env) *env = SPV_ENV_VULKAN_1_1_SPIRV_1_4;
|
|
return true;
|
|
} else if (match("vulkan1.0")) {
|
|
if (env) *env = SPV_ENV_VULKAN_1_0;
|
|
return true;
|
|
} else if (match("vulkan1.1")) {
|
|
if (env) *env = SPV_ENV_VULKAN_1_1;
|
|
return true;
|
|
} else if (match("spv1.0")) {
|
|
if (env) *env = SPV_ENV_UNIVERSAL_1_0;
|
|
return true;
|
|
} else if (match("spv1.1")) {
|
|
if (env) *env = SPV_ENV_UNIVERSAL_1_1;
|
|
return true;
|
|
} else if (match("spv1.2")) {
|
|
if (env) *env = SPV_ENV_UNIVERSAL_1_2;
|
|
return true;
|
|
} else if (match("spv1.3")) {
|
|
if (env) *env = SPV_ENV_UNIVERSAL_1_3;
|
|
return true;
|
|
} else if (match("spv1.4")) {
|
|
if (env) *env = SPV_ENV_UNIVERSAL_1_4;
|
|
return true;
|
|
} else if (match("opencl1.2embedded")) {
|
|
if (env) *env = SPV_ENV_OPENCL_EMBEDDED_1_2;
|
|
return true;
|
|
} else if (match("opencl1.2")) {
|
|
if (env) *env = SPV_ENV_OPENCL_1_2;
|
|
return true;
|
|
} else if (match("opencl2.0embedded")) {
|
|
if (env) *env = SPV_ENV_OPENCL_EMBEDDED_2_0;
|
|
return true;
|
|
} else if (match("opencl2.0")) {
|
|
if (env) *env = SPV_ENV_OPENCL_2_0;
|
|
return true;
|
|
} else if (match("opencl2.1embedded")) {
|
|
if (env) *env = SPV_ENV_OPENCL_EMBEDDED_2_1;
|
|
return true;
|
|
} else if (match("opencl2.1")) {
|
|
if (env) *env = SPV_ENV_OPENCL_2_1;
|
|
return true;
|
|
} else if (match("opencl2.2embedded")) {
|
|
if (env) *env = SPV_ENV_OPENCL_EMBEDDED_2_2;
|
|
return true;
|
|
} else if (match("opencl2.2")) {
|
|
if (env) *env = SPV_ENV_OPENCL_2_2;
|
|
return true;
|
|
} else if (match("opengl4.0")) {
|
|
if (env) *env = SPV_ENV_OPENGL_4_0;
|
|
return true;
|
|
} else if (match("opengl4.1")) {
|
|
if (env) *env = SPV_ENV_OPENGL_4_1;
|
|
return true;
|
|
} else if (match("opengl4.2")) {
|
|
if (env) *env = SPV_ENV_OPENGL_4_2;
|
|
return true;
|
|
} else if (match("opengl4.3")) {
|
|
if (env) *env = SPV_ENV_OPENGL_4_3;
|
|
return true;
|
|
} else if (match("opengl4.5")) {
|
|
if (env) *env = SPV_ENV_OPENGL_4_5;
|
|
return true;
|
|
} else if (match("webgpu0")) {
|
|
if (env) *env = SPV_ENV_WEBGPU_0;
|
|
return true;
|
|
} else {
|
|
if (env) *env = SPV_ENV_UNIVERSAL_1_0;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool spvIsVulkanEnv(spv_target_env env) {
|
|
switch (env) {
|
|
case SPV_ENV_UNIVERSAL_1_0:
|
|
case SPV_ENV_OPENCL_1_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_1_2:
|
|
case SPV_ENV_OPENCL_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_0:
|
|
case SPV_ENV_OPENCL_2_1:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_1:
|
|
case SPV_ENV_OPENGL_4_0:
|
|
case SPV_ENV_OPENGL_4_1:
|
|
case SPV_ENV_OPENGL_4_2:
|
|
case SPV_ENV_OPENGL_4_3:
|
|
case SPV_ENV_OPENGL_4_5:
|
|
case SPV_ENV_UNIVERSAL_1_1:
|
|
case SPV_ENV_UNIVERSAL_1_2:
|
|
case SPV_ENV_OPENCL_2_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_2:
|
|
case SPV_ENV_UNIVERSAL_1_3:
|
|
case SPV_ENV_WEBGPU_0:
|
|
case SPV_ENV_UNIVERSAL_1_4:
|
|
return false;
|
|
case SPV_ENV_VULKAN_1_0:
|
|
case SPV_ENV_VULKAN_1_1:
|
|
case SPV_ENV_VULKAN_1_1_SPIRV_1_4:
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool spvIsOpenCLEnv(spv_target_env env) {
|
|
switch (env) {
|
|
case SPV_ENV_UNIVERSAL_1_0:
|
|
case SPV_ENV_VULKAN_1_0:
|
|
case SPV_ENV_UNIVERSAL_1_1:
|
|
case SPV_ENV_OPENGL_4_0:
|
|
case SPV_ENV_OPENGL_4_1:
|
|
case SPV_ENV_OPENGL_4_2:
|
|
case SPV_ENV_OPENGL_4_3:
|
|
case SPV_ENV_OPENGL_4_5:
|
|
case SPV_ENV_UNIVERSAL_1_2:
|
|
case SPV_ENV_UNIVERSAL_1_3:
|
|
case SPV_ENV_VULKAN_1_1:
|
|
case SPV_ENV_WEBGPU_0:
|
|
case SPV_ENV_UNIVERSAL_1_4:
|
|
case SPV_ENV_VULKAN_1_1_SPIRV_1_4:
|
|
return false;
|
|
case SPV_ENV_OPENCL_1_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_1_2:
|
|
case SPV_ENV_OPENCL_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_1:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_2:
|
|
case SPV_ENV_OPENCL_2_1:
|
|
case SPV_ENV_OPENCL_2_2:
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool spvIsWebGPUEnv(spv_target_env env) {
|
|
switch (env) {
|
|
case SPV_ENV_UNIVERSAL_1_0:
|
|
case SPV_ENV_VULKAN_1_0:
|
|
case SPV_ENV_UNIVERSAL_1_1:
|
|
case SPV_ENV_OPENGL_4_0:
|
|
case SPV_ENV_OPENGL_4_1:
|
|
case SPV_ENV_OPENGL_4_2:
|
|
case SPV_ENV_OPENGL_4_3:
|
|
case SPV_ENV_OPENGL_4_5:
|
|
case SPV_ENV_UNIVERSAL_1_2:
|
|
case SPV_ENV_UNIVERSAL_1_3:
|
|
case SPV_ENV_VULKAN_1_1:
|
|
case SPV_ENV_OPENCL_1_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_1_2:
|
|
case SPV_ENV_OPENCL_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_1:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_2:
|
|
case SPV_ENV_OPENCL_2_1:
|
|
case SPV_ENV_OPENCL_2_2:
|
|
case SPV_ENV_UNIVERSAL_1_4:
|
|
case SPV_ENV_VULKAN_1_1_SPIRV_1_4:
|
|
return false;
|
|
case SPV_ENV_WEBGPU_0:
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool spvIsVulkanOrWebGPUEnv(spv_target_env env) {
|
|
return spvIsVulkanEnv(env) || spvIsWebGPUEnv(env);
|
|
}
|
|
|
|
std::string spvLogStringForEnv(spv_target_env env) {
|
|
switch (env) {
|
|
case SPV_ENV_OPENCL_1_2:
|
|
case SPV_ENV_OPENCL_2_0:
|
|
case SPV_ENV_OPENCL_2_1:
|
|
case SPV_ENV_OPENCL_2_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_1_2:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_0:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_1:
|
|
case SPV_ENV_OPENCL_EMBEDDED_2_2: {
|
|
return "OpenCL";
|
|
}
|
|
case SPV_ENV_OPENGL_4_0:
|
|
case SPV_ENV_OPENGL_4_1:
|
|
case SPV_ENV_OPENGL_4_2:
|
|
case SPV_ENV_OPENGL_4_3:
|
|
case SPV_ENV_OPENGL_4_5: {
|
|
return "OpenGL";
|
|
}
|
|
case SPV_ENV_VULKAN_1_0:
|
|
case SPV_ENV_VULKAN_1_1:
|
|
case SPV_ENV_VULKAN_1_1_SPIRV_1_4: {
|
|
return "Vulkan";
|
|
}
|
|
case SPV_ENV_WEBGPU_0: {
|
|
return "WebGPU";
|
|
}
|
|
case SPV_ENV_UNIVERSAL_1_0:
|
|
case SPV_ENV_UNIVERSAL_1_1:
|
|
case SPV_ENV_UNIVERSAL_1_2:
|
|
case SPV_ENV_UNIVERSAL_1_3:
|
|
case SPV_ENV_UNIVERSAL_1_4: {
|
|
return "Universal";
|
|
}
|
|
}
|
|
return "Unknown";
|
|
}
|