diff mbox series

RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions

Message ID 20230517095818.1285188-1-juzhe.zhong@rivai.ai
State New
Headers show
Series RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions | expand

Commit Message

juzhe.zhong@rivai.ai May 17, 2023, 9:58 a.m. UTC 
From: Juzhe-Zhong <juzhe.zhong@rivai.ai>

Hi, this patch support the new coming fixed-point intrinsics:
https://github.com/riscv-non-isa/rvv-intrinsic-doc/pull/222

Insert fixed-point rounding mode configuration by mode switching target hook.

Mode switching target hook is implemented applying LCM (Lazy code Motion).

So the performance && correctness can be well trusted.

Here is the example:

void f (void * in, void *out, int32_t x, int n, int m)
{
  for (int i = 0; i < n; i++) {
    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
  }
  
  for (int i = 0; i < n; i++) {
    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
  }
}

ASM:

...
csrwi   vxrm,2
vsetivli        zero,4,e32,m1,tu,ma
...
Loop 1
...
Loop 2

mode switching can global recognize both Loop 1 and Loop 2 are using RDN
rounding mode and hoist such single "csrwi vxrm,2" to dominate both Loop 1
and Loop 2.

Besides, I have add correctness check sanity tests in this patch too.

Ok for trunk ?

gcc/ChangeLog:

        * config/riscv/riscv-opts.h (enum riscv_entity): New enum.
        * config/riscv/riscv.cc (riscv_emit_mode_set): New function.
        (riscv_mode_needed): Ditto.
        (riscv_mode_after): Ditto.
        (riscv_mode_entry): Ditto.
        (riscv_mode_exit): Ditto.
        (riscv_mode_priority): Ditto.
        (TARGET_MODE_EMIT): New target hook.
        (TARGET_MODE_NEEDED): Ditto.
        (TARGET_MODE_AFTER): Ditto.
        (TARGET_MODE_ENTRY): Ditto.
        (TARGET_MODE_EXIT): Ditto.
        (TARGET_MODE_PRIORITY): Ditto.
        * config/riscv/riscv.h (OPTIMIZE_MODE_SWITCHING): Ditto.
        (NUM_MODES_FOR_MODE_SWITCHING): Ditto.
        * config/riscv/riscv.md: Add csrwvxrm.
        * config/riscv/vector.md (rnu,rne,rdn,rod,none): New attribute.
        (vxrmsi): New pattern.

gcc/testsuite/ChangeLog:

        * gcc.target/riscv/rvv/base/vxrm-10.c: New test.
        * gcc.target/riscv/rvv/base/vxrm-6.c: New test.
        * gcc.target/riscv/rvv/base/vxrm-7.c: New test.
        * gcc.target/riscv/rvv/base/vxrm-8.c: New test.
        * gcc.target/riscv/rvv/base/vxrm-9.c: New test.

---
 gcc/config/riscv/riscv-opts.h                 |   8 ++
 gcc/config/riscv/riscv.cc                     | 104 ++++++++++++++++++
 gcc/config/riscv/riscv.h                      |   6 +-
 gcc/config/riscv/riscv.md                     |   3 +-
 gcc/config/riscv/vector.md                    |  29 +++++
 .../gcc.target/riscv/rvv/base/vxrm-10.c       |  26 +++++
 .../gcc.target/riscv/rvv/base/vxrm-6.c        |  15 +++
 .../gcc.target/riscv/rvv/base/vxrm-7.c        |  16 +++
 .../gcc.target/riscv/rvv/base/vxrm-8.c        |  18 +++
 .../gcc.target/riscv/rvv/base/vxrm-9.c        |  26 +++++
 10 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c

Comments

Kito Cheng May 17, 2023, 10:05 a.m. UTC | #1 
LGTM, it's really awesome, I know it's kind of blocking due to enum
stuff, so feel free to commit this once it unblock :)

