Skip to content

Commit 600dbce

Browse files
jgu222igcbot
authored andcommitted
Rename d16c32 to d16u32
As the specification uses d8u32/d16u32, change visaasm type d8c32 to d8u32 and d16c32 to d16u32.
1 parent cf6e91f commit 600dbce

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

IGC/Compiler/tests/EmitVISAPass/predicated-load-subdw.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ entry:
2424

2525
; copy merge value. do predicated load, copy result
2626
; CHECK: mov (M1_NM, 1) [[G_ALIAS0]](0,0)<0> 0x0:b
27-
; CHECK: (P1) lsc_load.ugm (M1_NM, 1) [[GATHER0]]:d8c32 flat[
27+
; CHECK: (P1) lsc_load.ugm (M1_NM, 1) [[GATHER0]]:d8u32 flat[
2828
; CHECK: mov (M1_NM, 1) res0(0,0)<1> [[G_ALIAS0]](0,0)<0;1,0>
2929
%res0 = call i8 @llvm.genx.GenISA.PredicatedLoad.i8.p1.i8(ptr addrspace(1) %in, i64 1, i1 %p, i8 0)
3030

3131
; do predicated load, then do predicated copy of result to merge value which is used as dest.
32-
; CHECK: (P1) lsc_load.ugm (M1_NM, 1) [[GATHER1]]:d8c32 flat[
32+
; CHECK: (P1) lsc_load.ugm (M1_NM, 1) [[GATHER1]]:d8u32 flat[
3333
; CHECK: (P1) mov (M1_NM, 1) mVi8(0,0)<1> [[G_ALIAS1]](0,0)<0;1,0>
3434
%mergeV = add i32 %predicate, 5
3535
%mVi8 = trunc i32 %mergeV to i8

visa/CISA.l

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ type[ ]*=[ ]*(ud|d|uw|w|ub|b|df|f|bool|uq|q|UD|D|UW|W|UB|B|DF|F|Bool|BOOL|UQ|Q|h
10541054
}
10551055

10561056

1057-
:((d64|d32|d16|d8|d8c32|d16c32|d16c32h)|(u64|u32|u16|u8|u8c32|u16c32|u16c32h))(x(64|32|16|8|4|3|2|1))?t? {
1057+
:((d64|d32|d16|d8|d8u32|d8c32|d16u32|d16c32|d16u32h|d16c32h)|(u64|u32|u16|u8|u8c32|u16c32|u16c32h))(x(64|32|16|8|4|3|2|1))?t? {
10581058
TRACE("** LSC_DATA_SHAPE_TK");
10591059

10601060
int off = 1;
@@ -1427,14 +1427,17 @@ static LSC_OP str2lscop(const char *str)
14271427
static LSC_DATA_SIZE decodeDataSizePrefix(const char *yytext, int *off) {
14281428
LSC_DATA_SIZE dsz = LSC_DATA_SIZE_INVALID;
14291429
*off += 1; // 'd' or 'u'
1430-
if (strncmp(yytext + *off,"8c32", 4) == 0) {
1430+
if (strncmp(yytext + *off,"8u32", 4) == 0 ||
1431+
strncmp(yytext + *off,"8c32", 4) == 0) {
14311432
dsz = LSC_DATA_SIZE_8c32b;
14321433
*off += 4;
1433-
} else if (strncmp(yytext + *off, "16c32h", 6) == 0) {
1434+
} else if (strncmp(yytext + *off, "16u32h", 6) == 0 ||
1435+
strncmp(yytext + *off, "16c32h", 6) == 0) {
14341436
// must be above "u16c32" case (longest match first)
14351437
dsz = LSC_DATA_SIZE_16c32bH;
14361438
*off += 6;
1437-
} else if (strncmp(yytext + *off, "16c32", 5) == 0) {
1439+
} else if (strncmp(yytext + *off, "16u32", 5) == 0 ||
1440+
strncmp(yytext + *off, "16c32", 5) == 0) {
14381441
dsz = LSC_DATA_SIZE_16c32b;
14391442
*off += 5;
14401443
} else if (strncmp(yytext + *off, "64", 2) == 0) {

visa/IsaDisassembly.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2725,13 +2725,13 @@ class LscInstFormatter {
27252725
ss << "d64";
27262726
break;
27272727
case LSC_DATA_SIZE_8c32b:
2728-
ss << "d8c32";
2728+
ss << "d8u32";
27292729
break;
27302730
case LSC_DATA_SIZE_16c32b:
2731-
ss << "d16c32";
2731+
ss << "d16u32";
27322732
break;
27332733
case LSC_DATA_SIZE_16c32bH:
2734-
ss << "d16c32h";
2734+
ss << "d16u32h";
27352735
break;
27362736
default:
27372737
formatBadEnum(dataSize);

0 commit comments

Comments
 (0)