[PATCH] RISC-V: Adjust testdata for unsigned vector SAT_SUB

This patch adjust test data for unsigned vector SAT_SUB to vec_sat_data.h

Passed the rv64gcv regression test.

Signed-off-by: Ciyan Pan <panciyan@eswincomputing.com>
gcc/testsuite/ChangeLog:

	* gcc.target/riscv/rvv/autovec/sat/vec_sat_arith.h: Add vec_sat_u_sub_fmt wrap define.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_data.h: Add vec_sat_u_sub test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u8.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u16.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u32.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u64.c: Remove test data.
	* gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u8.c: Remove test data.

42 files changed, 493 insertions, 2600 deletions

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_arith.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_arith.h
index f78bdc0..9e4b4f4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_arith.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_arith.h
@@ -385,6 +385,8 @@ vec_sat_u_sub_##T##_fmt_1 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = (x - y) & (-(T)(x >= y));                             \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_1_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_1(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_2(T)                                   \
 void __attribute__((noinline))                                       \
@@ -398,6 +400,8 @@ vec_sat_u_sub_##T##_fmt_2 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = (x - y) & (-(T)(x > y));                              \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_2_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_2(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_3(T)                                   \
 void __attribute__((noinline))                                       \
@@ -411,6 +415,8 @@ vec_sat_u_sub_##T##_fmt_3 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = x > y ? x - y : 0;                                    \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_3_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_3(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_4(T)                                   \
 void __attribute__((noinline))                                       \
@@ -424,6 +430,8 @@ vec_sat_u_sub_##T##_fmt_4 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = x >= y ? x - y : 0;                                   \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_4_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_4(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_5(T)                                   \
 void __attribute__((noinline))                                       \
@@ -437,6 +445,8 @@ vec_sat_u_sub_##T##_fmt_5 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = x < y ? 0 : x - y;                                    \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_5_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_5(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_6(T)                                   \
 void __attribute__((noinline))                                       \
@@ -450,6 +460,8 @@ vec_sat_u_sub_##T##_fmt_6 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = x <= y ? 0 : x - y;                                   \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_6_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_6(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_7(T)                                   \
 void __attribute__((noinline))                                       \
@@ -465,6 +477,8 @@ vec_sat_u_sub_##T##_fmt_7 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = ret & (T)(overflow - 1);                              \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_7_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_7(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_8(T)                                   \
 void __attribute__((noinline))                                       \
@@ -480,6 +494,8 @@ vec_sat_u_sub_##T##_fmt_8 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = ret & (T)-(!overflow);                                \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_8_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_8(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_9(T)                                   \
 void __attribute__((noinline))                                       \
@@ -495,6 +511,8 @@ vec_sat_u_sub_##T##_fmt_9 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = overflow ? 0 : ret;                                   \
     }                                                                \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_9_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_9(T)
 
 #define DEF_VEC_SAT_U_SUB_FMT_10(T)                                   \
 void __attribute__((noinline))                                        \
@@ -510,6 +528,8 @@ vec_sat_u_sub_##T##_fmt_10 (T *out, T *op_1, T *op_2, unsigned limit) \
       out[i] = !overflow ? ret : 0;                                   \
     }                                                                 \
 }
+#define DEF_VEC_SAT_U_SUB_FMT_10_WRAP(T) \
+  DEF_VEC_SAT_U_SUB_FMT_10(T)
 
 #define DEF_VEC_SAT_U_SUB_ZIP(T1, T2)                             \
 void __attribute__((noinline))                                    \
@@ -669,33 +689,53 @@ vec_sat_s_sub_##T##_fmt_4 (T *out, T *op_1, T *op_2, unsigned limit) \
 
 #define RUN_VEC_SAT_U_SUB_FMT_1(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_1(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_1_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_1(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_2(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_2(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_2_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_2(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_3(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_3(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_3_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_3(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_4(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_4(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_4_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_4(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_5(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_5(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_5_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_5(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_6(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_6(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_6_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_6(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_7(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_7(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_7_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_7(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_8(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_8(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_8_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_8(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_9(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_9(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_9_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_9(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_10(T, out, op_1, op_2, N) \
   vec_sat_u_sub_##T##_fmt_10(out, op_1, op_2, N)
