Skip to content

Commit f2d51a2

Browse files
jwanggit86jwanggit86
committed
for gfx10, use existing VOP2_Real_gfx10
1 parent 4d69755 commit f2d51a2

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

‎llvm/lib/Target/AMDGPU/VOP2Instructions.td

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,10 +2169,7 @@ defm V_MAX_F16 : VOP2_Real_gfx10<0x039>;
21692169
defm V_MIN_F16 : VOP2_Real_gfx10<0x03a>;
21702170
defm V_LDEXP_F16 : VOP2_Real_gfx10<0x03b>;
21712171

2172-
let IsSingle = 1 in {
2173-
defm V_PK_FMAC_F16 : VOP2_Real_e32_gfx10<0x03c>;
2174-
}
2175-
defm V_PK_FMAC_F16 : VOP2_Real_dpp_gfx10<0x03c>, VOP2_Real_dpp8_gfx10<0x03c>;
2172+
defm V_PK_FMAC_F16 : VOP2_Real_gfx10<0x03c>;
21762173

21772174
// VOP2 no carry-in, carry-out.
21782175
defm V_ADD_NC_U32 :

‎llvm/test/MC/AMDGPU/literalv216.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,4 +291,4 @@ v_pk_add_u16 v5, v1, 123456.0
291291
// FIXME: v_pk_fmac_f16 cannot be promoted to VOP3 so '_e32' suffix is not valid
292292
v_pk_fmac_f16 v5, 0x12345678, v2
293293
// NOGFX9: :[[@LINE-1]]:{{[0-9]+}}: error: instruction not supported on this GPU
294-
// GFX10: v_pk_fmac_f16 v5, 0x12345678, v2 ; encoding: [0xff,0x04,0x0a,0x78,0x78,0x56,0x34,0x12]
294+
// GFX10: v_pk_fmac_f16_e32 v5, 0x12345678, v2 ; encoding: [0xff,0x04,0x0a,0x78,0x78,0x56,0x34,0x12]

‎llvm/test/MC/Disassembler/AMDGPU/gfx10_vop2.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,52 +1779,52 @@
17791779
# GFX10: v_or_b32_e32 v5, vcc_lo, v2 ; encoding: [0x6a,0x04,0x0a,0x38]
17801780
0x6a,0x04,0x0a,0x38
17811781

1782-
# GFX10: v_pk_fmac_f16 v255, v1, v2 ; encoding: [0x01,0x05,0xfe,0x79]
1782+
# GFX10: v_pk_fmac_f16_e32 v255, v1, v2 ; encoding: [0x01,0x05,0xfe,0x79]
17831783
0x01,0x05,0xfe,0x79
17841784

1785-
# GFX10: v_pk_fmac_f16 v5, -1, v2 ; encoding: [0xc1,0x04,0x0a,0x78]
1785+
# GFX10: v_pk_fmac_f16_e32 v5, -1, v2 ; encoding: [0xc1,0x04,0x0a,0x78]
17861786
0xc1,0x04,0x0a,0x78
17871787

1788-
# GFX10: v_pk_fmac_f16 v5, -4.0, v2 ; encoding: [0xf7,0x04,0x0a,0x78]
1788+
# GFX10: v_pk_fmac_f16_e32 v5, -4.0, v2 ; encoding: [0xf7,0x04,0x0a,0x78]
17891789
0xf7,0x04,0x0a,0x78
17901790

1791-
# GFX10: v_pk_fmac_f16 v5, 0, v2 ; encoding: [0x80,0x04,0x0a,0x78]
1791+
# GFX10: v_pk_fmac_f16_e32 v5, 0, v2 ; encoding: [0x80,0x04,0x0a,0x78]
17921792
0x80,0x04,0x0a,0x78
17931793

1794-
# GFX10: v_pk_fmac_f16 v5, 0.5, v2 ; encoding: [0xf0,0x04,0x0a,0x78]
1794+
# GFX10: v_pk_fmac_f16_e32 v5, 0.5, v2 ; encoding: [0xf0,0x04,0x0a,0x78]
17951795
0xf0,0x04,0x0a,0x78
17961796

1797-
# GFX10: v_pk_fmac_f16 v5, exec_hi, v2 ; encoding: [0x7f,0x04,0x0a,0x78]
1797+
# GFX10: v_pk_fmac_f16_e32 v5, exec_hi, v2 ; encoding: [0x7f,0x04,0x0a,0x78]
17981798
0x7f,0x04,0x0a,0x78
17991799

