Skip to content

Commit e539366

Browse files
broxigarchenIcohedron
authored andcommitted
[AMDGPU][True16][MC][CodeGen] true16 for v_alignbyte_b32 (llvm#125706)
Support true16 format for v_alignbyte_b32 in MC and CodeGen
1 parent b963f64 commit e539366

14 files changed

+317
-43
lines changed

llvm/lib/Target/AMDGPU/VOP3Instructions.td

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,13 @@ defm V_BFE_U32 : VOP3Inst <"v_bfe_u32", VOP3_Profile<VOP_I32_I32_I32_I32>, AMDGP
212212
defm V_BFE_I32 : VOP3Inst <"v_bfe_i32", VOP3_Profile<VOP_I32_I32_I32_I32>, AMDGPUbfe_i32>;
213213
defm V_BFI_B32 : VOP3Inst <"v_bfi_b32", VOP3_Profile<VOP_I32_I32_I32_I32>, AMDGPUbfi>;
214214
defm V_ALIGNBIT_B32 : VOP3Inst <"v_alignbit_b32", VOP3_Profile<VOP_I32_I32_I32_I32>, fshr>;
215+
216+
let True16Predicate = NotHasTrue16BitInsts in
215217
defm V_ALIGNBYTE_B32 : VOP3Inst <"v_alignbyte_b32", VOP3_Profile<VOP_I32_I32_I32_I32>, int_amdgcn_alignbyte>;
218+
let True16Predicate = UseRealTrue16Insts in
219+
defm V_ALIGNBYTE_B32_t16 : VOP3Inst <"v_alignbyte_b32_t16", VOP3_Profile_True16<VOP_I32_I32_I32_I16, VOP3_OPSEL>>;
220+
let True16Predicate = UseFakeTrue16Insts in
221+
defm V_ALIGNBYTE_B32_fake16 : VOP3Inst <"v_alignbyte_b32_fake16", VOP3_Profile_Fake16<VOP_I32_I32_I32_I16, VOP3_OPSEL>>;
216222

217223
// XXX - No FPException seems suspect but manual doesn't say it does
218224
let mayRaiseFPException = 0 in {
@@ -250,6 +256,25 @@ let SchedRW = [WriteDoubleAdd], FPDPRounding = 1 in {
250256
} // End SchedRW = [WriteDoubleAdd], FPDPRounding = 1
251257
} // End isReMaterializable = 1
252258

259+
let True16Predicate = UseFakeTrue16Insts in
260+
def : GCNPat <
261+
(i32 (int_amdgcn_alignbyte (i32 (VOP3OpSelMods i32:$src0, i32:$src0_modifiers)),
262+
(i32 (VOP3OpSelMods i32:$src1, i32:$src1_modifiers)),
263+
(i32 (VOP3OpSelMods i32:$src2, i32:$src2_modifiers)))),
264+
(V_ALIGNBYTE_B32_fake16_e64 i32:$src0_modifiers, VSrc_b32:$src0,
265+
i32:$src1_modifiers, VSrc_b32:$src1,
266+
i32:$src2_modifiers, VGPR_32:$src2)
267+
>;
268+
269+
let True16Predicate = UseRealTrue16Insts in
270+
def : GCNPat <
271+
(i32 (int_amdgcn_alignbyte (i32 (VOP3OpSelMods i32:$src0, i32:$src0_modifiers)),
272+
(i32 (VOP3OpSelMods i32:$src1, i32:$src1_modifiers)),
273+
(i32 (VOP3OpSelMods i32:$src2, i32:$src2_modifiers)))),
274+
(V_ALIGNBYTE_B32_t16_e64 i32:$src0_modifiers, VSrc_b32:$src0,
275+
i32:$src1_modifiers, VSrc_b32:$src1,
276+
i32:$src2_modifiers, (i16 (EXTRACT_SUBREG VGPR_32:$src2, lo16)))
277+
>;
253278

254279
let mayRaiseFPException = 0 in { // Seems suspicious but manual doesn't say it does.
255280
let SchedRW = [WriteFloatFMA, WriteSALU] in
@@ -1690,7 +1715,7 @@ defm V_FMA_F32 : VOP3_Realtriple_gfx11_gfx12<0x213>;
16901715
defm V_FMA_F64 : VOP3_Real_Base_gfx11_gfx12<0x214>;
16911716
defm V_LERP_U8 : VOP3_Realtriple_gfx11_gfx12<0x215>;
16921717
defm V_ALIGNBIT_B32 : VOP3_Realtriple_gfx11_gfx12<0x216>;
1693-
defm V_ALIGNBYTE_B32 : VOP3_Realtriple_gfx11_gfx12<0x217>;
1718+
defm V_ALIGNBYTE_B32 : VOP3_Realtriple_t16_and_fake16_gfx11_gfx12<0x217, "v_alignbyte_b32">;
16941719
defm V_MULLIT_F32 : VOP3_Realtriple_gfx11_gfx12<0x218>;
16951720
defm V_MIN3_F32 : VOP3_Realtriple_gfx11<0x219>;
16961721
defm V_MIN3_I32 : VOP3_Realtriple_gfx11_gfx12<0x21a>;
Lines changed: 116 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,128 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
12
; RUN: llc -mtriple=amdgcn -verify-machineinstrs < %s | FileCheck -check-prefix=GCN %s
3+
; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -mattr=+real-true16 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX11-TRUE16 %s
4+
; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -mattr=-real-true16 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX11-FAKE16 %s
25

36
declare i32 @llvm.amdgcn.alignbyte(i32, i32, i32) #0
47

5-
; GCN-LABEL: {{^}}v_alignbyte_b32:
6-
; GCN: v_alignbyte_b32 {{[vs][0-9]+}}, {{[vs][0-9]+}}, {{[vs][0-9]+}}
78
define amdgpu_kernel void @v_alignbyte_b32(ptr addrspace(1) %out, i32 %src1, i32 %src2, i32 %src3) #1 {
9+
; GCN-LABEL: v_alignbyte_b32:
10+
; GCN: ; %bb.0:
11+
; GCN-NEXT: s_load_dwordx4 s[0:3], s[4:5], 0xb
12+
; GCN-NEXT: s_load_dwordx2 s[4:5], s[4:5], 0x9
13+
; GCN-NEXT: s_mov_b32 s7, 0xf000
14+
; GCN-NEXT: s_mov_b32 s6, -1
15+
; GCN-NEXT: s_waitcnt lgkmcnt(0)
16+
; GCN-NEXT: v_mov_b32_e32 v0, s1
17+
; GCN-NEXT: v_mov_b32_e32 v1, s2
18+
; GCN-NEXT: v_alignbyte_b32 v0, s0, v0, v1
19+
; GCN-NEXT: buffer_store_dword v0, off, s[4:7], 0
20+
; GCN-NEXT: s_endpgm
21+
;
22+
; GFX11-TRUE16-LABEL: v_alignbyte_b32:
23+
; GFX11-TRUE16: ; %bb.0:
24+
; GFX11-TRUE16-NEXT: s_clause 0x1
25+
; GFX11-TRUE16-NEXT: s_load_b128 s[0:3], s[4:5], 0x2c
26+
; GFX11-TRUE16-NEXT: s_load_b64 s[4:5], s[4:5], 0x24
27+
; GFX11-TRUE16-NEXT: v_mov_b32_e32 v1, 0
28+
; GFX11-TRUE16-NEXT: s_waitcnt lgkmcnt(0)
29+
; GFX11-TRUE16-NEXT: v_mov_b16_e32 v0.l, s2
30+
; GFX11-TRUE16-NEXT: s_delay_alu instid0(VALU_DEP_1)
31+
; GFX11-TRUE16-NEXT: v_alignbyte_b32 v0, s0, s1, v0.l
32+
; GFX11-TRUE16-NEXT: global_store_b32 v1, v0, s[4:5]
33+
; GFX11-TRUE16-NEXT: s_endpgm
34+
;
35+
; GFX11-FAKE16-LABEL: v_alignbyte_b32:
36+
; GFX11-FAKE16: ; %bb.0:
37+
; GFX11-FAKE16-NEXT: s_clause 0x1
38+
; GFX11-FAKE16-NEXT: s_load_b128 s[0:3], s[4:5], 0x2c
39+
; GFX11-FAKE16-NEXT: s_load_b64 s[4:5], s[4:5], 0x24
40+
; GFX11-FAKE16-NEXT: s_waitcnt lgkmcnt(0)
41+
; GFX11-FAKE16-NEXT: v_dual_mov_b32 v1, 0 :: v_dual_mov_b32 v0, s2
42+
; GFX11-FAKE16-NEXT: s_delay_alu instid0(VALU_DEP_1)
43+
; GFX11-FAKE16-NEXT: v_alignbyte_b32 v0, s0, s1, v0
44+
; GFX11-FAKE16-NEXT: global_store_b32 v1, v0, s[4:5]
45+
; GFX11-FAKE16-NEXT: s_endpgm
846
%val = call i32 @llvm.amdgcn.alignbyte(i32 %src1, i32 %src2, i32 %src3) #0
947
store i32 %val, ptr addrspace(1) %out
1048
ret void
1149
}
1250

51+
define amdgpu_kernel void @v_alignbyte_b32_2(ptr addrspace(1) %out, ptr addrspace(1) %src1, ptr addrspace(1) %src2, i32 %src3) #1 {
52+
; GCN-LABEL: v_alignbyte_b32_2:
53+
; GCN: ; %bb.0:
54+
; GCN-NEXT: s_load_dwordx4 s[0:3], s[4:5], 0x9
55+
; GCN-NEXT: s_load_dwordx2 s[8:9], s[4:5], 0xd
56+
; GCN-NEXT: s_load_dword s16, s[4:5], 0xf
57+
; GCN-NEXT: s_mov_b32 s7, 0xf000
58+
; GCN-NEXT: s_mov_b32 s14, 0
59+
; GCN-NEXT: v_lshlrev_b32_e32 v0, 2, v0
60+
; GCN-NEXT: v_mov_b32_e32 v1, 0
61+
; GCN-NEXT: s_mov_b32 s15, s7
62+
; GCN-NEXT: s_mov_b64 s[10:11], s[14:15]
63+
; GCN-NEXT: s_waitcnt lgkmcnt(0)
64+
; GCN-NEXT: s_mov_b64 s[12:13], s[2:3]
65+
; GCN-NEXT: buffer_load_dword v2, v[0:1], s[12:15], 0 addr64 glc
66+
; GCN-NEXT: s_waitcnt vmcnt(0)
67+
; GCN-NEXT: buffer_load_dword v0, v[0:1], s[8:11], 0 addr64 glc
68+
; GCN-NEXT: s_waitcnt vmcnt(0)
69+
; GCN-NEXT: s_mov_b32 s6, -1
70+
; GCN-NEXT: s_mov_b32 s4, s0
71+
; GCN-NEXT: s_mov_b32 s5, s1
72+
; GCN-NEXT: v_alignbyte_b32 v0, v2, v0, s16
73+
; GCN-NEXT: buffer_store_dword v0, off, s[4:7], 0
74+
; GCN-NEXT: s_endpgm
75+
;
76+
; GFX11-TRUE16-LABEL: v_alignbyte_b32_2:
77+
; GFX11-TRUE16: ; %bb.0:
78+
; GFX11-TRUE16-NEXT: s_clause 0x1
79+
; GFX11-TRUE16-NEXT: s_load_b128 s[0:3], s[4:5], 0x24
80+
; GFX11-TRUE16-NEXT: s_load_b64 s[6:7], s[4:5], 0x34
81+
; GFX11-TRUE16-NEXT: v_dual_mov_b32 v3, 0 :: v_dual_and_b32 v0, 0x3ff, v0
82+
; GFX11-TRUE16-NEXT: s_delay_alu instid0(VALU_DEP_1)
83+
; GFX11-TRUE16-NEXT: v_lshlrev_b32_e32 v0, 2, v0
84+
; GFX11-TRUE16-NEXT: s_waitcnt lgkmcnt(0)
85+
; GFX11-TRUE16-NEXT: global_load_b32 v1, v0, s[2:3] glc dlc
86+
; GFX11-TRUE16-NEXT: s_waitcnt vmcnt(0)
87+
; GFX11-TRUE16-NEXT: global_load_b32 v2, v0, s[6:7] glc dlc
88+
; GFX11-TRUE16-NEXT: s_waitcnt vmcnt(0)
89+
; GFX11-TRUE16-NEXT: s_load_b32 s2, s[4:5], 0x3c
90+
; GFX11-TRUE16-NEXT: s_waitcnt lgkmcnt(0)
91+
; GFX11-TRUE16-NEXT: v_mov_b16_e32 v0.l, s2
92+
; GFX11-TRUE16-NEXT: s_delay_alu instid0(VALU_DEP_1)
93+
; GFX11-TRUE16-NEXT: v_alignbyte_b32 v0, v1, v2, v0.l
94+
; GFX11-TRUE16-NEXT: global_store_b32 v3, v0, s[0:1]
95+
; GFX11-TRUE16-NEXT: s_endpgm
96+
;
97+
; GFX11-FAKE16-LABEL: v_alignbyte_b32_2:
98+
; GFX11-FAKE16: ; %bb.0:
99+
; GFX11-FAKE16-NEXT: s_clause 0x1
100+
; GFX11-FAKE16-NEXT: s_load_b128 s[0:3], s[4:5], 0x24
101+
; GFX11-FAKE16-NEXT: s_load_b64 s[6:7], s[4:5], 0x34
102+
; GFX11-FAKE16-NEXT: v_and_b32_e32 v0, 0x3ff, v0
103+
; GFX11-FAKE16-NEXT: v_mov_b32_e32 v2, 0
104+
; GFX11-FAKE16-NEXT: s_delay_alu instid0(VALU_DEP_2)
105+
; GFX11-FAKE16-NEXT: v_lshlrev_b32_e32 v0, 2, v0
106+
; GFX11-FAKE16-NEXT: s_waitcnt lgkmcnt(0)
107+
; GFX11-FAKE16-NEXT: global_load_b32 v1, v0, s[2:3] glc dlc
108+
; GFX11-FAKE16-NEXT: s_waitcnt vmcnt(0)
109+
; GFX11-FAKE16-NEXT: global_load_b32 v0, v0, s[6:7] glc dlc
110+
; GFX11-FAKE16-NEXT: s_waitcnt vmcnt(0)
111+
; GFX11-FAKE16-NEXT: s_load_b32 s2, s[4:5], 0x3c
112+
; GFX11-FAKE16-NEXT: s_waitcnt lgkmcnt(0)
113+
; GFX11-FAKE16-NEXT: v_alignbyte_b32 v0, v1, v0, s2
114+
; GFX11-FAKE16-NEXT: global_store_b32 v2, v0, s[0:1]
115+
; GFX11-FAKE16-NEXT: s_endpgm
116+
%tid = call i32 @llvm.amdgcn.workitem.id.x()
117+
%a.gep = getelementptr inbounds i32, ptr addrspace(1) %src1, i32 %tid
118+
%b.gep = getelementptr inbounds i32, ptr addrspace(1) %src2, i32 %tid
119+
%a.val = load volatile i32, ptr addrspace(1) %a.gep
120+
%b.val = load volatile i32, ptr addrspace(1) %b.gep
121+
122+
%val = call i32 @llvm.amdgcn.alignbyte(i32 %a.val, i32 %b.val, i32 %src3) #0
123+
store i32 %val, ptr addrspace(1) %out
124+
ret void
125+
}
126+
13127
attributes #0 = { nounwind readnone }
14128
attributes #1 = { nounwind }

