diff --git a/llvm/test/MC/Disassembler/AMDGPU/xdl-insts-gfx1011-gfx1012.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx1011-xdl-insts.txt
rename from llvm/test/MC/Disassembler/AMDGPU/xdl-insts-gfx1011-gfx1012.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx1011-xdl-insts.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/atomic-fadd-insts.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx908-atomic-fadd-insts.txt
rename from llvm/test/MC/Disassembler/AMDGPU/atomic-fadd-insts.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx908-atomic-fadd-insts.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/dl-insts.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx908-dl-insts.txt
rename from llvm/test/MC/Disassembler/AMDGPU/dl-insts.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx908-dl-insts.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/xdl-insts-gfx908.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx908-xdl-insts.txt
rename from llvm/test/MC/Disassembler/AMDGPU/xdl-insts-gfx908.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx908-xdl-insts.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/mai.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx908_mai.txt
rename from llvm/test/MC/Disassembler/AMDGPU/mai.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx908_mai.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/dpp64.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx90a-dpp64.txt
rename from llvm/test/MC/Disassembler/AMDGPU/dpp64.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx90a-dpp64.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/mai-gfx90a.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx90a_mai.txt
rename from llvm/test/MC/Disassembler/AMDGPU/mai-gfx90a.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx90a_mai.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/mimg_gfx90a.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx90a_mimg.txt
rename from llvm/test/MC/Disassembler/AMDGPU/mimg_gfx90a.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx90a_mimg.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/flat-scratch-gfx940.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx940_flat.txt
rename from llvm/test/MC/Disassembler/AMDGPU/flat-scratch-gfx940.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx940_flat.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/mai-gfx940.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx940_mai.txt
rename from llvm/test/MC/Disassembler/AMDGPU/mai-gfx940.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx940_mai.txt