dd missing Vulkan 1.4 in validator help, env testing

Fixed: KhronosGroup#5945
dneto0 · Jan 16, 2025 · 73c8080 · 73c8080
1 parent a6107ed
commit 73c8080
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/source/spirv_target_env.cpp b/source/spirv_target_env.cpp
@@ -142,12 +142,14 @@ constexpr auto ordered_universal_envs = std::array<spv_target_env, 7>{
 };
 
 // When a new SPIR-V version is released, update this table.
+// Users see this ordered list when running 'spirv-val --help'. Order
+// matters for readability.
 static_assert(spv::Version == 0x10600);
 inline constexpr std::pair<const char*, spv_target_env> spvTargetEnvNameMap[] =
     {
-        {"vulkan1.1spv1.4", SPV_ENV_VULKAN_1_1_SPIRV_1_4},
         {"vulkan1.0", SPV_ENV_VULKAN_1_0},
         {"vulkan1.1", SPV_ENV_VULKAN_1_1},
+        {"vulkan1.1spv1.4", SPV_ENV_VULKAN_1_1_SPIRV_1_4},
         {"vulkan1.2", SPV_ENV_VULKAN_1_2},
         {"vulkan1.3", SPV_ENV_VULKAN_1_3},
         {"vulkan1.4", SPV_ENV_VULKAN_1_4},

diff --git a/test/target_env_test.cpp b/test/target_env_test.cpp
@@ -79,9 +79,16 @@ INSTANTIATE_TEST_SUITE_P(
         {"spv1.1", true, SPV_ENV_UNIVERSAL_1_1},
         {"spv1.2", true, SPV_ENV_UNIVERSAL_1_2},
         {"spv1.3", true, SPV_ENV_UNIVERSAL_1_3},
+        {"spv1.4", true, SPV_ENV_UNIVERSAL_1_4},
+        {"spv1.5", true, SPV_ENV_UNIVERSAL_1_5},
+        {"spv1.6", true, SPV_ENV_UNIVERSAL_1_6},
+        {"spv1.7", false, SPV_ENV_UNIVERSAL_1_3},
         {"vulkan1.0", true, SPV_ENV_VULKAN_1_0},
         {"vulkan1.1", true, SPV_ENV_VULKAN_1_1},
         {"vulkan1.2", true, SPV_ENV_VULKAN_1_2},
+        {"vulkan1.3", true, SPV_ENV_VULKAN_1_3},
+        {"vulkan1.4", true, SPV_ENV_VULKAN_1_4},
+        {"vulkan1.5", false, SPV_ENV_UNIVERSAL_1_0},
         {"opencl2.1", true, SPV_ENV_OPENCL_2_1},
         {"opencl2.2", true, SPV_ENV_OPENCL_2_2},
         {"opengl4.0", true, SPV_ENV_OPENGL_4_0},

diff --git a/tools/val/val.cpp b/tools/val/val.cpp
@@ -111,7 +111,7 @@ int main(int argc, char** argv) {
         printf("%s\n", spvSoftwareVersionDetailsString());
         printf(
             "Targets:\n  %s\n  %s\n  %s\n  %s\n  %s\n  %s\n  %s\n  %s\n  %s\n  "
-            "%s\n  %s\n  %s\n  %s\n",
+            "%s\n  %s\n  %s\n  %s %s\n",
             spvTargetEnvDescription(SPV_ENV_UNIVERSAL_1_0),
             spvTargetEnvDescription(SPV_ENV_UNIVERSAL_1_1),
             spvTargetEnvDescription(SPV_ENV_UNIVERSAL_1_2),
@@ -124,7 +124,8 @@ int main(int argc, char** argv) {
             spvTargetEnvDescription(SPV_ENV_VULKAN_1_1),
             spvTargetEnvDescription(SPV_ENV_VULKAN_1_1_SPIRV_1_4),
             spvTargetEnvDescription(SPV_ENV_VULKAN_1_2),
-            spvTargetEnvDescription(SPV_ENV_VULKAN_1_3));
+            spvTargetEnvDescription(SPV_ENV_VULKAN_1_3),
+            spvTargetEnvDescription(SPV_ENV_VULKAN_1_4));
         continue_processing = false;
         return_code = 0;
       } else if (0 == strcmp(cur_arg, "--help") || 0 == strcmp(cur_arg, "-h")) {