Re: [committed] RISC-V: Clean up testsuite for multi-lib testing [NFC]
ack, I am fixing this, and running a few more tests, thanks for reporting this! On Sat, Jan 6, 2024 at 10:06 AM 钟居哲 wrote: > > Hi, kito. > > This patch causes these following regression FAILs: > > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > > spawn -ignore SIGHUP > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/build/dev-rv64gcv-lp64d-medany-newlib-spike-release-m1-scalable/build-gcc-newlib-stage2/gcc/xgcc > > -B/work/home/jzzhong/work/docker/riscv-gnu-toolchain/build/dev-rv64gcv-lp64d-medany-newlib-spike-release-m1-scalable/build-gcc-newlib-stage2/gcc/ > > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c > -march=rv64gcv -mabi=lp64d -mcmodel=medany -fdiagnostics-plain-output > -ftree-vectorize -O2 --param riscv-autovec-lmul=m1 --param > riscv-autovec-preference=scalable -lm -o ./single_rgroup_run-3.exe^M > In file included from > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.c:4,^M > from > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c:4:^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c: > In function 'main':^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:108:9: > error: implicit declaration of function 'assert' > [-Wimplicit-function-declaration]^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:174:3: > note: in expansion of macro 'run_6'^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c:16:3: > note: in expansion of macro 'TEST_ALL'^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:108:9: > note: 'assert' is defined in header ''; this is probably fixable > by adding '#include '^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:174:3: > note: in expansion of macro 'run_6'^M > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c:16:3: > note: in expansion of macro 'TEST_ALL'^M > compiler exited with status 1 > FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for > excess errors) > Excess errors: > /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:108:9: > error: implicit declaration of function 'assert' > [-Wimplicit-function-declaration] > > UNRESOLVED: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c > compilation failed to produce executable > > > Could you fix it ? > > > juzhe.zh...@rivai.ai > > > From: Kito Cheng > Date: 2024-01-05 16:39 > To: gcc-patches; kito.cheng; juzhe.zhong > CC: Kito Cheng > Subject: [committed] 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:
Re: [committed] RISC-V: Clean up testsuite for multi-lib testing [NFC]
Hi, kito. This patch causes these following regression FAILs: FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) spawn -ignore SIGHUP /work/home/jzzhong/work/docker/riscv-gnu-toolchain/build/dev-rv64gcv-lp64d-medany-newlib-spike-release-m1-scalable/build-gcc-newlib-stage2/gcc/xgcc -B/work/home/jzzhong/work/docker/riscv-gnu-toolchain/build/dev-rv64gcv-lp64d-medany-newlib-spike-release-m1-scalable/build-gcc-newlib-stage2/gcc/ /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c -march=rv64gcv -mabi=lp64d -mcmodel=medany -fdiagnostics-plain-output -ftree-vectorize -O2 --param riscv-autovec-lmul=m1 --param riscv-autovec-preference=scalable -lm -o ./single_rgroup_run-3.exe^M In file included from /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.c:4,^M from /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c:4:^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c: In function 'main':^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:108:9: error: implicit declaration of function 'assert' [-Wimplicit-function-declaration]^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:174:3: note: in expansion of macro 'run_6'^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c:16:3: note: in expansion of macro 'TEST_ALL'^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:108:9: note: 'assert' is defined in header ''; this is probably fixable by adding '#include '^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:174:3: note: in expansion of macro 'run_6'^M /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c:16:3: note: in expansion of macro 'TEST_ALL'^M compiler exited with status 1 FAIL: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c (test for excess errors) Excess errors: /work/home/jzzhong/work/docker/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/single_rgroup-3.h:108:9: error: implicit declaration of function 'assert' [-Wimplicit-function-declaration] UNRESOLVED: gcc.target/riscv/rvv/autovec/partial/single_rgroup_run-3.c compilation failed to produce executable Could you fix it ? juzhe.zh...@rivai.ai From: Kito Cheng Date: 2024-01-05 16:39 To: gcc-patches; kito.cheng; juzhe.zhong CC: Kito Cheng Subject: [committed] 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/a
[committed] 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.
---
.../rvv/autovec/binop/shift-scalar-template.h | 5 +-
.../riscv/rvv/autovec/cond/cond_fmax-1.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax-2.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax-3.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax-4.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax_zvfh-1.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax_zvfh-2.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax_zvfh-3.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmax_zvfh-4.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin-1.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin-2.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin-3.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin-4.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin_zvfh-1.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin_zvfh-2.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin_zvfh-3.c | 1 -
.../riscv/rvv/autovec/cond/cond_fmin_zvfh-4.c | 1 -
.../rvv/autovec/partial/single_rgroup-2.h | 9 ++-
.../rvv/autovec/partial/single_rgroup-3.h | 73 ++-
.../gcc.target/riscv/rvv/autovec/pr112694-1.c | 4 +-
.../riscv/rvv/autovec/unop/abs-template.h | 1 -
.../riscv/rvv/autovec/unop/vneg-template.h| 1 -
.../riscv/rvv/autovec/unop/vnot-template.h| 1 -
23 files changed, 63 insertions(+), 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
index 8d1cefdca85..2cf645af26e 100644
--- 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
-#include
#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
index 25c35cf0607..fedee13aab8 100644
--- 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
-#include
#ifndef FN
#define FN(X) __builtin_fmax##X
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_fmax-2.c