On Wed, May 17, 2023 at 5:58 PM <juzhe.zhong@rivai.ai> wrote:
>
> From: Juzhe-Zhong <juzhe.zhong@rivai.ai>
>
> Hi, this patch support the new coming fixed-point intrinsics:
> https://github.com/riscv-non-isa/rvv-intrinsic-doc/pull/222
>
> Insert fixed-point rounding mode configuration by mode switching target hook.
>
> Mode switching target hook is implemented applying LCM (Lazy code Motion).
>
> So the performance && correctness can be well trusted.
>
> Here is the example:
>
> void f (void * in, void *out, int32_t x, int n, int m)
> {
>   for (int i = 0; i < n; i++) {
>     vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
>     vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
>     vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
>     v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
>     __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
>   }
>
>   for (int i = 0; i < n; i++) {
>     vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
>     vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
>     vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
>     v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
>     __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
>   }
> }
>
> ASM:
>
> ...
> csrwi   vxrm,2
> vsetivli        zero,4,e32,m1,tu,ma
> ...
> Loop 1
> ...
> Loop 2
>
> mode switching can global recognize both Loop 1 and Loop 2 are using RDN
> rounding mode and hoist such single "csrwi vxrm,2" to dominate both Loop 1
> and Loop 2.
>
> Besides, I have add correctness check sanity tests in this patch too.
>
> Ok for trunk ?
>
> gcc/ChangeLog:
>
>         * config/riscv/riscv-opts.h (enum riscv_entity): New enum.
>         * config/riscv/riscv.cc (riscv_emit_mode_set): New function.
>         (riscv_mode_needed): Ditto.
>         (riscv_mode_after): Ditto.
>         (riscv_mode_entry): Ditto.
>         (riscv_mode_exit): Ditto.
>         (riscv_mode_priority): Ditto.
>         (TARGET_MODE_EMIT): New target hook.
>         (TARGET_MODE_NEEDED): Ditto.
>         (TARGET_MODE_AFTER): Ditto.
>         (TARGET_MODE_ENTRY): Ditto.
>         (TARGET_MODE_EXIT): Ditto.
>         (TARGET_MODE_PRIORITY): Ditto.
>         * config/riscv/riscv.h (OPTIMIZE_MODE_SWITCHING): Ditto.
>         (NUM_MODES_FOR_MODE_SWITCHING): Ditto.
>         * config/riscv/riscv.md: Add csrwvxrm.
>         * config/riscv/vector.md (rnu,rne,rdn,rod,none): New attribute.
>         (vxrmsi): New pattern.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.target/riscv/rvv/base/vxrm-10.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-6.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-7.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-8.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-9.c: New test.
>
> ---
>  gcc/config/riscv/riscv-opts.h                 |   8 ++
>  gcc/config/riscv/riscv.cc                     | 104 ++++++++++++++++++
>  gcc/config/riscv/riscv.h                      |   6 +-
>  gcc/config/riscv/riscv.md                     |   3 +-
>  gcc/config/riscv/vector.md                    |  29 +++++
>  .../gcc.target/riscv/rvv/base/vxrm-10.c       |  26 +++++
>  .../gcc.target/riscv/rvv/base/vxrm-6.c        |  15 +++
>  .../gcc.target/riscv/rvv/base/vxrm-7.c        |  16 +++
>  .../gcc.target/riscv/rvv/base/vxrm-8.c        |  18 +++
>  .../gcc.target/riscv/rvv/base/vxrm-9.c        |  26 +++++
>  10 files changed, 249 insertions(+), 2 deletions(-)
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
>
> diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h
> index 1b2e6de5e1b..2a16402265a 100644
> --- a/gcc/config/riscv/riscv-opts.h
> +++ b/gcc/config/riscv/riscv-opts.h
> @@ -91,6 +91,14 @@ enum riscv_multilib_select_kind {
>    select_by_abi,
>  };
>
> +/* ENTITIES in mode switching.  */
> +enum riscv_entity
> +{
> +  RISCV_VXRM = 0,
> +  RISCV_FRM,
> +  MAX_RISCV_ENTITIES
> +};
> +
>  #define MASK_ZICSR    (1 << 0)
>  #define MASK_ZIFENCEI (1 << 1)
>
> diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
> index de5b87b1a87..0d1b83f4315 100644
> --- a/gcc/config/riscv/riscv.cc
> +++ b/gcc/config/riscv/riscv.cc
> @@ -7513,6 +7513,95 @@ riscv_vectorize_preferred_vector_alignment (const_tree type)
>    return TYPE_ALIGN (type);
>  }
>
> +/* Implement Mode switching.  */
> +
> +static void
> +riscv_emit_mode_set (int entity, int mode, int prev_mode,
> +                    HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      if (mode != VXRM_MODE_NONE && mode != prev_mode)
> +       emit_insn (gen_vxrmsi (gen_int_mode (mode, SImode)));
> +      break;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return mode that entity must be switched into
> +   prior to the execution of insn.  */
> +
> +static int
> +riscv_mode_needed (int entity, rtx_insn *insn)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return recog_memoized (insn) >= 0 ? get_attr_vxrm_mode (insn)
> +                                       : VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return the mode that an insn results in.  */
> +
> +static int
> +riscv_mode_after (int entity, int mode, rtx_insn *insn)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      if (recog_memoized (insn) >= 0)
> +       return reg_mentioned_p (gen_rtx_REG (SImode, VXRM_REGNUM),
> +                               PATTERN (insn))
> +                ? get_attr_vxrm_mode (insn)
> +                : mode;
> +      else
> +       return mode;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return a mode that ENTITY is assumed to be
> +   switched to at function entry.  */
> +
> +static int
> +riscv_mode_entry (int entity)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return a mode that ENTITY is assumed to be
> +   switched to at function exit.  */
> +
> +static int
> +riscv_mode_exit (int entity)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +static int
> +riscv_mode_priority (int, int n)
> +{
> +  return n;
> +}
> +
>  /* Initialize the GCC target structure.  */
>  #undef TARGET_ASM_ALIGNED_HI_OP
>  #define TARGET_ASM_ALIGNED_HI_OP "\t.half\t"
> @@ -7789,6 +7878,21 @@ riscv_vectorize_preferred_vector_alignment (const_tree type)
>  #define TARGET_VECTORIZE_PREFERRED_VECTOR_ALIGNMENT \
>    riscv_vectorize_preferred_vector_alignment
>
> +/* Mode switching hooks.  */
> +
> +#undef TARGET_MODE_EMIT
> +#define TARGET_MODE_EMIT riscv_emit_mode_set
> +#undef TARGET_MODE_NEEDED
> +#define TARGET_MODE_NEEDED riscv_mode_needed
> +#undef TARGET_MODE_AFTER
> +#define TARGET_MODE_AFTER riscv_mode_after
> +#undef TARGET_MODE_ENTRY
> +#define TARGET_MODE_ENTRY riscv_mode_entry
> +#undef TARGET_MODE_EXIT
> +#define TARGET_MODE_EXIT riscv_mode_exit
> +#undef TARGET_MODE_PRIORITY
> +#define TARGET_MODE_PRIORITY riscv_mode_priority
> +
>  struct gcc_target targetm = TARGET_INITIALIZER;
>
>  #include "gt-riscv.h"
> diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
> index f55bd6112a8..29f2c07ce5d 100644
> --- a/gcc/config/riscv/riscv.h
> +++ b/gcc/config/riscv/riscv.h
> @@ -845,7 +845,7 @@ typedef struct {
>    "fs0", "fs1", "fa0", "fa1", "fa2", "fa3", "fa4", "fa5",      \
>    "fa6", "fa7", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",      \
>    "fs8", "fs9", "fs10","fs11","ft8", "ft9", "ft10","ft11",     \
> -  "arg", "frame", "vl", "vtype", "N/A", "N/A", "N/A", "N/A",    \
> +  "arg", "frame", "vl", "vtype", "vxrm", "N/A", "N/A", "N/A",   \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
> @@ -1107,4 +1107,8 @@ extern void riscv_remove_unneeded_save_restore_calls (void);
>     CONST1_RTX for the simplification.  */
>  #define VECTOR_STORE_FLAG_VALUE(MODE) CONSTM1_RTX (GET_MODE_INNER (MODE))
>
> +/* Mode switching (Lazy code motion) for RVV rounding mode instructions.  */
> +#define OPTIMIZE_MODE_SWITCHING(ENTITY) (TARGET_VECTOR)
> +#define NUM_MODES_FOR_MODE_SWITCHING {VXRM_MODE_NONE}
> +
>  #endif /* ! GCC_RISCV_H */
> diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
> index 91808d6bd2a..a9179931217 100644
> --- a/gcc/config/riscv/riscv.md
> +++ b/gcc/config/riscv/riscv.md
> @@ -284,6 +284,7 @@
>  ;; Classification of RVV instructions which will be added to each RVV .md pattern and used by scheduler.
>  ;; rdvlenb     vector byte length vlenb csrr read
>  ;; rdvl        vector length vl csrr read
> +;; wrvxrm      vector fixed-point rounding mode write
>  ;; vsetvl      vector configuration-setting instrucions
>  ;; 7. Vector Loads and Stores
>  ;; vlde        vector unit-stride load instructions
> @@ -387,7 +388,7 @@
>     mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul,
>     fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip,rotate,
>     clmul,min,max,minu,maxu,clz,ctz,cpop,
> -   atomic,condmove,crypto,rdvlenb,rdvl,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
> +   atomic,condmove,crypto,rdvlenb,rdvl,wrvxrm,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
>     vldux,vldox,vstux,vstox,vldff,vldr,vstr,
>     vlsegde,vssegte,vlsegds,vssegts,vlsegdux,vlsegdox,vssegtux,vssegtox,vlsegdff,
>     vialu,viwalu,vext,vicalu,vshift,vnshift,vicmp,viminmax,
> diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md
> index a06b84d7473..1c102943622 100644
> --- a/gcc/config/riscv/vector.md
> +++ b/gcc/config/riscv/vector.md
> @@ -407,6 +407,26 @@
>            (symbol_ref "INTVAL (operands[4])")]
>         (const_int INVALID_ATTRIBUTE)))
>
> +;; Defines rounding mode of an fixed-point operation.
> +
> +(define_attr "vxrm_mode" "rnu,rne,rdn,rod,none"
> +  (cond [(and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNU"))
> +        (const_string "rnu")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNE"))
> +        (const_string "rne")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RDN"))
> +        (const_string "rdn")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_ROD"))
> +        (const_string "rod")]
> +        (const_string "none")))
> +
>  ;; -----------------------------------------------------------------
>  ;; ---- Miscellaneous Operations
>  ;; -----------------------------------------------------------------
> @@ -584,6 +604,15 @@
>    "TARGET_VECTOR"
>    "")
>
> +;; Set VXRM
> +(define_insn "vxrmsi"
> +  [(set (reg:SI VXRM_REGNUM)
> +       (match_operand 0 "const_int_operand" "i"))]
> +  "TARGET_VECTOR"
> +  "csrwi\tvxrm,%0"
> +  [(set_attr "type" "wrvxrm")
> +   (set_attr "mode" "SI")])
> +
>  ;; -----------------------------------------------------------------
>  ;; ---- Moves Operations
>  ;; -----------------------------------------------------------------
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
> new file mode 100644
> index 00000000000..a707aa1645e
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
> @@ -0,0 +1,26 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RNE, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
> new file mode 100644
> index 00000000000..4b346d67c27
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
> @@ -0,0 +1,15 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
> +  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
> +  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +  __riscv_vse32_v_i32m1 (out + 100, v3, 4);
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
> new file mode 100644
> index 00000000000..1ca795ce3f4
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
> @@ -0,0 +1,16 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
> +  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
> +  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
> +  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +  __riscv_vse32_v_i32m1 (out + 100, v3, 4);
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
> new file mode 100644
> index 00000000000..5799f731e21
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
> @@ -0,0 +1,18 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
> new file mode 100644
> index 00000000000..13921d4af21
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
> @@ -0,0 +1,26 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> --
> 2.36.3
>
juzhe.zhong@rivai.ai May 17, 2023, 2:56 p.m. UTC | #2 
Hi, Kito. The intrinsic doc has updated fixed point enum.
This patch (You have LGTM) should be merged after this patch:

