Passed the riscv.exp/rvv.exp in both rv32 and rv64 in PATCH v6 as below. https://gcc.gnu.org/pipermail/gcc-patches/2023-July/625315.html Pan From: Li, Pan2 Sent: Monday, July 24, 2023 9:52 AM To: 'juzhe.zhong@rivai.ai' ; gcc-patches Cc: Kito.cheng ; Wang, Yanzhang Subject: RE: [PATCH v5] RISC-V: Support CALL for RVV floating-point dynamic rounding Thanks Juzhe for reviewing, looks some conflicts with upstream, and will send the PATCH v6 after passed all the tests. Pan From: juzhe.zhong@rivai.ai > Sent: Monday, July 24, 2023 8:54 AM To: Li, Pan2 >; gcc-patches > Cc: Kito.cheng >; Li, Pan2 >; Wang, Yanzhang > Subject: Re: [PATCH v5] RISC-V: Support CALL for RVV floating-point dynamic rounding Overall LGTM from my side. But we should wait for Kito's review. ________________________________ juzhe.zhong@rivai.ai From: pan2.li Date: 2023-07-23 21:11 To: gcc-patches CC: juzhe.zhong; kito.cheng; pan2.li; yanzhang.wang Subject: [PATCH v5] RISC-V: Support CALL for RVV floating-point dynamic rounding From: Pan Li > In basic dynamic rounding mode, we simply ignore call instructions and we would like to take care of call in this PATCH. During the call, the frm may be updated or keep as is. Thus, we must make sure at least 2 things. 1. The static frm before call should not pollute the frm value in call. 2. The updated frm value in call should be sticky after call completed. We will perfrom some steps to make above happen. 1. Mark call instruction with new mode DYN_CALL. 2. Mark the instruction after CALL from NONE to DYN. 3. When emit for a DYN_CALL, we will restore the frm value. 4. When emit from a DYN_CALL, we will backup the frm value. Let's take a flow for this. +-------------+ | Entry (DYN) | <- frrm a5 +-------------+ / \ +-------+ +-----------+ | VFADD | | VFADD RTZ | <- fsrmi 1(RTZ) +-------+ +-----------+ | | +-------+ +-----------+ | CALL | | CALL | <- fsrm a5 +-------+ +-----------+ | | +-----------+ +-------+ | SHIFT | <- frrm a5 | VFADD | <- frrm a5 +-----------+ +-------+ | / +-----------+ / | VFADD RUP | <- fsrm1 3(RUP) +-----------+ / \ / +-----------------+ | Exit (DYN_EXIT) | <- fsrm a5 +-----------------+ When call is the last insn of one bb, we take care of it when needed for each insn by inserting one frm backup (frrm) insn to the end of the current bb. Signed-off-by: Pan Li > Co-Authored-By: Juzhe-Zhong > gcc/ChangeLog: * config/riscv/riscv.cc (DYNAMIC_FRM_RTL): New macro. (STATIC_FRM_P): Ditto. (struct mode_switching_info): New struct for mode switching. (struct machine_function): Add new field mode switching. (riscv_emit_frm_mode_set): Add DYN_CALL emit. (riscv_frm_adjust_mode_after_call): New function for call mode. (riscv_frm_reconcile_call_as_bb_end): New function for call as the last insn of bb. (riscv_frm_mode_needed): New function for frm mode needed. (riscv_mode_needed): Extrac function for frm. (riscv_frm_mode_after): Add DYN_CALL after. (riscv_mode_entry): Remove backup rtl initialization. * config/riscv/vector.md (frm_mode): Add dyn_call. (fsrmsi_restore_exit): Rename to _volatile. (fsrmsi_restore_volatile): Likewise. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/float-point-frm-insert-7.c: Adjust test cases. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-33.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-34.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-35.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-36.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-37.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-38.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-39.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-40.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-41.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-42.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-43.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-44.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-45.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-46.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-47.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-48.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-49.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-50.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-51.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-52.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-53.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-54.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-55.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-56.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-57.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-58.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-59.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-60.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-61.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-62.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-63.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-64.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-65.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-66.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-67.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-68.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-69.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-70.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-71.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-72.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-73.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-74.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-75.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-76.c: New test. * gcc.target/riscv/rvv/base/float-point-dynamic-frm-77.c: New test. * gcc.target/riscv/rvv/base/float-point-frm-run-4.c: New test. * gcc.target/riscv/rvv/base/float-point-frm-run-5.c: New test. --- gcc/config/riscv/riscv.cc | 150 ++++++++++++++++-- gcc/config/riscv/vector.md | 4 +- .../rvv/base/float-point-dynamic-frm-33.c | 31 ++++ .../rvv/base/float-point-dynamic-frm-34.c | 32 ++++ .../rvv/base/float-point-dynamic-frm-35.c | 32 ++++ .../rvv/base/float-point-dynamic-frm-36.c | 29 ++++ .../rvv/base/float-point-dynamic-frm-37.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-38.c | 34 ++++ .../rvv/base/float-point-dynamic-frm-39.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-40.c | 34 ++++ .../rvv/base/float-point-dynamic-frm-41.c | 37 +++++ .../rvv/base/float-point-dynamic-frm-42.c | 37 +++++ .../rvv/base/float-point-dynamic-frm-43.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-44.c | 40 +++++ .../rvv/base/float-point-dynamic-frm-45.c | 35 ++++ .../rvv/base/float-point-dynamic-frm-46.c | 35 ++++ .../rvv/base/float-point-dynamic-frm-47.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-48.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-49.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-50.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-51.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-52.c | 36 +++++ .../rvv/base/float-point-dynamic-frm-53.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-54.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-55.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-56.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-57.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-58.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-59.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-60.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-61.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-62.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-63.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-64.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-65.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-66.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-67.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-68.c | 38 +++++ .../rvv/base/float-point-dynamic-frm-69.c | 31 ++++ .../rvv/base/float-point-dynamic-frm-70.c | 28 ++++ .../rvv/base/float-point-dynamic-frm-71.c | 28 ++++ .../rvv/base/float-point-dynamic-frm-72.c | 33 ++++ .../rvv/base/float-point-dynamic-frm-73.c | 39 +++++ .../rvv/base/float-point-dynamic-frm-74.c | 39 +++++ .../rvv/base/float-point-dynamic-frm-75.c | 39 +++++ .../rvv/base/float-point-dynamic-frm-76.c | 39 +++++ .../rvv/base/float-point-dynamic-frm-77.c | 20 +++ .../riscv/rvv/base/float-point-frm-insert-7.c | 5 +- .../riscv/rvv/base/float-point-frm-run-4.c | 82 ++++++++++ .../riscv/rvv/base/float-point-frm-run-5.c | 83 ++++++++++ 50 files changed, 1913 insertions(+), 17 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-33.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-34.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-35.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-36.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-37.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-38.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-39.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-40.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-41.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-42.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-43.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-44.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-45.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-46.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-47.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-48.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-49.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-50.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-51.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-52.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-53.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-54.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-55.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-56.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-57.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-58.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-59.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-60.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-61.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-62.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-63.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-64.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-65.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-66.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-67.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-68.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-69.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-70.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-71.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-72.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-73.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-74.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-75.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-76.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-dynamic-frm-77.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-frm-run-4.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-frm-run-5.c diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 332fa720f01..bd2cf8176a7 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -69,6 +69,7 @@ along with GCC; see the file COPYING3. If not see #include "gimple-iterator.h" #include "gimple-expr.h" #include "tree-vectorizer.h" +#include "gcse.h" /* This file should be included last. */ #include "target-def.h" @@ -90,6 +91,12 @@ along with GCC; see the file COPYING3. If not see /* True if bit BIT is set in VALUE. */ #define BITSET_P(VALUE, BIT) (((VALUE) & (1ULL << (BIT))) != 0) +/* Extract the backup dynamic frm rtl. */ +#define DYNAMIC_FRM_RTL(c) ((c)->machine->mode_sw_info.dynamic_frm) + +/* True the mode switching has static frm, or false. */ +#define STATIC_FRM_P(c) ((c)->machine->mode_sw_info.static_frm_p) + /* Information about a function's frame layout. */ struct GTY(()) riscv_frame_info { /* The size of the frame in bytes. */ @@ -125,6 +132,22 @@ enum riscv_privilege_levels { UNKNOWN_MODE, USER_MODE, SUPERVISOR_MODE, MACHINE_MODE }; +struct GTY(()) mode_switching_info { + /* The RTL variable which stores the dynamic FRM value. We always use this + RTX to restore dynamic FRM rounding mode in mode switching. */ + rtx dynamic_frm; + + /* The boolean variables indicates there is at least one static rounding + mode instruction in the function or not. */ + bool static_frm_p; + + mode_switching_info () + { + dynamic_frm = NULL_RTX; + static_frm_p = false; + } +}; + struct GTY(()) machine_function { /* The number of extra stack bytes taken up by register varargs. This area is allocated by the callee at the very top of the frame. */ @@ -148,9 +171,7 @@ struct GTY(()) machine_function { not be considered by the prologue and epilogue. */ bool reg_is_wrapped_separately[FIRST_PSEUDO_REGISTER]; - /* The RTL variable which stores the dynamic FRM value. We always use this - RTX to restore dynamic FRM rounding mode in mode switching. */ - rtx dynamic_frm; + struct mode_switching_info mode_sw_info; }; /* Information about a single argument. */ @@ -7709,9 +7730,13 @@ riscv_static_frm_mode_p (int mode) static void riscv_emit_frm_mode_set (int mode, int prev_mode) { + rtx backup_reg = DYNAMIC_FRM_RTL (cfun); + + if (prev_mode == FRM_MODE_DYN_CALL) + emit_insn (gen_frrmsi (backup_reg)); /* Backup frm when DYN_CALL. */ + if (mode != prev_mode) { - rtx backup_reg = cfun->machine->dynamic_frm; /* TODO: By design, FRM_MODE_xxx used by mode switch which is different from the FRM value like FRM_RTZ defined in riscv-protos.h. When mode switching we actually need a conversion @@ -7721,9 +7746,13 @@ riscv_emit_frm_mode_set (int mode, int prev_mode) and then we leverage this assumption when emit. */ rtx frm = gen_int_mode (mode, SImode); - if (mode == FRM_MODE_DYN_EXIT && prev_mode != FRM_MODE_DYN) + if (mode == FRM_MODE_DYN_CALL && prev_mode != FRM_MODE_DYN) /* No need to emit when prev mode is DYN already. */ - emit_insn (gen_fsrmsi_restore_exit (backup_reg)); + emit_insn (gen_fsrmsi_restore_volatile (backup_reg)); + else if (mode == FRM_MODE_DYN_EXIT && STATIC_FRM_P (cfun) + && prev_mode != FRM_MODE_DYN && prev_mode != FRM_MODE_DYN_CALL) + /* No need to emit when prev mode is DYN or DYN_CALL already. */ + emit_insn (gen_fsrmsi_restore_volatile (backup_reg)); else if (mode == FRM_MODE_DYN) /* Restore frm value from backup when switch to DYN mode. */ emit_insn (gen_fsrmsi_restore (backup_reg)); @@ -7753,6 +7782,102 @@ riscv_emit_mode_set (int entity, int mode, int prev_mode, } } +/* Adjust the FRM_MODE_NONE insn after a call to FRM_MODE_DYN for the + underlying emit. */ + +static int +riscv_frm_adjust_mode_after_call (rtx_insn *cur_insn) +{ + rtx_insn *insn; + int mode = FRM_MODE_NONE; + basic_block bb = BLOCK_FOR_INSN (cur_insn); + + for (insn = PREV_INSN (cur_insn); insn; insn = PREV_INSN (insn)) + { + if (INSN_P (insn)) + { + if (CALL_P (insn)) + mode = FRM_MODE_DYN; + break; + } + + if (insn == BB_HEAD (bb)) + break; + } + + return mode; +} + +/* Insert the backup frm insn to the end of the bb if and only if the call + is the last insn of this bb. */ + +static void +riscv_frm_reconcile_call_as_bb_end (rtx_insn *cur_insn) +{ + rtx_insn *insn; + basic_block bb = BLOCK_FOR_INSN (cur_insn); + + gcc_assert (CALL_P (cur_insn)); + + if (cur_insn != BB_END (bb)) + { + for (insn = NEXT_INSN (cur_insn); insn; insn = NEXT_INSN (insn)) + { + if (INSN_P (insn)) /* If there is one insn after call, do nothing. */ + return; + + if (insn == BB_END (bb)) + break; + } + } + + /* Then we need to emit backup inst to the end of bb. */ + start_sequence (); + emit_insn (gen_frrmsi (DYNAMIC_FRM_RTL (cfun))); + rtx_insn *backup_insn = get_insns (); + end_sequence (); + + insert_insn_end_basic_block (backup_insn, bb); +} + +/* Return mode that frm must be switched into + prior to the execution of insn. */ + +static int +riscv_frm_mode_needed (rtx_insn *cur_insn, int code) +{ + if (!DYNAMIC_FRM_RTL(cfun)) + { + /* The dynamic frm will be initialized only onece during cfun. */ + DYNAMIC_FRM_RTL (cfun) = gen_reg_rtx (SImode); + emit_insn_at_entry (gen_frrmsi (DYNAMIC_FRM_RTL (cfun))); + } + + if (CALL_P (cur_insn)) + { + riscv_frm_reconcile_call_as_bb_end (cur_insn); + return FRM_MODE_DYN_CALL; + } + + int mode = code >= 0 ? get_attr_frm_mode (cur_insn) : FRM_MODE_NONE; + + if (mode == FRM_MODE_NONE) + /* After meet a call, we need to backup the frm because it may be + updated during the call. Here, for each insn, we will check if + the previous insn is a call or not. When previous insn is call, + there will be 2 cases for the emit mode set. + + 1. Current insn is not MODE_NONE, then the mode switch framework + will do the mode switch from MODE_CALL to MODE_NON_NONE natively. + 2. Current insn is MODE_NONE, we need to adjust the MODE_NONE to + the MODE_DYN, and leave the mode switch itself to perform + the emit mode set. + */ + mode = riscv_frm_adjust_mode_after_call (cur_insn); + + return mode; +} + /* Return mode that entity must be switched into prior to the execution of insn. */ @@ -7766,7 +7891,7 @@ riscv_mode_needed (int entity, rtx_insn *insn) case RISCV_VXRM: return code >= 0 ? get_attr_vxrm_mode (insn) : VXRM_MODE_NONE; case RISCV_FRM: - return code >= 0 ? get_attr_frm_mode (insn) : FRM_MODE_NONE; + return riscv_frm_mode_needed (insn, code); default: gcc_unreachable (); } @@ -7843,6 +7968,11 @@ riscv_vxrm_mode_after (rtx_insn *insn, int mode) static int riscv_frm_mode_after (rtx_insn *insn, int mode) { + STATIC_FRM_P (cfun) = STATIC_FRM_P (cfun) || riscv_static_frm_mode_p (mode); + + if (CALL_P (insn)) + return FRM_MODE_DYN_CALL; + if (frm_unknown_dynamic_p (insn)) return FRM_MODE_DYN; @@ -7883,12 +8013,6 @@ riscv_mode_entry (int entity) return VXRM_MODE_NONE; case RISCV_FRM: { - if (!cfun->machine->dynamic_frm) - { - cfun->machine->dynamic_frm = gen_reg_rtx (SImode); - emit_insn_at_entry (gen_frrmsi (cfun->machine->dynamic_frm)); - } - /* According to RVV 1.0 spec, all vector floating-point operations use the dynamic rounding mode in the frm register. Likewise in other similar places. */ diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md index 69680de2600..63b2d3a9b82 100644 --- a/gcc/config/riscv/vector.md +++ b/gcc/config/riscv/vector.md @@ -694,7 +694,7 @@ (define_attr "vxrm_mode" "rnu,rne,rdn,rod,none" ) ;; Defines rounding mode of an floating-point operation. -(define_attr "frm_mode" "rne,rtz,rdn,rup,rmm,dyn,dyn_exit,none" +(define_attr "frm_mode" "rne,rtz,rdn,rup,rmm,dyn,dyn_exit,dyn_call,none" (cond [ (eq_attr "type" "vfalu") @@ -829,7 +829,7 @@ (define_insn "fsrmsi_restore" ;; The volatile fsrmsi restore is used for the exit point for the ;; dynamic mode switching. It will generate one volatile fsrm a5 ;; which won't be eliminated. -(define_insn "fsrmsi_restore_exit" +(define_insn "fsrmsi_restore_volatile" [(set (reg:SI FRM_REGNUM) (unspec_volatile:SI [(match_operand:SI 0 "register_operand" "r")] UNSPECV_FRM_RESTORE_EXIT))] -- 2.34.1