diff --git a/llvm/test/MC/AMDGPU/gfx11_ds.s b/llvm/test/MC/AMDGPU/gfx11_asm_ds.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_ds.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_ds.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_err.s b/llvm/test/MC/AMDGPU/gfx11_asm_err.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_err.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_err.s
diff --git a/llvm/test/MC/AMDGPU/exp-gfx11.s b/llvm/test/MC/AMDGPU/gfx11_asm_exp.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/exp-gfx11.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_exp.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_flat.s b/llvm/test/MC/AMDGPU/gfx11_asm_flat.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_flat.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_flat.s
diff --git a/llvm/test/MC/AMDGPU/gfx11-flat-errs.s b/llvm/test/MC/AMDGPU/gfx11_asm_flat_errs.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11-flat-errs.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_flat_errs.s
diff --git a/llvm/test/MC/AMDGPU/flat-gfx11-mnemonic.s b/llvm/test/MC/AMDGPU/gfx11_asm_flat_mnemonic.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/flat-gfx11-mnemonic.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_flat_mnemonic.s
diff --git a/llvm/test/MC/AMDGPU/ldsdir.s b/llvm/test/MC/AMDGPU/gfx11_asm_ldsdir.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/ldsdir.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_ldsdir.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_mtbuf.s b/llvm/test/MC/AMDGPU/gfx11_asm_mtbuf.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_mtbuf.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_mtbuf.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_mtbuf_alias.s b/llvm/test/MC/AMDGPU/gfx11_asm_mtbuf_alias.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_mtbuf_alias.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_mtbuf_alias.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_mubuf.s b/llvm/test/MC/AMDGPU/gfx11_asm_mubuf.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_mubuf.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_mubuf.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_mubuf_alias.s b/llvm/test/MC/AMDGPU/gfx11_asm_mubuf_alias.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_mubuf_alias.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_mubuf_alias.s
diff --git a/llvm/test/MC/AMDGPU/sopp-gfx11.s b/llvm/test/MC/AMDGPU/gfx11_asm_sopp.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/sopp-gfx11.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_sopp.s
diff --git a/llvm/test/MC/AMDGPU/vinterp.s b/llvm/test/MC/AMDGPU/gfx11_asm_vinterp.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/vinterp.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vinterp.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_vop3p.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3p.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_vop3p.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3p.s
diff --git a/llvm/test/MC/AMDGPU/vopd.s b/llvm/test/MC/AMDGPU/gfx11_asm_vopd.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/vopd.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vopd.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_wmma.s b/llvm/test/MC/AMDGPU/gfx11_asm_wmma.s
similarity index 100%
rename from llvm/test/MC/AMDGPU/gfx11_wmma.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_wmma.s
diff --git a/llvm/test/MC/Disassembler/AMDGPU/ds_gfx11.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_ds.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/ds_gfx11.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_ds.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/exp_gfx11.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_exp.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/exp_gfx11.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_exp.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/flat-gfx11.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_flat.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/flat-gfx11.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_flat.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_mimg.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_mimg.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_mimg.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_mimg.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/mtbuf_dasm_gfx11.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_mtbuf.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/mtbuf_dasm_gfx11.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_mtbuf.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/mubuf_dasm_gfx11.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_mubuf.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/mubuf_dasm_gfx11.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_mubuf.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/vinterp.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vinterp.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/vinterp.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vinterp.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_wmma.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_wmma.txt
similarity index 100%
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_wmma.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_wmma.txt