RISC-V: Remove unnecessary asm check for rounding autovec

The vsetvl asm check is unnecessary for the rounding function autovec.
These rounding test cases should focus on the rounding insn sequence.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/rvv/autovec/unop/bswap16-0.c: Remove the
	vsetvl check.
	* gcc.target/riscv/rvv/autovec/unop/math-ceil-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-ceil-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-ceil-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-ceil-3.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-floor-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-floor-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-floor-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-floor-3.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-iceil-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-ifloor-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-irint-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-iround-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lceil-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lceil-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lfloor-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lfloor-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-llceil-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-llfloor-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-llrint-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-llround-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lrint-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lrint-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lround-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-lround-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-nearbyint-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-nearbyint-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-nearbyint-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-nearbyint-3.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-rint-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-rint-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-rint-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-rint-3.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-round-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-round-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-round-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-round-3.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-roundeven-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-roundeven-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-roundeven-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-roundeven-3.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-trunc-0.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-trunc-1.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-trunc-2.c: Ditto.
	* gcc.target/riscv/rvv/autovec/unop/math-trunc-3.c: Ditto.

Signed-off-by: Pan Li <pan2.li@intel.com>

45 files changed, 0 insertions, 45 deletions

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 10d235a..605b356 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 1c53d9b..5660d98 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 a6d0ac3..62a089b 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 d196fc6..1f57e08 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 cd3df49..e74d230 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 33b1693..06af0f1 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 5c462c42..b4913ea 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 6f07add..86a83d8 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 a091ffd..a9a5d15 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 2d4a1d1..b834786 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 b9ec415..40c6519 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 3ca2f65..3d0c887 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 f32515d..14828e2 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 3b13a52..5084672 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 5ff5d1d..1a51482 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 ac2d172..10bfadc 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 164e97c..b2eede8 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 3480c3e..ba85728 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 4b10f96..2bd82ac 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 4bf125f..b919109 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 4f8b455..2f3a7c6 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 a60ef30..dae0cfa 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 57e92ff..426a643 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 32b7348..242074e 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 a4d6fcf..3d95e22 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 f67b22a..85d5e0a 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 9363986..9697aed 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 d31de73..00402dd 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 4fd9950..6a8a276 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 0d44b98..d57f9de 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 2ce122a..4a79673 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 e3b911b..a7d7550 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 541c42c..33e6287 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 06de57b..18770df 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 ee51bcd..d50c293 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 d78f058..28a928d 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 98d1467..953ed60 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 ab65e37..98d1171 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 fac85ed..5c021770 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 074f1b4..7a14a7d 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 c95e8ec..6092fdc 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 e304634..ea135cd 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 8100419..e4ef82d 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 40551f5..7d17a11 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 bb113fd..66c1946 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