llvm/test/MC/AMDGPU/gfx11_asm_vop3.s

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,11 @@ v_alignbyte_b32 v5, s1, v255, s3
461461
v_alignbyte_b32 v5, s105, s105, s105
462462
// GFX11: v_alignbyte_b32 v5, s105, s105, s105 ; encoding: [0x05,0x00,0x17,0xd6,0x69,0xd2,0xa4,0x01]
463463

464-
v_alignbyte_b32 v5, vcc_lo, ttmp15, v3
465-
// GFX11: v_alignbyte_b32 v5, vcc_lo, ttmp15, v3 ; encoding: [0x05,0x00,0x17,0xd6,0x6a,0xf6,0x0c,0x04]
464+
v_alignbyte_b32 v5, vcc_lo, ttmp15, v3.l
465+
// GFX11: v_alignbyte_b32 v5, vcc_lo, ttmp15, v3.l ; encoding: [0x05,0x00,0x17,0xd6,0x6a,0xf6,0x0c,0x04]
466466

467-
v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255
468-
// GFX11: v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255 ; encoding: [0x05,0x00,0x17,0xd6,0x6b,0xfe,0xfd,0x07,0x56,0x34,0x12,0xaf]
467+
v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255.l
468+
// GFX11: v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255.l ; encoding: [0x05,0x00,0x17,0xd6,0x6b,0xfe,0xfd,0x07,0x56,0x34,0x12,0xaf]
469469