https://patchwork.sourceware.org/project/gcc/patch/20230517052521.405836-1-juzhe.zhong@rivai.ai/ 
Can you respond this patch ?

Thanks.


juzhe.zhong@rivai.ai
 
From: Kito Cheng
Date: 2023-05-17 18:05
To: juzhe.zhong
CC: gcc-patches; kito.cheng; palmer; palmer; jeffreyalaw; rdapp.gcc
Subject: Re: [PATCH] RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions
LGTM, it's really awesome, I know it's kind of blocking due to enum
stuff, so feel free to commit this once it unblock :)
 
On Wed, May 17, 2023 at 5:58 PM <juzhe.zhong@rivai.ai> wrote:
>
> From: Juzhe-Zhong <juzhe.zhong@rivai.ai>
>
> Hi, this patch support the new coming fixed-point intrinsics:
> https://github.com/riscv-non-isa/rvv-intrinsic-doc/pull/222
>
> Insert fixed-point rounding mode configuration by mode switching target hook.
>
> Mode switching target hook is implemented applying LCM (Lazy code Motion).
>
> So the performance && correctness can be well trusted.
>
> Here is the example:
>
> void f (void * in, void *out, int32_t x, int n, int m)
> {
>   for (int i = 0; i < n; i++) {
>     vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
>     vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
>     vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
>     v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
>     __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
>   }
>
>   for (int i = 0; i < n; i++) {
>     vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
>     vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
>     vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
>     v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
>     __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
>   }
> }
>
> ASM:
>
> ...
> csrwi   vxrm,2
> vsetivli        zero,4,e32,m1,tu,ma
> ...
> Loop 1
> ...
> Loop 2
>
> mode switching can global recognize both Loop 1 and Loop 2 are using RDN
> rounding mode and hoist such single "csrwi vxrm,2" to dominate both Loop 1
> and Loop 2.
>
> Besides, I have add correctness check sanity tests in this patch too.
>
> Ok for trunk ?
>
> gcc/ChangeLog:
>
>         * config/riscv/riscv-opts.h (enum riscv_entity): New enum.
>         * config/riscv/riscv.cc (riscv_emit_mode_set): New function.
>         (riscv_mode_needed): Ditto.
>         (riscv_mode_after): Ditto.
>         (riscv_mode_entry): Ditto.
>         (riscv_mode_exit): Ditto.
>         (riscv_mode_priority): Ditto.
>         (TARGET_MODE_EMIT): New target hook.
>         (TARGET_MODE_NEEDED): Ditto.
>         (TARGET_MODE_AFTER): Ditto.
>         (TARGET_MODE_ENTRY): Ditto.
>         (TARGET_MODE_EXIT): Ditto.
>         (TARGET_MODE_PRIORITY): Ditto.
>         * config/riscv/riscv.h (OPTIMIZE_MODE_SWITCHING): Ditto.
>         (NUM_MODES_FOR_MODE_SWITCHING): Ditto.
>         * config/riscv/riscv.md: Add csrwvxrm.
>         * config/riscv/vector.md (rnu,rne,rdn,rod,none): New attribute.
>         (vxrmsi): New pattern.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.target/riscv/rvv/base/vxrm-10.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-6.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-7.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-8.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-9.c: New test.
>
> ---
>  gcc/config/riscv/riscv-opts.h                 |   8 ++
>  gcc/config/riscv/riscv.cc                     | 104 ++++++++++++++++++
>  gcc/config/riscv/riscv.h                      |   6 +-
>  gcc/config/riscv/riscv.md                     |   3 +-
>  gcc/config/riscv/vector.md                    |  29 +++++
>  .../gcc.target/riscv/rvv/base/vxrm-10.c       |  26 +++++
>  .../gcc.target/riscv/rvv/base/vxrm-6.c        |  15 +++
>  .../gcc.target/riscv/rvv/base/vxrm-7.c        |  16 +++
>  .../gcc.target/riscv/rvv/base/vxrm-8.c        |  18 +++
>  .../gcc.target/riscv/rvv/base/vxrm-9.c        |  26 +++++
>  10 files changed, 249 insertions(+), 2 deletions(-)
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
>
> diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h
> index 1b2e6de5e1b..2a16402265a 100644
> --- a/gcc/config/riscv/riscv-opts.h
> +++ b/gcc/config/riscv/riscv-opts.h
> @@ -91,6 +91,14 @@ enum riscv_multilib_select_kind {
>    select_by_abi,
>  };
>
> +/* ENTITIES in mode switching.  */
> +enum riscv_entity
> +{
> +  RISCV_VXRM = 0,
> +  RISCV_FRM,
> +  MAX_RISCV_ENTITIES
> +};
> +
>  #define MASK_ZICSR    (1 << 0)
>  #define MASK_ZIFENCEI (1 << 1)
>
> diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
> index de5b87b1a87..0d1b83f4315 100644
> --- a/gcc/config/riscv/riscv.cc
> +++ b/gcc/config/riscv/riscv.cc
> @@ -7513,6 +7513,95 @@ riscv_vectorize_preferred_vector_alignment (const_tree type)
>    return TYPE_ALIGN (type);
>  }
>
> +/* Implement Mode switching.  */
> +
> +static void
> +riscv_emit_mode_set (int entity, int mode, int prev_mode,
> +                    HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      if (mode != VXRM_MODE_NONE && mode != prev_mode)
> +       emit_insn (gen_vxrmsi (gen_int_mode (mode, SImode)));
> +      break;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return mode that entity must be switched into
> +   prior to the execution of insn.  */
> +
> +static int
> +riscv_mode_needed (int entity, rtx_insn *insn)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return recog_memoized (insn) >= 0 ? get_attr_vxrm_mode (insn)
> +                                       : VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return the mode that an insn results in.  */
> +
> +static int
> +riscv_mode_after (int entity, int mode, rtx_insn *insn)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      if (recog_memoized (insn) >= 0)
> +       return reg_mentioned_p (gen_rtx_REG (SImode, VXRM_REGNUM),
> +                               PATTERN (insn))
> +                ? get_attr_vxrm_mode (insn)
> +                : mode;
> +      else
> +       return mode;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return a mode that ENTITY is assumed to be
> +   switched to at function entry.  */
> +
> +static int
> +riscv_mode_entry (int entity)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return a mode that ENTITY is assumed to be
> +   switched to at function exit.  */
> +
> +static int
> +riscv_mode_exit (int entity)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +static int
> +riscv_mode_priority (int, int n)
> +{
> +  return n;
> +}
> +
>  /* Initialize the GCC target structure.  */
>  #undef TARGET_ASM_ALIGNED_HI_OP
>  #define TARGET_ASM_ALIGNED_HI_OP "\t.half\t"
> @@ -7789,6 +7878,21 @@ riscv_vectorize_preferred_vector_alignment (const_tree type)
>  #define TARGET_VECTORIZE_PREFERRED_VECTOR_ALIGNMENT \
>    riscv_vectorize_preferred_vector_alignment
>
> +/* Mode switching hooks.  */
> +
> +#undef TARGET_MODE_EMIT
> +#define TARGET_MODE_EMIT riscv_emit_mode_set
> +#undef TARGET_MODE_NEEDED
> +#define TARGET_MODE_NEEDED riscv_mode_needed
> +#undef TARGET_MODE_AFTER
> +#define TARGET_MODE_AFTER riscv_mode_after
> +#undef TARGET_MODE_ENTRY
> +#define TARGET_MODE_ENTRY riscv_mode_entry
> +#undef TARGET_MODE_EXIT
> +#define TARGET_MODE_EXIT riscv_mode_exit
> +#undef TARGET_MODE_PRIORITY
> +#define TARGET_MODE_PRIORITY riscv_mode_priority
> +
>  struct gcc_target targetm = TARGET_INITIALIZER;
>
>  #include "gt-riscv.h"
> diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
> index f55bd6112a8..29f2c07ce5d 100644
> --- a/gcc/config/riscv/riscv.h
> +++ b/gcc/config/riscv/riscv.h
> @@ -845,7 +845,7 @@ typedef struct {
>    "fs0", "fs1", "fa0", "fa1", "fa2", "fa3", "fa4", "fa5",      \
>    "fa6", "fa7", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",      \
>    "fs8", "fs9", "fs10","fs11","ft8", "ft9", "ft10","ft11",     \
> -  "arg", "frame", "vl", "vtype", "N/A", "N/A", "N/A", "N/A",    \
> +  "arg", "frame", "vl", "vtype", "vxrm", "N/A", "N/A", "N/A",   \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
> @@ -1107,4 +1107,8 @@ extern void riscv_remove_unneeded_save_restore_calls (void);
>     CONST1_RTX for the simplification.  */
>  #define VECTOR_STORE_FLAG_VALUE(MODE) CONSTM1_RTX (GET_MODE_INNER (MODE))
>
> +/* Mode switching (Lazy code motion) for RVV rounding mode instructions.  */
> +#define OPTIMIZE_MODE_SWITCHING(ENTITY) (TARGET_VECTOR)
> +#define NUM_MODES_FOR_MODE_SWITCHING {VXRM_MODE_NONE}
> +
>  #endif /* ! GCC_RISCV_H */
> diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
> index 91808d6bd2a..a9179931217 100644
> --- a/gcc/config/riscv/riscv.md
> +++ b/gcc/config/riscv/riscv.md
> @@ -284,6 +284,7 @@
>  ;; Classification of RVV instructions which will be added to each RVV .md pattern and used by scheduler.
>  ;; rdvlenb     vector byte length vlenb csrr read
>  ;; rdvl        vector length vl csrr read
> +;; wrvxrm      vector fixed-point rounding mode write
>  ;; vsetvl      vector configuration-setting instrucions
>  ;; 7. Vector Loads and Stores
>  ;; vlde        vector unit-stride load instructions
> @@ -387,7 +388,7 @@
>     mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul,
>     fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip,rotate,
>     clmul,min,max,minu,maxu,clz,ctz,cpop,
> -   atomic,condmove,crypto,rdvlenb,rdvl,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
> +   atomic,condmove,crypto,rdvlenb,rdvl,wrvxrm,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
>     vldux,vldox,vstux,vstox,vldff,vldr,vstr,
>     vlsegde,vssegte,vlsegds,vssegts,vlsegdux,vlsegdox,vssegtux,vssegtox,vlsegdff,
>     vialu,viwalu,vext,vicalu,vshift,vnshift,vicmp,viminmax,
> diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md
> index a06b84d7473..1c102943622 100644
> --- a/gcc/config/riscv/vector.md
> +++ b/gcc/config/riscv/vector.md
> @@ -407,6 +407,26 @@
>            (symbol_ref "INTVAL (operands[4])")]
>         (const_int INVALID_ATTRIBUTE)))
>
> +;; Defines rounding mode of an fixed-point operation.
> +
> +(define_attr "vxrm_mode" "rnu,rne,rdn,rod,none"
> +  (cond [(and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNU"))
> +        (const_string "rnu")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNE"))
> +        (const_string "rne")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RDN"))
> +        (const_string "rdn")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_ROD"))
> +        (const_string "rod")]
> +        (const_string "none")))
> +
>  ;; -----------------------------------------------------------------
>  ;; ---- Miscellaneous Operations
>  ;; -----------------------------------------------------------------
> @@ -584,6 +604,15 @@
>    "TARGET_VECTOR"
>    "")
>
> +;; Set VXRM
> +(define_insn "vxrmsi"
> +  [(set (reg:SI VXRM_REGNUM)
> +       (match_operand 0 "const_int_operand" "i"))]
> +  "TARGET_VECTOR"
> +  "csrwi\tvxrm,%0"
> +  [(set_attr "type" "wrvxrm")
> +   (set_attr "mode" "SI")])
> +
>  ;; -----------------------------------------------------------------
>  ;; ---- Moves Operations
>  ;; -----------------------------------------------------------------
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
> new file mode 100644
> index 00000000000..a707aa1645e
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
> @@ -0,0 +1,26 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RNE, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
> new file mode 100644
> index 00000000000..4b346d67c27
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
> @@ -0,0 +1,15 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
> +  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
> +  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +  __riscv_vse32_v_i32m1 (out + 100, v3, 4);
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
> new file mode 100644
> index 00000000000..1ca795ce3f4
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
> @@ -0,0 +1,16 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
> +  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
> +  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
> +  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +  __riscv_vse32_v_i32m1 (out + 100, v3, 4);
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
> new file mode 100644
> index 00000000000..5799f731e21
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
> @@ -0,0 +1,18 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
> new file mode 100644
> index 00000000000..13921d4af21
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
> @@ -0,0 +1,26 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m)
> +{
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> --
> 2.36.3
>
Li, Pan2 via Gcc-patches May 17, 2023, 3:18 p.m. UTC | #3 
Committed, thanks kito.

Pan

-----Original Message-----
From: Gcc-patches <gcc-patches-bounces+pan2.li=intel.com@gcc.gnu.org> On Behalf Of Kito Cheng via Gcc-patches
Sent: Wednesday, May 17, 2023 6:06 PM
To: juzhe.zhong@rivai.ai
Cc: gcc-patches@gcc.gnu.org; kito.cheng@gmail.com; palmer@dabbelt.com; palmer@rivosinc.com; jeffreyalaw@gmail.com; rdapp.gcc@gmail.com
Subject: Re: [PATCH] RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions

LGTM, it's really awesome, I know it's kind of blocking due to enum stuff, so feel free to commit this once it unblock :)

