[llvm] 8f3c160 - [AMDGPU][MC][GFX8][NFC] Consolidate tests by encoding

Dmitry Preobrazhensky via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 24 03:14:19 PDT 2022


Author: Dmitry Preobrazhensky
Date: 2022-08-24T13:13:22+03:00
New Revision: 8f3c160b8bd637179340f878df0b0958a395cac2

URL: https://github.com/llvm/llvm-project/commit/8f3c160b8bd637179340f878df0b0958a395cac2
DIFF: https://github.com/llvm/llvm-project/commit/8f3c160b8bd637179340f878df0b0958a395cac2.diff

LOG: [AMDGPU][MC][GFX8][NFC] Consolidate tests by encoding

Differential Revision: https://reviews.llvm.org/D132469

Added: 
    llvm/test/MC/Disassembler/AMDGPU/gfx8-literal.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8-literal16.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8-trap.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_mimg_features.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_mtbuf.txt

Modified: 
    llvm/test/MC/Disassembler/AMDGPU/gfx8_ds.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_mubuf.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_smem.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_sopc.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_sopk.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_sopp.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_vintrp.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_dpp.txt
    llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_sdwa.txt

Removed: 
    llvm/test/MC/Disassembler/AMDGPU/dpp_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/ds_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/exp_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/flat_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/literal16_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/literal_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/mac.txt
    llvm/test/MC/Disassembler/AMDGPU/mimg_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/mov.txt
    llvm/test/MC/Disassembler/AMDGPU/mtbuf_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/mubuf_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/nop.txt
    llvm/test/MC/Disassembler/AMDGPU/sdwa_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/smem_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/smrd_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/sop1_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/sop2_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/sopc_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/sopk_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/sopp_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/trap_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/vintrp.txt
    llvm/test/MC/Disassembler/AMDGPU/vop1.txt
    llvm/test/MC/Disassembler/AMDGPU/vop1_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/vop2_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/vop3_vi.txt
    llvm/test/MC/Disassembler/AMDGPU/vopc_vi.txt


