https://gcc.gnu.org/g:97d90509f1d6b8189d6492d51383c06239c57bbe

commit 97d90509f1d6b8189d6492d51383c06239c57bbe
Author: Pan Li <pan2...@intel.com>
Date:   Sat Jul 20 10:43:44 2024 +0800

    RISC-V: Rearrange the test helper files for vector .SAT_*
    
    Rearrange the test help header files,  as well as align the name
    conventions.
    
    gcc/testsuite/ChangeLog:
    
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_binary.h: Move to...
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvv_run.h: 
...here.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_scalar.h: Move 
to...
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvx_run.h: 
...here.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx.h: Move to...
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx_run.h: 
...here.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-1.c: Adjust
            the include file names.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-10.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-11.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-12.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-13.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-14.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-15.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-16.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-17.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-18.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-19.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-2.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-20.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-21.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-22.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-23.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-24.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-25.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-26.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-27.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-28.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-29.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-3.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-30.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-31.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-32.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-4.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-5.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-6.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-7.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-8.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-9.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-1.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-10.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-11.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-12.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-13.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-14.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-15.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-16.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-17.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-18.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-19.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-2.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-20.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-21.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-22.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-23.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-24.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-25.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-26.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-27.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-28.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-29.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-3.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-30.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-31.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-32.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-4.c: Ditto.
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-5.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-6.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-7.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-8.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-9.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-1.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-2.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-3.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-4.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-5.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-6.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-7.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-8.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-1.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-2.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-3.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-4.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-5.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-6.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-7.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-8.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-1.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-10.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-11.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-12.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-13.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-14.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-15.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-16.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-17.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-18.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-19.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-2.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-20.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-21.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-22.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-23.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-24.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-25.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-26.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-27.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-28.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-29.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-3.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-30.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-31.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-32.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-33.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-34.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-35.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-36.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-37.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-38.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-39.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-4.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-40.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-5.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-6.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-7.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-8.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-9.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-1.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-10.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-11.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-12.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-13.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-14.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-15.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-16.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-17.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-18.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-19.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-2.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-20.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-21.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-22.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-23.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-24.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-25.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-26.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-27.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-28.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-29.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-3.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-30.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-31.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-32.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-33.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-34.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-35.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-36.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-37.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-38.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-39.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-4.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-40.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-5.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-6.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-7.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-8.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-9.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-1.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-2.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-3.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-1.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-2.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-3.c: 
Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip-run.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-1.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-2.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-3.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-4.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-5.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-6.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-1.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-2.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-3.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-4.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-5.c: Ditto
            * gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-6.c: Ditto
            * gcc.target/riscv/rvv/autovec/binop/vec_sat_arith.h: Move to...
            * gcc.target/riscv/rvv/autovec/vec_sat_arith.h: ...here.
    
    Signed-off-by: Pan Li <pan2...@intel.com>
    (cherry picked from commit 4ab19e461159989b7fb43e858190adcf480762b7)

