Merge lp:~eres/gcc-linaro/sms_fix_mem_dep into lp:gcc-linaro/4.5

[Revital Eres]

SMS patch backport from mainline (*):

http://gcc.gnu.org/ml/gcc-cvs/2011-06/msg00579.html

http://gcc.gnu.org/ml/gcc-patches/2011-06/msg00960.html

(*)The branch contains the following change compared to the patch committed to trunk: Call insn_alias_sets_conflict_p function instead of insns_may_alias_p, as ddg.c uses insn_alias_sets_conflict_p instead of the later in 4.5.

[Linaro Toolchain Builder (cbuild)]

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

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.5+bzr99520~eres~sms_fix_mem_dep.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.5+bzr99520~eres~sms_fix_mem_dep
cbuild-ancestor: lp:gcc-linaro+bzr99519
cbuild-state: check

[Linaro Toolchain Builder (cbuild)]

cbuild had trouble building this on i686-natty-cbuild148-oort4-i686r1.
See the following failure logs:
 failed.txt gcc-build-failed.txt

under the build results at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99520~eres~sms_fix_mem_dep/logs/i686-natty-cbuild148-oort4-i686r1

The test suite was not checked as this build has no .sum style test results

cbuild-checked: i686-natty-cbuild148-oort4-i686r1

review: Needs Fixing

[Linaro Toolchain Builder (cbuild)]

cbuild had trouble building this on x86_64-natty-cbuild148-oort1-x86_64r1.
See the following failure logs:
 failed.txt gcc-build-failed.txt

under the build results at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99520~eres~sms_fix_mem_dep/logs/x86_64-natty-cbuild148-oort1-x86_64r1

The test suite was not checked as this build has no .sum style test results

cbuild-checked: x86_64-natty-cbuild148-oort1-x86_64r1

review: Needs Fixing

[Linaro Toolchain Builder (cbuild)]

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

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep.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.5+bzr99521~eres~sms_fix_mem_dep
cbuild-ancestor: lp:gcc-linaro+bzr99519
cbuild-state: check

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on x86_64-natty-cbuild149-oort1-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/x86_64-natty-cbuild149-oort1-x86_64r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99519:
 +PASS: gcc.dg/sms-9.c execution test
 +PASS: gcc.dg/sms-9.c (test for excess errors)

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/x86_64-natty-cbuild149-oort1-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-natty-cbuild149-oort1-x86_64r1

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on armv7l-natty-cbuild149-ursa2-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/armv7l-natty-cbuild149-ursa2-cortexa9r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99519:
 +PASS: gcc.dg/sms-9.c execution test
 +PASS: gcc.dg/sms-9.c (test for excess errors)

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/armv7l-natty-cbuild149-ursa2-cortexa9r1/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild149-ursa2-cortexa9r1

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on armv7l-natty-cbuild151-ursa3-armv5r2.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/armv7l-natty-cbuild151-ursa3-armv5r2

The test suite was not checked as the branch point lp:gcc-linaro+bzr99519 has nothing to compare against.

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/armv7l-natty-cbuild151-ursa3-armv5r2/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild151-ursa3-armv5r2

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on i686-natty-cbuild151-oort6-i686r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/i686-natty-cbuild151-oort6-i686r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99519:
 +PASS: gcc.dg/sms-9.c execution test
 +PASS: gcc.dg/sms-9.c (test for excess errors)

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99521~eres~sms_fix_mem_dep/logs/i686-natty-cbuild151-oort6-i686r1/gcc-testsuite.txt

cbuild-checked: i686-natty-cbuild151-oort6-i686r1

[Michael Hope (michaelh1)]

I see this has already been merged.

[Revital Eres (eres)]

> I see this has already been merged.

No, actually it's pending review... it's not yet in 4.5. (it's in 4.6 though)

[Ulrich Weigand (uweigand)]

This is OK once the branch is open after the release.

review: Approve

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-07-04 10:55:55 +0000
+++ ChangeLog.linaro	2011-07-05 09:37:31 +0000
@@ -1,7 +1,19 @@
+<<<<<<< TREE
 2011-07-01  Andrew Stubbs  <[e-mail]>
 
 	Merge from FSF 4.5 branch r175676 (pre 4.5.4).
 
+=======
[phone]  Revital Eres  <[e-mail]>
+
+	gcc/
+	* ddg.c (add_intra_loop_mem_dep): New function.
+	(build_intra_loop_deps): Call it.
+
+	gcc/testsuite
+	* gcc.dg/sms-9.c: New file.
+
+>>>>>>> MERGE-SOURCE
 2011-07-01  Ramana Radhakrishnan  <[e-mail]>
 
 	Backport from mainline.

=== modified file 'gcc/ddg.c'
--- gcc/ddg.c	2011-05-13 16:16:22 +0000
+++ gcc/ddg.c	2011-07-05 09:37:31 +0000
@@ -352,6 +352,33 @@
 }
 
 
