Merge lp:~eres/gcc-linaro/sms_misc_fixes-4.6 into lp:gcc-linaro/4.6

[Revital Eres]

Backport from mainline -r176970

http://gcc.gnu.org/viewcvs?view=revision&revision=176970

http://gcc.gnu.org/ml/gcc-patches/2011-05/msg01342.html

http://gcc.gnu.org/ml/gcc-patches/2011-07/msg02712.html

[Linaro Toolchain Builder (cbuild)]

cbuild has taken a snapshot of this branch at r106783 and queued it for build.

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6.tar.xdelta3.xz

and will be built on the following builders:
 a9-builder armv5-builder i686 x86_64

You can track the build queue at:
 http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6
cbuild-ancestor: lp:gcc-linaro/4.6+bzr106782
cbuild-state: check

[Michael Hope (michaelh1)]

cbuild successfully built this on i686-natty-cbuild159-oort2-i686r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6/logs/i686-natty-cbuild159-oort2-i686r1

The testsuite results are the same as the branch point lp:gcc-linaro/4.6+bzr106782

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6/logs/i686-natty-cbuild159-oort2-i686r1/gcc-testsuite.txt

cbuild-checked: i686-natty-cbuild159-oort2-i686r1

[Michael Hope (michaelh1)]

cbuild successfully built this on x86_64-natty-cbuild159-oort3-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6/logs/x86_64-natty-cbuild159-oort3-x86_64r1

The testsuite results are the same as the branch point lp:gcc-linaro/4.6+bzr106782

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6/logs/x86_64-natty-cbuild159-oort3-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-natty-cbuild159-oort3-x86_64r1

[Michael Hope (michaelh1)]

cbuild successfully built this on armv7l-natty-cbuild159-ursa1-armv5r2.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6/logs/armv7l-natty-cbuild159-ursa1-armv5r2

The testsuite results are the same as the branch point lp:gcc-linaro/4.6+bzr106782

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106783~eres~sms_misc_fixes-4.6/logs/armv7l-natty-cbuild159-ursa1-armv5r2/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild159-ursa1-armv5r2

[Ulrich Weigand (uweigand)]

This is OK.

review: Approve

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-07-21 11:30:53 +0000
+++ ChangeLog.linaro	2011-07-31 11:09:17 +0000
@@ -1,3 +1,12 @@
[phone]  Revital Eres  <[e-mail]>
+
+	gcc/
+	Backport from trunk -r176970:
+
+	* modulo-sched.c: Change comment.
+	(reset_sched_times): Fix print message.
+	(print_partial_schedule): Add print info.
+
 2011-07-21  Richard Sandiford  <[e-mail]>
 
 	gcc/

=== modified file 'gcc/modulo-sched.c'
--- gcc/modulo-sched.c	2011-07-04 12:01:34 +0000
+++ gcc/modulo-sched.c	2011-07-31 11:09:17 +0000
@@ -84,13 +84,14 @@
       II cycles (i.e. use register copies to prevent a def from overwriting
       itself before reaching the use).
 
-    SMS works with countable loops whose loop count can be easily
-    adjusted.  This is because we peel a constant number of iterations
-    into a prologue and epilogue for which we want to avoid emitting
-    the control part, and a kernel which is to iterate that constant
-    number of iterations less than the original loop.  So the control
-    part should be a set of insns clearly identified and having its
-    own iv, not otherwise used in the loop (at-least for now), which
+    SMS works with countable loops (1) whose control part can be easily
+    decoupled from the rest of the loop and (2) whose loop count can
+    be easily adjusted.  This is because we peel a constant number of
+    iterations into a prologue and epilogue for which we want to avoid
+    emitting the control part, and a kernel which is to iterate that
+    constant number of iterations less than the original loop.  So the
+    control part should be a set of insns clearly identified and having
+    its own iv, not otherwise used in the loop (at-least for now), which
     initializes a register before the loop to the number of iterations.
     Currently SMS relies on the do-loop pattern to recognize such loops,
     where (1) the control part comprises of all insns defining and/or
@@ -598,8 +599,8 @@
             /* Print the scheduling times after the rotation.  */
             fprintf (dump_file, "crr_insn->node=%d (insn id %d), "
                      "crr_insn->cycle=%d, min_cycle=%d", crr_insn->node->cuid,
-                     INSN_UID (crr_insn->node->insn), SCHED_TIME (u),
-                     normalized_time);
+                     INSN_UID (crr_insn->node->insn), normalized_time,
+                     new_min_cycle);
             if (JUMP_P (crr_insn->node->insn))
               fprintf (dump_file, " (branch)");
             fprintf (dump_file, "\n");
@@ -2550,8 +2551,13 @@
       fprintf (dump, "\n[ROW %d ]: ", i);
       while (ps_i)
 	{
-	  fprintf (dump, "%d, ",
-		   INSN_UID (ps_i->node->insn));
+	  if (JUMP_P (ps_i->node->insn))
+	    fprintf (dump, "%d (branch), ",
+		     INSN_UID (ps_i->node->insn));
+	  else
+	    fprintf (dump, "%d, ",
+		     INSN_UID (ps_i->node->insn));
+	
 	  ps_i = ps_i->next_in_row;
 	}
     }