Patchwork New optimization for reload_combine

login
register
mail settings
Submitter Bernd Schmidt
Date July 16, 2010, 10:34 a.m.
Message ID <4C4035C3.9080305@codesourcery.com>
Download mbox | patch
Permalink /patch/59091/
State New
Headers show

Comments

Bernd Schmidt - July 16, 2010, 10:34 a.m.
This fixes one subproblem of PR42235.  In reload_combine, we recognize a
new pattern:

 REG1 = REG2 + CONST
 ...
 something MEM (REG1)

and try to use the addition in the MEM directly, moving the add insn
downwards if REG1 and REG2 are identical.  This has two benefits: it may
be possible to eliminate the add, and the load no longer depends on the
add instruction and may schedule sooner.

This can make the generated code quite a lot nicer:

-       adds    r3, r2, #2
        strb    r5, [r2, #0]
-       strb    r5, [r3, #0]
-       adds    r3, r2, #3
+       strb    r5, [r2, #2]
        strb    r5, [r2, #1]
-       strb    r5, [r3, #0]
-       adds    r3, r2, #4
+       strb    r5, [r2, #3]
        lsrs    r1, r1, #11
-       strb    r5, [r3, #0]
-       adds    r3, r2, #5
+       strb    r5, [r2, #4]
        add     r1, r1, r1, lsl #1
-       strb    r5, [r3, #0]
+       strb    r5, [r2, #5]

Bootstrapped and regression tested on i686-linux.  Also tested on
    qemu-system-armv7/arch=armv7-a/thumb
    qemu-system-armv7/thumb
    qemu-system-armv7

Does postreload.c fall under reload?  If not, would someone approve this?


Bernd
PR target/42235
	* postreload.c (reload_cse_move2add): Return bool, true if anything.
	changed.  All callers changed.
	(move2add_use_add2_insn): Likewise.
	(move2add_use_add3_insn): Likewise.
	(reload_cse_regs): If reload_cse_move2add changed anything, rerun
	reload_combine.
	(RELOAD_COMBINE_MAX_USES): Bump to 16.
	(last_jump_ruid): New static variable.
	(struct reg_use): New members CONTAINING_MEM and RUID.
	(reg_state): New members ALL_OFFSETS_MATCH and REAL_STORE_RUID.
	(reload_combine_split_one_ruid, reload_combine_split_ruids,
	reload_combine_purge_insn_uses, reload_combine_closest_single_use
	reload_combine_purge_reg_uses_after_ruid,
	reload_combine_recognize_const_pattern): New static functions.
	(reload_combine_recognize_pattern): Verify that ALL_OFFSETS_MATCH
	is true for our reg and that we have available index regs.
	(reload_combine_note_use): New args RUID and CONTAINING_MEM.  All
	callers changed.  Use them to initialize fields in struct reg_use.
	(reload_combine): Initialize last_jump_ruid.  Be careful when to
	take PREV_INSN of the scanned insn.  Update REAL_STORE_RUID fields.
	Call reload_combine_recognize_const_pattern.
	(reload_combine_note_store): Update REAL_STORE_RUID field.

	* gcc.target/arm/pr42235.c: New test.
Jeff Law - July 16, 2010, 6:32 p.m.
On 07/16/10 04:34, Bernd Schmidt wrote:
> This fixes one subproblem of PR42235.  In reload_combine, we recognize a
> new pattern:
>
>   REG1 = REG2 + CONST
>   ...
>   something MEM (REG1)
>
> and try to use the addition in the MEM directly, moving the add insn
> downwards if REG1 and REG2 are identical.  This has two benefits: it may
> be possible to eliminate the add, and the load no longer depends on the
> add instruction and may schedule sooner.
>
> This can make the generated code quite a lot nicer:
>
> -       adds    r3, r2, #2
>          strb    r5, [r2, #0]
> -       strb    r5, [r3, #0]
> -       adds    r3, r2, #3
> +       strb    r5, [r2, #2]
>          strb    r5, [r2, #1]
> -       strb    r5, [r3, #0]
> -       adds    r3, r2, #4
> +       strb    r5, [r2, #3]
>          lsrs    r1, r1, #11
> -       strb    r5, [r3, #0]
> -       adds    r3, r2, #5
> +       strb    r5, [r2, #4]
>          add     r1, r1, r1, lsl #1
> -       strb    r5, [r3, #0]
> +       strb    r5, [r2, #5]
>
> Bootstrapped and regression tested on i686-linux.  Also tested on
>      qemu-system-armv7/arch=armv7-a/thumb
>      qemu-system-armv7/thumb
>      qemu-system-armv7
>
> Does postreload.c fall under reload?  If not, would someone approve this?
>    
I'm not sure if it falls under reload or not, regardless, I'll make a 
few comments and approve :-)

+/* Describes a recorded use of a register.  */
+struct reg_use
+{
+  /* The insn where a register has been used.  */
+  rtx insn;
+  /* The reverse uid of the insn.  */
+  int ruid;
+  /* Points to the memory reference enclosing the use, if any, NULL_RTX
+     otherwise.  */
+  rtx containing_mem;
+  /* Location of the register withing INSN.  */
+  rtx *usep;
+};
Probably worth moving the int field to the end to avoid potentially 
unnecessary padding if someone adds other int-sized fields in the future.

  static struct
    {
      struct reg_use reg_use[RELOAD_COMBINE_MAX_USES];
      int use_index;
      rtx offset;
+    bool all_offsets_match;
      int store_ruid;
+    int real_store_ruid;
      int use_ruid;
    } reg_state[FIRST_PSEUDO_REGISTER];

SImilarly, but in this case I think moving the offset field up and the 
all_offsets_match field down is the way to go.

We're probably not talking about a huge issue, but we might as well take 
the more compact packing when we can get it.

Otherwise it looks fine.  Pre-approved after juggling the structure orders.

jeff
Paolo Bonzini - July 16, 2010, 7:45 p.m.
On 07/16/2010 12:34 PM, Bernd Schmidt wrote:
> This fixes one subproblem of PR42235.  In reload_combine, we recognize a
> new pattern:
>
>   REG1 = REG2 + CONST
>   ...
>   something MEM (REG1)
>
> and try to use the addition in the MEM directly, moving the add insn
> downwards if REG1 and REG2 are identical.  This has two benefits: it may
> be possible to eliminate the add, and the load no longer depends on the
> add instruction and may schedule sooner.
>
> This can make the generated code quite a lot nicer:
>
> -       adds    r3, r2, #2
>          strb    r5, [r2, #0]
> -       strb    r5, [r3, #0]
> -       adds    r3, r2, #3
> +       strb    r5, [r2, #2]
>          strb    r5, [r2, #1]
> -       strb    r5, [r3, #0]
> -       adds    r3, r2, #4
> +       strb    r5, [r2, #3]
>          lsrs    r1, r1, #11
> -       strb    r5, [r3, #0]
> -       adds    r3, r2, #5
> +       strb    r5, [r2, #4]
>          add     r1, r1, r1, lsl #1
> -       strb    r5, [r3, #0]
> +       strb    r5, [r2, #5]

Nice. :)  I suppose fwprop doesn't do it because the memory accesses are 
not present before reload?

Can you make the change dependent on

   bool speed = optimize_bb_for_speed_p (BLOCK_FOR_INSN (insn));

   /* Prefer the new address if it is less expensive.  */
   gain = (address_cost (old_rtx, mode, as, speed)
           - address_cost (new_rtx, mode, as, speed));

   /* If the addresses have equivalent cost, prefer the new address
      if it has the highest `rtx_cost'.  That has the potential of
      eliminating the most insns without additional costs, and it
      is the same that cse.c used to do.  */
   if (gain == 0)
     gain = rtx_cost (new_rtx, SET, speed) - rtx_cost (old_rtx, SET, speed);

   return (gain > 0);

as in fwprop (in turn taken from CSE)?

> Does postreload.c fall under reload?  If not, would someone approve this?

Well, it was part of reload1.c until a while ago...

Paolo
Bernd Schmidt - July 16, 2010, 7:54 p.m.
On 07/16/2010 09:45 PM, Paolo Bonzini wrote:
> On 07/16/2010 12:34 PM, Bernd Schmidt wrote:

>> This can make the generated code quite a lot nicer:
>>
>> -       adds    r3, r2, #2
>>          strb    r5, [r2, #0]
>> -       strb    r5, [r3, #0]
>> -       adds    r3, r2, #3
>> +       strb    r5, [r2, #2]
>>          strb    r5, [r2, #1]
>> -       strb    r5, [r3, #0]
>> -       adds    r3, r2, #4
>> +       strb    r5, [r2, #3]
>>          lsrs    r1, r1, #11
>> -       strb    r5, [r3, #0]
>> -       adds    r3, r2, #5
>> +       strb    r5, [r2, #4]
>>          add     r1, r1, r1, lsl #1
>> -       strb    r5, [r3, #0]
>> +       strb    r5, [r2, #5]
> 
> Nice. :)  I suppose fwprop doesn't do it because the memory accesses are
> not present before reload?

I haven't checked, but I guess in many cases (i.e. anything
stack-relative) that's the case.  Also, some of the adds are produced by
reload_cse_move2add.

> Can you make the change dependent on
> 
>   bool speed = optimize_bb_for_speed_p (BLOCK_FOR_INSN (insn));
> 
>   /* Prefer the new address if it is less expensive.  */
>   gain = (address_cost (old_rtx, mode, as, speed)
>           - address_cost (new_rtx, mode, as, speed));
> 
>   /* If the addresses have equivalent cost, prefer the new address
>      if it has the highest `rtx_cost'.  That has the potential of
>      eliminating the most insns without additional costs, and it
>      is the same that cse.c used to do.  */
>   if (gain == 0)
>     gain = rtx_cost (new_rtx, SET, speed) - rtx_cost (old_rtx, SET, speed);
> 
>   return (gain > 0);
> 
> as in fwprop (in turn taken from CSE)?

I guess I can use address_cost instead of rtx_cost.  I'll make the
change if it still gives me good results.  The extra rtx_cost check you
quoted doesn't seem worthwhile here, as the goal mentioned in the
comment (i.e, eliminating the add) is achievable only if we do the
replacement every time.

As a followup, it would be nice to compute all the costs before
replacing anything, and taking into account whether the add is dead.


Bernd
Paolo Bonzini - July 16, 2010, 8:24 p.m.
>> Can you make the change dependent on
>>
>>    bool speed = optimize_bb_for_speed_p (BLOCK_FOR_INSN (insn));
>>
>>    /* Prefer the new address if it is less expensive.  */
>>    gain = (address_cost (old_rtx, mode, as, speed)
>>            - address_cost (new_rtx, mode, as, speed));
>>
>>    /* If the addresses have equivalent cost, prefer the new address
>>       if it has the highest `rtx_cost'.  That has the potential of
>>       eliminating the most insns without additional costs, and it
>>       is the same that cse.c used to do.  */
>>    if (gain == 0)
>>      gain = rtx_cost (new_rtx, SET, speed) - rtx_cost (old_rtx, SET, speed);
>>
>>    return (gain>  0);
>>
>> as in fwprop (in turn taken from CSE)?
>
> I guess I can use address_cost instead of rtx_cost.  I'll make the
> change if it still gives me good results.  The extra rtx_cost check you
> quoted doesn't seem worthwhile here, as the goal mentioned in the
> comment (i.e, eliminating the add) is achievable only if we do the
> replacement every time.

That one is also covering the default definition of address_cost, which 
is that everything has the same cost.  You can of course change "gain > 
0" to test for >= instead.

Paolo
Mark Mitchell - July 19, 2010, 4:11 p.m.
Paolo Bonzini wrote:

>> Does postreload.c fall under reload?  If not, would someone approve this?
> 
> Well, it was part of reload1.c until a while ago...

Without commenting on the patch (which Jeff has already reviewed), I
think that postreload should fall in the scope of "reload maintainer".
Does anyone object?
Jeff Law - July 19, 2010, 4:12 p.m.
On 07/19/10 10:11, Mark Mitchell wrote:
> Paolo Bonzini wrote:
>
>    
>>> Does postreload.c fall under reload?  If not, would someone approve this?
>>>        
>> Well, it was part of reload1.c until a while ago...
>>      
> Without commenting on the patch (which Jeff has already reviewed), I
> think that postreload should fall in the scope of "reload maintainer".
> Does anyone object?
>    
Nope.  Sounds quite reasonable to me.

jeff
Paolo Bonzini - July 19, 2010, 4:31 p.m.
On 07/19/2010 06:11 PM, Mark Mitchell wrote:
> Paolo Bonzini wrote:
>
>>> Does postreload.c fall under reload?  If not, would someone approve this?
>>
>> Well, it was part of reload1.c until a while ago...
>
> Without commenting on the patch (which Jeff has already reviewed), I
> think that postreload should fall in the scope of "reload maintainer".
> Does anyone object?

It was even part of reload1.c some years ago.

Paolo
IainS - July 26, 2010, 10:12 a.m.
Hi Bernd,

Apparently, one more problem remains...

On 16 Jul 2010, at 11:34, Bernd Schmidt wrote:
> <rc-newpattern.diff>

This causes a bootstrap fail on powerpc64-darwin9 (when building GMP/ 
MPFR/MPC in tree)
(libgfortran fails to build because of a bad header, which is caused  
by an MPFR fail).

to cut a long story short ...

MPFR built with powerpc*-darwin9 @ m64 162270 fails its built-in  
check  [12 fails out of 148 tests] (it passes at 162269).
It still fails at head with the same problem (despite the other fixes).

I have no other powerpc64- execute target, so I can't tell if it's  
platform-related or cpu-wide.
Having said that, ISTM that most people do not build mp* in-tree, so  
this issue might be missed by them, hence copied to David.

I've checked {i686,x86_64}-darwin9 and they do _not_ show this problem.

This is independent of my darwin64 PPC ABI fixes (i.e. applying those  
does not alter the problem).

It fails on the stage1 compiler, so that should help debug (and I  
guess it's not a gtoggle issue).
and I've kept the builds of MPFR(162269) and (162270) .. (although  
they are normal, optimized objects).

cheers,
Iain

Patch

Index: postreload.c
===================================================================
--- postreload.c	(revision 162228)
+++ postreload.c	(working copy)
@@ -56,10 +56,10 @@  static int reload_cse_simplify_set (rtx,
 static int reload_cse_simplify_operands (rtx, rtx);
 
 static void reload_combine (void);
-static void reload_combine_note_use (rtx *, rtx);
+static void reload_combine_note_use (rtx *, rtx, int, rtx);
 static void reload_combine_note_store (rtx, const_rtx, void *);
 
-static void reload_cse_move2add (rtx);
+static bool reload_cse_move2add (rtx);
 static void move2add_note_store (rtx, const_rtx, void *);
 
 /* Call cse / combine like post-reload optimization phases.
@@ -67,11 +67,16 @@  static void move2add_note_store (rtx, co
 void
 reload_cse_regs (rtx first ATTRIBUTE_UNUSED)
 {
+  bool moves_converted;
   reload_cse_regs_1 (first);
   reload_combine ();
-  reload_cse_move2add (first);
+  moves_converted = reload_cse_move2add (first);
   if (flag_expensive_optimizations)
-    reload_cse_regs_1 (first);
+    {
+      if (moves_converted)
+	reload_combine ();
+      reload_cse_regs_1 (first);
+    }
 }
 
 /* See whether a single set SET is a noop.  */
@@ -660,29 +665,42 @@  reload_cse_simplify_operands (rtx insn, 
 
 /* The maximum number of uses of a register we can keep track of to
    replace them with reg+reg addressing.  */
-#define RELOAD_COMBINE_MAX_USES 6
+#define RELOAD_COMBINE_MAX_USES 16
 
-/* INSN is the insn where a register has been used, and USEP points to the
-   location of the register within the rtl.  */
-struct reg_use { rtx insn, *usep; };
+/* Describes a recorded use of a register.  */
+struct reg_use
+{
+  /* The insn where a register has been used.  */
+  rtx insn;
+  /* The reverse uid of the insn.  */
+  int ruid;
+  /* Points to the memory reference enclosing the use, if any, NULL_RTX
+     otherwise.  */
+  rtx containing_mem;
+  /* Location of the register withing INSN.  */
+  rtx *usep;
+};
 
 /* If the register is used in some unknown fashion, USE_INDEX is negative.
    If it is dead, USE_INDEX is RELOAD_COMBINE_MAX_USES, and STORE_RUID
-   indicates where it becomes live again.
+   indicates where it is first set or clobbered.
    Otherwise, USE_INDEX is the index of the last encountered use of the
-   register (which is first among these we have seen since we scan backwards),
-   OFFSET contains the constant offset that is added to the register in
-   all encountered uses, and USE_RUID indicates the first encountered, i.e.
-   last, of these uses.
+   register (which is first among these we have seen since we scan backwards).
+   USE_RUID indicates the first encountered, i.e. last, of these uses.
+   If ALL_OFFSETS_MATCH is true, all encountered uses were inside a PLUS
+   with a constant offset; OFFSET contains this constant in that case.
    STORE_RUID is always meaningful if we only want to use a value in a
    register in a different place: it denotes the next insn in the insn
-   stream (i.e. the last encountered) that sets or clobbers the register.  */
+   stream (i.e. the last encountered) that sets or clobbers the register.
+   REAL_STORE_RUID is similar, but clobbers are ignored when updating it.  */
 static struct
   {
     struct reg_use reg_use[RELOAD_COMBINE_MAX_USES];
     int use_index;
     rtx offset;
+    bool all_offsets_match;
     int store_ruid;
+    int real_store_ruid;
     int use_ruid;
   } reg_state[FIRST_PSEUDO_REGISTER];
 
@@ -694,6 +712,9 @@  static int reload_combine_ruid;
 /* The RUID of the last label we encountered in reload_combine.  */
 static int last_label_ruid;
 
+/* The RUID of the last jump we encountered in reload_combine.  */
+static int last_jump_ruid;
+
 /* The register numbers of the first and last index register.  A value of
    -1 in LAST_INDEX_REG indicates that we've previously computed these
    values and found no suitable index registers.  */
@@ -703,6 +724,310 @@  static int last_index_reg;
 #define LABEL_LIVE(LABEL) \
   (label_live[CODE_LABEL_NUMBER (LABEL) - min_labelno])
 
+/* Subroutine of reload_combine_split_ruids, called to fix up a single
+   ruid pointed to by *PRUID if it is higher than SPLIT_RUID.  */
+
+static inline void
+reload_combine_split_one_ruid (int *pruid, int split_ruid)
+{
+  if (*pruid > split_ruid)
+    (*pruid)++;
+}
+
+/* Called when we insert a new insn in a position we've already passed in
+   the scan.  Examine all our state, increasing all ruids that are higher
+   than SPLIT_RUID by one in order to make room for a new insn.  */
+
+static void
+reload_combine_split_ruids (int split_ruid)
+{
+  unsigned i;
+
+  reload_combine_split_one_ruid (&reload_combine_ruid, split_ruid);
+  reload_combine_split_one_ruid (&last_label_ruid, split_ruid);
+  reload_combine_split_one_ruid (&last_jump_ruid, split_ruid);
+
+  for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
+    {
+      int j, idx = reg_state[i].use_index;
+      reload_combine_split_one_ruid (&reg_state[i].use_ruid, split_ruid);
+      reload_combine_split_one_ruid (&reg_state[i].store_ruid, split_ruid);
+      reload_combine_split_one_ruid (&reg_state[i].real_store_ruid,
+				     split_ruid);
+      if (idx < 0)
+	continue;
+      for (j = idx; j < RELOAD_COMBINE_MAX_USES; j++)
+	{
+	  reload_combine_split_one_ruid (&reg_state[i].reg_use[j].ruid,
+					 split_ruid);
+	}
+    }
+}
+
+/* Called when we are about to rescan a previously encountered insn with
+   reload_combine_note_use after modifying some part of it.  This clears all
+   information about uses in that particular insn.  */
+
+static void
+reload_combine_purge_insn_uses (rtx insn)
+{
+  unsigned i;
+
+  for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
+    {
+      int j, k, idx = reg_state[i].use_index;
+      if (idx < 0)
+	continue;
+      j = k = RELOAD_COMBINE_MAX_USES;
+      while (j-- > idx)
+	{
+	  if (reg_state[i].reg_use[j].insn != insn)
+	    {
+	      k--;
+	      if (k != j)
+		reg_state[i].reg_use[k] = reg_state[i].reg_use[j];
+	    }
+	}
+      reg_state[i].use_index = k;
+    }
+}
+
+/* Called when we need to forget about all uses of REGNO after an insn
+   which is identified by RUID.  */
+
+static void
+reload_combine_purge_reg_uses_after_ruid (unsigned regno, int ruid)
+{
+  int j, k, idx = reg_state[regno].use_index;
+  if (idx < 0)
+    return;
+  j = k = RELOAD_COMBINE_MAX_USES;
+  while (j-- > idx)
+    {
+      if (reg_state[regno].reg_use[j].ruid >= ruid)
+	{
+	  k--;
+	  if (k != j)
+	    reg_state[regno].reg_use[k] = reg_state[regno].reg_use[j];
+	}
+    }
+  reg_state[regno].use_index = k;
+}
+
+/* Find the use of REGNO with the ruid that is highest among those
+   lower than RUID_LIMIT, and return it if it is the only use of this
+   reg in the insn.  Return NULL otherwise.  */
+
+static struct reg_use *
+reload_combine_closest_single_use (unsigned regno, int ruid_limit)
+{
+  int i, best_ruid = 0;
+  int use_idx = reg_state[regno].use_index;
+  struct reg_use *retval;
+
+  if (use_idx < 0)
+    return NULL;
+  retval = NULL;
+  for (i = use_idx; i < RELOAD_COMBINE_MAX_USES; i++)
+    {
+      int this_ruid = reg_state[regno].reg_use[i].ruid;
+      if (this_ruid >= ruid_limit)
+	continue;
+      if (this_ruid > best_ruid)
+	{
+	  best_ruid = this_ruid;
+	  retval = reg_state[regno].reg_use + i;
+	}
+      else if (this_ruid == best_ruid)
+	retval = NULL;
+    }
+  if (last_label_ruid >= best_ruid)
+    return NULL;
+  return retval;
+}
+
+/* Called by reload_combine when scanning INSN.  This function tries to detect
+   patterns where a constant is added to a register, and the result is used
+   in an address.
+   Return true if no further processing is needed on INSN; false if it wasn't
+   recognized and should be handled normally.  */
+
+static bool
+reload_combine_recognize_const_pattern (rtx insn)
+{
+  int from_ruid = reload_combine_ruid;
+  rtx set, pat, reg, src, addreg;
+  unsigned int regno;
+  struct reg_use *use;
+  bool must_move_add;
+  rtx add_moved_after_insn = NULL_RTX;
+  int add_moved_after_ruid = 0;
+  int clobbered_regno = -1;
+
+  set = single_set (insn);
+  if (set == NULL_RTX)
+    return false;
+
+  reg = SET_DEST (set);
+  src = SET_SRC (set);
+  if (!REG_P (reg)
+      || hard_regno_nregs[REGNO (reg)][GET_MODE (reg)] != 1
+      || GET_MODE (reg) != Pmode)
+    return false;
+
+  regno = REGNO (reg);
+
+  /* We look for a REG1 = REG2 + CONSTANT insn, followed by either
+     uses of REG1 inside an address, or inside another add insn.  If
+     possible and profitable, merge the addition into subsequent
+     uses.  */
+  if (GET_CODE (src) != PLUS
+      || !REG_P (XEXP (src, 0))
+      || !CONSTANT_P (XEXP (src, 1)))
+    return false;
+
+  addreg = XEXP (src, 0);
+  must_move_add = rtx_equal_p (reg, addreg);
+
+  pat = PATTERN (insn);
+  if (must_move_add && set != pat)
+    {
+      /* We have to be careful when moving the add; apart from the
+	 single_set there may also be clobbers.  Recognize one special
+	 case, that of one clobber alongside the set (likely a clobber
+	 of the CC register).  */
+      gcc_assert (GET_CODE (PATTERN (insn)) == PARALLEL);
+      if (XVECLEN (pat, 0) != 2 || XVECEXP (pat, 0, 0) != set
+	  || GET_CODE (XVECEXP (pat, 0, 1)) != CLOBBER
+	  || !REG_P (XEXP (XVECEXP (pat, 0, 1), 0)))
+	return false;
+      clobbered_regno = REGNO (XEXP (XVECEXP (pat, 0, 1), 0));
+    }
+
+  do
+    {
+      use = reload_combine_closest_single_use (regno, from_ruid);
+
+      if (use)
+	/* Start the search for the next use from here.  */
+	from_ruid = use->ruid;
+
+      if (use && GET_MODE (*use->usep) == Pmode)
+	{
+	  rtx use_insn = use->insn;
+	  int use_ruid = use->ruid;
+	  rtx mem = use->containing_mem;
+	  bool speed = optimize_bb_for_speed_p (BLOCK_FOR_INSN (use_insn));
+
+	  /* Avoid moving the add insn past a jump.  */
+	  if (must_move_add && use_ruid < last_jump_ruid)
+	    break;
+
+	  /* If the add clobbers another hard reg in parallel, don't move
+	     it past a real set of this hard reg.  */
+	  if (must_move_add && clobbered_regno >= 0
+	      && reg_state[clobbered_regno].real_store_ruid >= use_ruid)
+	    break;
+
+	  /* Avoid moving a use of ADDREG past a point where it
+	     is stored.  */
+	  if (reg_state[REGNO (addreg)].store_ruid >= use_ruid)
+	    break;
+
+	  if (mem != NULL_RTX)
+	    {
+	      rtx oldaddr = XEXP (mem, 0);
+	      rtx newaddr = NULL_RTX;
+	      int old_cost = rtx_cost (mem, SET, speed);
+	      int new_cost;
+
+	      newaddr = simplify_replace_rtx (oldaddr, reg, copy_rtx (src));
+	      if (memory_address_addr_space_p (GET_MODE (mem), newaddr,
+					       MEM_ADDR_SPACE (mem)))
+		{
+		  XEXP (mem, 0) = newaddr;
+		  new_cost = rtx_cost (mem, SET, speed);
+		  XEXP (mem, 0) = oldaddr;
+		  if (new_cost <= old_cost
+		      && validate_change (use_insn,
+					  &XEXP (mem, 0), newaddr, 0))
+		    {
+		      reload_combine_purge_insn_uses (use_insn);
+		      reload_combine_note_use (&PATTERN (use_insn), use_insn,
+					       use_ruid, NULL_RTX);
+
+		      if (must_move_add)
+			{
+			  add_moved_after_insn = use_insn;
+			  add_moved_after_ruid = use_ruid;
+			}
+		      continue;
+		    }
+		}
+	    }
+	  else
+	    {
+	      rtx new_set = single_set (use_insn);
+	      if (new_set
+		  && REG_P (SET_DEST (new_set))
+		  && GET_CODE (SET_SRC (new_set)) == PLUS
+		  && REG_P (XEXP (SET_SRC (new_set), 0))
+		  && CONSTANT_P (XEXP (SET_SRC (new_set), 1)))
+		{
+		  rtx new_src;
+		  int old_cost = rtx_cost (SET_SRC (new_set), SET, speed);
+
+		  gcc_assert (rtx_equal_p (XEXP (SET_SRC (new_set), 0), reg));
+		  new_src = simplify_replace_rtx (SET_SRC (new_set), reg,
+						  copy_rtx (src));
+
+		  if (rtx_cost (new_src, SET, speed) <= old_cost
+		      && validate_change (use_insn, &SET_SRC (new_set),
+					  new_src, 0))
+		    {
+		      reload_combine_purge_insn_uses (use_insn);
+		      reload_combine_note_use (&SET_SRC (new_set), use_insn,
+					       use_ruid, NULL_RTX);
+
+		      if (must_move_add)
+			{
+			  /* See if that took care of the add insn.  */
+			  if (rtx_equal_p (SET_DEST (new_set), reg))
+			    {
+			      delete_insn (insn);
+			      return true;
+			    }
+			  else
+			    {
+			      add_moved_after_insn = use_insn;
+			      add_moved_after_ruid = use_ruid;
+			    }
+			}
+		      continue;
+		    }
+		}
+	    }
+	  /* If we get here, we couldn't handle this use.  */
+	  if (must_move_add)
+	    break;
+	}
+    }
+  while (use);
+
+  if (!must_move_add || add_moved_after_insn == NULL_RTX)
+    /* Process the add normally.  */
+    return false;
+
+  reorder_insns (insn, insn, add_moved_after_insn);
+  reload_combine_purge_reg_uses_after_ruid (regno, add_moved_after_ruid);
+  reload_combine_split_ruids (add_moved_after_ruid - 1);
+  reload_combine_note_use (&PATTERN (insn), insn,
+			   add_moved_after_ruid, NULL_RTX);
+  reg_state[regno].store_ruid = add_moved_after_ruid;
+
+  return true;
+}
+
 /* Called by reload_combine when scanning INSN.  Try to detect a pattern we
    can handle and improve.  Return true if no further processing is needed on
    INSN; false if it wasn't recognized and should be handled normally.  */
@@ -713,6 +1038,18 @@  reload_combine_recognize_pattern (rtx in
   rtx set, reg, src;
   unsigned int regno;
 
+  set = single_set (insn);
+  if (set == NULL_RTX)
+    return false;
+
+  reg = SET_DEST (set);
+  src = SET_SRC (set);
+  if (!REG_P (reg)
+      || hard_regno_nregs[REGNO (reg)][GET_MODE (reg)] != 1)
+    return false;
+
+  regno = REGNO (reg);
+
   /* Look for (set (REGX) (CONST_INT))
      (set (REGX) (PLUS (REGX) (REGY)))
      ...
@@ -726,19 +1063,10 @@  reload_combine_recognize_pattern (rtx in
      and that we know all uses of REGX before it dies.
      Also, explicitly check that REGX != REGY; our life information
      does not yet show whether REGY changes in this insn.  */
-  set = single_set (insn);
-  if (set == NULL_RTX)
-    return false;
-
-  reg = SET_DEST (set);
-  src = SET_SRC (set);
-  if (!REG_P (reg)
-      || hard_regno_nregs[REGNO (reg)][GET_MODE (reg)] != 1)
-    return false;
-
-  regno = REGNO (reg);
 
   if (GET_CODE (src) == PLUS
+      && reg_state[regno].all_offsets_match
+      && last_index_reg != -1
       && REG_P (XEXP (src, 1))
       && rtx_equal_p (XEXP (src, 0), reg)
       && !rtx_equal_p (XEXP (src, 1), reg)
@@ -822,7 +1150,9 @@  reload_combine_recognize_pattern (rtx in
 		   i < RELOAD_COMBINE_MAX_USES; i++)
 		reload_combine_note_use
 		  (&XEXP (*reg_state[regno].reg_use[i].usep, 1),
-		   reg_state[regno].reg_use[i].insn);
+		   reg_state[regno].reg_use[i].insn,
+		   reg_state[regno].reg_use[i].ruid,
+		   reg_state[regno].reg_use[i].containing_mem);
 
 	      if (reg_state[REGNO (base)].use_ruid
 		  > reg_state[regno].use_ruid)
@@ -850,7 +1180,7 @@  reload_combine_recognize_pattern (rtx in
 static void
 reload_combine (void)
 {
-  rtx insn;
+  rtx insn, prev;
   int i;
   basic_block bb;
   unsigned int r;
@@ -912,20 +1244,23 @@  reload_combine (void)
     }
 
   /* Initialize last_label_ruid, reload_combine_ruid and reg_state.  */
-  last_label_ruid = reload_combine_ruid = 0;
+  last_label_ruid = last_jump_ruid = reload_combine_ruid = 0;
   for (r = 0; r < FIRST_PSEUDO_REGISTER; r++)
     {
-      reg_state[r].store_ruid = reload_combine_ruid;
+      reg_state[r].store_ruid = 0;
+      reg_state[r].real_store_ruid = 0;
       if (fixed_regs[r])
 	reg_state[r].use_index = -1;
       else
 	reg_state[r].use_index = RELOAD_COMBINE_MAX_USES;
     }
 
-  for (insn = get_last_insn (); insn; insn = PREV_INSN (insn))
+  for (insn = get_last_insn (); insn; insn = prev)
     {
       rtx note;
 
+      prev = PREV_INSN (insn);
+
       /* We cannot do our optimization across labels.  Invalidating all the use
 	 information we have would be costly, so we just note where the label
 	 is and then later disable any optimization that would cross it.  */
@@ -941,7 +1276,11 @@  reload_combine (void)
 
       reload_combine_ruid++;
 
-      if (reload_combine_recognize_pattern (insn))
+      if (JUMP_P (insn))
+	last_jump_ruid = reload_combine_ruid;
+
+      if (reload_combine_recognize_const_pattern (insn)
+	  || reload_combine_recognize_pattern (insn))
 	continue;
 
       note_stores (PATTERN (insn), reload_combine_note_store, NULL);
@@ -998,7 +1337,8 @@  reload_combine (void)
 	      reg_state[i].use_index = -1;
 	}
 
-      reload_combine_note_use (&PATTERN (insn), insn);
+      reload_combine_note_use (&PATTERN (insn), insn,
+			       reload_combine_ruid, NULL_RTX);
       for (note = REG_NOTES (insn); note; note = XEXP (note, 1))
 	{
 	  if (REG_NOTE_KIND (note) == REG_INC
@@ -1007,6 +1347,7 @@  reload_combine (void)
 	      int regno = REGNO (XEXP (note, 0));
 
 	      reg_state[regno].store_ruid = reload_combine_ruid;
+	      reg_state[regno].real_store_ruid = reload_combine_ruid;
 	      reg_state[regno].use_index = -1;
 	    }
 	}
@@ -1016,8 +1357,8 @@  reload_combine (void)
 }
 
 /* Check if DST is a register or a subreg of a register; if it is,
-   update reg_state[regno].store_ruid and reg_state[regno].use_index
-   accordingly.  Called via note_stores from reload_combine.  */
+   update store_ruid, real_store_ruid and use_index in the reg_state
+   structure accordingly.  Called via note_stores from reload_combine.  */
 
 static void
 reload_combine_note_store (rtx dst, const_rtx set, void *data ATTRIBUTE_UNUSED)
@@ -1041,14 +1382,14 @@  reload_combine_note_store (rtx dst, cons
   /* note_stores might have stripped a STRICT_LOW_PART, so we have to be
      careful with registers / register parts that are not full words.
      Similarly for ZERO_EXTRACT.  */
-  if (GET_CODE (set) != SET
-      || GET_CODE (SET_DEST (set)) == ZERO_EXTRACT
+  if (GET_CODE (SET_DEST (set)) == ZERO_EXTRACT
       || GET_CODE (SET_DEST (set)) == STRICT_LOW_PART)
     {
       for (i = hard_regno_nregs[regno][mode] - 1 + regno; i >= regno; i--)
 	{
 	  reg_state[i].use_index = -1;
 	  reg_state[i].store_ruid = reload_combine_ruid;
+	  reg_state[i].real_store_ruid = reload_combine_ruid;
 	}
     }
   else
@@ -1056,6 +1397,8 @@  reload_combine_note_store (rtx dst, cons
       for (i = hard_regno_nregs[regno][mode] - 1 + regno; i >= regno; i--)
 	{
 	  reg_state[i].store_ruid = reload_combine_ruid;
+	  if (GET_CODE (set) == SET)
+	    reg_state[i].real_store_ruid = reload_combine_ruid;
 	  reg_state[i].use_index = RELOAD_COMBINE_MAX_USES;
 	}
     }
@@ -1066,7 +1409,7 @@  reload_combine_note_store (rtx dst, cons
    *XP is the pattern of INSN, or a part of it.
    Called from reload_combine, and recursively by itself.  */
 static void
-reload_combine_note_use (rtx *xp, rtx insn)
+reload_combine_note_use (rtx *xp, rtx insn, int ruid, rtx containing_mem)
 {
   rtx x = *xp;
   enum rtx_code code = x->code;
@@ -1079,7 +1422,7 @@  reload_combine_note_use (rtx *xp, rtx in
     case SET:
       if (REG_P (SET_DEST (x)))
 	{
-	  reload_combine_note_use (&SET_SRC (x), insn);
+	  reload_combine_note_use (&SET_SRC (x), insn, ruid, NULL_RTX);
 	  return;
 	}
       break;
@@ -1143,29 +1486,28 @@  reload_combine_note_use (rtx *xp, rtx in
 	if (use_index < 0)
 	  return;
 
-	if (use_index != RELOAD_COMBINE_MAX_USES - 1)
-	  {
-	    /* We have found another use for a register that is already
-	       used later.  Check if the offsets match; if not, mark the
-	       register as used in an unknown fashion.  */
-	    if (! rtx_equal_p (offset, reg_state[regno].offset))
-	      {
-		reg_state[regno].use_index = -1;
-		return;
-	      }
-	  }
-	else
+	if (use_index == RELOAD_COMBINE_MAX_USES - 1)
 	  {
 	    /* This is the first use of this register we have seen since we
 	       marked it as dead.  */
 	    reg_state[regno].offset = offset;
-	    reg_state[regno].use_ruid = reload_combine_ruid;
+	    reg_state[regno].all_offsets_match = true;
+	    reg_state[regno].use_ruid = ruid;
 	  }
+	else if (! rtx_equal_p (offset, reg_state[regno].offset))
+	  reg_state[regno].all_offsets_match = false;
+
 	reg_state[regno].reg_use[use_index].insn = insn;
+	reg_state[regno].reg_use[use_index].ruid = ruid;
+	reg_state[regno].reg_use[use_index].containing_mem = containing_mem;
 	reg_state[regno].reg_use[use_index].usep = xp;
 	return;
       }
 
+    case MEM:
+      containing_mem = x;
+      break;
+
     default:
       break;
     }
@@ -1175,11 +1517,12 @@  reload_combine_note_use (rtx *xp, rtx in
   for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
     {
       if (fmt[i] == 'e')
-	reload_combine_note_use (&XEXP (x, i), insn);
+	reload_combine_note_use (&XEXP (x, i), insn, ruid, containing_mem);
       else if (fmt[i] == 'E')
 	{
 	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
-	    reload_combine_note_use (&XVECEXP (x, i, j), insn);
+	    reload_combine_note_use (&XVECEXP (x, i, j), insn, ruid,
+				     containing_mem);
 	}
     }
 }
@@ -1227,9 +1570,10 @@  static int move2add_last_label_luid;
    while REG is known to already have value (SYM + offset).
    This function tries to change INSN into an add instruction
    (set (REG) (plus (REG) (OFF - offset))) using the known value.
-   It also updates the information about REG's known value.  */
+   It also updates the information about REG's known value.
+   Return true if we made a change.  */
 
-static void
+static bool
 move2add_use_add2_insn (rtx reg, rtx sym, rtx off, rtx insn)
 {
   rtx pat = PATTERN (insn);
@@ -1238,6 +1582,7 @@  move2add_use_add2_insn (rtx reg, rtx sym
   rtx new_src = gen_int_mode (INTVAL (off) - reg_offset[regno],
 			      GET_MODE (reg));
   bool speed = optimize_bb_for_speed_p (BLOCK_FOR_INSN (insn));
+  bool changed = false;
 
   /* (set (reg) (plus (reg) (const_int 0))) is not canonical;
      use (set (reg) (reg)) instead.
@@ -1252,13 +1597,13 @@  move2add_use_add2_insn (rtx reg, rtx sym
 	 (reg)), would be discarded.  Maybe we should
 	 try a truncMN pattern?  */
       if (INTVAL (off) == reg_offset [regno])
-	validate_change (insn, &SET_SRC (pat), reg, 0);
+	changed = validate_change (insn, &SET_SRC (pat), reg, 0);
     }
   else if (rtx_cost (new_src, PLUS, speed) < rtx_cost (src, SET, speed)
 	   && have_add2_insn (reg, new_src))
     {
       rtx tem = gen_rtx_PLUS (GET_MODE (reg), reg, new_src);
-      validate_change (insn, &SET_SRC (pat), tem, 0);
+      changed = validate_change (insn, &SET_SRC (pat), tem, 0);
     }
   else if (sym == NULL_RTX && GET_MODE (reg) != BImode)
     {
@@ -1283,8 +1628,9 @@  move2add_use_add2_insn (rtx reg, rtx sym
 			     gen_rtx_STRICT_LOW_PART (VOIDmode,
 						      narrow_reg),
 			     narrow_src);
-	      if (validate_change (insn, &PATTERN (insn),
-				   new_set, 0))
+	      changed = validate_change (insn, &PATTERN (insn),
+					 new_set, 0);
+	      if (changed)
 		break;
 	    }
 	}
@@ -1294,6 +1640,7 @@  move2add_use_add2_insn (rtx reg, rtx sym
   reg_mode[regno] = GET_MODE (reg);
   reg_symbol_ref[regno] = sym;
   reg_offset[regno] = INTVAL (off);
+  return changed;
 }
 
 
@@ -1303,9 +1650,10 @@  move2add_use_add2_insn (rtx reg, rtx sym
    value (SYM + offset) and change INSN into an add instruction
    (set (REG) (plus (the found register) (OFF - offset))) if such
    a register is found.  It also updates the information about
-   REG's known value.  */
+   REG's known value.
+   Return true iff we made a change.  */
 
-static void
+static bool
 move2add_use_add3_insn (rtx reg, rtx sym, rtx off, rtx insn)
 {
   rtx pat = PATTERN (insn);
@@ -1315,6 +1663,7 @@  move2add_use_add3_insn (rtx reg, rtx sym
   int min_regno = 0;
   bool speed = optimize_bb_for_speed_p (BLOCK_FOR_INSN (insn));
   int i;
+  bool changed = false;
 
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     if (reg_set_luid[i] > move2add_last_label_luid
@@ -1359,20 +1708,25 @@  move2add_use_add3_insn (rtx reg, rtx sym
 				      GET_MODE (reg));
 	  tem = gen_rtx_PLUS (GET_MODE (reg), tem, new_src);
 	}
-      validate_change (insn, &SET_SRC (pat), tem, 0);
+      if (validate_change (insn, &SET_SRC (pat), tem, 0))
+	changed = true;
     }
   reg_set_luid[regno] = move2add_luid;
   reg_base_reg[regno] = -1;
   reg_mode[regno] = GET_MODE (reg);
   reg_symbol_ref[regno] = sym;
   reg_offset[regno] = INTVAL (off);
+  return changed;
 }
 
-static void
+/* Convert move insns with constant inputs to additions if they are cheaper.
+   Return true if any changes were made.  */
+static bool
 reload_cse_move2add (rtx first)
 {
   int i;
   rtx insn;
+  bool changed = false;
 
   for (i = FIRST_PSEUDO_REGISTER - 1; i >= 0; i--)
     {
@@ -1433,7 +1787,7 @@  reload_cse_move2add (rtx first)
 		  && reg_base_reg[regno] < 0
 		  && reg_symbol_ref[regno] == NULL_RTX)
 		{
-		  move2add_use_add2_insn (reg, NULL_RTX, src, insn);
+		  changed |= move2add_use_add2_insn (reg, NULL_RTX, src, insn);
 		  continue;
 		}
 
@@ -1494,6 +1848,7 @@  reload_cse_move2add (rtx first)
 			}
 		      if (success)
 			delete_insn (insn);
+		      changed |= success;
 		      insn = next;
 		      reg_mode[regno] = GET_MODE (reg);
 		      reg_offset[regno] =
@@ -1539,12 +1894,12 @@  reload_cse_move2add (rtx first)
 		  && reg_base_reg[regno] < 0
 		  && reg_symbol_ref[regno] != NULL_RTX
 		  && rtx_equal_p (sym, reg_symbol_ref[regno]))
-		move2add_use_add2_insn (reg, sym, off, insn);
+		changed |= move2add_use_add2_insn (reg, sym, off, insn);
 
 	      /* Otherwise, we have to find a register whose value is sum
 		 of sym and some constant value.  */
 	      else
-		move2add_use_add3_insn (reg, sym, off, insn);
+		changed |= move2add_use_add3_insn (reg, sym, off, insn);
 
 	      continue;
 	    }
@@ -1599,6 +1954,7 @@  reload_cse_move2add (rtx first)
 	    }
 	}
     }
+  return changed;
 }
 
 /* SET is a SET or CLOBBER that sets DST.  DATA is the insn which
Index: testsuite/gcc.target/arm/pr42235.c
===================================================================
--- testsuite/gcc.target/arm/pr42235.c	(revision 0)
+++ testsuite/gcc.target/arm/pr42235.c	(revision 0)
@@ -0,0 +1,11 @@ 
+/* { dg-options "-mthumb -O2 -march=armv5te" }  */
+/* { dg-require-effective-target arm_thumb1_ok } */
+/* { dg-final { scan-assembler-not "add\[\\t \]*r.,\[\\t \]*r.,\[\\t \]*\#1" } } */
+/* { dg-final { scan-assembler-not "add\[\\t \]*r.,\[\\t \]*\#1" } } */
+
+#include <string.h>
+
+int foo (char *x)
+{
+  memset (x, 0, 6);
+}