From 9e9edede1833f38e95cfa4845275cb40ee2b4020 Mon Sep 17 00:00:00 2001 From: Jay Foad Date: Fri, 4 Jun 2021 15:49:02 +0100 Subject: [PATCH] [AMDGPU] Fix MC tests for v_fmaak_f16 and v_fmamk_f16 This looks like a mistake when the tests were committed in r363946. There were two sets of tests for the f32 variant of these instructions, instead of one set for f16 and one set for f32. Differential Revision: https://reviews.llvm.org/D103699 --- llvm/test/MC/AMDGPU/gfx10_asm_vop2.s | 72 +++++++++++----------- .../test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt | 72 +++++++++++----------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/llvm/test/MC/AMDGPU/gfx10_asm_vop2.s b/llvm/test/MC/AMDGPU/gfx10_asm_vop2.s index a812f0d..c3b455c 100644 --- a/llvm/test/MC/AMDGPU/gfx10_asm_vop2.s +++ b/llvm/test/MC/AMDGPU/gfx10_asm_vop2.s @@ -11963,59 +11963,59 @@ v_fmac_f16_e64 v5, v1, v2 mul:4 v_fmac_f16_e64 v5, v1, v2 div:2 // GFX10: encoding: [0x05,0x00,0x36,0xd5,0x01,0x05,0x02,0x18] -v_fmamk_f32 v5, v1, 0x1121, v3 -// GFX10: encoding: [0x01,0x07,0x0a,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, v1, 0x1121, v3 +// GFX10: encoding: [0x01,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00] -v_fmamk_f32 v255, v1, 0x1121, v3 -// GFX10: encoding: [0x01,0x07,0xfe,0x59,0x21,0x11,0x00,0x00] +v_fmamk_f16 v255, v1, 0x1121, v3 +// GFX10: encoding: [0x01,0x07,0xfe,0x6f,0x21,0x11,0x00,0x00] -v_fmamk_f32 v5, v255, 0x1121, v3 -// GFX10: encoding: [0xff,0x07,0x0a,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, v255, 0x1121, v3 +// GFX10: encoding: [0xff,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00] -v_fmamk_f32 v5, 0, 0x1121, v3 -// GFX10: encoding: [0x80,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, 0, 0x1121, v3 +// GFX10: encoding: [0x80,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] -v_fmamk_f32 v5, -1, 0x1121, v3 -// GFX10: encoding: [0xc1,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, -1, 0x1121, v3 +// GFX10: encoding: [0xc1,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] -v_fmamk_f32 v5, 0.5, 0x1121, v3 -// GFX10: encoding: [0xf0,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, 0.5, 0x1121, v3 +// GFX10: encoding: [0xf0,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] -v_fmamk_f32 v5, -4.0, 0x1121, v3 -// GFX10: encoding: [0xf7,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, -4.0, 0x1121, v3 +// GFX10: encoding: [0xf7,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] -v_fmamk_f32 v5, v1, 0xa1b1, v3 -// GFX10: encoding: [0x01,0x07,0x0a,0x58,0xb1,0xa1,0x00,0x00] +v_fmamk_f16 v5, v1, 0xa1b1, v3 +// GFX10: encoding: [0x01,0x07,0x0a,0x6e,0xb1,0xa1,0x00,0x00] -v_fmamk_f32 v5, v1, 0x1121, v255 -// GFX10: encoding: [0x01,0xff,0x0b,0x58,0x21,0x11,0x00,0x00] +v_fmamk_f16 v5, v1, 0x1121, v255 +// GFX10: encoding: [0x01,0xff,0x0b,0x6e,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, v1, v2, 0x1121 -// GFX10: encoding: [0x01,0x05,0x0a,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, v1, v2, 0x1121 +// GFX10: encoding: [0x01,0x05,0x0a,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v255, v1, v2, 0x1121 -// GFX10: encoding: [0x01,0x05,0xfe,0x5b,0x21,0x11,0x00,0x00] +v_fmaak_f16 v255, v1, v2, 0x1121 +// GFX10: encoding: [0x01,0x05,0xfe,0x71,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, v255, v2, 0x1121 -// GFX10: encoding: [0xff,0x05,0x0a,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, v255, v2, 0x1121 +// GFX10: encoding: [0xff,0x05,0x0a,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, 0, v2, 0x1121 -// GFX10: encoding: [0x80,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, 0, v2, 0x1121 +// GFX10: encoding: [0x80,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, -1, v2, 0x1121 -// GFX10: encoding: [0xc1,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, -1, v2, 0x1121 +// GFX10: encoding: [0xc1,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, 0.5, v2, 0x1121 -// GFX10: encoding: [0xf0,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, 0.5, v2, 0x1121 +// GFX10: encoding: [0xf0,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, -4.0, v2, 0x1121 -// GFX10: encoding: [0xf7,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, -4.0, v2, 0x1121 +// GFX10: encoding: [0xf7,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, v1, v255, 0x1121 -// GFX10: encoding: [0x01,0xff,0x0b,0x5a,0x21,0x11,0x00,0x00] +v_fmaak_f16 v5, v1, v255, 0x1121 +// GFX10: encoding: [0x01,0xff,0x0b,0x70,0x21,0x11,0x00,0x00] -v_fmaak_f32 v5, v1, v2, 0xa1b1 -// GFX10: encoding: [0x01,0x05,0x0a,0x5a,0xb1,0xa1,0x00,0x00] +v_fmaak_f16 v5, v1, v2, 0xa1b1 +// GFX10: encoding: [0x01,0x05,0x0a,0x70,0xb1,0xa1,0x00,0x00] v_max_f16_e32 v5, v1, v2 // GFX10: encoding: [0x01,0x05,0x0a,0x72] diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt index c4db13f..41fe8b0 100644 --- a/llvm/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt +++ b/llvm/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt @@ -73772,56 +73772,56 @@ # GFX10: v_fma_f64 v[5:6], |v[1:2]|, |v[2:3]|, |v[3:4]| ; encoding: [0x05,0x07,0x4c,0xd5,0x01,0x05,0x0e,0x04] 0x05,0x07,0x4c,0xd5,0x01,0x05,0x0e,0x04 -# GFX10: v_fmaak_f32 v255, v1, v2, 0x1121 ; encoding: [0x01,0x05,0xfe,0x5b,0x21,0x11,0x00,0x00] -0x01,0x05,0xfe,0x5b,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v255, v1, v2, 0x1121 ; encoding: [0x01,0x05,0xfe,0x71,0x21,0x11,0x00,0x00] +0x01,0x05,0xfe,0x71,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v255, v1, v2, 0x11213141 ; encoding: [0x01,0x05,0xfe,0x5b,0x41,0x31,0x21,0x11] 0x01,0x05,0xfe,0x5b,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, -1, v2, 0x1121 ; encoding: [0xc1,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] -0xc1,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, -1, v2, 0x1121 ; encoding: [0xc1,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] +0xc1,0x04,0x0a,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, -1, v2, 0x11213141 ; encoding: [0xc1,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11] 0xc1,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, -4.0, v2, 0x1121 ; encoding: [0xf7,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] -0xf7,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, -4.0, v2, 0x1121 ; encoding: [0xf7,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] +0xf7,0x04,0x0a,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, -4.0, v2, 0x11213141 ; encoding: [0xf7,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11] 0xf7,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, 0, v2, 0x1121 ; encoding: [0x80,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] -0x80,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, 0, v2, 0x1121 ; encoding: [0x80,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] +0x80,0x04,0x0a,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, 0, v2, 0x11213141 ; encoding: [0x80,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11] 0x80,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, 0.5, v2, 0x1121 ; encoding: [0xf0,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00] -0xf0,0x04,0x0a,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, 0.5, v2, 0x1121 ; encoding: [0xf0,0x04,0x0a,0x70,0x21,0x11,0x00,0x00] +0xf0,0x04,0x0a,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, 0.5, v2, 0x11213141 ; encoding: [0xf0,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11] 0xf0,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, v1, v2, 0x1121 ; encoding: [0x01,0x05,0x0a,0x5a,0x21,0x11,0x00,0x00] -0x01,0x05,0x0a,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, v1, v2, 0x1121 ; encoding: [0x01,0x05,0x0a,0x70,0x21,0x11,0x00,0x00] +0x01,0x05,0x0a,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, v1, v2, 0x11213141 ; encoding: [0x01,0x05,0x0a,0x5a,0x41,0x31,0x21,0x11] 0x01,0x05,0x0a,0x5a,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, v1, v2, 0xa1b1 ; encoding: [0x01,0x05,0x0a,0x5a,0xb1,0xa1,0x00,0x00] -0x01,0x05,0x0a,0x5a,0xb1,0xa1,0x00,0x00 +# GFX10: v_fmaak_f16 v5, v1, v2, 0xa1b1 ; encoding: [0x01,0x05,0x0a,0x70,0xb1,0xa1,0x00,0x00] +0x01,0x05,0x0a,0x70,0xb1,0xa1,0x00,0x00 # GFX10: v_fmaak_f32 v5, v1, v2, 0xa1b1c1d1 ; encoding: [0x01,0x05,0x0a,0x5a,0xd1,0xc1,0xb1,0xa1] 0x01,0x05,0x0a,0x5a,0xd1,0xc1,0xb1,0xa1 -# GFX10: v_fmaak_f32 v5, v1, v255, 0x1121 ; encoding: [0x01,0xff,0x0b,0x5a,0x21,0x11,0x00,0x00] -0x01,0xff,0x0b,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, v1, v255, 0x1121 ; encoding: [0x01,0xff,0x0b,0x70,0x21,0x11,0x00,0x00] +0x01,0xff,0x0b,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, v1, v255, 0x11213141 ; encoding: [0x01,0xff,0x0b,0x5a,0x41,0x31,0x21,0x11] 0x01,0xff,0x0b,0x5a,0x41,0x31,0x21,0x11 -# GFX10: v_fmaak_f32 v5, v255, v2, 0x1121 ; encoding: [0xff,0x05,0x0a,0x5a,0x21,0x11,0x00,0x00] -0xff,0x05,0x0a,0x5a,0x21,0x11,0x00,0x00 +# GFX10: v_fmaak_f16 v5, v255, v2, 0x1121 ; encoding: [0xff,0x05,0x0a,0x70,0x21,0x11,0x00,0x00] +0xff,0x05,0x0a,0x70,0x21,0x11,0x00,0x00 # GFX10: v_fmaak_f32 v5, v255, v2, 0x11213141 ; encoding: [0xff,0x05,0x0a,0x5a,0x41,0x31,0x21,0x11] 0xff,0x05,0x0a,0x5a,0x41,0x31,0x21,0x11 @@ -74147,41 +74147,41 @@ # GFX10: v_fmac_f32_e64 v5, |v1|, |v2| ; encoding: [0x05,0x03,0x2b,0xd5,0x01,0x05,0x02,0x00] 0x05,0x03,0x2b,0xd5,0x01,0x05,0x02,0x00 -# GFX10: v_fmamk_f32 v255, v1, 0x1121, v3 ; encoding: [0x01,0x07,0xfe,0x59,0x21,0x11,0x00,0x00] -0x01,0x07,0xfe,0x59,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v255, v1, 0x1121, v3 ; encoding: [0x01,0x07,0xfe,0x6f,0x21,0x11,0x00,0x00] +0x01,0x07,0xfe,0x6f,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v255, v1, 0x11213141, v3 ; encoding: [0x01,0x07,0xfe,0x59,0x41,0x31,0x21,0x11] 0x01,0x07,0xfe,0x59,0x41,0x31,0x21,0x11 -# GFX10: v_fmamk_f32 v5, -1, 0x1121, v3 ; encoding: [0xc1,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] -0xc1,0x06,0x0a,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, -1, 0x1121, v3 ; encoding: [0xc1,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] +0xc1,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v5, -1, 0x11213141, v3 ; encoding: [0xc1,0x06,0x0a,0x58,0x41,0x31,0x21,0x11] 0xc1,0x06,0x0a,0x58,0x41,0x31,0x21,0x11 -# GFX10: v_fmamk_f32 v5, -4.0, 0x1121, v3 ; encoding: [0xf7,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] -0xf7,0x06,0x0a,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, -4.0, 0x1121, v3 ; encoding: [0xf7,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] +0xf7,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v5, -4.0, 0x11213141, v3 ; encoding: [0xf7,0x06,0x0a,0x58,0x41,0x31,0x21,0x11] 0xf7,0x06,0x0a,0x58,0x41,0x31,0x21,0x11 -# GFX10: v_fmamk_f32 v5, 0, 0x1121, v3 ; encoding: [0x80,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] -0x80,0x06,0x0a,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, 0, 0x1121, v3 ; encoding: [0x80,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] +0x80,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v5, 0, 0x11213141, v3 ; encoding: [0x80,0x06,0x0a,0x58,0x41,0x31,0x21,0x11] 0x80,0x06,0x0a,0x58,0x41,0x31,0x21,0x11 -# GFX10: v_fmamk_f32 v5, 0.5, 0x1121, v3 ; encoding: [0xf0,0x06,0x0a,0x58,0x21,0x11,0x00,0x00] -0xf0,0x06,0x0a,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, 0.5, 0x1121, v3 ; encoding: [0xf0,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00] +0xf0,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v5, 0.5, 0x11213141, v3 ; encoding: [0xf0,0x06,0x0a,0x58,0x41,0x31,0x21,0x11] 0xf0,0x06,0x0a,0x58,0x41,0x31,0x21,0x11 -# GFX10: v_fmamk_f32 v5, v1, 0x1121, v255 ; encoding: [0x01,0xff,0x0b,0x58,0x21,0x11,0x00,0x00] -0x01,0xff,0x0b,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, v1, 0x1121, v255 ; encoding: [0x01,0xff,0x0b,0x6e,0x21,0x11,0x00,0x00] +0x01,0xff,0x0b,0x6e,0x21,0x11,0x00,0x00 -# GFX10: v_fmamk_f32 v5, v1, 0x1121, v3 ; encoding: [0x01,0x07,0x0a,0x58,0x21,0x11,0x00,0x00] -0x01,0x07,0x0a,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, v1, 0x1121, v3 ; encoding: [0x01,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00] +0x01,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v5, v1, 0x11213141, v255 ; encoding: [0x01,0xff,0x0b,0x58,0x41,0x31,0x21,0x11] 0x01,0xff,0x0b,0x58,0x41,0x31,0x21,0x11 @@ -74189,14 +74189,14 @@ # GFX10: v_fmamk_f32 v5, v1, 0x11213141, v3 ; encoding: [0x01,0x07,0x0a,0x58,0x41,0x31,0x21,0x11] 0x01,0x07,0x0a,0x58,0x41,0x31,0x21,0x11 -# GFX10: v_fmamk_f32 v5, v1, 0xa1b1, v3 ; encoding: [0x01,0x07,0x0a,0x58,0xb1,0xa1,0x00,0x00] -0x01,0x07,0x0a,0x58,0xb1,0xa1,0x00,0x00 +# GFX10: v_fmamk_f16 v5, v1, 0xa1b1, v3 ; encoding: [0x01,0x07,0x0a,0x6e,0xb1,0xa1,0x00,0x00] +0x01,0x07,0x0a,0x6e,0xb1,0xa1,0x00,0x00 # GFX10: v_fmamk_f32 v5, v1, 0xa1b1c1d1, v3 ; encoding: [0x01,0x07,0x0a,0x58,0xd1,0xc1,0xb1,0xa1] 0x01,0x07,0x0a,0x58,0xd1,0xc1,0xb1,0xa1 -# GFX10: v_fmamk_f32 v5, v255, 0x1121, v3 ; encoding: [0xff,0x07,0x0a,0x58,0x21,0x11,0x00,0x00] -0xff,0x07,0x0a,0x58,0x21,0x11,0x00,0x00 +# GFX10: v_fmamk_f16 v5, v255, 0x1121, v3 ; encoding: [0xff,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00] +0xff,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00 # GFX10: v_fmamk_f32 v5, v255, 0x11213141, v3 ; encoding: [0xff,0x07,0x0a,0x58,0x41,0x31,0x21,0x11] 0xff,0x07,0x0a,0x58,0x41,0x31,0x21,0x11 -- 2.7.4