################################################################################
diff  --git a/llvm/test/MC/Disassembler/AMDGPU/dpp_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/dpp_vi.txt
deleted file mode 100644
index f3623dd3c0247..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/dpp_vi.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[0,2,1,1] row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x58,0x00,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x58 0x00 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x01,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x01 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_shr:15 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x1f,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x1f 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_ror:12 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x2c,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x2c 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 wave_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x30,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x30 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 wave_rol:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x34,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x34 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 wave_shr:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x38,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x38 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 wave_ror:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x3c,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x3c 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x40,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x40 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_half_mirror row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x41,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x41 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_bcast:15 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x42,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x42 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 row_bcast:31 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x43,0x01,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x43 0x01 0xff
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x08,0xa1]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x08 0xa1
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xa bank_mask:0xf ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x00,0xaf]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x00 0xaf
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xf bank_mask:0x1 ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x00,0xf1]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x00 0xf1
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xf bank_mask:0xf bound_ctrl:1 ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x08,0xff]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x08 0xff
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xa bank_mask:0x1 ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x00,0xa1]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x00 0xa1
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xa bank_mask:0xf bound_ctrl:1 ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x08,0xaf]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x08 0xaf
-
-# VI: v_mov_b32_dpp v0, v0 quad_perm:[1,3,0,1] row_mask:0xf bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x02,0x00,0x7e,0x00,0x4d,0x08,0xf1]
-0xfa 0x02 0x00 0x7e 0x00 0x4d 0x08 0xf1
-
-# VI: v_cvt_u32_f32_dpp v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x0e,0x00,0x7e,0x00,0x01,0x09,0xa1]
-0xfa 0x0e 0x00 0x7e 0x00 0x01 0x09 0xa1
-
-# VI: v_fract_f32_dpp v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x36,0x00,0x7e,0x00,0x01,0x09,0xa1]
-0xfa 0x36 0x00 0x7e 0x00 0x01 0x09 0xa1
-
-# VI: v_sin_f32_dpp v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x52,0x00,0x7e,0x00,0x01,0x09,0xa1]
-0xfa 0x52 0x00 0x7e 0x00 0x01 0x09 0xa1
-
-# VI: v_add_f32_dpp v0, v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x02,0x00,0x01,0x09,0xa1]
-0xfa 0x00 0x00 0x02 0x00 0x01 0x09 0xa1
-
-# VI: v_min_f32_dpp v0, v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x14,0x00,0x01,0x09,0xa1]
-0xfa 0x00 0x00 0x14 0x00 0x01 0x09 0xa1
-
-# VI: v_and_b32_dpp v0, v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x26,0x00,0x01,0x09,0xa1]
-0xfa 0x00 0x00 0x26 0x00 0x01 0x09 0xa1
-
-# VI: v_add_f32_dpp v0, -v0, v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x02,0x00,0x01,0x19,0xa1]
-0xfa 0x00 0x00 0x02 0x00 0x01 0x19 0xa1
-
-# VI: v_add_f32_dpp v0, v0, |v0| row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x02,0x00,0x01,0x89,0xa1]
-0xfa 0x00 0x00 0x02 0x00 0x01 0x89 0xa1
-
-# VI: v_add_f32_dpp v0, -v0, |v0| row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x02,0x00,0x01,0x99,0xa1]
-0xfa 0x00 0x00 0x02 0x00 0x01 0x99 0xa1
-
-# VI: v_add_f32_dpp v0, |v0|, -v0 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x00,0x00,0x02,0x00,0x01,0x69,0xa1]
-0xfa 0x00 0x00 0x02 0x00 0x01 0x69 0xa1
-
-# VI: v_mac_f32_dpp v76, v76, v114  quad_perm:[2,3,0,1] row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0xe4,0x98,0x2c,0x4c,0x4e,0x00,0xff]
-0xfa 0xe4 0x98 0x2c 0x4c 0x4e 0x00 0xff
-
-# VI: v_mac_f16_dpp v1, v2, v3 row_shl:1 row_mask:0xa bank_mask:0x1 bound_ctrl:1 ; encoding: [0xfa,0x06,0x02,0x46,0x02,0x01,0x09,0xa1]
-0xfa 0x06 0x02 0x46 0x02 0x01 0x09 0xa1
-
-# VI: v_cndmask_b32_dpp v5, v1, v2, vcc quad_perm:[0,1,2,3] row_mask:0x0 bank_mask:0x0 ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0xe4,0x00,0x00]
-0xfa,0x04,0x0a,0x00,0x01,0xe4,0x00,0x00
-
-# VI: v_cndmask_b32_dpp v5, v1, v2, vcc row_shl:15 row_mask:0x0 bank_mask:0x0 ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x0f,0x01,0x00]
-0xfa,0x04,0x0a,0x00,0x01,0x0f,0x01,0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/ds_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/ds_vi.txt
deleted file mode 100644
index 094465776e191..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/ds_vi.txt
+++ /dev/null
@@ -1,328 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   ds_add_u32 v2, v4 offset:16 ; encoding: [0x10,0x00,0x00,0xd8,0x02,0x04,0x00,0x00]
-0x10 0x00 0x00 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_write2_b32 v2, v4, v6 offset0:4 ; encoding: [0x04,0x00,0x1c,0xd8,0x02,0x04,0x06,0x00]
-0x04 0x00 0x1c 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_write2_b32 v2, v4, v6 offset0:4 offset1:8 ; encoding: [0x04,0x08,0x1c,0xd8,0x02,0x04,0x06,0x00]
-0x04 0x08 0x1c 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_write2_b32 v2, v4, v6 offset1:8 ; encoding: [0x00,0x08,0x1c,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x08 0x1c 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_read2_b32 v[8:9], v2 offset0:4 ; encoding: [0x04,0x00,0x6e,0xd8,0x02,0x00,0x00,0x08]
-0x04 0x00 0x6e 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read2_b32 v[8:9], v2 offset0:4 offset1:8 ; encoding: [0x04,0x08,0x6e,0xd8,0x02,0x00,0x00,0x08]
-0x04 0x08 0x6e 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read2_b32 v[8:9], v2 offset1:8 ; encoding: [0x00,0x08,0x6e,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x08 0x6e 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_add_u32 v2, v4 ; encoding: [0x00,0x00,0x00,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x00 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_sub_u32 v2, v4 ; encoding: [0x00,0x00,0x02,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x02 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_rsub_u32 v2, v4 ; encoding: [0x00,0x00,0x04,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x04 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_inc_u32 v2, v4 ; encoding: [0x00,0x00,0x06,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x06 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_dec_u32 v2, v4 ; encoding: [0x00,0x00,0x08,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x08 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_min_i32 v2, v4 ; encoding: [0x00,0x00,0x0a,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x0a 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_max_i32 v2, v4 ; encoding: [0x00,0x00,0x0c,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x0c 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_min_u32 v2, v4 ; encoding: [0x00,0x00,0x0e,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x0e 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_max_u32 v2, v4 ; encoding: [0x00,0x00,0x10,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x10 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_and_b32 v2, v4 ; encoding: [0x00,0x00,0x12,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x12 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_or_b32 v2, v4 ; encoding: [0x00,0x00,0x14,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x14 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_xor_b32 v2, v4 ; encoding: [0x00,0x00,0x16,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x16 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_mskor_b32 v2, v4, v6 ; encoding: [0x00,0x00,0x18,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x18 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_write_b32 v2, v4 ; encoding: [0x00,0x00,0x1a,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x1a 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_write2_b32 v2, v4, v6 ; encoding: [0x00,0x00,0x1c,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x1c 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_write2st64_b32 v2, v4, v6 ; encoding: [0x00,0x00,0x1e,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x1e 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_cmpst_b32 v2, v4, v6 ; encoding: [0x00,0x00,0x20,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x20 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_cmpst_f32 v2, v4, v6 ; encoding: [0x00,0x00,0x22,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x22 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_min_f32 v2, v4 ; encoding: [0x00,0x00,0x24,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x24 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_max_f32 v2, v4 ; encoding: [0x00,0x00,0x26,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x26 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x02,0x00,0x00,0x00]
-0x00 0x00 0x33 0xd9 0x02 0x00 0x00,0x00
-
-# VI:   ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x33,0xd9,0x03,0x00,0x00,0x00]
-0x39 0x30 0x33 0xd9 0x03 0x00 0x00 0x00
-
-# VI:   ds_gws_sema_v gds ; encoding: [0x00,0x00,0x35,0xd9,0x00,0x00,0x00,0x00]
-0x00 0x00 0x35 0xd9 0x00 0x00 0x00 0x00
-
-# VI:   ds_gws_sema_v offset:257 gds    ; encoding: [0x01,0x01,0x35,0xd9,0x00,0x00,0x00,0x00]
-0x01 0x01 0x35 0xd9 0x00 0x00 0x00 0x00
-
-# VI:   ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x37,0xd9,0x02,0x00,0x00,0x00]
-0x00 0x00 0x37 0xd9 0x02 0x00 0x00 0x00
-
-# VI:   ds_gws_sema_p gds ; encoding: [0x00,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
-0x00 0x00 0x39 0xd9 0x00 0x00 0x00 0x00
-
-# VI:   ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x3b,0xd9,0x02,0x00,0x00,0x00]
-0x00 0x00 0x3b 0xd9 0x02 0x00 0x00 0x00
-
-# VI:   ds_write_b8 v2, v4 ; encoding: [0x00,0x00,0x3c,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x3c 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_write_b16 v2, v4 ; encoding: [0x00,0x00,0x3e,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x3e 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_add_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x40,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x40 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_sub_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x42,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x42 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_rsub_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x44,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x44 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_inc_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x46,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x46 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_dec_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x48,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x48 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_min_rtn_i32 v8, v2, v4 ; encoding: [0x00,0x00,0x4a,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x4a 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_max_rtn_i32 v8, v2, v4 ; encoding: [0x00,0x00,0x4c,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x4c 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_min_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x4e,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x4e 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_max_rtn_u32 v8, v2, v4 ; encoding: [0x00,0x00,0x50,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x50 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_and_rtn_b32 v8, v2, v4 ; encoding: [0x00,0x00,0x52,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x52 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_or_rtn_b32 v8, v2, v4 ; encoding: [0x00,0x00,0x54,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x54 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_xor_rtn_b32 v8, v2, v4 ; encoding: [0x00,0x00,0x56,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x56 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_mskor_rtn_b32 v8, v2, v4, v6 ; encoding: [0x00,0x00,0x58,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0x58 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_wrxchg_rtn_b32 v8, v2, v4 ; encoding: [0x00,0x00,0x5a,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x5a 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_wrxchg2_rtn_b32 v[8:9], v2, v4, v6 ; encoding: [0x00,0x00,0x5c,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0x5c 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_wrxchg2st64_rtn_b32 v[8:9], v2, v4, v6 ; encoding: [0x00,0x00,0x5e,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0x5e 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_cmpst_rtn_b32 v8, v2, v4, v6 ; encoding: [0x00,0x00,0x60,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0x60 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_cmpst_rtn_f32 v8, v2, v4, v6 ; encoding: [0x00,0x00,0x62,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0x62 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_min_rtn_f32 v8, v2, v4 ; encoding: [0x00,0x00,0x64,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x64 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_max_rtn_f32 v8, v2, v4 ; encoding: [0x00,0x00,0x66,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0x66 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_swizzle_b32 v8, v2 ; encoding: [0x00,0x00,0x7a,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x7a 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_swizzle_b32 v8, v2 gds ; encoding: [0x00,0x00,0x7b,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x7b 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read_b32 v8, v2 ; encoding: [0x00,0x00,0x6c,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x6c 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read2_b32 v[8:9], v2 ; encoding: [0x00,0x00,0x6e,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x6e 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read2st64_b32 v[8:9], v2 ; encoding: [0x00,0x00,0x70,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x70 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read_i8 v8, v2 ; encoding: [0x00,0x00,0x72,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x72 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read_u8 v8, v2 ; encoding: [0x00,0x00,0x74,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x74 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read_i16 v8, v2 ; encoding: [0x00,0x00,0x76,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x76 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read_u16 v8, v2 ; encoding: [0x00,0x00,0x78,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0x78 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_add_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x80,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x80 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_sub_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x82,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x82 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_rsub_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x84,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x84 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_inc_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x86,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x86 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_dec_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x88,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x88 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_min_i64 v2, v[4:5] ; encoding: [0x00,0x00,0x8a,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x8a 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_max_i64 v2, v[4:5] ; encoding: [0x00,0x00,0x8c,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x8c 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_min_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x8e,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x8e 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_max_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x90,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x90 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_and_b64 v2, v[4:5] ; encoding: [0x00,0x00,0x92,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x92 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_or_b64 v2, v[4:5] ; encoding: [0x00,0x00,0x94,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x94 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_xor_b64 v2, v[4:5] ; encoding: [0x00,0x00,0x96,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x96 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_mskor_b64 v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0x98,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x98 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_write_b64 v2, v[4:5] ; encoding: [0x00,0x00,0x9a,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0x9a 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_write2_b64 v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0x9c,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x9c 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_write2st64_b64 v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0x9e,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0x9e 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_cmpst_b64 v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xa0,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0xa0 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_cmpst_f64 v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xa2,0xd8,0x02,0x04,0x06,0x00]
-0x00 0x00 0xa2 0xd8 0x02 0x04 0x06 0x00
-
-# VI:   ds_min_f64 v2, v[4:5] ; encoding: [0x00,0x00,0xa4,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0xa4 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_max_f64 v2, v[4:5] ; encoding: [0x00,0x00,0xa6,0xd8,0x02,0x04,0x00,0x00]
-0x00 0x00 0xa6 0xd8 0x02 0x04 0x00 0x00
-
-# VI:   ds_add_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xc0,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xc0 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_sub_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xc2,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xc2 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_rsub_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xc4,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xc4 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_inc_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xc6,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xc6 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_dec_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xc8,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xc8 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_min_rtn_i64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xca,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xca 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_max_rtn_i64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xcc,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xcc 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_min_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xce,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xce 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_max_rtn_u64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xd0,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xd0 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_and_rtn_b64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xd2,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xd2 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_or_rtn_b64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xd4,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xd4 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_xor_rtn_b64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xd6,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xd6 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_mskor_rtn_b64 v[8:9], v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xd8,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0xd8 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_wrxchg_rtn_b64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xda,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xda 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_wrxchg2_rtn_b64 v[8:11], v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xdc,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0xdc 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_wrxchg2st64_rtn_b64 v[8:11], v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xde,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0xde 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_cmpst_rtn_b64 v[8:9], v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xe0,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0xe0 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_cmpst_rtn_f64 v[8:9], v2, v[4:5], v[6:7] ; encoding: [0x00,0x00,0xe2,0xd8,0x02,0x04,0x06,0x08]
-0x00 0x00 0xe2 0xd8 0x02 0x04 0x06 0x08
-
-# VI:   ds_min_rtn_f64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xe4,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xe4 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_max_rtn_f64 v[8:9], v2, v[4:5] ; encoding: [0x00,0x00,0xe6,0xd8,0x02,0x04,0x00,0x08]
-0x00 0x00 0xe6 0xd8 0x02 0x04 0x00 0x08
-
-# VI:   ds_read_b64 v[8:9], v2 ; encoding: [0x00,0x00,0xec,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0xec 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read2_b64 v[8:11], v2 ; encoding: [0x00,0x00,0xee,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0xee 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_read2st64_b64 v[8:11], v2 ; encoding: [0x00,0x00,0xf0,0xd8,0x02,0x00,0x00,0x08]
-0x00 0x00 0xf0 0xd8 0x02 0x00 0x00 0x08
-
-# VI:   ds_add_src2_f32 v0 offset:4 gds ; encoding: [0x04,0x00,0x2b,0xd9,0x00,0x00,0x00,0x00]
-0x04,0x00,0x2b,0xd9,0x00,0x00,0x00,0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/exp_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/exp_vi.txt
deleted file mode 100644
index 9291fb807839a..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/exp_vi.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: exp mrt0 v1, v2, v3, v4    ; encoding: [0x0f,0x00,0x00,0xc4,0x01,0x02,0x03,0x04]
-0x0f,0x00,0x00,0xc4,0x01,0x02,0x03,0x04
-
-# VI: exp mrt0 v1, v2, v3, v4 vm    ; encoding: [0x0f,0x10,0x00,0xc4,0x01,0x02,0x03,0x04]
-0x0f,0x10,0x00,0xc4,0x01,0x02,0x03,0x04
-
-# VI: exp mrt0 v1, v1, v3, v3 compr    ; encoding: [0x0f,0x04,0x00,0xc4,0x01,0x03,0x00,0x00]
-0x0f,0x04,0x00,0xc4,0x01,0x03,0x00,0x00
-
-# VI: exp mrt0 v1, v2, v3, v4 done    ; encoding: [0x0f,0x08,0x00,0xc4,0x01,0x02,0x03,0x04]
-0x0f,0x08,0x00,0xc4,0x01,0x02,0x03,0x04
-
-# VI: exp mrt0 v2, v2, v4, v4 done compr vm    ; encoding: [0x0f,0x1c,0x00,0xc4,0x02,0x04,0x00,0x00]
-0x0f,0x1c,0x00,0xc4,0x02,0x04,0x00,0x00
-
-# VI: exp mrt0 v7, off, off, off vm    ; encoding: [0x01,0x10,0x00,0xc4,0x07,0x00,0x00,0x00]
-0x01,0x10,0x00,0xc4,0x07,0x00,0x00,0x00
-
-# VI: exp mrt0 off, off, v1, v2    ; encoding: [0x0c,0x00,0x00,0xc4,0x00,0x00,0x01,0x02]
-0x0c,0x00,0x00,0xc4,0x00,0x00,0x01,0x02
-
-# VI: exp mrt0 off, off, v8, v8 done compr    ; encoding: [0x0c,0x0c,0x00,0xc4,0x00,0x08,0x00,0x00]
-0x0c,0x0c,0x00,0xc4,0x00,0x08,0x00,0x00
-
-# VI: exp mrt0 v1, v1, off, off compr   ; encoding: [0x03,0x04,0x00,0xc4,0x01,0x00,0x00,0x00]
-0x03,0x04,0x00,0xc4,0x01,0x00,0x00,0x00
-
-# VI: exp param0 off, off, off, off compr    ; encoding: [0x00,0x06,0x00,0xc4,0x00,0x00,0x00,0x00]
-0x00,0x06,0x00,0xc4,0x00,0x00,0x00,0x00
-
-# VI: exp mrtz v0, off, off, off done vm    ; encoding: [0x81,0x18,0x00,0xc4,0x00,0x00,0x00,0x00]
-0x81,0x18,0x00,0xc4,0x00,0x00,0x00,0x00
-
-# VI: exp null v255, v0, v255, v0    ; encoding: [0x9f,0x00,0x00,0xc4,0xff,0x00,0xff,0x00]
-0x9f,0x00,0x00,0xc4,0xff,0x00,0xff,0x00
-
-# VI: exp pos0 v1, off, off, off    ; encoding: [0xc1,0x00,0x00,0xc4,0x01,0x00,0x00,0x00]
-0xc1,0x00,0x00,0xc4,0x01,0x00,0x00,0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/flat_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/flat_vi.txt
deleted file mode 100644
index bcc395078050f..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/flat_vi.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: flat_load_dword v1, v[3:4] ; encoding: [0x00,0x00,0x50,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x50 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_dword v1, v[3:4] glc ; encoding: [0x00,0x00,0x51,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x51 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_dword v1, v[3:4] glc slc ; encoding: [0x00,0x00,0x53,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x53 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_dword v1, v[3:4] slc ; encoding: [0x00,0x00,0x52,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x52 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_atomic_add v1, v[3:4], v5 glc slc ; encoding: [0x00,0x00,0x0b,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x0b 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_add v[3:4], v5 slc ; encoding: [0x00,0x00,0x0a,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x0a 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_load_ubyte v1, v[3:4] ; encoding: [0x00,0x00,0x40,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x40 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_sbyte v1, v[3:4] ; encoding: [0x00,0x00,0x44,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x44 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_ushort v1, v[3:4] ; encoding: [0x00,0x00,0x48,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x48 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_sshort v1, v[3:4] ; encoding: [0x00,0x00,0x4c,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x4c 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_dword v1, v[3:4] ; encoding: [0x00,0x00,0x50,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x50 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_dwordx2 v[1:2], v[3:4] ; encoding: [0x00,0x00,0x54,0xdc,0x03,0x00,0x00,0x01]
-0x00 0x00 0x54 0xdc 0x03 0x00 0x00 0x01
-
-# VI: flat_load_dwordx4 v[5:8], v[3:4] ; encoding: [0x00,0x00,0x5c,0xdc,0x03,0x00,0x00,0x05]
-0x00 0x00 0x5c 0xdc 0x03 0x00 0x00 0x05
-
-# VI: flat_load_dwordx3 v[5:7], v[3:4] ; encoding: [0x00,0x00,0x58,0xdc,0x03,0x00,0x00,0x05]
-0x00 0x00 0x58 0xdc 0x03 0x00 0x00 0x05
-
-# VI: flat_store_dwordx4 v[3:4], v[5:8] ; encoding: [0x00,0x00,0x7c,0xdc,0x03,0x05,0x00,0x00]
-0x00 0x00 0x7c 0xdc 0x03 0x05 0x00 0x00
-
-# VI: flat_store_dwordx3 v[3:4], v[5:7] ; encoding: [0x00,0x00,0x78,0xdc,0x03,0x05,0x00,0x00]
-0x00 0x00 0x78 0xdc 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_swap v[3:4], v5 ; encoding: [0x00,0x00,0x00,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x00 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_swap v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x01,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x01 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_cmpswap v[3:4], v[5:6] ; encoding: [0x00,0x00,0x04,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x04 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_cmpswap v1, v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x05,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x05 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_add v[3:4], v5 ; encoding: [0x00,0x00,0x08,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x08 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_add v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x09,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x09 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_sub v[3:4], v5 ; encoding: [0x00,0x00,0x0c,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x0c 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_sub v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x0d,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x0d 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_smin v[3:4], v5 ; encoding: [0x00,0x00,0x10,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x10 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_smin v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x11,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x11 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_umin v[3:4], v5 ; encoding: [0x00,0x00,0x14,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x14 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_umin v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x15,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x15 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_smax v[3:4], v5 ; encoding: [0x00,0x00,0x18,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x18 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_smax v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x19,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x19 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_umax v[3:4], v5 ; encoding: [0x00,0x00,0x1c,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x1c 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_umax v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x1d,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x1d 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_and v[3:4], v5 ; encoding: [0x00,0x00,0x20,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x20 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_and v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x21,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x21 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_or v[3:4], v5 ; encoding: [0x00,0x00,0x24,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x24 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_or v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x25,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x25 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_xor v[3:4], v5 ; encoding: [0x00,0x00,0x28,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x28 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_xor v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x29,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x29 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_inc v[3:4], v5 ; encoding: [0x00,0x00,0x2c,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x2c 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_inc v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x2d,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x2d 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_dec v[3:4], v5 ; encoding: [0x00,0x00,0x30,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x30 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_dec v1, v[3:4], v5 glc ; encoding: [0x00,0x00,0x31,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x31 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_swap_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x80,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x80 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_swap_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x81,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x81 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_cmpswap_x2 v[3:4], v[5:8] ; encoding: [0x00,0x00,0x84,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x84 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_cmpswap_x2 v[1:2], v[3:4], v[5:8] glc ; encoding: [0x00,0x00,0x85,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x85 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_add_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x88,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x88 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_add_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x89,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x89 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_sub_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x8c,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x8c 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_sub_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x8d,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x8d 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_smin_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x90,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x90 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_smin_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x91,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x91 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_umin_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x94,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x94 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_umin_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x95,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x95 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_smax_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x98,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x98 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_smax_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x99,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x99 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_umax_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0x9c,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0x9c 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_umax_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0x9d,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0x9d 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_and_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0xa0,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0xa0 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_and_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0xa1,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0xa1 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_or_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0xa4,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0xa4 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_or_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0xa5,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0xa5 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_xor_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0xa8,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0xa8 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_xor_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0xa9,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0xa9 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_inc_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0xac,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0xac 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_inc_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0xad,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0xad 0xdd 0x03 0x05 0x00 0x01
-
-# VI: flat_atomic_dec_x2 v[3:4], v[5:6] ; encoding: [0x00,0x00,0xb0,0xdd,0x03,0x05,0x00,0x00]
-0x00 0x00 0xb0 0xdd 0x03 0x05 0x00 0x00
-
-# VI: flat_atomic_dec_x2 v[1:2], v[3:4], v[5:6] glc ; encoding: [0x00,0x00,0xb1,0xdd,0x03,0x05,0x00,0x01]
-0x00 0x00 0xb1 0xdd 0x03 0x05 0x00 0x01

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/literal_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8-literal.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/literal_vi.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx8-literal.txt

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/literal16_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8-literal16.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/literal16_vi.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx8-literal16.txt

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/trap_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8-trap.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/trap_vi.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx8-trap.txt

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_ds.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_ds.txt
index caef8c8db946a..73c40dee8523d 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_ds.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_ds.txt
@@ -2678,3 +2678,12 @@
 
 # CHECK: ds_read_b128 v[5:8], v1 offset:65535 gds ; encoding: [0xff,0xff,0xff,0xd9,0x01,0x00,0x00,0x05]
 0xff,0xff,0xff,0xd9,0x01,0x00,0x00,0x05
+
+# CHECK: ds_add_src2_f32 v1                      ; encoding: [0x00,0x00,0x2a,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x2a,0xd9,0x01,0x00,0x00,0x00
+
+# CHECK: ds_add_src2_f32 v1 offset:65535         ; encoding: [0xff,0xff,0x2a,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x2a,0xd9,0x01,0x00,0x00,0x00
+
+# CHECK: ds_add_src2_f32 v255 offset:4 gds       ; encoding: [0x04,0x00,0x2b,0xd9,0xff,0x00,0x00,0x00]
+0x04,0x00,0x2b,0xd9,0xff,0x00,0x00,0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/mimg_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_mimg_features.txt
similarity index 99%
rename from llvm/test/MC/Disassembler/AMDGPU/mimg_vi.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx8_mimg_features.txt
index 1566779a28fa7..cc59789c62be5 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/mimg_vi.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_mimg_features.txt
@@ -99,6 +99,7 @@
 # GFX80: image_store v[0:4], v4, s[8:15] dmask:0xf tfe d16 ; encoding: [0x00,0x0f,0x21,0xf0,0x04,0x00,0x02,0x80]
 # GFX81: image_store v[0:2], v4, s[8:15] dmask:0xf tfe d16 ; encoding: [0x00,0x0f,0x21,0xf0,0x04,0x00,0x02,0x80]
 0x00,0x0f,0x21,0xf0,0x04,0x00,0x02,0x80
+
 #===------------------------------------------------------------------------===#
 # Image load/store: PCK variants
 #===------------------------------------------------------------------------===#

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/mtbuf_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_mtbuf.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/mtbuf_vi.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx8_mtbuf.txt

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_mubuf.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_mubuf.txt
index 0445d900cfc80..d0c9ddf9beecc 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_mubuf.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_mubuf.txt
@@ -2879,3 +2879,60 @@
 
 # CHECK: buffer_atomic_dec_x2 v[5:6], off, s[8:11], s3 offset:4095 slc ; encoding: [0xff,0x0f,0xb2,0xe1,0x00,0x05,0x02,0x03]
 0xff,0x0f,0xb2,0xe1,0x00,0x05,0x02,0x03
+
+# CHECK: buffer_store_lds_dword s[4:7], s2 lds   ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x02]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x02
+
+# CHECK: buffer_store_lds_dword s[4:7], s101 lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x65]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x65
+
+# CHECK: buffer_store_lds_dword s[4:7], ttmp11 lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7b]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7b
+
+# CHECK: buffer_store_lds_dword s[4:7], flat_scratch_hi lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x67]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x67
+
+# CHECK: buffer_store_lds_dword s[4:7], flat_scratch_lo lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x66]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x66
+
+# CHECK: buffer_store_lds_dword s[4:7], vcc_hi lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6b]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6b
+
+# CHECK: buffer_store_lds_dword s[4:7], vcc_lo lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6a]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6a
+
+# CHECK: buffer_store_lds_dword s[4:7], tba_hi lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6d]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6d
+
+# CHECK: buffer_store_lds_dword s[4:7], tba_lo lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6c]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6c
+
+# CHECK: buffer_store_lds_dword s[4:7], tma_hi lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6f]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6f
+
+# CHECK: buffer_store_lds_dword s[4:7], tma_lo lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6e]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x6e
+
+# CHECK: buffer_store_lds_dword s[4:7], m0 lds   ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7c]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7c
+
+# CHECK: buffer_store_lds_dword s[4:7], exec_hi lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7f]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7f
+
+# CHECK: buffer_store_lds_dword s[4:7], exec_lo lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7e]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x7e
+
+# CHECK: buffer_store_lds_dword s[4:7], -1 lds   ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0xc1]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0xc1
+
+# CHECK: buffer_store_lds_dword s[4:7], 0.5 lds  ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0xf0]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0xf0
+
+# CHECK: buffer_store_lds_dword s[4:7], src_vccz lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0xfb]
+0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0xfb
+
+# CHECK: buffer_store_lds_dword s[96:99], src_execz offset:4095 lds ; encoding: [0xff,0x0f,0xf5,0xe0,0x00,0x00,0x18,0xfc]
+0xff,0x0f,0xf5,0xe0,0x00,0x00,0x18,0xfc
+
+# CHECK: buffer_store_lds_dword ttmp[8:11], src_scc offset:7 lds glc slc ; encoding: [0x07,0x40,0xf7,0xe0,0x00,0x00,0x1e,0xfd]
+0x07,0x40,0xf7,0xe0,0x00,0x00,0x1e,0xfd

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_smem.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_smem.txt
index 874562012358c..8d3670cd62f9c 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_smem.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_smem.txt
@@ -1063,3 +1063,44 @@
 
 # CHECK: s_memrealtime ttmp[10:11]               ; encoding: [0x80,0x1e,0x94,0xc0,0x00,0x00,0x00,0x00]
 0x80,0x1e,0x94,0xc0,0x00,0x00,0x00,0x00
+
+# CHECK: s_atc_probe 7, s[4:5], s0               ; encoding: [0xc2,0x01,0x98,0xc0,0x00,0x00,0x00,0x00]
+0xc2,0x01,0x98,0xc0,0x00,0x00,0x00,0x00
+
+# CHECK: s_atc_probe 0, s[4:5], 0x0              ; encoding: [0x02,0x00,0x9a,0xc0,0x00,0x00,0x00,0x00]
+0x02,0x00,0x9a,0xc0,0x00,0x00,0x00,0x00
+
+# CHECK: s_atc_probe_buffer 1, s[8:11], s0       ; encoding: [0x44,0x00,0x9c,0xc0,0x00,0x00,0x00,0x00]
+0x44,0x00,0x9c,0xc0,0x00,0x00,0x00,0x00
+
+# CHECK: s_atc_probe_buffer 0, s[8:11], s101     ; encoding: [0x04,0x00,0x9c,0xc0,0x65,0x00,0x00,0x00]
+0x04,0x00,0x9c,0xc0,0x65,0x00,0x00,0x00
+
+#===------------------------------------------------------------------------===#
+# Unsigned 20-bit offsets
+#===------------------------------------------------------------------------===#
+
+# CHECK: s_atc_probe 7, s[4:5], 0xfffff          ; encoding: [0xc2,0x01,0x9a,0xc0,0xff,0xff,0x0f,0x00]
+0xc2,0x01,0x9a,0xc0,0xff,0xff,0x0f,0x00
+
+# CHECK: s_atc_probe_buffer 1, s[8:11], 0xfffff  ; encoding: [0x44,0x00,0x9e,0xc0,0xff,0xff,0x0f,0x00]
+0x44,0x00,0x9e,0xc0,0xff,0xff,0x0f,0x00
+
+# CHECK: s_load_dword s1, s[2:3], 0xfffff        ; encoding: [0x41,0x00,0x02,0xc0,0xff,0xff,0x0f,0x00]
+0x41,0x00,0x02,0xc0,0xff,0xff,0x0f,0x00
+
+# CHECK: s_store_dword s1, s[2:3], 0xfffff       ; encoding: [0x41,0x00,0x42,0xc0,0xff,0xff,0x0f,0x00]
+0x41,0x00,0x42,0xc0,0xff,0xff,0x0f,0x00
+
+# CHECK: s_buffer_store_dword s10, s[92:95], 0xfffff ; encoding: [0xae,0x02,0x62,0xc0,0xff,0xff,0x0f,0x00]
+0xae,0x02,0x62,0xc0,0xff,0xff,0x0f,0x00
+
+#===------------------------------------------------------------------------===#
+# Decoding of invalid (21-bit) buffer offsets
+#===------------------------------------------------------------------------===#
+
+# CHECK: s_store_dword s1, s[2:3], 0xfffff       ; encoding: [0x41,0x00,0x42,0xc0,0xff,0xff,0x0f,0x00]
+0x41,0x00,0x42,0xc0,0xff,0xff,0x1f,0x00
+
+# CHECK: s_buffer_store_dword s10, s[92:95], 0xfffff ; encoding: [0xae,0x02,0x62,0xc0,0xff,0xff,0x0f,0x00]
+0xae,0x02,0x62,0xc0,0xff,0xff,0x1f,0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopc.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopc.txt
index 8d05f25911603..9adae0dfa002a 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopc.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopc.txt
@@ -2019,6 +2019,9 @@
 # CHECK: s_set_gpr_idx_on s1, gpr_idx(SRC0,SRC1,SRC2,DST) ; encoding: [0x01,0x0f,0x11,0xbf]
 0x01,0x0f,0x11,0xbf
 
+# CHECK: s_set_gpr_idx_on s0, 0xff               ; encoding: [0x00,0xff,0x11,0xbf]
+0x00,0xff,0x11,0xbf
+
 # CHECK: s_cmp_eq_u64 s[2:3], s[4:5]             ; encoding: [0x02,0x04,0x12,0xbf]
 0x02,0x04,0x12,0xbf
 

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopk.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopk.txt
index 1672cb06ac29e..6293dfad0ef51 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopk.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopk.txt
@@ -840,6 +840,12 @@
 # CHECK: s_setreg_b32 hwreg(HW_REG_MODE, 5, 7), exec_hi ; encoding: [0x41,0x31,0x7f,0xb9]
 0x41,0x31,0x7f,0xb9
 
+# CHECK: s_setreg_b32 hwreg(HW_REG_LDS_ALLOC, 0, 1), s2 ; encoding: [0x06,0x00,0x02,0xb9]
+0x06 0x00 0x02 0xb9
+
+# CHECK: s_setreg_imm32_b32 hwreg(HW_REG_GPR_ALLOC, 1, 31), 0xff ; encoding: [0x45,0xf0,0x00,0xba,0xff,0x00,0x00,0x00]
+0x45 0xf0 0x00 0xba 0xff 0x00 0x00 0x00
+
 # CHECK: s_setreg_imm32_b32 hwreg(HW_REG_MODE, 5, 7), 0x11213141 ; encoding: [0x41,0x31,0x00,0xba,0x41,0x31,0x21,0x11]
 0x41,0x31,0x00,0xba,0x41,0x31,0x21,0x11
 

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopp.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopp.txt
index 65aed7df6c481..0857e58a89a23 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopp.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_sopp.txt
@@ -63,11 +63,35 @@
 # CHECK: s_setkill 0xc1d1                        ; encoding: [0xd1,0xc1,0x8b,0xbf]
 0xd1,0xc1,0x8b,0xbf
 
-# CHECK: s_waitcnt vmcnt(1) expcnt(4) lgkmcnt(1) ; encoding: [0x41,0x31,0x8c,0xbf]
-0x41,0x31,0x8c,0xbf
+# CHECK: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
+0x00 0x00 0x8c 0xbf
 
-# CHECK: s_waitcnt vmcnt(1) expcnt(5) lgkmcnt(1) ; encoding: [0xd1,0xc1,0x8c,0xbf]
-0xd1,0xc1,0x8c,0xbf
+# CHECK: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
+0x00 0x00 0x8c 0xbf
+
+# CHECK: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
+0x00 0x00 0x8c 0xbf
+
+# CHECK: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
+0x00 0x00 0x8c 0xbf
+
+# CHECK: s_waitcnt vmcnt(1)                      ; encoding: [0x71,0x0f,0x8c,0xbf]
+0x71 0x0f 0x8c 0xbf
+
+# CHECK: s_waitcnt vmcnt(9)                      ; encoding: [0x79,0x0f,0x8c,0xbf]
+0x79 0x0f 0x8c 0xbf
+
+# CHECK: s_waitcnt expcnt(2)                     ; encoding: [0x2f,0x0f,0x8c,0xbf]
+0x2f 0x0f 0x8c 0xbf
+
+# CHECK: s_waitcnt lgkmcnt(3)                    ; encoding: [0x7f,0x03,0x8c,0xbf]
+0x7f 0x03 0x8c 0xbf
+
+# CHECK: s_waitcnt lgkmcnt(9)                    ; encoding: [0x7f,0x09,0x8c,0xbf]
+0x7f 0x09 0x8c 0xbf
+
+# CHECK: s_waitcnt vmcnt(0) expcnt(0)            ; encoding: [0x00,0x0f,0x8c,0xbf]
+0x00 0x0f 0x8c 0xbf
 
 # CHECK: s_sethalt 0x3141                        ; encoding: [0x41,0x31,0x8d,0xbf]
 0x41,0x31,0x8d,0xbf
@@ -87,17 +111,62 @@
 # CHECK: s_setprio 0xc1d1                        ; encoding: [0xd1,0xc1,0x8f,0xbf]
 0xd1,0xc1,0x8f,0xbf
 
-# CHECK: s_sendmsg 12609                         ; encoding: [0x41,0x31,0x90,0xbf]
-0x41,0x31,0x90,0xbf
+# CHECK: s_sendmsg sendmsg(2, 0, 0)              ; encoding: [0x02,0x00,0x90,0xbf]
+0x02 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_INTERRUPT)        ; encoding: [0x01,0x00,0x90,0xbf]
+0x01 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_GS, GS_OP_CUT, 0) ; encoding: [0x12,0x00,0x90,0xbf]
+0x12 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT, 1) ; encoding: [0x22,0x01,0x90,0xbf]
+0x22 0x01 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT_CUT, 2) ; encoding: [0x32,0x02,0x90,0xbf]
+0x32 0x02 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_NOP) ; encoding: [0x03,0x00,0x90,0xbf]
+0x03 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_SAVEWAVE)         ; encoding: [0x04,0x00,0x90,0xbf]
+0x04 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(11, 0, 0)             ; encoding: [0x0b,0x00,0x90,0xbf]
+0x0b 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(MSG_SYSMSG, SYSMSG_OP_ECC_ERR_INTERRUPT) ; encoding: [0x1f,0x00,0x90,0xbf]
+0x1f 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(15, 6, 0)             ; encoding: [0x6f,0x00,0x90,0xbf]
+0x6f 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(1, 3, 0)              ; encoding: [0x31,0x00,0x90,0xbf]
+0x31 0x00 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(1, 3, 2)              ; encoding: [0x31,0x02,0x90,0xbf]
+0x31 0x02 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(2, 0, 1)              ; encoding: [0x02,0x01,0x90,0xbf]
+0x02 0x01 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(4, 0, 1)              ; encoding: [0x04,0x01,0x90,0xbf]
+0x04 0x01 0x90 0xbf
+
+# CHECK: s_sendmsg sendmsg(15, 7, 3)             ; encoding: [0x7f,0x03,0x90,0xbf]
+0x7f 0x03 0x90 0xbf
+
+# CHECK: s_sendmsg 4567                          ; encoding: [0xd7,0x11,0x90,0xbf]
+0xd7 0x11 0x90 0xbf
 
-# CHECK: s_sendmsg 49617                         ; encoding: [0xd1,0xc1,0x90,0xbf]
-0xd1,0xc1,0x90,0xbf
+# CHECK: s_sendmsghalt sendmsg(MSG_GS_DONE, GS_OP_NOP) ; encoding: [0x03,0x00,0x91,0xbf]
+0x03 0x00 0x91 0xbf
 
-# CHECK: s_sendmsghalt 12609                     ; encoding: [0x41,0x31,0x91,0xbf]
-0x41,0x31,0x91,0xbf
+# CHECK: s_sendmsghalt sendmsg(MSG_GS, GS_OP_EMIT, 1) ; encoding: [0x22,0x01,0x91,0xbf]
+0x22 0x01 0x91 0xbf
 
-# CHECK: s_sendmsghalt 49617                     ; encoding: [0xd1,0xc1,0x91,0xbf]
-0xd1,0xc1,0x91,0xbf
+# CHECK: s_sendmsghalt sendmsg(15, 6, 0)         ; encoding: [0x6f,0x00,0x91,0xbf]
+0x6f 0x00 0x91 0xbf
 
 # CHECK: s_trap 0x3141                           ; encoding: [0x41,0x31,0x92,0xbf]
 0x41,0x31,0x92,0xbf

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_vintrp.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_vintrp.txt
index c6652eeb528f5..a960c4ac61843 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_vintrp.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_vintrp.txt
@@ -1,4 +1,5 @@
 # RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck -strict-whitespace %s
+# RUN: llvm-mc -arch=amdgcn -mcpu=fiji -disassemble -show-encoding < %s | FileCheck -strict-whitespace %s
 
 # CHECK: v_interp_p1_f32_e32 v5, v1, attr0.x     ; encoding: [0x01,0x00,0x14,0xd4]
 0x01,0x00,0x14,0xd4
@@ -83,3 +84,9 @@
 
 # CHECK: v_interp_mov_f32_e32 v5, p10, attr0.w   ; encoding: [0x00,0x03,0x16,0xd4]
 0x00,0x03,0x16,0xd4
+
+# CHECK: v_interp_mov_f32_e32 v7, invalid_param_212, attr16.y ; encoding: [0xd4,0x41,0x1e,0xd4]
+0xd4 0x41 0x1e 0xd4
+
+# CHECK: v_interp_mov_f32_e32 v7, p10, attr16.y  ; encoding: [0x00,0x41,0x1e,0xd4]
+0x00 0x41 0x1e 0xd4

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_dpp.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_dpp.txt
index 0902522c060d4..892c27b342a8c 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_dpp.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_dpp.txt
@@ -3851,3 +3851,51 @@
 
 # CHECK: v_ldexp_f16_dpp v5, |v1|, v2 quad_perm:[0,1,2,3] row_mask:0x0 bank_mask:0x0 ; encoding: [0xfa,0x04,0x0a,0x66,0x01,0xe4,0x20,0x00]
 0xfa,0x04,0x0a,0x66,0x01,0xe4,0x20,0x00
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc quad_perm:[0,1,2,3] row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0xe4,0x00,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0xe4,0x00,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc quad_perm:[3,2,1,0] row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x1b,0x00,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x1b,0x00,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_mirror row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x40,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x40,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_half_mirror row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x41,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x41,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_bcast:15 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x42,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x42,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_bcast:31 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x43,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x43,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc wave_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x30,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x30,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc wave_rol:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x34,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x34,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc wave_shr:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x38,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x38,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc wave_ror:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x3c,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x3c,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_shl:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x01,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x01,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_shl:15 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x0f,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x0f,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_shr:1 row_mask:0xf bank_mask:0xf ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x11,0x01,0xff]
+0xfa,0x04,0x0a,0x00,0x01,0x11,0x01,0xff
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_shr:15 row_mask:0x0 bank_mask:0x1 ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x1f,0x01,0x01]
+0xfa,0x04,0x0a,0x00,0x01,0x1f,0x01,0x01
+
+# CHECK: v_cndmask_b32_dpp v5, v1, v2, vcc row_ror:1 row_mask:0x1 bank_mask:0x3 ; encoding: [0xfa,0x04,0x0a,0x00,0x01,0x21,0x01,0x13]
+0xfa,0x04,0x0a,0x00,0x01,0x21,0x01,0x13
+
+# CHECK: v_cndmask_b32_dpp v255, v255, v255, vcc row_ror:15 row_mask:0x3 bank_mask:0x0 bound_ctrl:1 ; encoding: [0xfa,0xfe,0xff,0x01,0xff,0x2f,0x09,0x30]
+0xfa,0xfe,0xff,0x01,0xff,0x2f,0x09,0x30

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_sdwa.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_sdwa.txt
index dc32b1a2a36bc..12d78527ede0d 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_sdwa.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx8_vop2_sdwa.txt
@@ -3803,3 +3803,24 @@
 
 # CHECK: v_ldexp_f16_sdwa v5, v1, sext(v2) dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:DWORD src1_sel:DWORD ; encoding: [0xf9,0x04,0x0a,0x66,0x01,0x06,0x06,0x0e]
 0xf9,0x04,0x0a,0x66,0x01,0x06,0x06,0x0e
+
+# CHECK: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:BYTE_0 src1_sel:WORD_0 ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x16,0x00,0x04]
+0xf9,0x04,0x0a,0x00,0x01,0x16,0x00,0x04
+
+# CHECK: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:BYTE_0 dst_unused:UNUSED_PRESERVE src0_sel:BYTE_1 src1_sel:DWORD ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x10,0x01,0x06]
+0xf9,0x04,0x0a,0x00,0x01,0x10,0x01,0x06
+
+# CHECK: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:BYTE_1 dst_unused:UNUSED_PRESERVE src0_sel:BYTE_2 src1_sel:BYTE_0 ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x11,0x02,0x00]
+0xf9,0x04,0x0a,0x00,0x01,0x11,0x02,0x00
+
+# CHECK: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:BYTE_2 dst_unused:UNUSED_PRESERVE src0_sel:BYTE_3 src1_sel:BYTE_1 ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x12,0x03,0x01]
+0xf9,0x04,0x0a,0x00,0x01,0x12,0x03,0x01
+
+# CHECK: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:BYTE_3 dst_unused:UNUSED_PRESERVE src0_sel:WORD_0 src1_sel:BYTE_2 ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x13,0x04,0x02]
+0xf9,0x04,0x0a,0x00,0x01,0x13,0x04,0x02
+
+# CHECK: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:WORD_0 dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_3 ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x04,0x05,0x03]
+0xf9,0x04,0x0a,0x00,0x01,0x04,0x05,0x03
+
+# CHECK: v_cndmask_b32_sdwa v255, sext(v255), sext(v255), vcc dst_sel:WORD_1 dst_unused:UNUSED_SEXT src0_sel:DWORD src1_sel:WORD_1 ; encoding: [0xf9,0xfe,0xff,0x01,0xff,0x0d,0x0e,0x0d]
+0xf9,0xfe,0xff,0x01,0xff,0x0d,0x0e,0x0d

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/mac.txt b/llvm/test/MC/Disassembler/AMDGPU/mac.txt
deleted file mode 100644
index 7f7f952655a40..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/mac.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: v_mac_f32_e64 v0, v1, v2 mul:2  ; encoding: [0x00,0x00,0x16,0xd1,0x01,0x05,0x02,0x08]
-0x00 0x00 0x16 0xd1 0x01 0x05 0x02 0x08
-
-# VI: v_mac_f32_e64 v0, v1, v2 clamp  ; encoding: [0x00,0x80,0x16,0xd1,0x01,0x05,0x02,0x00]
-0x00 0x80 0x16 0xd1 0x01 0x05 0x02 0x00
-
-# VI: v_mac_f32_e64 v0, v1, v2 clamp mul:2 ; encoding: [0x00,0x80,0x16,0xd1,0x01,0x05,0x02,0x08]
-0x00 0x80 0x16 0xd1 0x01 0x05 0x02 0x08
-
-# VI: v_mac_f16_e64 v0, v1, v2 mul:2  ; encoding: [0x00,0x00,0x23,0xd1,0x01,0x05,0x02,0x08]
-0x00 0x00 0x23 0xd1 0x01 0x05 0x02 0x08
-
-# VI: v_mac_f16_e64 v0, v1, v2 clamp  ; encoding: [0x00,0x80,0x23,0xd1,0x01,0x05,0x02,0x00]
-0x00 0x80 0x23 0xd1 0x01 0x05 0x02 0x00
-
-# VI: v_mac_f16_e64 v0, v1, v2 clamp mul:2 ; encoding: [0x00,0x80,0x23,0xd1,0x01,0x05,0x02,0x08]
-0x00 0x80 0x23 0xd1 0x01 0x05 0x02 0x08

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/mov.txt b/llvm/test/MC/Disassembler/AMDGPU/mov.txt
deleted file mode 100644
index 3b6ba4210b83c..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/mov.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s
-
-# CHECK: v_mov_b32_e32 v2, v1         ; encoding: [0x01,0x03,0x04,0x7e]
-0x01 0x03 0x04 0x7e
-
-# CHECK: v_mov_b32_e32 v1, 0.5         ; encoding: [0xf0,0x02,0x02,0x7e]
-0xf0 0x02 0x02 0x7e
-
-# CHECK: v_mov_b32_e32 v15, s100         ; encoding: [0x64,0x02,0x1e,0x7e]
-0x64 0x02 0x1e 0x7e
-
-# CHECK: v_mov_b32_e32 v90, flat_scratch_lo         ; encoding: [0x66,0x02,0xb4,0x7e]
-0x66 0x02 0xb4 0x7e
-
-# CHECK: v_mov_b32_e32 v150, vcc_lo         ; encoding: [0x6a,0x02,0x2c,0x7f]
-0x6a 0x02 0x2c 0x7f
-
-# CHECK: v_mov_b32_e32 v199, exec_lo         ; encoding: [0x7e,0x02,0x8e,0x7f]
-0x7e 0x02 0x8e 0x7f
-
-# CHECK: v_mov_b32_e32 v222, m0         ; encoding: [0x7c,0x02,0xbc,0x7f]
-0x7c 0x02 0xbc 0x7f
-
-# CHECK: v_mov_b32_e32 v255, -13         ; encoding: [0xcd,0x02,0xfe,0x7f]
-0xcd 0x02 0xfe 0x7f
-
-# CHECK: v_cvt_f32_i32_e32 v153, s98         ; encoding: [0x62,0x0a,0x32,0x7f]
-0x62 0x0a 0x32 0x7f
-
-# CHECK: v_cvt_f32_u32_e32 v33, -4.0         ; encoding: [0xf7,0x0c,0x42,0x7e]
-0xf7 0x0c 0x42 0x7e
\ No newline at end of file

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/mubuf_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/mubuf_vi.txt
deleted file mode 100644
index 76343b4bea641..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/mubuf_vi.txt
+++ /dev/null
@@ -1,416 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x50,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x50 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 offset:4 ; encoding: [0x04,0x00,0x50,0xe0,0x00,0x01,0x01,0x01]
-0x04 0x00 0x50 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 offset:4 glc ; encoding: [0x04,0x40,0x50,0xe0,0x00,0x01,0x01,0x01]
-0x04 0x40 0x50 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 offset:4 slc ; encoding: [0x04,0x00,0x52,0xe0,0x00,0x01,0x01,0x01]
-0x04 0x00 0x52 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 offset:4 tfe ; encoding: [0x04,0x00,0x50,0xe0,0x00,0x01,0x81,0x01]
-0x04 0x00 0x50 0xe0 0x00 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 glc tfe ; encoding: [0x00,0x40,0x50,0xe0,0x00,0x01,0x81,0x01]
-0x00 0x40 0x50 0xe0 0x00 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 offset:4 glc slc tfe ; encoding: [0x04,0x40,0x52,0xe0,0x00,0x01,0x81,0x01]
-0x04 0x40 0x52 0xe0 0x00 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen ; encoding: [0x00,0x10,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x00 0x10 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen offset:4 ; encoding: [0x04,0x10,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x10 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen offset:4 glc ; encoding: [0x04,0x50,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x50 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen offset:4 slc ; encoding: [0x04,0x10,0x52,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x10 0x52 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen offset:4 tfe ; encoding: [0x04,0x10,0x50,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x10 0x50 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen glc tfe ; encoding: [0x00,0x50,0x50,0xe0,0x02,0x01,0x81,0x01]
-0x00 0x50 0x50 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 offen offset:4 glc slc tfe ; encoding: [0x04,0x50,0x52,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x50 0x52 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen ; encoding: [0x00,0x20,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x00 0x20 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen offset:4 ; encoding: [0x04,0x20,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x20 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen offset:4 glc ; encoding: [0x04,0x60,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x60 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen offset:4 slc ; encoding: [0x04,0x20,0x52,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x20 0x52 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen offset:4 tfe ; encoding: [0x04,0x20,0x50,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x20 0x50 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen glc tfe ; encoding: [0x00,0x60,0x50,0xe0,0x02,0x01,0x81,0x01]
-0x00 0x60 0x50 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v2, s[4:7], s1 idxen offset:4 glc slc tfe ; encoding: [0x04,0x60,0x52,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x60 0x52 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen ; encoding: [0x00,0x30,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x00 0x30 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 ; encoding: [0x04,0x30,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x30 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 glc ; encoding: [0x04,0x70,0x50,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x70 0x50 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 slc ; encoding: [0x04,0x30,0x52,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x30 0x52 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 tfe ; encoding: [0x04,0x30,0x50,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x30 0x50 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen glc tfe ; encoding: [0x00,0x70,0x50,0xe0,0x02,0x01,0x81,0x01]
-0x00 0x70 0x50 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 glc slc tfe ; encoding: [0x04,0x70,0x52,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x70 0x52 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x70,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x70 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 offset:4 ; encoding: [0x04,0x00,0x70,0xe0,0x00,0x01,0x01,0x01]
-0x04 0x00 0x70 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 offset:4 glc ; encoding: [0x04,0x40,0x70,0xe0,0x00,0x01,0x01,0x01]
-0x04 0x40 0x70 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 offset:4 slc ; encoding: [0x04,0x00,0x72,0xe0,0x00,0x01,0x01,0x01]
-0x04 0x00 0x72 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 offset:4 tfe ; encoding: [0x04,0x00,0x70,0xe0,0x00,0x01,0x81,0x01]
-0x04 0x00 0x70 0xe0 0x00 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 glc tfe ; encoding: [0x00,0x40,0x70,0xe0,0x00,0x01,0x81,0x01]
-0x00 0x40 0x70 0xe0 0x00 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 offset:4 glc slc tfe ; encoding: [0x04,0x40,0x72,0xe0,0x00,0x01,0x81,0x01]
-0x04 0x40 0x72 0xe0 0x00 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen ; encoding: [0x00,0x10,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x00 0x10 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen offset:4 ; encoding: [0x04,0x10,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x10 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen offset:4 glc ; encoding: [0x04,0x50,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x50 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen offset:4 slc ; encoding: [0x04,0x10,0x72,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x10 0x72 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen offset:4 tfe ; encoding: [0x04,0x10,0x70,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x10 0x70 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen glc tfe ; encoding: [0x00,0x50,0x70,0xe0,0x02,0x01,0x81,0x01]
-0x00 0x50 0x70 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 offen offset:4 glc slc tfe ; encoding: [0x04,0x50,0x72,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x50 0x72 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen ; encoding: [0x00,0x20,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x00 0x20 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen offset:4 ; encoding: [0x04,0x20,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x20 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen offset:4 glc ; encoding: [0x04,0x60,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x60 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen offset:4 slc ; encoding: [0x04,0x20,0x72,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x20 0x72 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen offset:4 tfe ; encoding: [0x04,0x20,0x70,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x20 0x70 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen glc tfe ; encoding: [0x00,0x60,0x70,0xe0,0x02,0x01,0x81,0x01]
-0x00 0x60 0x70 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v2, s[4:7], s1 idxen offset:4 glc slc tfe ; encoding: [0x04,0x60,0x72,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x60 0x72 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen ; encoding: [0x00,0x30,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x00 0x30 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 ; encoding: [0x04,0x30,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x30 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 glc ; encoding: [0x04,0x70,0x70,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x70 0x70 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 slc ; encoding: [0x04,0x30,0x72,0xe0,0x02,0x01,0x01,0x01]
-0x04 0x30 0x72 0xe0 0x02 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 tfe ; encoding: [0x04,0x30,0x70,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x30 0x70 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen glc tfe ; encoding: [0x00,0x70,0x70,0xe0,0x02,0x01,0x81,0x01]
-0x00 0x70 0x70 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_store_dword v1, v[2:3], s[4:7], s1 idxen offen offset:4 glc slc tfe ; encoding: [0x04,0x70,0x72,0xe0,0x02,0x01,0x81,0x01]
-0x04 0x70 0x72 0xe0 0x02 0x01 0x81 0x01
-
-# VI:   buffer_load_format_x v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x00,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x00 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_format_xy v[1:2], off, s[4:7], s1 ; encoding: [0x00,0x00,0x04,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x04 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_format_xyz v[1:3], off, s[4:7], s1 ; encoding: [0x00,0x00,0x08,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x08 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_format_xyzw v[1:4], off, s[4:7], s1 ; encoding: [0x00,0x00,0x0c,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x0c 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_format_x v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x10,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x10 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_format_xy v[1:2], off, s[4:7], s1 ; encoding: [0x00,0x00,0x14,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x14 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_format_xyz v[1:3], off, s[4:7], s1 ; encoding: [0x00,0x00,0x18,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x18 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_format_xyzw v[1:4], off, s[4:7], s1 ; encoding: [0x00,0x00,0x1c,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x1c 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_ubyte v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x40,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x40 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_sbyte v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x44,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x44 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_ushort v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x48,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x48 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_sshort v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x4c,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x4c 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dword v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x50,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x50 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dwordx2 v[1:2], off, s[4:7], s1 ; encoding: [0x00,0x00,0x54,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x54 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_load_dwordx3 v[0:2], off, s[4:7], s0 offset:4095 ; encoding: [0xff,0x0f,0x58,0xe0,0x00,0x00,0x01,0x00]
-0xff,0x0f,0x58,0xe0,0x00,0x00,0x01,0x00
-
-# VI:   buffer_load_dwordx4 v[1:4], off, s[4:7], s1 ; encoding: [0x00,0x00,0x5c,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x5c 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_byte v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x60,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x60 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_short v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x68,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x68 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dword v1, off, s[4:7], s1 ; encoding: [0x00,0x00,0x70,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x70 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dwordx2 v[1:2], off, s[4:7], s1 ; encoding: [0x00,0x00,0x74,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x74 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_store_dwordx3 v[0:2], off, s[4:7], s0 offset:4095 ; encoding: [0xff,0x0f,0x78,0xe0,0x00,0x00,0x01,0x00]
-0xff,0x0f,0x78,0xe0,0x00,0x00,0x01,0x00
-
-# VI:   buffer_store_dwordx4 v[1:4], off, s[4:7], s1 ; encoding: [0x00,0x00,0x7c,0xe0,0x00,0x01,0x01,0x01]
-0x00 0x00 0x7c 0xe0 0x00 0x01 0x01 0x01
-
-# VI:   buffer_wbinvl1   ; encoding: [0x00,0x00,0xf8,0xe0,0x00,0x00,0x00,0x00]
-0x00 0x00 0xf8 0xe0 0x00 0x00 0x00 0x00
-
-# VI: buffer_wbinvl1_vol ; encoding: [0x00,0x00,0xfc,0xe0,0x00,0x00,0x00,0x00]
-0x00 0x00 0xfc 0xe0 0x00 0x00 0x00 0x00
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 ; encoding: [0x00,0x00,0x2c,0xe1,0x00,0x01,0x02,0xb8]
-0x00 0x00 0x2c 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 slc ; encoding: [0x00,0x00,0x2e,0xe1,0x00,0x01,0x02,0xb8]
-0x00 0x00 0x2e 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], s4 slc ; encoding: [0x00,0x00,0x2e,0xe1,0x00,0x01,0x02,0x04]
-0x00 0x00 0x2e 0xe1 0x00 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 offset:4 ; encoding: [0x04,0x00,0x2c,0xe1,0x00,0x01,0x02,0xb8]
-0x04 0x00 0x2c 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 offset:4 slc ; encoding: [0x04,0x00,0x2e,0xe1,0x00,0x01,0x02,0xb8]
-0x04 0x00 0x2e 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen ; encoding: [0x00,0x10,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x10 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen slc ; encoding: [0x00,0x10,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x10 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen offset:4 ; encoding: [0x04,0x10,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x10 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], s4 offen offset:4 ; encoding: [0x04,0x10,0x2c,0xe1,0x02,0x01,0x02,0x04]
-0x04 0x10 0x2c 0xe1 0x02 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen offset:4 slc ; encoding: [0x04,0x10,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x10 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen ; encoding: [0x00,0x20,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x20 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen slc ; encoding: [0x00,0x20,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x20 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen offset:4 ; encoding: [0x04,0x20,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x20 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen offset:4 slc ; encoding: [0x04,0x20,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x20 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], s4 idxen offset:4 slc ; encoding: [0x04,0x20,0x2e,0xe1,0x02,0x01,0x02,0x04]
-0x04 0x20 0x2e 0xe1 0x02 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen ; encoding: [0x00,0x30,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x30 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], s4 idxen offen ; encoding: [0x00,0x30,0x2c,0xe1,0x02,0x01,0x02,0x04]
-0x00 0x30 0x2c 0xe1 0x02 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen slc ; encoding: [0x00,0x30,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x30 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen offset:4 ; encoding: [0x04,0x30,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x30 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen offset:4 slc ; encoding: [0x04,0x30,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x30 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 glc ; encoding: [0x00,0x40,0x2c,0xe1,0x00,0x01,0x02,0xb8]
-0x00 0x40 0x2c 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 glc slc ; encoding: [0x00,0x40,0x2e,0xe1,0x00,0x01,0x02,0xb8]
-0x00 0x40 0x2e 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], s4 glc slc ; encoding: [0x00,0x40,0x2e,0xe1,0x00,0x01,0x02,0x04]
-0x00 0x40 0x2e 0xe1 0x00 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 offset:4 glc ; encoding: [0x04,0x40,0x2c,0xe1,0x00,0x01,0x02,0xb8]
-0x04 0x40 0x2c 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, off, s[8:11], 56 offset:4 glc slc ; encoding: [0x04,0x40,0x2e,0xe1,0x00,0x01,0x02,0xb8]
-0x04 0x40 0x2e 0xe1 0x00 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen glc ; encoding: [0x00,0x50,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x50 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen glc slc ; encoding: [0x00,0x50,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x50 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen offset:4 glc ; encoding: [0x04,0x50,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x50 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], s4 offen offset:4 glc ; encoding: [0x04,0x50,0x2c,0xe1,0x02,0x01,0x02,0x04]
-0x04 0x50 0x2c 0xe1 0x02 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 offen offset:4 glc slc ; encoding: [0x04,0x50,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x50 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen glc ; encoding: [0x00,0x60,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x60 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen glc slc ; encoding: [0x00,0x60,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x60 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen offset:4 glc ; encoding: [0x04,0x60,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x60 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], 56 idxen offset:4 glc slc ; encoding: [0x04,0x60,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x60 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v2, s[8:11], s4 idxen offset:4 glc slc ; encoding: [0x04,0x60,0x2e,0xe1,0x02,0x01,0x02,0x04]
-0x04 0x60 0x2e 0xe1 0x02 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen glc ; encoding: [0x00,0x70,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x70 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], s4 idxen offen glc ; encoding: [0x00,0x70,0x2c,0xe1,0x02,0x01,0x02,0x04]
-0x00 0x70 0x2c 0xe1 0x02 0x01 0x02 0x04
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen glc slc ; encoding: [0x00,0x70,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x00 0x70 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen offset:4 glc ; encoding: [0x04,0x70,0x2c,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x70 0x2c 0xe1 0x02 0x01 0x02 0xb8
-
-# VI:   buffer_atomic_inc v1, v[2:3], s[8:11], 56 idxen offen offset:4 glc slc ; encoding: [0x04,0x70,0x2e,0xe1,0x02,0x01,0x02,0xb8]
-0x04 0x70 0x2e 0xe1 0x02 0x01 0x02 0xb8
-
-#===------------------------------------------------------------------------===#
-# Lds support
-#===------------------------------------------------------------------------===#
-
-# VI:   buffer_load_sbyte off, s[8:11], s3 lds ; encoding: [0x00,0x00,0x45,0xe0,0x00,0x00,0x02,0x03]
-0x00,0x00,0x45,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte off, s[8:11], s3 lds ; encoding: [0x00,0x00,0x45,0xe0,0x00,0x00,0x02,0x03]
-0x00,0x00,0x45,0xe0,0x00,0x05,0x02,0x03
-
-# VI:   buffer_load_sbyte off, s[8:11], s3 glc slc lds ; encoding: [0x00,0x40,0x47,0xe0,0x00,0x00,0x02,0x03]
-0x00,0x40,0x47,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte off, s[8:11], s3 offset:4095 glc slc lds ; encoding: [0xff,0x4f,0x47,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x4f,0x47,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte v0, s[8:11], s3 offen offset:4095 slc lds ; encoding: [0xff,0x1f,0x47,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x1f,0x47,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte v0, s[8:11], s3 offen lds ; encoding: [0x00,0x10,0x45,0xe0,0x00,0x00,0x02,0x03]
-0x00,0x10,0x45,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte v0, s[8:11], s3 idxen glc slc lds ; encoding: [0x00,0x60,0x47,0xe0,0x00,0x00,0x02,0x03]
-0x00,0x60,0x47,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte v[0:1], s[8:11], s3 idxen offen offset:4095 lds ; encoding: [0xff,0x3f,0x45,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x3f,0x45,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sbyte v[0:1], s[8:11], s3 idxen offen offset:4095 glc slc lds ; encoding: [0xff,0x7f,0x47,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x7f,0x47,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_ubyte off, s[8:11], s3 offset:4095 lds ; encoding: [0xff,0x0f,0x41,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x0f,0x41,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_sshort v0, s[8:11], s3 offen offset:4095 glc slc lds ; encoding: [0xff,0x5f,0x4f,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x5f,0x4f,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_ushort v0, s[8:11], s3 idxen offset:4095 glc slc lds ; encoding: [0xff,0x6f,0x4b,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x6f,0x4b,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_load_dword v0, s[8:11], s101 offen lds ; encoding: [0x00,0x10,0x51,0xe0,0x00,0x00,0x02,0x65]
-0x00,0x10,0x51,0xe0,0x00,0x00,0x02,0x65
-
-# VI:   buffer_load_format_x v[0:1], s[8:11], s3 idxen offen offset:4095 glc slc lds ; encoding: [0xff,0x7f,0x03,0xe0,0x00,0x00,0x02,0x03]
-0xff,0x7f,0x03,0xe0,0x00,0x00,0x02,0x03
-
-# VI:   buffer_store_lds_dword s[4:7], s0 lds ; encoding: [0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x00]
-0x00,0x00,0xf5,0xe0,0x00,0x00,0x01,0x00
-
-# VI:   buffer_store_lds_dword s[4:7], s0 offset:4095 lds ; encoding: [0xff,0x0f,0xf5,0xe0,0x00,0x00,0x01,0x00]
-0xff,0x0f,0xf5,0xe0,0x00,0x00,0x01,0x00
-
-# VI:   buffer_store_lds_dword s[4:7], s8 offset:4 lds glc slc ; encoding: [0x04,0x40,0xf7,0xe0,0x00,0x00,0x01,0x08]
-0x04,0x40,0xf7,0xe0,0x00,0x00,0x01,0x08

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/nop.txt b/llvm/test/MC/Disassembler/AMDGPU/nop.txt
deleted file mode 100644
index d27c0bc6a583a..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/nop.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s
-
-# CHECK: v_nop              ; encoding: [0x00,0x00,0x00,0x7e]
-0x00 0x00 0x00 0x7e
-
-# CHECK: v_nop              ; encoding: [0x00,0x00,0x00,0x7e]
-0x80 0x00 0x00 0x7e

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/sdwa_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/sdwa_vi.txt
deleted file mode 100644
index f2cc73f67e309..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/sdwa_vi.txt
+++ /dev/null
@@ -1,376 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: v_mov_b32_sdwa v1, v2 dst_sel:BYTE_0 dst_unused:UNUSED_PRESERVE src0_sel:DWORD ; encoding: [0xf9,0x02,0x02,0x7e,0x02,0x10,0x06,0x00]
-0xf9 0x02 0x02 0x7e 0x02 0x10 0x06 0x00
-
-# VI: v_mov_b32_sdwa v3, v4 dst_sel:BYTE_1 dst_unused:UNUSED_PRESERVE src0_sel:WORD_1 ; encoding: [0xf9,0x02,0x06,0x7e,0x04,0x11,0x05,0x00]
-0xf9 0x02 0x06 0x7e 0x04 0x11 0x05 0x00
-
-# VI: v_mov_b32_sdwa v15, v99 dst_sel:BYTE_2 dst_unused:UNUSED_SEXT src0_sel:WORD_0 ; encoding: [0xf9,0x02,0x1e,0x7e,0x63,0x0a,0x04,0x00]
-0xf9 0x02 0x1e 0x7e 0x63 0x0a 0x04 0x00
-
-# VI: v_min_u32_sdwa v194, v13, v1 dst_sel:BYTE_3 dst_unused:UNUSED_SEXT src0_sel:BYTE_3 src1_sel:BYTE_2 ; encoding: [0xf9,0x02,0x84,0x1d,0x0d,0x0b,0x03,0x02]
-0xf9 0x02 0x84 0x1d 0x0d 0x0b 0x03 0x02
-
-# VI: v_min_u32_sdwa v255, v4, v1 dst_sel:WORD_0 dst_unused:UNUSED_PAD src0_sel:BYTE_2 src1_sel:WORD_1 ; encoding: [0xf9,0x02,0xfe,0x1d,0x04,0x04,0x02,0x05]
-0xf9 0x02 0xfe 0x1d 0x04 0x04 0x02 0x05
-
-# VI: v_min_u32_sdwa v200, v200, v1 dst_sel:WORD_1 dst_unused:UNUSED_PAD src0_sel:BYTE_1 src1_sel:DWORD ; encoding: [0xf9,0x02,0x90,0x1d,0xc8,0x05,0x01,0x06]
-0xf9 0x02 0x90 0x1d 0xc8 0x05 0x01 0x06
-
-# VI: v_min_u32_sdwa v1, v1, v1 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:BYTE_0 src1_sel:DWORD ; encoding: [0xf9,0x02,0x02,0x1c,0x01,0x06,0x00,0x06]
-0xf9 0x02 0x02 0x1c 0x01 0x06 0x00 0x06
-
-# VI: v_cvt_u32_f32_sdwa v0, v0 dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:DWORD ; encoding: [0xf9,0x0e,0x00,0x7e,0x00,0x16,0x06,0x00]
-0xf9 0x0e 0x00 0x7e 0x00 0x16 0x06 0x00
-
-# VI: v_fract_f32_sdwa v0, v0 clamp dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:DWORD ; encoding: [0xf9,0x36,0x00,0x7e,0x00,0x26,0x06,0x00]
-0xf9 0x36 0x00 0x7e 0x00 0x26 0x06 0x00
-
-# VI: v_sin_f32_sdwa v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x52,0x00,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x52 0x00 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_mov_b32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:WORD_1 ; encoding: [0xf9,0x02,0x02,0x7e,0x00,0x16,0x05,0x00]
-0xf9 0x02 0x02 0x7e 0x00 0x16 0x05 0x00
-
-# VI: v_trunc_f32_sdwa v1, v0 clamp dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:WORD_1 ; encoding: [0xf9,0x38,0x02,0x7e,0x00,0x36,0x05,0x00]
-0xf9 0x38 0x02 0x7e 0x00 0x36 0x05 0x00
-
-# VI: v_mov_b32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:DWORD ; encoding: [0xf9,0x02,0x02,0x7e,0x00,0x16,0x06,0x00]
-0xf9 0x02 0x02 0x7e 0x00 0x16 0x06 0x00
-
-# VI: v_add_f32_sdwa v0, v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:DWORD ; encoding: [0xf9,0x00,0x00,0x02,0x00,0x06,0x05,0x06]
-0xf9 0x00 0x00 0x02 0x00 0x06 0x05 0x06
-
-# VI: v_min_f32_sdwa v0, v0, v0 clamp dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:DWORD src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x14,0x00,0x36,0x06,0x02]
-0xf9 0x00 0x00 0x14 0x00 0x36 0x06 0x02
-
-# VI: v_and_b32_sdwa v0, v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:DWORD src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x26,0x00,0x06,0x06,0x02]
-0xf9 0x00 0x00 0x26 0x00 0x06 0x06 0x02
-
-# VI: v_mul_i32_i24_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PRESERVE src0_sel:DWORD src1_sel:DWORD ; encoding: [0xf9,0x06,0x02,0x0c,0x02,0x16,0x06,0x06]
-0xf9 0x06 0x02 0x0c 0x02 0x16 0x06 0x06
-
-# VI: v_fract_f32_sdwa v0, |v0| dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x36,0x00,0x7e,0x00,0x06,0x25,0x00]
-0xf9 0x36 0x00 0x7e 0x00 0x06 0x25 0x00
-
-# VI: v_sin_f32_sdwa v0, -|v0| dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x52,0x00,0x7e,0x00,0x06,0x35,0x00]
-0xf9 0x52 0x00 0x7e 0x00 0x06 0x35 0x00
-
-# VI: v_add_f32_sdwa v0, -|v0|, -v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x02,0x00,0x06,0x35,0x12]
-0xf9 0x00 0x00 0x02 0x00 0x06 0x35 0x12
-
-# VI: v_min_f32_sdwa v0, |v0|, -v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x14,0x00,0x06,0x25,0x12]
-0xf9 0x00 0x00 0x14 0x00 0x06 0x25 0x12
-
-# VI: v_nop ; encoding: [0xf9,0x00,0x00,0x7e,0x00,0x00,0x00,0x00]
-0xf9 0x00 0x00 0x7e 0x00 0x00 0x00 0x00
-
-# VI: v_cvt_u32_f32_sdwa v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x0e,0x00,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x0e 0x00 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_fract_f32_sdwa v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x36,0x00,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x36 0x00 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_sin_f32_sdwa v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x52,0x00,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x52 0x00 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_mov_b32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x02,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x02 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_i32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x0a,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x0a 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_u32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x0c,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x0c 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_i32_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x10,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x10 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f16_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x14,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x14 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x16,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x16 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_rpi_i32_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x18,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x18 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_flr_i32_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x1a,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x1a 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_off_f32_i4_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x1c,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x1c 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_ubyte0_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x22,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x22 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_ubyte1_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x24,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x24 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_ubyte2_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x26,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x26 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f32_ubyte3_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x28,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x28 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_trunc_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x38,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x38 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_ceil_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x3a,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x3a 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rndne_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x3c,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x3c 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_floor_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x3e,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x3e 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_exp_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x40,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x40 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_log_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x42,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x42 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rcp_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x44,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x44 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rcp_iflag_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x46,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x46 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rsq_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x48,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x48 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_sqrt_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x4e,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x4e 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cos_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x54,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x54 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_not_b32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x56,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x56 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_bfrev_b32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x58,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x58 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_ffbh_u32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x5a,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x5a 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_ffbl_b32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x5c,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x5c 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_ffbh_i32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x5e,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x5e 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_frexp_exp_i32_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x66,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x66 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_frexp_mant_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x68,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x68 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_log_legacy_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x98,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x98 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_exp_legacy_f32_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x96,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x96 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f16_u16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x72,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x72 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_f16_i16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x74,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x74 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_u16_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x76,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x76 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cvt_i16_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x78,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x78 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rcp_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x7a,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x7a 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_sqrt_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x7c,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x7c 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rsq_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x7e,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x7e 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_log_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x80,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x80 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_exp_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x82,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x82 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_frexp_mant_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x84,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x84 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_frexp_exp_i16_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x86,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x86 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_floor_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x88,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x88 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_ceil_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x8a,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x8a 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_trunc_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x8c,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x8c 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_rndne_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x8e,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x8e 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_fract_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x90,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x90 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_sin_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x92,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x92 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_cos_f16_sdwa v1, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 ; encoding: [0xf9,0x94,0x02,0x7e,0x00,0x06,0x05,0x00]
-0xf9 0x94 0x02 0x7e 0x00 0x06 0x05 0x00
-
-# VI: v_add_f32_sdwa v0, v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x02,0x00,0x06,0x05,0x02]
-0xf9 0x00 0x00 0x02 0x00 0x06 0x05 0x02
-
-# VI: v_min_f32_sdwa v0, v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x14,0x00,0x06,0x05,0x02]
-0xf9 0x00 0x00 0x14 0x00 0x06 0x05 0x02
-
-# VI: v_and_b32_sdwa v0, v0, v0 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x00,0x00,0x26,0x00,0x06,0x05,0x02]
-0xf9 0x00 0x00 0x26 0x00 0x06 0x05 0x02
-
-# VI: v_mul_i32_i24_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x0c,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x0c 0x02 0x06 0x05 0x02
-
-# VI: v_sub_f32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x04,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x04 0x02 0x06 0x05 0x02
-
-# VI: v_subrev_f32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x06,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x06 0x02 0x06 0x05 0x02
-
-# VI: v_mul_f32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x0a,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x0a 0x02 0x06 0x05 0x02
-
-# VI: v_mul_hi_i32_i24_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x0e,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x0e 0x02 0x06 0x05 0x02
-
-# VI: v_mul_u32_u24_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x10,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x10 0x02 0x06 0x05 0x02
-
-# VI: v_mul_hi_u32_u24_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x12,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x12 0x02 0x06 0x05 0x02
-
-# VI: v_max_f32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x16,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x16 0x02 0x06 0x05 0x02
-
-# VI: v_min_i32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x18,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x18 0x02 0x06 0x05 0x02
-
-# VI: v_max_i32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x1a,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x1a 0x02 0x06 0x05 0x02
-
-# VI: v_min_u32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x1c,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x1c 0x02 0x06 0x05 0x02
-
-# VI: v_max_u32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x1e,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x1e 0x02 0x06 0x05 0x02
-
-# VI: v_lshrrev_b32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x20,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x20 0x02 0x06 0x05 0x02
-
-# VI: v_ashrrev_i32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x22,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x22 0x02 0x06 0x05 0x02
-
-# VI: v_lshlrev_b32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x24,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x24 0x02 0x06 0x05 0x02
-
-# VI: v_or_b32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x28,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x28 0x02 0x06 0x05 0x02
-
-# VI: v_xor_b32_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x2a,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x2a 0x02 0x06 0x05 0x02
-
-# VI: v_add_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x3e,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x3e 0x02 0x06 0x05 0x02
-
-# VI: v_sub_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x40,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x40 0x02 0x06 0x05 0x02
-
-# VI: v_subrev_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x42,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x42 0x02 0x06 0x05 0x02
-
-# VI: v_mul_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x44,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x44 0x02 0x06 0x05 0x02
-
-# VI: v_mac_f32_sdwa v15, v99, v194 dst_sel:DWORD dst_unused:UNUSED_SEXT src0_sel:WORD_0 src1_sel:DWORD ; encoding: [0xf9,0x84,0x1f,0x2c,0x63,0x0e,0x04,0x06]
-0xf9 0x84 0x1f 0x2c 0x63 0x0e 0x04 0x06
-
-# VI: v_mac_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x46,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x46 0x02 0x06 0x05 0x02
-
-# VI: v_add_u16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x4c,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x4c 0x02 0x06 0x05 0x02
-
-# VI: v_sub_u16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x4e,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x4e 0x02 0x06 0x05 0x02
-
-# VI: v_subrev_u16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x50,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x50 0x02 0x06 0x05 0x02
-
-# VI: v_mul_lo_u16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x52,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x52 0x02 0x06 0x05 0x02
-
-# VI: v_lshlrev_b16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x54,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x54 0x02 0x06 0x05 0x02
-
-# VI: v_lshrrev_b16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x56,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x56 0x02 0x06 0x05 0x02
-
-# VI: v_ashrrev_i16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x58,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x58 0x02 0x06 0x05 0x02
-
-# VI: v_max_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x5a,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x5a 0x02 0x06 0x05 0x02
-
-# VI: v_min_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x5c,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x5c 0x02 0x06 0x05 0x02
-
-# VI: v_max_u16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x5e,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x5e 0x02 0x06 0x05 0x02
-
-# VI: v_max_i16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x60,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x60 0x02 0x06 0x05 0x02
-
-# VI: v_min_u16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x62,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x62 0x02 0x06 0x05 0x02
-
-# VI: v_min_i16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x64,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x64 0x02 0x06 0x05 0x02
-
-# VI: v_ldexp_f16_sdwa v1, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x66,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x66 0x02 0x06 0x05 0x02
-
-# VI: v_add_u32_sdwa v1, vcc, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x32,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x32 0x02 0x06 0x05 0x02
-
-# VI: v_sub_u32_sdwa v1, vcc, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x34,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x34 0x02 0x06 0x05 0x02
-
-# VI: v_subrev_u32_sdwa v1, vcc, v2, v3 dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x36,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x36 0x02 0x06 0x05 0x02
-
-# VI: v_addc_u32_sdwa v1, vcc, v2, v3, vcc  dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x38,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x38 0x02 0x06 0x05 0x02
-
-# VI: v_subb_u32_sdwa v1, vcc, v2, v3, vcc  dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x3a,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x3a 0x02 0x06 0x05 0x02
-
-# VI: v_subbrev_u32_sdwa v1, vcc, v2, v3, vcc  dst_sel:DWORD dst_unused:UNUSED_PAD src0_sel:WORD_1 src1_sel:BYTE_2 ; encoding: [0xf9,0x06,0x02,0x3c,0x02,0x06,0x05,0x02]
-0xf9 0x06 0x02 0x3c 0x02 0x06 0x05 0x02
-
-# VI: v_cndmask_b32_sdwa v5, v1, v2, vcc dst_sel:BYTE_0 dst_unused:UNUSED_PAD src0_sel:DWORD src1_sel:DWORD ; encoding: [0xf9,0x04,0x0a,0x00,0x01,0x00,0x06,0x06]
-0xf9,0x04,0x0a,0x00,0x01,0x00,0x06,0x06
-
-# VI: v_cmp_lt_f32 vcc, v2, v4 src0_sel:BYTE_1 src1_sel:DWORD ; encoding: [0xf9,0x08,0x82,0x7c,0x02,0x00,0x01,0x06]
-0xf9,0x08,0x82,0x7c,0x02,0x00,0x01,0x06
-
-# VI: v_cmp_lt_f32 vcc, v2, v4 src0_sel:BYTE_1 src1_sel:DWORD ; encoding: [0xf9,0x08,0x82,0x7c,0x02,0x00,0x01,0x06]
-0xf9,0x08,0x82,0x7c,0x02,0x06,0x01,0x06

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/smem_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/smem_vi.txt
deleted file mode 100644
index 7551265796f2f..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/smem_vi.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: s_dcache_wb  ; encoding: [0x00,0x00,0x84,0xc0,0x00,0x00,0x00,0x00]
-0x00 0x00 0x84 0xc0 0x00 0x00 0x00 0x00
-
-# VI: s_dcache_wb_vol ; encoding: [0x00,0x00,0x8c,0xc0,0x00,0x00,0x00,0x00]
-0x00 0x00 0x8c 0xc0 0x00 0x00 0x00 0x00
-
-# VI: s_memrealtime s[4:5] ; encoding: [0x00,0x01,0x94,0xc0,0x00,0x00,0x00,0x00]
-0x00 0x01 0x94 0xc0 0x00 0x00 0x00 0x00
-
-# VI: s_store_dword s1, s[2:3], 0xfc  ; encoding: [0x41,0x00,0x42,0xc0,0xfc,0x00,0x00,0x00]
-0x41 0x00 0x42 0xc0 0xfc 0x00 0x00 0x00
-
-# VI: s_store_dword s1, s[2:3], 0xfc glc ; encoding: [0x41,0x00,0x43,0xc0,0xfc,0x00,0x00,0x00]
-0x41 0x00 0x43 0xc0 0xfc 0x00 0x00 0x00
-
-# VI: s_store_dword s1, s[2:3], s4    ; encoding: [0x41,0x00,0x40,0xc0,0x04,0x00,0x00,0x00]
-0x41 0x00 0x40 0xc0 0x04 0x00 0x00 0x00
-
-# VI: s_store_dword s1, s[2:3], s4 glc ; encoding: [0x41,0x00,0x41,0xc0,0x04,0x00,0x00,0x00]
-0x41 0x00 0x41 0xc0 0x04 0x00 0x00 0x00
-
-# VI: s_load_dword s1, s[2:3], 0xfc glc ; encoding: [0x41,0x00,0x03,0xc0,0xfc,0x00,0x00,0x00]
-0x41 0x00 0x03 0xc0 0xfc 0x00 0x00 0x00
-
-# VI: s_load_dword s1, s[2:3], s4 glc ; encoding: [0x41,0x00,0x01,0xc0,0x04,0x00,0x00,0x00]
-0x41 0x00 0x01 0xc0 0x04 0x00 0x00 0x00
-
-# VI: s_buffer_store_dword s10, s[92:95], m0 ; encoding: [0xae,0x02,0x60,0xc0,0x7c,0x00,0x00,0x00]
-0xae 0x02 0x60 0xc0 0x7c 0x00 0x00 0x00
-
-# VI: s_buffer_store_dwordx2 s[10:11], s[92:95], m0 ; encoding: [0xae,0x02,0x64,0xc0,0x7c,0x00,0x00,0x00]
-0xae 0x02 0x64 0xc0 0x7c 0x00 0x00 0x00
-
-# VI: s_buffer_store_dwordx4 s[8:11], s[92:95], m0 glc ; encoding: [0x2e,0x02,0x69,0xc0,0x7c,0x00,0x00,0x00]
-0x2e 0x02 0x69 0xc0 0x7c 0x00 0x00 0x00
-
-# VI: s_buffer_load_dword s10, s[92:95], m0 ; encoding: [0xae,0x02,0x20,0xc0,0x7c,0x00,0x00,0x00]
-0xae 0x02 0x20 0xc0 0x7c 0x00 0x00 0x00
-
-# VI: s_buffer_load_dwordx2 s[10:11], s[92:95], m0 ; encoding: [0xae,0x02,0x24,0xc0,0x7c,0x00,0x00,0x00]
-0xae 0x02 0x24 0xc0 0x7c 0x00 0x00 0x00
-
-# VI: s_buffer_load_dwordx4 s[8:11], s[92:95], m0 glc ; encoding: [0x2e,0x02,0x29,0xc0,0x7c,0x00,0x00,0x00]
-0x2e 0x02 0x29 0xc0 0x7c 0x00 0x00 0x00
-
-# VI: s_atc_probe 7, s[4:5], s0 ; encoding: [0xc2,0x01,0x98,0xc0,0x00,0x00,0x00,0x00]
-0xc2,0x01,0x98,0xc0,0x00,0x00,0x00,0x00
-
-# VI: s_atc_probe 0, s[4:5], 0x0 ; encoding: [0x02,0x00,0x9a,0xc0,0x00,0x00,0x00,0x00]
-0x02,0x00,0x9a,0xc0,0x00,0x00,0x00,0x00
-
-# VI: s_atc_probe_buffer 1, s[8:11], s0 ; encoding: [0x44,0x00,0x9c,0xc0,0x00,0x00,0x00,0x00]
-0x44,0x00,0x9c,0xc0,0x00,0x00,0x00,0x00
-
-# VI: s_atc_probe_buffer 0, s[8:11], s101 ; encoding: [0x04,0x00,0x9c,0xc0,0x65,0x00,0x00,0x00]
-0x04,0x00,0x9c,0xc0,0x65,0x00,0x00,0x00
-
-#===------------------------------------------------------------------------===#
-# Unsigned 20-bit offsets
-#===------------------------------------------------------------------------===#
-
-# VI: s_atc_probe 7, s[4:5], 0xfffff ; encoding: [0xc2,0x01,0x9a,0xc0,0xff,0xff,0x0f,0x00]
-0xc2,0x01,0x9a,0xc0,0xff,0xff,0x0f,0x00
-
-# VI: s_atc_probe_buffer 1, s[8:11], 0xfffff ; encoding: [0x44,0x00,0x9e,0xc0,0xff,0xff,0x0f,0x00]
-0x44,0x00,0x9e,0xc0,0xff,0xff,0x0f,0x00
-
-# VI: s_load_dword s1, s[2:3], 0xfffff ; encoding: [0x41,0x00,0x02,0xc0,0xff,0xff,0x0f,0x00]
-0x41,0x00,0x02,0xc0,0xff,0xff,0x0f,0x00
-
-# VI: s_store_dword s1, s[2:3], 0xfffff ; encoding: [0x41,0x00,0x42,0xc0,0xff,0xff,0x0f,0x00]
-0x41,0x00,0x42,0xc0,0xff,0xff,0x0f,0x00
-
-# VI: s_buffer_store_dword s10, s[92:95], 0xfffff ; encoding: [0xae,0x02,0x62,0xc0,0xff,0xff,0x0f,0x00]
-0xae,0x02,0x62,0xc0,0xff,0xff,0x0f,0x00
-
-#===------------------------------------------------------------------------===#
-# Decoding of invalid (21-bit) buffer offsets
-#===------------------------------------------------------------------------===#
-
-# VI: s_store_dword s1, s[2:3], 0xfffff ; encoding: [0x41,0x00,0x42,0xc0,0xff,0xff,0x0f,0x00]
-0x41,0x00,0x42,0xc0,0xff,0xff,0x1f,0x00
-
-# VI: s_buffer_store_dword s10, s[92:95], 0xfffff ; encoding: [0xae,0x02,0x62,0xc0,0xff,0xff,0x0f,0x00]
-0xae,0x02,0x62,0xc0,0xff,0xff,0x1f,0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/smrd_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/smrd_vi.txt
deleted file mode 100644
index 630c55f6b5550..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/smrd_vi.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:	s_load_dword s1, s[2:3], 0xfc   ; encoding: [0x41,0x00,0x02,0xc0,0xfc,0x00,0x00,0x00]
-0x41 0x00 0x02 0xc0 0xfc 0x00 0x00 0x00
-
-# VI:	s_load_dword s1, s[2:3], 0xff   ; encoding: [0x41,0x00,0x02,0xc0,0xff,0x00,0x00,0x00]
-0x41 0x00 0x02 0xc0 0xff 0x00 0x00 0x00
-
-# VI:	s_load_dword s1, s[2:3], 0x1    ; encoding: [0x41,0x00,0x02,0xc0,0x01,0x00,0x00,0x00]
-0x41 0x00 0x02 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_load_dword s1, s[2:3], 0xfffff ; encoding: [0x41,0x00,0x02,0xc0,0xff,0xff,0x0f,0x00]
-0x41,0x00,0x02,0xc0,0xff,0xff,0x0f,0x00
-
-# VI:	s_load_dword s1, s[2:3], s4     ; encoding: [0x41,0x00,0x00,0xc0,0x04,0x00,0x00,0x00]
-0x41 0x00 0x00 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_load_dwordx2 s[2:3], s[2:3], 0x1 ; encoding: [0x81,0x00,0x06,0xc0,0x01,0x00,0x00,0x00]
-0x81 0x00 0x06 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_load_dwordx2 s[2:3], s[2:3], s4 ; encoding: [0x81,0x00,0x04,0xc0,0x04,0x00,0x00,0x00]
-0x81 0x00 0x04 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_load_dwordx4 s[4:7], s[2:3], 0x1 ; encoding: [0x01,0x01,0x0a,0xc0,0x01,0x00,0x00,0x00]
-0x01 0x01 0x0a 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_load_dwordx4 s[4:7], s[2:3], s4 ; encoding: [0x01,0x01,0x08,0xc0,0x04,0x00,0x00,0x00]
-0x01 0x01 0x08 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_load_dwordx8 s[8:15], s[2:3], 0x1 ; encoding: [0x01,0x02,0x0e,0xc0,0x01,0x00,0x00,0x00]
-0x01 0x02 0x0e 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_load_dwordx8 s[8:15], s[2:3], s4 ; encoding: [0x01,0x02,0x0c,0xc0,0x04,0x00,0x00,0x00]
-0x01 0x02 0x0c 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_load_dwordx16 s[16:31], s[2:3], 0x1 ; encoding: [0x01,0x04,0x12,0xc0,0x01,0x00,0x00,0x00]
-0x01 0x04 0x12 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_load_dwordx16 s[16:31], s[2:3], s4 ; encoding: [0x01,0x04,0x10,0xc0,0x04,0x00,0x00,0x00]
-0x01 0x04 0x10 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dword s1, s[4:7], 0x1    ; encoding: [0x42,0x00,0x22,0xc0,0x01,0x00,0x00,0x00]
-0x42 0x00 0x22 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dword s1, s[4:7], s4     ; encoding: [0x42,0x00,0x20,0xc0,0x04,0x00,0x00,0x00]
-0x42 0x00 0x20 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx2 s[8:9], s[4:7], 0x1 ; encoding: [0x02,0x02,0x26,0xc0,0x01,0x00,0x00,0x00]
-0x02 0x02 0x26 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx2 s[8:9], s[4:7], s4 ; encoding: [0x02,0x02,0x24,0xc0,0x04,0x00,0x00,0x00]
-0x02 0x02 0x24 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx4 s[8:11], s[4:7], 0x1 ; encoding: [0x02,0x02,0x2a,0xc0,0x01,0x00,0x00,0x00]
-0x02 0x02 0x2a 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx4 s[8:11], s[4:7], s4 ; encoding: [0x02,0x02,0x28,0xc0,0x04,0x00,0x00,0x00]
-0x02 0x02 0x28 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx8 s[8:15], s[4:7], 0x1 ; encoding: [0x02,0x02,0x2e,0xc0,0x01,0x00,0x00,0x00]
-0x02 0x02 0x2e 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx8 s[8:15], s[4:7], s4 ; encoding: [0x02,0x02,0x2c,0xc0,0x04,0x00,0x00,0x00]
-0x02 0x02 0x2c 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx16 s[16:31], s[4:7], 0x1 ; encoding: [0x02,0x04,0x32,0xc0,0x01,0x00,0x00,0x00]
-0x02 0x04 0x32 0xc0 0x01 0x00 0x00 0x00
-
-# VI:	s_buffer_load_dwordx16 s[16:31], s[4:7], s4 ; encoding: [0x02,0x04,0x30,0xc0,0x04,0x00,0x00,0x00]
-0x02 0x04 0x30 0xc0 0x04 0x00 0x00 0x00
-
-# VI:	s_dcache_inv                    ; encoding: [0x00,0x00,0x80,0xc0,0x00,0x00,0x00,0x00]
-0x00 0x00 0x80 0xc0 0x00 0x00 0x00 0x00
-
-# VI: s_dcache_inv_vol                ; encoding: [0x00,0x00,0x88,0xc0,0x00,0x00,0x00,0x00]
-0x00 0x00 0x88 0xc0 0x00 0x00 0x00 0x00
-
-# VI:	s_memtime s[4:5]                ; encoding: [0x00,0x01,0x90,0xc0,0x00,0x00,0x00,0x00]
-0x00 0x01 0x90 0xc0 0x00 0x00 0x00 0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/sop1_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/sop1_vi.txt
deleted file mode 100644
index 308a416a00371..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/sop1_vi.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   s_mov_b32 s1, s2 ; encoding: [0x02,0x00,0x81,0xbe]
-0x02 0x00 0x81 0xbe
-
-# VI:   s_mov_b32 s1, 1 ; encoding: [0x81,0x00,0x81,0xbe]
-0x81 0x00 0x81 0xbe
-
-# VI:   s_mov_b32 s1, 0x64 ; encoding: [0xff,0x00,0x81,0xbe,0x64,0x00,0x00,0x00]
-0xff 0x00 0x81 0xbe 0x64 0x00 0x00 0x00
-
-# VI:   s_mov_b32 s1, 0x80000000 ; encoding: [0xff,0x00,0x81,0xbe,0x00,0x00,0x00,0x80]
-0xff 0x00 0x81 0xbe 0x00 0x00 0x00 0x80
-
-# VI:   s_mov_b32 s0, 0xfe5163ab ; encoding: [0xff,0x00,0x80,0xbe,0xab,0x63,0x51,0xfe]
-0xff 0x00 0x80 0xbe 0xab 0x63 0x51 0xfe
-
-# VI:   s_mov_b32 xnack_mask_lo, -1 ; encoding: [0xc1,0x00,0xe8,0xbe]
-0xc1,0x00,0xe8,0xbe
-
-# VI:   s_mov_b32 xnack_mask_hi, -1 ; encoding: [0xc1,0x00,0xe9,0xbe]
-0xc1,0x00,0xe9,0xbe
-
-# VI:   s_mov_b64 s[2:3], s[4:5] ; encoding: [0x04,0x01,0x82,0xbe]
-0x04 0x01 0x82 0xbe
-
-# VI:   s_mov_b64 s[2:3], -1 ; encoding: [0xc1,0x01,0x82,0xbe]
-0xc1 0x01 0x82 0xbe
-
-# VI: s_mov_b64 xnack_mask, -1 ; encoding: [0xc1,0x01,0xe8,0xbe]
-0xc1,0x01,0xe8,0xbe
-
-# VI:   s_mov_b64 s[2:3], 0xffffffff ; encoding: [0xff,0x01,0x82,0xbe,0xff,0xff,0xff,0xff]
-0xff 0x01 0x82 0xbe 0xff 0xff 0xff 0xff
-
-# VI:   s_mov_b64 s[0:1], 0x80000000 ; encoding: [0xff,0x01,0x80,0xbe,0x00,0x00,0x00,0x80]
-0xff 0x01 0x80 0xbe 0x00 0x00 0x00 0x80
-
-# VI:   s_cmov_b32 s1, 0xc8 ; encoding: [0xff,0x02,0x81,0xbe,0xc8,0x00,0x00,0x00]
-0xff 0x02 0x81 0xbe 0xc8 0x00 0x00 0x00
-
-# VI:   s_cmov_b32 s1, 1.0 ; encoding: [0xf2,0x02,0x81,0xbe]
-0xf2 0x02 0x81 0xbe
-
-# VI:   s_cmov_b32 s1, s2 ; encoding: [0x02,0x02,0x81,0xbe]
-0x02 0x02 0x81 0xbe
-
-# VI:   s_cmov_b64 s[2:3], s[4:5] ; encoding: [0x04,0x03,0x82,0xbe]
-0x04 0x03 0x82 0xbe
-
-# VI:   s_not_b32 s1, s2 ; encoding: [0x02,0x04,0x81,0xbe]
-0x02 0x04 0x81 0xbe
-
-# VI:   s_not_b64 s[2:3], s[4:5] ; encoding: [0x04,0x05,0x82,0xbe]
-0x04 0x05 0x82 0xbe
-
-# VI:   s_wqm_b32 s1, s2 ; encoding: [0x02,0x06,0x81,0xbe]
-0x02 0x06 0x81 0xbe
-
-# VI:   s_wqm_b64 s[2:3], s[4:5] ; encoding: [0x04,0x07,0x82,0xbe]
-0x04 0x07 0x82 0xbe
-
-# VI:   s_brev_b32 s1, s2 ; encoding: [0x02,0x08,0x81,0xbe]
-0x02 0x08 0x81 0xbe
-
-# VI:   s_brev_b64 s[2:3], s[4:5] ; encoding: [0x04,0x09,0x82,0xbe]
-0x04 0x09 0x82 0xbe
-
-# VI:   s_bcnt0_i32_b32 s1, s2 ; encoding: [0x02,0x0a,0x81,0xbe]
-0x02 0x0a 0x81 0xbe
-
-# VI:   s_bcnt0_i32_b64 s1, s[2:3] ; encoding: [0x02,0x0b,0x81,0xbe]
-0x02 0x0b 0x81 0xbe
-
-# VI:   s_bcnt1_i32_b32 s1, s2 ; encoding: [0x02,0x0c,0x81,0xbe]
-0x02 0x0c 0x81 0xbe
-
-# VI:   s_bcnt1_i32_b64 s1, s[2:3] ; encoding: [0x02,0x0d,0x81,0xbe]
-0x02 0x0d 0x81 0xbe
-
-# VI:   s_ff0_i32_b32 s1, s2 ; encoding: [0x02,0x0e,0x81,0xbe]
-0x02 0x0e 0x81 0xbe
-
-# VI:   s_ff0_i32_b64 s1, s[2:3] ; encoding: [0x02,0x0f,0x81,0xbe]
-0x02 0x0f 0x81 0xbe
-
-# VI:   s_ff1_i32_b32 s1, s2 ; encoding: [0x02,0x10,0x81,0xbe]
-0x02 0x10 0x81 0xbe
-
-# VI:   s_ff1_i32_b64 s1, s[2:3] ; encoding: [0x02,0x11,0x81,0xbe]
-0x02 0x11 0x81 0xbe
-
-# VI:   s_flbit_i32_b32 s1, s2 ; encoding: [0x02,0x12,0x81,0xbe]
-0x02 0x12 0x81 0xbe
-
-# VI:   s_flbit_i32_b64 s1, s[2:3] ; encoding: [0x02,0x13,0x81,0xbe]
-0x02 0x13 0x81 0xbe
-
-# VI:   s_flbit_i32 s1, s2 ; encoding: [0x02,0x14,0x81,0xbe]
-0x02 0x14 0x81 0xbe
-
-# VI:   s_flbit_i32_i64 s1, s[2:3] ; encoding: [0x02,0x15,0x81,0xbe]
-0x02 0x15 0x81 0xbe
-
-# VI:   s_sext_i32_i8 s1, s2 ; encoding: [0x02,0x16,0x81,0xbe]
-0x02 0x16 0x81 0xbe
-
-# VI:   s_sext_i32_i16 s1, s2 ; encoding: [0x02,0x17,0x81,0xbe]
-0x02 0x17 0x81 0xbe
-
-# VI:   s_bitset0_b32 s1, s2 ; encoding: [0x02,0x18,0x81,0xbe]
-0x02 0x18 0x81 0xbe
-
-# VI:   s_bitset0_b64 s[2:3], s4 ; encoding: [0x04,0x19,0x82,0xbe]
-0x04 0x19 0x82 0xbe
-
-# VI:   s_bitset1_b32 s1, s2 ; encoding: [0x02,0x1a,0x81,0xbe]
-0x02 0x1a 0x81 0xbe
-
-# VI:   s_bitset1_b64 s[2:3], s4 ; encoding: [0x04,0x1b,0x82,0xbe]
-0x04 0x1b 0x82 0xbe
-
-# VI:   s_getpc_b64 s[2:3] ; encoding: [0x00,0x1c,0x82,0xbe]
-0x00 0x1c 0x82 0xbe
-
-# VI:   s_setpc_b64 s[4:5] ; encoding: [0x04,0x1d,0x80,0xbe]
-0x04 0x1d 0x80 0xbe
-
-# VI:   s_swappc_b64 s[2:3], s[4:5] ; encoding: [0x04,0x1e,0x82,0xbe]
-0x04 0x1e 0x82 0xbe
-
-# VI:   s_rfe_b64 s[4:5] ; encoding: [0x04,0x1f,0x80,0xbe]
-0x04 0x1f 0x80 0xbe
-
-# VI:   s_and_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x20,0x82,0xbe]
-0x04 0x20 0x82 0xbe
-
-# VI:   s_or_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x21,0x82,0xbe]
-0x04 0x21 0x82 0xbe
-
-# VI:   s_xor_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x22,0x82,0xbe]
-0x04 0x22 0x82 0xbe
-
-# VI:   s_andn2_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x23,0x82,0xbe]
-0x04 0x23 0x82 0xbe
-
-# VI:   s_orn2_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x24,0x82,0xbe]
-0x04 0x24 0x82 0xbe
-
-# VI:   s_nand_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x25,0x82,0xbe]
-0x04 0x25 0x82 0xbe
-
-# VI:   s_nor_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x26,0x82,0xbe]
-0x04 0x26 0x82 0xbe
-
-# VI:   s_xnor_saveexec_b64 s[2:3], s[4:5] ; encoding: [0x04,0x27,0x82,0xbe]
-0x04 0x27 0x82 0xbe
-
-# VI:   s_quadmask_b32 s1, s2 ; encoding: [0x02,0x28,0x81,0xbe]
-0x02 0x28 0x81 0xbe
-
-# VI:   s_quadmask_b64 s[2:3], s[4:5] ; encoding: [0x04,0x29,0x82,0xbe]
-0x04 0x29 0x82 0xbe
-
-# VI:   s_movrels_b32 s1, s2 ; encoding: [0x02,0x2a,0x81,0xbe]
-0x02 0x2a 0x81 0xbe
-
-# VI:   s_movrels_b64 s[2:3], s[4:5] ; encoding: [0x04,0x2b,0x82,0xbe]
-0x04 0x2b 0x82 0xbe
-
-# VI:   s_movreld_b32 s1, s2 ; encoding: [0x02,0x2c,0x81,0xbe]
-0x02 0x2c 0x81 0xbe
-
-# VI:   s_movreld_b64 s[2:3], s[4:5] ; encoding: [0x04,0x2d,0x82,0xbe]
-0x04 0x2d 0x82 0xbe
-
-# VI:   s_cbranch_join s4 ; encoding: [0x04,0x2e,0x80,0xbe]
-0x04 0x2e 0x80 0xbe
-
-# VI:   s_abs_i32 s1, s2 ; encoding: [0x02,0x30,0x81,0xbe]
-0x02 0x30 0x81 0xbe

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/sop2_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/sop2_vi.txt
deleted file mode 100644
index 853685c62f968..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/sop2_vi.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   s_and_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x86]
-0x04 0x06 0x02 0x86
-
-# VI:   s_and_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x86]
-0x04 0x06 0x82 0x86
-
-# VI:   s_or_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x87]
-0x04 0x06 0x02 0x87
-
-# VI:   s_or_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x87]
-0x04 0x06 0x82 0x87
-
-# VI:   s_xor_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x88]
-0x04 0x06 0x02 0x88
-
-# VI:   s_xor_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x88]
-0x04 0x06 0x82 0x88
-
-# VI:   s_andn2_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x89]
-0x04 0x06 0x02 0x89
-
-# VI:   s_andn2_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x89]
-0x04 0x06 0x82 0x89
-
-# VI:   s_orn2_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x8a]
-0x04 0x06 0x02 0x8a
-
-# VI:   s_orn2_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x8a]
-0x04 0x06 0x82 0x8a
-
-# VI:   s_nand_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x8b]
-0x04 0x06 0x02 0x8b
-
-# VI:   s_nand_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x8b]
-0x04 0x06 0x82 0x8b
-
-# VI:   s_nor_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x8c]
-0x04 0x06 0x02 0x8c
-
-# VI:   s_nor_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x8c]
-0x04 0x06 0x82 0x8c
-
-# VI:   s_xnor_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x8d]
-0x04 0x06 0x02 0x8d
-
-# VI:   s_xnor_b64 s[2:3], s[4:5], s[6:7] ; encoding: [0x04,0x06,0x82,0x8d]
-0x04 0x06 0x82 0x8d
-
-# VI:   s_lshl_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x8e]
-0x04 0x06 0x02 0x8e
-
-# VI:   s_lshl_b64 s[2:3], s[4:5], s6 ; encoding: [0x04,0x06,0x82,0x8e]
-0x04 0x06 0x82 0x8e
-
-# VI:   s_lshr_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x8f]
-0x04 0x06 0x02 0x8f
-
-# VI:   s_lshr_b64 s[2:3], s[4:5], s6 ; encoding: [0x04,0x06,0x82,0x8f]
-0x04 0x06 0x82 0x8f
-
-# VI:   s_ashr_i32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x90]
-0x04 0x06 0x02 0x90
-
-# VI:   s_ashr_i64 s[2:3], s[4:5], s6 ; encoding: [0x04,0x06,0x82,0x90]
-0x04 0x06 0x82 0x90
-
-# VI:   s_bfm_b32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x91]
-0x04 0x06 0x02 0x91
-
-# VI:   s_bfm_b64 s[2:3], s4, s6 ; encoding: [0x04,0x06,0x82,0x91]
-0x04 0x06 0x82 0x91
-
-# VI:   s_mul_i32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x92]
-0x04 0x06 0x02 0x92
-
-# VI:   s_bfe_u32 s2, s4, s6 ; encoding: [0x04,0x06,0x82,0x92]
-0x04 0x06 0x82 0x92
-
-# VI:   s_bfe_i32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x93]
-0x04 0x06 0x02 0x93
-
-# VI:   s_bfe_u64 s[2:3], s[4:5], s6 ; encoding: [0x04,0x06,0x82,0x93]
-0x04 0x06 0x82 0x93
-
-# VI:   s_bfe_i64 s[2:3], s[4:5], s6 ; encoding: [0x04,0x06,0x02,0x94]
-0x04 0x06 0x02 0x94
-
-# VI:   s_cbranch_g_fork s[4:5], s[6:7] ; encoding: [0x04,0x06,0x80,0x94]
-0x04 0x06 0x80 0x94
-
-# VI:   s_abs
diff _i32 s2, s4, s6 ; encoding: [0x04,0x06,0x02,0x95]
-0x04 0x06 0x02 0x95

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/sopc_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/sopc_vi.txt
deleted file mode 100644
index 4bf2aefaf0ce9..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/sopc_vi.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=GCN
-
-# GCN: s_cmp_eq_i32 s1, s2 ; encoding: [0x01,0x02,0x00,0xbf]
-0x01 0x02 0x00 0xbf
-
-# GCN: s_cmp_lg_i32 s1, s2 ; encoding: [0x01,0x02,0x01,0xbf]
-0x01 0x02 0x01 0xbf
-
-# GCN: s_cmp_gt_i32 s1, s2 ; encoding: [0x01,0x02,0x02,0xbf]
-0x01 0x02 0x02 0xbf
-
-# GCN: s_cmp_ge_i32 s1, s2 ; encoding: [0x01,0x02,0x03,0xbf]
-0x01 0x02 0x03 0xbf
-
-# GCN: s_cmp_lt_i32 s1, s2 ; encoding: [0x01,0x02,0x04,0xbf]
-0x01 0x02 0x04 0xbf
-
-# GCN: s_cmp_le_i32 s1, s2 ; encoding: [0x01,0x02,0x05,0xbf]
-0x01 0x02 0x05 0xbf
-
-# GCN: s_cmp_eq_u32 s1, s2 ; encoding: [0x01,0x02,0x06,0xbf]
-0x01 0x02 0x06 0xbf
-
-# GCN: s_cmp_lg_u32 s1, s2 ; encoding: [0x01,0x02,0x07,0xbf]
-0x01 0x02 0x07 0xbf
-
-# GCN: s_cmp_gt_u32 s1, s2 ; encoding: [0x01,0x02,0x08,0xbf]
-0x01 0x02 0x08 0xbf
-
-# GCN: s_cmp_ge_u32 s1, s2 ; encoding: [0x01,0x02,0x09,0xbf]
-0x01 0x02 0x09 0xbf
-
-# GCN: s_cmp_lt_u32 s1, s2 ; encoding: [0x01,0x02,0x0a,0xbf]
-0x01 0x02 0x0a 0xbf
-
-# GCN: s_cmp_le_u32 s1, s2 ; encoding: [0x01,0x02,0x0b,0xbf]
-0x01 0x02 0x0b 0xbf
-
-# GCN: s_bitcmp0_b32 s1, s2 ; encoding: [0x01,0x02,0x0c,0xbf]
-0x01 0x02 0x0c 0xbf
-
-# GCN: s_bitcmp1_b32 s1, s2 ; encoding: [0x01,0x02,0x0d,0xbf]
-0x01 0x02 0x0d 0xbf
-
-# GCN: s_bitcmp0_b64 s[2:3], s4 ; encoding: [0x02,0x04,0x0e,0xbf]
-0x02 0x04 0x0e 0xbf
-
-# GCN: s_bitcmp1_b64 s[2:3], s4 ; encoding: [0x02,0x04,0x0f,0xbf]
-0x02 0x04 0x0f 0xbf
-
-# GCN: s_setvskip s3, s5 ; encoding: [0x03,0x05,0x10,0xbf]
-0x03 0x05 0x10 0xbf
-
-# GCN: s_bitcmp0_b32 0xafaaffff, 0xafaaffff ; encoding: [0xff,0xff,0x0c,0xbf,0xff,0xff,0xaa,0xaf]
-0xff 0xff 0x0c 0xbf 0xff 0xff 0xaa 0xaf
-
-# GCN: s_set_gpr_idx_on s0, gpr_idx(SRC0) ; encoding: [0x00,0x01,0x11,0xbf]
-0x00,0x01,0x11,0xbf
-
-# GCN: s_set_gpr_idx_on s0, gpr_idx(SRC0,SRC1,SRC2,DST) ; encoding: [0x00,0x0f,0x11,0xbf]
-0x00,0x0f,0x11,0xbf
-
-# GCN: s_set_gpr_idx_on s0, gpr_idx(SRC0,SRC1,SRC2,DST) ; encoding: [0x00,0x0f,0x11,0xbf]
-0x00,0x0f,0x11,0xbf
-
-# GCN: s_set_gpr_idx_on s0, 0xff ; encoding: [0x00,0xff,0x11,0xbf]
-0x00,0xff,0x11,0xbf

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/sopk_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/sopk_vi.txt
deleted file mode 100644
index c3b5ffeb62ec8..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/sopk_vi.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   s_cmovk_i32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb0]
-0x06 0x00 0x82 0xb0
-
-# VI:   s_cmpk_eq_i32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb1]
-0x06 0x00 0x02 0xb1
-
-# VI:   s_cmpk_lg_i32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb1]
-0x06 0x00 0x82 0xb1
-
-# VI:   s_cmpk_gt_i32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb2]
-0x06 0x00 0x02 0xb2
-
-# VI:   s_cmpk_ge_i32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb2]
-0x06 0x00 0x82 0xb2
-
-# VI:   s_cmpk_lt_i32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb3]
-0x06 0x00 0x02 0xb3
-
-# VI:   s_cmpk_le_i32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb3]
-0x06 0x00 0x82 0xb3
-
-# VI:   s_cmpk_eq_u32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb4]
-0x06 0x00 0x02 0xb4
-
-# VI:   s_cmpk_lg_u32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb4]
-0x06 0x00 0x82 0xb4
-
-# VI:   s_cmpk_gt_u32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb5]
-0x06 0x00 0x02 0xb5
-
-# VI:   s_cmpk_ge_u32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb5]
-0x06 0x00 0x82 0xb5
-
-# VI:   s_cmpk_lt_u32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb6]
-0x06 0x00 0x02 0xb6
-
-# VI:   s_cmpk_le_u32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb6]
-0x06 0x00 0x82 0xb6
-
-# VI:   s_addk_i32 s2, 0x6 ; encoding: [0x06,0x00,0x02,0xb7]
-0x06 0x00 0x02 0xb7
-
-# VI:   s_mulk_i32 s2, 0x6 ; encoding: [0x06,0x00,0x82,0xb7]
-0x06 0x00 0x82 0xb7
-
-# VI:   s_cbranch_i_fork s[2:3], 6 ; encoding: [0x06,0x00,0x02,0xb8]
-0x06 0x00 0x02 0xb8
-
-# VI:   s_getreg_b32 s2, hwreg(HW_REG_LDS_ALLOC) ; encoding: [0x06,0xf8,0x82,0xb8]
-0x06 0xf8 0x82 0xb8
-
-# VI:   s_getreg_b32 s2, hwreg(51) ; encoding: [0x33,0xf8,0x82,0xb8]
-0x33,0xf8,0x82,0xb8
-
-# VI:   s_getreg_b32 s2, hwreg(51, 1, 31) ; encoding: [0x73,0xf0,0x82,0xb8]
-0x73,0xf0,0x82,0xb8
-
-# VI:   s_setreg_b32 hwreg(HW_REG_LDS_ALLOC, 0, 1), s2 ; encoding: [0x06,0x00,0x02,0xb9]
-0x06 0x00 0x02 0xb9
-
-# VI:   s_setreg_imm32_b32 hwreg(HW_REG_GPR_ALLOC, 1, 31), 0xff ; encoding: [0x45,0xf0,0x00,0xba,0xff,0x00,0x00,0x00]
-0x45 0xf0 0x00 0xba 0xff 0x00 0x00 0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/sopp_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/sopp_vi.txt
deleted file mode 100644
index b83ec93a12597..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/sopp_vi.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=GCN
-
-# GCN: s_nop 0 ; encoding: [0x00,0x00,0x80,0xbf]
-0x00 0x00 0x80 0xbf
-
-# GCN: s_nop 0xffff ; encoding: [0xff,0xff,0x80,0xbf]
-0xff 0xff 0x80 0xbf
-
-# GCN: s_nop 1 ; encoding: [0x01,0x00,0x80,0xbf]
-0x01 0x00 0x80 0xbf
-
-# GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]
-0x00 0x00 0x81 0xbf
-
-# GCN: s_branch 2 ; encoding: [0x02,0x00,0x82,0xbf]
-0x02 0x00 0x82 0xbf
-
-# GCN: s_cbranch_scc0 3 ; encoding: [0x03,0x00,0x84,0xbf]
-0x03 0x00 0x84 0xbf
-
-# GCN: s_cbranch_scc1 4 ; encoding: [0x04,0x00,0x85,0xbf]
-0x04 0x00 0x85 0xbf
-
-# GCN: s_cbranch_vccz 5 ; encoding: [0x05,0x00,0x86,0xbf]
-0x05 0x00 0x86 0xbf
-
-# GCN: s_cbranch_vccnz 6 ; encoding: [0x06,0x00,0x87,0xbf]
-0x06 0x00 0x87 0xbf
-
-# GCN: s_cbranch_execz 7 ; encoding: [0x07,0x00,0x88,0xbf]
-0x07 0x00 0x88 0xbf
-
-# GCN: s_cbranch_execnz 8 ; encoding: [0x08,0x00,0x89,0xbf]
-0x08 0x00 0x89 0xbf
-
-# GCN: s_barrier ; encoding: [0x00,0x00,0x8a,0xbf]
-0x00 0x00 0x8a 0xbf
-
-# GCN: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
-0x00 0x00 0x8c 0xbf
-
-# GCN: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
-0x00 0x00 0x8c 0xbf
-
-# GCN: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
-0x00 0x00 0x8c 0xbf
-
-# GCN: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0) ; encoding: [0x00,0x00,0x8c,0xbf]
-0x00 0x00 0x8c 0xbf
-
-# GCN: s_waitcnt vmcnt(1) ; encoding: [0x71,0x0f,0x8c,0xbf]
-0x71 0x0f 0x8c 0xbf
-
-# GCN: s_waitcnt vmcnt(9) ; encoding: [0x79,0x0f,0x8c,0xbf]
-0x79 0x0f 0x8c 0xbf
-
-# GCN: s_waitcnt expcnt(2) ; encoding: [0x2f,0x0f,0x8c,0xbf]
-0x2f 0x0f 0x8c 0xbf
-
-# GCN: s_waitcnt lgkmcnt(3) ; encoding: [0x7f,0x03,0x8c,0xbf]
-0x7f 0x03 0x8c 0xbf
-
-# GCN: s_waitcnt lgkmcnt(9) ; encoding: [0x7f,0x09,0x8c,0xbf]
-0x7f 0x09 0x8c 0xbf
-
-# GCN: s_waitcnt vmcnt(0) expcnt(0) ; encoding: [0x00,0x0f,0x8c,0xbf]
-0x00 0x0f 0x8c 0xbf
-
-# GCN: s_sethalt 9 ; encoding: [0x09,0x00,0x8d,0xbf]
-0x09 0x00 0x8d 0xbf
-
-# GCN: s_sleep 10 ; encoding: [0x0a,0x00,0x8e,0xbf]
-0x0a 0x00 0x8e 0xbf
-
-# GCN: s_setprio 1 ; encoding: [0x01,0x00,0x8f,0xbf]
-0x01 0x00 0x8f 0xbf
-
-# GCN: s_sendmsg sendmsg(2, 0, 0) ; encoding: [0x02,0x00,0x90,0xbf]
-0x02 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_INTERRUPT) ; encoding: [0x01,0x00,0x90,0xbf]
-0x01 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_GS, GS_OP_CUT, 0) ; encoding: [0x12,0x00,0x90,0xbf]
-0x12 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT, 1) ; encoding: [0x22,0x01,0x90,0xbf]
-0x22 0x01 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT_CUT, 2) ; encoding: [0x32,0x02,0x90,0xbf]
-0x32 0x02 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_NOP) ; encoding: [0x03,0x00,0x90,0xbf]
-0x03 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_SAVEWAVE) ; encoding: [0x04,0x00,0x90,0xbf]
-0x04 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(11, 0, 0) ; encoding: [0x0b,0x00,0x90,0xbf]
-0x0b 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(MSG_SYSMSG, SYSMSG_OP_ECC_ERR_INTERRUPT) ; encoding: [0x1f,0x00,0x90,0xbf]
-0x1f 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(15, 6, 0) ; encoding: [0x6f,0x00,0x90,0xbf]
-0x6f 0x00 0x90 0xbf
-
-# GCN: s_sendmsghalt sendmsg(MSG_GS_DONE, GS_OP_NOP) ; encoding: [0x03,0x00,0x91,0xbf]
-0x03 0x00 0x91 0xbf
-
-# GCN: s_sendmsghalt sendmsg(MSG_GS, GS_OP_EMIT, 1) ; encoding: [0x22,0x01,0x91,0xbf]
-0x22 0x01 0x91 0xbf
-
-# GCN: s_sendmsghalt sendmsg(15, 6, 0) ; encoding: [0x6f,0x00,0x91,0xbf]
-0x6f 0x00 0x91 0xbf
-
-# GCN: s_sendmsg sendmsg(1, 3, 0)      ; encoding: [0x31,0x00,0x90,0xbf]
-0x31 0x00 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(1, 3, 2)      ; encoding: [0x31,0x02,0x90,0xbf]
-0x31 0x02 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(2, 0, 1)      ; encoding: [0x02,0x01,0x90,0xbf]
-0x02 0x01 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(4, 0, 1)      ; encoding: [0x04,0x01,0x90,0xbf]
-0x04 0x01 0x90 0xbf
-
-# GCN: s_sendmsg sendmsg(15, 7, 3)     ; encoding: [0x7f,0x03,0x90,0xbf]
-0x7f 0x03 0x90 0xbf
-
-# GCN: s_sendmsg 4567                  ; encoding: [0xd7,0x11,0x90,0xbf]
-0xd7 0x11 0x90 0xbf
-
-# GCN: s_trap 4 ; encoding: [0x04,0x00,0x92,0xbf]
-0x04 0x00 0x92 0xbf
-
-# GCN: s_icache_inv ; encoding: [0x00,0x00,0x93,0xbf]
-0x00 0x00 0x93 0xbf
-
-# GCN: s_incperflevel 5 ; encoding: [0x05,0x00,0x94,0xbf]
-0x05 0x00 0x94 0xbf
-
-# GCN: s_decperflevel 6 ; encoding: [0x06,0x00,0x95,0xbf]
-0x06 0x00 0x95 0xbf
-
-# GCN: s_ttracedata ; encoding: [0x00,0x00,0x96,0xbf]
-0x00 0x00 0x96 0xbf
-
-# GCN: s_set_gpr_idx_mode gpr_idx() ; encoding: [0x00,0x00,0x9d,0xbf]
-0x00,0x00,0x9d,0xbf
-
-# GCN: s_set_gpr_idx_mode gpr_idx(SRC0,SRC1,SRC2,DST) ; encoding: [0x0f,0x00,0x9d,0xbf]
-0x0f,0x00,0x9d,0xbf

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/vintrp.txt b/llvm/test/MC/Disassembler/AMDGPU/vintrp.txt
deleted file mode 100644
index 335aef62805fd..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/vintrp.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=fiji -disassemble < %s | FileCheck %s -check-prefix=VI
-
-#VI: v_interp_p1_f32_e32 v7, v212, attr16.y
-0xd4 0x41 0x1c 0xd4
-
-#VI: v_interp_p2_f32_e32 v7, v212, attr16.y
-0xd4 0x41 0x1d 0xd4
-
-#VI: v_interp_mov_f32_e32 v7, invalid_param_212, attr16.y
-0xd4 0x41 0x1e 0xd4
-
-#VI: v_interp_mov_f32_e32 v7, p10, attr16.y
-0x00 0x41 0x1e 0xd4
-
-#VI: v_interp_mov_f32_e32 v7, p20, attr16.y
-0x01 0x41 0x1e 0xd4
-
-#VI: v_interp_mov_f32_e32 v7, p0, attr16.y
-0x02 0x41 0x1e 0xd4
-
-#VI: v_interp_mov_f32_e32 v7, invalid_param_3, attr16.y
-0x03 0x41 0x1e 0xd4
-
-# VI: v_interp_p1_f32_e32 v0, v0, attr0.x
-0x00 0x00 0x00 0xd4
-
-# VI: v_interp_p1_f32_e32 v0, v0, attr0.x
-0x00 0x00 0x00 0xd4
-
-# VI: v_interp_p1_f32_e32 v0, v1, attr0.x
-0x01 0x00 0x00 0xd4
-
-# VI: v_interp_p1_f32_e32 v0, v1, attr0.w
-0x01 0x03 0x00 0xd4
-
-# VI: v_interp_p2_f32_e32 v0, v1, attr0.x
-0x01 0x00 0x01 0xd4
-
-# VI: v_interp_mov_f32_e32 v0, p20, attr0.x
-0x01 0x00 0x02 0xd4
-
-#VI: v_interp_p2_f32_e32 v0, v1, attr63.x
-0x01 0xfc 0x01 0xd4
-
-#VI: v_interp_p2_f32_e32 v0, v1, attr63.x
-0x01 0xfc 0x01 0xd4
-
-#VI: v_interp_p2_f32_e32 v0, v1, attr63.w
-0x01 0xff 0x01 0xd4

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/vop1.txt b/llvm/test/MC/Disassembler/AMDGPU/vop1.txt
deleted file mode 100644
index 2d481d245f39a..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/vop1.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s
-
-# CHECK: v_nop              ; encoding: [0x00,0x00,0x00,0x7e]
-0x00 0x00 0x00 0x7e
-
-# CHECK: v_nop              ; encoding: [0x00,0x00,0x00,0x7e]
-0x80 0x00 0x00 0x7e
-
-# CHECK: v_clrexcp                       ; encoding: [0x00,0x6a,0x00,0x7e]
-0x00 0x6a 0x00 0x7e
-
-# CHECK: v_mov_b32_e32 v2, v1         ; encoding: [0x01,0x03,0x04,0x7e]
-0x01 0x03 0x04 0x7e
-
-# CHECK: v_mov_b32_e32 v1, 0.5         ; encoding: [0xf0,0x02,0x02,0x7e]
-0xf0 0x02 0x02 0x7e
-
-# CHECK: v_mov_b32_e32 v15, s100         ; encoding: [0x64,0x02,0x1e,0x7e]
-0x64 0x02 0x1e 0x7e
-
-# CHECK: v_mov_b32_e32 v90, flat_scratch_lo         ; encoding: [0x66,0x02,0xb4,0x7e]
-0x66 0x02 0xb4 0x7e
-
-# CHECK: v_mov_b32_e32 v150, vcc_lo         ; encoding: [0x6a,0x02,0x2c,0x7f]
-0x6a 0x02 0x2c 0x7f
-
-# CHECK: v_mov_b32_e32 v199, exec_lo         ; encoding: [0x7e,0x02,0x8e,0x7f]
-0x7e 0x02 0x8e 0x7f
-
-# CHECK: v_mov_b32_e32 v222, m0         ; encoding: [0x7c,0x02,0xbc,0x7f]
-0x7c 0x02 0xbc 0x7f
-
-# CHECK: v_mov_b32_e32 v255, -13         ; encoding: [0xcd,0x02,0xfe,0x7f]
-0xcd 0x02 0xfe 0x7f
-
-# CHECK: v_cvt_f32_i32_e32 v153, s98         ; encoding: [0x62,0x0a,0x32,0x7f]
-0x62 0x0a 0x32 0x7f
-
-# CHECK: v_cvt_f32_u32_e32 v33, -4.0         ; encoding: [0xf7,0x0c,0x42,0x7e]
-0xf7 0x0c 0x42 0x7e
-
-# CHECK: v_cvt_i32_f64_e32 v2, s[0:1]         ; encoding: [0x00,0x06,0x04,0x7e]
-0x00 0x06 0x04 0x7e
-
-# CHECK: v_cvt_u32_f32_e32 v123, vcc_hi  ; encoding: [0x6b,0x0e,0xf6,0x7e]
-0x6b 0x0e 0xf6 0x7e
-
-# CHECK: v_cvt_i32_f32_e32 v123, flat_scratch_lo ; encoding: [0x66,0x10,0xf6,0x7e]
-0x66 0x10 0xf6 0x7e
-
-# CHECK: v_cvt_rpi_i32_f32_e32 v123, s101 ; encoding: [0x65,0x18,0xf6,0x7e]
-0x65 0x18 0xf6 0x7e
-
-# CHECK: v_cvt_flr_i32_f32_e32 v123, -4.0 ; encoding: [0xf7,0x1a,0xf6,0x7e]
-0xf7 0x1a 0xf6 0x7e
-
-# CHECK: v_cvt_f32_f64_e32 v123, vcc      ; encoding: [0x6a,0x1e,0xf6,0x7e]
-0x6a 0x1e 0xf6 0x7e
-
-# CHECK: v_cvt_u32_f64_e32 v123, exec      ; encoding: [0x7e,0x2a,0xf6,0x7e]
-0x7e 0x2a 0xf6 0x7e
-
-# CHECK: v_fract_f32_e32 v123, m0        ; encoding: [0x7c,0x36,0xf6,0x7e]
-0x7c 0x36 0xf6 0x7e
-
-# CHECK: v_trunc_f32_e32 v123, exec_lo   ; encoding: [0x7e,0x38,0xf6,0x7e]
-0x7e 0x38 0xf6 0x7e
-
-# CHECK: v_ceil_f32_e32 v123, exec_hi    ; encoding: [0x7f,0x3a,0xf6,0x7e]
-0x7f 0x3a 0xf6 0x7e
-
-# CHECK: v_rndne_f32_e32 v123, 0         ; encoding: [0x80,0x3c,0xf6,0x7e]
-0x80 0x3c 0xf6 0x7e
-
-# CHECK: v_floor_f32_e32 v123, -0.5      ; encoding: [0xf1,0x3e,0xf6,0x7e]
-0xf1 0x3e 0xf6 0x7e
-
-# CHECK: v_exp_f32_e32 v123, 1.0         ; encoding: [0xf2,0x40,0xf6,0x7e]
-0xf2 0x40 0xf6 0x7e
-
-# CHECK: v_log_f32_e32 v123, -1.0        ; encoding: [0xf3,0x42,0xf6,0x7e]
-0xf3 0x42 0xf6 0x7e
-
-# CHECK: v_rcp_f32_e32 v123, 2.0         ; encoding: [0xf4,0x44,0xf6,0x7e]
-0xf4 0x44 0xf6 0x7e
-
-# CHECK: v_rcp_iflag_f32_e32 v123, -2.0  ; encoding: [0xf5,0x46,0xf6,0x7e]
-0xf5 0x46 0xf6 0x7e
-
-# CHECK: v_rsq_f32_e32 v123, 4.0         ; encoding: [0xf6,0x48,0xf6,0x7e]
-0xf6 0x48 0xf6 0x7e
-
-# CHECK: v_sqrt_f32_e32 v123, v12        ; encoding: [0x0c,0x4f,0xf6,0x7e]
-0x0c 0x4f 0xf6 0x7e
-
-# CHECK: v_sin_f32_e32 v123, v12         ; encoding: [0x0c,0x53,0xf6,0x7e]
-0x0c 0x53 0xf6 0x7e
-
-# CHECK: v_cos_f32_e32 v123, v12         ; encoding: [0x0c,0x55,0xf6,0x7e]
-0x0c 0x55 0xf6 0x7e
-
-# CHECK: v_not_b32_e32 v123, v12         ; encoding: [0x0c,0x57,0xf6,0x7e]
-0x0c 0x57 0xf6 0x7e
-
-# CHECK: v_bfrev_b32_e32 v123, v12       ; encoding: [0x0c,0x59,0xf6,0x7e]
-0x0c 0x59 0xf6 0x7e
-
-# CHECK: v_ffbh_u32_e32 v123, v12        ; encoding: [0x0c,0x5b,0xf6,0x7e]
-0x0c 0x5b 0xf6 0x7e
-
-# CHECK: v_ffbl_b32_e32 v123, v12        ; encoding: [0x0c,0x5d,0xf6,0x7e]
-0x0c 0x5d 0xf6 0x7e
-
-# CHECK: v_ffbh_i32_e32 v123, v12        ; encoding: [0x0c,0x5f,0xf6,0x7e]
-0x0c 0x5f 0xf6 0x7e
-
-# CHECK: v_frexp_exp_i32_f64_e32 v123, 2.0 ; encoding: [0xf4,0x60,0xf6,0x7e]
-0xf4 0x60 0xf6 0x7e
-
-# CHECK: v_frexp_exp_i32_f32_e32 v123, s33 ; encoding: [0x21,0x66,0xf6,0x7e]
-0x21 0x66 0xf6 0x7e
-
-# CHECK: v_frexp_mant_f32_e32 v123, s33  ; encoding: [0x21,0x68,0xf6,0x7e]
-0x21 0x68 0xf6 0x7e
-
-# CHECK: v_movreld_b32_e32 v123, s33     ; encoding: [0x21,0x6c,0xf6,0x7e]
-0x21 0x6c 0xf6 0x7e
-
-# CHECK: v_movrels_b32_e32 v123, s33     ; encoding: [0x21,0x6e,0xf6,0x7e]
-0x21 0x6e 0xf6 0x7e
-
-# CHECK: v_movrelsd_b32_e32 v123, s33    ; encoding: [0x21,0x70,0xf6,0x7e]
-0x21 0x70 0xf6 0x7e
-
-# CHECK: v_cvt_f16_f32_e32 v123, flat_scratch_hi ; encoding: [0x67,0x14,0xf6,0x7e]
-0x67 0x14 0xf6 0x7e
-
-# CHECK: v_cvt_f32_f16_e32 v123, s55     ; encoding: [0x37,0x16,0xf6,0x7e]
-0x37 0x16 0xf6 0x7e
-
-# CHECK: v_cvt_off_f32_i4_e32 v123, v12  ; encoding: [0x0c,0x1d,0xf6,0x7e]
-0x0c 0x1d 0xf6 0x7e
-
-# CHECK: v_cvt_f32_ubyte0_e32 v123, v12  ; encoding: [0x0c,0x23,0xf6,0x7e]
-0x0c 0x23 0xf6 0x7e
-
-# CHECK: v_cvt_f32_ubyte1_e32 v123, v12  ; encoding: [0x0c,0x25,0xf6,0x7e]
-0x0c 0x25 0xf6 0x7e
-
-# CHECK: v_cvt_f32_ubyte2_e32 v123, v12  ; encoding: [0x0c,0x27,0xf6,0x7e]
-0x0c 0x27 0xf6 0x7e
-
-# CHECK: v_cvt_f32_ubyte3_e32 v123, v12  ; encoding: [0x0c,0x29,0xf6,0x7e]
-0x0c 0x29 0xf6 0x7e
-
-# CHECK: v_cvt_f64_i32_e32 v[222:223], 1.0 ; encoding: [0xf2,0x08,0xbc,0x7f]
-0xf2 0x08 0xbc 0x7f
-
-# CHECK: v_cvt_f64_i32_e32 v[222:223], exec_hi ; encoding: [0x7f,0x08,0xbc,0x7f]
-0x7f 0x08 0xbc 0x7f
-
-# CHECK: v_cvt_f64_f32_e32 v[222:223], s33 ; encoding: [0x21,0x20,0xbc,0x7f]
-0x21 0x20 0xbc 0x7f
-
-# CHECK: v_cvt_f64_u32_e32 v[222:223], s33 ; encoding: [0x21,0x2c,0xbc,0x7f]
-0x21 0x2c 0xbc 0x7f
-
-# CHECK: v_rcp_f64_e32 v[222:223], s[22:23] ; encoding: [0x16,0x4a,0xbc,0x7f]
-0x16 0x4a 0xbc 0x7f
-
-# CHECK: v_rsq_f64_e32 v[222:223], s[22:23] ; encoding: [0x16,0x4c,0xbc,0x7f]
-0x16 0x4c 0xbc 0x7f
-
-# CHECK: v_sqrt_f64_e32 v[222:223], s[22:23] ; encoding: [0x16,0x50,0xbc,0x7f]
-0x16 0x50 0xbc 0x7f
-
-# CHECK: v_frexp_mant_f64_e32 v[222:223], s[22:23] ; encoding: [0x16,0x62,0xbc,0x7f]
-0x16 0x62 0xbc 0x7f
-
-# CHECK: v_fract_f64_e32 v[222:223], s[22:23] ; encoding: [0x16,0x64,0xbc,0x7f]
-0x16 0x64 0xbc 0x7f
-
-# CHECK: v_cvt_f16_u16_e32 v123, 23      ; encoding: [0x97,0x72,0xf6,0x7e]
-0x97 0x72 0xf6 0x7e
-
-# CHECK: v_cvt_f16_i16_e32 v123, vcc_hi  ; encoding: [0x6b,0x74,0xf6,0x7e]
-0x6b 0x74 0xf6 0x7e
-
-# CHECK: v_cvt_u16_f16_e32 v123, m0      ; encoding: [0x7c,0x76,0xf6,0x7e]
-0x7c 0x76 0xf6 0x7e
-
-# CHECK: v_cvt_i16_f16_e32 v123, exec_lo ; encoding: [0x7e,0x78,0xf6,0x7e]
-0x7e 0x78 0xf6 0x7e
-
-# CHECK: v_rcp_f16_e32 v123, 1.0         ; encoding: [0xf2,0x7a,0xf6,0x7e]
-0xf2 0x7a 0xf6 0x7e
-
-# CHECK: v_sqrt_f16_e32 v123, 4.0        ; encoding: [0xf6,0x7c,0xf6,0x7e]
-0xf6 0x7c 0xf6 0x7e
-
-# CHECK: v_rsq_f16_e32 v123, -1.0        ; encoding: [0xf3,0x7e,0xf6,0x7e]
-0xf3 0x7e 0xf6 0x7e
-
-# CHECK: v_log_f16_e32 v123, s33         ; encoding: [0x21,0x80,0xf6,0x7e]
-0x21 0x80 0xf6 0x7e
-
-# CHECK: v_exp_f16_e32 v123, v12         ; encoding: [0x0c,0x83,0xf6,0x7e]
-0x0c 0x83 0xf6 0x7e
-
-# CHECK: v_frexp_mant_f16_e32 v123, v12  ; encoding: [0x0c,0x85,0xf6,0x7e]
-0x0c 0x85 0xf6 0x7e
-
-# CHECK: v_frexp_exp_i16_f16_e32 v123, v12 ; encoding: [0x0c,0x87,0xf6,0x7e]
-0x0c 0x87 0xf6 0x7e
-
-# CHECK: v_floor_f16_e32 v123, v12       ; encoding: [0x0c,0x89,0xf6,0x7e]
-0x0c 0x89 0xf6 0x7e
-
-# CHECK: v_ceil_f16_e32 v123, v12        ; encoding: [0x0c,0x8b,0xf6,0x7e]
-0x0c 0x8b 0xf6 0x7e
-
-# CHECK: v_trunc_f16_e32 v123, s33       ; encoding: [0x21,0x8c,0xf6,0x7e]
-0x21 0x8c 0xf6 0x7e
-
-# CHECK: v_rndne_f16_e32 v123, s33       ; encoding: [0x21,0x8e,0xf6,0x7e]
-0x21 0x8e 0xf6 0x7e
-
-# CHECK: v_fract_f16_e32 v123, s33       ; encoding: [0x21,0x90,0xf6,0x7e]
-0x21 0x90 0xf6 0x7e
-
-# CHECK: v_sin_f16_e32 v123, s33         ; encoding: [0x21,0x92,0xf6,0x7e]
-0x21 0x92 0xf6 0x7e
-
-# CHECK: v_cos_f16_e32 v123, s33         ; encoding: [0x21,0x94,0xf6,0x7e]
-0x21 0x94 0xf6 0x7e
-
-# CHECK: v_mov_b32_e32 v2, 0x75bcd15     ; encoding: [0xff,0x02,0x04,0x7e,0x15,0xcd,0x5b,0x07]
-0xff 0x02 0x04 0x7e 0x15 0xcd 0x5b 0x07
-
-# CHECK: v_cvt_f32_u32_e32 v33, 0x4236b732 ; encoding: [0xff,0x0c,0x42,0x7e,0x32,0xb7,0x36,0x42]
-0xff 0x0c 0x42 0x7e 0x32 0xb7 0x36 0x42
-
-# CHECK: v_cvt_i32_f64_e32 v2, 0x4236b732 ; encoding: [0xff,0x06,0x04,0x7e,0x32,0xb7,0x36,0x42]
-0xff 0x06 0x04 0x7e 0x32 0xb7 0x36 0x42
-
-# CHECK: v_cvt_f16_u16_e32 v123, 0x68b1 ; encoding: [0xff,0x72,0xf6,0x7e,0xb1,0x68,0xde,0x3a]
-0xff 0x72 0xf6 0x7e 0xb1 0x68 0xde 0x3a
-
-# CHECK: v_cvt_f16_i16_e32 v123, 0x21c2  ; encoding: [0xff,0x74,0xf6,0x7e,0xc2,0x21,0x00,0x00]
-0xff 0x74 0xf6 0x7e 0xc2 0x21 0x00 0x00
-
-# CHECK: v_cvt_u16_f16_e32 v123, 0x3f20 ; encoding: [0xff,0x76,0xf6,0x7e,0x20,0x3f,0x00,0x00]
-0xff 0x76 0xf6 0x7e 0x20 0x3f 0x00 0x00

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/vop1_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/vop1_vi.txt
deleted file mode 100644
index 8e1a13e25896c..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/vop1_vi.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI: v_mov_b32_e32 v1, v2 ; encoding: [0x02,0x03,0x02,0x7e]
-0x02 0x03 0x02 0x7e
-
-# VI: v_nop ; encoding: [0x00,0x00,0x00,0x7e]
-0x00 0x00 0x00 0x7e
-
-# VI: v_nop ; encoding: [0x00,0x00,0x00,0x7e]
-0x80 0x00 0x00 0x7e
-
-# VI:   v_clrexcp ; encoding: [0x00,0x6a,0x00,0x7e]
-0x00 0x6a 0x00 0x7e
-
-# VI: v_nop ; encoding: [0x00,0x00,0x00,0x7e]
-0x00 0x00 0x00 0x7e
-
-# VI: v_mov_b32_e32 v1, v2 ; encoding: [0x02,0x03,0x02,0x7e]
-0x02 0x03 0x02 0x7e
-
-# VI: v_readfirstlane_b32 s1, v2 ; encoding: [0x02,0x05,0x02,0x7e]
-0x02 0x05 0x02 0x7e
-
-# VI: v_cvt_i32_f64_e32 v1, v[2:3] ; encoding: [0x02,0x07,0x02,0x7e]
-0x02 0x07 0x02 0x7e
-
-# VI: v_cvt_f64_i32_e32 v[1:2], v2 ; encoding: [0x02,0x09,0x02,0x7e]
-0x02 0x09 0x02 0x7e
-
-# VI: v_cvt_f32_i32_e32 v1, v2 ; encoding: [0x02,0x0b,0x02,0x7e]
-0x02 0x0b 0x02 0x7e
-
-# VI: v_cvt_f32_u32_e32 v1, v2 ; encoding: [0x02,0x0d,0x02,0x7e]
-0x02 0x0d 0x02 0x7e
-
-# VI: v_cvt_i32_f32_e32 v1, v2 ; encoding: [0x02,0x11,0x02,0x7e]
-0x02 0x11 0x02 0x7e
-
-# VI: v_cvt_f16_f32_e32 v1, v2 ; encoding: [0x02,0x15,0x02,0x7e]
-0x02 0x15 0x02 0x7e
-
-# VI: v_cvt_f32_f16_e32 v1, v2 ; encoding: [0x02,0x17,0x02,0x7e]
-0x02 0x17 0x02 0x7e
-
-# VI: v_cvt_rpi_i32_f32_e32 v1, v2 ; encoding: [0x02,0x19,0x02,0x7e]
-0x02 0x19 0x02 0x7e
-
-# VI: v_cvt_flr_i32_f32_e32 v1, v2 ; encoding: [0x02,0x1b,0x02,0x7e]
-0x02 0x1b 0x02 0x7e
-
-# VI: v_cvt_off_f32_i4_e32 v1, v2 ; encoding: [0x02,0x1d,0x02,0x7e]
-0x02 0x1d 0x02 0x7e
-
-# VI: v_cvt_f32_f64_e32 v1, v[2:3] ; encoding: [0x02,0x1f,0x02,0x7e]
-0x02 0x1f 0x02 0x7e
-
-# VI: v_cvt_f64_f32_e32 v[1:2], v2 ; encoding: [0x02,0x21,0x02,0x7e]
-0x02 0x21 0x02 0x7e
-
-# VI: v_cvt_f32_ubyte0_e32 v1, v2 ; encoding: [0x02,0x23,0x02,0x7e]
-0x02 0x23 0x02 0x7e
-
-# VI: v_cvt_f32_ubyte1_e32 v1, v2 ; encoding: [0x02,0x25,0x02,0x7e]
-0x02 0x25 0x02 0x7e
-
-# VI: v_cvt_f32_ubyte2_e32 v1, v2 ; encoding: [0x02,0x27,0x02,0x7e]
-0x02 0x27 0x02 0x7e
-
-# VI: v_cvt_f32_ubyte3_e32 v1, v2 ; encoding: [0x02,0x29,0x02,0x7e]
-0x02 0x29 0x02 0x7e
-
-# VI: v_cvt_u32_f64_e32 v1, v[2:3] ; encoding: [0x02,0x2b,0x02,0x7e]
-0x02 0x2b 0x02 0x7e
-
-# VI: v_cvt_f64_u32_e32 v[1:2], v2 ; encoding: [0x02,0x2d,0x02,0x7e]
-0x02 0x2d 0x02 0x7e
-
-# VI:   v_fract_f32_e32 v1, v2 ; encoding: [0x02,0x37,0x02,0x7e]
-0x02 0x37 0x02 0x7e
-
-# VI:   v_trunc_f32_e32 v1, v2 ; encoding: [0x02,0x39,0x02,0x7e]
-0x02 0x39 0x02 0x7e
-
-# VI:   v_ceil_f32_e32 v1, v2 ; encoding: [0x02,0x3b,0x02,0x7e]
-0x02 0x3b 0x02 0x7e
-
-# VI:   v_rndne_f32_e32 v1, v2 ; encoding: [0x02,0x3d,0x02,0x7e]
-0x02 0x3d 0x02 0x7e
-
-# VI:   v_floor_f32_e32 v1, v2 ; encoding: [0x02,0x3f,0x02,0x7e]
-0x02 0x3f 0x02 0x7e
-
-# VI:   v_exp_f32_e32 v1, v2 ; encoding: [0x02,0x41,0x02,0x7e]
-0x02 0x41 0x02 0x7e
-
-# VI:   v_log_f32_e32 v1, v2 ; encoding: [0x02,0x43,0x02,0x7e]
-0x02 0x43 0x02 0x7e
-
-# VI:   v_rcp_f32_e32 v1, v2 ; encoding: [0x02,0x45,0x02,0x7e]
-0x02 0x45 0x02 0x7e
-
-# VI:   v_rcp_iflag_f32_e32 v1, v2 ; encoding: [0x02,0x47,0x02,0x7e]
-0x02 0x47 0x02 0x7e
-
-# VI:   v_rsq_f32_e32 v1, v2 ; encoding: [0x02,0x49,0x02,0x7e]
-0x02 0x49 0x02 0x7e
-
-# VI:   v_rcp_f64_e32 v[1:2], v[2:3] ; encoding: [0x02,0x4b,0x02,0x7e]
-0x02 0x4b 0x02 0x7e
-
-# VI:   v_rsq_f64_e32 v[1:2], v[2:3] ; encoding: [0x02,0x4d,0x02,0x7e]
-0x02 0x4d 0x02 0x7e
-
-# VI:   v_sqrt_f32_e32 v1, v2 ; encoding: [0x02,0x4f,0x02,0x7e]
-0x02 0x4f 0x02 0x7e
-
-# VI:   v_sqrt_f64_e32 v[1:2], v[2:3] ; encoding: [0x02,0x51,0x02,0x7e]
-0x02 0x51 0x02 0x7e
-
-# VI:   v_sin_f32_e32 v1, v2 ; encoding: [0x02,0x53,0x02,0x7e]
-0x02 0x53 0x02 0x7e
-
-# VI:   v_cos_f32_e32 v1, v2 ; encoding: [0x02,0x55,0x02,0x7e]
-0x02 0x55 0x02 0x7e
-
-# VI:   v_not_b32_e32 v1, v2 ; encoding: [0x02,0x57,0x02,0x7e]
-0x02 0x57 0x02 0x7e
-
-# VI:   v_bfrev_b32_e32 v1, v2 ; encoding: [0x02,0x59,0x02,0x7e]
-0x02 0x59 0x02 0x7e
-
-# VI:   v_ffbh_u32_e32 v1, v2 ; encoding: [0x02,0x5b,0x02,0x7e]
-0x02 0x5b 0x02 0x7e
-
-# VI:   v_ffbl_b32_e32 v1, v2 ; encoding: [0x02,0x5d,0x02,0x7e]
-0x02 0x5d 0x02 0x7e
-
-# VI:   v_ffbh_i32_e32 v1, v2 ; encoding: [0x02,0x5f,0x02,0x7e]
-0x02 0x5f 0x02 0x7e
-
-# VI:   v_frexp_exp_i32_f64_e32 v1, v[2:3] ; encoding: [0x02,0x61,0x02,0x7e]
-0x02 0x61 0x02 0x7e
-
-# VI:   v_fract_f64_e32 v[1:2], v[2:3] ; encoding: [0x02,0x65,0x02,0x7e]
-0x02 0x65 0x02 0x7e
-
-# VI:   v_frexp_exp_i32_f32_e32 v1, v2 ; encoding: [0x02,0x67,0x02,0x7e]
-0x02 0x67 0x02 0x7e
-
-# VI:   v_frexp_mant_f32_e32 v1, v2 ; encoding: [0x02,0x69,0x02,0x7e]
-0x02 0x69 0x02 0x7e
-
-# VI:   v_clrexcp ; encoding: [0x00,0x6a,0x00,0x7e]
-0x00 0x6a 0x00 0x7e
-
-# VI:   v_movreld_b32_e32 v1, v2 ; encoding: [0x02,0x6d,0x02,0x7e]
-0x02 0x6d 0x02 0x7e
-
-# VI:   v_movrels_b32_e32 v1, v2 ; encoding: [0x02,0x6f,0x02,0x7e]
-0x02 0x6f 0x02 0x7e
-
-# VI:   v_movrelsd_b32_e32 v1, v2 ; encoding: [0x02,0x71,0x02,0x7e]
-0x02 0x71 0x02 0x7e
-
-# VI: v_log_legacy_f32_e32 v1, v2 ; encoding: [0x02,0x99,0x02,0x7e]
-0x02 0x99 0x02 0x7e
-
-# VI: v_exp_legacy_f32_e32 v1, v2 ; encoding: [0x02,0x97,0x02,0x7e]
-0x02 0x97 0x02 0x7e
-
-# VI: v_cvt_f16_u16_e32 v1, v2 ; encoding: [0x02,0x73,0x02,0x7e]
-0x02 0x73 0x02 0x7e
-
-# VI: v_cvt_f16_i16_e32 v1, v2 ; encoding: [0x02,0x75,0x02,0x7e]
-0x02 0x75 0x02 0x7e
-
-# VI: v_cvt_u16_f16_e32 v1, v2 ; encoding: [0x02,0x77,0x02,0x7e]
-0x02 0x77 0x02 0x7e
-
-# VI: v_cvt_i16_f16_e32 v1, v2 ; encoding: [0x02,0x79,0x02,0x7e]
-0x02 0x79 0x02 0x7e
-
-# VI: v_rcp_f16_e32 v1, v2 ; encoding: [0x02,0x7b,0x02,0x7e]
-0x02 0x7b 0x02 0x7e
-
-# VI: v_sqrt_f16_e32 v1, v2 ; encoding: [0x02,0x7d,0x02,0x7e]
-0x02 0x7d 0x02 0x7e
-
-# VI: v_rsq_f16_e32 v1, v2 ; encoding: [0x02,0x7f,0x02,0x7e]
-0x02 0x7f 0x02 0x7e
-
-# VI: v_log_f16_e32 v1, v2 ; encoding: [0x02,0x81,0x02,0x7e]
-0x02 0x81 0x02 0x7e
-
-# VI: v_exp_f16_e32 v1, v2 ; encoding: [0x02,0x83,0x02,0x7e]
-0x02 0x83 0x02 0x7e
-
-# VI: v_frexp_mant_f16_e32 v1, v2 ; encoding: [0x02,0x85,0x02,0x7e]
-0x02 0x85 0x02 0x7e
-
-# VI: v_frexp_exp_i16_f16_e32 v1, v2 ; encoding: [0x02,0x87,0x02,0x7e]
-0x02 0x87 0x02 0x7e
-
-# VI: v_floor_f16_e32 v1, v2 ; encoding: [0x02,0x89,0x02,0x7e]
-0x02 0x89 0x02 0x7e
-
-# VI: v_ceil_f16_e32 v1, v2 ; encoding: [0x02,0x8b,0x02,0x7e]
-0x02 0x8b 0x02 0x7e
-
-# VI: v_trunc_f16_e32 v1, v2 ; encoding: [0x02,0x8d,0x02,0x7e]
-0x02 0x8d 0x02 0x7e
-
-# VI: v_rndne_f16_e32 v1, v2 ; encoding: [0x02,0x8f,0x02,0x7e]
-0x02 0x8f 0x02 0x7e
-
-# VI: v_fract_f16_e32 v1, v2 ; encoding: [0x02,0x91,0x02,0x7e]
-0x02 0x91 0x02 0x7e
-
-# VI: v_sin_f16_e32 v1, v2 ; encoding: [0x02,0x93,0x02,0x7e]
-0x02 0x93 0x02 0x7e
-
-# VI: v_cos_f16_e32 v1, v2 ; encoding: [0x02,0x95,0x02,0x7e]
-0x02 0x95 0x02 0x7e

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/vop2_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/vop2_vi.txt
deleted file mode 100644
index eafbece4d96cf..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/vop2_vi.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   v_cndmask_b32_e32 v1, v2, v3, vcc ; encoding: [0x02,0x07,0x02,0x00]
-0x02 0x07 0x02 0x00
-
-# VI:   v_readlane_b32 s1, v2, s3 ; encoding: [0x01,0x00,0x89,0xd2,0x02,0x07,0x00,0x00]
-0x01 0x00 0x89 0xd2 0x02 0x07 0x00 0x00
-
-# VI:   v_writelane_b32 v1, s2, s3 ; encoding: [0x01,0x00,0x8a,0xd2,0x02,0x06,0x00,0x00]
-0x01 0x00 0x8a 0xd2 0x02 0x06 0x00 0x00
-
-# VI:   v_add_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x02]
-0x02 0x07 0x02 0x02
-
-# VI:   v_sub_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x04]
-0x02 0x07 0x02 0x04
-
-# VI:   v_subrev_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x06]
-0x02 0x07 0x02 0x06
-
-# VI:   v_mul_legacy_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x08]
-0x02 0x07 0x02 0x08
-
-# VI:   v_mul_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x0a]
-0x02 0x07 0x02 0x0a
-
-# VI:   v_mul_i32_i24_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x0c]
-0x02 0x07 0x02 0x0c
-
-# VI:   v_mul_i32_i24_e64 v1, v2, v3 clamp ; encoding: [0x01,0x80,0x06,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x80 0x06 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_mul_hi_i32_i24_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x0e]
-0x02 0x07 0x02 0x0e
-
-# VI:   v_mul_u32_u24_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x10]
-0x02 0x07 0x02 0x10
-
-# VI:   v_mul_u32_u24_e64 v1, v3, s5 clamp ; encoding: [0x01,0x80,0x08,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x80 0x08 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_mul_hi_u32_u24_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x12]
-0x02 0x07 0x02 0x12
-
-# VI:   v_min_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x14]
-0x02 0x07 0x02 0x14
-
-# VI:   v_max_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x16]
-0x02 0x07 0x02 0x16
-
-# VI:   v_min_i32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x18]
-0x02 0x07 0x02 0x18
-
-# VI:   v_max_i32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x1a]
-0x02 0x07 0x02 0x1a
-
-# VI:   v_min_u32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x1c]
-0x02 0x07 0x02 0x1c
-
-# VI:   v_max_u32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x1e]
-0x02 0x07 0x02 0x1e
-
-# VI:   v_lshrrev_b32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x20]
-0x02 0x07 0x02 0x20
-
-# VI:   v_ashrrev_i32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x22]
-0x02 0x07 0x02 0x22
-
-# VI:   v_lshlrev_b32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x24]
-0x02 0x07 0x02 0x24
-
-# VI:   v_and_b32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x26]
-0x02 0x07 0x02 0x26
-
-# VI:   v_or_b32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x28]
-0x02 0x07 0x02 0x28
-
-# VI:   v_xor_b32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x2a]
-0x02 0x07 0x02 0x2a
-
-# VI:   v_bfm_b32 v1, v2, v3 ; encoding: [0x01,0x00,0x93,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x93 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_mac_f32_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x2c]
-0x02 0x07 0x02 0x2c
-
-# VI:   v_madmk_f32 v1, v2, 0x42800000, v3 ; encoding: [0x02,0x07,0x02,0x2e,0x00,0x00,0x80,0x42]
-0x02 0x07 0x02 0x2e 0x00 0x00 0x80 0x42
-
-# VI:   v_madak_f32 v1, v2, v3, 0x42800000 ; encoding: [0x02,0x07,0x02,0x30,0x00,0x00,0x80,0x42]
-0x02 0x07 0x02 0x30 0x00 0x00 0x80 0x42
-
-# VI:   v_bcnt_u32_b32 v1, v2, v3 ; encoding: [0x01,0x00,0x8b,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x8b 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_mbcnt_lo_u32_b32 v1, v2, v3 ; encoding: [0x01,0x00,0x8c,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x8c 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_mbcnt_hi_u32_b32 v1, v2, v3 ; encoding: [0x01,0x00,0x8d,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x8d 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_add_u32_e32 v1, vcc, v2, v3 ; encoding: [0x02,0x07,0x02,0x32]
-0x02 0x07 0x02 0x32
-
-# VI:   v_add_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x19,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x19 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_add_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x19,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x19 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_add_u32_e64 v1, vcc, v2, v3 ; encoding: [0x01,0x6a,0x19,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x6a 0x19 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_add_u32_e32 v1, vcc, v2, v3 ; encoding: [0x02,0x07,0x02,0x32]
-0x02 0x07 0x02 0x32
-
-# VI:   v_add_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x19,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x19 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_sub_u32_e32 v1, vcc, v2, v3 ; encoding: [0x02,0x07,0x02,0x34]
-0x02 0x07 0x02 0x34
-
-# VI:   v_sub_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x1a,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x1a 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_sub_u32_e32 v1, vcc, v2, v3 ; encoding: [0x02,0x07,0x02,0x34]
-0x02 0x07 0x02 0x34
-
-# VI:   v_sub_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x1a,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x1a 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_subrev_u32_e32 v1, vcc, v2, v3 ; encoding: [0x02,0x07,0x02,0x36]
-0x02 0x07 0x02 0x36
-
-# VI:   v_subrev_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x1b,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x1b 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_subrev_u32_e32 v1, vcc, v2, v3 ; encoding: [0x02,0x07,0x02,0x36]
-0x02 0x07 0x02 0x36
-
-# VI:   v_subrev_u32_e64 v1, s[0:1], v2, v3 ; encoding: [0x01,0x00,0x1b,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0x1b 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_addc_u32_e32 v1, vcc, v2, v3, vcc ; encoding: [0x02,0x07,0x02,0x38]
-0x02 0x07 0x02 0x38
-
-# VI:   v_addc_u32_e32 v1, vcc, v2, v3, vcc ; encoding: [0x02,0x07,0x02,0x38]
-0x02 0x07 0x02 0x38
-
-# VI: v_addc_u32_e64 v1, s[0:1], v2, v3, vcc ; encoding: [0x01,0x00,0x1c,0xd1,0x02,0x07,0xaa,0x01]
-0x01 0x00 0x1c 0xd1 0x02 0x07 0xaa 0x01
-
-# VI: v_addc_u32_e64 v1, s[0:1], v2, v3, s[2:3] ; encoding: [0x01,0x00,0x1c,0xd1,0x02,0x07,0x0a,0x00]
-0x01 0x00 0x1c 0xd1 0x02 0x07 0x0a 0x00
-
-# VI: v_addc_u32_e64 v1, s[0:1], v2, v3, s[2:3] ; encoding: [0x01,0x00,0x1c,0xd1,0x02,0x07,0x0a,0x00]
-0x01 0x00 0x1c 0xd1 0x02 0x07 0x0a 0x00
-
-# FIXME: v_addc_u32_e64 v1, s[0:1], v2, v3, -1 ; encoding: [0x01,0x00,0x1c,0xd1,0x02,0x07,0x06,0x03]
-#0x01 0x00 0x1c 0xd1 0x02 0x07 0x06 0x03
-
-# FIXME: v_addc_u32_e64 v1, vcc, v2, v3, -1 ; encoding: [0x01,0x6a,0x1c,0xd1,0x02,0x07,0x06,0x03]
-#0x01 0x6a 0x1c 0xd1 0x02 0x07 0x06 0x03
-
-# VI: v_addc_u32_e64 v1, vcc, v2, v3, vcc ; encoding: [0x01,0x6a,0x1c,0xd1,0x02,0x07,0xaa,0x01]
-0x01 0x6a 0x1c 0xd1 0x02 0x07 0xaa 0x01
-
-# VI: v_subb_u32_e32 v1, vcc, v2, v3, vcc ; encoding: [0x02,0x07,0x02,0x3a]
-0x02 0x07 0x02 0x3a
-
-# VI: v_subb_u32_e64 v1, s[0:1], v2, v3, vcc ; encoding: [0x01,0x00,0x1d,0xd1,0x02,0x07,0xaa,0x01]
-0x01 0x00 0x1d 0xd1 0x02 0x07 0xaa 0x01
-
-# VI:   v_subbrev_u32_e32 v1, vcc, v2, v3, vcc ; encoding: [0x02,0x07,0x02,0x3c]
-0x02 0x07 0x02 0x3c
-
-# VI: v_subbrev_u32_e64 v1, s[0:1], v2, v3, vcc ; encoding: [0x01,0x00,0x1e,0xd1,0x02,0x07,0xaa,0x01]
-0x01 0x00 0x1e 0xd1 0x02 0x07 0xaa 0x01
-
-# VI:   v_ldexp_f32 v1, v2, v3 ; encoding: [0x01,0x00,0x88,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x88 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_cvt_pkaccum_u8_f32 v1, v2, v3 ; encoding: [0x01,0x00,0xf0,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x00 0xf0 0xd1 0x02 0x07 0x02 0x00
-
-# VI:   v_cvt_pknorm_i16_f32 v1, v2, v3 ; encoding: [0x01,0x00,0x94,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x94 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_cvt_pknorm_u16_f32 v1, v2, v3 ; encoding: [0x01,0x00,0x95,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x95 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_cvt_pkrtz_f16_f32 v1, v2, v3 ; encoding: [0x01,0x00,0x96,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x96 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_cvt_pk_u16_u32 v1, v2, v3 ; encoding: [0x01,0x00,0x97,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x97 0xd2 0x02 0x07 0x02 0x00
-
-# VI:   v_cvt_pk_i16_i32 v1, v2, v3 ; encoding: [0x01,0x00,0x98,0xd2,0x02,0x07,0x02,0x00]
-0x01 0x00 0x98 0xd2 0x02 0x07 0x02 0x00
-
-# VI:     v_add_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x3e]
-0x02 0x07 0x02 0x3e
-
-# VI:     v_sub_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x40]
-0x02 0x07 0x02 0x40
-
-# VI:     v_subrev_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x42]
-0x02 0x07 0x02 0x42
-
-# VI:     v_mul_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x44]
-0x02 0x07 0x02 0x44
-
-# VI:     v_mac_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x46]
-0x02 0x07 0x02 0x46
-
-# VI:     v_madmk_f16 v1, v2, 0x42800000, v3 ; encoding: [0x02,0x07,0x02,0x48,0x00,0x00,0x80,0x42]
-0x02 0x07 0x02 0x48 0x00 0x00 0x80 0x42
-
-# VI:     v_madak_f16 v1, v2, v3, 0x42800000 ; encoding: [0x02,0x07,0x02,0x4a,0x00,0x00,0x80,0x42]
-0x02 0x07 0x02 0x4a 0x00 0x00 0x80 0x42
-
-# VI:     v_add_u16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x4c]
-0x02 0x07 0x02 0x4c
-
-# VI:     v_add_u16_e64 v1, v2, v3 clamp  ; encoding: [0x01,0x80,0x26,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x80 0x26 0xd1 0x02 0x07 0x02 0x00
-
-# VI:     v_sub_u16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x4e]
-0x02 0x07 0x02 0x4e
-
-# VI:     v_sub_u16_e64 v1, v2, v3 clamp ; encoding: [0x01,0x80,0x27,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x80 0x27 0xd1 0x02 0x07 0x02 0x00
-
-# VI:     v_subrev_u16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x50]
-0x02 0x07 0x02 0x50
-
-# VI:     v_subrev_u16_e64 v1, v2, v3 clamp ; encoding: [0x01,0x80,0x28,0xd1,0x02,0x07,0x02,0x00]
-0x01 0x80 0x28 0xd1 0x02 0x07 0x02 0x00
-
-# VI:     v_mul_lo_u16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x52]
-0x02 0x07 0x02 0x52
-
-# VI:     v_lshlrev_b16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x54]
-0x02 0x07 0x02 0x54
-
-# VI: v_lshrrev_b16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x56]
-0x02 0x07 0x02 0x56
-
-# VI:     v_ashrrev_i16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x58]
-0x02 0x07 0x02 0x58
-
-# VI:     v_max_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x5a]
-0x02 0x07 0x02 0x5a
-
-# VI:     v_min_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x5c]
-0x02 0x07 0x02 0x5c
-
-# VI:     v_max_u16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x5e]
-0x02 0x07 0x02 0x5e
-
-# VI:     v_max_i16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x60]
-0x02 0x07 0x02 0x60
-
-# VI:     v_min_u16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x62]
-0x02 0x07 0x02 0x62
-
-# VI:     v_min_i16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x64]
-0x02 0x07 0x02 0x64
-
-# VI:     v_ldexp_f16_e32 v1, v2, v3 ; encoding: [0x02,0x07,0x02,0x66]
-0x02 0x07 0x02 0x66

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/vop3_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/vop3_vi.txt
deleted file mode 100644
index 5ee8b00fd044a..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/vop3_vi.txt
+++ /dev/null
@@ -1,512 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], v4, -v6 ; encoding: [0x02,0x00,0x41,0xd0,0x04,0x0d,0x02,0x40]
-0x02 0x00 0x41 0xd0 0x04 0x0d 0x02 0x40
-
-# VI: v_cmp_lt_f32_e64 vcc, v4, v6 ; encoding: [0x6a,0x00,0x41,0xd0,0x04,0x0d,0x02,0x00]
-0x6a 0x00 0x41 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], -v4, v6 ; encoding: [0x02,0x00,0x41,0xd0,0x04,0x0d,0x02,0x20]
-0x02 0x00 0x41 0xd0 0x04 0x0d 0x02 0x20
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], v4, -v6 ; encoding: [0x02,0x00,0x41,0xd0,0x04,0x0d,0x02,0x40]
-0x02 0x00 0x41 0xd0 0x04 0x0d 0x02 0x40
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], -v4, -v6 ; encoding: [0x02,0x00,0x41,0xd0,0x04,0x0d,0x02,0x60]
-0x02 0x00 0x41 0xd0 0x04 0x0d 0x02 0x60
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], |v4|, v6 ; encoding: [0x02,0x01,0x41,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x01 0x41 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], v4, |v6| ; encoding: [0x02,0x02,0x41,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x02 0x41 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], |v4|, |v6| ; encoding: [0x02,0x03,0x41,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x03 0x41 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], -|v4|, v6 ; encoding: [0x02,0x01,0x41,0xd0,0x04,0x0d,0x02,0x20]
-0x02 0x01 0x41 0xd0 0x04 0x0d 0x02 0x20
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], -|v4|, v6 ; encoding: [0x02,0x01,0x41,0xd0,0x04,0x0d,0x02,0x20]
-0x02 0x01 0x41 0xd0 0x04 0x0d 0x02 0x20
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], v4, -|v6| ; encoding: [0x02,0x02,0x41,0xd0,0x04,0x0d,0x02,0x40]
-0x02 0x02 0x41 0xd0 0x04 0x0d 0x02 0x40
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], v4, -|v6| ; encoding: [0x02,0x02,0x41,0xd0,0x04,0x0d,0x02,0x40]
-0x02 0x02 0x41 0xd0 0x04 0x0d 0x02 0x40
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], -|v4|, -|v6| ; encoding: [0x02,0x03,0x41,0xd0,0x04,0x0d,0x02,0x60]
-0x02 0x03 0x41 0xd0 0x04 0x0d 0x02 0x60
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], -|v4|, -|v6| ; encoding: [0x02,0x03,0x41,0xd0,0x04,0x0d,0x02,0x60]
-0x02 0x03 0x41 0xd0 0x04 0x0d 0x02 0x60
-
-# VI:   v_cmp_f_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x40,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x40 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_lt_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x41,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x41 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_eq_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x42,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x42 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_le_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x43,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x43 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_gt_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x44,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x44 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_lg_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x45,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x45 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_ge_f32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0x46,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x46 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_f_f64_e64 s[2:3], v[4:5], v[6:7] ; encoding: [0x02,0x00,0x60,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0x60 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_f_i32_e64 s[2:3], v4, v6 ; encoding: [0x02,0x00,0xc0,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0xc0 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_cmp_f_i64_e64 s[2:3], v[4:5], v[6:7] ; encoding: [0x02,0x00,0xe0,0xd0,0x04,0x0d,0x02,0x00]
-0x02 0x00 0xe0 0xd0 0x04 0x0d 0x02 0x00
-
-# VI:   v_mov_b32_e64 v1, v2 ; encoding: [0x01,0x00,0x41,0xd1,0x02,0x01,0x00,0x00]
-0x01 0x00 0x41 0xd1 0x02 0x01 0x00 0x00
-
-# VI:   v_nop ; encoding: [0x00,0x00,0x40,0xd1,0x00,0x00,0x00,0x00]
-0x00 0x00 0x40 0xd1 0x00 0x00 0x00 0x00
-
-# VI:   v_clrexcp ; encoding: [0x00,0x00,0x75,0xd1,0x00,0x00,0x00,0x00]
-0x00 0x00 0x75 0xd1 0x00 0x00 0x00 0x00
-
-# VI:   v_fract_f64_e64 v[5:6], s[2:3] ; encoding: [0x05,0x00,0x72,0xd1,0x02,0x00,0x00,0x00]
-0x05,0x00,0x72,0xd1,0x02,0x00,0x00,0x00
-
-# VI:   v_fract_f64_e64 v[5:6], -4.0 ; encoding: [0x05,0x00,0x72,0xd1,0xf7,0x00,0x00,0x00]
-0x05,0x00,0x72,0xd1,0xf7,0x00,0x00,0x00
-
-# VI:   v_fract_f64_e64 v[5:6], -s[2:3] ; encoding: [0x05,0x00,0x72,0xd1,0x02,0x00,0x00,0x20]
-0x05,0x00,0x72,0xd1,0x02,0x00,0x00,0x20
-
-# VI:   v_fract_f64_e64 v[5:6], |s[2:3]| ; encoding: [0x05,0x01,0x72,0xd1,0x02,0x00,0x00,0x00]
-0x05,0x01,0x72,0xd1,0x02,0x00,0x00,0x00
-
-# VI:   v_fract_f64_e64 v[5:6], s[2:3] clamp ; encoding: [0x05,0x80,0x72,0xd1,0x02,0x00,0x00,0x00]
-0x05,0x80,0x72,0xd1,0x02,0x00,0x00,0x00
-
-# VI:   v_fract_f64_e64 v[5:6], s[2:3] mul:2 ; encoding: [0x05,0x00,0x72,0xd1,0x02,0x00,0x00,0x08]
-0x05,0x00,0x72,0xd1,0x02,0x00,0x00,0x08
-
-# VI:   v_fract_f32_e64 v1, -v2 ; encoding: [0x01,0x00,0x5b,0xd1,0x02,0x01,0x00,0x20]
-0x01 0x00 0x5b 0xd1 0x02 0x01 0x00 0x20
-
-# VI:   v_fract_f32_e64 v1, |v2| ; encoding: [0x01,0x01,0x5b,0xd1,0x02,0x01,0x00,0x00]
-0x01 0x01 0x5b 0xd1 0x02 0x01 0x00 0x00
-
-# VI:   v_fract_f32_e64 v1, |v2| ; encoding: [0x01,0x01,0x5b,0xd1,0x02,0x01,0x00,0x00]
-0x01 0x01 0x5b 0xd1 0x02 0x01 0x00 0x00
-
-# VI:   v_fract_f32_e64 v1, -|v2| ; encoding: [0x01,0x01,0x5b,0xd1,0x02,0x01,0x00,0x20]
-0x01 0x01 0x5b 0xd1 0x02 0x01 0x00 0x20
-
-# VI:   v_fract_f32_e64 v1, -|v2| ; encoding: [0x01,0x01,0x5b,0xd1,0x02,0x01,0x00,0x20]
-0x01 0x01 0x5b 0xd1 0x02 0x01 0x00 0x20
-
-# VI:   v_fract_f32_e64 v1, v2 clamp ; encoding: [0x01,0x80,0x5b,0xd1,0x02,0x01,0x00,0x00]
-0x01 0x80 0x5b 0xd1 0x02 0x01 0x00 0x00
-
-# VI:   v_fract_f32_e64 v1, v2 mul:2 ; encoding: [0x01,0x00,0x5b,0xd1,0x02,0x01,0x00,0x08]
-0x01 0x00 0x5b 0xd1 0x02 0x01 0x00 0x08
-
-# VI:   v_fract_f32_e64 v1, v2 clamp div:2 ; encoding: [0x01,0x80,0x5b,0xd1,0x02,0x01,0x00,0x18]
-0x01 0x80 0x5b 0xd1 0x02 0x01 0x00 0x18
-
-# VI:   v_add_f32_e64 v1, v3, v5 ; encoding: [0x01,0x00,0x01,0xd1,0x03,0x0b,0x02,0x00]
-0x01 0x00 0x01 0xd1 0x03 0x0b 0x02 0x00
-
-# VI:   v_cndmask_b32_e64 v1, v3, v5, s[4:5] ; encoding: [0x01,0x00,0x00,0xd1,0x03,0x0b,0x12,0x00]
-0x01 0x00 0x00 0xd1 0x03 0x0b 0x12 0x00
-
-# VI:   v_cndmask_b32_e64 v1, v3, v5, vcc ; encoding: [0x01,0x00,0x00,0xd1,0x03,0x0b,0xaa,0x01]
-0x01 0x00 0x00 0xd1 0x03 0x0b 0xaa 0x01
-
-# VI:   v_cndmask_b32_e64 v1, -v3, v5, s[4:5] ; encoding: [0x01,0x00,0x00,0xd1,0x03,0x0b,0x12,0x20]
-0x01,0x00,0x00,0xd1,0x03,0x0b,0x12,0x20
-
-# VI:   v_cndmask_b32_e64 v1, v3, |v5|, s[4:5] ; encoding: [0x01,0x02,0x00,0xd1,0x03,0x0b,0x12,0x00]
-0x01,0x02,0x00,0xd1,0x03,0x0b,0x12,0x00
-
-# VI:   v_cndmask_b32_e64 v1, -|v3|, v5, vcc ; encoding: [0x01,0x01,0x00,0xd1,0x03,0x0b,0xaa,0x21]
-0x01,0x01,0x00,0xd1,0x03,0x0b,0xaa,0x21
-
-# VI:   v_add_f32_e64 v1, v3, s5 ; encoding: [0x01,0x00,0x01,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x00 0x01 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_sub_f32_e64 v1, v3, s5 ; encoding: [0x01,0x00,0x02,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x00 0x02 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_subrev_f32_e64 v1, v3, s5 ; encoding: [0x01,0x00,0x03,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x00 0x03 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_mul_legacy_f32_e64 v1, v3, s5 ; encoding: [0x01,0x00,0x04,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x00 0x04 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_mul_f32_e64 v1, v3, s5 ; encoding: [0x01,0x00,0x05,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x00 0x05 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_mul_i32_i24_e64 v1, v3, s5 ; encoding: [0x01,0x00,0x06,0xd1,0x03,0x0b,0x00,0x00]
-0x01 0x00 0x06 0xd1 0x03 0x0b 0x00 0x00
-
-# VI:   v_mad_legacy_f32 v2, v4, v6, v8 ; encoding: [0x02,0x00,0xc0,0xd1,0x04,0x0d,0x22,0x04]
-0x02 0x00 0xc0 0xd1 0x04 0x0d 0x22 0x04
-
-# VI:   v_add_f64 v[0:1], v[2:3], v[5:6] ; encoding: [0x00,0x00,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x00 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], v[2:3], v[5:6] ; encoding: [0x00,0x00,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x00 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], -v[2:3], v[5:6] ; encoding: [0x00,0x00,0x80,0xd2,0x02,0x0b,0x02,0x20]
-0x00 0x00 0x80 0xd2 0x02 0x0b 0x02 0x20
-
-# VI:   v_add_f64 v[0:1], -v[2:3], v[5:6] ; encoding: [0x00,0x00,0x80,0xd2,0x02,0x0b,0x02,0x20]
-0x00 0x00 0x80 0xd2 0x02 0x0b 0x02 0x20
-
-# VI:   v_add_f64 v[0:1], v[2:3], -v[5:6] ; encoding: [0x00,0x00,0x80,0xd2,0x02,0x0b,0x02,0x40]
-0x00 0x00 0x80 0xd2 0x02 0x0b 0x02 0x40
-
-# VI:   v_add_f64 v[0:1], v[2:3], -v[5:6] ; encoding: [0x00,0x00,0x80,0xd2,0x02,0x0b,0x02,0x40]
-0x00 0x00 0x80 0xd2 0x02 0x0b 0x02 0x40
-
-# VI:   v_add_f64 v[0:1], |v[2:3]|, v[5:6] ; encoding: [0x00,0x01,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x01 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], |v[2:3]|, v[5:6] ; encoding: [0x00,0x01,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x01 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], |v[2:3]|, v[5:6] ; encoding: [0x00,0x01,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x01 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], |v[2:3]|, v[5:6] ; encoding: [0x00,0x01,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x01 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], v[2:3], |v[5:6]| ; encoding: [0x00,0x02,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x02 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], v[2:3], |v[5:6]| ; encoding: [0x00,0x02,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x02 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], v[2:3], |v[5:6]| ; encoding: [0x00,0x02,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x02 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], v[2:3], |v[5:6]| ; encoding: [0x00,0x02,0x80,0xd2,0x02,0x0b,0x02,0x00]
-0x00 0x02 0x80 0xd2 0x02 0x0b 0x02 0x00
-
-# VI:   v_add_f64 v[0:1], -v[2:3], |v[5:6]| clamp mul:4 ; encoding: [0x00,0x82,0x80,0xd2,0x02,0x0b,0x02,0x30]
-0x00 0x82 0x80 0xd2 0x02 0x0b 0x02 0x30
-
-# VI:   v_add_f64 v[0:1], -v[2:3], |v[5:6]| clamp mul:4 ; encoding: [0x00,0x82,0x80,0xd2,0x02,0x0b,0x02,0x30]
-0x00 0x82 0x80 0xd2 0x02 0x0b 0x02 0x30
-
-# VI:   v_add_f64 v[0:1], -v[2:3], |v[5:6]| clamp mul:4 ; encoding: [0x00,0x82,0x80,0xd2,0x02,0x0b,0x02,0x30]
-0x00 0x82 0x80 0xd2 0x02 0x0b 0x02 0x30
-
-# VI:   v_add_f64 v[0:1], -v[2:3], |v[5:6]| clamp mul:4 ; encoding: [0x00,0x82,0x80,0xd2,0x02,0x0b,0x02,0x30]
-0x00 0x82 0x80 0xd2 0x02 0x0b 0x02 0x30
-
-# VI:   v_div_scale_f64 v[24:25], vcc, v[22:23], v[22:23], v[20:21] ; encoding: [0x18,0x6a,0xe1,0xd1,0x16,0x2d,0x52,0x04]
-0x18 0x6a 0xe1 0xd1 0x16 0x2d 0x52 0x04
-
-# VI:   v_div_scale_f64 v[24:25], s[10:11], v[22:23], v[20:21], v[20:21] ; encoding: [0x18,0x0a,0xe1,0xd1,0x16,0x29,0x52,0x04]
-0x18 0x0a 0xe1 0xd1 0x16 0x29 0x52 0x04
-
-# VI:   v_div_scale_f32 v24, vcc, v22, v22, v20 ; encoding: [0x18,0x6a,0xe0,0xd1,0x16,0x2d,0x52,0x04]
-0x18 0x6a 0xe0 0xd1 0x16 0x2d 0x52 0x04
-
-# VI:   v_div_scale_f32 v24, vcc, s10, v22, v20 ; encoding: [0x18,0x6a,0xe0,0xd1,0x0a,0x2c,0x52,0x04]
-0x18 0x6a 0xe0 0xd1 0x0a 0x2c 0x52 0x04
-
-# VI:   v_div_scale_f32 v24, s[10:11], v22, v22, v20 ; encoding: [0x18,0x0a,0xe0,0xd1,0x16,0x2d,0x52,0x04]
-0x18 0x0a 0xe0 0xd1 0x16 0x2d 0x52 0x04
-
-# VI:   v_div_scale_f32 v24, vcc, v22, 1.0, v22 ; encoding: [0x18,0x6a,0xe0,0xd1,0x16,0xe5,0x59,0x04]
-0x18 0x6a 0xe0 0xd1 0x16 0xe5 0x59 0x04
-
-# VI:   v_div_scale_f32 v24, vcc, v22, v22, -2.0 ; encoding: [0x18,0x6a,0xe0,0xd1,0x16,0x2d,0xd6,0x03]
-0x18 0x6a 0xe0 0xd1 0x16 0x2d 0xd6 0x03
-
-# VI:   v_div_scale_f32 v24, vcc, v22, v22, -2.0 ; encoding: [0x18,0x6a,0xe0,0xd1,0x16,0x2d,0xd6,0x03]
-0x18 0x6a 0xe0 0xd1 0x16 0x2d 0xd6 0x03
-
-# VI:   v_mad_f32 v9, 0.5, v5, -v8      ; encoding: [0x09,0x00,0xc1,0xd1,0xf0,0x0a,0x22,0x84]
-0x09 0x00 0xc1 0xd1 0xf0 0x0a 0x22 0x84
-
-# VI:   v_ceil_f32_e64 v0, neg(-1)      ; encoding: [0x00,0x00,0x5d,0xd1,0xc1,0x00,0x00,0x20]
-0x00,0x00,0x5d,0xd1,0xc1,0x00,0x00,0x20
-
-# VI:   v_ceil_f32_e64 v0, neg(-1.0)    ; encoding: [0x00,0x00,0x5d,0xd1,0xf3,0x00,0x00,0x20]
-0x00,0x00,0x5d,0xd1,0xf3,0x00,0x00,0x20
-
-# VI: v_fma_f16 v5, v1, v2, v3    ; encoding: [0x05,0x00,0xee,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x00,0xee,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_fma_f16 v5, 0.5, v2, v3    ; encoding: [0x05,0x00,0xee,0xd1,0xf0,0x04,0x0e,0x04]
-0x05,0x00,0xee,0xd1,0xf0,0x04,0x0e,0x04
-
-# VI: v_fma_f16 v5, v1, v2, |v3|    ; encoding: [0x05,0x04,0xee,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x04,0xee,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_fma_f16 v5, v1, v2, v3 clamp    ; encoding: [0x05,0x80,0xee,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xee,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_div_fixup_f16 v5, 0.5, v2, v3    ; encoding: [0x05,0x00,0xef,0xd1,0xf0,0x04,0x0e,0x04]
-0x05,0x00,0xef,0xd1,0xf0,0x04,0x0e,0x04
-
-# VI: v_div_fixup_f16 v5, v1, 0.5, v3    ; encoding: [0x05,0x00,0xef,0xd1,0x01,0xe1,0x0d,0x04]
-0x05,0x00,0xef,0xd1,0x01,0xe1,0x0d,0x04
-
-# VI: v_div_fixup_f16 v5, v1, v2, 0.5    ; encoding: [0x05,0x00,0xef,0xd1,0x01,0x05,0xc2,0x03]
-0x05,0x00,0xef,0xd1,0x01,0x05,0xc2,0x03
-
-# VI: v_div_fixup_f16 v5, -v1, -v2, -v3    ; encoding: [0x05,0x00,0xef,0xd1,0x01,0x05,0x0e,0xe4]
-0x05,0x00,0xef,0xd1,0x01,0x05,0x0e,0xe4
-
-# VI: v_div_fixup_f16 v5, |v1|, |v2|, |v3|    ; encoding: [0x05,0x07,0xef,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x07,0xef,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_div_fixup_f16 v5, v1, v2, v3 clamp    ; encoding: [0x05,0x80,0xef,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xef,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mad_f16 v5, 0.5, v2, v3    ; encoding: [0x05,0x00,0xea,0xd1,0xf0,0x04,0x0e,0x04]
-0x05,0x00,0xea,0xd1,0xf0,0x04,0x0e,0x04
-
-# VI: v_mad_f16 v5, v1, 0.5, v3    ; encoding: [0x05,0x00,0xea,0xd1,0x01,0xe1,0x0d,0x04]
-0x05,0x00,0xea,0xd1,0x01,0xe1,0x0d,0x04
-
-# VI: v_mad_f16 v5, v1, v2, 0.5    ; encoding: [0x05,0x00,0xea,0xd1,0x01,0x05,0xc2,0x03]
-0x05,0x00,0xea,0xd1,0x01,0x05,0xc2,0x03
-
-# VI: v_mad_f16 v5, -v1, -v2, -v3    ; encoding: [0x05,0x00,0xea,0xd1,0x01,0x05,0x0e,0xe4]
-0x05,0x00,0xea,0xd1,0x01,0x05,0x0e,0xe4
-
-# VI: v_mad_f16 v5, |v1|, |v2|, |v3|    ; encoding: [0x05,0x07,0xea,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x07,0xea,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mad_f16 v5, v1, v2, v3 clamp    ; encoding: [0x05,0x80,0xea,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xea,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mad_i16 v5, -1, v2, v3    ; encoding: [0x05,0x00,0xec,0xd1,0xc1,0x04,0x0e,0x04]
-0x05,0x00,0xec,0xd1,0xc1,0x04,0x0e,0x04
-
-# VI: v_mad_i16 v5, v1, 20, v3    ; encoding: [0x05,0x00,0xec,0xd1,0x01,0x29,0x0d,0x04]
-0x05,0x00,0xec,0xd1,0x01,0x29,0x0d,0x04
-
-# VI: v_mad_i16 v5, v1, v2, 63    ; encoding: [0x05,0x00,0xec,0xd1,0x01,0x05,0xfe,0x02]
-0x05,0x00,0xec,0xd1,0x01,0x05,0xfe,0x02
-
-# VI: v_mad_u16 v5, -1, v2, v3    ; encoding: [0x05,0x00,0xeb,0xd1,0xc1,0x04,0x0e,0x04]
-0x05,0x00,0xeb,0xd1,0xc1,0x04,0x0e,0x04
-
-# VI: v_mad_u16 v5, v1, 20, v3    ; encoding: [0x05,0x00,0xeb,0xd1,0x01,0x29,0x0d,0x04]
-0x05,0x00,0xeb,0xd1,0x01,0x29,0x0d,0x04
-
-# VI: v_mad_u16 v5, v1, v2, 63    ; encoding: [0x05,0x00,0xeb,0xd1,0x01,0x05,0xfe,0x02]
-0x05,0x00,0xeb,0xd1,0x01,0x05,0xfe,0x02
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr0.x    ; encoding: [0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x00]
-0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x00
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr32.x    ; encoding: [0x05,0x00,0x72,0xd2,0x20,0x00,0x00,0x00]
-0x05,0x00,0x72,0xd2,0x20,0x00,0x00,0x00
-
-# VI: v_interp_mov_f32_e64 v5, p20, attr0.x    ; encoding: [0x05,0x00,0x72,0xd2,0x00,0x02,0x00,0x00]
-0x05,0x00,0x72,0xd2,0x00,0x02,0x00,0x00
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr0.w    ; encoding: [0x05,0x00,0x72,0xd2,0xc0,0x00,0x00,0x00]
-0x05,0x00,0x72,0xd2,0xc0,0x00,0x00,0x00
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr0.x clamp    ; encoding: [0x05,0x80,0x72,0xd2,0x00,0x00,0x00,0x00]
-0x05,0x80,0x72,0xd2,0x00,0x00,0x00,0x00
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr0.x mul:2    ; encoding: [0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x08]
-0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x08
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr0.x mul:4    ; encoding: [0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x10]
-0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x10
-
-# VI: v_interp_mov_f32_e64 v5, p10, attr0.x div:2    ; encoding: [0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x18]
-0x05,0x00,0x72,0xd2,0x00,0x00,0x00,0x18
-
-# VI: v_interp_p1_f32_e64 v255, v2, attr0.x    ; encoding: [0xff,0x00,0x70,0xd2,0x00,0x04,0x02,0x00]
-0xff,0x00,0x70,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p1_f32_e64 v5, v2, attr1.x    ; encoding: [0x05,0x00,0x70,0xd2,0x01,0x04,0x02,0x00]
-0x05,0x00,0x70,0xd2,0x01,0x04,0x02,0x00
-
-# VI: v_interp_p1_f32_e64 v5, -v2, attr0.x    ; encoding: [0x05,0x00,0x70,0xd2,0x00,0x04,0x02,0x40]
-0x05,0x00,0x70,0xd2,0x00,0x04,0x02,0x40
-
-# VI: v_interp_p1_f32_e64 v5, |v2|, attr0.x    ; encoding: [0x05,0x02,0x70,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x02,0x70,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p1_f32_e64 v5, v2, attr0.z    ; encoding: [0x05,0x00,0x70,0xd2,0x80,0x04,0x02,0x00]
-0x05,0x00,0x70,0xd2,0x80,0x04,0x02,0x00
-
-# VI: v_interp_p1_f32_e64 v5, v2, attr0.x clamp    ; encoding: [0x05,0x80,0x70,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x80,0x70,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p1_f32_e64 v5, v2, attr0.x mul:2    ; encoding: [0x05,0x00,0x70,0xd2,0x00,0x04,0x02,0x08]
-0x05,0x00,0x70,0xd2,0x00,0x04,0x02,0x08
-
-# VI: v_interp_p2_f32_e64 v5, v2, attr0.x    ; encoding: [0x05,0x00,0x71,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x00,0x71,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p2_f32_e64 v5, v2, attr31.x    ; encoding: [0x05,0x00,0x71,0xd2,0x1f,0x04,0x02,0x00]
-0x05,0x00,0x71,0xd2,0x1f,0x04,0x02,0x00
-
-# VI: v_interp_p2_f32_e64 v5, -v2, attr0.x    ; encoding: [0x05,0x00,0x71,0xd2,0x00,0x04,0x02,0x40]
-0x05,0x00,0x71,0xd2,0x00,0x04,0x02,0x40
-
-# VI: v_interp_p2_f32_e64 v5, |v2|, attr0.x    ; encoding: [0x05,0x02,0x71,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x02,0x71,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p2_f32_e64 v5, v2, attr0.y    ; encoding: [0x05,0x00,0x71,0xd2,0x40,0x04,0x02,0x00]
-0x05,0x00,0x71,0xd2,0x40,0x04,0x02,0x00
-
-# VI: v_interp_p2_f32_e64 v5, v2, attr0.x clamp    ; encoding: [0x05,0x80,0x71,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x80,0x71,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p2_f32_e64 v5, v2, attr0.x mul:4    ; encoding: [0x05,0x00,0x71,0xd2,0x00,0x04,0x02,0x10]
-0x05,0x00,0x71,0xd2,0x00,0x04,0x02,0x10
-
-# VI: v_interp_p1ll_f16 v5, v2, attr0.x    ; encoding: [0x05,0x00,0x74,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x00,0x74,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p1ll_f16 v5, v2, attr1.x    ; encoding: [0x05,0x00,0x74,0xd2,0x01,0x04,0x02,0x00]
-0x05,0x00,0x74,0xd2,0x01,0x04,0x02,0x00
-
-# VI: v_interp_p1ll_f16 v5, -v2, attr0.x    ; encoding: [0x05,0x00,0x74,0xd2,0x00,0x04,0x02,0x40]
-0x05,0x00,0x74,0xd2,0x00,0x04,0x02,0x40
-
-# VI: v_interp_p1ll_f16 v5, |v2|, attr0.x    ; encoding: [0x05,0x02,0x74,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x02,0x74,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p1ll_f16 v5, v2, attr0.y    ; encoding: [0x05,0x00,0x74,0xd2,0x40,0x04,0x02,0x00]
-0x05,0x00,0x74,0xd2,0x40,0x04,0x02,0x00
-
-# VI: v_interp_p1ll_f16 v5, v2, attr0.x high    ; encoding: [0x05,0x00,0x74,0xd2,0x00,0x05,0x02,0x00]
-0x05,0x00,0x74,0xd2,0x00,0x05,0x02,0x00
-
-# VI: v_interp_p1ll_f16 v5, v2, attr0.x clamp    ; encoding: [0x05,0x80,0x74,0xd2,0x00,0x04,0x02,0x00]
-0x05,0x80,0x74,0xd2,0x00,0x04,0x02,0x00
-
-# VI: v_interp_p1ll_f16 v5, v2, attr0.x div:2    ; encoding: [0x05,0x00,0x74,0xd2,0x00,0x04,0x02,0x18]
-0x05,0x00,0x74,0xd2,0x00,0x04,0x02,0x18
-
-# VI: v_interp_p1lv_f16 v255, v2, attr0.x, v3    ; encoding: [0xff,0x00,0x75,0xd2,0x00,0x04,0x0e,0x04]
-0xff,0x00,0x75,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p1lv_f16 v5, v2, attr32.x, v3    ; encoding: [0x05,0x00,0x75,0xd2,0x20,0x04,0x0e,0x04]
-0x05,0x00,0x75,0xd2,0x20,0x04,0x0e,0x04
-
-# VI: v_interp_p1lv_f16 v5, -v2, attr0.x, v3    ; encoding: [0x05,0x00,0x75,0xd2,0x00,0x04,0x0e,0x44]
-0x05,0x00,0x75,0xd2,0x00,0x04,0x0e,0x44
-
-# VI: v_interp_p1lv_f16 v5, v2, attr0.x, -v3    ; encoding: [0x05,0x00,0x75,0xd2,0x00,0x04,0x0e,0x84]
-0x05,0x00,0x75,0xd2,0x00,0x04,0x0e,0x84
-
-# VI: v_interp_p1lv_f16 v5, |v2|, attr0.x, v3    ; encoding: [0x05,0x02,0x75,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x02,0x75,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p1lv_f16 v5, v2, attr0.x, |v3|    ; encoding: [0x05,0x04,0x75,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x04,0x75,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p1lv_f16 v5, v2, attr0.x, v3 high    ; encoding: [0x05,0x00,0x75,0xd2,0x00,0x05,0x0e,0x04]
-0x05,0x00,0x75,0xd2,0x00,0x05,0x0e,0x04
-
-# VI: v_interp_p1lv_f16 v5, v2, attr0.x, v3 clamp    ; encoding: [0x05,0x80,0x75,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x80,0x75,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p1lv_f16 v5, v2, attr0.x, v3 mul:4    ; encoding: [0x05,0x00,0x75,0xd2,0x00,0x04,0x0e,0x14]
-0x05,0x00,0x75,0xd2,0x00,0x04,0x0e,0x14
-
-# VI: v_interp_p2_f16 v5, v2, attr0.x, v3    ; encoding: [0x05,0x00,0x76,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x00,0x76,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p2_f16 v5, v2, attr1.x, v3    ; encoding: [0x05,0x00,0x76,0xd2,0x01,0x04,0x0e,0x04]
-0x05,0x00,0x76,0xd2,0x01,0x04,0x0e,0x04
-
-# VI: v_interp_p2_f16 v5, -v2, attr0.x, v3    ; encoding: [0x05,0x00,0x76,0xd2,0x00,0x04,0x0e,0x44]
-0x05,0x00,0x76,0xd2,0x00,0x04,0x0e,0x44
-
-# VI: v_interp_p2_f16 v5, v2, attr0.x, -v3    ; encoding: [0x05,0x00,0x76,0xd2,0x00,0x04,0x0e,0x84]
-0x05,0x00,0x76,0xd2,0x00,0x04,0x0e,0x84
-
-# VI: v_interp_p2_f16 v5, |v2|, attr0.x, v3    ; encoding: [0x05,0x02,0x76,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x02,0x76,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p2_f16 v5, v2, attr0.x, |v3|    ; encoding: [0x05,0x04,0x76,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x04,0x76,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_interp_p2_f16 v5, v2, attr0.x, v3 high    ; encoding: [0x05,0x00,0x76,0xd2,0x00,0x05,0x0e,0x04]
-0x05,0x00,0x76,0xd2,0x00,0x05,0x0e,0x04
-
-# VI: v_interp_p2_f16 v5, v2, attr0.x, v3 clamp    ; encoding: [0x05,0x80,0x76,0xd2,0x00,0x04,0x0e,0x04]
-0x05,0x80,0x76,0xd2,0x00,0x04,0x0e,0x04
-
-# VI: v_mad_i32_i24 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xc2,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xc2,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mad_u32_u24 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xc3,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xc3,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_sad_u8 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xd9,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xd9,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_sad_hi_u8 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xda,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xda,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_sad_u16 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xdb,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xdb,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_sad_u32 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xdc,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xdc,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_msad_u8 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xe4,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xe4,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mqsad_pk_u16_u8 v[5:6], v[1:2], v2, v[3:4] clamp ; encoding: [0x05,0x80,0xe6,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xe6,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_qsad_pk_u16_u8 v[5:6], v[1:2], v2, v[3:4] clamp ; encoding: [0x05,0x80,0xe5,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xe5,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mqsad_u32_u8 v[252:255], v[1:2], v2, v[3:6] clamp ; encoding: [0xfc,0x80,0xe7,0xd1,0x01,0x05,0x0e,0x04]
-0xfc,0x80,0xe7,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mad_u16 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xeb,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xeb,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_mad_i16 v5, v1, v2, v3 clamp ; encoding: [0x05,0x80,0xec,0xd1,0x01,0x05,0x0e,0x04]
-0x05,0x80,0xec,0xd1,0x01,0x05,0x0e,0x04
-
-# VI: v_add_u32_e64 v84, vcc, v13, s31 clamp ; encoding: [0x54,0xea,0x19,0xd1,0x0d,0x3f,0x00,0x00]
-0x54,0xea,0x19,0xd1,0x0d,0x3f,0x00,0x00
-
-# VI: v_sub_u32_e64 v84, s[2:3], v13, s31 clamp ; encoding: [0x54,0x82,0x1a,0xd1,0x0d,0x3f,0x00,0x00]
-0x54,0x82,0x1a,0xd1,0x0d,0x3f,0x00,0x00
-
-# VI: v_subrev_u32_e64 v84, vcc, v13, s31 clamp ; encoding: [0x54,0xea,0x1b,0xd1,0x0d,0x3f,0x00,0x00]
-0x54,0xea,0x1b,0xd1,0x0d,0x3f,0x00,0x00
-
-# VI: v_addc_u32_e64 v84, s[4:5], v13, v31, vcc clamp ; encoding: [0x54,0x84,0x1c,0xd1,0x0d,0x3f,0xaa,0x01]
-0x54,0x84,0x1c,0xd1,0x0d,0x3f,0xaa,0x01
-
-# VI: v_subb_u32_e64 v84, s[2:3], v13, v31, vcc clamp ; encoding: [0x54,0x82,0x1d,0xd1,0x0d,0x3f,0xaa,0x01]
-0x54,0x82,0x1d,0xd1,0x0d,0x3f,0xaa,0x01
-
-# VI: v_subbrev_u32_e64 v84, vcc, v13, v31, s[6:7] clamp ; encoding: [0x54,0xea,0x1e,0xd1,0x0d,0x3f,0x1a,0x00]
-0x54,0xea,0x1e,0xd1,0x0d,0x3f,0x1a,0x00
-

diff  --git a/llvm/test/MC/Disassembler/AMDGPU/vopc_vi.txt b/llvm/test/MC/Disassembler/AMDGPU/vopc_vi.txt
deleted file mode 100644
index 7840b6247b579..0000000000000
--- a/llvm/test/MC/Disassembler/AMDGPU/vopc_vi.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# RUN: llvm-mc -arch=amdgcn -mcpu=tonga -disassemble -show-encoding < %s | FileCheck %s -check-prefix=VI
-
-# VI:   v_cmp_lt_f32_e32 vcc, s2, v4 ; encoding: [0x02,0x08,0x82,0x7c]
-0x02 0x08 0x82 0x7c
-
-# VI:   v_cmp_lt_f32_e32 vcc, 0, v4 ; encoding: [0x80,0x08,0x82,0x7c]
-0x80 0x08 0x82 0x7c
-
-# VI:   v_cmp_lt_f32_e32 vcc, 0x41200000, v4 ; encoding: [0xff,0x08,0x82,0x7c,0x00,0x00,0x20,0x41]
-0xff 0x08 0x82 0x7c 0x00 0x00 0x20 0x41
-
-# VI:   v_cmp_lt_f32_e32 vcc, v255, v255 ; encoding: [0xff,0xff,0x83,0x7c]
-0xff 0xff 0x83 0x7c
-
-# VI:   v_cmp_lt_f32_e32 vcc, v2, v4 ; encoding: [0x02,0x09,0x82,0x7c]
-0x02 0x09 0x82 0x7c
-
-# VI:   v_cmp_f_f32_e32 vcc, v2, v4 ; encoding: [0x02,0x09,0x80,0x7c]
-0x02 0x09 0x80 0x7c
-
-# VI:   v_cmp_lt_f32_e32 vcc, v2, v4 ; encoding: [0x02,0x09,0x82,0x7c]
-0x02 0x09 0x82 0x7c
-
-# VI:   v_cmp_f_f64_e32 vcc, v[2:3], v[4:5] ; encoding: [0x02,0x09,0xc0,0x7c]
-0x02 0x09 0xc0 0x7c
-
-# VI:   v_cmp_f_i32_e32 vcc, v2, v4 ; encoding: [0x02,0x09,0x80,0x7d]
-0x02 0x09 0x80 0x7d
-
-# VI:   v_cmp_f_i64_e32 vcc, v[2:3], v[4:5] ; encoding: [0x02,0x09,0xc0,0x7d]
-0x02 0x09 0xc0 0x7d


        


More information about the llvm-commits mailing list