diff --git a/gcc/config/loongarch/lasx.md b/gcc/config/loongarch/lasx.md index 4ac85b7fcf9325de30933b9322ffe8b9c3d10d6e..e4505c1660d1ec64d9cebf506d5119037ded4c49 100644 --- a/gcc/config/loongarch/lasx.md +++ b/gcc/config/loongarch/lasx.md @@ -43,9 +43,7 @@ UNSPEC_LASX_XVSAT_U UNSPEC_LASX_XVREPL128VEI UNSPEC_LASX_XVSRAR - UNSPEC_LASX_XVSRARI UNSPEC_LASX_XVSRLR - UNSPEC_LASX_XVSRLRI UNSPEC_LASX_XVSHUF UNSPEC_LASX_XVSHUF_B UNSPEC_LASX_BRANCH @@ -2035,16 +2033,6 @@ [(set_attr "type" "simd_shift") (set_attr "mode" "<MODE>")]) -(define_insn "lasx_xvsrari_<lasxfmt>" - [(set (match_operand:ILASX 0 "register_operand" "=f") - (unspec:ILASX [(match_operand:ILASX 1 "register_operand" "f") - (match_operand 2 "const_<bitimm256>_operand" "")] - UNSPEC_LASX_XVSRARI))] - "ISA_HAS_LASX" - "xvsrari.<lasxfmt>\t%u0,%u1,%2" - [(set_attr "type" "simd_shift") - (set_attr "mode" "<MODE>")]) - (define_insn "lasx_xvsrlr_<lasxfmt>" [(set (match_operand:ILASX 0 "register_operand" "=f") (unspec:ILASX [(match_operand:ILASX 1 "register_operand" "f") @@ -2055,16 +2043,6 @@ [(set_attr "type" "simd_shift") (set_attr "mode" "<MODE>")]) -(define_insn "lasx_xvsrlri_<lasxfmt>" - [(set (match_operand:ILASX 0 "register_operand" "=f") - (unspec:ILASX [(match_operand:ILASX 1 "register_operand" "f") - (match_operand 2 "const_<bitimm256>_operand" "")] - UNSPEC_LASX_XVSRLRI))] - "ISA_HAS_LASX" - "xvsrlri.<lasxfmt>\t%u0,%u1,%2" - [(set_attr "type" "simd_shift") - (set_attr "mode" "<MODE>")]) - (define_insn "lasx_xvssub_s_<lasxfmt>" [(set (match_operand:ILASX 0 "register_operand" "=f") (ss_minus:ILASX (match_operand:ILASX 1 "register_operand" "f") diff --git a/gcc/config/loongarch/lsx.md b/gcc/config/loongarch/lsx.md index 9d7254768ae34707906768ea8b769e52b49c0ff1..c35826ffc0e1ea3bf46819a1065d3f0d92e6db5f 100644 --- a/gcc/config/loongarch/lsx.md +++ b/gcc/config/loongarch/lsx.md @@ -44,9 +44,7 @@ UNSPEC_LSX_VSAT_S UNSPEC_LSX_VSAT_U UNSPEC_LSX_VSRAR - UNSPEC_LSX_VSRARI UNSPEC_LSX_VSRLR - UNSPEC_LSX_VSRLRI UNSPEC_LSX_VSHUF UNSPEC_LSX_VEXTW_S UNSPEC_LSX_VEXTW_U @@ -1710,16 +1708,6 @@ [(set_attr "type" "simd_shift") (set_attr "mode" "<MODE>")]) -(define_insn "lsx_vsrari_<lsxfmt>" - [(set (match_operand:ILSX 0 "register_operand" "=f") - (unspec:ILSX [(match_operand:ILSX 1 "register_operand" "f") - (match_operand 2 "const_<bitimm>_operand" "")] - UNSPEC_LSX_VSRARI))] - "ISA_HAS_LSX" - "vsrari.<lsxfmt>\t%w0,%w1,%2" - [(set_attr "type" "simd_shift") - (set_attr "mode" "<MODE>")]) - (define_insn "lsx_vsrlr_<lsxfmt>" [(set (match_operand:ILSX 0 "register_operand" "=f") (unspec:ILSX [(match_operand:ILSX 1 "register_operand" "f") @@ -1730,16 +1718,6 @@ [(set_attr "type" "simd_shift") (set_attr "mode" "<MODE>")]) -(define_insn "lsx_vsrlri_<lsxfmt>" - [(set (match_operand:ILSX 0 "register_operand" "=f") - (unspec:ILSX [(match_operand:ILSX 1 "register_operand" "f") - (match_operand 2 "const_<bitimm>_operand" "")] - UNSPEC_LSX_VSRLRI))] - "ISA_HAS_LSX" - "vsrlri.<lsxfmt>\t%w0,%w1,%2" - [(set_attr "type" "simd_shift") - (set_attr "mode" "<MODE>")]) - (define_insn "lsx_vssub_s_<lsxfmt>" [(set (match_operand:ILSX 0 "register_operand" "=f") (ss_minus:ILSX (match_operand:ILSX 1 "register_operand" "f") diff --git a/gcc/config/loongarch/simd.md b/gcc/config/loongarch/simd.md index 45d2bcaec2ea91fb3028c341154ba28eec898bf6..5e7bd49eaa24794c31e6d54f4778ae9738bb1d4f 100644 --- a/gcc/config/loongarch/simd.md +++ b/gcc/config/loongarch/simd.md @@ -932,6 +932,35 @@ DONE; }) +;; Integer shift right with rounding. +(define_insn "simd_<optab>_imm_round_<mode>" + [(set (match_operand:IVEC 0 "register_operand" "=f") + (any_shiftrt:IVEC + (plus:IVEC + (match_operand:IVEC 1 "register_operand" "f") + (match_operand:IVEC 2 "const_vector_same_val_operand" "Uuvx")) + (match_operand:SI 3 "const_<bitimm>_operand" "I")))] + "(HOST_WIDE_INT_1U << UINTVAL (operands[3]) >> 1) + == UINTVAL (CONST_VECTOR_ELT (operands[2], 0))" + "<x>v<insn>ri.<simdfmt>\t%<wu>0,%<wu>1,%d3" + [(set_attr "type" "simd_shift") + (set_attr "mode" "<MODE>")]) + +(define_expand "<simd_isa>_<x>v<insn>ri_<simdfmt>" + [(match_operand:IVEC 0 "register_operand" "=f") + (match_operand:IVEC 1 "register_operand" " f") + (match_operand 2 "const_<bitimm>_operand") + (any_shiftrt (const_int 0) (const_int 0))] + "" +{ + auto addend = HOST_WIDE_INT_1U << UINTVAL (operands[2]) >> 1; + rtx addend_v = loongarch_gen_const_int_vector (<MODE>mode, addend); + + emit_insn (gen_simd_<optab>_imm_round_<mode> (operands[0], operands[1], + addend_v, operands[2])); + DONE; +}) + ; The LoongArch SX Instructions. (include "lsx.md") diff --git a/gcc/testsuite/gcc.target/loongarch/vect-shift-imm-round.c b/gcc/testsuite/gcc.target/loongarch/vect-shift-imm-round.c new file mode 100644 index 0000000000000000000000000000000000000000..6f16566ba9bf434d53ae5484ef06ba4498c7774f --- /dev/null +++ b/gcc/testsuite/gcc.target/loongarch/vect-shift-imm-round.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -march=loongarch64 -mlsx" } */ +/* { dg-final { scan-assembler "vsrari\\.w\t\\\$vr\[0-9\]+,\\\$vr\[0-9\]+,15" } } */ + +int x __attribute__ ((vector_size (16))); + +void +f (void) +{ + x = (x + (1 << 14)) >> 15; +}