spirv-val: Add VUID for SPV_EXT_ocp_microscaling_types (KhronosGroup#6779)

closes KhronosGroup#6774

Author: spencer-lunarg

source/val/validate_conversion.cpp

@@ -52,7 +52,7 @@ spv_result_t ValidateVulkanOCPMicroscalingFloatIntConversion(
   if (spvIsVulkanEnv(_.context()->target_env) &&
       _.ContainsOCPMicroscalingType(float_type)) {
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
-           << spvOpcodeString(inst->opcode())
+           << _.VkErrorID(12465) << spvOpcodeString(inst->opcode())
            << " must not consume or produce OCP microscaling types in the "
               "Vulkan environment.";
   }
@@ -355,15 +355,15 @@ spv_result_t ValidateFConvert(ValidationState_t& _, const Instruction* inst,
   if (spvIsVulkanEnv(_.context()->target_env)) {
     if (_.ContainsOCPMicroscalingType(result_type)) {
       return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << spvOpcodeString(opcode)
+             << _.VkErrorID(12466) << spvOpcodeString(opcode)
              << " must not produce OCP microscaling types in the Vulkan "
                 "environment.";
     }
     if (_.ContainsOCPMicroscalingType(input_type) &&
         !IsIEEEOrAlternativeFloatTypeAllowedForOCPMicroscalingFConvert(
             _, result_type)) {
       return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << spvOpcodeString(opcode)
+             << _.VkErrorID(12467) << spvOpcodeString(opcode)
              << " consuming an OCP microscaling type in the Vulkan "
                 "environment must produce IEEE 754, Float8E4M3EXT, "
                 "Float8E5M2EXT, or BFloat16KHR.";
@@ -857,27 +857,31 @@ spv_result_t ValidateBitcastExtract(ValidationState_t& _,
 
   if (!IsNumericScalarOrVectorType(_, result_type)) {
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
+           << _.VkErrorID(12468)
            << "Expected Result Type to be a numerical scalar or vector type: "
            << spvOpcodeString(opcode);
   }
 
   if (spvIsVulkanEnv(_.context()->target_env) &&
       !_.ContainsOCPMicroscalingNonByteType(result_type)) {
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
+           << _.VkErrorID(12468)
            << "Expected Result Type to be a Float4EXT or Float6EXT type in "
               "the Vulkan environment: "
            << spvOpcodeString(opcode);
   }
 
   if (!base_type || !IsNumericScalarOrVectorType(_, base_type)) {
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
+           << _.VkErrorID(12469)
            << "Expected Base to be a numerical scalar or vector type: "
            << spvOpcodeString(opcode);
   }
 
   if (spvIsVulkanEnv(_.context()->target_env) &&
       !_.IsIntScalarType(base_type) && !_.IsIntVectorType(base_type)) {
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
+           << _.VkErrorID(12469)
            << "Expected Base to be an integer scalar or vector type in the "
               "Vulkan environment: "
            << spvOpcodeString(opcode);

source/val/validation_state.cpp

@@ -3521,6 +3521,16 @@ std::string ValidationState_t::VkErrorID(uint32_t id,
       return VUID_WRAP(VUID-StandaloneSpirv-MemorySemantics-13556);
     case 13557:
       return VUID_WRAP(VUID-StandaloneSpirv-MemorySemantics-13557);
+    case 12465:
+      return VUID_WRAP(VUID-StandaloneSpirv-OpConvertFToU-12465);
+    case 12466:
+      return VUID_WRAP(VUID-StandaloneSpirv-OpFConvert-12466);
+    case 12467:
+      return VUID_WRAP(VUID-StandaloneSpirv-OpFConvert-12467);
+    case 12468:
+      return VUID_WRAP(VUID-StandaloneSpirv-Result-12468);
+    case 12469:
+      return VUID_WRAP(VUID-StandaloneSpirv-Base-12469);
     default:
       return "";  // unknown id
   }

test/val/val_conversion_test.cpp

@@ -731,6 +731,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpFConvert-12466"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("FConvert must not produce OCP microscaling types"));
 }
@@ -751,6 +753,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpConvertFToU-12465"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("ConvertFToU must not consume or produce OCP "
                         "microscaling types"));
@@ -772,6 +776,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpConvertFToU-12465"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("ConvertFToS must not consume or produce OCP "
                         "microscaling types"));
@@ -792,6 +798,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpConvertFToU-12465"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("ConvertSToF must not consume or produce OCP "
                         "microscaling types"));
@@ -812,6 +820,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpConvertFToU-12465"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("ConvertUToF must not consume or produce OCP "
                         "microscaling types"));
@@ -901,6 +911,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-Result-12468"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("Expected Result Type to be a Float4EXT or "
                         "Float6EXT type in the Vulkan environment"));
@@ -922,6 +934,8 @@ OpExtension "SPV_EXT_ocp_microscaling_types"
   CompileSuccessfully(GenerateShaderCode(body, extensions, "", types).c_str(),
                       SPV_ENV_VULKAN_1_3);
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-Base-12469"));
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("Expected Base to be an integer scalar or vector type "
                         "in the Vulkan environment"));