https://gcc.gnu.org/g:f6b9412769a4b8f792bfce23bc6e12b3704916a4

commit f6b9412769a4b8f792bfce23bc6e12b3704916a4
Author: Michael Meissner <[email protected]>
Date:   Thu Nov 12 16:50:03 2026 -0500

    Fix rs6000_expand_vector_set and simplify vpair splitting.
    
    2026-11-12  Michael Meissner  <[email protected]>
    
            * config/rs6000/rs6000-protos.h (split_vector_pair_operands): New
            declaration.
            (rs6000_expand_vector_set): For vector pairs, do the set operation 
by
            storing the vector pair, storing the value to be set, and then 
reloading
            the vector pair.
            (split_vector_pair_operands): New function.
            * config/rs6000/vsx.md (<VPAIR_FP_name><mode>2): Use
            split_vector_pair_operands to split up the operands.
            (nabs<mode>2): Likewise.
            (sqrt<mode>2): Likewise.
            (rsqrte<mode>): Likewise.
            (fre<mode>2): Likewise.
            (<VPAIR_FP_name><mode>3): Likewise.
            (div<mode>3): Likewise.
            (fma<mode>4): Likewise.
            (fms<mode>4): Likewise.
            (nfma<mode>4): Likewise.
            (nfms<mode>4): Likewise.
            (vpair_xxsel<mode>_1): Likewise.
            (vpair_xxsel<mode>_2): Likewise.
            (vpair_xxsel<mode>_3): Likewise.
            (vpair_xxsel<mode>_4): Likewise.

Diff:
---
 gcc/config/rs6000/rs6000-protos.h |   1 +
 gcc/config/rs6000/rs6000.cc       |  70 ++++++++-----
 gcc/config/rs6000/vsx.md          | 204 +++-----------------------------------
 3 files changed, 63 insertions(+), 212 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-protos.h 