On Wed, May 17, 2023 at 5:58 PM <juzhe.zhong@rivai.ai> wrote:
>
> From: Juzhe-Zhong <juzhe.zhong@rivai.ai>
>
> Hi, this patch support the new coming fixed-point intrinsics:
> https://github.com/riscv-non-isa/rvv-intrinsic-doc/pull/222
>
> Insert fixed-point rounding mode configuration by mode switching target hook.
>
> Mode switching target hook is implemented applying LCM (Lazy code Motion).
>
> So the performance && correctness can be well trusted.
>
> Here is the example:
>
> void f (void * in, void *out, int32_t x, int n, int m) {
>   for (int i = 0; i < n; i++) {
>     vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
>     vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
>     vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
>     v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
>     __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
>   }
>
>   for (int i = 0; i < n; i++) {
>     vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
>     vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
>     vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
>     v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
>     __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
>   }
> }
>
> ASM:
>
> ...
> csrwi   vxrm,2
> vsetivli        zero,4,e32,m1,tu,ma
> ...
> Loop 1
> ...
> Loop 2
>
> mode switching can global recognize both Loop 1 and Loop 2 are using 
> RDN rounding mode and hoist such single "csrwi vxrm,2" to dominate 
> both Loop 1 and Loop 2.
>
> Besides, I have add correctness check sanity tests in this patch too.
>
> Ok for trunk ?
>
> gcc/ChangeLog:
>
>         * config/riscv/riscv-opts.h (enum riscv_entity): New enum.
>         * config/riscv/riscv.cc (riscv_emit_mode_set): New function.
>         (riscv_mode_needed): Ditto.
>         (riscv_mode_after): Ditto.
>         (riscv_mode_entry): Ditto.
>         (riscv_mode_exit): Ditto.
>         (riscv_mode_priority): Ditto.
>         (TARGET_MODE_EMIT): New target hook.
>         (TARGET_MODE_NEEDED): Ditto.
>         (TARGET_MODE_AFTER): Ditto.
>         (TARGET_MODE_ENTRY): Ditto.
>         (TARGET_MODE_EXIT): Ditto.
>         (TARGET_MODE_PRIORITY): Ditto.
>         * config/riscv/riscv.h (OPTIMIZE_MODE_SWITCHING): Ditto.
>         (NUM_MODES_FOR_MODE_SWITCHING): Ditto.
>         * config/riscv/riscv.md: Add csrwvxrm.
>         * config/riscv/vector.md (rnu,rne,rdn,rod,none): New attribute.
>         (vxrmsi): New pattern.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.target/riscv/rvv/base/vxrm-10.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-6.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-7.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-8.c: New test.
>         * gcc.target/riscv/rvv/base/vxrm-9.c: New test.
>
> ---
>  gcc/config/riscv/riscv-opts.h                 |   8 ++
>  gcc/config/riscv/riscv.cc                     | 104 ++++++++++++++++++
>  gcc/config/riscv/riscv.h                      |   6 +-
>  gcc/config/riscv/riscv.md                     |   3 +-
>  gcc/config/riscv/vector.md                    |  29 +++++
>  .../gcc.target/riscv/rvv/base/vxrm-10.c       |  26 +++++
>  .../gcc.target/riscv/rvv/base/vxrm-6.c        |  15 +++
>  .../gcc.target/riscv/rvv/base/vxrm-7.c        |  16 +++
>  .../gcc.target/riscv/rvv/base/vxrm-8.c        |  18 +++
>  .../gcc.target/riscv/rvv/base/vxrm-9.c        |  26 +++++
>  10 files changed, 249 insertions(+), 2 deletions(-)  create mode 
> 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
>
> diff --git a/gcc/config/riscv/riscv-opts.h 
> b/gcc/config/riscv/riscv-opts.h index 1b2e6de5e1b..2a16402265a 100644
> --- a/gcc/config/riscv/riscv-opts.h
> +++ b/gcc/config/riscv/riscv-opts.h
> @@ -91,6 +91,14 @@ enum riscv_multilib_select_kind {
>    select_by_abi,
>  };
>
> +/* ENTITIES in mode switching.  */
> +enum riscv_entity
> +{
> +  RISCV_VXRM = 0,
> +  RISCV_FRM,
> +  MAX_RISCV_ENTITIES
> +};
> +
>  #define MASK_ZICSR    (1 << 0)
>  #define MASK_ZIFENCEI (1 << 1)
>
> diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc 
> index de5b87b1a87..0d1b83f4315 100644
> --- a/gcc/config/riscv/riscv.cc
> +++ b/gcc/config/riscv/riscv.cc
> @@ -7513,6 +7513,95 @@ riscv_vectorize_preferred_vector_alignment (const_tree type)
>    return TYPE_ALIGN (type);
>  }
>
> +/* Implement Mode switching.  */
> +
> +static void
> +riscv_emit_mode_set (int entity, int mode, int prev_mode,
> +                    HARD_REG_SET regs_live ATTRIBUTE_UNUSED) {
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      if (mode != VXRM_MODE_NONE && mode != prev_mode)
> +       emit_insn (gen_vxrmsi (gen_int_mode (mode, SImode)));
> +      break;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return mode that entity must be switched into
> +   prior to the execution of insn.  */
> +
> +static int
> +riscv_mode_needed (int entity, rtx_insn *insn) {
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return recog_memoized (insn) >= 0 ? get_attr_vxrm_mode (insn)
> +                                       : VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return the mode that an insn results in.  */
> +
> +static int
> +riscv_mode_after (int entity, int mode, rtx_insn *insn) {
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      if (recog_memoized (insn) >= 0)
> +       return reg_mentioned_p (gen_rtx_REG (SImode, VXRM_REGNUM),
> +                               PATTERN (insn))
> +                ? get_attr_vxrm_mode (insn)
> +                : mode;
> +      else
> +       return mode;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return a mode that ENTITY is assumed to be
> +   switched to at function entry.  */
> +
> +static int
> +riscv_mode_entry (int entity)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +/* Return a mode that ENTITY is assumed to be
> +   switched to at function exit.  */
> +
> +static int
> +riscv_mode_exit (int entity)
> +{
> +  switch (entity)
> +    {
> +    case RISCV_VXRM:
> +      return VXRM_MODE_NONE;
> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +
> +static int
> +riscv_mode_priority (int, int n)
> +{
> +  return n;
> +}
> +
>  /* Initialize the GCC target structure.  */  #undef 
> TARGET_ASM_ALIGNED_HI_OP  #define TARGET_ASM_ALIGNED_HI_OP "\t.half\t"
> @@ -7789,6 +7878,21 @@ riscv_vectorize_preferred_vector_alignment 
> (const_tree type)  #define TARGET_VECTORIZE_PREFERRED_VECTOR_ALIGNMENT \
>    riscv_vectorize_preferred_vector_alignment
>
> +/* Mode switching hooks.  */
> +
> +#undef TARGET_MODE_EMIT
> +#define TARGET_MODE_EMIT riscv_emit_mode_set #undef 
> +TARGET_MODE_NEEDED #define TARGET_MODE_NEEDED riscv_mode_needed 
> +#undef TARGET_MODE_AFTER #define TARGET_MODE_AFTER riscv_mode_after 
> +#undef TARGET_MODE_ENTRY #define TARGET_MODE_ENTRY riscv_mode_entry 
> +#undef TARGET_MODE_EXIT #define TARGET_MODE_EXIT riscv_mode_exit 
> +#undef TARGET_MODE_PRIORITY #define TARGET_MODE_PRIORITY 
> +riscv_mode_priority
> +
>  struct gcc_target targetm = TARGET_INITIALIZER;
>
>  #include "gt-riscv.h"
> diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h index 
> f55bd6112a8..29f2c07ce5d 100644
> --- a/gcc/config/riscv/riscv.h
> +++ b/gcc/config/riscv/riscv.h
> @@ -845,7 +845,7 @@ typedef struct {
>    "fs0", "fs1", "fa0", "fa1", "fa2", "fa3", "fa4", "fa5",      \
>    "fa6", "fa7", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",      \
>    "fs8", "fs9", "fs10","fs11","ft8", "ft9", "ft10","ft11",     \
> -  "arg", "frame", "vl", "vtype", "N/A", "N/A", "N/A", "N/A",    \
> +  "arg", "frame", "vl", "vtype", "vxrm", "N/A", "N/A", "N/A",   \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
>    "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",      \
> @@ -1107,4 +1107,8 @@ extern void riscv_remove_unneeded_save_restore_calls (void);
>     CONST1_RTX for the simplification.  */  #define 
> VECTOR_STORE_FLAG_VALUE(MODE) CONSTM1_RTX (GET_MODE_INNER (MODE))
>
> +/* Mode switching (Lazy code motion) for RVV rounding mode 
> +instructions.  */ #define OPTIMIZE_MODE_SWITCHING(ENTITY) 
> +(TARGET_VECTOR) #define NUM_MODES_FOR_MODE_SWITCHING {VXRM_MODE_NONE}
> +
>  #endif /* ! GCC_RISCV_H */
> diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md 
> index 91808d6bd2a..a9179931217 100644
> --- a/gcc/config/riscv/riscv.md
> +++ b/gcc/config/riscv/riscv.md
> @@ -284,6 +284,7 @@
>  ;; Classification of RVV instructions which will be added to each RVV .md pattern and used by scheduler.
>  ;; rdvlenb     vector byte length vlenb csrr read
>  ;; rdvl        vector length vl csrr read
> +;; wrvxrm      vector fixed-point rounding mode write
>  ;; vsetvl      vector configuration-setting instrucions
>  ;; 7. Vector Loads and Stores
>  ;; vlde        vector unit-stride load instructions
> @@ -387,7 +388,7 @@
>     mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul,
>     fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip,rotate,
>     clmul,min,max,minu,maxu,clz,ctz,cpop,
> -   atomic,condmove,crypto,rdvlenb,rdvl,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
> +   
> + atomic,condmove,crypto,rdvlenb,rdvl,wrvxrm,vsetvl,vlde,vste,vldm,vst
> + m,vlds,vsts,
>     vldux,vldox,vstux,vstox,vldff,vldr,vstr,
>     vlsegde,vssegte,vlsegds,vssegts,vlsegdux,vlsegdox,vssegtux,vssegtox,vlsegdff,
>     vialu,viwalu,vext,vicalu,vshift,vnshift,vicmp,viminmax,
> diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md 
> index a06b84d7473..1c102943622 100644
> --- a/gcc/config/riscv/vector.md
> +++ b/gcc/config/riscv/vector.md
> @@ -407,6 +407,26 @@
>            (symbol_ref "INTVAL (operands[4])")]
>         (const_int INVALID_ATTRIBUTE)))
>
> +;; Defines rounding mode of an fixed-point operation.
> +
> +(define_attr "vxrm_mode" "rnu,rne,rdn,rod,none"
> +  (cond [(and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNU"))
> +        (const_string "rnu")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNE"))
> +        (const_string "rne")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RDN"))
> +        (const_string "rdn")
> +
> +        (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
> +             (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_ROD"))
> +        (const_string "rod")]
> +        (const_string "none")))
> +
>  ;; -----------------------------------------------------------------
>  ;; ---- Miscellaneous Operations
>  ;; -----------------------------------------------------------------
> @@ -584,6 +604,15 @@
>    "TARGET_VECTOR"
>    "")
>
> +;; Set VXRM
> +(define_insn "vxrmsi"
> +  [(set (reg:SI VXRM_REGNUM)
> +       (match_operand 0 "const_int_operand" "i"))]
> +  "TARGET_VECTOR"
> +  "csrwi\tvxrm,%0"
> +  [(set_attr "type" "wrvxrm")
> +   (set_attr "mode" "SI")])
> +
>  ;; -----------------------------------------------------------------
>  ;; ---- Moves Operations
>  ;; -----------------------------------------------------------------
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c 
> b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
> new file mode 100644
> index 00000000000..a707aa1645e
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
> @@ -0,0 +1,26 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns 
> +-fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m) {
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RNE, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c 
> b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
> new file mode 100644
> index 00000000000..4b346d67c27
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
> @@ -0,0 +1,15 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m) {
> +  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
> +  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
> +  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +  __riscv_vse32_v_i32m1 (out + 100, v3, 4); }
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c 
> b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
> new file mode 100644
> index 00000000000..1ca795ce3f4
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
> @@ -0,0 +1,16 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m) {
> +  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
> +  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
> +  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
> +  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +  __riscv_vse32_v_i32m1 (out + 100, v3, 4); }
> +
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c 
> b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
> new file mode 100644
> index 00000000000..5799f731e21
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
> @@ -0,0 +1,18 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns 
> +-fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m) {
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times 
> +{csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]
> +} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c 
> b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
> new file mode 100644
> index 00000000000..13921d4af21
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
> @@ -0,0 +1,26 @@
> +/* { dg-do compile } */
> +/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns 
> +-fno-schedule-insns2" } */
> +
> +#include "riscv_vector.h"
> +
> +void f (void * in, void *out, int32_t x, int n, int m) {
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
> +  }
> +
> +  for (int i = 0; i < n; i++) {
> +    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
> +    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
> +    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
> +    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
> +    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
> +  }
> +}
> +
> +/* { dg-final { scan-assembler-times 
> +{csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]
> +} 1 } } */
> +/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
> --
> 2.36.3
>
Andreas Schwab May 19, 2023, 10:41 a.m. UTC | #4 
In function 'int optimize_mode_switching()',
    inlined from 'virtual unsigned int {anonymous}::pass_mode_switching::execute(function*)' at ../../gcc/mode-switching.cc:909:31:
../../gcc/mode-switching.cc:608:29: error: 'bb_info$' may be used uninitialized [-Werror=maybe-uninitialized]
  608 |                 add_seginfo (info + bb->index, ptr);
      |                 ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
../../gcc/mode-switching.cc: In member function 'virtual unsigned int {anonymous}::pass_mode_switching::execute(function*)':
../../gcc/mode-switching.cc:503:19: note: 'bb_info$' was declared here
  503 |   struct bb_info *bb_info[N_ENTITIES];
      |                   ^~~~~~~
cc1plus: all warnings being treated as errors
make[3]: *** [Makefile:1174: mode-switching.o] Error 1
Li, Pan2 via Gcc-patches May 19, 2023, 12:29 p.m. UTC | #5 
Hi Andreas,

Could you please help to share more information about how to trigger this error? As you don't mentioned, I assume below error comes from X86 build. I take below configuration but failed to reproduce.

mkdir __BUILD_X86 && cd __BUILD_X86
../configure --enable-language=c,c++   --enable-bootstrap   --disable-multilib --prefix=`pwd`/../__INSTALL_X86

make -j $(nproc) && make install

Pan


-----Original Message-----
From: Gcc-patches <gcc-patches-bounces+pan2.li=intel.com@gcc.gnu.org> On Behalf Of Andreas Schwab
Sent: Friday, May 19, 2023 6:41 PM
To: juzhe.zhong@rivai.ai
Cc: gcc-patches@gcc.gnu.org; kito.cheng@gmail.com; kito.cheng@sifive.com; palmer@dabbelt.com; palmer@rivosinc.com; jeffreyalaw@gmail.com; rdapp.gcc@gmail.com
Subject: Re: [PATCH] RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions

In function 'int optimize_mode_switching()',
    inlined from 'virtual unsigned int {anonymous}::pass_mode_switching::execute(function*)' at ../../gcc/mode-switching.cc:909:31:
../../gcc/mode-switching.cc:608:29: error: 'bb_info$' may be used uninitialized [-Werror=maybe-uninitialized]
  608 |                 add_seginfo (info + bb->index, ptr);
      |                 ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
../../gcc/mode-switching.cc: In member function 'virtual unsigned int {anonymous}::pass_mode_switching::execute(function*)':
../../gcc/mode-switching.cc:503:19: note: 'bb_info$' was declared here
  503 |   struct bb_info *bb_info[N_ENTITIES];
      |                   ^~~~~~~
cc1plus: all warnings being treated as errors
make[3]: *** [Makefile:1174: mode-switching.o] Error 1

--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1 "And now for something completely different."
Li, Pan2 via Gcc-patches May 19, 2023, 12:45 p.m. UTC | #6 
Sorry to bother, just tried below build for the RISC-V but failed to reproduce...

../configure \
  --target=riscv64-unknown-elf \
  --prefix=${INSTALL_DIR} \
  --disable-shared \
  --enable-threads \
  --enable-tls \
  --enable-languages=c,c++ \
  --with-system-zlib \
  --with-newlib \
  --disable-libmudflap \
  --disable-libssp \
  --disable-libquadmath \
  --disable-libgomp \
  --enable-nls \
  --disable-tm-clone-registry \
  --enable-multilib \
  --src=`pwd`/../ \
  --with-abi=lp64d \
  --with-arch=rv64imafdcv \
  --with-tune=rocket \
  --with-isa-spec=20191213 \
  --enable-bootstrap \
make -j $(nproc) all-gcc && make install-gcc

Pan

-----Original Message-----
From: Gcc-patches <gcc-patches-bounces+pan2.li=intel.com@gcc.gnu.org> On Behalf Of Li, Pan2 via Gcc-patches
Sent: Friday, May 19, 2023 8:29 PM
To: Andreas Schwab <schwab@linux-m68k.org>; juzhe.zhong@rivai.ai
Cc: gcc-patches@gcc.gnu.org; kito.cheng@gmail.com; kito.cheng@sifive.com; palmer@dabbelt.com; palmer@rivosinc.com; jeffreyalaw@gmail.com; rdapp.gcc@gmail.com
Subject: RE: [PATCH] RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions

Hi Andreas,

Could you please help to share more information about how to trigger this error? As you don't mentioned, I assume below error comes from X86 build. I take below configuration but failed to reproduce.

mkdir __BUILD_X86 && cd __BUILD_X86
../configure --enable-language=c,c++   --enable-bootstrap   --disable-multilib --prefix=`pwd`/../__INSTALL_X86

make -j $(nproc) && make install

Pan


-----Original Message-----
From: Gcc-patches <gcc-patches-bounces+pan2.li=intel.com@gcc.gnu.org> On Behalf Of Andreas Schwab
Sent: Friday, May 19, 2023 6:41 PM
To: juzhe.zhong@rivai.ai
Cc: gcc-patches@gcc.gnu.org; kito.cheng@gmail.com; kito.cheng@sifive.com; palmer@dabbelt.com; palmer@rivosinc.com; jeffreyalaw@gmail.com; rdapp.gcc@gmail.com
Subject: Re: [PATCH] RISC-V: Add mode switching target hook to insert rounding mode config for fixed-point instructions

In function 'int optimize_mode_switching()',
    inlined from 'virtual unsigned int {anonymous}::pass_mode_switching::execute(function*)' at ../../gcc/mode-switching.cc:909:31:
../../gcc/mode-switching.cc:608:29: error: 'bb_info$' may be used uninitialized [-Werror=maybe-uninitialized]
  608 |                 add_seginfo (info + bb->index, ptr);
      |                 ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
../../gcc/mode-switching.cc: In member function 'virtual unsigned int {anonymous}::pass_mode_switching::execute(function*)':
../../gcc/mode-switching.cc:503:19: note: 'bb_info$' was declared here
  503 |   struct bb_info *bb_info[N_ENTITIES];
      |                   ^~~~~~~
cc1plus: all warnings being treated as errors
make[3]: *** [Makefile:1174: mode-switching.o] Error 1

--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1 "And now for something completely different."
Andreas Schwab May 19, 2023, 1:59 p.m. UTC | #7 
This is built with --disable-werror, so it doesn't fail, but the warning
is there:

https://build.opensuse.org/package/live_build_log/devel:gcc:next/gcc14/openSUSE_Factory_RISCV/riscv64
diff mbox series

Patch

diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h
index 1b2e6de5e1b..2a16402265a 100644
--- a/gcc/config/riscv/riscv-opts.h
+++ b/gcc/config/riscv/riscv-opts.h
@@ -91,6 +91,14 @@  enum riscv_multilib_select_kind {
   select_by_abi,
 };
 
+/* ENTITIES in mode switching.  */
+enum riscv_entity
+{
+  RISCV_VXRM = 0,
+  RISCV_FRM,
+  MAX_RISCV_ENTITIES
+};
+
 #define MASK_ZICSR    (1 << 0)
 #define MASK_ZIFENCEI (1 << 1)
 
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index de5b87b1a87..0d1b83f4315 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -7513,6 +7513,95 @@  riscv_vectorize_preferred_vector_alignment (const_tree type)
   return TYPE_ALIGN (type);
 }
 