1800-
# GFX10: v_pk_fmac_f16 v5, exec_lo, v2 ; encoding: [0x7e,0x04,0x0a,0x78]
1800+
# GFX10: v_pk_fmac_f16_e32 v5, exec_lo, v2 ; encoding: [0x7e,0x04,0x0a,0x78]
18011801
0x7e,0x04,0x0a,0x78
18021802

1803-
# GFX10: v_pk_fmac_f16 v5, m0, v2 ; encoding: [0x7c,0x04,0x0a,0x78]
1803+
# GFX10: v_pk_fmac_f16_e32 v5, m0, v2 ; encoding: [0x7c,0x04,0x0a,0x78]
18041804
0x7c,0x04,0x0a,0x78
18051805

1806-
# GFX10: v_pk_fmac_f16 v5, s1, v2 ; encoding: [0x01,0x04,0x0a,0x78]
1806+
# GFX10: v_pk_fmac_f16_e32 v5, s1, v2 ; encoding: [0x01,0x04,0x0a,0x78]
18071807
0x01,0x04,0x0a,0x78
18081808

1809-
# GFX10: v_pk_fmac_f16 v5, s103, v2 ; encoding: [0x67,0x04,0x0a,0x78]
1809+
# GFX10: v_pk_fmac_f16_e32 v5, s103, v2 ; encoding: [0x67,0x04,0x0a,0x78]
18101810
0x67,0x04,0x0a,0x78
18111811

1812-
# GFX10: v_pk_fmac_f16 v5, ttmp11, v2 ; encoding: [0x77,0x04,0x0a,0x78]
1812+
# GFX10: v_pk_fmac_f16_e32 v5, ttmp11, v2 ; encoding: [0x77,0x04,0x0a,0x78]
18131813
0x77,0x04,0x0a,0x78
18141814

1815-
# GFX10: v_pk_fmac_f16 v5, v1, v2 ; encoding: [0x01,0x05,0x0a,0x78]
1815+
# GFX10: v_pk_fmac_f16_e32 v5, v1, v2 ; encoding: [0x01,0x05,0x0a,0x78]
18161816
0x01,0x05,0x0a,0x78
18171817

1818-
# GFX10: v_pk_fmac_f16 v5, v1, v255 ; encoding: [0x01,0xff,0x0b,0x78]
1818+
# GFX10: v_pk_fmac_f16_e32 v5, v1, v255 ; encoding: [0x01,0xff,0x0b,0x78]
18191819
0x01,0xff,0x0b,0x78
18201820

1821-
# GFX10: v_pk_fmac_f16 v5, v255, v2 ; encoding: [0xff,0x05,0x0a,0x78]
1821+
# GFX10: v_pk_fmac_f16_e32 v5, v255, v2 ; encoding: [0xff,0x05,0x0a,0x78]
18221822
0xff,0x05,0x0a,0x78
18231823

1824-
# GFX10: v_pk_fmac_f16 v5, vcc_hi, v2 ; encoding: [0x6b,0x04,0x0a,0x78]
1824+
# GFX10: v_pk_fmac_f16_e32 v5, vcc_hi, v2 ; encoding: [0x6b,0x04,0x0a,0x78]
18251825
0x6b,0x04,0x0a,0x78
18261826

1827-
# GFX10: v_pk_fmac_f16 v5, vcc_lo, v2 ; encoding: [0x6a,0x04,0x0a,0x78]
1827+
# GFX10: v_pk_fmac_f16_e32 v5, vcc_lo, v2 ; encoding: [0x6a,0x04,0x0a,0x78]
18281828
0x6a,0x04,0x0a,0x78
18291829

18301830
# W32: v_sub_co_ci_u32_e32 v255, vcc_lo, v1, v2, vcc_lo ; encoding: [0x01,0x05,0xfe,0x53]

‎llvm/test/MC/Disassembler/AMDGPU/gfx10_vop3p_literalv216.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,5 @@
144144
# Packed VOP2
145145
#===----------------------------------------------------------------------===//
146146

147-
# GFX10: v_pk_fmac_f16 v5, 0x12345678, v2 ; encoding: [0xff,0x04,0x0a,0x78,0x78,0x56,0x34,0x12]
147+
# GFX10: v_pk_fmac_f16_e32 v5, 0x12345678, v2 ; encoding: [0xff,0x04,0x0a,0x78,0x78,0x56,0x34,0x12]
148148
0xff,0x04,0x0a,0x78,0x78,0x56,0x34,0x12

0 commit comments

Comments
 (0)