diff mbox series

[v1,1/6] RISC-V: Refine unsigned SAT_ADD testcase dump check to tree optimized

Message ID 20241208013230.3579529-1-pan2.li@intel.com
State New
Headers show
Series [v1,1/6] RISC-V: Refine unsigned SAT_ADD testcase dump check to tree optimized | expand

Commit Message

Li, Pan2 Dec. 8, 2024, 1:32 a.m. UTC 
From: Pan Li <pan2.li@intel.com>

The sat alu related testcase check the rtl dump for the standard name
like .SAT_ADD exist or not.  But the rtl pass expand is somehow
impressionable by the middle-end change or debug information.  Like
below new appearance recently.

Replacing Expressions
_5 replace with --> _5 = .SAT_ADD (x_3(D), y_4(D)); [tail call]

After that we need to adjust the dump check time and again.  This
patch would like to switch to tree optimized pass for the standard
name check, which is more stable up to a point.

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_u_add-1-u16.c: Take tree-optimized
	pass for standard name check, and adjust the times.
	* 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>
---
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u16.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u32.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u64.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-1-u8.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u16.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u32.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u64.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-2-u8.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u16.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u32.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u64.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-3-u8.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u16.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u32.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u64.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-4-u8.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u16.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u32.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u64.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-5-u8.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u16.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u32.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u64.c          | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add-6-u8.c           | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u16.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u32.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u64.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-1-u8.c       | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u16.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u32.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u64.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-2-u8.c       | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u16.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u32.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u64.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-3-u8.c       | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u16.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u32.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u64.c      | 4 ++--
 gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm-4-u8.c       | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c        | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c         | 4 ++--
 .../gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c         | 4 ++--
 100 files changed, 200 insertions(+), 200 deletions(-)
diff mbox series

