[val] Allow Generic casts to/from CodeSectionINTEL storage class (KhronosGroup#6787)

resolves KhronosGroup#6700

Author: aobolensk

source/val/validate_conversion.cpp

@@ -611,10 +611,12 @@ spv_result_t ValidatePtrCastToGeneric(ValidationState_t& _,
 
   if (input_storage_class != spv::StorageClass::Workgroup &&
       input_storage_class != spv::StorageClass::CrossWorkgroup &&
-      input_storage_class != spv::StorageClass::Function)
+      input_storage_class != spv::StorageClass::Function &&
+      input_storage_class != spv::StorageClass::CodeSectionINTEL)
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
            << "Expected input to have storage class Workgroup, "
-           << "CrossWorkgroup or Function: " << spvOpcodeString(opcode);
+           << "CrossWorkgroup, Function or CodeSectionINTEL: "
+           << spvOpcodeString(opcode);
 
   if (result_data_type != input_data_type)
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
@@ -638,10 +640,12 @@ spv_result_t ValidateGenericCastToPtr(ValidationState_t& _,
 
   if (result_storage_class != spv::StorageClass::Workgroup &&
       result_storage_class != spv::StorageClass::CrossWorkgroup &&
-      result_storage_class != spv::StorageClass::Function)
+      result_storage_class != spv::StorageClass::Function &&
+      result_storage_class != spv::StorageClass::CodeSectionINTEL)
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
            << "Expected Result Type to have storage class Workgroup, "
-           << "CrossWorkgroup or Function: " << spvOpcodeString(opcode);
+           << "CrossWorkgroup, Function or CodeSectionINTEL: "
+           << spvOpcodeString(opcode);
 
   const uint32_t input_type = _.GetOperandTypeId(inst, operand_index);
   spv::StorageClass input_storage_class;
@@ -699,10 +703,12 @@ spv_result_t ValidateGenericCastToPtrExplicit(ValidationState_t& _,
 
   if (target_storage_class != spv::StorageClass::Workgroup &&
       target_storage_class != spv::StorageClass::CrossWorkgroup &&
-      target_storage_class != spv::StorageClass::Function)
+      target_storage_class != spv::StorageClass::Function &&
+      target_storage_class != spv::StorageClass::CodeSectionINTEL)
     return _.diag(SPV_ERROR_INVALID_DATA, inst)
            << "Expected target storage class to be Workgroup, "
-           << "CrossWorkgroup or Function: " << spvOpcodeString(opcode);
+           << "CrossWorkgroup, Function or CodeSectionINTEL: "
+           << spvOpcodeString(opcode);
   return SPV_SUCCESS;
 }
 

test/val/val_conversion_test.cpp

@@ -1237,7 +1237,8 @@ TEST_F(ValidateConversion, PtrCastToGenericWrongInputStorageClass) {
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions());
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("Expected input to have storage class Workgroup, "
-                        "CrossWorkgroup or Function: PtrCastToGeneric"));
+                        "CrossWorkgroup, Function or CodeSectionINTEL: "
+                        "PtrCastToGeneric"));
 }
 
 TEST_F(ValidateConversion, PtrCastToGenericPointToDifferentType) {
@@ -1254,6 +1255,36 @@ TEST_F(ValidateConversion, PtrCastToGenericPointToDifferentType) {
                 "PtrCastToGeneric"));
 }
 
+TEST_F(ValidateConversion, PtrCastToGenericFromCodeSectionINTELSuccess) {
+  const std::string spirv = R"(
+OpCapability Kernel
+OpCapability Addresses
+OpCapability FunctionPointersINTEL
+OpCapability GenericPointer
+OpCapability Int8
+OpCapability Linkage
+OpExtension "SPV_INTEL_function_pointers"
+OpMemoryModel Physical64 OpenCL
+OpName %fn "fn"
+OpDecorate %fn LinkageAttributes "fn" Export
+%u8 = OpTypeInt 8 0
+%code_ptr = OpTypePointer CodeSectionINTEL %u8
+%void = OpTypeVoid
+%fn_type = OpTypeFunction %void %code_ptr
+%gen_ptr = OpTypePointer Generic %u8
+%u8_0 = OpConstantNull %u8
+%fn = OpFunction %void None %fn_type
+%param = OpFunctionParameter %code_ptr
+%entry = OpLabel
+%gen = OpPtrCastToGeneric %gen_ptr %param
+OpStore %gen %u8_0 Aligned 1
+OpReturn
+OpFunctionEnd
+)";
+  CompileSuccessfully(spirv.c_str());
+  ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
 TEST_F(ValidateConversion, GenericCastToPtrSuccess) {
   const std::string body = R"(
 %ptr_func = OpVariable %f32ptr_func Function
@@ -1292,7 +1323,8 @@ TEST_F(ValidateConversion, GenericCastToPtrWrongResultStorageClass) {
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions());
   EXPECT_THAT(getDiagnosticString(),
               HasSubstr("Expected Result Type to have storage class Workgroup, "
-                        "CrossWorkgroup or Function: GenericCastToPtr"));
+                        "CrossWorkgroup, Function or CodeSectionINTEL: "
+                        "GenericCastToPtr"));
 }
 
 TEST_F(ValidateConversion, GenericCastToPtrWrongInputType) {
@@ -1336,6 +1368,36 @@ TEST_F(ValidateConversion, GenericCastToPtrPointToDifferentType) {
                 "GenericCastToPtr"));
 }
 
