From 5e8edf67f8abf795451cd19847d2a082094738e5 Mon Sep 17 00:00:00 2001 From: Alan Lawrence Date: Mon, 21 Sep 2015 10:38:27 +0000 Subject: [PATCH] [RS6000] Migrate from reduc_xxx to reduc_xxx_scal optabs * config/rs6000/altivec.md (reduc_splus_): Rename to... (reduc_plus_scal_): ...this, add rs6000_expand_vector_extract. (reduc_uplus_v16qi): Remove. * config/rs6000/vector.md (VEC_reduc_name): Change "splus" to "plus". (reduc__v2df): Remove. (reduc__v4sf): Remove. (reduc__scal_): New. * config/rs6000/vsx.md (vsx_reduc__v2df): Declare gen_ function by removing * prefix. (vsx_reduc__v4sf): Likewise. From-SVN: r227965 --- gcc/ChangeLog | 15 ++++++++++++ gcc/config/rs6000/altivec.md | 25 +++++-------------- gcc/config/rs6000/vector.md | 47 +++++++++++++++--------------------- gcc/config/rs6000/vsx.md | 4 +-- 4 files changed, 42 insertions(+), 49 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 970ebae979f..ce9a20f0eb1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2015-09-21 Alan Lawrence + + * config/rs6000/altivec.md (reduc_splus_): Rename to... + (reduc_plus_scal_): ...this, add rs6000_expand_vector_extract. + (reduc_uplus_v16qi): Remove. + + * config/rs6000/vector.md (VEC_reduc_name): Change "splus" to "plus". + (reduc__v2df): Remove. + (reduc__v4sf): Remove. + (reduc__scal_): New. + + * config/rs6000/vsx.md (vsx_reduc__v2df): Declare + gen_ function by removing * prefix. + (vsx_reduc__v4sf): Likewise. + 2015-09-21 Manuel López-Ibáñez PR middle-end/60832 diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md index 9cacca49050..5f6c0f5540e 100644 --- a/gcc/config/rs6000/altivec.md +++ b/gcc/config/rs6000/altivec.md @@ -2658,35 +2658,22 @@ operands[3] = gen_reg_rtx (GET_MODE (operands[0])); }) -(define_expand "reduc_splus_" - [(set (match_operand:VIshort 0 "register_operand" "=v") +(define_expand "reduc_plus_scal_" + [(set (match_operand: 0 "register_operand" "=v") (unspec:VIshort [(match_operand:VIshort 1 "register_operand" "v")] UNSPEC_REDUC_PLUS))] "TARGET_ALTIVEC" { rtx vzero = gen_reg_rtx (V4SImode); rtx vtmp1 = gen_reg_rtx (V4SImode); - rtx dest = gen_lowpart (V4SImode, operands[0]); + rtx vtmp2 = gen_reg_rtx (mode); + rtx dest = gen_lowpart (V4SImode, vtmp2); + int elt = BYTES_BIG_ENDIAN ? GET_MODE_NUNITS (mode) - 1 : 0; emit_insn (gen_altivec_vspltisw (vzero, const0_rtx)); emit_insn (gen_altivec_vsum4ss (vtmp1, operands[1], vzero)); emit_insn (gen_altivec_vsumsws_direct (dest, vtmp1, vzero)); - DONE; -}) - -(define_expand "reduc_uplus_v16qi" - [(set (match_operand:V16QI 0 "register_operand" "=v") - (unspec:V16QI [(match_operand:V16QI 1 "register_operand" "v")] - UNSPEC_REDUC_PLUS))] - "TARGET_ALTIVEC" -{ - rtx vzero = gen_reg_rtx (V4SImode); - rtx vtmp1 = gen_reg_rtx (V4SImode); - rtx dest = gen_lowpart (V4SImode, operands[0]); - - emit_insn (gen_altivec_vspltisw (vzero, const0_rtx)); - emit_insn (gen_altivec_vsum4ubs (vtmp1, operands[1], vzero)); - emit_insn (gen_altivec_vsumsws_direct (dest, vtmp1, vzero)); + rs6000_expand_vector_extract (operands[0], vtmp2, elt); DONE; }) diff --git a/gcc/config/rs6000/vector.md b/gcc/config/rs6000/vector.md index 8821dec5989..d8699c8a032 100644 --- a/gcc/config/rs6000/vector.md +++ b/gcc/config/rs6000/vector.md @@ -78,7 +78,7 @@ ;; Vector reduction code iterators (define_code_iterator VEC_reduc [plus smin smax]) -(define_code_attr VEC_reduc_name [(plus "splus") +(define_code_attr VEC_reduc_name [(plus "plus") (smin "smin") (smax "smax")]) @@ -1061,38 +1061,29 @@ "") ;; Vector reduction expanders for VSX - -(define_expand "reduc__v2df" - [(parallel [(set (match_operand:V2DF 0 "vfloat_operand" "") - (VEC_reduc:V2DF - (vec_concat:V2DF - (vec_select:DF - (match_operand:V2DF 1 "vfloat_operand" "") - (parallel [(const_int 1)])) - (vec_select:DF - (match_dup 1) - (parallel [(const_int 0)]))) - (match_dup 1))) - (clobber (match_scratch:V2DF 2 ""))])] - "VECTOR_UNIT_VSX_P (V2DFmode)" - "") - -; The (VEC_reduc:V4SF +; The (VEC_reduc:... ; (op1) -; (unspec:V4SF [(const_int 0)] UNSPEC_REDUC)) +; (unspec:... [(const_int 0)] UNSPEC_REDUC)) ; ; is to allow us to use a code iterator, but not completely list all of the ; vector rotates, etc. to prevent canonicalization -(define_expand "reduc__v4sf" - [(parallel [(set (match_operand:V4SF 0 "vfloat_operand" "") - (VEC_reduc:V4SF - (unspec:V4SF [(const_int 0)] UNSPEC_REDUC) - (match_operand:V4SF 1 "vfloat_operand" ""))) - (clobber (match_scratch:V4SF 2 "")) - (clobber (match_scratch:V4SF 3 ""))])] - "VECTOR_UNIT_VSX_P (V4SFmode)" - "") + +(define_expand "reduc__scal_" + [(match_operand: 0 "register_operand" "") + (VEC_reduc:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") + (unspec:VEC_F [(const_int 0)] UNSPEC_REDUC))] + "VECTOR_UNIT_VSX_P (mode)" + { + rtx vec = gen_reg_rtx (mode); + rtx elt = BYTES_BIG_ENDIAN + ? gen_int_mode (GET_MODE_NUNITS (mode) - 1, QImode) + : const0_rtx; + emit_insn (gen_vsx_reduc__ (vec, + operand1)); + emit_insn (gen_vsx_extract_ (operand0, vec, elt)); + DONE; + }) ;;; Expanders for vector insn patterns shared between the SPE and TARGET_PAIRED systems. diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md index 7f366b8d69a..0e110ae2f7f 100644 --- a/gcc/config/rs6000/vsx.md +++ b/gcc/config/rs6000/vsx.md @@ -2289,7 +2289,7 @@ ;; Vector reduction insns and splitters -(define_insn_and_split "*vsx_reduc__v2df" +(define_insn_and_split "vsx_reduc__v2df" [(set (match_operand:V2DF 0 "vfloat_operand" "=&wd,&?wa,wd,?wa") (VEC_reduc:V2DF (vec_concat:V2DF @@ -2317,7 +2317,7 @@ [(set_attr "length" "8") (set_attr "type" "veccomplex")]) -(define_insn_and_split "*vsx_reduc__v4sf" +(define_insn_and_split "vsx_reduc__v4sf" [(set (match_operand:V4SF 0 "vfloat_operand" "=wf,?wa") (VEC_reduc:V4SF (unspec:V4SF [(const_int 0)] UNSPEC_REDUC) -- 2.30.2