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.li@intel.com>
Signed-off-by: Pan Li <pan2.li@intel.com>

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 2572298..24832c7 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 8f5a5ef..ea0a757 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 676e93c..85c0087 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 37cc58e..3941829 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 987ba15..acbc50e 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 2d5dc97..af22c34 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 1246860..2bb9293 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 707deaa..76f318b 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 ac55802..2abeb03 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 093390d..e5c74e5 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 04e3a0a..017efed 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 98b6798..8ced9e2 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 984e446..5fdbd13 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 92f3402..6fe9857 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 6fb958e..dd4d3e8 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 2c12514..eef0580 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 f20f9b0..a54bb94 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 6746caf..154992b 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 3d31d01..960766f 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 eb3127b..ebcfedd 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 1735a8b..9a6254b 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 83ed301..371ba47 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 df25cc6..27320b5 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 0a4f6fc..724995c 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 cb93d44..4a7a0e6 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 a95c4b3..87cf441 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 6530f37..b46e590 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 6f02547..9293234 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 420c194..0750f7c 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 8a9cf7b..4a90977 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 250b45f..923f057 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 eec5a36..fad4d51 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 fa882a5..4a6f81950 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 da485fb..f1b9a2c 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 a980390..b7256bd 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 60247e9..c243cb2 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 b903dba..cdf7ccb 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 c0b34dd..296a742 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 5380bf3..fc2e331 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 b145e6a..065243f 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 2390232..266e445 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 481cdfd..8ea5ec6 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 0ed8c8f..618d424 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 44546d7..54ff195 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 67c6b22..484c699 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 800aee6..d5db1e4 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 a1dd305..2af09c5 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 90a4e4a..89b41bf 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 e5e0ff6..405d167 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 9eb373e..20579a1 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 856001f..64f479d 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 a69a1e2..aa15bf1 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 b2f2ffc..9a78e8b 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 6d07d4f..f302dae 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 0c4fa94..e81349e 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 9089d1e..a6ab96e 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 318cd3f..19333ee 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 77cd953..a34a555 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 04886ff..f080784 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 859c5c9..ca71c86 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 e04d4d4..d9054c7 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 73ce397..4e12def 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 58e330f..da84594 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 db4b0be..8dae493 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 37ec6e9..e5b0aed 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 8dca3b2c..16e6a3b 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 f3cde55..a6b3b9a 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 61834e7..d45ae94 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 74e9298..f35ada1 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 f5d60e9..6d2976e 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 e7742b3..87c4ecf 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 1437206..e1d25f6 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 4ef47e2..9f89866 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 3df6acf..a66f428 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 ab69971..6c6f67d 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 b504faf..b53684f 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 55e5683..174091a 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 fdd6863..5a83e04 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 f6e9b6b..873fe3f 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 1d73286..3f00dc9 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 9f8dd6b..6f5a73d 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 988a557..e78da01 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 9b14324..e02dd59 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 781699c..d2d8bf4 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 7aa0720..428334f 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 ea49c6b..c34de86 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 467b9d9..70b3d7e 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 6a144a7..3bc849c 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 2cc1912..f05c836 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 c94716d..f2df787 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 9b38133..36e66d4 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 4b5c6fa..f47c77c 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 903df49..00fe0c9 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 ff30c20..3c8d5ca 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 45e06e4..89c7321 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 659352e..ba50deb 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 c9a33ed..739e8b8 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 a16776a..dff605d 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 edcad09..79e1d41 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 8d37bba..99a8a48 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 5976d6e..dd18b2f 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 f19edb2..41f3103 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 0a48aca..dc98ebe 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 26d293e..7391d09 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 37bf026..96c59ff 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 f16c68e..875f75d 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 ec2b557..3613d43 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 1e21831a..203408c 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 752ca6f..2f7254c 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 b9fe726..6e6e9a4 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 f1afecb..247467c 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 c959eeb..a2d1be6 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 abc19e2..edd1bfd 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 e9c3fd5..9fc436c 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 3f8e3e1..6643111 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 1b193bc..16d7b33 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 b7dc71b..75a7360 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 4f2fb30..615fd0d7 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 0370857..28bb235 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 b32e69e..93d7817 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 660635e..0a1a977 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 38da62d..34cf91d 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 baf81b4..2f4f27f 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"