From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id 9A5B3385841A; Fri, 14 Jul 2023 02:43:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9A5B3385841A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689302616; bh=IExd3NaK/Tu04vVDwWuV4TyIkcA6pXXyvD80Jabwr+E=; h=From:To:Subject:Date:From; b=eXuc6H9jOmm5QDZI5xzj9g0HkPlTQ7dsKSXlkFepBL0aQO1R2zYRj+gHhTtaTvlz4 UYtsqfVfojVkzGq5nun9JKJ3oSnBSQVZdCZ85aQ8tXg6LhuSbS3v10omNo5H4e2A1I pti4XcQbOAkaEXfLTWUDLuPmj+2Wh255aw/iSM7o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jeff Law To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] [RISC-V] correct machine mode in save-restore cfi RTL. X-Act-Checkin: gcc X-Git-Author: Fei Gao X-Git-Refname: refs/vendors/riscv/heads/gcc-13-with-riscv-opts X-Git-Oldrev: d7b74d90175dcec066406bc93b0022b08a4f1145 X-Git-Newrev: f3d3fc0623b956ea1a0f64bc73bbfecfd4bf6935 Message-Id: <20230714024336.9A5B3385841A@sourceware.org> Date: Fri, 14 Jul 2023 02:43:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:f3d3fc0623b956ea1a0f64bc73bbfecfd4bf6935 commit f3d3fc0623b956ea1a0f64bc73bbfecfd4bf6935 Author: Fei Gao Date: Mon Jun 5 20:09:03 2023 -0600 [RISC-V] correct machine mode in save-restore cfi RTL. gcc/ChangeLog: * config/riscv/riscv.cc (riscv_adjust_libcall_cfi_prologue): Use Pmode for cfi reg/mem machmode (riscv_adjust_libcall_cfi_epilogue): Use Pmode for cfi reg machmode gcc/testsuite/ChangeLog: * gcc.target/riscv/save-restore-cfi-2.c: New test to check machmode for cfi reg/mem. Diff: --- gcc/config/riscv/riscv.cc | 10 +++++----- gcc/testsuite/gcc.target/riscv/save-restore-cfi-2.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index caa7858b864..3954c89a039 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -5370,10 +5370,10 @@ riscv_adjust_libcall_cfi_prologue () else offset = saved_size - ((regno - S2_REGNUM + 4) * UNITS_PER_WORD); - reg = gen_rtx_REG (SImode, regno); - mem = gen_frame_mem (SImode, plus_constant (Pmode, - stack_pointer_rtx, - offset)); + reg = gen_rtx_REG (Pmode, regno); + mem = gen_frame_mem (Pmode, plus_constant (Pmode, + stack_pointer_rtx, + offset)); insn = gen_rtx_SET (mem, reg); dwarf = alloc_reg_note (REG_CFA_OFFSET, insn, dwarf); @@ -5510,7 +5510,7 @@ riscv_adjust_libcall_cfi_epilogue () for (int regno = GP_REG_FIRST; regno <= GP_REG_LAST; regno++) if (BITSET_P (cfun->machine->frame.mask, regno - GP_REG_FIRST)) { - reg = gen_rtx_REG (SImode, regno); + reg = gen_rtx_REG (Pmode, regno); dwarf = alloc_reg_note (REG_CFA_RESTORE, reg, dwarf); } diff --git a/gcc/testsuite/gcc.target/riscv/save-restore-cfi-2.c b/gcc/testsuite/gcc.target/riscv/save-restore-cfi-2.c new file mode 100644 index 00000000000..44d805b4de8 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/save-restore-cfi-2.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-fdump-rtl-pro_and_epilogue -O2 -march=rv64gc -mabi=lp64d -msave-restore -mcmodel=medany" } */ +/* { dg-skip-if "" { *-*-* } {"-Os" "-O1" "-O0" "-Og" "-O3" "-Oz" "-flto"} } */ +/* { dg-final { scan-rtl-dump {expr_list:REG_CFA_OFFSET \(set \(mem/c:DI} "pro_and_epilogue" } } */ +/* { dg-final { scan-rtl-dump {expr_list:REG_CFA_RESTORE \(reg:DI 8 s0\)} "pro_and_epilogue" } } */ + +char my_getchar(); +float getf(); + +int foo() +{ + int s0 = my_getchar(); + float f0 = getf(); + int b = my_getchar(); + return f0 + s0 + b; +}