Special case non close-phi nodes with one argument in rewrite_close_phi_out_of_ssa.

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

	* graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): Special
	case non close-phi nodes with one argument.

From-SVN: r163145

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61f53149dea3ebe07b7764a7aec524d497315862..c40f769afd0c4d5cad25c2b9e602e52e99b6d6aa 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-02  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): Special
+       case non close-phi nodes with one argument.
+
 2010-08-02  Sebastian Pop  <sebastian.pop@amd.com>
 
        * sese.h (scev_analyzable_p): Scevs could be expressions without

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index a93e0357517851d4b888fcc2b2e68158cb3d6ce2..965ed2530c099fe88934cf81d200faf9a3436953 100644 (file)
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,8 @@
+2010-07-15  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): Special
+       case non close-phi nodes with one argument.
+
 2010-07-15  Sebastian Pop  <sebastian.pop@amd.com>
 
        * sese.h (scev_analyzable_p): Scevs could be expressions without

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 5a8db3dbf80dfcc980d168e25b91ede6b28a5bd9..bea9c9f4c5ecae83a35047bc2938692ef677e8e2 100644 (file)
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2203,22 +2203,34 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi)
   gimple phi = gsi_stmt (*psi);
   tree res = gimple_phi_result (phi);
   tree var = SSA_NAME_VAR (res);
-  tree zero_dim_array = create_zero_dim_array (var, "Close_Phi");
-  gimple_stmt_iterator gsi = gsi_after_labels (gimple_bb (phi));
-  gimple stmt = gimple_build_assign (res, zero_dim_array);
+  basic_block bb = gimple_bb (phi);
+  gimple_stmt_iterator gsi = gsi_after_labels (bb);
   tree arg = gimple_phi_arg_def (phi, 0);
+  gimple stmt;
 
   /* Note that loop close phi nodes should have a single argument
      because we translated the representation into a canonical form
      before Graphite: see canonicalize_loop_closed_ssa_form.  */
   gcc_assert (gimple_phi_num_args (phi) == 1);
 
-  if (TREE_CODE (arg) == SSA_NAME
-      && !SSA_NAME_IS_DEFAULT_DEF (arg))
-    insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg));
+  /* The phi node can be a non close phi node, when its argument is
+     invariant, or when it is defined in the same loop as the phi node.  */
+  if (is_gimple_min_invariant (arg)
+      || gimple_bb (SSA_NAME_DEF_STMT (arg))->loop_father == bb->loop_father)
+    stmt = gimple_build_assign (res, arg);
   else
-    insert_out_of_ssa_copy_on_edge (single_pred_edge (gimple_bb (phi)),
-                                   zero_dim_array, arg);
+    {
+      tree zero_dim_array = create_zero_dim_array (var, "Close_Phi");
+
+      stmt = gimple_build_assign (res, zero_dim_array);
+
+      if (TREE_CODE (arg) == SSA_NAME
+         && !SSA_NAME_IS_DEFAULT_DEF (arg))
+       insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg));
+      else
+       insert_out_of_ssa_copy_on_edge (single_pred_edge (bb),
+                                       zero_dim_array, arg);
+    }
 
   remove_phi_node (psi, false);
   gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);