+/* Implement Mode switching.  */
+
+static void
+riscv_emit_mode_set (int entity, int mode, int prev_mode,
+		     HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
+{
+  switch (entity)
+    {
+    case RISCV_VXRM:
+      if (mode != VXRM_MODE_NONE && mode != prev_mode)
+	emit_insn (gen_vxrmsi (gen_int_mode (mode, SImode)));
+      break;
+    default:
+      gcc_unreachable ();
+    }
+}
+
+/* Return mode that entity must be switched into
+   prior to the execution of insn.  */
+
+static int
+riscv_mode_needed (int entity, rtx_insn *insn)
+{
+  switch (entity)
+    {
+    case RISCV_VXRM:
+      return recog_memoized (insn) >= 0 ? get_attr_vxrm_mode (insn)
+					: VXRM_MODE_NONE;
+    default:
+      gcc_unreachable ();
+    }
+}
+
+/* Return the mode that an insn results in.  */
+
+static int
+riscv_mode_after (int entity, int mode, rtx_insn *insn)
+{
+  switch (entity)
+    {
+    case RISCV_VXRM:
+      if (recog_memoized (insn) >= 0)
+	return reg_mentioned_p (gen_rtx_REG (SImode, VXRM_REGNUM),
+				PATTERN (insn))
+		 ? get_attr_vxrm_mode (insn)
+		 : mode;
+      else
+	return mode;
+    default:
+      gcc_unreachable ();
+    }
+}
+
+/* Return a mode that ENTITY is assumed to be
+   switched to at function entry.  */
+
+static int
+riscv_mode_entry (int entity)
+{
+  switch (entity)
+    {
+    case RISCV_VXRM:
+      return VXRM_MODE_NONE;
+    default:
+      gcc_unreachable ();
+    }
+}
+
+/* Return a mode that ENTITY is assumed to be
+   switched to at function exit.  */
+
+static int
+riscv_mode_exit (int entity)
+{
+  switch (entity)
+    {
+    case RISCV_VXRM:
+      return VXRM_MODE_NONE;
+    default:
+      gcc_unreachable ();
+    }
+}
+
+static int
+riscv_mode_priority (int, int n)
+{
+  return n;
+}
+
 /* Initialize the GCC target structure.  */
 #undef TARGET_ASM_ALIGNED_HI_OP
 #define TARGET_ASM_ALIGNED_HI_OP "\t.half\t"
@@ -7789,6 +7878,21 @@  riscv_vectorize_preferred_vector_alignment (const_tree type)
 #define TARGET_VECTORIZE_PREFERRED_VECTOR_ALIGNMENT \
   riscv_vectorize_preferred_vector_alignment
 
+/* Mode switching hooks.  */
+
+#undef TARGET_MODE_EMIT
+#define TARGET_MODE_EMIT riscv_emit_mode_set
+#undef TARGET_MODE_NEEDED
+#define TARGET_MODE_NEEDED riscv_mode_needed
+#undef TARGET_MODE_AFTER
+#define TARGET_MODE_AFTER riscv_mode_after
+#undef TARGET_MODE_ENTRY
+#define TARGET_MODE_ENTRY riscv_mode_entry
+#undef TARGET_MODE_EXIT
+#define TARGET_MODE_EXIT riscv_mode_exit
+#undef TARGET_MODE_PRIORITY
+#define TARGET_MODE_PRIORITY riscv_mode_priority
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-riscv.h"
diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
index f55bd6112a8..29f2c07ce5d 100644
--- a/gcc/config/riscv/riscv.h
+++ b/gcc/config/riscv/riscv.h
@@ -845,7 +845,7 @@  typedef struct {
   "fs0", "fs1", "fa0", "fa1", "fa2", "fa3", "fa4", "fa5",	\
   "fa6", "fa7", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",	\
   "fs8", "fs9", "fs10","fs11","ft8", "ft9", "ft10","ft11",	\
-  "arg", "frame", "vl", "vtype", "N/A", "N/A", "N/A", "N/A",    \
+  "arg", "frame", "vl", "vtype", "vxrm", "N/A", "N/A", "N/A",   \
   "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",	\
   "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",	\
   "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A",	\
@@ -1107,4 +1107,8 @@  extern void riscv_remove_unneeded_save_restore_calls (void);
    CONST1_RTX for the simplification.  */
 #define VECTOR_STORE_FLAG_VALUE(MODE) CONSTM1_RTX (GET_MODE_INNER (MODE))
 
+/* Mode switching (Lazy code motion) for RVV rounding mode instructions.  */
+#define OPTIMIZE_MODE_SWITCHING(ENTITY) (TARGET_VECTOR)
+#define NUM_MODES_FOR_MODE_SWITCHING {VXRM_MODE_NONE}
+
 #endif /* ! GCC_RISCV_H */
diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
index 91808d6bd2a..a9179931217 100644
--- a/gcc/config/riscv/riscv.md
+++ b/gcc/config/riscv/riscv.md
@@ -284,6 +284,7 @@ 
 ;; Classification of RVV instructions which will be added to each RVV .md pattern and used by scheduler.
 ;; rdvlenb     vector byte length vlenb csrr read
 ;; rdvl        vector length vl csrr read
+;; wrvxrm      vector fixed-point rounding mode write
 ;; vsetvl      vector configuration-setting instrucions
 ;; 7. Vector Loads and Stores
 ;; vlde        vector unit-stride load instructions
@@ -387,7 +388,7 @@ 
    mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul,
    fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip,rotate,
    clmul,min,max,minu,maxu,clz,ctz,cpop,
-   atomic,condmove,crypto,rdvlenb,rdvl,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
+   atomic,condmove,crypto,rdvlenb,rdvl,wrvxrm,vsetvl,vlde,vste,vldm,vstm,vlds,vsts,
    vldux,vldox,vstux,vstox,vldff,vldr,vstr,
    vlsegde,vssegte,vlsegds,vssegts,vlsegdux,vlsegdox,vssegtux,vssegtox,vlsegdff,
    vialu,viwalu,vext,vicalu,vshift,vnshift,vicmp,viminmax,
diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md
index a06b84d7473..1c102943622 100644
--- a/gcc/config/riscv/vector.md
+++ b/gcc/config/riscv/vector.md
@@ -407,6 +407,26 @@ 
 	   (symbol_ref "INTVAL (operands[4])")]
 	(const_int INVALID_ATTRIBUTE)))
 