b/gcc/config/rs6000/rs6000-protos.h
index 692f72f1b1d4..903c23e76f70 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -274,6 +274,7 @@ typedef enum {
 
 extern vect_const_method vect_const_can_be_generated (vec_const_128bit_type *,
                                                      unsigned *);
+extern void split_vector_pair_operands (size_t, rtx [], machine_mode);
 
 /* From float16.cc.  */
 /* Optimize bfloat16 and float16 operations.  */
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 61754db2c833..2ec65f420e6b 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -7916,38 +7916,29 @@ rs6000_expand_vector_set (rtx target, rtx val, rtx 
elt_rtx)
 {
   machine_mode mode = GET_MODE (target);
   machine_mode inner_mode = GET_MODE_INNER (mode);
-  rtx reg = gen_reg_rtx (mode);
   rtx mask, mem, x;
-  int width = GET_MODE_SIZE (inner_mode);
   int i;
 
-  if (VPAIR_FP_P (mode) && CONST_INT_P (elt_rtx))
-    {
-      size_t nunits = GET_MODE_NUNITS (mode);
-      size_t elt = (size_t) UINTVAL (elt_rtx);
-      size_t v_num;
-      machine_mode v_mode;
+  val = force_reg (GET_MODE (val), val);
 
-      if (BYTES_BIG_ENDIAN)
-       v_num = (elt >= nunits) ? 16 : 0;
-      else
-       v_num = (elt < nunits) ? 16 : 0;
+  /* Vectors that take more than one register like vector pairs need to store
+     the whole vector, store the value and then reload.  */
+  if (GET_MODE_SIZE (mode) > 16)
+    {
+      mem = assign_stack_temp (mode, GET_MODE_SIZE (mode));
+      emit_move_insn (mem, target);
 
-      if (mode == V4DFmode)
-       v_mode = V2DFmode;
-      else if (mode == V8SFmode)
-       v_mode = V4SFmode;
-      else
-       gcc_unreachable ();
+      rtx addr = copy_to_mode_reg (Pmode, XEXP (mem, 0));
+      if (elt_rtx != const0_rtx)
+       emit_insn (gen_add2_insn (addr, elt_rtx));
 
-      rtx v_target = gen_rtx_SUBREG (v_mode, target, v_num);
-      size_t v_nunits = GET_MODE_NUNITS (v_mode);
-      rs6000_expand_vector_set (v_target, val,
-                               GEN_INT (elt % v_nunits));
+      emit_move_insn (change_address (mem, inner_mode, addr), val);
+      emit_move_insn (target, mem);
       return;
     }
 
-  val = force_reg (GET_MODE (val), val);
+  rtx reg = gen_reg_rtx (mode);
+  int width = GET_MODE_SIZE (inner_mode);
 
   if (VECTOR_MEM_VSX_P (mode))
     {
@@ -30384,7 +30375,40 @@ rs6000_opaque_type_invalid_use_p (gimple *stmt)
 
   return false;
 }
+
+/* Split up the operands for vector pair operation into separate operations on
+   each vector register.  Take the first N_OPERANDS from the OPERANDS array and
+   adjust the next n_operands to have the high register and the following
+   n_operands will have the low register.  Each single register operands will
+   use MODE for the machine mode.
+
+   Because vector pair registers are required to be even/odd regiters, we don't
+   have to worry about registers overlapping.
+
+   Unary operations have 2 operands, binary operations have 3 operands, and
+   fma/xxsel operation have 4 operands.  */
+
+void
+split_vector_pair_operands (size_t n_operands,
+                           rtx operands[],
+                           machine_mode mode)
+{
+  size_t hi_regs = n_operands;
+  size_t lo_regs = n_operands * 2;
 
+  gcc_assert (IN_RANGE (n_operands, 2, 4));
+
+  for (size_t i = 0; i < n_operands; i++)
+    {
+      unsigned r = reg_or_subregno (operands[i]);
+      operands[ hi_regs+i ] = gen_rtx_REG (mode, r);
+      operands[ lo_regs+i ] = gen_rtx_REG (mode, r+1);
+    }
+
+  return;
+}
+
+
 #undef TARGET_DOCUMENTATION_NAME
 #define TARGET_DOCUMENTATION_NAME "PowerPC"
 
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 7ae54146724e..931e2647213a 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -7453,15 +7453,7 @@
    (set (match_dup 4)
        (VPAIR_FP_unary:<VPAIR_FP_SINGLE> (match_dup 5)))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-
-  operands[2] = gen_rtx_REG (mode, r0);
-  operands[3] = gen_rtx_REG (mode, r1);
-
-  operands[4] = gen_rtx_REG (mode, r0 + 1);
-  operands[5] = gen_rtx_REG (mode, r1 + 1);
+  split_vector_pair_operands (2, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7482,15 +7474,7 @@
         (abs:<VPAIR_FP_SINGLE>
          (match_dup 5))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-
-  operands[2] = gen_rtx_REG (mode, r0);
-  operands[3] = gen_rtx_REG (mode, r1);
-
-  operands[4] = gen_rtx_REG (mode, r0 + 1);
-  operands[5] = gen_rtx_REG (mode, r1 + 1);
+  split_vector_pair_operands (2, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7521,15 +7505,7 @@
    (set (match_dup 4)
        (sqrt:<VPAIR_FP_SINGLE> (match_dup 5)))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-
-  operands[2] = gen_rtx_REG (mode, r0);
-  operands[3] = gen_rtx_REG (mode, r1);
-
-  operands[4] = gen_rtx_REG (mode, r0 + 1);
-  operands[5] = gen_rtx_REG (mode, r1 + 1);
+  split_vector_pair_operands (2, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<sd>sqrt")
    (set_attr "length" "8")])
@@ -7547,15 +7523,7 @@
    (set (match_dup 4)
        (unspec:<VPAIR_FP_SINGLE> [(match_dup 5)] UNSPEC_RSQRT))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-
-  operands[2] = gen_rtx_REG (mode, r0);
-  operands[3] = gen_rtx_REG (mode, r1);
-
-  operands[4] = gen_rtx_REG (mode, r0 + 1);
-  operands[5] = gen_rtx_REG (mode, r1 + 1);
+  split_vector_pair_operands (2, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7572,15 +7540,7 @@
    (set (match_dup 4)
        (unspec:<VPAIR_FP_SINGLE> [(match_dup 5)] UNSPEC_FRES))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-
-  operands[2] = gen_rtx_REG (mode, r0);
-  operands[3] = gen_rtx_REG (mode, r1);
-
-  operands[4] = gen_rtx_REG (mode, r0 + 1);
-  operands[5] = gen_rtx_REG (mode, r1 + 1);
+  split_vector_pair_operands (2, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7602,18 +7562,7 @@
         (match_dup 7)
         (match_dup 8)))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-
-  operands[3] = gen_rtx_REG (mode, r0);
-  operands[4] = gen_rtx_REG (mode, r1);
-  operands[5] = gen_rtx_REG (mode, r2);
-
-  operands[6] = gen_rtx_REG (mode, r0 + 1);
-  operands[7] = gen_rtx_REG (mode, r1 + 1);
-  operands[8] = gen_rtx_REG (mode, r2 + 1);
+  split_vector_pair_operands (3, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7650,18 +7599,7 @@
         (match_dup 7)
         (match_dup 8)))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-
-  operands[3] = gen_rtx_REG (mode, r0);
-  operands[4] = gen_rtx_REG (mode, r1);
-  operands[5] = gen_rtx_REG (mode, r2);
-
-  operands[6] = gen_rtx_REG (mode, r0 + 1);
-  operands[7] = gen_rtx_REG (mode, r1 + 1);
-  operands[8] = gen_rtx_REG (mode, r2 + 1);
+  split_vector_pair_operands (3, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_div>")
    (set_attr "length" "8")])
@@ -7686,21 +7624,7 @@
         (match_dup 10)
         (match_dup 11)))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7728,21 +7652,7 @@
         (neg:<VPAIR_FP_SINGLE>
          (match_dup 11))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7770,21 +7680,7 @@
          (match_dup 10)
          (match_dup 11))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7815,21 +7711,7 @@
          (neg:<VPAIR_FP_SINGLE>
           (match_dup 11)))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "<VStype_simple>")
    (set_attr "length" "8")])
