RISC-V: Clean up testsuite for multi-lib testing [NFC]

- Drop unnecessary including for stdlib.h and math.h - Drop assert.h / assert, use __builtin_abort instead. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/binop/shift-scalar-template.h: Use __builtin_abort instead of assert. * gcc.target/riscv/rvv/autovec/cond/cond_fmax-1.c: Drop math.h. * gcc.target/riscv/rvv/autovec/cond/cond_fmax-2.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmax-3.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmax-4.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin-1.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin-2.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin-3.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin-4.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-1.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-2.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-3.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-4.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-1.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-2.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-3.c: Ditto. * gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-4.c: Ditto. * gcc.target/riscv/rvv/autovec/partial/single_rgroup-2.h: Use __builtin_abort instead of assert. * gcc.target/riscv/rvv/autovec/pr112694-1.c: Ditto. * gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h: Ditto. * gcc.target/riscv/rvv/autovec/unop/abs-template.h: Drop stdlib.h. * gcc.target/riscv/rvv/autovec/unop/vneg-template.h: Ditto. * gcc.target/riscv/rvv/autovec/unop/vnot-template.h: Ditto.
thurday · Jan 5, 2024 · 085585e · 085585e
1 parent 05415db
commit 085585e
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 47 deletions.
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-scalar-template.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-scalar-template.h
@@ -3,7 +3,6 @@
 /* { dg-additional-options "-std=c99 --param=riscv-autovec-preference=scalable -fno-vect-cost-model --save-temps" } */
 
 #include <stdint-gcc.h>
-#include <assert.h>
 
 #define SHIFTL(TYPE,VAL)				\
   __attribute__ ((noipa))                               \
@@ -64,7 +63,7 @@ TEST_ALL()
     a##TYPE##VAL[i] = 2;		\
   vsll_##TYPE_##VAL (a##TYPE##VAL, SZ);	\
   for (int i = 0; i < SZ; i++)	  	\
-    assert (a##TYPE##VAL[i] == (2ll << VAL));
+    if (a##TYPE##VAL[i] != (2ll << VAL)) __builtin_abort ();
 
 __attribute__((noipa))
 void vsllvx (uint32_t *dst, int val, int n)
@@ -79,7 +78,7 @@ void vsllvx (uint32_t *dst, int val, int n)
     a[i] = 2;		\
   vsllvx (a, 17, SZ);	\
   for (int i = 0; i < SZ; i++)	  	\
-    assert (a[i] == (2 << 17));
+    if (a[i] != (2 << 17)) __builtin_abort ();
 
 int main ()
 {

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-1.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-2.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-3.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-4.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-4.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-1.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-2.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-3.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-4.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax_zvfh-4.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #ifndef FN
 #define FN(X) __builtin_fmax##X

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-1.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax-1.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-2.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax-2.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-3.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax-3.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-4.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin-4.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax-4.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-1.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax_zvfh-1.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-2.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax_zvfh-2.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-3.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-3.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax_zvfh-3.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-4.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmin_zvfh-4.c
@@ -2,7 +2,6 @@
 /* { dg-additional-options "-march=rv32gcv_zvfh -mabi=ilp32d --param=riscv-autovec-preference=scalable -fno-vect-cost-model -fno-signaling-nans" } */
 
 #include <stdint-gcc.h>
-#include <math.h>
 
 #define FN(X) __builtin_fmin##X
 #include "cond_fmax_zvfh-4.c"

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-2.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-2.h
@@ -1,4 +1,3 @@
-#include <assert.h>
 #include <stdint-gcc.h>
 
 #define N 777
@@ -25,9 +24,13 @@
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond_##TYPE[i] && i < 8)                                             \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+	  if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+	}                                                                      \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+	  if (b_##TYPE[i] == 0) __builtin_abort();                             \
+	}                                                                      \
     }
 
 #define TEST_ALL(T)                                                            \

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h
@@ -1,4 +1,3 @@
-#include <assert.h>
 #include <stdint-gcc.h>
 
 #define N 777
@@ -22,9 +21,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 5)                                                    \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_2(TYPE)                                                            \
@@ -34,9 +37,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 17)                                                   \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_3(TYPE)                                                            \
@@ -46,9 +53,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 32)                                                   \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_4(TYPE)                                                            \
@@ -58,9 +69,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 128)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_5(TYPE)                                                            \
@@ -70,9 +85,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 177)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_6(TYPE)                                                            \
@@ -82,7 +101,9 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 255)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
 	assert (b_##TYPE[i] == 0);                                             \
     }
@@ -94,9 +115,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 333)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_8(TYPE)                                                            \
@@ -106,9 +131,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 512)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define run_9(TYPE)                                                            \
@@ -118,7 +147,9 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 637)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
 	assert (b_##TYPE[i] == 0);                                             \
     }
@@ -130,9 +161,13 @@ int cond[N] = {0};
   for (unsigned int i = 0; i < N; i++)                                         \
     {                                                                          \
       if (cond[i] && i < 777)                                                  \
-	assert (b_##TYPE[i] == a_##TYPE[i]);                                   \
+        {                                                                      \
+          if (b_##TYPE[i] != a_##TYPE[i]) __builtin_abort();                   \
+        }								       \
       else                                                                     \
-	assert (b_##TYPE[i] == 0);                                             \
+        {                                                                      \
+          if (b_##TYPE[i] != 0) __builtin_abort();                             \
+        }								       \
     }
 
 #define TEST_ALL(T)                                                            \

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr112694-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr112694-1.c
@@ -16,8 +16,6 @@
 
 TEST_ALL()
 
-#include <assert.h>
-
 #define SZ 512
 
 #define RUN(TYPE, VAL)                                                         \
@@ -30,7 +28,7 @@ TEST_ALL()
     }                                                                          \
   vmul_##TYPE (a##TYPE, a##TYPE, b##TYPE, SZ);                                 \
   for (int i = 0; i < SZ; i++)                                                 \
-    assert (a##TYPE[i] == 2 * VAL);
+    if (a##TYPE[i] != 2 * VAL) __builtin_abort ();
 
 #define RUN_ALL()	\
  RUN(_Float16, 4)	\

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/abs-template.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/abs-template.h
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdint-gcc.h>
 
 #define TEST_TYPE(TYPE) 				\

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vneg-template.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vneg-template.h
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdint-gcc.h>
 
 #define TEST_TYPE(TYPE) 				\

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vnot-template.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vnot-template.h
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdint-gcc.h>
 
 #define TEST_TYPE(TYPE) 				\