Fix lst_update_scattering.

2010-09-09  Sebastian Pop  <sebastian.pop@amd.com>

	* graphite-poly.h (lst_update_scattering_seq): Removed.
	(lst_update_scattering): Correctly handle outermost loop dewey
	renumbering.

From-SVN: r164801

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2461df8ba26ff4f8a0c54db78c994d5b8af800be..af2ab8b877cb6e10a2857cbe87030f429ac2c093 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-30  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * graphite-poly.h (lst_update_scattering_seq): Removed.
+       (lst_update_scattering): Correctly handle outermost loop dewey
+       renumbering.
+
 2010-09-30  Sebastian Pop  <sebastian.pop@amd.com>
 
        * graphite-blocking.c (pbb_strip_mine_profitable_p): Renamed

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index a22f77ef79e9b9e2d16ac37c5ea79192f703ca97..f0858030bf1e08bccffa5515254f65bd12f5f77e 100644 (file)
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,9 @@
+2010-09-09  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * graphite-poly.h (lst_update_scattering_seq): Removed.
+       (lst_update_scattering): Correctly handle outermost loop dewey
+       renumbering.
+
 2010-09-09  Sebastian Pop  <sebastian.pop@amd.com>
 
        * graphite-blocking.c (pbb_strip_mine_profitable_p): Renamed

diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h
index 5f536a8529ad100219b9af3c6c8a044f723f2199..e93c2ad31dc1f90a05f9651df788bfda5316abd5 100644 (file)
--- a/gcc/graphite-poly.h
+++ b/gcc/graphite-poly.h
@@ -1120,24 +1120,6 @@ lst_update_scattering_under (lst_p lst, int level, int dewey)
     pbb_update_scattering (LST_PBB (lst), level, dewey);
 }
 
-/* Updates the scattering of all the PBBs under LST and in sequence
-   with LST.  */
-
-static inline void
-lst_update_scattering_seq (lst_p lst)
-{
-  int i;
-  lst_p l;
-  lst_p father = LST_LOOP_FATHER (lst);
-  int dewey = lst_dewey_number (lst);
-  int level = lst_depth (lst);
-
-  gcc_assert (lst && father && dewey >= 0 && level >= 0);
-
-  for (i = dewey; VEC_iterate (lst_p, LST_SEQ (father), i, l); i++)
-    lst_update_scattering_under (l, level, i);
-}
-
 /* Updates the all the scattering levels of all the PBBs under
    LST.  */
 
@@ -1147,14 +1129,24 @@ lst_update_scattering (lst_p lst)
   int i;
   lst_p l;
 
-  if (!lst || !LST_LOOP_P (lst))
+  if (!lst)
     return;
 
   if (LST_LOOP_FATHER (lst))
-    lst_update_scattering_seq (lst);
+    {
+      lst_p father = LST_LOOP_FATHER (lst);
+      int dewey = lst_dewey_number (lst);
+      int level = lst_depth (lst);
 
-  for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++)
-    lst_update_scattering (l);
+      gcc_assert (lst && father && dewey >= 0 && level >= 0);
+
+      for (i = dewey; VEC_iterate (lst_p, LST_SEQ (father), i, l); i++)
+       lst_update_scattering_under (l, level, i);
+    }
+
+  if (LST_LOOP_P (lst))
+    for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++)
+      lst_update_scattering (l);
 }
 
 /* Inserts LST1 before LST2 if BEFORE is true; inserts LST1 after LST2