470470
v_alignbyte_b32 v5, ttmp15, src_scc, ttmp15
471471
// GFX11: v_alignbyte_b32 v5, ttmp15, src_scc, ttmp15 ; encoding: [0x05,0x00,0x17,0xd6,0x7b,0xfa,0xed,0x01]
@@ -494,6 +494,9 @@ v_alignbyte_b32 v5, src_scc, vcc_lo, -1
494494
v_alignbyte_b32 v255, 0xaf123456, vcc_hi, null
495495
// GFX11: v_alignbyte_b32 v255, 0xaf123456, vcc_hi, null ; encoding: [0xff,0x00,0x17,0xd6,0xff,0xd6,0xf0,0x01,0x56,0x34,0x12,0xaf]
496496

497+
v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255.h
498+
// GFX11: v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255.h op_sel:[0,0,1,0] ; encoding: [0x05,0x20,0x17,0xd6,0x6b,0xfe,0xfd,0x07,0x56,0x34,0x12,0xaf]
499+
497500
v_and_b16 v5.l, v1.l, v2.l
498501
// GFX11: v_and_b16 v5.l, v1.l, v2.l ; encoding: [0x05,0x00,0x62,0xd7,0x01,0x05,0x02,0x00]
499502

llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16.s

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,22 +363,22 @@ v_alignbit_b32_e64_dpp v5, v1, v2, -1 row_xmask:0 row_mask:0x1 bank_mask:0x3 bou
363363
v_alignbit_b32_e64_dpp v255, v255, v255, src_scc row_xmask:15 row_mask:0x3 bank_mask:0x0 bound_ctrl:0 fi:1
364364
// GFX11: v_alignbit_b32_e64_dpp v255, v255, v255, src_scc row_xmask:15 row_mask:0x3 bank_mask:0x0 fi:1 ; encoding: [0xff,0x00,0x16,0xd6,0xfa,0xfe,0xf7,0x03,0xff,0x6f,0x05,0x30]
365365

