tree-loop-distribution.c (stmt_has_scalar_dependences_outside_loop): Use FOR_EACH_SSA...

2012-05-31  Richard Guenther  <rguenther@suse.de>

	* tree-loop-distribution.c (stmt_has_scalar_dependences_outside_loop):
	Use FOR_EACH_SSA_DEF_OPERAND.
	(generate_builtin): Adjust.
	(stmt_generated_in_another_partition): Remove.
	(add_scalar_computations_to_partition): Likewise.
	(rdg_build_partitions): Do not call
	add_scalar_computations_to_partition.

	* gcc.dg/tree-ssa/ldist-pr45948-2.c: New testcase copy of
	ldist-pr45948.c with disabled SCCP.

From-SVN: r188061

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d38d0cb..68bb12a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-31  Richard Guenther  <rguenther@suse.de>
+
+       * tree-loop-distribution.c (stmt_has_scalar_dependences_outside_loop):
+       Use FOR_EACH_SSA_DEF_OPERAND.
+       (generate_builtin): Adjust.
+       (stmt_generated_in_another_partition): Remove.
+       (add_scalar_computations_to_partition): Likewise.
+       (rdg_build_partitions): Do not call
+       add_scalar_computations_to_partition.
+
 2012-05-31  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree-dfa.c (get_ref_base_and_extent): Compute the offset using

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fc10281..29ed833 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2012-05-31  Richard Guenther  <rguenther@suse.de>
 
+       * gcc.dg/tree-ssa/ldist-pr45948-2.c: New testcase copy of
+       ldist-pr45948.c with disabled SCCP.
+
+2012-05-31  Richard Guenther  <rguenther@suse.de>
+
        PR middle-end/48493
        * gcc.dg/torture/pr48493.c: New testcase.
 

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948-2.c
new file mode 100644 (file)
index 0000000..aecb49f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948-2.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-loop-distribution -fno-tree-scev-cprop" } */
+
+extern void bar(int);
+
+void
+foo (int i, int n)
+{
+  int a[30];
+  int b[30];
+  for (; i < n; i++)
+    a[i] = b[i] = 0;
+
+  while (1)
+    if (b[0])
+      bar (a[i - 1]);
+}

diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index f4b03bd..5f7018a 100644 (file)
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -80,32 +80,19 @@ ssa_name_has_uses_outside_loop_p (tree def, loop_p loop)
 }
 
 /* Returns true when STMT defines a scalar variable used after the
-   loop.  */
+   loop LOOP.  */
 
 static bool
-stmt_has_scalar_dependences_outside_loop (gimple stmt)
+stmt_has_scalar_dependences_outside_loop (loop_p loop, gimple stmt)
 {
-  tree name;
+  def_operand_p def_p;
+  ssa_op_iter op_iter;
 
-  switch (gimple_code (stmt))
-    {
-    case GIMPLE_CALL:
-    case GIMPLE_ASSIGN:
-      name = gimple_get_lhs (stmt);
-      break;
-
-    case GIMPLE_PHI:
-      name = gimple_phi_result (stmt);
-      break;
-
-    default:
-      return false;
-    }
+  FOR_EACH_SSA_DEF_OPERAND (def_p, stmt, op_iter, SSA_OP_DEF)
+    if (ssa_name_has_uses_outside_loop_p (DEF_FROM_PTR (def_p), loop))
+      return true;
 
-  return (name
-         && TREE_CODE (name) == SSA_NAME
-         && ssa_name_has_uses_outside_loop_p (name,
-                                              loop_containing_stmt (stmt)));
+  return false;
 }
 
 /* Update the PHI nodes of NEW_LOOP.  NEW_LOOP is a duplicate of
@@ -382,9 +369,16 @@ generate_builtin (struct loop *loop, bitmap partition, bool copy_p)
          if (!bitmap_bit_p (partition, x++))
            continue;
 
-         /* If the stmt has uses outside of the loop fail.  */
-         if (stmt_has_scalar_dependences_outside_loop (stmt))
-           goto end;
+         /* If the stmt has uses outside of the loop fail.
+            ???  If the stmt is generated in another partition that
+            is not created as builtin we can ignore this.  */
+         if (stmt_has_scalar_dependences_outside_loop (loop, stmt))
+           {
+             if (dump_file && (dump_flags & TDF_DETAILS))
+               fprintf (dump_file, "not generating builtin, partition has "
+                        "scalar uses outside of the loop\n");
+             goto end;
+           }
 
          if (is_gimple_assign (stmt)
              && !is_gimple_reg (gimple_assign_lhs (stmt)))
@@ -879,60 +873,6 @@ fuse_partitions_with_similar_memory_accesses (struct graph *rdg,
          }
 }
 
-/* Returns true when STMT will be code generated in a partition of RDG
-   different than PART and that will not be code generated as a
-   builtin.  */
-
-static bool
-stmt_generated_in_another_partition (struct graph *rdg, gimple stmt, int part,
-                                    VEC (bitmap, heap) *partitions)
-{
-  int p;
-  bitmap pp;
-  unsigned i;
-  bitmap_iterator bi;
-
-  FOR_EACH_VEC_ELT (bitmap, partitions, p, pp)
-    if (p != part
-       && !can_generate_builtin (rdg, pp))
-      EXECUTE_IF_SET_IN_BITMAP (pp, 0, i, bi)
-       if (stmt == RDG_STMT (rdg, i))
-         return true;
-
-  return false;
-}
-
-/* For each partition in PARTITIONS that will be code generated using
-   a builtin, add its scalar computations used after the loop to
-   PARTITION.  */
-
-static void
-add_scalar_computations_to_partition (struct graph *rdg,
-                                     VEC (bitmap, heap) *partitions,
-                                     bitmap partition)
-{
-  int p;
-  bitmap pp;
-  unsigned i;
-  bitmap_iterator bi;
-  bitmap l = BITMAP_ALLOC (NULL);
-  bitmap pr = BITMAP_ALLOC (NULL);
-  bool f = false;
-
-  FOR_EACH_VEC_ELT (bitmap, partitions, p, pp)
-    if (can_generate_builtin (rdg, pp))
-      EXECUTE_IF_SET_IN_BITMAP (pp, 0, i, bi)
-       if (stmt_has_scalar_dependences_outside_loop (RDG_STMT (rdg, i))
-           && !stmt_generated_in_another_partition (rdg, RDG_STMT (rdg, i), p,
-                                                    partitions))
-         rdg_flag_vertex_and_dependent (rdg, i, partition, l, pr, &f);
-
-  rdg_flag_loop_exits (rdg, l, partition, pr, &f);
-
-  BITMAP_FREE (pr);
-  BITMAP_FREE (l);
-}
-
 /* Aggregate several components into a useful partition that is
    registered in the PARTITIONS vector.  Partitions will be
    distributed in different loops.  */
@@ -996,8 +936,6 @@ rdg_build_partitions (struct graph *rdg, VEC (rdgc, heap) *components,
       free_rdg_components (comps);
     }
 
-  add_scalar_computations_to_partition (rdg, *partitions, partition);
-
   /* If there is something left in the last partition, save it.  */
   if (bitmap_count_bits (partition) > 0)
     VEC_safe_push (bitmap, heap, *partitions, partition);