try multi-reg dest in default_zero_call_used_regs

When the mode of regno_reg_rtx is not hard_regno_mode_ok for the
target, try grouping the register with subsequent ones.  This enables
s16 to s31 and their hidden pairs to be zeroed with the default logic
on some arm variants.

for  gcc/ChangeLog

	* targhooks.cc (default_zero_call_used_regs): Attempt to group
	regs that the target refuses to use in their natural modes.
	(zcur_select_mode_rtx): New.
	* regs.h (struct target_regs): Add x_hard_regno_max_nregs.
	(hard_regno_max_nregs): Define.
	* reginfo.cc (init_reg_modes_target): Set hard_regno_max_nregs.

diff --git a/gcc/reginfo.cc b/gcc/reginfo.cc
index 234f72eceeb25df9933eafe72e9a1a346b4b6800..67e30cab428557f04536c9f97b80ab63d720c81b 100644 (file)
--- a/gcc/reginfo.cc
+++ b/gcc/reginfo.cc
@@ -441,10 +441,15 @@ init_reg_modes_target (void)
 {
   int i, j;
 
+  this_target_regs->x_hard_regno_max_nregs = 1;
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     for (j = 0; j < MAX_MACHINE_MODE; j++)
-      this_target_regs->x_hard_regno_nregs[i][j]
-       = targetm.hard_regno_nregs (i, (machine_mode) j);
+      {
+       unsigned char nregs = targetm.hard_regno_nregs (i, (machine_mode) j);
+       this_target_regs->x_hard_regno_nregs[i][j] = nregs;
+       if (nregs > this_target_regs->x_hard_regno_max_nregs)
+         this_target_regs->x_hard_regno_max_nregs = nregs;
+      }
 
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     {

diff --git a/gcc/regs.h b/gcc/regs.h
index 74f1f63770322554c30b861310bd7865df66f789..f72b06fb5650838eb8e264f1ac9a1e9253ce8ffa 100644 (file)
--- a/gcc/regs.h
+++ b/gcc/regs.h
@@ -202,6 +202,9 @@ struct target_regs {
      registers that a given machine mode occupies.  */
   unsigned char x_hard_regno_nregs[FIRST_PSEUDO_REGISTER][MAX_MACHINE_MODE];
 
+  /* The max value found in x_hard_regno_nregs.  */
+  unsigned char x_hard_regno_max_nregs;
+
   /* For each hard register, the widest mode object that it can contain.
      This will be a MODE_INT mode if the register can hold integers.  Otherwise
      it will be a MODE_FLOAT or a MODE_CC mode, whichever is valid for the
@@ -235,6 +238,8 @@ extern struct target_regs *this_target_regs;
 #else
 #define this_target_regs (&default_target_regs)
 #endif
+#define hard_regno_max_nregs \
+  (this_target_regs->x_hard_regno_max_nregs)
 #define reg_raw_mode \
   (this_target_regs->x_reg_raw_mode)
 #define have_regs_of_mode \

diff --git a/gcc/targhooks.cc b/gcc/targhooks.cc
index fc49235eb38ee3102ea55fe6d23e295b90a1edcc..e22bc66a6c8967f65db5127d5a4823afef3e67af 100644 (file)
--- a/gcc/targhooks.cc
+++ b/gcc/targhooks.cc
@@ -1017,6 +1017,45 @@ default_function_value_regno_p (const unsigned int regno ATTRIBUTE_UNUSED)
 #endif
 }
 
+/* Choose the mode and rtx to use to zero REGNO, storing tem in PMODE and
+   PREGNO_RTX and returning TRUE if successful, otherwise returning FALSE.  If
+   the natural mode for REGNO doesn't work, attempt to group it with subsequent
+   adjacent registers set in TOZERO.  */
+
+static inline bool
+zcur_select_mode_rtx (unsigned int regno, machine_mode *pmode,
+                     rtx *pregno_rtx, HARD_REG_SET tozero)
+{
+  rtx regno_rtx = regno_reg_rtx[regno];
+  machine_mode mode = GET_MODE (regno_rtx);
+
+  /* If the natural mode doesn't work, try some wider mode.  */
+  if (!targetm.hard_regno_mode_ok (regno, mode))
+    {
+      bool found = false;
+      for (int nregs = 2;
+          !found && nregs <= hard_regno_max_nregs
+            && regno + nregs <= FIRST_PSEUDO_REGISTER
+            && TEST_HARD_REG_BIT (tozero,
+                                  regno + nregs - 1);
+          nregs++)
+       {
+         mode = choose_hard_reg_mode (regno, nregs, 0);
+         if (mode == E_VOIDmode)
+           continue;
+         gcc_checking_assert (targetm.hard_regno_mode_ok (regno, mode));
+         regno_rtx = gen_rtx_REG (mode, regno);
+         found = true;
+       }
+      if (!found)
+       return false;
+    }
+
+  *pmode = mode;
+  *pregno_rtx = regno_rtx;
+  return true;
+}
+
 /* The default hook for TARGET_ZERO_CALL_USED_REGS.  */
 
 HARD_REG_SET
@@ -1035,16 +1074,28 @@ default_zero_call_used_regs (HARD_REG_SET need_zeroed_hardregs)
     if (TEST_HARD_REG_BIT (need_zeroed_hardregs, regno))
       {
        rtx_insn *last_insn = get_last_insn ();
-       machine_mode mode = GET_MODE (regno_reg_rtx[regno]);
+       rtx regno_rtx;
+       machine_mode mode;
+
+       if (!zcur_select_mode_rtx (regno, &mode, &regno_rtx,
+                                  need_zeroed_hardregs))
+         {
+           SET_HARD_REG_BIT (failed, regno);
+           continue;
+         }
+
        rtx zero = CONST0_RTX (mode);
-       rtx_insn *insn = emit_move_insn (regno_reg_rtx[regno], zero);
+       rtx_insn *insn = emit_move_insn (regno_rtx, zero);
        if (!valid_insn_p (insn))
          {
            SET_HARD_REG_BIT (failed, regno);
            delete_insns_since (last_insn);
          }
        else
-         progress = true;
+         {
+           progress = true;
+           regno += hard_regno_nregs (regno, mode) - 1;
+         }
       }
 
   /* Now retry with copies from zeroed registers, as long as we've
@@ -1060,7 +1111,18 @@ default_zero_call_used_regs (HARD_REG_SET need_zeroed_hardregs)
       for (unsigned int regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++)
        if (TEST_HARD_REG_BIT (retrying, regno))
          {
-           machine_mode mode = GET_MODE (regno_reg_rtx[regno]);
+           rtx regno_rtx;
+           machine_mode mode;
+
+           /* This might select registers we've already zeroed.  If grouping
+              with them is what it takes to get regno zeroed, so be it.  */
+           if (!zcur_select_mode_rtx (regno, &mode, &regno_rtx,
+                                      need_zeroed_hardregs))
+             {
+               SET_HARD_REG_BIT (failed, regno);
+               continue;
+             }
+
            bool success = false;
            /* Look for a source.  */
            for (unsigned int src = 0; src < FIRST_PSEUDO_REGISTER; src++)
@@ -1086,8 +1148,8 @@ default_zero_call_used_regs (HARD_REG_SET need_zeroed_hardregs)
 
                /* SRC is usable, try to copy from it.  */
                rtx_insn *last_insn = get_last_insn ();
-               rtx zsrc = gen_rtx_REG (mode, src);
-               rtx_insn *insn = emit_move_insn (regno_reg_rtx[regno], zsrc);
+               rtx src_rtx = gen_rtx_REG (mode, src);
+               rtx_insn *insn = emit_move_insn (regno_rtx, src_rtx);
                if (!valid_insn_p (insn))
                  /* It didn't work, remove any inserts.  We'll look
                     for another SRC.  */
@@ -1100,13 +1162,16 @@ default_zero_call_used_regs (HARD_REG_SET need_zeroed_hardregs)
                  }
              }
 
-           /* If nothing worked for REGNO this round, marked it to be
+           /* If nothing worked for REGNO this round, mark it to be
               retried if we get another round.  */
            if (!success)
              SET_HARD_REG_BIT (failed, regno);
            else
-             /* Take note so as to enable another round if needed.  */
-             progress = true;
+             {
+               /* Take note so as to enable another round if needed.  */
+               progress = true;
+               regno += hard_regno_nregs (regno, mode) - 1;
+             }
          }
     }