[gcc r15-5312] RISC-V: Remove unnecessary option for scalar SAT_ADD testcase

[Pan Li via Gcc-cvs]

https://gcc.gnu.org/g:9676da9fc26c9be62a1e862b29165177aa95120f

commit r15-5312-g9676da9fc26c9be62a1e862b29165177aa95120f
Author: Pan Li <pan2...@intel.com>
Date:   Fri Nov 15 15:05:58 2024 +0800

    RISC-V: Remove unnecessary option for scalar SAT_ADD testcase
    
    After we create a isolated folder to hold all SAT scalar test,
    we have fully control of what optimization options passing to
    the testcase.  Thus, it is better to remove the unnecessary
    work around for flto option, as well as the -O3 option for
    each cases.  The riscv.exp will pass sorts of different optimization
    options for each case.
    
    The below test suites are passed for this patch.
    * The rv64gcv fully regression test.
    
    It is test only patch and obvious up to a point, will commit it
    directly if no comments in next 48H.
    
    gcc/testsuite/ChangeLog:
    
            * gcc.target/riscv/sat/sat_s_add-1-i16.c: Remove flto
            dg-skip workaround and -O3 option.
            * gcc.target/riscv/sat/sat_s_add-1-i32.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-1-i64.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-1-i8.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-2-i16.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-2-i32.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-2-i64.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-2-i8.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-3-i16.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-3-i32.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-3-i64.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-3-i8.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-4-i16.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-4-i32.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-4-i64.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add-4-i8.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-1-1.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-1.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-2-1.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-2.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-3-1.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-3.c: Ditto.
            * gcc.target/riscv/sat/sat_s_add_imm-4.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-1-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-1-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-1-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-1-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-2-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-2-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-2-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-2-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-3-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-3-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-3-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-3-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-4-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-4-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-4-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-4-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-5-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-5-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-5-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-5-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-6-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-6-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-6-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add-6-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-1-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-1-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-1-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-1-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-2-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-2-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-2-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-2-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-3-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-3-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-3-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-3-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-4-u16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-4-u32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-4-u64.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm-4-u8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c: Ditto.
            * gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c: Ditto.
    
    Signed-off-by: Pan Li <pan2...@intel.com>
    Signed-off-by: Pan Li <pan2...@intel.com>

Diff:
---
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1-1.c           | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2-1.c           | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3-1.c           | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-4.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u16.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u32.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u64.c             | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u8.c              | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u16.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u32.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u64.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u8.c          | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u16.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u32.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u64.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u8.c          | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u16.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u32.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u64.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u8.c          | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u16.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u32.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u64.c         | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u8.c          | 3 +--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c  | 2 +-
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c  | 2 +-
 123 files changed, 123 insertions(+), 186 deletions(-)

diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i16.c
index 257229804824..24832c7435d9 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i32.c
index 8f5a5ef55307..ea0a757cff82 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i64.c
index 676e93c43daf..85c0087d7d0d 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i8.c
index 37cc58eebf88..3941829543ed 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-1-i8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i16.c
index 987ba15eb470..acbc50e5396e 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i32.c
index 2d5dc97e3264..af22c34ca15a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i64.c
index 1246860a1500..2bb929385f2a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i8.c
index 707deaaa3466..76f318b4ec12 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-2-i8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i16.c
index ac5580291ecb..2abeb033a217 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i32.c
index 093390dbd402..e5c74e5f84bf 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i64.c
index 04e3a0a72dca..017efeda1db4 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i8.c
index 98b6798a5a68..8ced9e2592df 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-3-i8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i16.c
index 984e4463545f..5fdbd135d4b9 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i32.c
index 92f340210175..6fe98578f501 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i64.c
index 6fb958e2e33c..dd4d3e801212 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i8.c
index 2c12514ec059..eef05807a112 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add-4-i8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1-1.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1-1.c
index f20f9b0c477c..a54bb94717df 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1-1.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1-1.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1.c
index 6746caf02f6b..154992b6a14f 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-1.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2-1.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2-1.c
index 3d31d0142f2d..960766f4383c 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2-1.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2-1.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2.c
index eb3127b85407..ebcfedd790a1 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-2.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3-1.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3-1.c
index 1735a8b54678..9a6254b77323 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3-1.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3-1.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3.c
index 83ed30128e14..371ba4729550 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-3.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-4.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-4.c
index df25cc68a053..27320b550b2a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-4.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_s_add_imm-4.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u16.c
index 0a4f6fc47916..724995cd19fd 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -O3 -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u32.c
index cb93d4498152..4a7a0e64494f 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u64.c
index a95c4b314b83..87cf441399ec 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u8.c
index 6530f374e86f..b46e590534b1 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u16.c
index 6f02547c5e2c..9293234fbfa0 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u32.c
index 420c194375d4..0750f7cd818a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u64.c
index 8a9cf7b7070d..4a90977d12c2 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u8.c
index 250b45f00fc7..923f057d44a9 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u16.c
index eec5a360d462..fad4d51e79b0 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u32.c
index fa882a5cedd2..4a6f81950b09 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u64.c
index da485fb0857e..f1b9a2cf1179 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u8.c
index a9803908a679..b7256bd97c31 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u16.c
index 60247e9fa1dc..c243cb2abd64 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u32.c
index b903dbab2621..cdf7ccbaf864 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u64.c
index c0b34ddd0ad3..296a742f9aaf 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u8.c
index 5380bf3db5d1..fc2e331f12f2 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u16.c
index b145e6abf15b..065243ffd6d5 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u32.c
index 2390232bc8c9..266e44505d22 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u64.c
index 481cdfd74f9b..8ea5ec67b7f7 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u8.c
index 0ed8c8fd9421..618d4240b191 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u16.c
index 44546d735399..54ff195ef573 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u32.c
index 67c6b228a70e..484c699aa708 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u64.c
index 800aee6e5c02..d5db1e4d69c2 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u8.c
index a1dd30555af2..2af09c5510fe 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u16.c
index 90a4e4a786fd..89b41bf3f996 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u32.c
index e5e0ff6e45bc..405d16724f25 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u64.c
index 9eb373e393da..20579a1e1b25 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u8.c
index 856001f8f4e0..64f479d8010c 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u16.c
index a69a1e215161..aa15bf117b60 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u32.c
index b2f2ffc2ab8b..9a78e8b0bc50 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u64.c
index 6d07d4f26e51..f302dae3c2c4 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u8.c
index 0c4fa94c3975..e81349e1e2d8 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u16.c
index 9089d1e927e8..a6ab96ee502d 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u32.c
index 318cd3fd2e8f..19333eee71da 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u64.c
index 77cd9533de6b..a34a55575bdc 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u8.c
index 04886ff79c96..f0807844f6ce 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u16.c
index 859c5c9a2ce9..ca71c86b61de 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u16.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u32.c
index e04d4d4ee037..d9054c77c804 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u32.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u64.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u64.c
index 73ce397ce3e7..4e12def14d5e 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u64.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u64.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u8.c
index 58e330f181ef..da84594bbdf5 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u8.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if  "" { *-*-* } { "-flto" } } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details 
-fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c
index db4b0be75385..8dae49353f19 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c
index 37ec6e9b7140..e5b0aedea148 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c
index 8dca3b2cb9bd..16e6a3b099d2 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c
index f3cde55242a9..a6b3b9a8152e 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c
index 61834e744525..d45ae94e61a0 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c
index 74e9298361e7..f35ada1f1fae 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c
index f5d60e9a0980..6d2976e2e612 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c
index e7742b30a9a8..87c4ecf20942 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c
index 1437206b1e08..e1d25f634b8a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c
index 4ef47e235663..9f898660a28a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c
index 3df6acf24789..a66f42813adb 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c
index ab69971a4781..6c6f67dc2d28 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c
index b504faf0bacf..b53684fd59dd 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c
index 55e56831d10d..174091a420ec 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c
index fdd686336b66..5a83e0449e2e 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c
index f6e9b6bdc38b..873fe3fd265b 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c
index 1d73286776ee..3f00dc93da06 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c
index 9f8dd6be84c2..6f5a73d07f06 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c
index 988a557e7a3a..e78da01ac73a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c
index 9b14324e6b37..e02dd59a80ef 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c
index 781699c48e2f..d2d8bf4805cb 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c
index 7aa0720218c7..428334fe413e 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c
index ea49c6b9d7f2..c34de86f7059 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c
index 467b9d998232..70b3d7e30cf4 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c
index 6a144a72938f..3bc849cd3336 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c
index 2cc1912e47d1..f05c83615418 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c
index c94716d88eb9..f2df78756ef5 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c
index 9b38133c0154..36e66d4aa2f1 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c
index 4b5c6fa112cc..f47c77cdc4ff 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c
index 903df4937b35..00fe0c9573d6 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c
index ff30c207c23c..3c8d5cae2164 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c
index 45e06e40c0c4..89c732172efd 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c
index 659352e82448..ba50deb053f5 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c
index c9a33edd6294..739e8b872eb4 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c
index a16776a0dbb5..dff605dbbdb6 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c
index edcad091d8f3..79e1d413ab14 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c
index 8d37bba4f2a5..99a8a4837d02 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c
index 5976d6e67e4c..dd18b2f15a03 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c
index f19edb2aa837..41f3103d0a60 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c
index 0a48acaba8c7..dc98ebe17195 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c
index 26d293ea6769..7391d0931cce 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c
index 37bf026ce8f4..96c59ff7e4b9 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c
index f16c68e2ba5f..875f75d47ca8 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c
index ec2b557758e7..3613d433f61d 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c
index 1e21831ad445..203408c53206 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c
index 752ca6f43881..2f7254ccce59 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c
index b9fe726d2d39..6e6e9a4b623d 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c
index f1afecb45723..247467ccbc4a 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c
index c959eeb0d867..a2d1be6e860f 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c
index abc19e22be46..edd1bfda75b9 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c
index e9c3fd51eb10..9fc436c09916 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c
index 3f8e3e1b7d32..6643111fa91e 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c
index 1b193bcfb265..16d7b3317267 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c
index b7dc71b42ee7..75a7360f1569 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c
index 4f2fb307949c..615fd0d72d32 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c
index 037085705517..28bb23534e20 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c
index b32e69ea8591..93d781750e05 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c
index 660635ec7247..0a1a977a73a4 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c
index 38da62def23d..34cf91db73e4 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"
 
diff --git a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c 
b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c
index baf81b4b90df..2f4f27fc98e6 100644
--- a/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c
+++ b/gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
 
 #include "sat_arith.h"