RISC-V: Avoid scalar unsigned SAT_ADD test data duplication

Some of the previous scalar unsigned SAT_ADD test data are
duplicated in different test files.  This patch would like to
move them into a shared header file, to avoid the test data
duplication.

The below test suites are passed for this patch series.
* The rv64gcv fully regression test.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/sat/sat_arith.h: Add more helper macros.
	* gcc.target/riscv/sat/sat_arith_data.h: Add the test data
	for scalar unsigned SAT_ADD.
	* gcc.target/riscv/sat/sat_u_add-run-1-u16.c: Leverage the test
	data from the shared header file.
	* gcc.target/riscv/sat/sat_u_add-run-1-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-1-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-1-u8.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-2-u16.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-2-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-2-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-2-u8.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-3-u16.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-3-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-3-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-3-u8.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-4-u16.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-4-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-4-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-4-u8.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-5-u16.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-5-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-5-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-5-u8.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-6-u16.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-6-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-6-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-6-u8.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-7-u32-from-u64.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u16.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u32.c: Ditto
	* gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u64.c: Ditto

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

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_arith.h b/gcc/testsuite/gcc.target/riscv/sat/sat_arith.h
index 2225d30d77e29520c88a2ec07a53444f6017af77..6e97cae96e6ed65ce500f678d6d1e87a2f769521 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_arith.h
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_arith.h
@@ -13,6 +13,7 @@ sat_u_add_##T##_fmt_1 (T x, T y)           \
 {                                          \
   return (x + y) | (-(T)((T)(x + y) < x)); \
 }
+#define DEF_SAT_U_ADD_FMT_1_WRAP(T) DEF_SAT_U_ADD_FMT_1(T)
 
 #define DEF_SAT_U_ADD_FMT_2(T)           \
 T __attribute__((noinline))              \
@@ -20,6 +21,7 @@ sat_u_add_##T##_fmt_2 (T x, T y)         \
 {                                        \
   return (T)(x + y) >= x ? (x + y) : -1; \
 }
+#define DEF_SAT_U_ADD_FMT_2_WRAP(T) DEF_SAT_U_ADD_FMT_2(T)
 
 #define DEF_SAT_U_ADD_FMT_3(T)                      \
 T __attribute__((noinline))                         \
@@ -29,6 +31,7 @@ sat_u_add_##T##_fmt_3 (T x, T y)                    \
   T overflow = __builtin_add_overflow (x, y, &ret); \
   return (T)(-overflow) | ret;                      \
 }
+#define DEF_SAT_U_ADD_FMT_3_WRAP(T) DEF_SAT_U_ADD_FMT_3(T)
 
 #define DEF_SAT_U_ADD_FMT_4(T)                           \
 T __attribute__((noinline))                              \
@@ -37,6 +40,7 @@ sat_u_add_##T##_fmt_4 (T x, T y)                         \
   T ret;                                                 \
   return __builtin_add_overflow (x, y, &ret) ? -1 : ret; \
 }
+#define DEF_SAT_U_ADD_FMT_4_WRAP(T) DEF_SAT_U_ADD_FMT_4(T)
 
 #define DEF_SAT_U_ADD_FMT_5(T)                                \
 T __attribute__((noinline))                                   \
@@ -45,6 +49,7 @@ sat_u_add_##T##_fmt_5 (T x, T y)                              \
   T ret;                                                      \
   return __builtin_add_overflow (x, y, &ret) == 0 ? ret : -1; \
 }
+#define DEF_SAT_U_ADD_FMT_5_WRAP(T) DEF_SAT_U_ADD_FMT_5(T)
 
 #define DEF_SAT_U_ADD_FMT_6(T)          \
 T __attribute__((noinline))             \
@@ -52,6 +57,7 @@ sat_u_add_##T##_fmt_6 (T x, T y)        \
 {                                       \
   return (T)(x + y) < x ? -1 : (x + y); \
 }
+#define DEF_SAT_U_ADD_FMT_6_WRAP(T) DEF_SAT_U_ADD_FMT_6(T)
 
 #define DEF_SAT_U_ADD_FMT_7(WT, T)     \
 T __attribute__((noinline))            \