@@ -7861,21 +7743,7 @@
         (and:<VPAIR_FP_SINGLE> (match_dup 9)
                                (match_dup 11))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "vecmove")
    (set_attr "length" "8")])
@@ -7906,21 +7774,7 @@
         (and:<VPAIR_FP_SINGLE> (match_dup 11)
                                (match_dup 9))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "vecmove")
    (set_attr "length" "8")])
@@ -7951,21 +7805,7 @@
         (and:<VPAIR_FP_SINGLE> (not:<VPAIR_FP_SINGLE> (match_dup 9))
                                (match_dup 11))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "vecmove")
    (set_attr "length" "8")])
@@ -7996,21 +7836,7 @@
         (and:<VPAIR_FP_SINGLE> (not:<VPAIR_FP_SINGLE> (match_dup 10))
                                (match_dup 11))))]
 {
-  machine_mode mode = <VPAIR_FP_SINGLE>mode;
-  unsigned r0 = reg_or_subregno (operands[0]);
-  unsigned r1 = reg_or_subregno (operands[1]);
-  unsigned r2 = reg_or_subregno (operands[2]);
-  unsigned r3 = reg_or_subregno (operands[3]);
-
-  operands[4] = gen_rtx_REG (mode, r0);
-  operands[5] = gen_rtx_REG (mode, r1);
-  operands[6] = gen_rtx_REG (mode, r2);
-  operands[7] = gen_rtx_REG (mode, r3);
-
-  operands[8] = gen_rtx_REG (mode, r0 + 1);
-  operands[9] = gen_rtx_REG (mode, r1 + 1);
-  operands[10] = gen_rtx_REG (mode, r2 + 1);
-  operands[11] = gen_rtx_REG (mode, r3 + 1);
+  split_vector_pair_operands (4, operands, <VPAIR_FP_SINGLE>mode);
 }
   [(set_attr "type" "vecmove")
    (set_attr "length" "8")])

Reply via email to