diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-abs.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-abs-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-abs.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-abs-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-abs.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-abs-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-abs.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-abs-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-add.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-add-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-add.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-add-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-add.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-add-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-add.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-add-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-addo-subo.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-addo-subo-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-addo-subo.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-addo-subo-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-addo-subo.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-addo-subo-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-addo-subo.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-addo-subo-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-and.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-and-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-and.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-and-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-and.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-and-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-and.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-and-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ashr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ashr-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ashr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ashr-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ashr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ashr-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ashr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ashr-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-bitreverse.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bitreverse-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-bitreverse.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bitreverse-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-bitreverse.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bitreverse-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-bitreverse.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bitreverse-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-bswap.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bswap-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-bswap.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bswap-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-bswap.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bswap-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-bswap.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-bswap-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-const.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-const-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-const.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-const-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-const.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-const-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-const.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-const-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ctlz.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctlz-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ctlz.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctlz-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ctlz.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctlz-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ctlz.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctlz-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ctpop.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctpop-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ctpop.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctpop-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ctpop.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctpop-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ctpop.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ctpop-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-cttz.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-cttz-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-cttz.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-cttz-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-cttz.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-cttz-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-cttz.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-cttz-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-div.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-div-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-div.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-div-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-div.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-div-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-div.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-div-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-dyn-alloca.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-dyn-alloca-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-dyn-alloca.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-dyn-alloca-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ext.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ext-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ext.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ext-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-extload.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-extload-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-extload.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-extload-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-extload.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-extload-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-extload.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-extload-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-fcmp.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fcmp-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-fcmp.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fcmp-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-fcmp.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fcmp-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-fcmp.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fcmp-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-fptoi.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fptoi-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-fptoi.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fptoi-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-fptoi.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fptoi-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-fptoi.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fptoi-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-frame-index.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-frame-index-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-frame-index.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-frame-index-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-frame-index.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-frame-index-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-frame-index.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-frame-index-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-fshl-fshr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fshl-fshr-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-fshl-fshr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fshl-fshr-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-fshl-fshr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fshl-fshr-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-fshl-fshr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-fshl-fshr-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-global.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-global-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-global.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-global-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-global.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-global-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-global.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-global-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-icmp.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-icmp-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-icmp.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-icmp-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-icmp.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-icmp-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-icmp.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-icmp-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-implicit-def.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-implicit-def-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-implicit-def.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-implicit-def-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-implicit-def.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-implicit-def-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-implicit-def.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-implicit-def-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-inttoptr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-inttoptr-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-inttoptr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-inttoptr-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-inttoptr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-inttoptr-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-inttoptr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-inttoptr-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-itofp.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-itofp-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-itofp.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-itofp-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-itofp.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-itofp-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-itofp.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-itofp-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-jump-table-brjt.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-jump-table-brjt-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-jump-table-brjt.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-jump-table-brjt-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-jump-table-brjt.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-jump-table-brjt-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-jump-table-brjt.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-jump-table-brjt-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-load.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-load-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-load.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-load-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-load.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-load-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-load.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-load-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-lshr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-lshr-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-lshr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-lshr-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-lshr.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-lshr-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-lshr.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-lshr-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-mul-ext.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-ext-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-mul-ext.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-ext-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-mul-ext.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-ext-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-mul-ext.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-ext-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-mul.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-mul.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-mul.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-mul.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mul-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-mulo.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mulo-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-mulo.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mulo-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-mulo.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mulo-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-mulo.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-mulo-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-or.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-or-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-or.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-or-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-or.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-or-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-or.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-or-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-phi.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-phi-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-phi.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-phi-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-phi.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-phi-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-phi.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-phi-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ptrtoint.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ptrtoint-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-ptrtoint.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ptrtoint-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ptrtoint.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ptrtoint-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-ptrtoint.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-ptrtoint-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-rem.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rem-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-rem.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rem-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-rem.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rem-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-rem.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rem-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-rotate.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rotate-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-rotate.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rotate-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-rotate.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rotate-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-rotate.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-rotate-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-select.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-select-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-select.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-select-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-select.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-select-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-select.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-select-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-shl.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-shl-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-shl.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-shl-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-shl.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-shl-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-shl.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-shl-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-smax.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smax-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-smax.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smax-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-smax.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smax-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-smax.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smax-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-smin.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smin-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-smin.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smin-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-smin.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smin-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-smin.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-smin-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-store.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-store-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-store.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-store-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-store.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-store-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-store.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-store-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-sub.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-sub-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-sub.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-sub-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-sub.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-sub-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-sub.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-sub-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-umax.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umax-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-umax.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umax-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-umax.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umax-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-umax.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umax-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-umin.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umin-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-umin.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umin-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-umin.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umin-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-umin.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-umin-rv64.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-xor.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-xor-rv32.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv32/legalize-xor.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-xor-rv32.mir
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-xor.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-xor-rv64.mir
similarity index 100%
rename from llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rv64/legalize-xor.mir
rename to llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-xor-rv64.mir