* [PATCH 0/7] Fix PR45297
@ 2010-11-30 15:33 Sebastian Pop
2010-11-30 15:43 ` [PATCH 3/7] Do not rewrite out of SSA scalar dependences crossing the limits of the scop Sebastian Pop
` (8 more replies)
0 siblings, 9 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 15:33 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther, Sebastian Pop
This set of patches merges the changes needed to fix PR45297 from the
Graphite branch to trunk. This has been bootstrapped and tested on
amd64-linux. It also passed the SPEC benchmarks, although with some
pre-existing errors inherited from the last merge from trunk: I will
merge trunk into the graphite branch. Ok for trunk?
Sebastian
spop (7):
Add a stride parameter to scop_do_strip_mine.
Call recompute_tree_invariant_for_addr_expr when replacing a constant
in an ADDR_EXPR.
Do not rewrite out of SSA scalar dependences crossing the limits of
the scop.
Postpone the rewrite out of SSA to the end of the translation to
polyhedral representation.
LHS cannot be an ADDR_EXPR.
Avoid the analysis of data references after the translation out of
SSA.
Fix unused warnings.
gcc/ChangeLog | 101 +++++++
gcc/ChangeLog.graphite | 103 +++++++
gcc/graphite-blocking.c | 42 ++-
gcc/graphite-poly.c | 12 +-
gcc/graphite-poly.h | 20 ++-
gcc/graphite-sese-to-poly.c | 477 +++++++++++++++++++------------
gcc/graphite-sese-to-poly.h | 4 -
gcc/graphite.c | 29 +--
gcc/sese.c | 10 +
gcc/sese.h | 10 +-
gcc/testsuite/ChangeLog | 5 +
gcc/testsuite/gcc.dg/graphite/pr45297.c | 9 +
12 files changed, 581 insertions(+), 241 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/graphite/pr45297.c
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/7] Do not rewrite out of SSA scalar dependences crossing the limits of the scop.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
@ 2010-11-30 15:43 ` Sebastian Pop
2010-11-30 15:56 ` [PATCH 1/7] Add a stride parameter to scop_do_strip_mine Sebastian Pop
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 15:43 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
* graphite-sese-to-poly.c (handle_scalar_deps_crossing_scop_limits):
New.
(rewrite_cross_bb_scalar_deps): Pass in the scop. Call
handle_scalar_deps_crossing_scop_limits.
(rewrite_cross_bb_scalar_deps_out_of_ssa): Create an empty BB
after the scop. Update call to rewrite_cross_bb_scalar_deps.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@167059 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 9 +++++++
gcc/ChangeLog.graphite | 9 +++++++
gcc/graphite-sese-to-poly.c | 54 +++++++++++++++++++++++++++++++++++++++++-
3 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9e0ddb..a59501f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (handle_scalar_deps_crossing_scop_limits):
+ New.
+ (rewrite_cross_bb_scalar_deps): Pass in the scop. Call
+ handle_scalar_deps_crossing_scop_limits.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Create an empty BB
+ after the scop. Update call to rewrite_cross_bb_scalar_deps.
+
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
* sese.c (rename_uses): Call recompute_tree_invariant_for_addr_expr
when replacing a constant in an ADDR_EXPR.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 1746711..08a4847 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,14 @@
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (handle_scalar_deps_crossing_scop_limits):
+ New.
+ (rewrite_cross_bb_scalar_deps): Pass in the scop. Call
+ handle_scalar_deps_crossing_scop_limits.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Create an empty BB
+ after the scop. Update call to rewrite_cross_bb_scalar_deps.
+
+2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
+
* sese.c (rename_uses): Call recompute_tree_invariant_for_addr_expr
when replacing a constant in an ADDR_EXPR.
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 77930d5..eec46dc 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2426,13 +2426,57 @@ rewrite_cross_bb_scalar_dependence (tree zero_dim_array, tree def, gimple use_st
update_stmt (use_stmt);
}
+/* For every definition DEF in the SCOP that is used outside the scop,
+ insert a closing-scop definition in the basic block just after this
+ SCOP. */
+
+static void
+handle_scalar_deps_crossing_scop_limits (scop_p scop, tree def, gimple stmt)
+{
+ tree var = create_tmp_reg (TREE_TYPE (def), NULL);
+ tree new_name = make_ssa_name (var, stmt);
+ bool needs_copy = false;
+ use_operand_p use_p;
+ imm_use_iterator imm_iter;
+ gimple use_stmt;
+ sese region = SCOP_REGION (scop);
+
+ FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
+ {
+ if (!bb_in_sese_p (gimple_bb (use_stmt), region))
+ {
+ FOR_EACH_IMM_USE_ON_STMT (use_p, imm_iter)
+ {
+ SET_USE (use_p, new_name);
+ }
+ update_stmt (use_stmt);
+ needs_copy = true;
+ }
+ }
+
+ /* Insert in the empty BB just after the scop a use of DEF such
+ that the rewrite of cross_bb_scalar_dependences won't insert
+ arrays everywhere else. */
+ if (needs_copy)
+ {
+ gimple assign = gimple_build_assign (new_name, def);
+ gimple_stmt_iterator psi = gsi_after_labels (SESE_EXIT (region)->dest);
+
+ add_referenced_var (var);
+ SSA_NAME_DEF_STMT (new_name) = assign;
+ update_stmt (assign);
+ gsi_insert_before (&psi, assign, GSI_SAME_STMT);
+ }
+}
+
/* Rewrite the scalar dependences crossing the boundary of the BB
containing STMT with an array. Return true when something has been
changed. */
static bool
-rewrite_cross_bb_scalar_deps (sese region, gimple_stmt_iterator *gsi)
+rewrite_cross_bb_scalar_deps (scop_p scop, gimple_stmt_iterator *gsi)
{
+ sese region = SCOP_REGION (scop);
gimple stmt = gsi_stmt (*gsi);
imm_use_iterator imm_iter;
tree def;
@@ -2473,6 +2517,8 @@ rewrite_cross_bb_scalar_deps (sese region, gimple_stmt_iterator *gsi)
def_bb = gimple_bb (stmt);
+ handle_scalar_deps_crossing_scop_limits (scop, def, stmt);
+
FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
if (gimple_code (use_stmt) == GIMPLE_PHI
&& (res = true))
@@ -2512,14 +2558,18 @@ void
rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p scop)
{
basic_block bb;
+ basic_block exit;
gimple_stmt_iterator psi;
sese region = SCOP_REGION (scop);
bool changed = false;
+ /* Create an extra empty BB after the scop. */
+ exit = split_edge (SESE_EXIT (region));
+
FOR_EACH_BB (bb)
if (bb_in_sese_p (bb, region))
for (psi = gsi_start_bb (bb); !gsi_end_p (psi); gsi_next (&psi))
- changed |= rewrite_cross_bb_scalar_deps (region, &psi);
+ changed |= rewrite_cross_bb_scalar_deps (scop, &psi);
if (changed)
{
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/7] Add a stride parameter to scop_do_strip_mine.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
2010-11-30 15:43 ` [PATCH 3/7] Do not rewrite out of SSA scalar dependences crossing the limits of the scop Sebastian Pop
@ 2010-11-30 15:56 ` Sebastian Pop
2010-11-30 16:05 ` [PATCH 6/7] Avoid the analysis of data references after the translation out of SSA Sebastian Pop
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 15:56 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-10-20 Sebastian Pop <sebastian.pop@amd.com>
* graphite-blocking.c (lst_do_strip_mine_loop): Extra parameter
for the stride.
(lst_do_strip_mine): Same.
(scop_do_strip_mine): Same.
* graphite-poly.c (apply_poly_transforms): Update call to
scop_do_strip_mine.
* graphite-poly.h (scop_do_strip_mine): Update declaration.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@165738 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 10 ++++++++++
gcc/ChangeLog.graphite | 10 ++++++++++
gcc/graphite-blocking.c | 42 ++++++++++++++++++++++++++++--------------
gcc/graphite-poly.c | 2 +-
gcc/graphite-poly.h | 2 +-
5 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5706ef8..3d6de3f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
+ * graphite-blocking.c (lst_do_strip_mine_loop): Extra parameter
+ for the stride.
+ (lst_do_strip_mine): Same.
+ (scop_do_strip_mine): Same.
+ * graphite-poly.c (apply_poly_transforms): Update call to
+ scop_do_strip_mine.
+ * graphite-poly.h (scop_do_strip_mine): Update declaration.
+
2010-11-29 H.J. Lu <hongjiu.lu@intel.com>
PR driver/46712
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 6f0038b..a205928 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,13 @@
+2010-10-20 Sebastian Pop <sebastian.pop@amd.com>
+
+ * graphite-blocking.c (lst_do_strip_mine_loop): Extra parameter
+ for the stride.
+ (lst_do_strip_mine): Same.
+ (scop_do_strip_mine): Same.
+ * graphite-poly.c (apply_poly_transforms): Update call to
+ scop_do_strip_mine.
+ * graphite-poly.h (scop_do_strip_mine): Update declaration.
+
2010-09-24 Sebastian Pop <sebastian.pop@amd.com>
PR middle-end/45758
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index 3951b60..f1dd846 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -194,15 +194,14 @@ lst_strip_mine_profitable_p (lst_p lst, int stride)
return res;
}
-/* Strip-mines all the loops of LST that are considered profitable to
- strip-mine. Return true if it did strip-mined some loops. */
+/* Strip-mines all the loops of LST with STRIDE. Return true if it
+ did strip-mined some loops. */
static bool
-lst_do_strip_mine_loop (lst_p lst, int depth)
+lst_do_strip_mine_loop (lst_p lst, int depth, int stride)
{
int i;
lst_p l;
- int stride = PARAM_VALUE (PARAM_LOOP_BLOCK_TILE_SIZE);
poly_bb_p pbb;
if (!lst)
@@ -213,7 +212,7 @@ lst_do_strip_mine_loop (lst_p lst, int depth)
bool res = false;
FOR_EACH_VEC_ELT (lst_p, LST_SEQ (lst), i, l)
- res |= lst_do_strip_mine_loop (l, depth);
+ res |= lst_do_strip_mine_loop (l, depth, stride);
return res;
}
@@ -223,30 +222,45 @@ lst_do_strip_mine_loop (lst_p lst, int depth)
stride);
}
-/* Strip-mines all the loops of LST that are considered profitable to
- strip-mine. Return true if it did strip-mined some loops. */
+/* Strip-mines all the loops of LST with STRIDE. When STRIDE is zero,
+ read the stride from the PARAM_LOOP_BLOCK_TILE_SIZE. Return true
+ if it did strip-mined some loops.
+
+ Strip mining transforms a loop
+
+ | for (i = 0; i < N; i++)
+ | S (i);
+
+ into the following loop nest:
+
+ | for (k = 0; k < N; k += STRIDE)
+ | for (j = 0; j < STRIDE; j++)
+ | S (i = k + j);
+*/
static bool
-lst_do_strip_mine (lst_p lst)
+lst_do_strip_mine (lst_p lst, int stride)
{
int i;
lst_p l;
bool res = false;
- int stride = PARAM_VALUE (PARAM_LOOP_BLOCK_TILE_SIZE);
int depth;
+ if (!stride)
+ stride = PARAM_VALUE (PARAM_LOOP_BLOCK_TILE_SIZE);
+
if (!lst
|| !LST_LOOP_P (lst))
return false;
FOR_EACH_VEC_ELT (lst_p, LST_SEQ (lst), i, l)
- res |= lst_do_strip_mine (l);
+ res |= lst_do_strip_mine (l, stride);
depth = lst_depth (lst);
if (depth >= 0
&& lst_strip_mine_profitable_p (lst, stride))
{
- res |= lst_do_strip_mine_loop (lst, lst_depth (lst));
+ res |= lst_do_strip_mine_loop (lst, lst_depth (lst), stride);
lst_add_loop_under_loop (lst);
}
@@ -257,9 +271,9 @@ lst_do_strip_mine (lst_p lst)
have been strip-mined. */
bool
-scop_do_strip_mine (scop_p scop)
+scop_do_strip_mine (scop_p scop, int stride)
{
- return lst_do_strip_mine (SCOP_TRANSFORMED_SCHEDULE (scop));
+ return lst_do_strip_mine (SCOP_TRANSFORMED_SCHEDULE (scop), stride);
}
/* Loop blocks all the loops in SCOP. Returns true when we manage to
@@ -273,7 +287,7 @@ scop_do_block (scop_p scop)
store_scattering (scop);
- strip_mined = lst_do_strip_mine (SCOP_TRANSFORMED_SCHEDULE (scop));
+ strip_mined = lst_do_strip_mine (SCOP_TRANSFORMED_SCHEDULE (scop), 0);
interchanged = scop_do_interchange (scop);
/* If we don't interchange loops, the strip mine alone will not be
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 0dbd61c..eebaa13 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -777,7 +777,7 @@ apply_poly_transforms (scop_p scop)
else
{
if (flag_loop_strip_mine)
- transform_done |= scop_do_strip_mine (scop);
+ transform_done |= scop_do_strip_mine (scop, 0);
if (flag_loop_interchange)
transform_done |= scop_do_interchange (scop);
diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h
index 8b950a4..4a2f25c 100644
--- a/gcc/graphite-poly.h
+++ b/gcc/graphite-poly.h
@@ -412,7 +412,7 @@ extern void print_iteration_domains (FILE *, scop_p, int);
extern void debug_iteration_domain (poly_bb_p, int);
extern void debug_iteration_domains (scop_p, int);
extern bool scop_do_interchange (scop_p);
-extern bool scop_do_strip_mine (scop_p);
+extern bool scop_do_strip_mine (scop_p, int);
extern bool scop_do_block (scop_p);
extern bool flatten_all_loops (scop_p);
extern void pbb_number_of_iterations_at_time (poly_bb_p, graphite_dim_t, mpz_t);
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 6/7] Avoid the analysis of data references after the translation out of SSA.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
2010-11-30 15:43 ` [PATCH 3/7] Do not rewrite out of SSA scalar dependences crossing the limits of the scop Sebastian Pop
2010-11-30 15:56 ` [PATCH 1/7] Add a stride parameter to scop_do_strip_mine Sebastian Pop
@ 2010-11-30 16:05 ` Sebastian Pop
2010-11-30 16:06 ` [PATCH 2/7] Call recompute_tree_invariant_for_addr_expr when replacing a constant in an ADDR_EXPR Sebastian Pop
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 16:05 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
* graphite-sese-to-poly.c (analyze_drs): Removed.
(build_scop_drs): Do not call analyze_drs.
(analyze_drs_in_stmts): New.
(insert_stmts): New.
(insert_out_of_ssa_copy): Call analyze_drs_in_stmts.
(insert_out_of_ssa_copy_on_edge): Same.
(rewrite_close_phi_out_of_ssa): Call insert_stmts.
(rewrite_phi_out_of_ssa): Same.
(rewrite_cross_bb_scalar_dependence): Same.
(split_reduction_stmt): Move data references in the new basic blocks.
(translate_scalar_reduction_to_array_for_stmt): Call insert_stmts.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@167165 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 14 ++++
gcc/ChangeLog.graphite | 14 ++++
gcc/graphite-sese-to-poly.c | 171 ++++++++++++++++++++++++++-----------------
3 files changed, 133 insertions(+), 66 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 08d4323..3cf2c7c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,19 @@
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (analyze_drs): Removed.
+ (build_scop_drs): Do not call analyze_drs.
+ (analyze_drs_in_stmts): New.
+ (insert_stmts): New.
+ (insert_out_of_ssa_copy): Call analyze_drs_in_stmts.
+ (insert_out_of_ssa_copy_on_edge): Same.
+ (rewrite_close_phi_out_of_ssa): Call insert_stmts.
+ (rewrite_phi_out_of_ssa): Same.
+ (rewrite_cross_bb_scalar_dependence): Same.
+ (split_reduction_stmt): Move data references in the new basic blocks.
+ (translate_scalar_reduction_to_array_for_stmt): Call insert_stmts.
+
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
* sese.c (rename_uses): Do not handle ADDR_EXPR in LHS of assignments.
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 8114735..b5c6004 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,19 @@
2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (analyze_drs): Removed.
+ (build_scop_drs): Do not call analyze_drs.
+ (analyze_drs_in_stmts): New.
+ (insert_stmts): New.
+ (insert_out_of_ssa_copy): Call analyze_drs_in_stmts.
+ (insert_out_of_ssa_copy_on_edge): Same.
+ (rewrite_close_phi_out_of_ssa): Call insert_stmts.
+ (rewrite_phi_out_of_ssa): Same.
+ (rewrite_cross_bb_scalar_dependence): Same.
+ (split_reduction_stmt): Move data references in the new basic blocks.
+ (translate_scalar_reduction_to_array_for_stmt): Call insert_stmts.
+
+2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
+
* sese.c (rename_uses): Do not handle ADDR_EXPR in LHS of assignments.
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index c614874..805c0f5 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -1957,36 +1957,6 @@ dump_alias_graphs (VEC (data_reference_p, heap) *drs)
}
}
-/* Recompute all the data references of BB and add them to the
- GBB_DATA_REFS vector. */
-
-static void
-analyze_drs (scop_p scop, basic_block bb)
-{
- loop_p nest;
- poly_bb_p pbb;
- gimple_stmt_iterator gsi;
- gimple_bb_p gbb;
-
- if (!bb_in_sese_p (bb, SCOP_REGION (scop)))
- return;
-
- nest = outermost_loop_in_sese (SCOP_REGION (scop), bb);
- pbb = pbb_from_bb (bb);
- gbb = PBB_BLACK_BOX (pbb);
-
- VEC_free (data_reference_p, heap, GBB_DATA_REFS (gbb));
- GBB_DATA_REFS (gbb) = VEC_alloc (data_reference_p, heap, 3);
-
- for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
- {
- gimple stmt = gsi_stmt (gsi);
- if (!is_gimple_debug (stmt))
- graphite_find_data_references_in_stmt (nest, stmt,
- &GBB_DATA_REFS (gbb));
- }
-}
-
/* Build data references in SCOP. */
static void
@@ -2000,14 +1970,11 @@ build_scop_drs (scop_p scop)
/* Remove all the PBBs that do not have data references: these basic
blocks are not handled in the polyhedral representation. */
for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
- {
- analyze_drs (scop, GBB_BB (PBB_BLACK_BOX (pbb)));
- if (VEC_empty (data_reference_p, GBB_DATA_REFS (PBB_BLACK_BOX (pbb))))
- {
- VEC_ordered_remove (poly_bb_p, SCOP_BBS (scop), i);
- i--;
- }
- }
+ if (VEC_empty (data_reference_p, GBB_DATA_REFS (PBB_BLACK_BOX (pbb))))
+ {
+ VEC_ordered_remove (poly_bb_p, SCOP_BBS (scop), i);
+ i--;
+ }
FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
for (j = 0; VEC_iterate (data_reference_p,
@@ -2052,21 +2019,73 @@ gsi_for_phi_node (gimple stmt)
return psi;
}
+/* Analyze all the data references of STMTS and add them to the
+ GBB_DATA_REFS vector of BB. */
+
+static void
+analyze_drs_in_stmts (scop_p scop, basic_block bb, VEC (gimple, heap) *stmts)
+{
+ loop_p nest;
+ poly_bb_p pbb;
+ gimple_bb_p gbb;
+ gimple stmt;
+ int i;
+
+ if (!bb_in_sese_p (bb, SCOP_REGION (scop)))
+ return;
+
+ nest = outermost_loop_in_sese (SCOP_REGION (scop), bb);
+ pbb = pbb_from_bb (bb);
+ gbb = gbb_from_bb (bb);
+
+ FOR_EACH_VEC_ELT (gimple, stmts, i, stmt)
+ if (!is_gimple_debug (stmt))
+ graphite_find_data_references_in_stmt (nest, stmt,
+ &GBB_DATA_REFS (gbb));
+}
+
+/* Insert STMT at the end of the STMTS sequence and then insert the
+ statements from STMTS at INSERT_GSI and call analyze_drs_in_stmts
+ on STMTS. */
+
+static void
+insert_stmts (scop_p scop, gimple stmt, gimple_seq stmts,
+ gimple_stmt_iterator insert_gsi)
+{
+ gimple_stmt_iterator gsi;
+ VEC (gimple, heap) *x = VEC_alloc (gimple, heap, 3);
+
+ if (!stmts)
+ stmts = gimple_seq_alloc ();
+
+ gsi = gsi_last (stmts);
+ gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
+ for (gsi = gsi_start (stmts); !gsi_end_p (gsi); gsi_next (&gsi))
+ VEC_safe_push (gimple, heap, x, gsi_stmt (gsi));
+
+ gsi_insert_seq_before (&insert_gsi, stmts, GSI_SAME_STMT);
+ analyze_drs_in_stmts (scop, gsi_bb (insert_gsi), x);
+ VEC_free (gimple, heap, x);
+}
+
/* Insert the assignment "RES := EXPR" just after AFTER_STMT. */
static void
-insert_out_of_ssa_copy (tree res, tree expr, gimple after_stmt)
+insert_out_of_ssa_copy (scop_p scop, tree res, tree expr, gimple after_stmt)
{
gimple_seq stmts;
gimple_stmt_iterator si;
gimple_stmt_iterator gsi;
tree var = force_gimple_operand (expr, &stmts, true, NULL_TREE);
gimple stmt = gimple_build_assign (res, var);
+ VEC (gimple, heap) *x = VEC_alloc (gimple, heap, 3);
if (!stmts)
stmts = gimple_seq_alloc ();
si = gsi_last (stmts);
gsi_insert_after (&si, stmt, GSI_NEW_STMT);
+ for (gsi = gsi_start (stmts); !gsi_end_p (gsi); gsi_next (&gsi))
+ VEC_safe_push (gimple, heap, x, gsi_stmt (gsi));
if (gimple_code (after_stmt) == GIMPLE_PHI)
{
@@ -2078,6 +2097,9 @@ insert_out_of_ssa_copy (tree res, tree expr, gimple after_stmt)
gsi = gsi_for_stmt (after_stmt);
gsi_insert_seq_after (&gsi, stmts, GSI_NEW_STMT);
}
+
+ analyze_drs_in_stmts (scop, gimple_bb (after_stmt), x);
+ VEC_free (gimple, heap, x);
}
/* Creates a poly_bb_p for basic_block BB from the existing PBB. */
@@ -2114,12 +2136,16 @@ insert_out_of_ssa_copy_on_edge (scop_p scop, edge e, tree res, tree expr)
tree var = force_gimple_operand (expr, &stmts, true, NULL_TREE);
gimple stmt = gimple_build_assign (res, var);
basic_block bb;
+ VEC (gimple, heap) *x = VEC_alloc (gimple, heap, 3);
if (!stmts)
stmts = gimple_seq_alloc ();
gsi = gsi_last (stmts);
gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
+ for (gsi = gsi_start (stmts); !gsi_end_p (gsi); gsi_next (&gsi))
+ VEC_safe_push (gimple, heap, x, gsi_stmt (gsi));
+
gsi_insert_seq_on_edge (e, stmts);
gsi_commit_edge_inserts ();
bb = gimple_bb (stmt);
@@ -2129,6 +2155,9 @@ insert_out_of_ssa_copy_on_edge (scop_p scop, edge e, tree res, tree expr)
if (!gbb_from_bb (bb))
new_pbb_from_pbb (scop, pbb_from_bb (e->src), bb);
+
+ analyze_drs_in_stmts (scop, bb, x);
+ VEC_free (gimple, heap, x);
}
/* Creates a zero dimension array of the same type as VAR. */
@@ -2270,7 +2299,7 @@ rewrite_close_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
stmt = gimple_build_assign (res, zero_dim_array);
if (TREE_CODE (arg) == SSA_NAME)
- insert_out_of_ssa_copy (zero_dim_array, arg,
+ insert_out_of_ssa_copy (scop, zero_dim_array, arg,
SSA_NAME_DEF_STMT (arg));
else
insert_out_of_ssa_copy_on_edge (scop, single_pred_edge (bb),
@@ -2278,8 +2307,9 @@ rewrite_close_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
}
remove_phi_node (psi, false);
- gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);
SSA_NAME_DEF_STMT (res) = stmt;
+
+ insert_stmts (scop, stmt, NULL, gsi_after_labels (bb));
}
/* Rewrite out of SSA the reduction phi node at PSI by creating a zero
@@ -2294,7 +2324,6 @@ rewrite_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
tree res = gimple_phi_result (phi);
tree var = SSA_NAME_VAR (res);
tree zero_dim_array = create_zero_dim_array (var, "phi_out_of_ssa");
- gimple_stmt_iterator gsi;
gimple stmt;
gimple_seq stmts;
@@ -2307,7 +2336,7 @@ rewrite_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
pattern matching of the vectorizer. */
if (TREE_CODE (arg) == SSA_NAME
&& e->src == bb->loop_father->latch)
- insert_out_of_ssa_copy (zero_dim_array, arg,
+ insert_out_of_ssa_copy (scop, zero_dim_array, arg,
SSA_NAME_DEF_STMT (arg));
else
insert_out_of_ssa_copy_on_edge (scop, e, zero_dim_array, arg);
@@ -2315,18 +2344,11 @@ rewrite_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
var = force_gimple_operand (zero_dim_array, &stmts, true, NULL_TREE);
- if (!stmts)
- stmts = gimple_seq_alloc ();
-
stmt = gimple_build_assign (res, var);
remove_phi_node (psi, false);
SSA_NAME_DEF_STMT (res) = stmt;
- gsi = gsi_last (stmts);
- gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
-
- gsi = gsi_after_labels (bb);
- gsi_insert_seq_before (&gsi, stmts, GSI_NEW_STMT);
+ insert_stmts (scop, stmt, stmts, gsi_after_labels (bb));
}
/* Rewrite the degenerate phi node at position PSI from the degenerate
@@ -2396,7 +2418,7 @@ rewrite_reductions_out_of_ssa (scop_p scop)
read from ZERO_DIM_ARRAY. */
static void
-rewrite_cross_bb_scalar_dependence (tree zero_dim_array,
+rewrite_cross_bb_scalar_dependence (scop_p scop, tree zero_dim_array,
tree def, gimple use_stmt)
{
tree var = SSA_NAME_VAR (def);
@@ -2404,14 +2426,11 @@ rewrite_cross_bb_scalar_dependence (tree zero_dim_array,
tree name = make_ssa_name (var, name_stmt);
ssa_op_iter iter;
use_operand_p use_p;
- gimple_stmt_iterator gsi;
gcc_assert (gimple_code (use_stmt) != GIMPLE_PHI);
gimple_assign_set_lhs (name_stmt, name);
-
- gsi = gsi_for_stmt (use_stmt);
- gsi_insert_before (&gsi, name_stmt, GSI_NEW_STMT);
+ insert_stmts (scop, name_stmt, NULL, gsi_for_stmt (use_stmt));
FOR_EACH_SSA_USE_OPERAND (use_p, use_stmt, iter, SSA_OP_ALL_USES)
if (operand_equal_p (def, USE_FROM_PTR (use_p), 0))
@@ -2535,12 +2554,12 @@ rewrite_cross_bb_scalar_deps (scop_p scop, gimple_stmt_iterator *gsi)
{
zero_dim_array = create_zero_dim_array
(SSA_NAME_VAR (def), "Cross_BB_scalar_dependence");
- insert_out_of_ssa_copy (zero_dim_array, def,
+ insert_out_of_ssa_copy (scop, zero_dim_array, def,
SSA_NAME_DEF_STMT (def));
gsi_next (gsi);
}
- rewrite_cross_bb_scalar_dependence (zero_dim_array,
+ rewrite_cross_bb_scalar_dependence (scop, zero_dim_array,
def, use_stmt);
}
@@ -2627,7 +2646,10 @@ split_reduction_stmt (scop_p scop, gimple stmt)
{
basic_block bb = gimple_bb (stmt);
poly_bb_p pbb = pbb_from_bb (bb);
+ gimple_bb_p gbb = gbb_from_bb (bb);
edge e1;
+ int i;
+ data_reference_p dr;
/* Do not split basic blocks with no writes to memory: the reduction
will be the only write to memory. */
@@ -2645,6 +2667,22 @@ split_reduction_stmt (scop_p scop, gimple stmt)
e1 = split_pbb (scop, pbb, bb, gsi_stmt (gsi));
}
+ /* A part of the data references will end in a different basic block
+ after the split: move the DRs from the original GBB to the newly
+ created GBB1. */
+ FOR_EACH_VEC_ELT (data_reference_p, GBB_DATA_REFS (gbb), i, dr)
+ {
+ basic_block bb1 = gimple_bb (DR_STMT (dr));
+
+ if (bb1 != bb)
+ {
+ gimple_bb_p gbb1 = gbb_from_bb (bb1);
+ VEC_safe_push (data_reference_p, heap, GBB_DATA_REFS (gbb1), dr);
+ VEC_ordered_remove (data_reference_p, GBB_DATA_REFS (gbb), i);
+ i--;
+ }
+ }
+
return e1->dest;
}
@@ -2871,18 +2909,19 @@ detect_commutative_reduction (gimple stmt, VEC (gimple, heap) **in,
knowing that its recursive phi node is LOOP_PHI. */
static void
-translate_scalar_reduction_to_array_for_stmt (tree red, gimple stmt,
- gimple loop_phi)
+translate_scalar_reduction_to_array_for_stmt (scop_p scop, tree red,
+ gimple stmt, gimple loop_phi)
{
tree res = gimple_phi_result (loop_phi);
gimple assign = gimple_build_assign (res, red);
- gimple_stmt_iterator insert_gsi = gsi_after_labels (gimple_bb (loop_phi));
+ gimple_stmt_iterator gsi;
- gsi_insert_before (&insert_gsi, assign, GSI_SAME_STMT);
+ insert_stmts (scop, assign, NULL, gsi_after_labels (gimple_bb (loop_phi)));
assign = gimple_build_assign (red, gimple_assign_lhs (stmt));
- insert_gsi = gsi_for_stmt (stmt);
- gsi_insert_after (&insert_gsi, assign, GSI_SAME_STMT);
+ gsi = gsi_for_stmt (stmt);
+ gsi_next (&gsi);
+ insert_stmts (scop, assign, NULL, gsi);
}
/* Removes the PHI node and resets all the debug stmts that are using
@@ -2954,13 +2993,13 @@ translate_scalar_reduction_to_array (scop_p scop,
red = create_zero_dim_array
(gimple_assign_lhs (stmt), "Commutative_Associative_Reduction");
translate_scalar_reduction_to_array_for_stmt
- (red, stmt, VEC_index (gimple, in, 1));
+ (scop, red, stmt, VEC_index (gimple, in, 1));
continue;
}
if (i == VEC_length (gimple, in) - 1)
{
- insert_out_of_ssa_copy (gimple_phi_result (close_phi), red,
+ insert_out_of_ssa_copy (scop, gimple_phi_result (close_phi), red,
close_phi);
insert_out_of_ssa_copy_on_edge
(scop, edge_initial_value_for_loop_phi (loop_phi),
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/7] Call recompute_tree_invariant_for_addr_expr when replacing a constant in an ADDR_EXPR.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
` (2 preceding siblings ...)
2010-11-30 16:05 ` [PATCH 6/7] Avoid the analysis of data references after the translation out of SSA Sebastian Pop
@ 2010-11-30 16:06 ` Sebastian Pop
2010-11-30 16:06 ` [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation Sebastian Pop
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 16:06 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
* sese.c (rename_uses): Call recompute_tree_invariant_for_addr_expr
when replacing a constant in an ADDR_EXPR.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@167058 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 5 +++++
gcc/ChangeLog.graphite | 5 +++++
gcc/sese.c | 13 +++++++++++++
3 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d6de3f..a9e0ddb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+ * sese.c (rename_uses): Call recompute_tree_invariant_for_addr_expr
+ when replacing a constant in an ADDR_EXPR.
+
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-blocking.c (lst_do_strip_mine_loop): Extra parameter
for the stride.
(lst_do_strip_mine): Same.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index a205928..1746711 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,8 @@
+2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
+
+ * sese.c (rename_uses): Call recompute_tree_invariant_for_addr_expr
+ when replacing a constant in an ADDR_EXPR.
+
2010-10-20 Sebastian Pop <sebastian.pop@amd.com>
* graphite-blocking.c (lst_do_strip_mine_loop): Extra parameter
diff --git a/gcc/sese.c b/gcc/sese.c
index ffcb51c..dbb0cd7 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -547,6 +547,19 @@ rename_uses (gimple copy, htab_t rename_map, gimple_stmt_iterator *gsi_tgt,
true, NULL_TREE);
gsi_insert_seq_before (gsi_tgt, stmts, GSI_SAME_STMT);
replace_exp (use_p, new_expr);
+
+
+ if (TREE_CODE (new_expr) == INTEGER_CST)
+ {
+ tree lhs = gimple_assign_lhs (copy);
+ tree rhs = gimple_assign_rhs1 (copy);
+
+ if (TREE_CODE (lhs) == ADDR_EXPR)
+ recompute_tree_invariant_for_addr_expr (lhs);
+ if (TREE_CODE (rhs) == ADDR_EXPR)
+ recompute_tree_invariant_for_addr_expr (rhs);
+ }
+
set_rename (rename_map, old_name, new_expr);
}
}
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
` (3 preceding siblings ...)
2010-11-30 16:06 ` [PATCH 2/7] Call recompute_tree_invariant_for_addr_expr when replacing a constant in an ADDR_EXPR Sebastian Pop
@ 2010-11-30 16:06 ` Sebastian Pop
2010-12-15 6:25 ` H.J. Lu
2010-11-30 16:07 ` [PATCH 7/7] Fix unused warnings Sebastian Pop
` (3 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 16:06 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
PR middle-end/45297
* graphite-poly.c (new_poly_bb): Returns a poly_bb_p. Do not take
the reduction bool in parameter. Clear PBB_IS_REDUCTION. Set GBB_PBB.
* graphite-poly.h (new_poly_bb): Update declaration.
(gbb_from_bb): Moved here...
(pbb_from_bb): New.
* graphite-sese-to-poly.c (var_used_in_not_loop_header_phi_node):
Removed.
(graphite_stmt_p): Removed.
(try_generate_gimple_bb): Returns a gimple_bb_p. Do not pass in
sbitmap reductions. Always build a gimple_bb_p. Do not call
new_poly_bb.
(build_scop_bbs_1): Do not pass in sbitmap reductions.
(build_scop_bbs): Same.
(gbb_from_bb): ... from here.
(add_conditions_to_constraints): Moved up.
(analyze_drs): New.
(build_scop_drs): Call analyze_drs. Remove all the PBBs that do
not contain data references.
(new_pbb_from_pbb): New.
(insert_out_of_ssa_copy_on_edge): Call new_pbb_from_pbb after a
block is split.
(rewrite_close_phi_out_of_ssa): Update call to
insert_out_of_ssa_copy_on_edge.
(rewrite_reductions_out_of_ssa): Now static.
(rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
(split_pbb): New.
(split_reduction_stmt): Call split_pbb.
(translate_scalar_reduction_to_array): Pass in the scop, do not
pass in the sbitmap reductions.
(rewrite_commutative_reductions_out_of_ssa_close_phi): Same.
(rewrite_commutative_reductions_out_of_ssa_loop): Same.
(rewrite_commutative_reductions_out_of_ssa): Same.
(build_poly_scop): Call build_scop_bbs,
rewrite_commutative_reductions_out_of_ssa,
rewrite_reductions_out_of_ssa, and
rewrite_cross_bb_scalar_deps_out_of_ssa. Move build_scop_drs
before scop_to_lst.
* graphite-sese-to-poly.h (rewrite_commutative_reductions_out_of_ssa):
Removed declaration.
(rewrite_reductions_out_of_ssa): Same.
(rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
(build_scop_bbs): Same.
* graphite.c (graphite_transform_loops): Do not initialize reductions.
Do not call build_scop_bbs,
rewrite_commutative_reductions_out_of_ssa,
rewrite_reductions_out_of_ssa, and
rewrite_cross_bb_scalar_deps_out_of_ssa.
* sese.h (struct gimple_bb): Add field pbb.
(GBB_PBB): New.
* gcc.dg/graphite/pr45297.c: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@167060 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 53 +++++
gcc/ChangeLog.graphite | 55 +++++
gcc/graphite-poly.c | 10 +-
gcc/graphite-poly.h | 18 ++-
gcc/graphite-sese-to-poly.c | 347 ++++++++++++++++---------------
gcc/graphite-sese-to-poly.h | 4 -
gcc/graphite.c | 29 +--
gcc/sese.h | 10 +-
gcc/testsuite/ChangeLog | 5 +
gcc/testsuite/gcc.dg/graphite/pr45297.c | 9 +
10 files changed, 337 insertions(+), 203 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/graphite/pr45297.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a59501f..9a49897 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,58 @@
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+ PR middle-end/45297
+ * graphite-poly.c (new_poly_bb): Returns a poly_bb_p. Do not take
+ the reduction bool in parameter. Clear PBB_IS_REDUCTION. Set GBB_PBB.
+ * graphite-poly.h (new_poly_bb): Update declaration.
+ (gbb_from_bb): Moved here...
+ (pbb_from_bb): New.
+ * graphite-sese-to-poly.c (var_used_in_not_loop_header_phi_node):
+ Removed.
+ (graphite_stmt_p): Removed.
+ (try_generate_gimple_bb): Returns a gimple_bb_p. Do not pass in
+ sbitmap reductions. Always build a gimple_bb_p. Do not call
+ new_poly_bb.
+ (build_scop_bbs_1): Do not pass in sbitmap reductions.
+ (build_scop_bbs): Same.
+ (gbb_from_bb): ... from here.
+ (add_conditions_to_constraints): Moved up.
+ (analyze_drs): New.
+ (build_scop_drs): Call analyze_drs. Remove all the PBBs that do
+ not contain data references.
+ (new_pbb_from_pbb): New.
+ (insert_out_of_ssa_copy_on_edge): Call new_pbb_from_pbb after a
+ block is split.
+ (rewrite_close_phi_out_of_ssa): Update call to
+ insert_out_of_ssa_copy_on_edge.
+ (rewrite_reductions_out_of_ssa): Now static.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
+ (split_pbb): New.
+ (split_reduction_stmt): Call split_pbb.
+ (translate_scalar_reduction_to_array): Pass in the scop, do not
+ pass in the sbitmap reductions.
+ (rewrite_commutative_reductions_out_of_ssa_close_phi): Same.
+ (rewrite_commutative_reductions_out_of_ssa_loop): Same.
+ (rewrite_commutative_reductions_out_of_ssa): Same.
+ (build_poly_scop): Call build_scop_bbs,
+ rewrite_commutative_reductions_out_of_ssa,
+ rewrite_reductions_out_of_ssa, and
+ rewrite_cross_bb_scalar_deps_out_of_ssa. Move build_scop_drs
+ before scop_to_lst.
+ * graphite-sese-to-poly.h (rewrite_commutative_reductions_out_of_ssa):
+ Removed declaration.
+ (rewrite_reductions_out_of_ssa): Same.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
+ (build_scop_bbs): Same.
+ * graphite.c (graphite_transform_loops): Do not initialize reductions.
+ Do not call build_scop_bbs,
+ rewrite_commutative_reductions_out_of_ssa,
+ rewrite_reductions_out_of_ssa, and
+ rewrite_cross_bb_scalar_deps_out_of_ssa.
+ * sese.h (struct gimple_bb): Add field pbb.
+ (GBB_PBB): New.
+
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-sese-to-poly.c (handle_scalar_deps_crossing_scop_limits):
New.
(rewrite_cross_bb_scalar_deps): Pass in the scop. Call
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 08a4847..4461ade 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,60 @@
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
+ PR middle-end/45297
+ * graphite-poly.c (new_poly_bb): Returns a poly_bb_p. Do not take
+ the reduction bool in parameter. Clear PBB_IS_REDUCTION. Set GBB_PBB.
+ * graphite-poly.h (new_poly_bb): Update declaration.
+ (gbb_from_bb): Moved here...
+ (pbb_from_bb): New.
+ * graphite-sese-to-poly.c (var_used_in_not_loop_header_phi_node):
+ Removed.
+ (graphite_stmt_p): Removed.
+ (try_generate_gimple_bb): Returns a gimple_bb_p. Do not pass in
+ sbitmap reductions. Always build a gimple_bb_p. Do not call
+ new_poly_bb.
+ (build_scop_bbs_1): Do not pass in sbitmap reductions.
+ (build_scop_bbs): Same.
+ (gbb_from_bb): ... from here.
+ (add_conditions_to_constraints): Moved up.
+ (analyze_drs): New.
+ (build_scop_drs): Call analyze_drs. Remove all the PBBs that do
+ not contain data references.
+ (new_pbb_from_pbb): New.
+ (insert_out_of_ssa_copy_on_edge): Call new_pbb_from_pbb after a
+ block is split.
+ (rewrite_close_phi_out_of_ssa): Update call to
+ insert_out_of_ssa_copy_on_edge.
+ (rewrite_reductions_out_of_ssa): Now static.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
+ (split_pbb): New.
+ (split_reduction_stmt): Call split_pbb.
+ (translate_scalar_reduction_to_array): Pass in the scop, do not
+ pass in the sbitmap reductions.
+ (rewrite_commutative_reductions_out_of_ssa_close_phi): Same.
+ (rewrite_commutative_reductions_out_of_ssa_loop): Same.
+ (rewrite_commutative_reductions_out_of_ssa): Same.
+ (build_poly_scop): Call build_scop_bbs,
+ rewrite_commutative_reductions_out_of_ssa,
+ rewrite_reductions_out_of_ssa, and
+ rewrite_cross_bb_scalar_deps_out_of_ssa. Move build_scop_drs
+ before scop_to_lst.
+ * graphite-sese-to-poly.h (rewrite_commutative_reductions_out_of_ssa):
+ Removed declaration.
+ (rewrite_reductions_out_of_ssa): Same.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
+ (build_scop_bbs): Same.
+ * graphite.c (graphite_transform_loops): Do not initialize reductions.
+ Do not call build_scop_bbs,
+ rewrite_commutative_reductions_out_of_ssa,
+ rewrite_reductions_out_of_ssa, and
+ rewrite_cross_bb_scalar_deps_out_of_ssa.
+ * sese.h (struct gimple_bb): Add field pbb.
+ (GBB_PBB): New.
+
+ * gcc.dg/graphite/pr45297.c: New.
+
+2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-sese-to-poly.c (handle_scalar_deps_crossing_scop_limits):
New.
(rewrite_cross_bb_scalar_deps): Pass in the scop. Call
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index eebaa13..a0b3007 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -875,8 +875,8 @@ free_poly_dr (poly_dr_p pdr)
/* Create a new polyhedral black box. */
-void
-new_poly_bb (scop_p scop, void *black_box, bool reduction)
+poly_bb_p
+new_poly_bb (scop_p scop, void *black_box)
{
poly_bb_p pbb = XNEW (struct poly_bb);
@@ -887,9 +887,11 @@ new_poly_bb (scop_p scop, void *black_box, bool reduction)
PBB_SAVED (pbb) = NULL;
PBB_ORIGINAL (pbb) = NULL;
PBB_DRS (pbb) = VEC_alloc (poly_dr_p, heap, 3);
- PBB_IS_REDUCTION (pbb) = reduction;
+ PBB_IS_REDUCTION (pbb) = false;
PBB_PDR_DUPLICATES_REMOVED (pbb) = false;
- VEC_safe_push (poly_bb_p, heap, SCOP_BBS (scop), pbb);
+ GBB_PBB ((gimple_bb_p) black_box) = pbb;
+
+ return pbb;
}
/* Free polyhedral black box. */
diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h
index 4a2f25c..8be905e 100644
--- a/gcc/graphite-poly.h
+++ b/gcc/graphite-poly.h
@@ -389,7 +389,7 @@ struct poly_bb
#define PBB_PDR_DUPLICATES_REMOVED(PBB) (PBB->pdr_duplicates_removed)
#define PBB_IS_REDUCTION(PBB) (PBB->is_reduction)
-extern void new_poly_bb (scop_p, void *, bool);
+extern poly_bb_p new_poly_bb (scop_p, void *);
extern void free_poly_bb (poly_bb_p);
extern void debug_loop_vec (poly_bb_p);
extern void schedule_to_scattering (poly_bb_p, int);
@@ -434,6 +434,22 @@ number_of_write_pdrs (poly_bb_p pbb)
return res;
}
+/* Returns a gimple_bb from BB. */
+
+static inline gimple_bb_p
+gbb_from_bb (basic_block bb)
+{
+ return (gimple_bb_p) bb->aux;
+}
+
+/* The poly_bb of the BB. */
+
+static inline poly_bb_p
+pbb_from_bb (basic_block bb)
+{
+ return GBB_PBB (gbb_from_bb (bb));
+}
+
/* The basic block of the PBB. */
static inline basic_block
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index eec46dc..c614874 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -50,27 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "graphite-scop-detection.h"
#include "graphite-sese-to-poly.h"
-/* Check if VAR is used in a phi node, that is no loop header. */
-
-static bool
-var_used_in_not_loop_header_phi_node (tree var)
-{
- imm_use_iterator imm_iter;
- gimple stmt;
- bool result = false;
-
- FOR_EACH_IMM_USE_STMT (stmt, imm_iter, var)
- {
- basic_block bb = gimple_bb (stmt);
-
- if (gimple_code (stmt) == GIMPLE_PHI
- && bb->loop_father->header != bb)
- result = true;
- }
-
- return result;
-}
-
/* Returns the index of the PHI argument defined in the outermost
loop. */
@@ -197,58 +176,6 @@ reduction_phi_p (sese region, gimple_stmt_iterator *psi)
return true;
}
-/* Returns true when BB will be represented in graphite. Return false
- for the basic blocks that contain code eliminated in the code
- generation pass: i.e. induction variables and exit conditions. */
-
-static bool
-graphite_stmt_p (sese region, basic_block bb,
- VEC (data_reference_p, heap) *drs)
-{
- gimple_stmt_iterator gsi;
- loop_p loop = bb->loop_father;
-
- if (VEC_length (data_reference_p, drs) > 0)
- return true;
-
- for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
- {
- gimple stmt = gsi_stmt (gsi);
-
- switch (gimple_code (stmt))
- {
- case GIMPLE_DEBUG:
- /* Control flow expressions can be ignored, as they are
- represented in the iteration domains and will be
- regenerated by graphite. */
- case GIMPLE_COND:
- case GIMPLE_GOTO:
- case GIMPLE_SWITCH:
- break;
-
- case GIMPLE_ASSIGN:
- {
- tree var = gimple_assign_lhs (stmt);
-
- /* We need these bbs to be able to construct the phi nodes. */
- if (var_used_in_not_loop_header_phi_node (var))
- return true;
-
- var = scalar_evolution_in_region (region, loop, var);
- if (chrec_contains_undetermined (var))
- return true;
-
- break;
- }
-
- default:
- return true;
- }
- }
-
- return false;
-}
-
/* Store the GRAPHITE representation of BB. */
static gimple_bb_p
@@ -331,8 +258,8 @@ free_scops (VEC (scop_p, heap) *scops)
/* Generates a polyhedral black box only if the bb contains interesting
information. */
-static void
-try_generate_gimple_bb (scop_p scop, basic_block bb, sbitmap reductions)
+static gimple_bb_p
+try_generate_gimple_bb (scop_p scop, basic_block bb)
{
VEC (data_reference_p, heap) *drs = VEC_alloc (data_reference_p, heap, 5);
loop_p nest = outermost_loop_in_sese (SCOP_REGION (scop), bb);
@@ -345,11 +272,7 @@ try_generate_gimple_bb (scop_p scop, basic_block bb, sbitmap reductions)
graphite_find_data_references_in_stmt (nest, stmt, &drs);
}
- if (!graphite_stmt_p (SCOP_REGION (scop), bb, drs))
- free_data_refs (drs);
- else
- new_poly_bb (scop, new_gimple_bb (bb, drs), TEST_BIT (reductions,
- bb->index));
+ return new_gimple_bb (bb, drs);
}
/* Returns true if all predecessors of BB, that are not dominated by BB, are
@@ -401,16 +324,18 @@ graphite_sort_dominated_info (VEC (basic_block, heap) *dom)
/* Recursive helper function for build_scops_bbs. */
static void
-build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb, sbitmap reductions)
+build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb)
{
sese region = SCOP_REGION (scop);
VEC (basic_block, heap) *dom;
+ poly_bb_p pbb;
if (TEST_BIT (visited, bb->index)
|| !bb_in_sese_p (bb, region))
return;
- try_generate_gimple_bb (scop, bb, reductions);
+ pbb = new_poly_bb (scop, try_generate_gimple_bb (scop, bb));
+ VEC_safe_push (poly_bb_p, heap, SCOP_BBS (scop), pbb);
SET_BIT (visited, bb->index);
dom = get_dominated_by (CDI_DOMINATORS, bb);
@@ -428,7 +353,7 @@ build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb, sbitmap reductio
FOR_EACH_VEC_ELT (basic_block, dom, i, dom_bb)
if (all_non_dominated_preds_marked_p (dom_bb, visited))
{
- build_scop_bbs_1 (scop, visited, dom_bb, reductions);
+ build_scop_bbs_1 (scop, visited, dom_bb);
VEC_unordered_remove (basic_block, dom, i);
break;
}
@@ -439,14 +364,14 @@ build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb, sbitmap reductio
/* Gather the basic blocks belonging to the SCOP. */
-void
-build_scop_bbs (scop_p scop, sbitmap reductions)
+static void
+build_scop_bbs (scop_p scop)
{
sbitmap visited = sbitmap_alloc (last_basic_block);
sese region = SCOP_REGION (scop);
sbitmap_zero (visited);
- build_scop_bbs_1 (scop, visited, SESE_ENTRY_BB (region), reductions);
+ build_scop_bbs_1 (scop, visited, SESE_ENTRY_BB (region));
sbitmap_free (visited);
}
@@ -1005,14 +930,6 @@ find_scop_parameters (scop_p scop)
(&SCOP_CONTEXT (scop), scop_nb_params (scop), 0);
}
-/* Returns a gimple_bb from BB. */
-
-static inline gimple_bb_p
-gbb_from_bb (basic_block bb)
-{
- return (gimple_bb_p) bb->aux;
-}
-
/* Insert in the SCOP context constraints from the estimation of the
number of iterations. UB_EXPR is a linear expression describing
the number of iterations in a loop. This expression is bounded by
@@ -1349,6 +1266,19 @@ add_conditions_to_domain (poly_bb_p pbb)
}
}
+/* Traverses all the GBBs of the SCOP and add their constraints to the
+ iteration domains. */
+
+static void
+add_conditions_to_constraints (scop_p scop)
+{
+ int i;
+ poly_bb_p pbb;
+
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ add_conditions_to_domain (pbb);
+}
+
/* Structure used to pass data to dom_walk. */
struct bsc
@@ -1471,19 +1401,6 @@ build_sese_conditions (sese region)
VEC_free (gimple, heap, cases);
}
-/* Traverses all the GBBs of the SCOP and add their constraints to the
- iteration domains. */
-
-static void
-add_conditions_to_constraints (scop_p scop)
-{
- int i;
- poly_bb_p pbb;
-
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
- add_conditions_to_domain (pbb);
-}
-
/* Add constraints on the possible values of parameter P from the type
of P. */
@@ -1951,7 +1868,7 @@ build_alias_set_optimal_p (VEC (data_reference_p, heap) *drs)
return all_components_are_cliques;
}
-/* Group each data reference in DRS with it's base object set num. */
+/* Group each data reference in DRS with its base object set num. */
static void
build_base_obj_set_for_drs (VEC (data_reference_p, heap) *drs)
@@ -2040,6 +1957,36 @@ dump_alias_graphs (VEC (data_reference_p, heap) *drs)
}
}
+/* Recompute all the data references of BB and add them to the
+ GBB_DATA_REFS vector. */
+
+static void
+analyze_drs (scop_p scop, basic_block bb)
+{
+ loop_p nest;
+ poly_bb_p pbb;
+ gimple_stmt_iterator gsi;
+ gimple_bb_p gbb;
+
+ if (!bb_in_sese_p (bb, SCOP_REGION (scop)))
+ return;
+
+ nest = outermost_loop_in_sese (SCOP_REGION (scop), bb);
+ pbb = pbb_from_bb (bb);
+ gbb = PBB_BLACK_BOX (pbb);
+
+ VEC_free (data_reference_p, heap, GBB_DATA_REFS (gbb));
+ GBB_DATA_REFS (gbb) = VEC_alloc (data_reference_p, heap, 3);
+
+ for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+ {
+ gimple stmt = gsi_stmt (gsi);
+ if (!is_gimple_debug (stmt))
+ graphite_find_data_references_in_stmt (nest, stmt,
+ &GBB_DATA_REFS (gbb));
+ }
+}
+
/* Build data references in SCOP. */
static void
@@ -2050,6 +1997,18 @@ build_scop_drs (scop_p scop)
data_reference_p dr;
VEC (data_reference_p, heap) *drs = VEC_alloc (data_reference_p, heap, 3);
+ /* Remove all the PBBs that do not have data references: these basic
+ blocks are not handled in the polyhedral representation. */
+ for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ {
+ analyze_drs (scop, GBB_BB (PBB_BLACK_BOX (pbb)));
+ if (VEC_empty (data_reference_p, GBB_DATA_REFS (PBB_BLACK_BOX (pbb))))
+ {
+ VEC_ordered_remove (poly_bb_p, SCOP_BBS (scop), i);
+ i--;
+ }
+ }
+
FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
for (j = 0; VEC_iterate (data_reference_p,
GBB_DATA_REFS (PBB_BLACK_BOX (pbb)), j, dr); j++)
@@ -2093,18 +2052,17 @@ gsi_for_phi_node (gimple stmt)
return psi;
}
-/* Insert the assignment "RES := VAR" just after AFTER_STMT. */
+/* Insert the assignment "RES := EXPR" just after AFTER_STMT. */
static void
-insert_out_of_ssa_copy (tree res, tree var, gimple after_stmt)
+insert_out_of_ssa_copy (tree res, tree expr, gimple after_stmt)
{
- gimple stmt;
gimple_seq stmts;
gimple_stmt_iterator si;
gimple_stmt_iterator gsi;
+ tree var = force_gimple_operand (expr, &stmts, true, NULL_TREE);
+ gimple stmt = gimple_build_assign (res, var);
- var = force_gimple_operand (var, &stmts, true, NULL_TREE);
- stmt = gimple_build_assign (res, var);
if (!stmts)
stmts = gimple_seq_alloc ();
si = gsi_last (stmts);
@@ -2122,15 +2080,40 @@ insert_out_of_ssa_copy (tree res, tree var, gimple after_stmt)
}
}
+/* Creates a poly_bb_p for basic_block BB from the existing PBB. */
+
+static void
+new_pbb_from_pbb (scop_p scop, poly_bb_p pbb, basic_block bb)
+{
+ VEC (data_reference_p, heap) *drs = VEC_alloc (data_reference_p, heap, 3);
+ gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
+ gimple_bb_p gbb1 = new_gimple_bb (bb, drs);
+ poly_bb_p pbb1 = new_poly_bb (scop, gbb1);
+ int index, n = VEC_length (poly_bb_p, SCOP_BBS (scop));
+
+ /* The INDEX of PBB in SCOP_BBS. */
+ for (index = 0; index < n; index++)
+ if (VEC_index (poly_bb_p, SCOP_BBS (scop), index) == pbb)
+ break;
+
+ GBB_PBB (gbb1) = pbb1;
+ ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
+ (&PBB_DOMAIN (pbb1), PBB_DOMAIN (pbb));
+ GBB_CONDITIONS (gbb1) = VEC_copy (gimple, heap, GBB_CONDITIONS (gbb));
+ GBB_CONDITION_CASES (gbb1) = VEC_copy (gimple, heap, GBB_CONDITION_CASES (gbb));
+ VEC_safe_insert (poly_bb_p, heap, SCOP_BBS (scop), index + 1, pbb1);
+}
+
/* Insert on edge E the assignment "RES := EXPR". */
static void
-insert_out_of_ssa_copy_on_edge (edge e, tree res, tree expr)
+insert_out_of_ssa_copy_on_edge (scop_p scop, edge e, tree res, tree expr)
{
gimple_stmt_iterator gsi;
gimple_seq stmts;
tree var = force_gimple_operand (expr, &stmts, true, NULL_TREE);
gimple stmt = gimple_build_assign (res, var);
+ basic_block bb;
if (!stmts)
stmts = gimple_seq_alloc ();
@@ -2139,6 +2122,13 @@ insert_out_of_ssa_copy_on_edge (edge e, tree res, tree expr)
gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
gsi_insert_seq_on_edge (e, stmts);
gsi_commit_edge_inserts ();
+ bb = gimple_bb (stmt);
+
+ if (!bb_in_sese_p (bb, SCOP_REGION (scop)))
+ return;
+
+ if (!gbb_from_bb (bb))
+ new_pbb_from_pbb (scop, pbb_from_bb (e->src), bb);
}
/* Creates a zero dimension array of the same type as VAR. */
@@ -2214,8 +2204,9 @@ propagate_expr_outside_region (tree def, tree expr, sese region)
dimension array for it. */
static void
-rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region)
+rewrite_close_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
{
+ sese region = SCOP_REGION (scop);
gimple phi = gsi_stmt (*psi);
tree res = gimple_phi_result (phi);
tree var = SSA_NAME_VAR (res);
@@ -2279,9 +2270,10 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region)
stmt = gimple_build_assign (res, zero_dim_array);
if (TREE_CODE (arg) == SSA_NAME)
- insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (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),
+ insert_out_of_ssa_copy_on_edge (scop, single_pred_edge (bb),
zero_dim_array, arg);
}
@@ -2294,7 +2286,7 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region)
dimension array for it. */
static void
-rewrite_phi_out_of_ssa (gimple_stmt_iterator *psi)
+rewrite_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
{
size_t i;
gimple phi = gsi_stmt (*psi);
@@ -2315,9 +2307,10 @@ rewrite_phi_out_of_ssa (gimple_stmt_iterator *psi)
pattern matching of the vectorizer. */
if (TREE_CODE (arg) == SSA_NAME
&& e->src == bb->loop_father->latch)
- insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg));
+ insert_out_of_ssa_copy (zero_dim_array, arg,
+ SSA_NAME_DEF_STMT (arg));
else
- insert_out_of_ssa_copy_on_edge (e, zero_dim_array, arg);
+ insert_out_of_ssa_copy_on_edge (scop, e, zero_dim_array, arg);
}
var = force_gimple_operand (zero_dim_array, &stmts, true, NULL_TREE);
@@ -2363,7 +2356,7 @@ rewrite_degenerate_phi (gimple_stmt_iterator *psi)
/* Rewrite out of SSA all the reduction phi nodes of SCOP. */
-void
+static void
rewrite_reductions_out_of_ssa (scop_p scop)
{
basic_block bb;
@@ -2387,10 +2380,10 @@ rewrite_reductions_out_of_ssa (scop_p scop)
rewrite_degenerate_phi (&psi);
else if (scalar_close_phi_node_p (phi))
- rewrite_close_phi_out_of_ssa (&psi, region);
+ rewrite_close_phi_out_of_ssa (scop, &psi);
else if (reduction_phi_p (region, &psi))
- rewrite_phi_out_of_ssa (&psi);
+ rewrite_phi_out_of_ssa (scop, &psi);
}
update_ssa (TODO_update_ssa);
@@ -2403,7 +2396,8 @@ rewrite_reductions_out_of_ssa (scop_p scop)
read from ZERO_DIM_ARRAY. */
static void
-rewrite_cross_bb_scalar_dependence (tree zero_dim_array, tree def, gimple use_stmt)
+rewrite_cross_bb_scalar_dependence (tree zero_dim_array,
+ tree def, gimple use_stmt)
{
tree var = SSA_NAME_VAR (def);
gimple name_stmt = gimple_build_assign (var, zero_dim_array);
@@ -2526,9 +2520,9 @@ rewrite_cross_bb_scalar_deps (scop_p scop, gimple_stmt_iterator *gsi)
gimple_stmt_iterator psi = gsi_for_stmt (use_stmt);
if (scalar_close_phi_node_p (gsi_stmt (psi)))
- rewrite_close_phi_out_of_ssa (&psi, region);
+ rewrite_close_phi_out_of_ssa (scop, &psi);
else
- rewrite_phi_out_of_ssa (&psi);
+ rewrite_phi_out_of_ssa (scop, &psi);
}
FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
@@ -2546,7 +2540,8 @@ rewrite_cross_bb_scalar_deps (scop_p scop, gimple_stmt_iterator *gsi)
gsi_next (gsi);
}
- rewrite_cross_bb_scalar_dependence (zero_dim_array, def, use_stmt);
+ rewrite_cross_bb_scalar_dependence (zero_dim_array,
+ def, use_stmt);
}
return res;
@@ -2554,7 +2549,7 @@ rewrite_cross_bb_scalar_deps (scop_p scop, gimple_stmt_iterator *gsi)
/* Rewrite out of SSA all the reduction phi nodes of SCOP. */
-void
+static void
rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p scop)
{
basic_block bb;
@@ -2613,30 +2608,44 @@ nb_data_writes_in_bb (basic_block bb)
return res;
}
-/* Splits STMT out of its current BB. */
+/* Splits at STMT the basic block BB represented as PBB in the
+ polyhedral form. */
+
+static edge
+split_pbb (scop_p scop, poly_bb_p pbb, basic_block bb, gimple stmt)
+{
+ edge e1 = split_block (bb, stmt);
+ new_pbb_from_pbb (scop, pbb, e1->dest);
+ return e1;
+}
+
+/* Splits STMT out of its current BB. This is done for reduction
+ statements for which we want to ignore data dependences. */
static basic_block
-split_reduction_stmt (gimple stmt)
+split_reduction_stmt (scop_p scop, gimple stmt)
{
- gimple_stmt_iterator gsi;
basic_block bb = gimple_bb (stmt);
- edge e;
+ poly_bb_p pbb = pbb_from_bb (bb);
+ edge e1;
/* Do not split basic blocks with no writes to memory: the reduction
will be the only write to memory. */
if (nb_data_writes_in_bb (bb) == 0)
return bb;
- split_block (bb, stmt);
+ e1 = split_pbb (scop, pbb, bb, stmt);
- if (gsi_one_before_end_p (gsi_start_nondebug_bb (bb)))
- return bb;
-
- gsi = gsi_last_bb (bb);
- gsi_prev (&gsi);
- e = split_block (bb, gsi_stmt (gsi));
+ /* Split once more only when the reduction stmt is not the only one
+ left in the original BB. */
+ if (!gsi_one_before_end_p (gsi_start_nondebug_bb (bb)))
+ {
+ gimple_stmt_iterator gsi = gsi_last_bb (bb);
+ gsi_prev (&gsi);
+ e1 = split_pbb (scop, pbb, bb, gsi_stmt (gsi));
+ }
- return e->dest;
+ return e1->dest;
}
/* Return true when stmt is a reduction operation. */
@@ -2865,13 +2874,12 @@ static void
translate_scalar_reduction_to_array_for_stmt (tree red, gimple stmt,
gimple loop_phi)
{
- gimple_stmt_iterator insert_gsi = gsi_after_labels (gimple_bb (loop_phi));
tree res = gimple_phi_result (loop_phi);
gimple assign = gimple_build_assign (res, red);
+ gimple_stmt_iterator insert_gsi = gsi_after_labels (gimple_bb (loop_phi));
gsi_insert_before (&insert_gsi, assign, GSI_SAME_STMT);
- insert_gsi = gsi_after_labels (gimple_bb (stmt));
assign = gimple_build_assign (red, gimple_assign_lhs (stmt));
insert_gsi = gsi_for_stmt (stmt);
gsi_insert_after (&insert_gsi, assign, GSI_SAME_STMT);
@@ -2923,9 +2931,9 @@ remove_phi (gimple phi)
are the loop and close phi nodes of each of the outer loops. */
static void
-translate_scalar_reduction_to_array (VEC (gimple, heap) *in,
- VEC (gimple, heap) *out,
- sbitmap reductions)
+translate_scalar_reduction_to_array (scop_p scop,
+ VEC (gimple, heap) *in,
+ VEC (gimple, heap) *out)
{
unsigned int i;
gimple loop_phi;
@@ -2938,9 +2946,9 @@ translate_scalar_reduction_to_array (VEC (gimple, heap) *in,
if (i == 0)
{
gimple stmt = loop_phi;
- basic_block bb = split_reduction_stmt (stmt);
-
- SET_BIT (reductions, bb->index);
+ basic_block bb = split_reduction_stmt (scop, stmt);
+ poly_bb_p pbb = pbb_from_bb (bb);
+ PBB_IS_REDUCTION (pbb) = true;
gcc_assert (close_phi == loop_phi);
red = create_zero_dim_array
@@ -2955,7 +2963,7 @@ translate_scalar_reduction_to_array (VEC (gimple, heap) *in,
insert_out_of_ssa_copy (gimple_phi_result (close_phi), red,
close_phi);
insert_out_of_ssa_copy_on_edge
- (edge_initial_value_for_loop_phi (loop_phi),
+ (scop, edge_initial_value_for_loop_phi (loop_phi),
red, initial_value_for_loop_phi (loop_phi));
}
@@ -2968,8 +2976,8 @@ translate_scalar_reduction_to_array (VEC (gimple, heap) *in,
true when something has been changed. */
static bool
-rewrite_commutative_reductions_out_of_ssa_close_phi (gimple close_phi,
- sbitmap reductions)
+rewrite_commutative_reductions_out_of_ssa_close_phi (scop_p scop,
+ gimple close_phi)
{
bool res;
VEC (gimple, heap) *in = VEC_alloc (gimple, heap, 10);
@@ -2978,7 +2986,7 @@ rewrite_commutative_reductions_out_of_ssa_close_phi (gimple close_phi,
detect_commutative_reduction (close_phi, &in, &out);
res = VEC_length (gimple, in) > 0;
if (res)
- translate_scalar_reduction_to_array (in, out, reductions);
+ translate_scalar_reduction_to_array (scop, in, out);
VEC_free (gimple, heap, in);
VEC_free (gimple, heap, out);
@@ -2989,9 +2997,8 @@ rewrite_commutative_reductions_out_of_ssa_close_phi (gimple close_phi,
Returns true when something has been changed. */
static bool
-rewrite_commutative_reductions_out_of_ssa_loop (loop_p loop,
- sbitmap reductions,
- sese region)
+rewrite_commutative_reductions_out_of_ssa_loop (scop_p scop,
+ loop_p loop)
{
gimple_stmt_iterator gsi;
edge exit = single_exit (loop);
@@ -3004,30 +3011,26 @@ rewrite_commutative_reductions_out_of_ssa_loop (loop_p loop,
for (gsi = gsi_start_phis (exit->dest); !gsi_end_p (gsi); gsi_next (&gsi))
if ((res = gimple_phi_result (gsi_stmt (gsi)))
&& is_gimple_reg (res)
- && !scev_analyzable_p (res, region))
+ && !scev_analyzable_p (res, SCOP_REGION (scop)))
changed |= rewrite_commutative_reductions_out_of_ssa_close_phi
- (gsi_stmt (gsi), reductions);
+ (scop, gsi_stmt (gsi));
return changed;
}
/* Rewrites all the commutative reductions from SCOP out of SSA. */
-void
-rewrite_commutative_reductions_out_of_ssa (sese region, sbitmap reductions)
+static void
+rewrite_commutative_reductions_out_of_ssa (scop_p scop)
{
loop_iterator li;
loop_p loop;
bool changed = false;
-
- if (!flag_associative_math)
- return;
+ sese region = SCOP_REGION (scop);
FOR_EACH_LOOP (li, loop, 0)
if (loop_in_sese_p (loop, region))
- changed |= rewrite_commutative_reductions_out_of_ssa_loop (loop,
- reductions,
- region);
+ changed |= rewrite_commutative_reductions_out_of_ssa_loop (scop, loop);
if (changed)
{
@@ -3085,6 +3088,7 @@ build_poly_scop (scop_p scop)
sese region = SCOP_REGION (scop);
graphite_dim_t max_dim;
+ build_scop_bbs (scop);
/* FIXME: This restriction is needed to avoid a problem in CLooG.
Once CLooG is fixed, remove this guard. Anyways, it makes no
@@ -3106,11 +3110,20 @@ build_poly_scop (scop_p scop)
build_scop_iteration_domain (scop);
build_scop_context (scop);
-
add_conditions_to_constraints (scop);
+
+ /* Rewrite out of SSA only after having translated the
+ representation to the polyhedral representation to avoid scev
+ analysis failures. That means that these functions will insert
+ new data references that they create in the right place. */
+ if (flag_associative_math)
+ rewrite_commutative_reductions_out_of_ssa (scop);
+ rewrite_reductions_out_of_ssa (scop);
+ rewrite_cross_bb_scalar_deps_out_of_ssa (scop);
+
+ build_scop_drs (scop);
scop_to_lst (scop);
build_scop_scattering (scop);
- build_scop_drs (scop);
/* This SCoP has been translated to the polyhedral
representation. */
diff --git a/gcc/graphite-sese-to-poly.h b/gcc/graphite-sese-to-poly.h
index b0053d0..d341c0f 100644
--- a/gcc/graphite-sese-to-poly.h
+++ b/gcc/graphite-sese-to-poly.h
@@ -29,9 +29,5 @@ struct base_alias_pair
};
void build_poly_scop (scop_p);
-void rewrite_commutative_reductions_out_of_ssa (sese, sbitmap);
-void rewrite_reductions_out_of_ssa (scop_p);
-void rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p);
-void build_scop_bbs (scop_p, sbitmap);
#endif
diff --git a/gcc/graphite.c b/gcc/graphite.c
index 6b393d6..ce7bb3f 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -263,7 +263,6 @@ graphite_transform_loops (void)
bool need_cfg_cleanup_p = false;
VEC (scop_p, heap) *scops = NULL;
htab_t bb_pbb_mapping;
- sbitmap reductions;
if (!graphite_initialize ())
return;
@@ -277,33 +276,17 @@ graphite_transform_loops (void)
}
bb_pbb_mapping = htab_create (10, bb_pbb_map_hash, eq_bb_pbb_map, free);
- reductions = sbitmap_alloc (last_basic_block * 2);
- sbitmap_zero (reductions);
-
- FOR_EACH_VEC_ELT (scop_p, scops, i, scop)
- if (dbg_cnt (graphite_scop))
- rewrite_commutative_reductions_out_of_ssa (SCOP_REGION (scop),
- reductions);
FOR_EACH_VEC_ELT (scop_p, scops, i, scop)
if (dbg_cnt (graphite_scop))
{
- rewrite_reductions_out_of_ssa (scop);
- rewrite_cross_bb_scalar_deps_out_of_ssa (scop);
- build_scop_bbs (scop, reductions);
- }
-
- sbitmap_free (reductions);
+ build_poly_scop (scop);
- FOR_EACH_VEC_ELT (scop_p, scops, i, scop)
- if (dbg_cnt (graphite_scop))
- build_poly_scop (scop);
-
- FOR_EACH_VEC_ELT (scop_p, scops, i, scop)
- if (POLY_SCOP_P (scop)
- && apply_poly_transforms (scop)
- && gloog (scop, bb_pbb_mapping))
- need_cfg_cleanup_p = true;
+ if (POLY_SCOP_P (scop)
+ && apply_poly_transforms (scop)
+ && gloog (scop, bb_pbb_mapping))
+ need_cfg_cleanup_p = true;
+ }
htab_delete (bb_pbb_mapping);
free_scops (scops);
diff --git a/gcc/sese.h b/gcc/sese.h
index 61f3a17..10bf874 100644
--- a/gcc/sese.h
+++ b/gcc/sese.h
@@ -312,6 +312,7 @@ recompute_all_dominators (void)
typedef struct gimple_bb
{
basic_block bb;
+ struct poly_bb *pbb;
/* Lists containing the restrictions of the conditional statements
dominating this bb. This bb can only be executed, if all conditions
@@ -338,10 +339,11 @@ typedef struct gimple_bb
VEC (data_reference_p, heap) *data_refs;
} *gimple_bb_p;
-#define GBB_BB(GBB) GBB->bb
-#define GBB_DATA_REFS(GBB) GBB->data_refs
-#define GBB_CONDITIONS(GBB) GBB->conditions
-#define GBB_CONDITION_CASES(GBB) GBB->condition_cases
+#define GBB_BB(GBB) (GBB)->bb
+#define GBB_PBB(GBB) (GBB)->pbb
+#define GBB_DATA_REFS(GBB) (GBB)->data_refs
+#define GBB_CONDITIONS(GBB) (GBB)->conditions
+#define GBB_CONDITION_CASES(GBB) (GBB)->condition_cases
/* Return the innermost loop that contains the basic block GBB. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5792e66..b619b4f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
+ PR middle-end/45297
+ * gcc.dg/graphite/pr45297.c: New.
+
2010-11-29 Nicola Pero <nicola.pero@meta-innovation.com>
* objc.dg/duplicate-class-1.m: New.
diff --git a/gcc/testsuite/gcc.dg/graphite/pr45297.c b/gcc/testsuite/gcc.dg/graphite/pr45297.c
new file mode 100644
index 0000000..faa653a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/pr45297.c
@@ -0,0 +1,9 @@
+/* { dg-options "-Os -fgraphite-identity" } */
+
+void
+foo (int *p)
+{
+ int *q = p + 1024;
+ while (q != p)
+ *--q = *--q;
+}
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 7/7] Fix unused warnings.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
` (4 preceding siblings ...)
2010-11-30 16:06 ` [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation Sebastian Pop
@ 2010-11-30 16:07 ` Sebastian Pop
2010-11-30 16:18 ` [PATCH 5/7] LHS cannot be an ADDR_EXPR Sebastian Pop
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 16:07 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
* graphite-sese-to-poly.c (analyze_drs_in_stmts): Fix set but
unused warning.
(rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@167166 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/ChangeLog.graphite | 6 ++++++
gcc/graphite-sese-to-poly.c | 5 +----
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3cf2c7c..7a1781a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (analyze_drs_in_stmts): Fix set but
+ unused warning.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
+
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-sese-to-poly.c (analyze_drs): Removed.
(build_scop_drs): Do not call analyze_drs.
(analyze_drs_in_stmts): New.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index b5c6004..e6e9ff9 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,11 @@
2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-sese-to-poly.c (analyze_drs_in_stmts): Fix set but
+ unused warning.
+ (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
+
+2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-sese-to-poly.c (analyze_drs): Removed.
(build_scop_drs): Do not call analyze_drs.
(analyze_drs_in_stmts): New.
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 805c0f5..6e1e1e0 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2026,7 +2026,6 @@ static void
analyze_drs_in_stmts (scop_p scop, basic_block bb, VEC (gimple, heap) *stmts)
{
loop_p nest;
- poly_bb_p pbb;
gimple_bb_p gbb;
gimple stmt;
int i;
@@ -2035,7 +2034,6 @@ analyze_drs_in_stmts (scop_p scop, basic_block bb, VEC (gimple, heap) *stmts)
return;
nest = outermost_loop_in_sese (SCOP_REGION (scop), bb);
- pbb = pbb_from_bb (bb);
gbb = gbb_from_bb (bb);
FOR_EACH_VEC_ELT (gimple, stmts, i, stmt)
@@ -2572,13 +2570,12 @@ static void
rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p scop)
{
basic_block bb;
- basic_block exit;
gimple_stmt_iterator psi;
sese region = SCOP_REGION (scop);
bool changed = false;
/* Create an extra empty BB after the scop. */
- exit = split_edge (SESE_EXIT (region));
+ split_edge (SESE_EXIT (region));
FOR_EACH_BB (bb)
if (bb_in_sese_p (bb, region))
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 5/7] LHS cannot be an ADDR_EXPR.
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
` (5 preceding siblings ...)
2010-11-30 16:07 ` [PATCH 7/7] Fix unused warnings Sebastian Pop
@ 2010-11-30 16:18 ` Sebastian Pop
2010-12-01 12:05 ` [PATCH 0/7] Fix PR45297 Richard Guenther
2010-12-01 20:37 ` H.J. Lu
8 siblings, 0 replies; 12+ messages in thread
From: Sebastian Pop @ 2010-11-30 16:18 UTC (permalink / raw)
To: gcc-patches; +Cc: gcc-graphite, rguenther
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
* sese.c (rename_uses): Do not handle ADDR_EXPR in LHS of assignments.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@167164 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 4 ++++
gcc/ChangeLog.graphite | 4 ++++
gcc/sese.c | 3 ---
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a49897..08d4323 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+ * sese.c (rename_uses): Do not handle ADDR_EXPR in LHS of assignments.
+
+2010-11-29 Sebastian Pop <sebastian.pop@amd.com>
+
PR middle-end/45297
* graphite-poly.c (new_poly_bb): Returns a poly_bb_p. Do not take
the reduction bool in parameter. Clear PBB_IS_REDUCTION. Set GBB_PBB.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 4461ade..8114735 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,7 @@
+2010-11-26 Sebastian Pop <sebastian.pop@amd.com>
+
+ * sese.c (rename_uses): Do not handle ADDR_EXPR in LHS of assignments.
+
2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
PR middle-end/45297
diff --git a/gcc/sese.c b/gcc/sese.c
index dbb0cd7..78258ce 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -551,11 +551,8 @@ rename_uses (gimple copy, htab_t rename_map, gimple_stmt_iterator *gsi_tgt,
if (TREE_CODE (new_expr) == INTEGER_CST)
{
- tree lhs = gimple_assign_lhs (copy);
tree rhs = gimple_assign_rhs1 (copy);
- if (TREE_CODE (lhs) == ADDR_EXPR)
- recompute_tree_invariant_for_addr_expr (lhs);
if (TREE_CODE (rhs) == ADDR_EXPR)
recompute_tree_invariant_for_addr_expr (rhs);
}
--
1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/7] Fix PR45297
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
` (6 preceding siblings ...)
2010-11-30 16:18 ` [PATCH 5/7] LHS cannot be an ADDR_EXPR Sebastian Pop
@ 2010-12-01 12:05 ` Richard Guenther
2010-12-01 20:37 ` H.J. Lu
8 siblings, 0 replies; 12+ messages in thread
From: Richard Guenther @ 2010-12-01 12:05 UTC (permalink / raw)
To: Sebastian Pop; +Cc: gcc-patches, gcc-graphite
On Tue, 30 Nov 2010, Sebastian Pop wrote:
> This set of patches merges the changes needed to fix PR45297 from the
> Graphite branch to trunk. This has been bootstrapped and tested on
> amd64-linux. It also passed the SPEC benchmarks, although with some
> pre-existing errors inherited from the last merge from trunk: I will
> merge trunk into the graphite branch. Ok for trunk?
Ok.
Thanks,
Richard.
> Sebastian
>
> spop (7):
> Add a stride parameter to scop_do_strip_mine.
> Call recompute_tree_invariant_for_addr_expr when replacing a constant
> in an ADDR_EXPR.
> Do not rewrite out of SSA scalar dependences crossing the limits of
> the scop.
> Postpone the rewrite out of SSA to the end of the translation to
> polyhedral representation.
> LHS cannot be an ADDR_EXPR.
> Avoid the analysis of data references after the translation out of
> SSA.
> Fix unused warnings.
>
> gcc/ChangeLog | 101 +++++++
> gcc/ChangeLog.graphite | 103 +++++++
> gcc/graphite-blocking.c | 42 ++-
> gcc/graphite-poly.c | 12 +-
> gcc/graphite-poly.h | 20 ++-
> gcc/graphite-sese-to-poly.c | 477 +++++++++++++++++++------------
> gcc/graphite-sese-to-poly.h | 4 -
> gcc/graphite.c | 29 +--
> gcc/sese.c | 10 +
> gcc/sese.h | 10 +-
> gcc/testsuite/ChangeLog | 5 +
> gcc/testsuite/gcc.dg/graphite/pr45297.c | 9 +
> 12 files changed, 581 insertions(+), 241 deletions(-)
> create mode 100644 gcc/testsuite/gcc.dg/graphite/pr45297.c
>
>
--
Richard Guenther <rguenther@suse.de>
Novell / SUSE Labs
SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 - GF: Markus Rex
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/7] Fix PR45297
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
` (7 preceding siblings ...)
2010-12-01 12:05 ` [PATCH 0/7] Fix PR45297 Richard Guenther
@ 2010-12-01 20:37 ` H.J. Lu
8 siblings, 0 replies; 12+ messages in thread
From: H.J. Lu @ 2010-12-01 20:37 UTC (permalink / raw)
To: Sebastian Pop; +Cc: gcc-patches, gcc-graphite, rguenther
On Tue, Nov 30, 2010 at 6:50 AM, Sebastian Pop <sebpop@gmail.com> wrote:
> This set of patches merges the changes needed to fix PR45297 from the
> Graphite branch to trunk. This has been bootstrapped and tested on
> amd64-linux. It also passed the SPEC benchmarks, although with some
> pre-existing errors inherited from the last merge from trunk: I will
> merge trunk into the graphite branch. Ok for trunk?
>
> Sebastian
>
> spop (7):
> Add a stride parameter to scop_do_strip_mine.
> Call recompute_tree_invariant_for_addr_expr when replacing a constant
> in an ADDR_EXPR.
> Do not rewrite out of SSA scalar dependences crossing the limits of
> the scop.
> Postpone the rewrite out of SSA to the end of the translation to
> polyhedral representation.
> LHS cannot be an ADDR_EXPR.
> Avoid the analysis of data references after the translation out of
> SSA.
> Fix unused warnings.
>
> gcc/ChangeLog | 101 +++++++
> gcc/ChangeLog.graphite | 103 +++++++
> gcc/graphite-blocking.c | 42 ++-
> gcc/graphite-poly.c | 12 +-
> gcc/graphite-poly.h | 20 ++-
> gcc/graphite-sese-to-poly.c | 477 +++++++++++++++++++------------
> gcc/graphite-sese-to-poly.h | 4 -
> gcc/graphite.c | 29 +--
> gcc/sese.c | 10 +
> gcc/sese.h | 10 +-
> gcc/testsuite/ChangeLog | 5 +
> gcc/testsuite/gcc.dg/graphite/pr45297.c | 9 +
This caused:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46754
--
H.J.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation.
2010-11-30 16:06 ` [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation Sebastian Pop
@ 2010-12-15 6:25 ` H.J. Lu
2010-12-15 20:36 ` H.J. Lu
0 siblings, 1 reply; 12+ messages in thread
From: H.J. Lu @ 2010-12-15 6:25 UTC (permalink / raw)
To: Sebastian Pop; +Cc: gcc-patches, gcc-graphite, rguenther
On Tue, Nov 30, 2010 at 6:50 AM, Sebastian Pop <sebpop@gmail.com> wrote:
> From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
>
> 2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
>
> PR middle-end/45297
> * graphite-poly.c (new_poly_bb): Returns a poly_bb_p. Do not take
> the reduction bool in parameter. Clear PBB_IS_REDUCTION. Set GBB_PBB.
> * graphite-poly.h (new_poly_bb): Update declaration.
> (gbb_from_bb): Moved here...
> (pbb_from_bb): New.
> * graphite-sese-to-poly.c (var_used_in_not_loop_header_phi_node):
> Removed.
> (graphite_stmt_p): Removed.
> (try_generate_gimple_bb): Returns a gimple_bb_p. Do not pass in
> sbitmap reductions. Always build a gimple_bb_p. Do not call
> new_poly_bb.
> (build_scop_bbs_1): Do not pass in sbitmap reductions.
> (build_scop_bbs): Same.
> (gbb_from_bb): ... from here.
> (add_conditions_to_constraints): Moved up.
> (analyze_drs): New.
> (build_scop_drs): Call analyze_drs. Remove all the PBBs that do
> not contain data references.
> (new_pbb_from_pbb): New.
> (insert_out_of_ssa_copy_on_edge): Call new_pbb_from_pbb after a
> block is split.
> (rewrite_close_phi_out_of_ssa): Update call to
> insert_out_of_ssa_copy_on_edge.
> (rewrite_reductions_out_of_ssa): Now static.
> (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
> (split_pbb): New.
> (split_reduction_stmt): Call split_pbb.
> (translate_scalar_reduction_to_array): Pass in the scop, do not
> pass in the sbitmap reductions.
> (rewrite_commutative_reductions_out_of_ssa_close_phi): Same.
> (rewrite_commutative_reductions_out_of_ssa_loop): Same.
> (rewrite_commutative_reductions_out_of_ssa): Same.
> (build_poly_scop): Call build_scop_bbs,
> rewrite_commutative_reductions_out_of_ssa,
> rewrite_reductions_out_of_ssa, and
> rewrite_cross_bb_scalar_deps_out_of_ssa. Move build_scop_drs
> before scop_to_lst.
> * graphite-sese-to-poly.h (rewrite_commutative_reductions_out_of_ssa):
> Removed declaration.
> (rewrite_reductions_out_of_ssa): Same.
> (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
> (build_scop_bbs): Same.
> * graphite.c (graphite_transform_loops): Do not initialize reductions.
> Do not call build_scop_bbs,
> rewrite_commutative_reductions_out_of_ssa,
> rewrite_reductions_out_of_ssa, and
> rewrite_cross_bb_scalar_deps_out_of_ssa.
> * sese.h (struct gimple_bb): Add field pbb.
> (GBB_PBB): New.
>
> * gcc.dg/graphite/pr45297.c: New.
>
This caused:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46924
--
H.J.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation.
2010-12-15 6:25 ` H.J. Lu
@ 2010-12-15 20:36 ` H.J. Lu
0 siblings, 0 replies; 12+ messages in thread
From: H.J. Lu @ 2010-12-15 20:36 UTC (permalink / raw)
To: Sebastian Pop; +Cc: gcc-patches, gcc-graphite, rguenther
On Tue, Dec 14, 2010 at 7:52 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Tue, Nov 30, 2010 at 6:50 AM, Sebastian Pop <sebpop@gmail.com> wrote:
>> From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
>>
>> 2010-11-22 Sebastian Pop <sebastian.pop@amd.com>
>>
>> PR middle-end/45297
>> * graphite-poly.c (new_poly_bb): Returns a poly_bb_p. Do not take
>> the reduction bool in parameter. Clear PBB_IS_REDUCTION. Set GBB_PBB.
>> * graphite-poly.h (new_poly_bb): Update declaration.
>> (gbb_from_bb): Moved here...
>> (pbb_from_bb): New.
>> * graphite-sese-to-poly.c (var_used_in_not_loop_header_phi_node):
>> Removed.
>> (graphite_stmt_p): Removed.
>> (try_generate_gimple_bb): Returns a gimple_bb_p. Do not pass in
>> sbitmap reductions. Always build a gimple_bb_p. Do not call
>> new_poly_bb.
>> (build_scop_bbs_1): Do not pass in sbitmap reductions.
>> (build_scop_bbs): Same.
>> (gbb_from_bb): ... from here.
>> (add_conditions_to_constraints): Moved up.
>> (analyze_drs): New.
>> (build_scop_drs): Call analyze_drs. Remove all the PBBs that do
>> not contain data references.
>> (new_pbb_from_pbb): New.
>> (insert_out_of_ssa_copy_on_edge): Call new_pbb_from_pbb after a
>> block is split.
>> (rewrite_close_phi_out_of_ssa): Update call to
>> insert_out_of_ssa_copy_on_edge.
>> (rewrite_reductions_out_of_ssa): Now static.
>> (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
>> (split_pbb): New.
>> (split_reduction_stmt): Call split_pbb.
>> (translate_scalar_reduction_to_array): Pass in the scop, do not
>> pass in the sbitmap reductions.
>> (rewrite_commutative_reductions_out_of_ssa_close_phi): Same.
>> (rewrite_commutative_reductions_out_of_ssa_loop): Same.
>> (rewrite_commutative_reductions_out_of_ssa): Same.
>> (build_poly_scop): Call build_scop_bbs,
>> rewrite_commutative_reductions_out_of_ssa,
>> rewrite_reductions_out_of_ssa, and
>> rewrite_cross_bb_scalar_deps_out_of_ssa. Move build_scop_drs
>> before scop_to_lst.
>> * graphite-sese-to-poly.h (rewrite_commutative_reductions_out_of_ssa):
>> Removed declaration.
>> (rewrite_reductions_out_of_ssa): Same.
>> (rewrite_cross_bb_scalar_deps_out_of_ssa): Same.
>> (build_scop_bbs): Same.
>> * graphite.c (graphite_transform_loops): Do not initialize reductions.
>> Do not call build_scop_bbs,
>> rewrite_commutative_reductions_out_of_ssa,
>> rewrite_reductions_out_of_ssa, and
>> rewrite_cross_bb_scalar_deps_out_of_ssa.
>> * sese.h (struct gimple_bb): Add field pbb.
>> (GBB_PBB): New.
>>
>> * gcc.dg/graphite/pr45297.c: New.
>>
>
> This caused:
>
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46924
>
This also caused:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46966
--
H.J.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2010-12-15 20:19 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-30 15:33 [PATCH 0/7] Fix PR45297 Sebastian Pop
2010-11-30 15:43 ` [PATCH 3/7] Do not rewrite out of SSA scalar dependences crossing the limits of the scop Sebastian Pop
2010-11-30 15:56 ` [PATCH 1/7] Add a stride parameter to scop_do_strip_mine Sebastian Pop
2010-11-30 16:05 ` [PATCH 6/7] Avoid the analysis of data references after the translation out of SSA Sebastian Pop
2010-11-30 16:06 ` [PATCH 2/7] Call recompute_tree_invariant_for_addr_expr when replacing a constant in an ADDR_EXPR Sebastian Pop
2010-11-30 16:06 ` [PATCH 4/7] Postpone the rewrite out of SSA to the end of the translation to polyhedral representation Sebastian Pop
2010-12-15 6:25 ` H.J. Lu
2010-12-15 20:36 ` H.J. Lu
2010-11-30 16:07 ` [PATCH 7/7] Fix unused warnings Sebastian Pop
2010-11-30 16:18 ` [PATCH 5/7] LHS cannot be an ADDR_EXPR Sebastian Pop
2010-12-01 12:05 ` [PATCH 0/7] Fix PR45297 Richard Guenther
2010-12-01 20:37 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).