Hi Kito, Christoph, Patrick,
I've been trying to test a specific non multilib config
(rv64-zicond_zfa) and seeing noisy output (compared to a similar multlib
build) and it seems there's still a bunch of this header issue (for the
rv32 abi headers) in the non-multlib config.
e.g.
FAIL: gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul1-7.c -O3
-ftree-vectorize --param riscv-autovec-lmul=dynamic (test for excess errors)
...
...
The errors are missing header :
from
gcc/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul1-7.c:4:
INSTALL/tc-up-231010-zicond-zfa-non-multilib/sysroot/usr/include/gnu/stubs.h:8:11:
fatal error: gnu/stubs-ilp32.h: No such file or directory
When looking around, I stumbled upon commit
d0bbecb1c41 "RISC-V: Add riscv_vector.h wrapper in testsuite to
prevent pull in stdint.h from C library"
Which seems like a step in a right direction, but how does one ensure
that the wrapper riscv_vector.h (containing stdint-gcc.h) is included by
test vs. the default riscv_vector.h (which is more user facing and thus
needs to include the system stdint.h)
P.S. I couldn't find the posting for above commit on gcc-patches ?
Thx,
-Vineet
On 10/5/23 16:45, Patrick O'Neill wrote:
stdint.h can be replaced with stdint-gcc.h to resolve some missing
system headers in non-multilib installations.
Tested using glibc rv32gcv and rv64gcv on r14-4381-g7eb5ce7f58e.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-1.h:
Replace stdint.h with stdint-gcc.h.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-2.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-1.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-2.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-1.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-2.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-1.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-2.h:
Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c: Ditto.
* gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c: Ditto.
* gcc.target/riscv/rvv/autovec/partial/slp-8.c: Ditto.
* gcc.target/riscv/rvv/autovec/partial/slp-9.c: Ditto.
* gcc.target/riscv/rvv/autovec/pr111232.c: Ditto.
* gcc.target/riscv/rvv/autovec/unop/cvt-0.c: Ditto.
* gcc.target/riscv/rvv/autovec/unop/cvt-1.c: Ditto.
* gcc.target/riscv/rvv/autovec/vls-vlmax/perm.h: Ditto.
* gcc.target/riscv/rvv/base/abi-call-args-4-run.c: Ditto.
* gcc.target/riscv/rvv/base/pr110119-2.c: Ditto.
* gcc.target/riscv/rvv/vsetvl/pr111255.c: Ditto.
* gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c: Ditto.
Signed-off-by: Patrick O'Neill <patr...@rivosinc.com>
---
Changes from v1:
- Avoid changing riscv_vector.h
Failures looked like this:
In file included from
/riscv-gnu-toolchain/build/sysroot/usr/include/features.h:515,
from
/riscv-gnu-toolchain/build/sysroot/usr/include/bits/libc-header-start.h:33,
from /riscv-gnu-toolchain/build/sysroot/usr/include/stdint.h:26,
from
/riscv-gnu-toolchain/build/lib/gcc/riscv32-unknown-linux-gnu/14.0.0/include/stdint.h:9,
from
/riscv-gnu-toolchain/build/build-gcc-linux-stage2/gcc/include/stdint.h:9,
from
/riscv-gnu-toolchain/build/build-gcc-linux-stage2/gcc/include/riscv_vector.h:28,
from
/riscv-gnu-toolchain/gcc/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul1-7.c:4:
/riscv-gnu-toolchain/build/sysroot/usr/include/gnu/stubs.h:8:11: fatal error:
gnu/stubs-ilp32.h: No such file or directory
Resolves these failures on rv32gcv (non-multilib):
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-rv64-1.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-rv64-2.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-rv64-1.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-rv64-2.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-rv64-1.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-rv64-2.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-rv64-1.c (test for
excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-rv64-2.c (test for
excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/partial/slp-9.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/pr111232.c -O3 -ftree-vectorize (test for
excess errors)
FAIL: gcc.target/riscv/rvv/autovec/unop/cvt-0.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/unop/cvt-1.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-1.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-2.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-3.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-5.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-6.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls-vlmax/perm-7.c -std=c99 -O3
-ftree-vectorize --param riscv-autovec-preference=fixed-vlmax (test for excess
errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-1.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-2.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-3.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-4.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-5.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-6.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/vls/perm-7.c -O3 -ftree-vectorize --param
riscv-autovec-preference=scalable (test for excess errors)
FAIL: gcc.target/riscv/rvv/base/pr110119-2.c (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O0 (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O1 (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O2 (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O2 -flto -fno-use-linker-plugin
-flto-partition=none (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O2 -flto -fuse-linker-plugin
-fno-fat-lto-objects (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O3 -fomit-frame-pointer
-funroll-loops -fpeel-loops -ftracer -finline-functions (test for excess
errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -O3 -g (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/pr111255.c -Os (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O0 (test for excess
errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O1 (test for excess
errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O2 (test for excess
errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O2 -flto
-fno-use-linker-plugin -flto-partition=none (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O2 -flto
-fuse-linker-plugin -fno-fat-lto-objects (test for excess errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O3 -fomit-frame-pointer
-funroll-loops -fpeel-loops -ftracer -finline-functions (test for excess
errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -O3 -g (test for excess
errors)
FAIL: gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c -Os (test for excess
errors)
Resolves these failures on rv64gcv (non-multilib):
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-rv32-1.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-rv32-2.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-rv32-1.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-rv32-2.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-rv32-1.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-rv32-2.c (test
for excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-rv32-1.c (test for
excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-rv32-2.c (test for
excess errors)
FAIL: gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-rv32-2.c (test for
excess errors)
FAIL: gcc.target/riscv/rvv/autovec/partial/slp-8.c (test for excess errors)
---
.../riscv/rvv/autovec/cond/cond_convert_float2float-1.h | 2 +-
.../riscv/rvv/autovec/cond/cond_convert_float2float-2.h | 2 +-
.../riscv/rvv/autovec/cond/cond_convert_float2int-1.h | 2 +-
.../riscv/rvv/autovec/cond/cond_convert_float2int-2.h | 2 +-
.../riscv/rvv/autovec/cond/cond_convert_int2float-1.h | 2 +-
.../riscv/rvv/autovec/cond/cond_convert_int2float-2.h | 2 +-
.../gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-1.h | 2 +-
.../gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-2.h | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-8.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111232.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-0.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-1.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm.h | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/base/abi-call-args-4-run.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/base/pr110119-2.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr111255.c | 2 +-
gcc/testsuite/gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c | 2 +-
28 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-1.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-1.h
index 4742d926af6..36af15b986a 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-1.h
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-1.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-2.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-2.h
index b084eaae19d..1aad4a658de 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-2.h
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2float-2.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-1.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-1.h
index 2df68aa2d1e..639adc34c3d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-1.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-1.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-2.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-2.h
index 9735141faa1..3d518a45cd2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-2.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_float2int-2.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-1.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-1.h
index 5b0baeece41..1c49e39cad0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-1.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-1.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-2.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-2.h
index 2177c946de8..640e0db39a3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-2.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2float-2.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-1.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-1.h
index c8ef6df399d..eb820d3fe36 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-1.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-1.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-2.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-2.h
index f53c1b3fde9..5653ef61675 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-2.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_convert_int2int-2.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c
index 21219b43d9d..c7bd37e4f0e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model -ffast-math" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(TYPE, OP)
\
void __attribute__ ((noipa))
\
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c
index 2fcdc339e70..c2fb92fbbbf 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model -ffast-math" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(TYPE, OP)
\
void __attribute__ ((noipa))
\
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c
index 8076243f7d4..cb738a84492 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c
index 8e44301ae80..d9fb0865fc7 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c
index 6da5b6e42e3..145839308e5 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c
index 5428c289d22..e120e8f7e2a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c
index 8e567378d0d..775e65e7e6a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c
index 65a36d0e52a..63314402fbd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-6.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c
index 356fe9fc25a..4847aec49e0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-7.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c
index 5208a858882..ae4d11893c9 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_unary-8.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define abs(A) ((A) < 0 ? -(A) : (A))
#define neg(A) (-(A))
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-8.c
index 2568d6947a2..cf2fd1d656f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-8.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv32gcv -mabi=ilp32d --param
riscv-autovec-preference=scalable -fno-vect-cost-model
-fdump-tree-optimized-details" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define VEC_PERM(TYPE)
\
TYPE __attribute__ ((noinline, noclone))
\
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c
index 7c42438c9d9..1b99ffd4ffa 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv -mabi=lp64d --param
riscv-autovec-preference=scalable -fno-vect-cost-model
-fdump-tree-optimized-details" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define VEC_PERM(TYPE)
\
TYPE __attribute__ ((noinline, noclone))
\
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111232.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111232.c
index de815c5fac9..edad1402154 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111232.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111232.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-march=rv64gcv -mabi=lp64d
--param=riscv-autovec-preference=scalable -Ofast -fno-schedule-insns
-fno-schedule-insns2" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
int16_t
foo (int8_t *restrict x, int8_t *restrict y, int n)
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-0.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-0.c
index f08c1211723..762b1408994 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-0.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-0.c
@@ -2,7 +2,7 @@
/* { dg-options "-march=rv64gcv_zvfh -mabi=lp64d -O3 -ftree-vectorize -ffast-math
-fno-vect-cost-model -fno-schedule-insns -fno-schedule-insns2" } */
/* { dg-final { check-function-bodies "**" "" } } */
-#include <stdint.h>
+#include <stdint-gcc.h>
/*
** test_int65_to_fp16:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-1.c
index 2d8ba8f45a5..3180ba3612c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/cvt-1.c
@@ -2,7 +2,7 @@
/* { dg-options "-march=rv64gcv_zvfh -mabi=lp64d -O3 -ftree-vectorize -ffast-math
-fno-vect-cost-model -fno-schedule-insns -fno-schedule-insns2" } */
/* { dg-final { check-function-bodies "**" "" } } */
-#include <stdint.h>
+#include <stdint-gcc.h>
/*
** test_uint65_to_fp16:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm.h
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm.h
index 18cb4af059b..1c5e4724651 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm.h
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint-gcc.h>
typedef int8_t vnx2qi __attribute__ ((vector_size (2)));
typedef int8_t vnx4qi __attribute__ ((vector_size (4)));
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/abi-call-args-4-run.c
b/gcc/testsuite/gcc.target/riscv/rvv/base/abi-call-args-4-run.c
index 01cd55f1c72..aa28bb7e477 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/base/abi-call-args-4-run.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/abi-call-args-4-run.c
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <stdint.h>
+#include <stdint-gcc.h>
#include "riscv_vector.h"
vint64m8_t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/pr110119-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/base/pr110119-2.c
index 958d1addb05..3dadc9920e6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/base/pr110119-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/pr110119-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-march=rv64gczve32x -mabi=lp64d
--param=riscv-autovec-preference=fixed-vlmax -Wno-psabi" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#include "riscv_vector.h"
__attribute__ ((noipa)) vint32m1x3_t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr111255.c
b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr111255.c
index 736f6838a50..d667dbc874b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr111255.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr111255.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 --param riscv-autovec-lmul=m2
-fno-vect-cost-model" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
#define DEF_LOOP(OLD_TYPE, NEW_TYPE)
\
void __attribute__ ((noipa))
\
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c
b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c
index 81a0ebb9f52..5d1126786d3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/wredsum_vlmax.c
@@ -2,7 +2,7 @@
/* { dg-options "-march=rv64gcv_zvl256b -mabi=lp64d
--param=riscv-autovec-preference=fixed-vlmax -O3" } */
-#include <stdint.h>
+#include <stdint-gcc.h>
int16_t foo (int8_t *restrict a)
{
--
2.34.1
