https://gcc.gnu.org/g:0404fd56aeae56ba9bbe50d3fe8e2911d4079f7b
commit r15-6032-g0404fd56aeae56ba9bbe50d3fe8e2911d4079f7b
Author: Pan Li <pan2...@intel.com>
Date: Sun Dec 8 09:32:25 2024 +0800
RISC-V: Refine unsigned SAT_ADD testcase dump check to tree optimized
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...@intel.com>
Diff:
---
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/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-1.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-10.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-11.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-12.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-13.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-14.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-15.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-16.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-17.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-18.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-19.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-2.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-20.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-21.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-22.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-23.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-24.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-25.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-26.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-27.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-28.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-29.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-3.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-30.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-31.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-32.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-33.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-34.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-35.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-36.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-37.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-38.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-39.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-4.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-40.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-41.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-42.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-43.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-44.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-45.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-46.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-47.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-48.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-49.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-5.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-50.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-51.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-52.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-53.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-54.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-55.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-56.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-57.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-58.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-59.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-6.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-60.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-7.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-8.c | 4 ++--
gcc/testsuite/gcc.target/riscv/sat/sat_u_add_imm_type_check-9.c | 4 ++--
100 files changed, 200 insertions(+), 200 deletions(-)
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 724995cd19fd..3c916bcb9950 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 4a7a0e64494f..edded3ebc0e8 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 87cf441399ec..821e4bc5afea 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 b46e590534b1..fd73c3a5f7a7 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 9293234fbfa0..a166d2888bb7 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 0750f7cd818a..c06731b130ce 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 4a90977d12c2..ae10dffb53f2 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 923f057d44a9..f3977be6edd1 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 fad4d51e79b0..5898c3b75de7 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 4a6f81950b09..a1017c9c0a4d 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 f1b9a2cf1179..83fcb602a8ba 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 b7256bd97c31..2c398e0c1f77 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 c243cb2abd64..c18a5d5939ac 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 cdf7ccbaf864..fa2e55dc4ccd 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 296a742f9aaf..6818c0c2059a 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 fc2e331f12f2..1096de849f00 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 065243ffd6d5..fd4be5c46284 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 266e44505d22..4fbc80780c59 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 8ea5ec67b7f7..5bc29487442a 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 618d4240b191..74109c3b5042 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 54ff195ef573..3cb9cbe7895d 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 484c699aa708..fd1cb1ae33f8 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 d5db1e4d69c2..c968f3358ed0 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 2af09c5510fe..9cd95ad6337d 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 89b41bf3f996..3c31ac3b650d 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 405d16724f25..c6b352c21e48 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 20579a1e1b25..1d9df3c3045c 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 64f479d8010c..101acd88d38c 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 aa15bf117b60..ac57cc92fe49 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 9a78e8b0bc50..6aca60ca7096 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 f302dae3c2c4..d0417243ff0a 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 e81349e1e2d8..7baeb8d603d1 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 a6ab96ee502d..6dbabf6f5143 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 19333eee71da..1c52b219cef0 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 a34a55575bdc..ef60ce24ec82 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 f0807844f6ce..81a4b217af62 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 ca71c86b61de..2f6c04601f3c 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 d9054c77c804..1fc9a50a8a2a 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 4e12def14d5e..0ca423c0f01f 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 da84594bbdf5..c8a43fa2c5a6 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 8dae49353f19..6104bc5dd882 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 e5b0aedea148..aa02dcb53251 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 16e6a3b099d2..08f1e327fc3c 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 a6b3b9a8152e..7464e7f57328 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 d45ae94e61a0..813804fe8331 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 f35ada1f1fae..76674c7674ec 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 6d2976e2e612..92db9bf359d6 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 87c4ecf20942..cbf6c550ae0f 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 e1d25f634b8a..0393d2b3be07 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 9f898660a28a..27427e63816c 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 a66f42813adb..a6f0fa74e129 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 6c6f67dc2d28..8b0c8e358e16 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 b53684fd59dd..90d73b9f5303 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 174091a420ec..85a70bcba61f 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 5a83e0449e2e..a7e4249e4b45 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 873fe3fd265b..8b3ab81c36dc 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 3f00dc93da06..018d701c18be 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 6f5a73d07f06..8dab7c94dc9e 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 e78da01ac73a..ee571fe07edc 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 e02dd59a80ef..4e75190f9538 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 d2d8bf4805cb..ce67a95f9166 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 428334fe413e..5504e4330de7 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 c34de86f7059..5e5c43ddfac9 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 70b3d7e30cf4..5cf2463a7031 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 3bc849cd3336..4313a5631d12 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 f05c83615418..0f39ed5e332c 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 f2df78756ef5..aad0b6532441 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 36e66d4aa2f1..4908a4927d83 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 f47c77cdc4ff..540b301e2b7b 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 00fe0c9573d6..2cd1ad848df5 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 3c8d5cae2164..4115269fddb5 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 89c732172efd..b21213b1b929 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 ba50deb053f5..a043940e1726 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 739e8b872eb4..6144e4710437 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 dff605dbbdb6..5b139e0ec144 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 79e1d413ab14..14569f4ecbae 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 99a8a4837d02..d0c4c663fae9 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 dd18b2f15a03..56b8147af2db 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 41f3103d0a60..59371eb1aa31 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 dc98ebe17195..739dc70148f1 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 7391d0931cce..52d3ee6608fa 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 96c59ff7e4b9..5e4995f144be 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 875f75d47ca8..cabc1d454d24 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 3613d433f61d..b1cb34d5f697 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 203408c53206..8402a5481c71 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 2f7254ccce59..f842b8252bd5 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 6e6e9a4b623d..6b47656011a9 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 247467ccbc4a..e559fce4f48c 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 a2d1be6e860f..9b3c9f2547d2 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 edd1bfda75b9..ef92f0e57c87 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 9fc436c09916..004b8a2b820d 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 6643111fa91e..f08c6003ce54 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 16d7b3317267..2eb46aa47633 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 75a7360f1569..71f27ae72b26 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 615fd0d72d32..5b23cb75f7df 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 28bb23534e20..087cbfc089bc 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 93d781750e05..ab8ee54fe79a 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 0a1a977a73a4..d8e3b08c1bb7 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 34cf91db73e4..357f9c34fedc 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 2f4f27fc98e6..2e67ae9cf297 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" } } */
