diff mbox

Fix ARM ldm/stm peephole2 loop

Message ID 4C5A9BF3.2090109@codesourcery.com
State New
Headers show

Commit Message

Bernd Schmidt Aug. 5, 2010, 11:09 a.m. UTC 
On 08/05/2010 11:21 AM, Phil Blundell wrote:
> It does seem a little bit fragile to require the conditions in the two
> places to match in order to avoid loops, though.  Maybe there should be
> a comment at the appropriate place in arm_gen_xx_multiple to say that it
> needs to stay in sync with the code in multiple_operation_profitable_p,
> or maybe those two functions could be reworked to actually use
> multiple_operation_profitable_p() rather than duplicating its logic.

Like this?


Bernd
* config/arm/arm.c (multiple_operation_profitable_p): Move xscale
	test here from arm_gen_load_multiple_1.
	(arm_gen_load_multiple_1, arm_gen_store_multiple_1): Use
	multiple_operation_profitable_p.

Comments

Phil Blundell Aug. 5, 2010, 11:22 a.m. UTC | #1 
On Thu, 2010-08-05 at 13:09 +0200, Bernd Schmidt wrote:
> On 08/05/2010 11:21 AM, Phil Blundell wrote:
> > or maybe those two functions could be reworked to actually use
> > multiple_operation_profitable_p() rather than duplicating its logic.
> 
> Like this?

Right, exactly like that.  Richard, does this look ok to you?

p.
Richard Earnshaw Aug. 5, 2010, 12:28 p.m. UTC | #2 
On Thu, 2010-08-05 at 13:09 +0200, Bernd Schmidt wrote:
> On 08/05/2010 11:21 AM, Phil Blundell wrote:
> > It does seem a little bit fragile to require the conditions in the two
> > places to match in order to avoid loops, though.  Maybe there should be
> > a comment at the appropriate place in arm_gen_xx_multiple to say that it
> > needs to stay in sync with the code in multiple_operation_profitable_p,
> > or maybe those two functions could be reworked to actually use
> > multiple_operation_profitable_p() rather than duplicating its logic.
> 
> Like this?
> 
> 
> Bernd

This is OK.

Longer term I want to get rid of all places where we test 'xscale'
explicitly and replace them with calls to hooks in the costings
infrastructure; but that's not necessary today.

R.
diff mbox

Patch

Index: config/arm/arm.c
===================================================================
--- config/arm/arm.c	(revision 162821)
+++ config/arm/arm.c	(working copy)
@@ -9186,6 +9193,36 @@  multiple_operation_profitable_p (bool is
   if (nops == 2 && arm_ld_sched && add_offset != 0)
     return false;
 
+  /* XScale has load-store double instructions, but they have stricter
+     alignment requirements than load-store multiple, so we cannot
+     use them.
+
+     For XScale ldm requires 2 + NREGS cycles to complete and blocks
+     the pipeline until completion.
+
+	NREGS		CYCLES
+	  1		  3
+	  2		  4
+	  3		  5
+	  4		  6
+
+     An ldr instruction takes 1-3 cycles, but does not block the
+     pipeline.
+
+	NREGS		CYCLES
+	  1		 1-3
+	  2		 2-6
+	  3		 3-9
+	  4		 4-12
+
+     Best case ldr will always win.  However, the more ldr instructions
+     we issue, the less likely we are to be able to schedule them well.
+     Using ldr instructions also increases code size.
+
+     As a compromise, we use ldr for counts of 1 or 2 regs, and ldm
+     for counts of 3 or 4 regs.  */
+  if (nops <= 2 && arm_tune_xscale && !optimize_size)
+    return false;
   return true;
 }
 
@@ -9538,35 +9575,7 @@  arm_gen_load_multiple_1 (int count, int 
   int i = 0, j;
   rtx result;
 
-  /* XScale has load-store double instructions, but they have stricter
-     alignment requirements than load-store multiple, so we cannot
-     use them.
-
-     For XScale ldm requires 2 + NREGS cycles to complete and blocks
-     the pipeline until completion.
-
-	NREGS		CYCLES
-	  1		  3
-	  2		  4
-	  3		  5
-	  4		  6
-
-     An ldr instruction takes 1-3 cycles, but does not block the
-     pipeline.
-
-	NREGS		CYCLES
-	  1		 1-3
-	  2		 2-6
-	  3		 3-9
-	  4		 4-12
-
-     Best case ldr will always win.  However, the more ldr instructions
-     we issue, the less likely we are to be able to schedule them well.
-     Using ldr instructions also increases code size.
-
-     As a compromise, we use ldr for counts of 1 or 2 regs, and ldm
-     for counts of 3 or 4 regs.  */
-  if (arm_tune_xscale && count <= 2 && ! optimize_size)
+  if (!multiple_operation_profitable_p (false, count, 0))
     {
       rtx seq;
 
@@ -9618,9 +9627,7 @@  arm_gen_store_multiple_1 (int count, int
   if (GET_CODE (basereg) == PLUS)
     basereg = XEXP (basereg, 0);
 
-  /* See arm_gen_load_multiple_1 for discussion of
-     the pros/cons of ldm/stm usage for XScale.  */
-  if (arm_tune_xscale && count <= 2 && ! optimize_size)
+  if (!multiple_operation_profitable_p (false, count, 0))
     {
       rtx seq;