Patch

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 724995cd19f..3c916bcb995 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_1(uint16_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 4a7a0e64494..edded3ebc0e 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_1(uint32_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 87cf441399e..821e4bc5afe 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_1(uint64_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 b46e590534b..fd73c3a5f7a 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_1(uint8_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 9293234fbfa..a166d2888bb 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_2(uint16_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 0750f7cd818..c06731b130c 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_2(uint32_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 4a90977d12c..ae10dffb53f 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_2(uint64_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 923f057d44a..f3977be6edd 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_2(uint8_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 fad4d51e79b..5898c3b75de 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_3(uint16_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 4a6f81950b0..a1017c9c0a4 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_3(uint32_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 f1b9a2cf117..83fcb602a8b 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_3(uint64_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 b7256bd97c3..2c398e0c1f7 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_3(uint8_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 c243cb2abd6..c18a5d5939a 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_4(uint16_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 cdf7ccbaf86..fa2e55dc4cc 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_4(uint32_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 296a742f9aa..6818c0c2059 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_4(uint64_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 fc2e331f12f..1096de849f0 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_4(uint8_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 065243ffd6d..fd4be5c4628 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_5(uint16_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 266e44505d2..4fbc80780c5 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_5(uint32_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 8ea5ec67b7f..5bc29487442 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_5(uint64_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 618d4240b19..74109c3b504 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_5(uint8_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 54ff195ef57..3cb9cbe7895 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_6(uint16_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 484c699aa70..fd1cb1ae33f 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_6(uint32_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 d5db1e4d69c..c968f3358ed 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_6(uint64_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 2af09c5510f..9cd95ad6337 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_FMT_6(uint8_t)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 89b41bf3f99..3c31ac3b650 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_1(uint16_t, 3)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 405d16724f2..c6b352c21e4 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_1(uint32_t, 7)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 20579a1e1b2..1d9df3c3045 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_1(uint64_t, 8)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 64f479d8010..101acd88d38 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_1(uint8_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 aa15bf117b6..ac57cc92fe4 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_2(uint16_t, 3)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 9a78e8b0bc5..6aca60ca709 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_2(uint32_t, 7)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 f302dae3c2c..d0417243ff0 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_2(uint64_t, 8)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 e81349e1e2d..7baeb8d603d 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_2(uint8_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 a6ab96ee502..6dbabf6f514 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_3(uint16_t, 3)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 19333eee71d..1c52b219cef 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_3(uint32_t, 7u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 a34a55575bd..ef60ce24ec8 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_3(uint64_t, 8ull)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 f0807844f6c..81a4b217af6 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_3(uint8_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 ca71c86b61d..2f6c04601f3 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -18,4 +18,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_4(uint16_t, 3)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 d9054c77c80..1fc9a50a8a2 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -19,4 +19,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_4(uint32_t, 7u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 4e12def14d5..0ca423c0f01 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -14,4 +14,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_4(uint64_t, 8ull)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 da84594bbdf..c8a43fa2c5a 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,5 +1,5 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized -fno-schedule-insns -fno-schedule-insns2" } */
 /* { dg-final { check-function-bodies "**" "" } } */
 
 #include "sat_arith.h"
@@ -16,4 +16,4 @@ 
 */
 DEF_SAT_U_ADD_IMM_FMT_4(uint8_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 8dae49353f1..6104bc5dd88 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 e5b0aedea14..aa02dcb5325 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, 52767)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 16e6a3b099d..08f1e327fc3 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, 65534u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 a6b3b9a8152..7464e7f5732 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, -3)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 d45ae94e61a..813804fe833 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, 65549)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 f35ada1f1fa..76674c7674e 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, 67732u)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 6d2976e2e61..92db9bf359d 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, 91)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 87c4ecf2094..cbf6c550ae0 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, 2147483644u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 e1d25f634b8..0393d2b3be0 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, 2147483944)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 9f898660a28..27427e63816 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, 4294967293u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 a66f42813ad..a6f0fa74e12 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, -3433)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 6c6f67dc2d2..8b0c8e358e1 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, 126u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 b53684fd59d..90d73b9f530 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, 4294967342ll)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 174091a420e..85a70bcba61 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint32_t, 4994967342ull)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 5a83e0449e2..a7e4249e4b4 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint64_t, 439)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 873fe3fd265..8b3ab81c36d 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint64_t, 576460752303423482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 3f00dc93da0..018d701c18b 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint64_t, 576460752303483482)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 6f5a73d07f0..8dab7c94dc9 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,9 +1,9 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint64_t, 976460752303483482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
 
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 e78da01ac73..ee571fe07ed 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint64_t, -39294)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 e02dd59a80e..4e75190f953 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 d2d8bf4805c..ce67a95f916 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, 126u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 428334fe413..5504e4330de 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, 129)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 c34de86f705..5e5c43ddfac 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, 129)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 70b3d7e30cf..5cf2463a703 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, 254u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 3bc849cd333..4313a5631d1 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, -3)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 f05c8361541..0f39ed5e332 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, 267)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 f2df78756ef..aad0b653244 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint8_t, 287u)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 36e66d4aa2f..4908a4927d8 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 f47c77cdc4f..540b301e2b7 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, 32767u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 00fe0c9573d..2cd1ad848df 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, 52767)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 3c8d5cae216..4115269fddb 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, 65534u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 89c732172ef..b21213b1b92 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, -3)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 ba50deb053f..a043940e172 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, 65549)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 739e8b872eb..6144e471043 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, 254u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 dff605dbbdb..5b139e0ec14 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint16_t, 67732u)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 79e1d413ab1..14569f4ecba 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, 91)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 99a8a4837d0..d0c4c663fae 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, 2147483644u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 dd18b2f15a0..56b8147af2d 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, 2147483944)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 41f3103d0a6..59371eb1aa3 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, 4294967293u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 dc98ebe1719..739dc70148f 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, -3433)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 7391d0931cc..52d3ee6608f 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, 4294967342ll)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 96c59ff7e4b..5e4995f144b 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint32_t, 4994967342ull)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 875f75d47ca..cabc1d454d2 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint64_t, 439)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 3613d433f61..b1cb34d5f69 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint64_t, 576460752303423482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 203408c5320..8402a5481c7 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, -3)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 2f7254ccce5..f842b8252bd 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint64_t, 576460752303483482)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 6e6e9a4b623..6b47656011a 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,9 +1,9 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint64_t, 976460752303483482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
 
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 247467ccbc4..e559fce4f48 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_2(uint64_t, -39294)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 a2d1be6e860..9b3c9f2547d 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -15,4 +15,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_1 (6, uint32_t, -62)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_1 (7, uint32_t, 4294967342ll)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_1 (8, uint32_t, 4394967342ull)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 edd1bfda75b..ef92f0e57c8 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -24,4 +24,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_1 (14, uint64_t, 576460752303483482)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_1 (15, uint64_t, 576460752303423482u)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_1 (16, uint64_t, 976460752303483482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_SUB " 34 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_SUB " 17 "optimized" } } */
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 9fc436c0991..004b8a2b820 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -15,4 +15,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_2 (6, uint32_t, -62)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_2 (7, uint32_t, 4294967342ll)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_2 (8, uint32_t, 4394967342ull)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 6643111fa91..f08c6003ce5 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -24,4 +24,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_2 (14, uint64_t, 576460752303483482)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_2 (15, uint64_t, 576460752303423482u)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_2 (16, uint64_t, 976460752303483482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_SUB " 34 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_SUB " 17 "optimized" } } */
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 16d7b331726..2eb46aa4763 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -15,4 +15,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_3 (6, uint32_t, -62l)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_3 (7, uint32_t, 6294967342ll)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_3 (8, uint32_t, 4394967342ull)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 75a7360f156..71f27ae72b2 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -24,4 +24,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_3 (14, uint64_t, 576460752303483482)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_3 (15, uint64_t, 576460752303423482u)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_3 (16, uint64_t, 976460752303483482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_SUB " 34 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_SUB " 17 "optimized" } } */
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 615fd0d72d3..5b23cb75f7d 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -15,4 +15,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_4 (6, uint32_t, -62l)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_4 (7, uint32_t, 4294967342ll)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_4 (8, uint32_t, 4394967342ull)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 28bb23534e2..087cbfc089b 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, 267)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 93d781750e0..ab8ee54fe79 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 -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
@@ -24,4 +24,4 @@  DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_4 (14, uint64_t, 576460752303483482)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_4 (15, uint64_t, 576460752303423482u)
 DEF_SAT_U_SUB_IMM_TYPE_CHECK_FMT_4 (16, uint64_t, 976460752303483482u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_SUB " 34 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_SUB " 17 "optimized" } } */
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 0a1a977a73a..d8e3b08c1bb 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint8_t, 287u)
 
-/* { dg-final { scan-rtl-dump-not ".SAT_ADD " "expand" } } */
+/* { dg-final { scan-tree-dump-not ".SAT_ADD " "optimized" } } */
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 34cf91db73e..357f9c34fed 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, 9)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */
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 2f4f27fc98e..2e67ae9cf29 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,8 +1,8 @@ 
 /* { dg-do compile } */
-/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-rtl-expand-details" } */
+/* { dg-options "-march=rv64gc -mabi=lp64d -fdump-tree-optimized" } */
 
 #include "sat_arith.h"
 
 DEF_SAT_U_ADD_IMM_TYPE_CHECK_FMT_1(uint16_t, 32767u)
 
-/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */
+/* { dg-final { scan-tree-dump-times ".SAT_ADD " 1 "optimized" } } */