Skip to content

Commit 44160a1

Browse files
kealan-barbierikealan-barbieri
committed
xe: ocl: cleanup type macros
1 parent 94f13af commit 44160a1

File tree

1 file changed

+0
-82
lines changed

1 file changed

+0
-82
lines changed

‎src/gpu/intel/ocl/ocl_types.h

-82
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@
163163
#define AS_DATA4_T as_float4
164164
#define AS_DATA8_T as_float8
165165

166-
#define AS_UINT_T as_uint
167-
#define AS_UINT2_T as_uint2
168-
#define AS_UINT4_T as_uint4
169-
#define AS_UINT8_T as_uint8
170-
171166
#define BLOCK_DATA_T uint
172167
#define BLOCK_DATA2_T uint2
173168
#define BLOCK_DATA4_T uint4
@@ -286,11 +281,6 @@
286281
#define AS_DATA4_T as_half4
287282
#define AS_DATA8_T as_half8
288283

289-
#define AS_UINT_T as_ushort
290-
#define AS_UINT2_T as_ushort2
291-
#define AS_UINT4_T as_ushort4
292-
#define AS_UINT8_T as_ushort8
293-
294284
#define BLOCK_DATA_T ushort
295285
#define BLOCK_DATA2_T ushort2
296286
#define BLOCK_DATA4_T ushort4
@@ -347,11 +337,6 @@
347337
#define AS_DATA4_T as_ushort4
348338
#define AS_DATA8_T as_ushort8
349339

350-
#define AS_UINT_T as_ushort
351-
#define AS_UINT2_T as_ushort2
352-
#define AS_UINT4_T as_ushort4
353-
#define AS_UINT8_T as_ushort8
354-
355340
#define BLOCK_DATA_T ushort
356341
#define BLOCK_DATA2_T ushort2
357342
#define BLOCK_DATA4_T ushort4
@@ -408,12 +393,6 @@
408393
#define AS_DATA8_T as_uchar8
409394
#define AS_DATA16_T as_uchar16
410395

411-
#define AS_UINT_T as_uchar
412-
#define AS_UINT2_T as_uchar2
413-
#define AS_UINT4_T as_uchar4
414-
#define AS_UINT8_T as_uchar8
415-
#define AS_INT8_T as_uint8
416-
417396
#define BLOCK_DATA_T uchar
418397
#define BLOCK_DATA2_T uchar2
419398
#define BLOCK_DATA4_T uchar4
@@ -476,12 +455,6 @@
476455
#define AS_DATA8_T as_uchar8
477456
#define AS_DATA16_T as_uchar16
478457

479-
#define AS_UINT_T as_uchar
480-
#define AS_UINT2_T as_uchar2
481-
#define AS_UINT4_T as_uchar4
482-
#define AS_UINT8_T as_uchar8
483-
#define AS_INT8_T as_uint8
484-
485458
#define BLOCK_DATA_T uchar
486459
#define BLOCK_DATA2_T uchar2
487460
#define BLOCK_DATA4_T uchar4
@@ -607,12 +580,6 @@
607580
#define AS_DATA8_T as_char8
608581
#define AS_DATA16_T as_char16
609582

610-
#define AS_UINT_T as_uchar
611-
#define AS_UINT2_T as_uchar2
612-
#define AS_UINT4_T as_uchar4
613-
#define AS_UINT8_T as_uchar8
614-
#define AS_INT8_T as_int8
615-
616583
#define BLOCK_DATA_T uchar
617584
#define BLOCK_DATA2_T uchar2
618585
#define BLOCK_DATA4_T uchar4
@@ -670,12 +637,6 @@
670637
#define AS_DATA8_T as_uchar8
671638
#define AS_DATA16_T as_uchar16
672639