@@ -64,11 +70,17 @@ sat_u_add_##WT##_##T##_fmt_7(T x, T y) \
 #define DEF_SAT_U_ADD_FMT_7_WRAP(WT, T) DEF_SAT_U_ADD_FMT_7(WT, T)
 
 #define RUN_SAT_U_ADD_FMT_1(T, x, y) sat_u_add_##T##_fmt_1(x, y)
+#define RUN_SAT_U_ADD_FMT_1_WRAP(T, x, y) RUN_SAT_U_ADD_FMT_1(T, x, y)
 #define RUN_SAT_U_ADD_FMT_2(T, x, y) sat_u_add_##T##_fmt_2(x, y)
+#define RUN_SAT_U_ADD_FMT_2_WRAP(T, x, y) RUN_SAT_U_ADD_FMT_2(T, x, y)
 #define RUN_SAT_U_ADD_FMT_3(T, x, y) sat_u_add_##T##_fmt_3(x, y)
+#define RUN_SAT_U_ADD_FMT_3_WRAP(T, x, y) RUN_SAT_U_ADD_FMT_3(T, x, y)
 #define RUN_SAT_U_ADD_FMT_4(T, x, y) sat_u_add_##T##_fmt_4(x, y)
+#define RUN_SAT_U_ADD_FMT_4_WRAP(T, x, y) RUN_SAT_U_ADD_FMT_4(T, x, y)
 #define RUN_SAT_U_ADD_FMT_5(T, x, y) sat_u_add_##T##_fmt_5(x, y)
+#define RUN_SAT_U_ADD_FMT_5_WRAP(T, x, y) RUN_SAT_U_ADD_FMT_5(T, x, y)
 #define RUN_SAT_U_ADD_FMT_6(T, x, y) sat_u_add_##T##_fmt_6(x, y)
+#define RUN_SAT_U_ADD_FMT_6_WRAP(T, x, y) RUN_SAT_U_ADD_FMT_6(T, x, y)
 #define RUN_SAT_U_ADD_FMT_7_FROM_U16(T, x, y) \
   sat_u_add_uint16_t_##T##_fmt_7(x, y)
 #define RUN_SAT_U_ADD_FMT_7_FROM_U16_WRAP(T, x, y) \

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_arith_data.h b/gcc/testsuite/gcc.target/riscv/sat/sat_arith_data.h
index 9f9f7d0bcd19f6c685f69c43d7ba227560e02bcd..f1006889d2125d6b8989c510a96a99893c064181 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_arith_data.h
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_arith_data.h
@@ -32,6 +32,11 @@ TEST_UNARY_STRUCT (uint16_t, uint32_t)
 TEST_UNARY_STRUCT (uint16_t, uint64_t)
 TEST_UNARY_STRUCT (uint32_t, uint64_t)
 
+TEST_BINARY_STRUCT (uint8_t, usadd)
+TEST_BINARY_STRUCT (uint16_t, usadd)
+TEST_BINARY_STRUCT (uint32_t, usadd)
+TEST_BINARY_STRUCT (uint64_t, usadd)
+
 TEST_BINARY_STRUCT (int8_t,  ssadd)
 TEST_BINARY_STRUCT (int16_t, ssadd)
 TEST_BINARY_STRUCT (int32_t, ssadd)
@@ -236,6 +241,62 @@ TEST_UNARY_STRUCT_DECL(int32_t, int64_t) \
   {-2147483648, -9223372036854775808ull},
 };
 
