This enables autopar to pass testing with gimplifying only ever
marking lhs for renaming (I bet this catches not all cases in
omp-low.c, but rather than going for a search myself I'm going
to wait for testcases to show up to increase autopar test coverage).
For this to be easy I made make_rename_temp to be usable in code
shared between SSA / non-SSA.
Bootstrap and regtest running on x86_64-unknown-linux-gnu.
Richard.
2012-05-14 Richard Guenther <rguent...@suse.de>
* tree-dfa.c (make_rename_temp): Be forgiving if not in SSA form.
* omp-low.c (expand_omp_taskreg): Properly conditionalize call
to update_ssa.
(expand_omp_for): Likewise.
(expand_omp_for_generic): Adjust conditional add to referenced vars.
Use make_rename_temp for temporaries that should be rewritten into
SSA form.
(expand_omp_for_static_nochunk): Likewise.
(expand_omp_atomic_pipeline): Likewise.
Index: gcc/tree-dfa.c
===================================================================
--- gcc/tree-dfa.c (revision 187456)
+++ gcc/tree-dfa.c (working copy)
@@ -198,10 +198,9 @@ make_rename_temp (tree type, const char
tree t = create_tmp_reg (type, prefix);
if (gimple_referenced_vars (cfun))
- {
- add_referenced_var (t);
- mark_sym_for_renaming (t);
- }
+ add_referenced_var (t);
+ if (gimple_in_ssa_p (cfun))
+ mark_sym_for_renaming (t);
return t;
}
Index: gcc/omp-low.c
===================================================================
--- gcc/omp-low.c (revision 187456)
+++ gcc/omp-low.c (working copy)
@@ -3598,7 +3598,8 @@ expand_omp_taskreg (struct omp_region *r
expand_parallel_call (region, new_bb, entry_stmt, ws_args);
else
expand_task_call (new_bb, entry_stmt);
- update_ssa (TODO_update_ssa_only_virtuals);
+ if (gimple_in_ssa_p (cfun))
+ update_ssa (TODO_update_ssa_only_virtuals);
}
@@ -3709,7 +3710,7 @@ expand_omp_for_generic (struct omp_regio
iend0 = create_tmp_var (fd->iter_type, ".iend0");
TREE_ADDRESSABLE (istart0) = 1;
TREE_ADDRESSABLE (iend0) = 1;
- if (gimple_in_ssa_p (cfun))
+ if (gimple_referenced_vars (cfun))
{
add_referenced_var (istart0);
add_referenced_var (iend0);
@@ -3793,7 +3794,7 @@ expand_omp_for_generic (struct omp_regio
counts[i] = t;
else
{
- counts[i] = create_tmp_var (type, ".count");
+ counts[i] = make_rename_temp (type, ".count");
t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE,
true, GSI_SAME_STMT);
stmt = gimple_build_assign (counts[i], t);
@@ -3918,8 +3919,7 @@ expand_omp_for_generic (struct omp_regio
false, GSI_CONTINUE_LINKING);
if (fd->collapse > 1)
{
- tree tem = create_tmp_var (type, ".tem");
-
+ tree tem = make_rename_temp (type, ".tem");
stmt = gimple_build_assign (tem, fd->loop.v);
gsi_insert_after (&gsi, stmt, GSI_CONTINUE_LINKING);
for (i = fd->collapse - 1; i >= 0; i--)
@@ -4207,12 +4207,12 @@ expand_omp_for_static_nochunk (struct om
t = fold_convert (itype, t);
n = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true, GSI_SAME_STMT);
- q = create_tmp_var (itype, "q");
+ q = make_rename_temp (itype, "q");
t = fold_build2 (TRUNC_DIV_EXPR, itype, n, nthreads);
t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE, true,
GSI_SAME_STMT);
gsi_insert_before (&gsi, gimple_build_assign (q, t), GSI_SAME_STMT);
- tt = create_tmp_var (itype, "tt");
+ tt = make_rename_temp (itype, "tt");
t = fold_build2 (TRUNC_MOD_EXPR, itype, n, nthreads);
t = force_gimple_operand_gsi (&gsi, t, false, NULL_TREE, true,
GSI_SAME_STMT);
gsi_insert_before (&gsi, gimple_build_assign (tt, t), GSI_SAME_STMT);
@@ -4679,7 +4679,8 @@ expand_omp_for (struct omp_region *regio
(enum built_in_function) next_ix);
}
- update_ssa (TODO_update_ssa_only_virtuals);
+ if (gimple_in_ssa_p (cfun))
+ update_ssa (TODO_update_ssa_only_virtuals);
}
@@ -5281,8 +5282,8 @@ expand_omp_atomic_pipeline (basic_block
{
tree iaddr_val;
- iaddr = create_tmp_var (build_pointer_type_for_mode (itype, ptr_mode,
- true), NULL);
+ iaddr = make_rename_temp (build_pointer_type_for_mode (itype, ptr_mode,
+ true), NULL);
iaddr_val
= force_gimple_operand_gsi (&si,
fold_convert (TREE_TYPE (iaddr), addr),