+/* Given two nodes, analyze their RTL insns and add intra-loop mem deps
+   to ddg G.  */
+static void
+add_intra_loop_mem_dep (ddg_ptr g, ddg_node_ptr from, ddg_node_ptr to)
+{
+
+  if ((from->cuid == to->cuid)
+      || !insn_alias_sets_conflict_p (from->insn, to->insn))
+    /* Do not create edge if memory references have disjoint alias sets
+       or 'to' and 'from' are the same instruction.  */
+    return;
+
+  if (mem_write_insn_p (from->insn))
+    {
+      if (mem_read_insn_p (to->insn))
+	create_ddg_dep_no_link (g, from, to,
+				DEBUG_INSN_P (to->insn)
+				? ANTI_DEP : TRUE_DEP, MEM_DEP, 0);
+      else
+	create_ddg_dep_no_link (g, from, to,
+				DEBUG_INSN_P (to->insn)
+				? ANTI_DEP : OUTPUT_DEP, MEM_DEP, 0);
+    }
+  else if (!mem_read_insn_p (to->insn))
+    create_ddg_dep_no_link (g, from, to, ANTI_DEP, MEM_DEP, 0);
+}
+
 /* Given two nodes, analyze their RTL insns and add inter-loop mem deps
    to ddg G.  */
 static void
@@ -439,10 +466,22 @@
 	      if (DEBUG_INSN_P (j_node->insn))
 		continue;
 	      if (mem_access_insn_p (j_node->insn))
- 		/* Don't bother calculating inter-loop dep if an intra-loop dep
-		   already exists.  */
+		{
+		  /* Don't bother calculating inter-loop dep if an intra-loop dep
+		     already exists.  */
 	      	  if (! TEST_BIT (dest_node->successors, j))
 		    add_inter_loop_mem_dep (g, dest_node, j_node);
+		  /* If -fmodulo-sched-allow-regmoves
+		     is set certain anti-dep edges are not created.
+		     It might be that these anti-dep edges are on the
+		     path from one memory instruction to another such that
+		     removing these edges could cause a violation of the
+		     memory dependencies.  Thus we add intra edges between
+		     every two memory instructions in this case.  */
+		  if (flag_modulo_sched_allow_regmoves
+		      && !TEST_BIT (dest_node->predecessors, j))
+		    add_intra_loop_mem_dep (g, j_node, dest_node);
+		}
             }
         }
     }

=== added file 'gcc/testsuite/gcc.dg/sms-9.c'
--- gcc/testsuite/gcc.dg/sms-9.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.dg/sms-9.c	2011-07-05 09:37:31 +0000
@@ -0,0 +1,60 @@
+/* { dg-do run } */
+/* { dg-options "-O2 -fmodulo-sched -fno-auto-inc-dec -O2 -fmodulo-sched-allow-regmoves" } */
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+struct df_ref_info
+{
+  unsigned int *begin;
+  unsigned int *count;
+};
+
+extern void *memset (void *s, int c, __SIZE_TYPE__ n);
+
+
+__attribute__ ((noinline))
+     int
+     df_reorganize_refs_by_reg_by_insn (struct df_ref_info *ref_info,
+					int num, unsigned int start)
+{
+  unsigned int m = num;
+  unsigned int offset = 77;
+  unsigned int r;
+
+  for (r = start; r < m; r++)
+    {
+      ref_info->begin[r] = offset;
+      offset += ref_info->count[r];
+      ref_info->count[r] = 0;
+    }
+
+  return offset;
+}
+
+int
+main ()
+{
+  struct df_ref_info temp;
+  int num = 100;
+  unsigned int start = 5;
+  int i, offset;
+
+  temp.begin = malloc (100 * sizeof (unsigned int));
+  temp.count = malloc (100 * sizeof (unsigned int));
+
+  memset (temp.begin, 0, sizeof (unsigned int) * num);
+  memset (temp.count, 0, sizeof (unsigned int) * num);
+
+  for (i = 0; i < num; i++)
+    temp.count[i] = i + 1;
+
+  offset = df_reorganize_refs_by_reg_by_insn (&temp, num, start);
+
+  if (offset != 5112)
+    abort ();
+
+  free (temp.begin);
+  free (temp.count);
+  return 0;
+}