+#define RUN_VEC_SAT_U_SUB_FMT_10_WRAP(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_10(T, out, op_1, op_2, N)
 
 #define RUN_VEC_SAT_U_SUB_FMT_ZIP(T1, T2, x, b, N) \
   vec_sat_u_sub_##T1##_##T2##_fmt_zip(x, b, N)
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_data.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_data.h
index 9f05c0c..4469f0e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_data.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_data.h
@@ -744,6 +744,258 @@ uint64_t TEST_UNARY_DATA(uint64_t, sat_u_sub_imm)[][2][N] =
   },
 };
 
+uint8_t TEST_UNARY_DATA(uint8_t, usub)[][3][N] = {
+  {
+    {
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+    }, /* arg_0 */
+    {
+      0, 1, 2, 3,
+      0, 1, 2, 3,
+      0, 1, 2, 3,
+      0, 1, 2, 3,
+    }, /* arg_1 */
+    {
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+    }, /* expect */
+  },
+  {
+    {
+	0, 255, 255, 255,
+	0, 255, 255, 255,
+	0, 255, 255, 255,
+	0, 255, 255, 255,
+    },
+    {
+	1, 255, 254, 251,
+	1, 255, 254, 251,
+	1, 255, 254, 251,
+	1, 255, 254, 251,
+    },
+    {
+	0,   0,   1,   4,
+	0,   0,   1,   4,
+	0,   0,   1,   4,
+	0,   0,   1,   4,
+    },
+  },
+  {
+    {
+	0,   0,   1,   0,
+	1,   2,   3,   0,
+	1,   2,   3, 255,
+	5, 254, 255,   9,
+    },
+    {
+	0,   1,   0, 254,
+      254, 254, 254, 255,
+      255, 255,   0, 252,
+      255, 255, 255,   1,
+    },
+    {
+	0,   0,   1,   0,
+	0,   0,   0,   0,
+	0,   0,   3,   3,
+	0,   0,   0,   8,
+    },
+  },
+};
+
+uint16_t TEST_UNARY_DATA(uint16_t, usub)[][3][N] = {
+  {
+    {
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+    }, /* arg_0 */
+    {
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+    }, /* arg_1 */
+    {
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+    }, /* expect */
+  },
+  {
+    {
+      65535, 65535, 65535, 65535,
+      65535, 65535, 65535, 65535,
+      65535, 65535, 65535, 65535,
+      65535, 65535, 65535, 65535,
+    },
+    {
+      55535, 45535, 35535, 25535,
+      55535, 45535, 35535, 25535,
+      55535, 45535, 35535, 25535,
+      55535, 45535, 35535, 25535,
+    },
+    {
+      10000, 20000, 30000, 40000,
+      10000, 20000, 30000, 40000,
+      10000, 20000, 30000, 40000,
+      10000, 20000, 30000, 40000,
+    },
+  },
+  {
+    {
+	  0,     0,     1,     0,
+	  1,     2,     3,     0,
+	  1, 65535,     3, 65535,
+	  5, 65534, 65535,     9,
+    },
+    {
+	  0,     1,     1, 65534,
+      65534, 65534,     1, 65535,
+	  0, 65535, 65535,     0,
+      65535, 65535,     1,     2,
+    },
+    {
+	  0,     0,     0,     0,
+	  0,     0,     2,     0,
+	  1,     0,     0, 65535,
+	  0,     0, 65534,     7,
+    },
+  },
+};
+
+uint32_t TEST_UNARY_DATA(uint32_t, usub)[][3][N] = {
+  {
+    {
+      0, 0, 4, 0,
+      0, 0, 4, 0,
+      0, 0, 4, 0,
+      0, 0, 4, 0,
+    }, /* arg_0 */
+    {
+      0, 1, 2, 3,
+      0, 1, 2, 3,
+      0, 1, 2, 3,
+      0, 1, 2, 3,
+    }, /* arg_1 */
+    {
+      0, 0, 2, 0,
+      0, 0, 2, 0,
+      0, 0, 2, 0,
+      0, 0, 2, 0,
+    }, /* expect */
+  },
+  {
+    {
+      4294967295, 4294967295, 4294967295, 4294967295,
+      4294967295, 4294967295, 4294967295, 4294967295,
+      4294967295, 4294967295, 4294967295, 4294967295,
+      4294967295, 4294967295, 4294967295, 4294967295,
+    },
+    {
+      1294967295, 2294967295, 3294967295, 4294967295,
+      1294967295, 2294967295, 3294967295, 4294967295,
+      1294967295, 2294967295, 3294967295, 4294967295,
+      1294967295, 2294967295, 3294967295, 4294967295,
+    },
+    {
+      3000000000, 2000000000, 1000000000,          0,
+      3000000000, 2000000000, 1000000000,          0,
+      3000000000, 2000000000, 1000000000,          0,
+      3000000000, 2000000000, 1000000000,          0,
+    },
+  },
+  {
+    {
+	       0,          0,          9,          0,
+	       1, 4294967295,          3,          0,
+	       1,          2,          3,          4,
+	       5, 4294967294, 4294967295, 4294967295,
+    },
+    {
+	       0,          1,          1, 4294967294,
+	       1,          2, 4294967294, 4294967295,
+	       1, 4294967295, 4294967295,          1,
+	       1, 4294967295, 4294967290,          9,
+    },
+    {
+	       0,          0,          8,          0,
+	       0, 4294967293,          0,          0,
+	       0,          0,          0,          3,
+	       4,          0,          5, 4294967286,
+    },
+  },
+};
+
+uint64_t TEST_UNARY_DATA(uint64_t, usub)[][3][N] = {
+  {
+    {
+      0, 9, 0, 0,
+      0, 9, 0, 0,
+      0, 9, 0, 0,
+      0, 9, 0, 0,
+    }, /* arg_0 */
+    {
+      0, 2, 3, 1,
+      0, 2, 3, 1,
+      0, 2, 3, 1,
+      0, 2, 3, 1,
+    }, /* arg_1 */
+    {
+      0, 7, 0, 0,
+      0, 7, 0, 0,
+      0, 7, 0, 0,
+      0, 7, 0, 0,
+    }, /* expect */
+  },
+  {
+    {
+      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
+      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
+      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
+      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
+    },
+    {
+      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
+      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
+      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
+      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
+    },
+    {
+       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
+       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
+       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
+       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
+    },
+  },
+  {
+    {
+			  0, 18446744073709551615u,                     1,                     0,
+			  1, 18446744073709551615u,                     3,                     0,
+			  1, 18446744073709551614u,                     3,                     4,
+			  5, 18446744073709551614u, 18446744073709551615u,                     9,
+    },
+    {
+			  0,                     1,                     1, 18446744073709551614u,
+      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
+      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
+      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
+    },
+    {
+			  0, 18446744073709551614u,                     0,                     0,
+			  0,                     1,                     0,                     0,
+			  0,                     0,                     0,                     0,
+			  0,                     0,                     0,                     8,
+    },
+  },
+};
+
 int8_t TEST_UNARY_DATA(int8_t, sat_s_add_imm)[][2][N] =
 {
   { /* For add imm -128 */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u16.c
index 97e5040..5fc747b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_1
 
-DEF_VEC_SAT_U_SUB_FMT_1(T)
+DEF_VEC_SAT_U_SUB_FMT_1_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_1_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u32.c
index a5428c4..c9976d0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_1
 
-DEF_VEC_SAT_U_SUB_FMT_1(T)
+DEF_VEC_SAT_U_SUB_FMT_1_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_1_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u64.c
index bdb65d9..10a0b0c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_1
 
-DEF_VEC_SAT_U_SUB_FMT_1(T)
+DEF_VEC_SAT_U_SUB_FMT_1_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_1_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u8.c
index 3fe5fe3..7b22863 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-1-u8.c
@@ -2,74 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_1
 
-DEF_VEC_SAT_U_SUB_FMT_1(T)
+DEF_VEC_SAT_U_SUB_FMT_1_WRAP(T)
+
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_1_WRAP(T, out, op_1, op_2, N)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u16.c
index 0f4129c..a6b2dc4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_10
 
-DEF_VEC_SAT_U_SUB_FMT_10(T)
+DEF_VEC_SAT_U_SUB_FMT_10_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_10_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u32.c
index 8b995eb..91e749e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_10
 
-DEF_VEC_SAT_U_SUB_FMT_10(T)
+DEF_VEC_SAT_U_SUB_FMT_10_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_10_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u64.c
index d12d981..b7a6314 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_10
 
-DEF_VEC_SAT_U_SUB_FMT_10(T)
+DEF_VEC_SAT_U_SUB_FMT_10_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_10_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u8.c
index 384ef3e..1d55798 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-10-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_10
 
-DEF_VEC_SAT_U_SUB_FMT_10(T)
+DEF_VEC_SAT_U_SUB_FMT_10_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_10_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u16.c
index 5cf08ac..dcd6d17 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_2
 
-DEF_VEC_SAT_U_SUB_FMT_2(T)
+DEF_VEC_SAT_U_SUB_FMT_2_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_2_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u32.c
index 85c8454..98a1fff 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_2
 
-DEF_VEC_SAT_U_SUB_FMT_2(T)
+DEF_VEC_SAT_U_SUB_FMT_2_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_2_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u64.c
index 67d5ac5..5445b01 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_2
 
-DEF_VEC_SAT_U_SUB_FMT_2(T)
+DEF_VEC_SAT_U_SUB_FMT_2_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_2_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u8.c
index 809f07f..3aaec4d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-2-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_2
 
-DEF_VEC_SAT_U_SUB_FMT_2(T)
+DEF_VEC_SAT_U_SUB_FMT_2_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_2_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u16.c
index 57839a9..99e58cd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_3
 
-DEF_VEC_SAT_U_SUB_FMT_3(T)
+DEF_VEC_SAT_U_SUB_FMT_3_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_3_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u32.c
index ffb0dcc..bd7bcd0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_3
 
-DEF_VEC_SAT_U_SUB_FMT_3(T)
+DEF_VEC_SAT_U_SUB_FMT_3_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_3_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u64.c
index 3966677..96ee0c8 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_3
 
-DEF_VEC_SAT_U_SUB_FMT_3(T)
+DEF_VEC_SAT_U_SUB_FMT_3_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_3_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u8.c
index e795f62..b9fa957 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-3-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_3
 
-DEF_VEC_SAT_U_SUB_FMT_3(T)
+DEF_VEC_SAT_U_SUB_FMT_3_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_3_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u16.c
index 0eecf82..6d4f377 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_4
 
-DEF_VEC_SAT_U_SUB_FMT_4(T)
+DEF_VEC_SAT_U_SUB_FMT_4_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_4_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u32.c
index 1d0d16b..1425017 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_4
 
-DEF_VEC_SAT_U_SUB_FMT_4(T)
+DEF_VEC_SAT_U_SUB_FMT_4_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_4_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u64.c
index 98fdfa2..149d481 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_4
 
-DEF_VEC_SAT_U_SUB_FMT_4(T)
+DEF_VEC_SAT_U_SUB_FMT_4_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_4_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u8.c
index 18a887d..12195cd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-4-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_4
 
-DEF_VEC_SAT_U_SUB_FMT_4(T)
+DEF_VEC_SAT_U_SUB_FMT_4_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_4_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u16.c
index ce44c04..9cd2577 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_5
 
-DEF_VEC_SAT_U_SUB_FMT_5(T)
+DEF_VEC_SAT_U_SUB_FMT_5_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_5_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u32.c
index 36ae7b3..638e054 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_5
 
-DEF_VEC_SAT_U_SUB_FMT_5(T)
+DEF_VEC_SAT_U_SUB_FMT_5_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_5_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u64.c
index 7b40ffd..db86baf 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_5
 
-DEF_VEC_SAT_U_SUB_FMT_5(T)
+DEF_VEC_SAT_U_SUB_FMT_5_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_5_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u8.c
index 3b0807f..b277e1c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-5-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_5
 
-DEF_VEC_SAT_U_SUB_FMT_5(T)
+DEF_VEC_SAT_U_SUB_FMT_5_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_5_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u16.c
index e972078..e79e2fc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_6
 
-DEF_VEC_SAT_U_SUB_FMT_6(T)
+DEF_VEC_SAT_U_SUB_FMT_6_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_6_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u32.c
index 54e2848..cd9cbfc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_6
 
-DEF_VEC_SAT_U_SUB_FMT_6(T)
+DEF_VEC_SAT_U_SUB_FMT_6_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_6_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u64.c
index 33f3be0..7c0f753 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_6
 
-DEF_VEC_SAT_U_SUB_FMT_6(T)
+DEF_VEC_SAT_U_SUB_FMT_6_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_6_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u8.c
index 1376038..d97a834 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-6-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_6
 
-DEF_VEC_SAT_U_SUB_FMT_6(T)
+DEF_VEC_SAT_U_SUB_FMT_6_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_6_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u16.c
index 83241ef..3b8c870 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_7
 
-DEF_VEC_SAT_U_SUB_FMT_7(T)
+DEF_VEC_SAT_U_SUB_FMT_7_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_7_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u32.c
index f20bb21..065d898 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_7
 
-DEF_VEC_SAT_U_SUB_FMT_7(T)
+DEF_VEC_SAT_U_SUB_FMT_7_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_7_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u64.c
index 4ad0afd..f6783a8 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_7
 
-DEF_VEC_SAT_U_SUB_FMT_7(T)
+DEF_VEC_SAT_U_SUB_FMT_7_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_7_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u8.c
index 3b33b13..6b9ae2d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-7-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_7
 
-DEF_VEC_SAT_U_SUB_FMT_7(T)
+DEF_VEC_SAT_U_SUB_FMT_7_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_7_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u16.c
index b212550..27c4563 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_8
 
-DEF_VEC_SAT_U_SUB_FMT_8(T)
+DEF_VEC_SAT_U_SUB_FMT_8_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_8_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u32.c
index 1fb707c..2dba875 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_8
 
-DEF_VEC_SAT_U_SUB_FMT_8(T)
+DEF_VEC_SAT_U_SUB_FMT_8_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_8_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u64.c
index da8c09c..149a522 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_8
 
-DEF_VEC_SAT_U_SUB_FMT_8(T)
+DEF_VEC_SAT_U_SUB_FMT_8_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_8_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u8.c
index 647607f..739850e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-8-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_8
 
-DEF_VEC_SAT_U_SUB_FMT_8(T)
+DEF_VEC_SAT_U_SUB_FMT_8_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_8_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u16.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u16.c
index 9bb0664..3eb91ef 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u16.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint16_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_9
 
-DEF_VEC_SAT_U_SUB_FMT_9(T)
+DEF_VEC_SAT_U_SUB_FMT_9_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-      65535, 65535, 65535, 65535,
-    },
-    {
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-      55535, 45535, 35535, 25535,
-    },
-    {
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-      10000, 20000, 30000, 40000,
-    },
-  },
-  {
-    {
-	  0,     0,     1,     0,
-	  1,     2,     3,     0,
-	  1, 65535,     3, 65535,
-	  5, 65534, 65535,     9,
-    },
-    {
-	  0,     1,     1, 65534,
-      65534, 65534,     1, 65535,
-	  0, 65535, 65535,     0,
-      65535, 65535,     1,     2,
-    },
-    {
-	  0,     0,     0,     0,
-	  0,     0,     2,     0,
-	  1,     0,     0, 65535,
-	  0,     0, 65534,     7,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_9_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u32.c
index f142b8b..3e8d6fb 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u32.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint32_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_9
 
-DEF_VEC_SAT_U_SUB_FMT_9(T)
+DEF_VEC_SAT_U_SUB_FMT_9_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-      0, 0, 4, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-      0, 0, 2, 0,
-    }, /* expect */
-  },
-  {
-    {
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-      4294967295, 4294967295, 4294967295, 4294967295,
-    },
-    {
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-      1294967295, 2294967295, 3294967295, 4294967295,
-    },
-    {
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-      3000000000, 2000000000, 1000000000,          0,
-    },
-  },
-  {
-    {
-	       0,          0,          9,          0,
-	       1, 4294967295,          3,          0,
-	       1,          2,          3,          4,
-	       5, 4294967294, 4294967295, 4294967295,
-    },
-    {
-	       0,          1,          1, 4294967294,
-	       1,          2, 4294967294, 4294967295,
-	       1, 4294967295, 4294967295,          1,
-	       1, 4294967295, 4294967290,          9,
-    },
-    {
-	       0,          0,          8,          0,
-	       0, 4294967293,          0,          0,
-	       0,          0,          0,          3,
-	       4,          0,          5, 4294967286,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_9_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u64.c
index 574b91a..bb09035 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u64.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint64_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_9
 
-DEF_VEC_SAT_U_SUB_FMT_9(T)
+DEF_VEC_SAT_U_SUB_FMT_9_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-      0, 9, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-      0, 2, 3, 1,
-    }, /* arg_1 */
-    {
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-      0, 7, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-    },
-    {
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-      10446744073709551615u, 11446744073709551615u, 12446744073709551615u, 18446744073709551615u,
-    },
-    {
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-       8000000000000000000u,  7000000000000000000u,  6000000000000000000u,                    0u,
-    },
-  },
-  {
-    {
-			  0, 18446744073709551615u,                     1,                     0,
-			  1, 18446744073709551615u,                     3,                     0,
-			  1, 18446744073709551614u,                     3,                     4,
-			  5, 18446744073709551614u, 18446744073709551615u,                     9,
-    },
-    {
-			  0,                     1,                     1, 18446744073709551614u,
-      18446744073709551614u, 18446744073709551614u, 18446744073709551614u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u, 18446744073709551615u,
-      18446744073709551615u, 18446744073709551615u, 18446744073709551615u,                     1,
-    },
-    {
-			  0, 18446744073709551614u,                     0,                     0,
-			  0,                     1,                     0,                     0,
-			  0,                     0,                     0,                     0,
-			  0,                     0,                     0,                     8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_9_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u8.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u8.c
index 2c8ee42..1dc3191 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/sat/vec_sat_u_sub-run-9-u8.c
@@ -2,74 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "vec_sat_arith.h"
+#include "vec_sat_data.h"
 
 #define T                  uint8_t
-#define N                  16
-#define RUN_VEC_SAT_BINARY RUN_VEC_SAT_U_SUB_FMT_9
 
-DEF_VEC_SAT_U_SUB_FMT_9(T)
+DEF_VEC_SAT_U_SUB_FMT_9_WRAP(T)
 
-T test_data[][3][N] = {
-  {
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* arg_0 */
-    {
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-      0, 1, 2, 3,
-    }, /* arg_1 */
-    {
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-      0, 0, 0, 0,
-    }, /* expect */
-  },
-  {
-    {
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-	0, 255, 255, 255,
-    },
-    {
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-	1, 255, 254, 251,
-    },
-    {
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-	0,   0,   1,   4,
-    },
-  },
-  {
-    {
-	0,   0,   1,   0,
-	1,   2,   3,   0,
-	1,   2,   3, 255,
-	5, 254, 255,   9,
-    },
-    {
-	0,   1,   0, 254,
-      254, 254, 254, 255,
-      255, 255,   0, 252,
-      255, 255, 255,   1,
-    },
-    {
-	0,   0,   1,   0,
-	0,   0,   0,   0,
-	0,   0,   3,   3,
-	0,   0,   0,   8,
-    },
-  },
-};
+#define test_data          TEST_UNARY_DATA_WRAP(T, usub)
+#define RUN_VEC_SAT_BINARY(T, out, op_1, op_2, N) \
+  RUN_VEC_SAT_U_SUB_FMT_9_WRAP(T, out, op_1, op_2, N)
 
 #include "vec_sat_binary_vvv_run.h"