diff --git a/llvm/test/tools/llvm-mca/RISCV/different-lmul-instruments.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/different-lmul-instruments.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/different-lmul-instruments.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/different-lmul-instruments.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/different-sew-instruments.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/different-sew-instruments.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/different-sew-instruments.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/different-sew-instruments.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/disable-im.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/disable-im.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/disable-im.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/disable-im.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/fractional-lmul-data.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/fractional-lmul-data.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/fractional-lmul-data.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/fractional-lmul-data.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/lmul-instrument-at-start.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-at-start.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/lmul-instrument-at-start.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-at-start.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/lmul-instrument-in-middle.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-in-middle.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/lmul-instrument-in-middle.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-in-middle.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/lmul-instrument-in-region.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-in-region.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/lmul-instrument-in-region.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-in-region.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/lmul-instrument-straddles-region.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-straddles-region.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/lmul-instrument-straddles-region.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/lmul-instrument-straddles-region.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/multiple-same-lmul-instruments.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/multiple-same-lmul-instruments.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/multiple-same-lmul-instruments.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/multiple-same-lmul-instruments.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/multiple-same-sew-instruments.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/multiple-same-sew-instruments.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/multiple-same-sew-instruments.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/multiple-same-sew-instruments.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/needs-sew-but-only-lmul.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/needs-sew-but-only-lmul.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/needs-sew-but-only-lmul.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/needs-sew-but-only-lmul.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/no-vsetvli-to-start.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/no-vsetvli-to-start.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/no-vsetvli-to-start.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/no-vsetvli-to-start.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/SiFive7/reductions.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/reductions.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/SiFive7/reductions.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/reductions.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/riscv-lmul-instrument-no-data-is-err.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/riscv-lmul-instrument-no-data-is-err.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/riscv-lmul-instrument-no-data-is-err.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/riscv-lmul-instrument-no-data-is-err.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/riscv-sew-instrument-no-data-is-err.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/riscv-sew-instrument-no-data-is-err.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/riscv-sew-instrument-no-data-is-err.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/riscv-sew-instrument-no-data-is-err.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/sew-instrument-at-start.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-at-start.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/sew-instrument-at-start.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-at-start.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/sew-instrument-in-middle.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-in-middle.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/sew-instrument-in-middle.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-in-middle.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/sew-instrument-in-region.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-in-region.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/sew-instrument-in-region.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-in-region.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/sew-instrument-straddles-region.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-straddles-region.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/sew-instrument-straddles-region.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/sew-instrument-straddles-region.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/SiFive7/strided-load-store.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/strided-load-store.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/SiFive7/strided-load-store.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/strided-load-store.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/SiFive7/strided-load-x0.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/strided-load-x0.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/SiFive7/strided-load-x0.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/strided-load-x0.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/unknown-instrument-is-err.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/unknown-instrument-is-err.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/unknown-instrument-is-err.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/unknown-instrument-is-err.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/unknown-lmul-is-err.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/unknown-lmul-is-err.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/unknown-lmul-is-err.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/unknown-lmul-is-err.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/unknown-sew-is-err.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/unknown-sew-is-err.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/unknown-sew-is-err.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/unknown-sew-is-err.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/SiFive7/vector-integer-arithmetic.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vector-integer-arithmetic.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/SiFive7/vector-integer-arithmetic.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vector-integer-arithmetic.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/vle-vse.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vle-vse.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/vle-vse.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vle-vse.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/vsetivli-lmul-instrument.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetivli-lmul-instrument.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/vsetivli-lmul-instrument.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetivli-lmul-instrument.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/vsetivli-lmul-sew-instrument.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetivli-lmul-sew-instrument.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/vsetivli-lmul-sew-instrument.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetivli-lmul-sew-instrument.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/vsetvli-lmul-instrument.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetvli-lmul-instrument.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/vsetvli-lmul-instrument.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetvli-lmul-instrument.s
diff --git a/llvm/test/tools/llvm-mca/RISCV/vsetvli-lmul-sew-instrument.s b/llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetvli-lmul-sew-instrument.s
similarity index 100%
rename from llvm/test/tools/llvm-mca/RISCV/vsetvli-lmul-sew-instrument.s
rename to llvm/test/tools/llvm-mca/RISCV/SiFiveX280/vsetvli-lmul-sew-instrument.s