Support KHR SPIRV Friendly IR for SPV_INTEL_media_block_io

aratajew · igcbot · commit 83cf0dbd2345 · 2021-12-14T13:01:16.000+01:00
This change introduces support for Khronos SPIRV Friendly IR for the following
opcodes:
-SubgroupImageMediaBlockReadINTEL
-SubgroupImageMediaBlockWriteINTEL
diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVInternal.h b/IGC/AdaptorOCL/SPIRV/SPIRVInternal.h
@@ -470,16 +470,10 @@ _SPIRV_OP(OpJointMatrixMadINTEL)
 _SPIRV_OP(OpJointMatrixSUMadINTEL)
 _SPIRV_OP(OpJointMatrixUSMadINTEL)
 _SPIRV_OP(OpJointMatrixUUMadINTEL)
-#undef _SPIRV_OP
-
-#define _SPIRV_OP(x, y) add(Op##y, #x);
 // Intel media_block_io builtins
-_SPIRV_OP(intel_sub_group_media_block_read, SubgroupImageMediaBlockReadINTEL)
-_SPIRV_OP(intel_sub_group_media_block_write, SubgroupImageMediaBlockWriteINTEL)
-#undef _SPIRV_OP
-
+_SPIRV_OP(OpSubgroupImageMediaBlockReadINTEL)
+_SPIRV_OP(OpSubgroupImageMediaBlockWriteINTEL)
 // VME
-#define _SPIRV_OP(x) add(x, #x);
 _SPIRV_OP(OpVmeImageINTEL)
 // Initialization phase functions
 _SPIRV_OP(OpSubgroupAvcImeInitializeINTEL)
diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp b/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp
@@ -4202,7 +4202,9 @@ SPIRVToLLVM::transSPIRVBuiltinFromInst(SPIRVInstruction *BI, BasicBlock *BB) {
        OC != OpImageQuerySamples &&
        OC != OpVmeImageINTEL &&
        OC != OpSampledImage &&
-       OC != OpImageSampleExplicitLod);
+       OC != OpImageSampleExplicitLod &&
+       OC != OpSubgroupImageMediaBlockReadINTEL &&
+       OC != OpSubgroupImageMediaBlockWriteINTEL);
 
   if (convertImageToI64)
   {
@@ -4281,7 +4283,8 @@ SPIRVToLLVM::transSPIRVBuiltinFromInst(SPIRVInstruction *BI, BasicBlock *BB) {
       OC == OpSubgroupBlockReadINTEL ||
       OC == OpSubgroupImageBlockReadINTEL ||
       OC == OpImageRead ||
-      OC == OpImageSampleExplicitLod)
+      OC == OpImageSampleExplicitLod ||
+      OC == OpSubgroupImageMediaBlockReadINTEL)
   {
       hasReturnTypeInTypeList = true;
   }
diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVUtil.cpp b/IGC/AdaptorOCL/SPIRV/SPIRVUtil.cpp
@@ -264,51 +264,7 @@ isFunctionBuiltin(llvm::Function* F) {
 
 std::string
 getSPIRVBuiltinName(Op OC, SPIRVInstruction *BI, std::vector<Type*> ArgTypes, std::string suffix) {
-  std::string name = "";
-  bool hasI32Postfix = false;
-
-  if (OC == OpSubgroupImageMediaBlockReadINTEL || OC == OpSubgroupImageMediaBlockWriteINTEL) {
-    std::stringstream tmpName;
-    SPIRVType *DataTy = nullptr;
-    switch (OC) {
-    case OpSubgroupImageMediaBlockReadINTEL:
-      tmpName << OCLSPIRVBuiltinMap::map(OC);
-      DataTy = BI->getType();
-      hasI32Postfix = true;
-      break;
-    case OpSubgroupImageMediaBlockWriteINTEL:
-      tmpName << OCLSPIRVBuiltinMap::map(OC);
-      DataTy = (*BI->getOperands().rbegin())->getType();
-      hasI32Postfix = true;
-      break;
-    default:
-      tmpName << OCLSPIRVBuiltinMap::map(OC);
-    }
-    if (DataTy) {
-      if (DataTy->getBitWidth() == 8) {
-        tmpName << "_uc";
-      }
-      else if (DataTy->getBitWidth() == 16) {
-        tmpName << "_us";
-      }
-      else if (DataTy->getBitWidth() == 32 && hasI32Postfix) {
-        tmpName << "_ui";
-      }
-      else if (DataTy->getBitWidth() == 64) {
-        tmpName << "_ul";
-      }
-
-      if (DataTy->isTypeVector()) {
-        if (unsigned ComponentCount = DataTy->getVectorComponentCount())
-          tmpName << ComponentCount;
-      }
-    }
-    name = tmpName.str();
-  }
-  else
-  {
-    name = OCLSPIRVBuiltinMap::map(OC);
-  }
+  std::string name = OCLSPIRVBuiltinMap::map(OC);
 
   if (!name.empty()) {
     name = name + suffix;
diff --git a/IGC/BiFModule/Implementation/group.cl b/IGC/BiFModule/Implementation/group.cl
@@ -1929,6 +1929,78 @@ DEF_INTEL_SUB_GROUP_BLOCK_WRITE_IMAGE(ulong4, v4i64, __builtin_IB_simd_media_blo
 DEF_INTEL_SUB_GROUP_BLOCK_WRITE_IMAGE(ulong8, v8i64, __builtin_IB_simd_media_block_write_8_l)
 #endif // cl_intel_subgroups_long
 
+// OpSubgroupImageMediaBlockReadINTEL
+//
+// Reads a block of data from a 2D region of the specified 'Image'.
+
+#define DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(TYPE, TYPE_ABBR)                                                         \
+TYPE SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageMediaBlockReadINTEL, _##TYPE_ABBR##_img2d_ro_v2i32_i32_i32, _R##TYPE)(   \
+    global Img2d_ro* image, int2 coord, int width, int height)                                                              \
+{                                                                                                                           \
+    int id = (int)__builtin_astype(image, global void*);                                                                    \
+    return as_##TYPE(__builtin_IB_media_block_read_u##TYPE(id, coord, width, height));                                      \
+}                                                                                                                           \
+TYPE SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageMediaBlockReadINTEL, _##TYPE_ABBR##_img2d_rw_v2i32_i32_i32, _R##TYPE)(   \
+    global Img2d_rw* image, int2 coord, int width, int height)                                                              \
+{                                                                                                                           \
+    int id = (int)__builtin_astype(image, global void*);                                                                    \
+    return as_##TYPE(__builtin_IB_media_block_read_u##TYPE(id, coord, width, height));                                      \
+}
+
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(char,   i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(char2,  v2i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(char4,  v4i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(char8,  v8i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(char16, v16i8)
+
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(short,   i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(short2,  v2i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(short4,  v4i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(short8,  v8i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(short16, v16i16)
+
+// Integer block reads don't have 16 element version.
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(int,  i32)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(int2, v2i32)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(int4, v4i32)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_READ_IMAGE(int8, v8i32)
+
+// OpSubgroupImageMediaBlockWriteINTEL
+//
+// Writes a block of data into a 2D region of the specified 'Image'.
+
+#define DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(TYPE, TYPE_ABBR)                                                \
+void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageMediaBlockWriteINTEL, _img2d_wo_v2i32_i32_i32_##TYPE_ABBR, )(    \
+    global Img2d_wo* image, int2 coord, int width, int height, TYPE data)                                           \
+{                                                                                                                   \
+    int id = (int)__builtin_astype(image, global void*);                                                            \
+    __builtin_IB_media_block_write_u##TYPE(id, coord, width, height, as_u##TYPE(data));                             \
+}                                                                                                                   \
+void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageMediaBlockWriteINTEL, _img2d_rw_v2i32_i32_i32_##TYPE_ABBR, )(    \
+    global Img2d_rw* image, int2 coord, int width, int height, TYPE data)                                           \
+{                                                                                                                   \
+    int id = (int)__builtin_astype(image, global void*);                                                            \
+    __builtin_IB_media_block_write_u##TYPE(id, coord, width, height, as_u##TYPE(data));                             \
+}
+
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(char,   i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(char2,  v2i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(char4,  v4i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(char8,  v8i8)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(char16, v16i8)
+
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(short,   i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(short2,  v2i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(short4,  v4i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(short8,  v8i16)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(short16, v16i16)
+
+// Integer block writes don't have 16 element version.
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(int,  i32)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(int2, v2i32)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(int4, v4i32)
+DEF_INTEL_SUB_GROUP_MEDIA_BLOCK_WRITE_IMAGE(int8, v8i32)
+
 // Ballot Functions
 
 uint intel_sub_group_ballot(bool p)
diff --git a/IGC/BiFModule/Languages/OpenCL/IBiF_Sub_Groups.cl b/IGC/BiFModule/Languages/OpenCL/IBiF_Sub_Groups.cl
@@ -528,13 +528,6 @@ TYPE##LEN intel_sub_group_media_block_read_##TYPE_POSTFIX##LEN(         \
     int id = (int)__builtin_astype(image, global void*);                \
     return __builtin_IB_media_block_read_##TYPE##LEN(                   \
         id, src_offset, width, height);                                 \
-}                                                                       \
-TYPE##LEN __builtin_spirv_intel_sub_group_media_block_read_             \
-##TYPE_POSTFIX##LEN##_i64_v2i32_i32_i32(                                \
-    ulong image, int2 src_offset, int width, int height)                \
-{                                                                       \
-    return __builtin_IB_media_block_read_##TYPE##LEN(                   \
-        image, src_offset, width, height);                              \
 }
 
 #if SUPPORT_ACCESS_QUAL_OVERLOAD
@@ -565,13 +558,6 @@ void intel_sub_group_media_block_write_##TYPE_POSTFIX##LEN(                 \
     int id = (int)__builtin_astype(image, global void*);                    \
     __builtin_IB_media_block_write_##TYPE##LEN(                             \
         id, src_offset, width, height, pixels);                             \
-}                                                                           \
-void __builtin_spirv_intel_sub_group_media_block_write_                     \
-##TYPE_POSTFIX##LEN##_i64_v2i32_i32_i32_##TYPE_ABBR(                        \
-    ulong image, int2 src_offset, int width, int height, TYPE##LEN pixels)  \
-{                                                                           \
-    __builtin_IB_media_block_write_##TYPE##LEN(                             \
-        image, src_offset, width, height, pixels);                          \
 }
 
 #if SUPPORT_ACCESS_QUAL_OVERLOAD

Original file line number	Diff line number	Diff line change
`@@ -4202,7 +4202,9 @@ SPIRVToLLVM::transSPIRVBuiltinFromInst(SPIRVInstruction BI, BasicBlock BB) {`
`4202`	`4202`	`OC != OpImageQuerySamples &&`
`4203`	`4203`	`OC != OpVmeImageINTEL &&`
`4204`	`4204`	`OC != OpSampledImage &&`
`4205`		`- OC != OpImageSampleExplicitLod);`
	`4205`	`+ OC != OpImageSampleExplicitLod &&`
	`4206`	`+ OC != OpSubgroupImageMediaBlockReadINTEL &&`
	`4207`	`+ OC != OpSubgroupImageMediaBlockWriteINTEL);`
`4206`	`4208`
`4207`	`4209`	`if (convertImageToI64)`
`4208`	`4210`	`{`
`@@ -4281,7 +4283,8 @@ SPIRVToLLVM::transSPIRVBuiltinFromInst(SPIRVInstruction BI, BasicBlock BB) {`
`4281`	`4283`	`OC == OpSubgroupBlockReadINTEL \|\|`
`4282`	`4284`	`OC == OpSubgroupImageBlockReadINTEL \|\|`
`4283`	`4285`	`OC == OpImageRead \|\|`
`4284`		`- OC == OpImageSampleExplicitLod)`
	`4286`	`+ OC == OpImageSampleExplicitLod \|\|`
	`4287`	`+ OC == OpSubgroupImageMediaBlockReadINTEL)`
`4285`	`4288`	`{`
`4286`	`4289`	`hasReturnTypeInTypeList = true;`
`4287`	`4290`	`}`