Diff:
---
 .../rvv/autovec/binop/{vec_sat_binary.h => vec_sat_binary_vvv_run.h}  | 4 ++--
 .../binop/{vec_sat_binary_scalar.h => vec_sat_binary_vvx_run.h}       | 4 ++--
 .../autovec/binop/{vec_sat_binary_vx.h => vec_sat_binary_vx_run.h}    | 4 ++--
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-1.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-10.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-11.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-12.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-13.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-14.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-15.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-16.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-17.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-18.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-19.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-2.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-20.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-21.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-22.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-23.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-24.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-25.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-26.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-27.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-28.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-29.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-3.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-30.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-31.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-32.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-4.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-5.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-6.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-7.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-8.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-9.c    | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-1.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-10.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-11.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-12.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-13.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-14.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-15.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-16.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-17.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-18.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-19.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-2.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-20.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-21.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-22.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-23.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-24.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-25.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-26.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-27.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-28.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-29.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-3.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-30.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-31.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-32.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-4.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-5.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-6.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-7.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-8.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-9.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-1.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-2.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-3.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-4.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-5.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-6.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-7.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-8.c          | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-1.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-2.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-3.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-4.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-5.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-6.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-7.c      | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-8.c      | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-1.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-10.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-11.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-12.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-13.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-14.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-15.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-16.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-17.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-18.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-19.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-2.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-20.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-21.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-22.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-23.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-24.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-25.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-26.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-27.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-28.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-29.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-3.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-30.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-31.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-32.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-33.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-34.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-35.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-36.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-37.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-38.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-39.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-4.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-40.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-5.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-6.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-7.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-8.c    | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-9.c    | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-1.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-10.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-11.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-12.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-13.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-14.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-15.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-16.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-17.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-18.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-19.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-2.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-20.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-21.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-22.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-23.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-24.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-25.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-26.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-27.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-28.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-29.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-3.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-30.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-31.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-32.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-33.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-34.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-35.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-36.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-37.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-38.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-39.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-4.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-40.c         | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-5.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-6.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-7.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-8.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-9.c          | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-1.c        | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-2.c        | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-3.c        | 2 +-
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-1.c    | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-2.c    | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-3.c    | 4 ++--
 .../gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip-run.c        | 4 ++--
 gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-1.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-2.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-3.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-4.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-5.c   | 2 +-
 gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-6.c   | 2 +-
 .../gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-1.c         | 2 +-
 .../gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-2.c         | 2 +-
 .../gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-3.c         | 2 +-
 .../gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-4.c         | 2 +-
 .../gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-5.c         | 2 +-
 .../gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-6.c         | 2 +-
 .../gcc.target/riscv/rvv/autovec/{binop => }/vec_sat_arith.h          | 0
 184 files changed, 262 insertions(+), 262 deletions(-)

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary.h 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvv_run.h
similarity index 87%
rename from gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary.h
rename to 
gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvv_run.h
index 0976ae978302..a61482af47b7 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvv_run.h
@@ -1,5 +1,5 @@
-#ifndef HAVE_DEFINED_VEC_SAT_BINARY
-#define HAVE_DEFINED_VEC_SAT_BINARY
+#ifndef HAVE_DEFINED_VEC_SAT_BINARY_VVV_RUN_H
+#define HAVE_DEFINED_VEC_SAT_BINARY_VVV_RUN_H
 
 /* To leverage this header files for run test, you need to:
    1. define T as the type, for example uint8_t,
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_scalar.h 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvx_run.h
similarity index 81%
rename from 
gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_scalar.h
rename to 
gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvx_run.h
index c79b180054ee..90a003367347 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_scalar.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vvx_run.h
@@ -1,5 +1,5 @@
-#ifndef HAVE_DEFINED_VEC_SAT_BINARY_SCALAR
-#define HAVE_DEFINED_VEC_SAT_BINARY_SCALAR
+#ifndef HAVE_DEFINED_VEC_SAT_BINARY_VVX_RUN_H
+#define HAVE_DEFINED_VEC_SAT_BINARY_VVX_RUN_H
 
 int
 main ()
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx.h 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx_run.h
similarity index 75%
rename from gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx.h
rename to 
gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx_run.h
index 309d63377d53..10c08e0bd8c2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_binary_vx_run.h
@@ -1,5 +1,5 @@
-#ifndef HAVE_DEFINED_VEC_SAT_BINARY_VX_H
-#define HAVE_DEFINED_VEC_SAT_BINARY_VX_H
+#ifndef HAVE_DEFINED_VEC_SAT_BINARY_VX_RUN_H
+#define HAVE_DEFINED_VEC_SAT_BINARY_VX_RUN_H
 
 int
 main ()
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-1.c
index 6fe84f3945fe..348313b511f4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-1.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-10.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-10.c
index b5dfaafa1eed..425d4c768d6a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-10.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-10.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-11.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-11.c
index 84b55d0b3b61..903ae36e464f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-11.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-11.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-12.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-12.c
index 90332c216bbb..b9db496f2fa8 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-12.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-12.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-13.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-13.c
index 09fdb7295077..c22787b4d94b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-13.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-13.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-14.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-14.c
index b1171cc4de0d..ced40d41c773 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-14.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-14.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-15.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-15.c
index 130eb7840ffa..3c9162ce7008 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-15.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-15.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-16.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-16.c
index 37aefa05a504..f689440030fe 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-16.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-17.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-17.c
index ac5ed050d9b9..3f2c409a5879 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-17.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-17.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_5:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-18.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-18.c
index 52beb95c43b3..5432cdc73def 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-18.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-18.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_5:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-19.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-19.c
index e2d725a51d6d..ee8813f0372a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-19.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-19.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_5:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-2.c
index e9a40e0dcd04..e4f7c64331b4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-2.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-20.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-20.c
index e4fbb586dec9..5f867a2c26fc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-20.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-20.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_5:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-21.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-21.c
index e53c3c9af4c4..2e77b067cf37 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-21.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-21.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-22.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-22.c
index 5fb5f6605c67..2e824049874b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-22.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-22.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-23.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-23.c
index 20927b7c32c8..9283ce340b86 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-23.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-23.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-24.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-24.c
index b898f693e32a..fcf7c9281400 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-24.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-24.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-25.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-25.c
index 24b9b335c329..a5ca9228a20f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-25.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-25.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-26.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-26.c
index 8cdbac7ea2c2..9d379ae46a12 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-26.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-26.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-27.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-27.c
index 89c09bbffde5..7b89fe1c3cfb 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-27.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-27.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-28.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-28.c
index 14b20e87b0e6..f7c37df28885 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-28.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-28.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-29.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-29.c
index e96aa4b85793..fbf57ff16421 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-29.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-29.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_8:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-3.c
index f30000698a2f..a0847c90f3f5 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-3.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-30.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-30.c
index 88be0cd53489..e8b6de3ceb38 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-30.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-30.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_8:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-31.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-31.c
index 07e0149dda94..57f4bf2c4275 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-31.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-31.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_8:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-32.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-32.c
index 3a4c7581a29c..47a3bc1c2f28 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-32.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_8:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-4.c
index 9c9ba2797d04..3556761c430b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-4.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_1:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-5.c
index a46a3c592c24..c89ecea75cc6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-5.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-6.c
index 1ce6e7fd0eb1..0f0f4542fb2e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-6.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint16_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-7.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-7.c
index dff577a21e1b..e0e311d8b5b9 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-7.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint32_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-8.c
index 6fd0f3a9b6c8..b76b231c06ee 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-8.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint64_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-9.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-9.c
index 15266572607e..b13ff0aad8b0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-9.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-9.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_uint8_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-1.c
index 151bc466c72b..0b5c1bc5e3ee 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-10.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-10.c
index 7039830cafaa..4239e93522f0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-10.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-10.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-11.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-11.c
index f5b7957b9b4e..ded6c2e9f053 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-11.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-11.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-12.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-12.c
index a500414a9f53..deadae6807e2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-12.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-12.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-13.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-13.c
index fd7e1af45c99..2872072e26dd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-13.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-13.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-14.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-14.c
index 8896dad831b4..8b49e808b0f2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-14.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-14.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-15.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-15.c
index 1e40fffc6588..08d60569ad70 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-15.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-15.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-16.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-16.c
index 3b39fa318f8b..2039f6c65b33 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-16.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-17.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-17.c
index 17e244d089e3..1dbece4ce81b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-17.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-17.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-18.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-18.c
index 532fa97fe8b5..5eb886d37e68 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-18.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-18.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-19.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-19.c
index b36b4c7d4d18..2077cde09d76 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-19.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-19.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-2.c
index 4d545226b2b0..c23214f19a75 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-2.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-20.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-20.c
index d3b64450dc48..af23da12f8d8 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-20.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-20.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-21.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-21.c
index b5ce31b9b6f9..606741af0c7e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-21.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-21.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-22.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-22.c
index 611281ee77f3..7c6b6a024d6f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-22.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-22.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-23.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-23.c
index b7077567dc3d..6d707e88d156 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-23.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-23.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-24.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-24.c
index 9d8e91892e6d..cf41743310c3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-24.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-24.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-25.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-25.c
index fbce1b6aa010..8ac6eb46f141 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-25.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-25.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-26.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-26.c
index 6562a59ebbb6..949c2df63c19 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-26.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-26.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-27.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-27.c
index b5693802ccc4..0a7159ef9982 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-27.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-27.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-28.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-28.c
index 5b32c97d37e2..bd296e301401 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-28.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-28.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-29.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-29.c
index a8ed9b6e52b8..3998ffcbd12d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-29.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-29.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-3.c
index f1b3a4fc79eb..a61fc4ee5ad3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-3.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-30.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-30.c
index dd8d1a6970c1..29209174aeb9 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-30.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-30.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-31.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-31.c
index a0fe504821cf..925896ab0ad6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-31.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-31.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-32.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-32.c
index 4aa353bea751..56bc2ff8ce18 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-32.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-4.c
index 4768d6283c6b..b11b984b1878 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-4.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-5.c
index aa6ec96d2dbb..5efe06c668b5 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-5.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-6.c
index 3ba88c149e2f..6b58d79c2a1e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-6.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-7.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-7.c
index b1c06efc48c4..714cbf0774d3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-7.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-8.c
index df3b70d9c53d..cacf65efc10a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-8.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-9.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-9.c
index 31919eda7e99..98d226aa7d25 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-9.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add-run-9.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-1.c
index e5350734749d..d7e955ee86e3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-1.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm9_uint8_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-2.c
index 2319f0730a4a..4c301273f127 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-2.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm15_uint16_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-3.c
index bc5d0ef026a9..df2394a4f4e3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-3.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm33_uint32_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-4.c
index 3912dc465c16..549d616a05ec 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-4.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm129_uint64_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-5.c
index d25fdcf78f38..2819d6d13932 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-5.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm9_uint8_t_fmt_2:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-6.c
index e601f686a9d8..a76cb9b8cc65 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-6.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm15_uint16_t_fmt_2:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-7.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-7.c
index 1d41a594b83c..66bfa6cba5af 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-7.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm33_uint32_t_fmt_2:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-8.c
index 9ee356a28e24..a35344fedc82 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-8.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_add_imm129_uint64_t_fmt_2:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-1.c
index 41524753a351..b0d2799b1e0f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint8_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-2.c
index dba87ac07203..3a45cf16ed8e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-2.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint16_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-3.c
index cf96f14b341d..52723ed1dbf3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-3.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint32_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-4.c
index 8ec1f1a40b12..2c76ae216b3b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-4.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint64_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-5.c
index 50037f5e4d10..9cc1eeda82e6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-5.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint8_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-6.c
index 9735a9ab144b..8d6b90c6d4ba 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-6.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint16_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-7.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-7.c
index 44f4ef38d5af..ef0d9fdca0fe 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-7.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint32_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-8.c
index 4309eb4851b8..cb8bf7346181 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_add_imm-run-8.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T uint64_t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-1.c
index ff444ea38621..f0ce17d19591 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-1.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-10.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-10.c
index e1c4020b36d2..b40d004c5615 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-10.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-10.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-11.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-11.c
index cf744ade7c74..cb83e007d03c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-11.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-11.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-12.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-12.c
index c2d7e01ddf03..b9d1b4f406e3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-12.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-12.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-13.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-13.c
index d4d098f06232..503d02064393 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-13.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-13.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-14.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-14.c
index ba274f514dd9..850279db715e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-14.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-14.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-15.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-15.c
index 5b666be33be0..0a6d42315436 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-15.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-15.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-16.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-16.c
index 6830f06945c7..72be3b5187eb 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-16.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_4:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-17.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-17.c
index 8d50f5ff26c0..15e5038212bc 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-17.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-17.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_5:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-18.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-18.c
index a431ded301c7..a1294611f708 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-18.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-18.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_5:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-19.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-19.c
index acc7ef2d4f50..d2ebad7713ed 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-19.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-19.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_5:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-2.c
index 2bde6a23ead0..c73413a4597a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-2.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-20.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-20.c
index d74c09726350..0a755a3f6128 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-20.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-20.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_5:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-21.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-21.c
index 9799a1eb0c7e..f4c1d950080b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-21.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-21.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-22.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-22.c
index bb1eeb42cf97..a0eeb3ed6a3a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-22.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-22.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-23.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-23.c
index 642003cc1188..e758dd019084 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-23.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-23.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-24.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-24.c
index 9bc952957389..f4f9127e4b75 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-24.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-24.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_6:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-25.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-25.c
index 760eb3140bf9..424551e15006 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-25.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-25.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-26.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-26.c
index 158816158127..110318824d86 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-26.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-26.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-27.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-27.c
index 611923bdc064..981c0713c18c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-27.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-27.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-28.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-28.c
index 7fd0a1c24465..159153727132 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-28.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-28.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_7:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-29.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-29.c
index 2af9357948af..9c971f6a3d1e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-29.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-29.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_8:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-3.c
index ab688fcde961..447b6814b8ab 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-3.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-30.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-30.c
index 7c2922be80da..09bcd0d34689 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-30.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-30.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_8:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-31.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-31.c
index 4be50b94f271..704f560b79ad 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-31.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-31.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_8:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-32.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-32.c
index 28f05dca93ba..8011f6c19ccf 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-32.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_8:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-33.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-33.c
index 3478bb6ebc2c..2c66b5abf16a 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-33.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-33.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_9:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-34.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-34.c
index a52939535352..84212c7100a9 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-34.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-34.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_9:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-35.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-35.c
index 69b2a60ea7e2..8eb4712917ef 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-35.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-35.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_9:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-36.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-36.c
index 86c60cdbd442..4c6064d1892c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-36.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-36.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_9:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-37.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-37.c
index d58da2abd765..f9646bea88e8 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-37.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-37.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_10:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-38.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-38.c
index a8ec4f6548c4..5502d7f649d4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-38.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-38.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_10:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-39.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-39.c
index 0bb1b46e3193..c429af3f2b26 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-39.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-39.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_10:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-4.c
index 8bcca4fa474e..5eca3debeaf2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-4.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-40.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-40.c
index d75c101a6beb..091edb624bed 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-40.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-40.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_10:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-5.c
index b05f3ad14ee1..942d2e91acc1 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-5.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-6.c
index 251a53323506..c27fc4d53312 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-6.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-7.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-7.c
index 23fc3dcb1fd2..817435955a5f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-7.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint32_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-8.c
index 9ad3f327ed73..42cf16f13b06 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-8.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint64_t_fmt_2:
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-9.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-9.c
index 5075a535dd17..13034682d883 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-9.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-9.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint8_t_fmt_3:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-1.c
index b6c48388cf82..ea7a537f0ee0 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-10.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-10.c
index d827c6be73bf..7a9d5d0c3731 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-10.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-10.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-11.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-11.c
index 1f99d0d7b217..a1e4be2746ed 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-11.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-11.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-12.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-12.c
index a9ad03c3898d..a55e1c489de3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-12.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-12.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-13.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-13.c
index b56115d55b3f..4bbf15ce99eb 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-13.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-13.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-14.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-14.c
index 220007dc6fce..50f9aeb55dd2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-14.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-14.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-15.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-15.c
index 5876148784c5..66b500849394 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-15.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-15.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-16.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-16.c
index 468193932bfd..90c779851896 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-16.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-16.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-17.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-17.c
index 12207ad7f52b..92044005487b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-17.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-17.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-18.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-18.c
index 9614f42417a9..9926a6f8498f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-18.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-18.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-19.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-19.c
index cbaf2b142790..3aef3cf2882c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-19.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-19.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-2.c
index 18b53fd2df94..1288c619be0d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-2.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-20.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-20.c
index e1c59a977f0d..969421185091 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-20.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-20.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-21.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-21.c
index aec82f86376d..1d3f2ca165f3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-21.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-21.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-22.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-22.c
index bd5c7d206b45..c4e933bca14b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-22.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-22.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-23.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-23.c
index f5a1d6bd9304..4930eb10dfa7 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-23.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-23.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-24.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-24.c
index 62c54a21e6fa..0b0f38f4534e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-24.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-24.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-25.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-25.c
index b5bc00195a1f..56decee10269 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-25.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-25.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-26.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-26.c
index 4446e150493e..4e49247fe415 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-26.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-26.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-27.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-27.c
index dd725a5c8ffb..ea4be4a151db 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-27.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-27.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-28.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-28.c
index 6baf65bea18e..f44fb7ac5119 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-28.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-28.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-29.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-29.c
index b828e95b8a1a..ab3e9455e119 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-29.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-29.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-3.c
index 527a95b9a9f9..f584c2dc3680 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-3.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-30.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-30.c
index 232f78d35441..66110a4cb363 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-30.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-30.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-31.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-31.c
index 03355327c6d0..bae4e85ba8b4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-31.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-31.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-32.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-32.c
index f8872ca521b1..d3924bf35cb6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-32.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-33.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-33.c
index e8f38813cabd..0f20e4680543 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-33.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-33.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-34.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-34.c
index 346e1df39f3e..dbfcd8bfc7f6 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-34.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-34.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-35.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-35.c
index 587a36a93f04..636ba08af9cd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-35.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-35.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-36.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-36.c
index 84a71050e813..ccf40875d2e4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-36.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-36.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-37.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-37.c
index ba5642aa2047..cabf501631b5 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-37.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-37.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-38.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-38.c
index bdb1ca3bbb0f..3856cb0439b9 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-38.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-38.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-39.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-39.c
index 10ec04f2ad32..5c4683ee8a0c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-39.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-39.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-4.c
index b78fd824acd5..e469cf2e98d8 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-4.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-40.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-40.c
index f6a1277225ae..8436c6482c39 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-40.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-40.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-5.c
index cf72540feee6..1c0a6734b5e4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-5.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-6.c
index e4e0c5671797..8aac5656adfe 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-6.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint16_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-7.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-7.c
index 833ec62f3c56..4b88f778f212 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-7.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-7.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint32_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-8.c
index fea1629609e1..d4df48df111e 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-8.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-8.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint64_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-9.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-9.c
index d87d48b4e941..248a8052b7c7 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-9.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub-run-9.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define T                  uint8_t
 #define N                  16
@@ -72,4 +72,4 @@ T test_data[][3][N] = {
   },
 };
 
-#include "vec_sat_binary.h"
+#include "vec_sat_binary_vvv_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-1.c
index 1e380657d744..ab2287032d6b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-1.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_trunc_uint8_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-2.c
index d7b8931f0ec6..2c752e722586 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-2.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_trunc_uint16_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-3.c
index edf42a1f776c..7f89d7099b07 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-3.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_trunc_uint32_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-1.c
index 324648e6e315..d85a78366a4e 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-1.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define OUT_T              uint8_t
 #define IN_T               uint16_t
@@ -71,4 +71,4 @@ IN_T op_2_data[] = {
   257,
 };
 
-#include "vec_sat_binary_scalar.h"
+#include "vec_sat_binary_vvx_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-2.c
index a9bf1dddf984..9652c92a9336 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-2.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-2.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define OUT_T              uint16_t
 #define IN_T               uint32_t
@@ -71,4 +71,4 @@ IN_T op_2_data[] = {
   65539,
 };
 
-#include "vec_sat_binary_scalar.h"
+#include "vec_sat_binary_vvx_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-3.c
index 1ea7467e8a65..d73cfa24a69a 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-3.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_trunc-run-3.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 #define OUT_T              uint32_t
 #define IN_T               uint64_t
@@ -71,4 +71,4 @@ IN_T op_2_data[] = {
   4294967303,
 };
 
-#include "vec_sat_binary_scalar.h"
+#include "vec_sat_binary_vvx_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip-run.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip-run.c
index 456d99a8d5eb..63d2391a63ea 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip-run.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip-run.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint16_t
@@ -13,4 +13,4 @@ DEF_VEC_SAT_U_SUB_ZIP_WRAP(T1, T2)
 #define T                       TEST_ZIP_STRUCT_DECL(T1, T2)
 #define RUN_BINARY_VX(x, b, N)  RUN_VEC_SAT_U_SUB_FMT_ZIP_WRAP(T1, T2, x, b, N)
 
-#include "vec_sat_binary_vx.h"
+#include "vec_sat_binary_vx_run.h"
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip.c
index cd9ea0e1c762..29b32f34b46c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_u_sub_zip.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_sub_uint16_t_uint32_t_fmt_zip:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-1.c
index dc9653947fc1..7f047f3f6a2b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-1.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_trunc_uint8_t_uint16_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-2.c
index 03c1d7091941..f1b1cc7e5d94 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-2.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_trunc_uint8_t_uint32_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-3.c
index 291dd0512fd5..30e4a15eca0c 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-3.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_trunc_uint8_t_uint64_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-4.c
index a3192bf0d760..89dd65374a55 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-4.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_trunc_uint16_t_uint32_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-5.c
index b85276175bc3..851a20e5037b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-5.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_trunc_uint16_t_uint64_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-6.c
index 65b5ad3c219c..8ae3bc243cd3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-6.c
@@ -3,7 +3,7 @@
 /* { dg-skip-if "" { *-*-* } { "-flto" } } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 
 /*
 ** vec_sat_u_trunc_uint32_t_uint64_t_fmt_1:
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-1.c
index cd896e2eb077..4e387d89019d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint8_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-2.c
index 96272ca2943b..a51ad60ebbb4 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-2.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint8_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-3.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-3.c
index 671bbebf3638..90a12c9275ef 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-3.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-3.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint8_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-4.c
index c7df27be15fe..3e7a7eda2dbb 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-4.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-4.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint16_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-5.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-5.c
index c9067a1bcd0c..ffb9e6fe3225 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-5.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-5.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint16_t
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-6.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-6.c
index 51d76be67431..82396f538773 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-6.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/unop/vec_sat_u_trunc-run-6.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { riscv_v } } } */
 /* { dg-additional-options "-std=c99" } */
 
-#include "../binop/vec_sat_arith.h"
+#include "../vec_sat_arith.h"
 #include "vec_sat_data.h"
 
 #define T1 uint32_t
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_arith.h 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vec_sat_arith.h
similarity index 100%
rename from gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/vec_sat_arith.h
rename to gcc/testsuite/gcc.target/riscv/rvv/autovec/vec_sat_arith.h

Reply via email to