+;; Defines rounding mode of an fixed-point operation.
+
+(define_attr "vxrm_mode" "rnu,rne,rdn,rod,none"
+  (cond [(and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
+	      (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNU"))
+	 (const_string "rnu")
+
+	 (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
+	      (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RNE"))
+	 (const_string "rne")
+
+	 (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
+	      (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_RDN"))
+	 (const_string "rdn")
+
+	 (and (eq_attr "type" "vsalu,vaalu,vsmul,vsshift,vnclip")
+	      (match_test "INTVAL(operands[9]) == riscv_vector::VXRM_ROD"))
+	 (const_string "rod")]
+	 (const_string "none")))
+
 ;; -----------------------------------------------------------------
 ;; ---- Miscellaneous Operations
 ;; -----------------------------------------------------------------
@@ -584,6 +604,15 @@ 
   "TARGET_VECTOR"
   "")
 
+;; Set VXRM
+(define_insn "vxrmsi"
+  [(set (reg:SI VXRM_REGNUM)
+	(match_operand 0 "const_int_operand" "i"))]
+  "TARGET_VECTOR"
+  "csrwi\tvxrm,%0"
+  [(set_attr "type" "wrvxrm")
+   (set_attr "mode" "SI")])
+
 ;; -----------------------------------------------------------------
 ;; ---- Moves Operations
 ;; -----------------------------------------------------------------
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
new file mode 100644
index 00000000000..a707aa1645e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-10.c
@@ -0,0 +1,26 @@ 
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+void f (void * in, void *out, int32_t x, int n, int m)
+{
+  for (int i = 0; i < n; i++) {
+    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
+    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
+    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
+    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
+    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
+  }
+  
+  for (int i = 0; i < n; i++) {
+    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
+    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
+    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
+    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RNE, 4);
+    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
+  }
+}
+
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
new file mode 100644
index 00000000000..4b346d67c27
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-6.c
@@ -0,0 +1,15 @@ 
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
+
+#include "riscv_vector.h"
+
+void f (void * in, void *out, int32_t x, int n, int m)
+{
+  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
+  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
+  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
+  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
+  __riscv_vse32_v_i32m1 (out + 100, v3, 4);
+}
+
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
new file mode 100644
index 00000000000..1ca795ce3f4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-7.c
@@ -0,0 +1,16 @@ 
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
+
+#include "riscv_vector.h"
+
+void f (void * in, void *out, int32_t x, int n, int m)
+{
+  vint32m1_t v = __riscv_vle32_v_i32m1 (in, 4);
+  vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100, 4);
+  vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RNE, 4);
+  v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
+  __riscv_vse32_v_i32m1 (out + 100, v3, 4);
+}
+
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*1} 1 } } */
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
new file mode 100644
index 00000000000..5799f731e21
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-8.c
@@ -0,0 +1,18 @@ 
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+void f (void * in, void *out, int32_t x, int n, int m)
+{
+  for (int i = 0; i < n; i++) {
+    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
+    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
+    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
+    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
+    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
+  }
+}
+
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]} 1 } } */
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
new file mode 100644
index 00000000000..13921d4af21
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vxrm-9.c
@@ -0,0 +1,26 @@ 
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+void f (void * in, void *out, int32_t x, int n, int m)
+{
+  for (int i = 0; i < n; i++) {
+    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i, 4);
+    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i, 4);
+    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
+    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
+    __riscv_vse32_v_i32m1 (out + 100 + i, v3, 4);
+  }
+  
+  for (int i = 0; i < n; i++) {
+    vint32m1_t v = __riscv_vle32_v_i32m1 (in + i + 1000, 4);
+    vint32m1_t v2 = __riscv_vle32_v_i32m1_tu (v, in + 100 + i + 1000, 4);
+    vint32m1_t v3 = __riscv_vaadd_vx_i32m1 (v2, 0, VXRM_RDN, 4);
+    v3 = __riscv_vaadd_vx_i32m1 (v3, 3, VXRM_RDN, 4);
+    __riscv_vse32_v_i32m1 (out + 100 + i + 1000, v3, 4);
+  }
+}
+
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2\s+vsetivli\s+zero,\s*4,\s*e32,\s*m1,\s*tu,\s*m[au]} 1 } } */
+/* { dg-final { scan-assembler-times {csrwi\s+vxrm,\s*2} 1 } } */