366-
v_alignbyte_b32_e64_dpp v5, v1, v2, v3 quad_perm:[3,2,1,0]
367-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3 quad_perm:[3,2,1,0] row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0x1b,0x00,0xff]
366+
v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l quad_perm:[3,2,1,0]
367+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l quad_perm:[3,2,1,0] row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0x1b,0x00,0xff]
368368

369-
v_alignbyte_b32_e64_dpp v5, v1, v2, v3 quad_perm:[0,1,2,3]
370-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3 quad_perm:[0,1,2,3] row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0xe4,0x00,0xff]
369+
v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l quad_perm:[0,1,2,3]
370+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l quad_perm:[0,1,2,3] row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0xe4,0x00,0xff]
371371

372-
v_alignbyte_b32_e64_dpp v5, v1, v2, v3 row_mirror
373-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3 row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0x40,0x01,0xff]
372+
v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l row_mirror row_mask:0xf bank_mask:0xf
373+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0x40,0x01,0xff]
374374

375-
v_alignbyte_b32_e64_dpp v5, v1, v2, v3 row_half_mirror
376-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3 row_half_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0x41,0x01,0xff]
375+
v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l row_half_mirror row_mask:0xf bank_mask:0xf
376+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l row_half_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x04,0x01,0x41,0x01,0xff]
377377

