Extend cl_intel_subgroup_2d_block_io extension with more variants

This change implements support for the following builtins:
```c
intel_sub_group_2d_block_read_8b_16r16x4c
intel_sub_group_2d_block_read_8b_32r16x4c

intel_sub_group_2d_block_prefetch_8b_16r16x4c
```

Author: aratajew

IGC/BiFModule/Implementation/IGCBiF_Intrinsics_Lsc.cl

@@ -496,6 +496,8 @@ void __builtin_IB_subgroup_block_write_cacheopts_u16_m8k16v1(long base_address,
 #ifdef cl_intel_subgroup_2d_block_io
 
 typedef uchar uchar32 __attribute__((ext_vector_type(32)));
+typedef uchar uchar64 __attribute__((ext_vector_type(64)));
+typedef uchar uchar128 __attribute__((ext_vector_type(128)));
 
 typedef ushort ushort32 __attribute__((ext_vector_type(32)));
 typedef ushort ushort64 __attribute__((ext_vector_type(64)));
@@ -507,6 +509,8 @@ ushort32  __builtin_IB_subgroup_block_read_cacheopts_u8_m16k32v2(long baseoffset
 ushort64  __builtin_IB_subgroup_block_read_cacheopts_u8_m32k32v2(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
 
 uchar32  __builtin_IB_subgroup_block_read_cacheopts_u8_m8k16v4(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
+uchar64  __builtin_IB_subgroup_block_read_cacheopts_u8_m16k16v4(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
+uchar128  __builtin_IB_subgroup_block_read_cacheopts_u8_m32k16v4(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
 
 ushort32  __builtin_IB_subgroup_block_read_cacheopts_u16_m16k16v2(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
 ushort64  __builtin_IB_subgroup_block_read_cacheopts_u16_m32k16v2(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
@@ -515,6 +519,7 @@ void  __builtin_IB_subgroup_block_read_prefetch_u8_m16k32v2(long baseoffset, int
 void  __builtin_IB_subgroup_block_read_prefetch_u8_m32k32v2(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
 
 void  __builtin_IB_subgroup_block_read_prefetch_u8_m8k16v4(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
+void  __builtin_IB_subgroup_block_read_prefetch_u8_m16k16v4(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
 
 void  __builtin_IB_subgroup_block_read_prefetch_u16_m16k16v2(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);
 void  __builtin_IB_subgroup_block_read_prefetch_u16_m32k16v2(long baseoffset, int width_minus_one, int height_minus_one, int pitch_minus_one, int2 coord, enum LSC_LDCC cacheOpt);

IGC/BiFModule/Languages/OpenCL/IBiF_Sub_Groups.cl

@@ -1049,7 +1049,9 @@ DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_32r32x1c,
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_16r32x2c,             ushort,  ushort32,  __builtin_IB_subgroup_block_read_cacheopts_u8_m16k32v2)
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_32r32x2c,             ushort,  ushort64,  __builtin_IB_subgroup_block_read_cacheopts_u8_m32k32v2)
 
-DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_8r16x4c,              uchar, uchar32, __builtin_IB_subgroup_block_read_cacheopts_u8_m8k16v4)
+DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_8r16x4c,              uchar, uchar32,  __builtin_IB_subgroup_block_read_cacheopts_u8_m8k16v4)
+DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_16r16x4c,             uchar, uchar64,  __builtin_IB_subgroup_block_read_cacheopts_u8_m16k16v4)
+DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_8b_32r16x4c,             uchar, uchar128, __builtin_IB_subgroup_block_read_cacheopts_u8_m32k16v4)
 
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_16b_16r16x2c,             ushort,  ushort32,  __builtin_IB_subgroup_block_read_cacheopts_u16_m16k16v2)
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_READ(intel_sub_group_2d_block_read_16b_32r16x2c,             ushort,  ushort64,  __builtin_IB_subgroup_block_read_cacheopts_u16_m32k16v2)
@@ -1126,6 +1128,7 @@ DEFN_INTEL_SUB_GROUP_2D_BLOCK_PREFETCH(intel_sub_group_2d_block_prefetch_8b_16r3
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_PREFETCH(intel_sub_group_2d_block_prefetch_8b_32r32x2c,   __builtin_IB_subgroup_block_read_prefetch_u8_m32k32v2)
 
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_PREFETCH(intel_sub_group_2d_block_prefetch_8b_8r16x4c,    __builtin_IB_subgroup_block_read_prefetch_u8_m8k16v4)
+DEFN_INTEL_SUB_GROUP_2D_BLOCK_PREFETCH(intel_sub_group_2d_block_prefetch_8b_16r16x4c,   __builtin_IB_subgroup_block_read_prefetch_u8_m16k16v4)
 
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_PREFETCH(intel_sub_group_2d_block_prefetch_16b_16r16x2c,  __builtin_IB_subgroup_block_read_prefetch_u16_m16k16v2)
 DEFN_INTEL_SUB_GROUP_2D_BLOCK_PREFETCH(intel_sub_group_2d_block_prefetch_16b_32r16x2c,  __builtin_IB_subgroup_block_read_prefetch_u16_m32k16v2)

IGC/BiFModule/Languages/OpenCL/PreRelease/opencl_cth_pre_release.h

@@ -2676,8 +2676,11 @@ void __attribute__((overloadable)) intel_sub_group_2d_block_prefetch_8b_32r32x2c
 // 2D Block Load / Prefetch, 8-bit data, Rows in [1*, 2*, 4*, 8, 16*, 32*], Columns in [16x4]:
 
 void __attribute__((overloadable)) intel_sub_group_2d_block_read_8b_8r16x4c(__global void* base_address, int width, int height, int pitch, int2 coord, __private uchar* destination);
+void __attribute__((overloadable)) intel_sub_group_2d_block_read_8b_16r16x4c(__global void* base_address, int width, int height, int pitch, int2 coord, __private uchar* destination);
+void __attribute__((overloadable)) intel_sub_group_2d_block_read_8b_32r16x4c(__global void* base_address, int width, int height, int pitch, int2 coord, __private uchar* destination);
 
 void __attribute__((overloadable)) intel_sub_group_2d_block_prefetch_8b_8r16x4c(__global void* base_address, int width, int height, int pitch, int2 coord);
+void __attribute__((overloadable)) intel_sub_group_2d_block_prefetch_8b_16r16x4c(__global void* base_address, int width, int height, int pitch, int2 coord);
 
 ////////////////////////////////////////////////////////////////
 

IGC/ocloc_tests/Builtins/cl_intel_subgroup_2d_block_io/PVC/block_reads.cl

@@ -50,6 +50,18 @@ SPDX-License-Identifier: MIT
 
 // CHECK-VISAASM-8B-8R-16X4C: lsc_load_block2d.ugm (M1, 1)  V{{[0-9]+}}:d8.4x16x8nn  flat[{{.+}},0x1FF,0x2D,0x1FF,V{{[0-9]+}},V{{[0-9]+}}
 
+// RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1' \
+// RUN: -DINPUT_TYPE=uchar -DOUTPUT_TYPE=uchar -DFUNCTION=intel_sub_group_2d_block_read_8b_16r16x4c -DDST_ARRAY_EL_TYPE=uchar -DDST_ARRAY_EL_NUM=64" \
+// RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_2d_block_io" | FileCheck %s --check-prefix=CHECK-VISAASM-8B-16R-16X4C
+
+// CHECK-VISAASM-8B-16R-16X4C: lsc_load_block2d.ugm (M1, 1)  V{{[0-9]+}}:d8.4x16x16nn  flat[{{.+}},0x1FF,0x2D,0x1FF,V{{[0-9]+}},V{{[0-9]+}}
+
+// RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1' \
+// RUN: -DINPUT_TYPE=uchar -DOUTPUT_TYPE=uchar -DFUNCTION=intel_sub_group_2d_block_read_8b_32r16x4c -DDST_ARRAY_EL_TYPE=uchar -DDST_ARRAY_EL_NUM=128" \
+// RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_2d_block_io" | FileCheck %s --check-prefix=CHECK-VISAASM-8B-32R-16X4C
+
+// CHECK-VISAASM-8B-32R-16X4C: lsc_load_block2d.ugm (M1, 1)  V{{[0-9]+}}:d8.4x16x32nn  flat[{{.+}},0x1FF,0x2D,0x1FF,V{{[0-9]+}},V{{[0-9]+}}
+
 // RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1' \
 // RUN: -DINPUT_TYPE=ushort -DOUTPUT_TYPE=ushort -DFUNCTION=intel_sub_group_2d_block_read_16b_1r16x1c -DDST_ARRAY_EL_TYPE=ushort -DDST_ARRAY_EL_NUM=1" \
 // RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_2d_block_io" | FileCheck %s --check-prefix=CHECK-VISAASM-16B-1R-16X1C

IGC/ocloc_tests/Builtins/cl_intel_subgroup_2d_block_io/PVC/prefetches.cl

@@ -45,11 +45,17 @@ SPDX-License-Identifier: MIT
 // CHECK-VISAASM-8B-32R-32X2C: lsc_load_block2d.ugm (M1, 1)  %null:d8.64x32nn  flat[{{.+}},0x1FF,0x2D,0x1FF,V{{[0-9]+}},V{{[0-9]+}}
 
 // RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1' \
-// RUN: -DINPUT_TYPE=uint -DFUNCTION=intel_sub_group_2d_block_prefetch_8b_8r16x4c" \
+// RUN: -DINPUT_TYPE=uchar -DFUNCTION=intel_sub_group_2d_block_prefetch_8b_8r16x4c" \
 // RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_2d_block_io" | FileCheck %s --check-prefix=CHECK-VISAASM-8B-8R-16X4C
 
 // CHECK-VISAASM-8B-8R-16X4C: lsc_load_block2d.ugm (M1, 1)  %null:d8.64x8nn  flat[{{.+}},0x1FF,0x2D,0x1FF,V{{[0-9]+}},V{{[0-9]+}}
 
+// RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1' \
+// RUN: -DINPUT_TYPE=uchar -DFUNCTION=intel_sub_group_2d_block_prefetch_8b_16r16x4c" \
+// RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_2d_block_io" | FileCheck %s --check-prefix=CHECK-VISAASM-8B-16R-16X4C
+
+// CHECK-VISAASM-8B-16R-16X4C: lsc_load_block2d.ugm (M1, 1)  %null:d8.64x16nn  flat[{{.+}},0x1FF,0x2D,0x1FF,V{{[0-9]+}},V{{[0-9]+}}
+
 // RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1' \
 // RUN: -DINPUT_TYPE=ushort -DFUNCTION=intel_sub_group_2d_block_prefetch_16b_1r16x1c" \
 // RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_2d_block_io" | FileCheck %s --check-prefix=CHECK-VISAASM-16B-1R-16X1C