673-
#define AS_UINT_T as_uchar
674-
#define AS_UINT2_T as_uchar2
675-
#define AS_UINT4_T as_uchar4
676-
#define AS_UINT8_T as_uchar8
677-
#define AS_INT8_T as_uint8
678-
679640
#define BLOCK_DATA_T uchar
680641
#define BLOCK_DATA2_T uchar2
681642
#define BLOCK_DATA4_T uchar4
@@ -736,11 +697,6 @@
736697
#define AS_DATA4_T as_int4
737698
#define AS_DATA8_T as_int8
738699

739-
#define AS_UINT_T as_uint
740-
#define AS_UINT2_T as_uint2
741-
#define AS_UINT4_T as_uint4
742-
#define AS_UINT8_T as_uint8
743-
744700
#define BLOCK_DATA_T uint
745701
#define BLOCK_DATA2_T uint2
746702
#define BLOCK_DATA4_T uint4
@@ -941,7 +897,6 @@
941897
#endif
942898

943899
#ifdef A_DATA_T
944-
#define A_DATA8_T CONCAT2(A_DATA_T, 8)
945900
#if A_DT_BF16
946901
#define A_TO_REF(x) cvt_bf16_to_f32(x)
947902
#define A_TO_REF8(x) cvt_bf16_to_f32(x)
@@ -1232,40 +1187,25 @@
12321187
#define BLOCK_WRITE_DST4(ptr, v) \
12331188
intel_sub_group_block_write_uc4((__global uchar *)ptr, as_uchar4(v))
12341189

1235-
#define BLOCK_READ_DST8(ptr) \
1236-
AS_DST_DATA8_T(intel_sub_group_block_read_uc8((__global uchar *)ptr))
12371190
#define BLOCK_WRITE_DST8(ptr, v) \
12381191
intel_sub_group_block_write_uc8((__global uchar *)ptr, as_uchar8(v))
12391192

1240-
#define BLOCK_READ_DST16(ptr) \
1241-
AS_DST_DATA16_T(intel_sub_group_block_read_uc16((__global uchar *)ptr))
12421193
#define BLOCK_WRITE_DST16(ptr, v) \
12431194
intel_sub_group_block_write_uc16((__global uchar *)ptr, as_uchar16(v))
12441195

12451196
#elif DST_DT_F16 || DST_DT_BF16
1246-
#define BLOCK_READ_DST(ptr) \
1247-
AS_DST_DATA_T(intel_sub_group_block_read_us((__global ushort *)ptr))
12481197
#define BLOCK_WRITE_DST(ptr, v) \
12491198
intel_sub_group_block_write_us((__global ushort *)ptr, as_ushort(v))
12501199

1251-
#define BLOCK_READ_DST2(ptr) \
1252-
AS_DST_DATA2_T(intel_sub_group_block_read_us2((__global ushort *)ptr))
12531200
#define BLOCK_WRITE_DST2(ptr, v) \
12541201
intel_sub_group_block_write_us2((__global ushort *)ptr, as_ushort2(v))
12551202

1256-
#define BLOCK_READ_DST4(ptr) \
1257-
AS_DST_DATA4_T(intel_sub_group_block_read_us4((__global ushort *)ptr))
12581203
#define BLOCK_WRITE_DST4(ptr, v) \
12591204
intel_sub_group_block_write_us4((__global ushort *)ptr, as_ushort4(v))
12601205

1261-
#define BLOCK_READ_DST8(ptr) \
1262-
AS_DST_DATA8_T(intel_sub_group_block_read_us8((__global ushort *)ptr))
12631206
#define BLOCK_WRITE_DST8(ptr, v) \
12641207
intel_sub_group_block_write_us8((__global ushort *)ptr, as_ushort8(v))
12651208

