diff --git a/llvm/test/tools/llvm-mca/RISCV/instrument-in-middle.s b/llvm/test/tools/llvm-mca/RISCV/instrument-in-middle.s
--- a/llvm/test/tools/llvm-mca/RISCV/instrument-in-middle.s
+++ b/llvm/test/tools/llvm-mca/RISCV/instrument-in-middle.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mca -mtriple=riscv64 -mcpu=sifive-x280 -timeline -iterations=1 < %s | FileCheck %s
 
 vadd.vv v12, v12, v12
-vsetvli zero, a0, e8, m8, tu, mu
+vsetvli zero, a0, e8, mf8, tu, mu
 # LLVM-MCA-RISCV-LMUL MF8
 vadd.vv v12, v12, v12
 
@@ -26,7 +26,7 @@
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
 # CHECK-NEXT:  1      4     16.00                       vadd.vv	v12, v12, v12
-# CHECK-NEXT:  1      3     1.00                  U     vsetvli	zero, a0, e8, m8, tu, mu
+# CHECK-NEXT:  1      3     1.00                  U     vsetvli	zero, a0, e8, mf8, tu, mu
 # CHECK-NEXT:  1      4     1.00                        vadd.vv	v12, v12, v12
 
 # CHECK:      Resources:
@@ -46,7 +46,7 @@
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    Instructions:
 # CHECK-NEXT:  -      -      -      -     16.00  16.00   -      -     vadd.vv	v12, v12, v12
-# CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vsetvli	zero, a0, e8, m8, tu, mu
+# CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vsetvli	zero, a0, e8, mf8, tu, mu
 # CHECK-NEXT:  -      -      -      -     1.00   1.00    -      -     vadd.vv	v12, v12, v12
 
 # CHECK:      Timeline view:
@@ -54,7 +54,7 @@
 # CHECK-NEXT: Index     0123456789          0
 
 # CHECK:      [0,0]     DeeeE.    .    .    .   vadd.vv	v12, v12, v12
-# CHECK-NEXT: [0,1]     .DeeE.    .    .    .   vsetvli	zero, a0, e8, m8, tu, mu
+# CHECK-NEXT: [0,1]     .DeeE.    .    .    .   vsetvli	zero, a0, e8, mf8, tu, mu
 # CHECK-NEXT: [0,2]     .    .    .    .DeeeE   vadd.vv	v12, v12, v12
 
 # CHECK:      Average Wait times (based on the timeline view):
@@ -65,6 +65,6 @@
 
 # CHECK:            [0]    [1]    [2]    [3]
 # CHECK-NEXT: 0.     1     0.0    0.0    0.0       vadd.vv	v12, v12, v12
-# CHECK-NEXT: 1.     1     0.0    0.0    0.0       vsetvli	zero, a0, e8, m8, tu, mu
+# CHECK-NEXT: 1.     1     0.0    0.0    0.0       vsetvli	zero, a0, e8, mf8, tu, mu
 # CHECK-NEXT: 2.     1     0.0    0.0    0.0       vadd.vv	v12, v12, v12
 # CHECK-NEXT:        1     0.0    0.0    0.0       <total>
diff --git a/llvm/test/tools/llvm-mca/RISCV/multiple-same-instruments.s b/llvm/test/tools/llvm-mca/RISCV/multiple-same-instruments.s
--- a/llvm/test/tools/llvm-mca/RISCV/multiple-same-instruments.s
+++ b/llvm/test/tools/llvm-mca/RISCV/multiple-same-instruments.s
@@ -8,7 +8,7 @@
 # LLVM-MCA-RISCV-LMUL M1
 vadd.vv v12, v12, v12
 vsub.vv v12, v12, v12
-vsetvli zero, a0, e8, m2, tu, mu
+vsetvli zero, a0, e8, m4, tu, mu
 # LLVM-MCA-RISCV-LMUL M4
 vadd.vv v12, v12, v12
 vsub.vv v12, v12, v12
@@ -37,7 +37,7 @@
 # CHECK-NEXT:  1      3     1.00                  U     vsetvli	zero, a0, e8, m1, tu, mu
 # CHECK-NEXT:  1      4     2.00                        vadd.vv	v12, v12, v12
 # CHECK-NEXT:  1      4     2.00                        vsub.vv	v12, v12, v12
-# CHECK-NEXT:  1      3     1.00                  U     vsetvli	zero, a0, e8, m2, tu, mu
+# CHECK-NEXT:  1      3     1.00                  U     vsetvli	zero, a0, e8, m4, tu, mu
 # CHECK-NEXT:  1      4     8.00                        vadd.vv	v12, v12, v12
 # CHECK-NEXT:  1      4     8.00                        vsub.vv	v12, v12, v12
 
@@ -62,7 +62,7 @@
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vsetvli	zero, a0, e8, m1, tu, mu
 # CHECK-NEXT:  -      -      -      -     2.00   2.00    -      -     vadd.vv	v12, v12, v12
 # CHECK-NEXT:  -      -      -      -     2.00   2.00    -      -     vsub.vv	v12, v12, v12
-# CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vsetvli	zero, a0, e8, m2, tu, mu
+# CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vsetvli	zero, a0, e8, m4, tu, mu
 # CHECK-NEXT:  -      -      -      -     8.00   8.00    -      -     vadd.vv	v12, v12, v12
 # CHECK-NEXT:  -      -      -      -     8.00   8.00    -      -     vsub.vv	v12, v12, v12
 
@@ -75,7 +75,7 @@
 # CHECK-NEXT: [0,2]     .   DeeE  .    .    .    . .   vsetvli	zero, a0, e8, m1, tu, mu
 # CHECK-NEXT: [0,3]     .    . DeeeE   .    .    . .   vadd.vv	v12, v12, v12
 # CHECK-NEXT: [0,4]     .    .    .DeeeE    .    . .   vsub.vv	v12, v12, v12
-# CHECK-NEXT: [0,5]     .    .    . DeeE    .    . .   vsetvli	zero, a0, e8, m2, tu, mu
+# CHECK-NEXT: [0,5]     .    .    . DeeE    .    . .   vsetvli	zero, a0, e8, m4, tu, mu
 # CHECK-NEXT: [0,6]     .    .    .    DeeeE.    . .   vadd.vv	v12, v12, v12
 # CHECK-NEXT: [0,7]     .    .    .    .    .  DeeeE   vsub.vv	v12, v12, v12
 
@@ -91,7 +91,7 @@
 # CHECK-NEXT: 2.     1     0.0    0.0    0.0       vsetvli	zero, a0, e8, m1, tu, mu
 # CHECK-NEXT: 3.     1     0.0    0.0    0.0       vadd.vv	v12, v12, v12
 # CHECK-NEXT: 4.     1     0.0    0.0    0.0       vsub.vv	v12, v12, v12
-# CHECK-NEXT: 5.     1     0.0    0.0    0.0       vsetvli	zero, a0, e8, m2, tu, mu
+# CHECK-NEXT: 5.     1     0.0    0.0    0.0       vsetvli	zero, a0, e8, m4, tu, mu
 # CHECK-NEXT: 6.     1     0.0    0.0    0.0       vadd.vv	v12, v12, v12
 # CHECK-NEXT: 7.     1     0.0    0.0    0.0       vsub.vv	v12, v12, v12
 # CHECK-NEXT:        1     0.0    0.0    0.0       <total>