378-
v_alignbyte_b32_e64_dpp v5, v1, v2, v255 row_shl:1
379-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255 row_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xfe,0x07,0x01,0x01,0x01,0xff]
378+
v_alignbyte_b32_e64_dpp v5, v1, v2, v255.l row_shl:1 row_mask:0xf bank_mask:0xf
379+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255.l row_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xfe,0x07,0x01,0x01,0x01,0xff]
380380

381-
v_alignbyte_b32_e64_dpp v5, v1, v2, s105 row_shl:15
381+
v_alignbyte_b32_e64_dpp v5, v1, v2, s105 row_shl:15 row_mask:0xf bank_mask:0xf
382382
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, s105 row_shl:15 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xa6,0x01,0x01,0x0f,0x01,0xff]
383383

384384
v_alignbyte_b32_e64_dpp v5, v1, v2, vcc_hi row_shr:1
@@ -387,7 +387,7 @@ v_alignbyte_b32_e64_dpp v5, v1, v2, vcc_hi row_shr:1
387387
v_alignbyte_b32_e64_dpp v5, v1, v2, vcc_lo row_shr:15
388388
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, vcc_lo row_shr:15 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xaa,0x01,0x01,0x1f,0x01,0xff]
389389

390-
v_alignbyte_b32_e64_dpp v5, v1, v2, ttmp15 row_ror:1
390+
v_alignbyte_b32_e64_dpp v5, v1, v2, ttmp15 row_ror:1 row_mask:0xf bank_mask:0xf
391391
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, ttmp15 row_ror:1 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xee,0x01,0x01,0x21,0x01,0xff]
392392