+TEST_BINARY_STRUCT_DECL(uint8_t, usadd) TEST_BINARY_DATA(uint8_t, usadd)[] =
+{
+  {      0,     0,      0, },
+  {      0,     1,      1, },
+  {      1,     1,      2, },
+  {      0,   254,    254, },
+  {      1,   254,    255, },
+  {      2,   254,    255, },
+  {      0,   255,    255, },
+  {      1,   255,    255, },
+  {      2,   255,    255, },
+  {    255,   255,    255, },
+};
+
+TEST_BINARY_STRUCT_DECL(uint16_t, usadd) TEST_BINARY_DATA(uint16_t, usadd)[] =
+{
+  {      0,     0,      0, },
+  {      0,     1,      1, },
+  {      1,     1,      2, },
+  {      0, 65534,  65534, },
+  {      1, 65534,  65535, },
+  {      2, 65534,  65535, },
+  {      0, 65535,  65535, },
+  {      1, 65535,  65535, },
+  {      2, 65535,  65535, },
+  {  65535, 65535,  65535, },
+};
+
+TEST_BINARY_STRUCT_DECL(uint32_t, usadd) TEST_BINARY_DATA(uint32_t, usadd)[] =
+{
+  {          0,          0,           0, },
+  {          0,          1,           1, },
+  {          1,          1,           2, },
+  {          0, 4294967294,  4294967294, },
+  {          1, 4294967294,  4294967295, },
+  {          2, 4294967294,  4294967295, },
+  {          0, 4294967295,  4294967295, },
+  {          1, 4294967295,  4294967295, },
+  {          2, 4294967295,  4294967295, },
+  { 4294967295, 4294967295,  4294967295, },
+};
+
+TEST_BINARY_STRUCT_DECL(uint64_t, usadd) TEST_BINARY_DATA(uint64_t, usadd)[] =
+{
+  {                     0,                     0,                      0, },
+  {                     0,                     1,                      1, },
+  {                     1,                     1,                      2, },
+  {                     0, 18446744073709551614u,  18446744073709551614u, },
+  {                     1, 18446744073709551614u,  18446744073709551615u, },
+  {                     2, 18446744073709551614u,  18446744073709551615u, },
+  {                     0, 18446744073709551615u,  18446744073709551615u, },
+  {                     1, 18446744073709551615u,  18446744073709551615u, },
+  {                     2, 18446744073709551615u,  18446744073709551615u, },
+  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
+};
+
 TEST_BINARY_STRUCT_DECL(int8_t, ssadd) TEST_BINARY_DATA(int8_t, ssadd)[] =
 {
   {   0,    0,    0},

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u16.c
index cb3879d0cded4893437370e3c02b650cc60e2277..fe015cc9d1ca50d4fe783e44107b74f0430cfe5f 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u16.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_1
+#define T1               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_1(T)
+DEF_SAT_U_ADD_FMT_1_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_1_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u32.c
index c9a6080ca3b6c81b122bd49a09475c3cc6879760..8ee650197383b235a751ba25be9ccad7c2e9bb16 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u32.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_1
+#define T1               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_1(T)
+DEF_SAT_U_ADD_FMT_1_WRAP(T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_1_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u64.c
index c19b7e22387d6c2e6ed55f67d4bc3b81a9538b84..d2c6af0d432d90dbdcea435fa470ce7d8d6f1122 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u64.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_1
+#define T1               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_1(T)
+DEF_SAT_U_ADD_FMT_1_WRAP(T1)
 
-T test_data[][3] = {
-  /*                arg_0,                 arg_1,                 expect */
-  {                     0,                     0,                      0, },
-  {                     0,                     1,                      1, },
-  {                     1,                     1,                      2, },
-  {                     0, 18446744073709551614u,  18446744073709551614u, },
-  {                     1, 18446744073709551614u,  18446744073709551615u, },
-  {                     2, 18446744073709551614u,  18446744073709551615u, },
-  {                     0, 18446744073709551615u,  18446744073709551615u, },
-  {                     1, 18446744073709551615u,  18446744073709551615u, },
-  {                     2, 18446744073709551615u,  18446744073709551615u, },
-  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_1_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u8.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u8.c
index f1972490006962b26535088c26ec25e7f0b1dd96..154edde1794344e5d6fee05dec49f1502dfdb808 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-1-u8.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_1
+#define T1               uint8_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_1(T)
+DEF_SAT_U_ADD_FMT_1_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_1_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u16.c
index 99b5c3a39f048eb31dcb0bb8745ae45fd2333a38..1fc08bd1eb96cc4a5de7196d64f195c352cd8ed6 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u16.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_2
+#define T1               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_2(T)
+DEF_SAT_U_ADD_FMT_2_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_2_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u32.c
index 13f595489352e2ad1b489e598564936ac8c39b48..a52a230f629b7b0c6c90c5f412fce1c12aba5dbb 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u32.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_2
+#define T1               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_2(T)
+DEF_SAT_U_ADD_FMT_2_WRAP(T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_2_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u64.c
index cdbea7b1b2cab17c862f43bbfc8cb711096083d3..d05ed332d841a1d910e244dfd381f6c6a3ebfae1 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u64.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_2
+#define T1               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_2(T)
+DEF_SAT_U_ADD_FMT_2_WRAP(T1)
 
-T test_data[][3] = {
-  /*                arg_0,                 arg_1,                 expect */
-  {                     0,                     0,                      0, },
-  {                     0,                     1,                      1, },
-  {                     1,                     1,                      2, },
-  {                     0, 18446744073709551614u,  18446744073709551614u, },
-  {                     1, 18446744073709551614u,  18446744073709551615u, },
-  {                     2, 18446744073709551614u,  18446744073709551615u, },
-  {                     0, 18446744073709551615u,  18446744073709551615u, },
-  {                     1, 18446744073709551615u,  18446744073709551615u, },
-  {                     2, 18446744073709551615u,  18446744073709551615u, },
-  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_2_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u8.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u8.c
index 508531c09d7376c43be46a692d6b99dd652fb0ba..fd393353b569caa3aa5f212abc52bc842904a576 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-2-u8.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_2
+#define T1               uint8_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_2(T)
+DEF_SAT_U_ADD_FMT_2_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_2_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u16.c
index bd935dcfd610b7de0af52ae73474fd14f7b1e63c..7084272442c6ffa3eb0d40e963eb528e57ed4e43 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u16.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_3
+#define T1               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_3(T)
+DEF_SAT_U_ADD_FMT_3_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_3_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u32.c
index deccf9a75250136e0e4e1784418b850f482b3946..82de67db75a1980852f856720e51915999b5c47c 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u32.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_3
+#define T1               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_3(T)
+DEF_SAT_U_ADD_FMT_3_WRAP(T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_3_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u64.c
index 4f9936706a8865cae3110e35aac7f51fc4503799..d73f3056e760def62d68513feb6364d76d1b2b5b 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u64.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_3
+#define T1               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_3(T)
+DEF_SAT_U_ADD_FMT_3_WRAP(T1)
 
-T test_data[][3] = {
-  /*                arg_0,                 arg_1,                 expect */
-  {                     0,                     0,                      0, },
-  {                     0,                     1,                      1, },
-  {                     1,                     1,                      2, },
-  {                     0, 18446744073709551614u,  18446744073709551614u, },
-  {                     1, 18446744073709551614u,  18446744073709551615u, },
-  {                     2, 18446744073709551614u,  18446744073709551615u, },
-  {                     0, 18446744073709551615u,  18446744073709551615u, },
-  {                     1, 18446744073709551615u,  18446744073709551615u, },
-  {                     2, 18446744073709551615u,  18446744073709551615u, },
-  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_3_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u8.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u8.c
index 670932fa9101833a8cc6d043a4dc793e4784c8f1..f572c440c0e5e1f79cf60b00e73b9840c8b9ca6c 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-3-u8.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_3
+#define T1               uint8_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_3(T)
+DEF_SAT_U_ADD_FMT_3_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_3_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u16.c
index 33a595dad51b33443abf14de352ca96a034c5ede..65c431f8b8939e745c50f259b5a352631a363138 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u16.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_4
+#define T1               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_4(T)
+DEF_SAT_U_ADD_FMT_4_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_4_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u32.c
index 8a5b7c106008b103fe528e2577eef0249215749e..8a73fcde64e5845d3285e8718b314a6915d06466 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u32.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_4
+#define T1               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_4(T)
+DEF_SAT_U_ADD_FMT_4_WRAP(T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_4_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u64.c
index fa20aae1d0be9f6f8226041dae1920d7d460a2bd..0903e107955b639b908deb0a5035342e38dbca8d 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u64.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_4
+#define T1               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_4(T)
+DEF_SAT_U_ADD_FMT_4_WRAP(T1)
 
-T test_data[][3] = {
-  /*                arg_0,                 arg_1,                 expect */
-  {                     0,                     0,                      0, },
-  {                     0,                     1,                      1, },
-  {                     1,                     1,                      2, },
-  {                     0, 18446744073709551614u,  18446744073709551614u, },
-  {                     1, 18446744073709551614u,  18446744073709551615u, },
-  {                     2, 18446744073709551614u,  18446744073709551615u, },
-  {                     0, 18446744073709551615u,  18446744073709551615u, },
-  {                     1, 18446744073709551615u,  18446744073709551615u, },
-  {                     2, 18446744073709551615u,  18446744073709551615u, },
-  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_4_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u8.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u8.c
index 083d6e59a06f2f288ec5c6ac0f23f04f6961918b..ffdd390efd6bf3c40f33e868851ddd4729586720 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-4-u8.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_4
+#define T1               uint8_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_4(T)
+DEF_SAT_U_ADD_FMT_4_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_4_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u16.c
index a1d5d70b4ab563405a976cf5150b180cdb674f56..72ccd2f776a7facf9739b79a0c5fc4cb07bf0696 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u16.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5
+#define T1               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_5(T)
+DEF_SAT_U_ADD_FMT_5_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_5_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u32.c
index 7608e71dd80bf15aca0a990d851bb7f70f72babb..34d1a4ef54912d322268c932947c84028a40ebd9 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u32.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5
+#define T1               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_5(T)
+DEF_SAT_U_ADD_FMT_5_WRAP(T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_5_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u64.c
index 496ab58150b8488a80000bc91391c9d324b74f67..d502a58a68097d9c6557afaeafa5bd158f2f9a33 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u64.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5
+#define T1               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_5(T)
+DEF_SAT_U_ADD_FMT_5_WRAP(T1)
 
-T test_data[][3] = {
-  /*                arg_0,                 arg_1,                 expect */
-  {                     0,                     0,                      0, },
-  {                     0,                     1,                      1, },
-  {                     1,                     1,                      2, },
-  {                     0, 18446744073709551614u,  18446744073709551614u, },
-  {                     1, 18446744073709551614u,  18446744073709551615u, },
-  {                     2, 18446744073709551614u,  18446744073709551615u, },
-  {                     0, 18446744073709551615u,  18446744073709551615u, },
-  {                     1, 18446744073709551615u,  18446744073709551615u, },
-  {                     2, 18446744073709551615u,  18446744073709551615u, },
-  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_5_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u8.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u8.c
index 936028cbe8bbde84054c19091b365ea8129df4d9..f6113763b889227a209bbb31c62a9d7ce5d6151a 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-5-u8.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5
+#define T1               uint8_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_5(T)
+DEF_SAT_U_ADD_FMT_5_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_5_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u16.c
index d304288d8b6156418831e5f22911a81b25ae3ad5..5ef250d196638147abca47ffcf52c526dd40f5ab 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u16.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_6
+#define T1               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_6(T)
+DEF_SAT_U_ADD_FMT_6_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_6_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u32.c
index 1a1ea5981335bf31d18ffc4d128741c73044787f..ba95dbf0545e27733bbe3fe8cf432ee004e5477a 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u32.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_6
+#define T1               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_6(T)
+DEF_SAT_U_ADD_FMT_6_WRAP(T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_6_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u64.c
index dc977d5b3a5023d02173bb773c0f0c9e650bcde9..d0e9dfda28b913f483e78d7c6386ae1dcbae4150 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u64.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_6
+#define T1               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_6(T)
+DEF_SAT_U_ADD_FMT_6_WRAP(T1)
 
-T test_data[][3] = {
-  /*                arg_0,                 arg_1,                 expect */
-  {                     0,                     0,                      0, },
-  {                     0,                     1,                      1, },
-  {                     1,                     1,                      2, },
-  {                     0, 18446744073709551614u,  18446744073709551614u, },
-  {                     1, 18446744073709551614u,  18446744073709551615u, },
-  {                     2, 18446744073709551614u,  18446744073709551615u, },
-  {                     0, 18446744073709551615u,  18446744073709551615u, },
-  {                     1, 18446744073709551615u,  18446744073709551615u, },
-  {                     2, 18446744073709551615u,  18446744073709551615u, },
-  { 18446744073709551615u, 18446744073709551615u,  18446744073709551615u, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_6_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u8.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u8.c
index 8bc204ec74e4ee63b34810f29d11619e98bd1f0e..b3d00df16d73d30bba546afb1c7f22247f0a3954 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-6-u8.c
@@ -2,24 +2,14 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_6
+#define T1               uint8_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_6(T)
+DEF_SAT_U_ADD_FMT_6_WRAP(T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_6_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u32.c
index 25dc1d1bab364269565e9a1db86831360b07091e..26c27783ae048f4d87f2226e0037deddd263f464 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u32.c
@@ -2,25 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define WT             uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_7_FROM_U32_WRAP
+#define T1               uint16_t
+#define T2               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_7_WRAP(WT, T)
+DEF_SAT_U_ADD_FMT_7_WRAP(T2, T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_7_FROM_U32_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u64.c
index 565b108b5a36b3ce2d0a69e2a0dc50217a545fdc..1f3e2f3ff957a07c413729d50f3990f5f347e06d 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u16-from-u64.c
@@ -2,25 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint16_t
-#define WT             uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_7_FROM_U64_WRAP
+#define T1               uint16_t
+#define T2               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_7_WRAP(WT, T)
+DEF_SAT_U_ADD_FMT_7_WRAP(T2, T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0, 65534,  65534, },
-  {      1, 65534,  65535, },
-  {      2, 65534,  65535, },
-  {      0, 65535,  65535, },
-  {      1, 65535,  65535, },
-  {      2, 65535,  65535, },
-  {  65535, 65535,  65535, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_7_FROM_U64_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u32-from-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u32-from-u64.c
index 6ff34fd2235be1cf109d418e117892cc66ded79c..558f6ce155d1185b1ab94d0fff32d4a7a0781e50 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u32-from-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u32-from-u64.c
@@ -2,25 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint32_t
-#define WT             uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_7_FROM_U64_WRAP
+#define T1               uint32_t
+#define T2               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_7_WRAP(WT, T)
+DEF_SAT_U_ADD_FMT_7_WRAP(T2, T1)
 
-T test_data[][3] = {
-  /*     arg_0,      arg_1,      expect */
-  {          0,          0,           0, },
-  {          0,          1,           1, },
-  {          1,          1,           2, },
-  {          0, 4294967294,  4294967294, },
-  {          1, 4294967294,  4294967295, },
-  {          2, 4294967294,  4294967295, },
-  {          0, 4294967295,  4294967295, },
-  {          1, 4294967295,  4294967295, },
-  {          2, 4294967295,  4294967295, },
-  { 4294967295, 4294967295,  4294967295, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_7_FROM_U64_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u16.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u16.c
index 9e6e70aa6b36511bb853dc5435545f777122b438..ec5ac70bd84a689e45a6f608258d5eacda2151cb 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u16.c
@@ -2,25 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define WT             uint16_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_7_FROM_U16_WRAP
+#define T1               uint8_t
+#define T2               uint16_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_7_WRAP(WT, T)
+DEF_SAT_U_ADD_FMT_7_WRAP(T2, T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_7_FROM_U16_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u32.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u32.c
index a1134edfd284fffdf4f1e8acc2a5ef74990b04f5..aa94eef6c329e89e25f6df5d8a4f66845a50cb71 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u32.c
@@ -2,25 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define WT             uint32_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_7_FROM_U32_WRAP
+#define T1               uint8_t
+#define T2               uint32_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_7_WRAP(WT, T)
+DEF_SAT_U_ADD_FMT_7_WRAP(T2, T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_7_FROM_U32_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u64.c b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u64.c
index ef9f7aa25b0c21d2b952d875ca4416edd3c36ad9..6ac38bae0b2b5ba4cacd1fcf93e6725033f266d0 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-run-7-u8-from-u64.c
@@ -2,25 +2,15 @@
 /* { dg-additional-options "-std=c99" } */
 
 #include "sat_arith.h"
+#include "sat_arith_data.h"
 
-#define T              uint8_t
-#define WT             uint64_t
-#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_7_FROM_U64_WRAP
+#define T1               uint8_t
+#define T2               uint64_t
+#define DATA             TEST_BINARY_DATA_WRAP(T1, usadd)
+#define T                TEST_BINARY_STRUCT_DECL(T1, usadd)
 
-DEF_SAT_U_ADD_FMT_7_WRAP(WT, T)
+DEF_SAT_U_ADD_FMT_7_WRAP(T2, T1)
 
-T test_data[][3] = {
-  /* arg_0, arg_1, expect */
-  {      0,     0,      0, },
-  {      0,     1,      1, },
-  {      1,     1,      2, },
-  {      0,   254,    254, },
-  {      1,   254,    255, },
-  {      2,   254,    255, },
-  {      0,   255,    255, },
-  {      1,   255,    255, },
-  {      2,   255,    255, },
-  {    255,   255,    255, },
-};
+#define RUN_BINARY(x, y) RUN_SAT_U_ADD_FMT_7_FROM_U64_WRAP(T1, x, y)
 
-#include "scalar_sat_binary.h"
+#include "scalar_sat_binary_run_xxx.h"