+TEST_F(ValidateConversion, GenericCastToPtrToCodeSectionINTELSuccess) {
+  const std::string spirv = R"(
+OpCapability Kernel
+OpCapability Addresses
+OpCapability FunctionPointersINTEL
+OpCapability GenericPointer
+OpCapability Int8
+OpCapability Linkage
+OpExtension "SPV_INTEL_function_pointers"
+OpMemoryModel Physical64 OpenCL
+OpName %fn "fn"
+OpDecorate %fn LinkageAttributes "fn" Export
+%u8 = OpTypeInt 8 0
+%code_ptr = OpTypePointer CodeSectionINTEL %u8
+%void = OpTypeVoid
+%fn_type = OpTypeFunction %void %code_ptr
+%gen_ptr = OpTypePointer Generic %u8
+%u8_0 = OpConstantNull %u8
+%fn = OpFunction %void None %fn_type
+%param = OpFunctionParameter %code_ptr
+%entry = OpLabel
+%gen = OpPtrCastToGeneric %gen_ptr %param
+%code = OpGenericCastToPtr %code_ptr %gen
+OpReturn
+OpFunctionEnd
+)";
+  CompileSuccessfully(spirv.c_str());
+  ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
 TEST_F(ValidateConversion, GenericCastToPtrExplicitSuccess) {
   const std::string body = R"(
 %ptr_func = OpVariable %f32ptr_func Function
@@ -1387,10 +1449,10 @@ TEST_F(ValidateConversion, GenericCastToPtrExplicitWrongResultStorageClass) {
 
   CompileSuccessfully(GenerateKernelCode(body).c_str());
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions());
-  EXPECT_THAT(
-      getDiagnosticString(),
-      HasSubstr("Expected target storage class to be Workgroup, "
-                "CrossWorkgroup or Function: GenericCastToPtrExplicit"));
+  EXPECT_THAT(getDiagnosticString(),
+              HasSubstr("Expected target storage class to be Workgroup, "
+                        "CrossWorkgroup, Function or CodeSectionINTEL: "
+                        "GenericCastToPtrExplicit"));
 }
 
 TEST_F(ValidateConversion, GenericCastToPtrExplicitWrongInputType) {
@@ -1435,6 +1497,35 @@ TEST_F(ValidateConversion, GenericCastToPtrExplicitPointToDifferentType) {
                 "GenericCastToPtrExplicit"));
 }
 
+TEST_F(ValidateConversion, GenericCastToPtrExplicitToCodeSectionINTELSuccess) {
+  const std::string spirv = R"(
+OpCapability Kernel
+OpCapability Addresses
+OpCapability FunctionPointersINTEL
+OpCapability GenericPointer
+OpCapability Int8
+OpCapability Linkage
+OpExtension "SPV_INTEL_function_pointers"
+OpMemoryModel Physical64 OpenCL
+OpName %fn "fn"
+OpDecorate %fn LinkageAttributes "fn" Export
+%u8 = OpTypeInt 8 0
+%code_ptr = OpTypePointer CodeSectionINTEL %u8
+%void = OpTypeVoid
+%fn_type = OpTypeFunction %void %code_ptr
+%gen_ptr = OpTypePointer Generic %u8
+%fn = OpFunction %void None %fn_type
+%param = OpFunctionParameter %code_ptr
+%entry = OpLabel
+%gen = OpPtrCastToGeneric %gen_ptr %param
+%code = OpGenericCastToPtrExplicit %code_ptr %gen CodeSectionINTEL
+OpReturn
+OpFunctionEnd
+)";
+  CompileSuccessfully(spirv.c_str());
+  ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
 TEST_F(ValidateConversion, CoopMatConversionSuccess) {
   const std::string body =
       R"(