393393
v_alignbyte_b32_e64_dpp v5, v1, v2, exec_hi row_ror:15
@@ -405,6 +405,24 @@ v_alignbyte_b32_e64_dpp v5, v1, v2, -1 row_xmask:0 row_mask:0x1 bank_mask:0x3 bo
405405
v_alignbyte_b32_e64_dpp v255, v255, v255, src_scc row_xmask:15 row_mask:0x3 bank_mask:0x0 bound_ctrl:0 fi:1
406406
// GFX11: v_alignbyte_b32_e64_dpp v255, v255, v255, src_scc row_xmask:15 row_mask:0x3 bank_mask:0x0 fi:1 ; encoding: [0xff,0x00,0x17,0xd6,0xfa,0xfe,0xf7,0x03,0xff,0x6f,0x05,0x30]
407407

408+
v_alignbyte_b32_e64_dpp v5, v1, v2, v255.l row_mirror
409+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255.l row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xfe,0x07,0x01,0x40,0x01,0xff]
410+
411+
v_alignbyte_b32_e64_dpp v5, v1, v2, s3 row_half_mirror
412+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, s3 row_half_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0x0e,0x00,0x01,0x41,0x01,0xff]
413+
414+
v_alignbyte_b32_e64_dpp v5, v1, v2, s105 row_shl:1
415+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, s105 row_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xa6,0x01,0x01,0x01,0x01,0xff]
416+
417+
v_alignbyte_b32_e64_dpp v5, v1, v2, ttmp15 row_shl:15
418+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, ttmp15 row_shl:15 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xee,0x01,0x01,0x0f,0x01,0xff]
419+
420+
v_alignbyte_b32_e64_dpp v5, v1, v2, m0 row_ror:1
421+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, m0 row_ror:1 row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x17,0xd6,0xfa,0x04,0xf6,0x01,0x01,0x21,0x01,0xff]
422+
423+
v_alignbyte_b32_e64_dpp v5, v1, v2, v255.h row_mirror
424+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255.h op_sel:[0,0,1,0] row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x20,0x17,0xd6,0xfa,0x04,0xfe,0x07,0x01,0x40,0x01,0xff]
425+
408426
v_and_b16_e64_dpp v5.l, v1.l, v2.l quad_perm:[3,2,1,0]
409427
// GFX11: v_and_b16_e64_dpp v5.l, v1.l, v2.l quad_perm:[3,2,1,0] row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x62,0xd7,0xfa,0x04,0x02,0x00,0x01,0x1b,0x00,0xff]
410428

llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8.s

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ v_alignbit_b32_e64_dpp v5, v1, v2, -1 dpp8:[7,6,5,4,3,2,1,0] fi:1
187187
v_alignbit_b32_e64_dpp v255, v255, v255, src_scc dpp8:[0,0,0,0,0,0,0,0] fi:0
188188
// GFX11: v_alignbit_b32_e64_dpp v255, v255, v255, src_scc dpp8:[0,0,0,0,0,0,0,0] ; encoding: [0xff,0x00,0x16,0xd6,0xe9,0xfe,0xf7,0x03,0xff,0x00,0x00,0x00]
189189

190-
v_alignbyte_b32_e64_dpp v5, v1, v2, v3 dpp8:[7,6,5,4,3,2,1,0]
191-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3 dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0x0e,0x04,0x01,0x77,0x39,0x05]
190+
v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l dpp8:[7,6,5,4,3,2,1,0]
191+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v3.l dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0x0e,0x04,0x01,0x77,0x39,0x05]
192192

193-
v_alignbyte_b32_e64_dpp v5, v1, v2, v255 dpp8:[7,6,5,4,3,2,1,0]
194-
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255 dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0xfe,0x07,0x01,0x77,0x39,0x05]
193+
v_alignbyte_b32_e64_dpp v5, v1, v2, v255.l dpp8:[7,6,5,4,3,2,1,0]
194+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255.l dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0xfe,0x07,0x01,0x77,0x39,0x05]
195195

196196
v_alignbyte_b32_e64_dpp v5, v1, v2, s105 dpp8:[7,6,5,4,3,2,1,0]
197197
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, s105 dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0xa6,0x01,0x01,0x77,0x39,0x05]
@@ -220,6 +220,15 @@ v_alignbyte_b32_e64_dpp v5, v1, v2, -1 dpp8:[7,6,5,4,3,2,1,0] fi:1
220220
v_alignbyte_b32_e64_dpp v255, v255, v255, src_scc dpp8:[0,0,0,0,0,0,0,0] fi:0
221221
// GFX11: v_alignbyte_b32_e64_dpp v255, v255, v255, src_scc dpp8:[0,0,0,0,0,0,0,0] ; encoding: [0xff,0x00,0x17,0xd6,0xe9,0xfe,0xf7,0x03,0xff,0x00,0x00,0x00]
222222