1266-
#define BLOCK_READ_DST16(ptr) \
1267-
(DST_DATA16_T)( \
1268-
BLOCK_READ_DST8(ptr), BLOCK_READ_DST8(ptr + 8 * SUB_GROUP_SIZE))
12691209
#define BLOCK_WRITE_DST16(ptr, v) \
12701210
do { \
12711211
BLOCK_WRITE_DST8(ptr, (v).s01234567); \
@@ -1274,29 +1214,18 @@
12741214

12751215
#elif DST_DT_S32 || DST_DT_F32
12761216

1277-
#define BLOCK_READ_DST(ptr) \
1278-
AS_DST_DATA_T(intel_sub_group_block_read((__global uint *)ptr))
12791217
#define BLOCK_WRITE_DST(ptr, v) \
12801218
intel_sub_group_block_write((__global uint *)ptr, as_uint(v))
12811219

1282-
#define BLOCK_READ_DST2(ptr) \
1283-
AS_DST_DATA2_T(intel_sub_group_block_read2((__global uint *)ptr))
12841220
#define BLOCK_WRITE_DST2(ptr, v) \
12851221
intel_sub_group_block_write2((__global uint *)ptr, as_uint2(v))
12861222

1287-
#define BLOCK_READ_DST4(ptr) \
1288-
AS_DST_DATA4_T(intel_sub_group_block_read4((__global uint *)ptr))
12891223
#define BLOCK_WRITE_DST4(ptr, v) \
12901224
intel_sub_group_block_write4((__global uint *)ptr, as_uint4(v))
12911225

1292-
#define BLOCK_READ_DST8(ptr) \
1293-
AS_DST_DATA8_T(intel_sub_group_block_read8((__global uint *)ptr))
12941226
#define BLOCK_WRITE_DST8(ptr, v) \
12951227
intel_sub_group_block_write8((__global uint *)ptr, as_uint8(v))
12961228

1297-
#define BLOCK_READ_DST16(ptr) \
1298-
(DST_DATA16_T)( \
1299-
BLOCK_READ_DST8(ptr), BLOCK_READ_DST8(ptr + 8 * SUB_GROUP_SIZE))
13001229
#define BLOCK_WRITE_DST16(ptr, v) \
13011230
do { \
13021231
BLOCK_WRITE_DST8(ptr, (v).s01234567); \
@@ -1305,29 +1234,18 @@
13051234

13061235
#elif DST_DT_F16 || DST_DT_BF16
13071236

1308-
#define BLOCK_READ_DST(ptr) \
1309-
AS_DST_DATA_T(intel_sub_group_block_read_us((__global ushort *)ptr))
13101237
#define BLOCK_WRITE_DST(ptr, v) \
13111238
intel_sub_group_block_write_us((__global ushort *)ptr, as_ushort(v))
13121239

1313-
#define BLOCK_READ_DST2(ptr) \
1314-
AS_DST_DATA2_T(intel_sub_group_block_read_us2((__global ushort *)ptr))
13151240
#define BLOCK_WRITE_DST2(ptr, v) \
13161241
intel_sub_group_block_write_us2((__global ushort *)ptr, as_short2(v))
13171242

1318-
#define BLOCK_READ_DST4(ptr) \
1319-
AS_DST_DATA4_T(intel_sub_group_block_read_us4((__global ushort *)ptr))
13201243
#define BLOCK_WRITE_DST4(ptr, v) \
13211244
intel_sub_group_block_write_us4((__global ushort *)ptr, as_ushort4(v))
13221245

1323-
#define BLOCK_READ_DST8(ptr) \
1324-
AS_DST_DATA8_T(intel_sub_group_block_read_us8((__global ushort *)ptr))
13251246
#define BLOCK_WRITE_DST8(ptr, v) \
13261247
intel_sub_group_block_write_us8((__global ushort *)ptr, as_ushort8(v))
13271248

1328-
#define BLOCK_READ_DST16(ptr) \
1329-
(DST_DATA16_T)( \
1330-
BLOCK_READ_DST8(ptr), BLOCK_READ_DST8(ptr + 8 * SUB_GROUP_SIZE))
13311249
#define BLOCK_WRITE_DST16(ptr, v) \
13321250
do { \
13331251
BLOCK_WRITE_DST8(ptr, (v).s01234567); \

0 commit comments

Comments
 (0)