diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/bswap16-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/bswap16-0.c
index 10d235a8edf..605b3565b6b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/bswap16-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/bswap16-0.c
@@ -8,7 +8,6 @@
 /*
 ** test_uint16_t___builtin_bswap16:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*ma
 **   vsrl\.vi\s+v[0-9]+,\s*v[0-9],\s*8+
 **   vsll\.vi\s+v[0-9]+,\s*v[0-9],\s*8+
 **   vor\.vv\s+v[0-9]+,\s*v[0-9],\s*v[0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-0.c
index 1c53d9b67d3..5660d980030 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-1.c
index a6d0ac3fc83..62a089b5927 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-2.c
index d196fc678c4..1f57e08d151 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-2.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-3.c
index cd3df49de6d..e74d2303483 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ceil-3.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-0.c
index 33b169395bf..06af0f15e02 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-1.c
index 5c462c424df..b4913eae2ad 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-2.c
index 6f07add1004..86a83d87e7b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-2.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-3.c
index a091ffdab50..a9a5d156ea7 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-floor-3.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iceil-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iceil-0.c
index 2d4a1d163d1..b8347868398 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iceil-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iceil-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ifloor-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ifloor-0.c
index b9ec415d690..40c6519aa0d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ifloor-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-ifloor-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-irint-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-irint-0.c
index 3ca2f651763..3d0c887e63f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-irint-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-irint-0.c
@@ -7,7 +7,6 @@
 /*
 ** test_float_int___builtin_irintf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iround-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iround-0.c
index f32515d1403..14828e22fd6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iround-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-iround-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-0.c
index 3b13a52d555..5084672e290 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-1.c
index 5ff5d1d2ab1..1a51482af14 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lceil-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-0.c
index ac2d1722300..10bfadc7848 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-1.c
index 164e97c17d6..b2eede8d130 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lfloor-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llceil-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llceil-0.c
index 3480c3ea91d..ba85728d3e5 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llceil-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llceil-0.c
@@ -11,7 +11,6 @@
 **   ...
 **   fsrmi\s+3
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llfloor-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llfloor-0.c
index 4b10f966015..2bd82ac4631 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llfloor-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llfloor-0.c
@@ -11,7 +11,6 @@
 **   ...
 **   fsrmi\s+2
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llrint-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llrint-0.c
index 4bf125f8cc8..b919109051d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llrint-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llrint-0.c
@@ -8,7 +8,6 @@
 /*
 ** test_double_int64_t___builtin_llrint:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llround-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llround-0.c
index 4f8b4553a91..2f3a7c60d22 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llround-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-llround-0.c
@@ -11,7 +11,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-0.c
index a60ef30efa4..dae0cfa76fd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-0.c
@@ -7,7 +7,6 @@
 /*
 ** test_double_long___builtin_lrint:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-1.c
index 57e92ffb0e6..426a6439530 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lrint-1.c
@@ -7,7 +7,6 @@
 /*
 ** test_float_long___builtin_lrintf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-0.c
index 32b7348e7ad..242074e6794 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-1.c
index a4d6fcfb0dc..3d95e224c0b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-lround-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*ma
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+
 **   ...
 **   fsrm\s+[atx][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-0.c
index f67b22ac02d..85d5e0acab2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-0.c
@@ -7,7 +7,6 @@
 /*
 ** test__Float16___builtin_nearbyintf16:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   frflags\s+[axt][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-1.c
index 93639863412..9697aed3bf1 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-1.c
@@ -7,7 +7,6 @@
 /*
 ** test_float___builtin_nearbyintf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   frflags\s+[axt][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-2.c
index d31de739d2d..00402ddee70 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-2.c
@@ -7,7 +7,6 @@
 /*
 ** test_double___builtin_nearbyint:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   frflags\s+[axt][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-3.c
index 4fd99505b40..6a8a276cc45 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-nearbyint-3.c
@@ -7,7 +7,6 @@
 /*
 ** test_float___builtin_nearbyintf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   frflags\s+[axt][0-9]+
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-0.c
index 0d44b9844dd..d57f9de82fc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-0.c
@@ -7,7 +7,6 @@
 /*
 ** test__Float16___builtin_rintf16:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-1.c
index 2ce122af677..4a796739ff4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-1.c
@@ -7,7 +7,6 @@
 /*
 ** test_float___builtin_rintf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-2.c
index e3b911b45c4..a7d75501e1a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-2.c
@@ -7,7 +7,6 @@
 /*
 ** test_double___builtin_rint:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-3.c
index 541c42c2ec7..33e62871238 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-rint-3.c
@@ -7,7 +7,6 @@
 /*
 ** test_float___builtin_rintf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-0.c
index 06de57bf7e2..18770df99cc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-1.c
index ee51bcd820b..d50c293ca26 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-2.c
index d78f0583e41..28a928debd5 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-2.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-3.c
index 98d14673e20..953ed60eac1 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-round-3.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+4
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-0.c
index ab65e372f0e..98d1171065c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-0.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+0
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-1.c
index fac85ed0895..5c021770352 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-1.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+0
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-2.c
index 074f1b4a1ae..7a14a7d4034 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-2.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+0
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-3.c
index c95e8eca007..6092fdcd8dc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-roundeven-3.c
@@ -10,7 +10,6 @@
 **   ...
 **   fsrmi\s+0
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-0.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-0.c
index e3046341b99..ea135cd8965 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-0.c
@@ -7,7 +7,6 @@
 /*
 ** test__Float16___builtin_truncf16:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e16,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.rtz\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-1.c
index 8100419d22f..e4ef82dac19 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-1.c
@@ -7,7 +7,6 @@
 /*
 ** test_float___builtin_truncf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.rtz\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-2.c
index 40551f559a7..7d17a11bbaf 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-2.c
@@ -7,7 +7,6 @@
 /*
 ** test_double___builtin_trunc:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e64,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.rtz\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-3.c
index bb113fd4f2a..66c19463e08 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/math-trunc-3.c
@@ -7,7 +7,6 @@
 /*
 ** test_float___builtin_truncf:
 **   ...
-**   vsetvli\s+[atx][0-9]+,\s*zero,\s*e32,\s*m1,\s*ta,\s*mu
 **   vfabs\.v\s+v[0-9]+,\s*v[0-9]+
 **   vmflt\.vf\s+v0,\s*v[0-9]+,\s*[fa]+[0-9]+
 **   vfcvt\.rtz\.x\.f\.v\s+v[0-9]+,\s*v[0-9]+,\s*v0\.t