223+
v_alignbyte_b32_e64_dpp v5, v1, v2, s3 dpp8:[7,6,5,4,3,2,1,0]
224+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, s3 dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0x0e,0x00,0x01,0x77,0x39,0x05]
225+
226+
v_alignbyte_b32_e64_dpp v5, v1, v2, m0 dpp8:[7,6,5,4,3,2,1,0]
227+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, m0 dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x17,0xd6,0xe9,0x04,0xf6,0x01,0x01,0x77,0x39,0x05]
228+
229+
v_alignbyte_b32_e64_dpp v5, v1, v2, v255.h dpp8:[7,6,5,4,3,2,1,0]
230+
// GFX11: v_alignbyte_b32_e64_dpp v5, v1, v2, v255.h op_sel:[0,0,1,0] dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x20,0x17,0xd6,0xe9,0x04,0xfe,0x07,0x01,0x77,0x39,0x05]
231+
223232
v_and_b16_e64_dpp v5.l, v1.l, v2.l dpp8:[7,6,5,4,3,2,1,0]
224233
// GFX11: v_and_b16_e64_dpp v5.l, v1.l, v2.l dpp8:[7,6,5,4,3,2,1,0] ; encoding: [0x05,0x00,0x62,0xd7,0xe9,0x04,0x02,0x00,0x01,0x77,0x39,0x05]
225234

llvm/test/MC/AMDGPU/gfx12_asm_vop3.s

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,9 @@ v_alignbyte_b32 v5, src_scc, vcc_lo, -1
452452
v_alignbyte_b32 v255, 0xaf123456, vcc_hi, null
453453
// GFX12: v_alignbyte_b32 v255, 0xaf123456, vcc_hi, null ; encoding: [0xff,0x00,0x17,0xd6,0xff,0xd6,0xf0,0x01,0x56,0x34,0x12,0xaf]
454454

455+
v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255.h
456+
// GFX12: v_alignbyte_b32 v5, vcc_hi, 0xaf123456, v255.h op_sel:[0,0,1,0] ; encoding: [0x05,0x20,0x17,0xd6,0x6b,0xfe,0xfd,0x07,0x56,0x34,0x12,0xaf]
457+
455458
v_and_b16 v5.l, v1.l, v2.l
456459
// GFX12: v_and_b16 v5.l, v1.l, v2.l ; encoding: [0x05,0x00,0x62,0xd7,0x01,0x05,0x02,0x00]
457460

llvm/test/MC/AMDGPU/gfx12_asm_vop3_dpp16.s

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@ v_alignbyte_b32_e64_dpp v5, v1, v2, -1 row_xmask:0 row_mask:0x1 bank_mask:0x3 bo
485485
v_alignbyte_b32_e64_dpp v255, v255, v255, src_scc row_xmask:15 row_mask:0x3 bank_mask:0x0 bound_ctrl:0 fi:1
486486
// GFX12: v_alignbyte_b32_e64_dpp v255, v255, v255, src_scc row_xmask:15 row_mask:0x3 bank_mask:0x0 fi:1 ; encoding: [0xff,0x00,0x17,0xd6,0xfa,0xfe,0xf7,0x03,0xff,0x6f,0x05,0x30]
487487

488+
v_alignbyte_b32_e64_dpp v5, v1, v2, v255.h row_mirror
489+
// GFX12: v_alignbyte_b32_e64_dpp v5, v1, v2, v255.h op_sel:[0,0,1,0] row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x20,0x17,0xd6,0xfa,0x04,0xfe,0x07,0x01,0x40,0x01,0xff]
490+
488491
v_and_b16_e64_dpp v5.l, v1.l, v2.l quad_perm:[3,2,1,0]
489492
// GFX12: v_and_b16_e64_dpp v5.l, v1.l, v2.l quad_perm:[3,2,1,0] row_mask:0xf bank_mask:0xf ; encoding: [0x05,0x00,0x62,0xd7,0xfa,0x04,0x02,0x00,0x01,0x1b,0x00,0xff]
490493

0 commit comments

Comments
 (0)