#include "basic-block.h"
#include "diagnostic.h"
#include "tree-flow.h"
-#include "toplev.h"
#include "tree-dump.h"
#include "timevar.h"
#include "cfgloop.h"
#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. */
gimple phi = gsi_stmt (*psi);
tree res = gimple_phi_result (phi);
- if (!is_gimple_reg (res))
- {
- gsi_next (psi);
- return false;
- }
-
loop = loop_containing_stmt (phi);
if (simple_copy_phi_p (phi))
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
unsigned int i;
struct data_reference *dr;
- for (i = 0; VEC_iterate (data_reference_p, datarefs, i, dr); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, datarefs, i, dr)
if (dr->aux)
{
base_alias_pair *bap = (base_alias_pair *)(dr->aux);
int i;
poly_bb_p pbb;
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
free_gimple_bb (PBB_BLACK_BOX (pbb));
}
int i;
scop_p scop;
- for (i = 0; VEC_iterate (scop_p, scops, i, scop); i++)
+ FOR_EACH_VEC_ELT (scop_p, scops, i, scop)
{
remove_gbbs_in_scop (scop);
free_sese (SCOP_REGION (scop));
/* 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);
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
static void
graphite_sort_dominated_info (VEC (basic_block, heap) *dom)
{
- size_t len = VEC_length (basic_block, dom);
-
- qsort (VEC_address (basic_block, dom), len, sizeof (basic_block),
- compare_bb_depths);
+ VEC_qsort (basic_block, dom, compare_bb_depths);
}
/* 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);
int i;
basic_block dom_bb;
- for (i = 0; VEC_iterate (basic_block, dom, i, dom_bb); i++)
+ 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;
}
/* 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);
}
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_coefficient (static_schedule, 0, c);
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
{
gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
ppl_Linear_Expression_t common;
gcc_assert (TREE_CODE (name) == SSA_NAME);
- for (i = 0; VEC_iterate (tree, SESE_PARAMS (region), i, p); i++)
+ FOR_EACH_VEC_ELT (tree, SESE_PARAMS (region), i, p)
if (p == name)
return i;
mpz_set_si (one, 1);
/* Find parameters in the access functions of data references. */
- for (i = 0; VEC_iterate (data_reference_p, GBB_DATA_REFS (gbb), i, dr); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, GBB_DATA_REFS (gbb), i, dr)
for (j = 0; j < DR_NUM_DIMENSIONS (dr); j++)
scan_tree_for_params (region, DR_ACCESS_FN (dr, j), NULL, one);
/* Find parameters in conditional statements. */
- for (i = 0; VEC_iterate (gimple, GBB_CONDITIONS (gbb), i, stmt); i++)
+ FOR_EACH_VEC_ELT (gimple, GBB_CONDITIONS (gbb), i, stmt)
{
tree lhs = scalar_evolution_in_region (region, loop,
gimple_cond_lhs (stmt));
mpz_set_si (one, 1);
/* Find the parameters used in the loop bounds. */
- for (i = 0; VEC_iterate (loop_p, SESE_LOOP_NEST (region), i, loop); i++)
+ FOR_EACH_VEC_ELT (loop_p, SESE_LOOP_NEST (region), i, loop)
{
tree nb_iters = number_of_latch_executions (loop);
mpz_clear (one);
/* Find the parameters used in data accesses. */
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
find_params_in_bb (region, PBB_BLACK_BOX (pbb));
scop_set_nb_params (scop, sese_nb_params (region));
(&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
ppl_Coefficient_t coef;
ppl_Constraint_t ub;
- ppl_new_Linear_Expression_with_dimension (&ub_expr, dim);
ppl_new_C_Polyhedron_from_space_dimension (&pol, dim, 0);
ppl_new_Linear_Expression_from_Linear_Expression (&nb_iters_le,
ub_expr);
if (VEC_empty (gimple, GBB_CONDITIONS (gbb)))
return;
- for (i = 0; VEC_iterate (gimple, GBB_CONDITIONS (gbb), i, stmt); i++)
+ FOR_EACH_VEC_ELT (gimple, GBB_CONDITIONS (gbb), i, stmt)
switch (gimple_code (stmt))
{
case GIMPLE_COND:
}
}
+/* 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
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 (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
- add_conditions_to_domain (pbb);
-}
-
/* Add constraints on the possible values of parameter P from the type
of P. */
ppl_new_C_Polyhedron_from_space_dimension (&ph, scop_nb_params (scop), 0);
- for (i = 0; VEC_iterate (loop_p, SESE_LOOP_NEST (region), i, loop); i++)
+ FOR_EACH_VEC_ELT (loop_p, SESE_LOOP_NEST (region), i, loop)
if (!loop_in_sese_p (loop_outer (loop), region))
build_loop_iteration_domains (scop, loop, ph, 0, domains);
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
if (domains[gbb_loop (PBB_BLACK_BOX (pbb))->num])
ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
(&PBB_DOMAIN (pbb), (ppl_const_Pointset_Powerset_C_Polyhedron_t)
if (num_vertex == 0)
return true;
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
for (j = i + 1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
if (dr_may_alias_p (dr1, dr2))
edge_num++;
fprintf (file, "p edge %d %d\n", num_vertex, edge_num);
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
for (j = i + 1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
if (dr_may_alias_p (dr1, dr2))
fprintf (file, "e %d %d\n", i + 1, j + 1);
fprintf (file, "c %s\n", comment);
/* First print all the vertices. */
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
fprintf (file, "n%d;\n", i);
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
for (j = i + 1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
if (dr_may_alias_p (dr1, dr2))
fprintf (file, "n%d n%d\n", i, j);
if (comment)
fprintf (file, "c %s\n", comment);
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
for (j = i + 1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
if (dr_may_alias_p (dr1, dr2))
fprintf (file, "%d %d\n", i, j);
int this_component_is_clique;
int all_components_are_cliques = 1;
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
for (j = i+1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
if (dr_may_alias_p (dr1, dr2))
{
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)
int i, j;
int *queue;
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
for (j = i + 1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
if (dr_same_base_object_p (dr1, dr2))
{
data_reference_p dr;
VEC (data_reference_p, heap) *gbb_drs = GBB_DATA_REFS (PBB_BLACK_BOX (pbb));
- for (j = 0; VEC_iterate (data_reference_p, gbb_drs, j, dr); j++)
+ FOR_EACH_VEC_ELT (data_reference_p, gbb_drs, j, dr)
build_poly_dr (dr, pbb);
}
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++)
+ 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++)
VEC_safe_push (data_reference_p, heap, drs, dr);
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr); i++)
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr)
dr->aux = XNEW (base_alias_pair);
if (!build_alias_set_optimal_p (drs))
VEC_free (data_reference_p, heap, drs);
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
build_pbb_drs (pbb);
}
return psi;
}
-/* Insert the assignment "RES := VAR" just after AFTER_STMT. */
+/* Analyze all the data references of STMTS and add them to the
+ GBB_DATA_REFS vector of BB. */
static void
-insert_out_of_ssa_copy (tree res, tree var, gimple after_stmt)
+analyze_drs_in_stmts (scop_p scop, basic_block bb, VEC (gimple, heap) *stmts)
{
+ loop_p nest;
+ 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);
+ 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 (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);
- 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);
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)
{
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. */
+
+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;
+ 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);
+
+ 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);
+
+ analyze_drs_in_stmts (scop, bb, x);
+ VEC_free (gimple, heap, x);
}
/* Creates a zero dimension array of the same type as VAR. */
gimple_seq stmts;
bool replaced_once = false;
- gcc_assert (TREE_CODE (def) == SSA_NAME
- && bb_in_sese_p (gimple_bb (SSA_NAME_DEF_STMT (def)), region));
+ gcc_assert (TREE_CODE (def) == SSA_NAME);
expr = force_gimple_operand (unshare_expr (expr), &stmts, true,
NULL_TREE);
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);
gcc_assert (gimple_phi_num_args (phi) == 1);
/* 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. */
+ invariant, or a default definition. */
if (is_gimple_min_invariant (arg)
- || SSA_NAME_IS_DEFAULT_DEF (arg)
- || gimple_bb (SSA_NAME_DEF_STMT (arg))->loop_father == bb->loop_father)
- stmt = gimple_build_assign (res, arg);
+ || SSA_NAME_IS_DEFAULT_DEF (arg))
+ {
+ propagate_expr_outside_region (res, arg, region);
+ gsi_next (psi);
+ return;
+ }
+
+ else if (gimple_bb (SSA_NAME_DEF_STMT (arg))->loop_father == bb->loop_father)
+ {
+ propagate_expr_outside_region (res, arg, region);
+ stmt = gimple_build_assign (res, arg);
+ remove_phi_node (psi, false);
+ gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);
+ SSA_NAME_DEF_STMT (res) = stmt;
+ return;
+ }
/* If res is scev analyzable and is not a scalar value, it is safe
to ignore the close phi node: it will be code generated in the
scev = compute_overall_effect_of_inner_loop (loop, scev);
}
else
- scev = scalar_evolution_in_region (region, loop, res);
+ scev = scalar_evolution_in_region (region, loop, res);
if (tree_does_not_contain_chrecs (scev))
propagate_expr_outside_region (res, scev, 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 (scop, 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);
}
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
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);
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;
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 (scop, 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);
- 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
tree res = gimple_phi_result (phi);
basic_block bb;
- if (!is_gimple_reg (res))
- {
- gsi_next (psi);
- return;
- }
-
bb = gimple_bb (phi);
rhs = degenerate_phi_result (phi);
gcc_assert (rhs);
/* 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;
{
gimple phi = gsi_stmt (psi);
+ if (!is_gimple_reg (gimple_phi_result (phi)))
+ {
+ gsi_next (&psi);
+ continue;
+ }
+
if (gimple_phi_num_args (phi) > 1
&& degenerate_phi_result (phi))
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);
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 (scop_p scop, 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);
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))
update_stmt (use_stmt);
}
-/* Rewrite the scalar dependences crossing the boundary of the BB
- containing STMT with an array. GSI points to a definition that is
- used in a PHI node. */
+/* 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
-rewrite_cross_bb_phi_deps (sese region, gimple_stmt_iterator gsi)
+handle_scalar_deps_crossing_scop_limits (scop_p scop, tree def, gimple stmt)
{
- gimple stmt = gsi_stmt (gsi);
+ 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;
- tree def;
gimple use_stmt;
-
- if (gimple_code (stmt) != GIMPLE_ASSIGN)
- return;
-
- def = gimple_assign_lhs (stmt);
- if (!is_gimple_reg (def)
- || scev_analyzable_p (def, region))
- return;
+ sese region = SCOP_REGION (scop);
FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
- if (gimple_code (use_stmt) == GIMPLE_PHI)
- {
- gimple_stmt_iterator psi = gsi_for_stmt (use_stmt);
+ {
+ 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;
+ }
+ }
- if (scalar_close_phi_node_p (gsi_stmt (psi)))
- rewrite_close_phi_out_of_ssa (&psi, region);
- else
- rewrite_phi_out_of_ssa (&psi);
- }
+ /* 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. */
+ containing STMT with an array. Return true when something has been
+ changed. */
-static void
-rewrite_cross_bb_scalar_deps (sese region, gimple_stmt_iterator *gsi)
+static bool
+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;
basic_block def_bb;
tree zero_dim_array = NULL_TREE;
gimple use_stmt;
+ bool res = false;
switch (gimple_code (stmt))
{
break;
default:
- return;
+ return false;
}
- if (!is_gimple_reg (def))
- return;
+ if (!def
+ || !is_gimple_reg (def))
+ return false;
if (scev_analyzable_p (def, region))
{
loop_p loop = loop_containing_stmt (SSA_NAME_DEF_STMT (def));
tree scev = scalar_evolution_in_region (region, loop, def);
- if (tree_does_not_contain_chrecs (scev))
- propagate_expr_outside_region (def, scev, region);
+ if (tree_contains_chrecs (scev, NULL))
+ return false;
- return;
+ propagate_expr_outside_region (def, scev, region);
+ return true;
}
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 (def_bb != gimple_bb (use_stmt)
- && !is_gimple_debug (use_stmt))
+ if (gimple_code (use_stmt) == GIMPLE_PHI
+ && (res = true))
{
- gcc_assert (gimple_code (use_stmt) != GIMPLE_PHI);
+ gimple_stmt_iterator psi = gsi_for_stmt (use_stmt);
+
+ if (scalar_close_phi_node_p (gsi_stmt (psi)))
+ rewrite_close_phi_out_of_ssa (scop, &psi);
+ else
+ rewrite_phi_out_of_ssa (scop, &psi);
+ }
+ FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
+ if (gimple_code (use_stmt) != GIMPLE_PHI
+ && def_bb != gimple_bb (use_stmt)
+ && !is_gimple_debug (use_stmt)
+ && (res = true))
+ {
if (!zero_dim_array)
{
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, def, use_stmt);
+ rewrite_cross_bb_scalar_dependence (scop, zero_dim_array,
+ def, use_stmt);
}
+
+ return res;
}
/* 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;
gimple_stmt_iterator psi;
sese region = SCOP_REGION (scop);
+ bool changed = false;
+
+ /* Create an extra empty BB after the scop. */
+ 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))
- {
- rewrite_cross_bb_phi_deps (region, psi);
- rewrite_cross_bb_scalar_deps (region, &psi);
- }
+ changed |= rewrite_cross_bb_scalar_deps (scop, &psi);
- update_ssa (TODO_update_ssa);
+ if (changed)
+ {
+ scev_reset_htab ();
+ update_ssa (TODO_update_ssa);
#ifdef ENABLE_CHECKING
- verify_loop_closed_ssa (true);
+ verify_loop_closed_ssa (true);
#endif
+ }
}
/* Returns the number of pbbs that are in loops contained in SCOP. */
poly_bb_p pbb;
int res = 0;
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
+ FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
if (loop_in_sese_p (gbb_loop (PBB_BLACK_BOX (pbb)), SCOP_REGION (scop)))
res++;
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);
+ 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. */
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;
+ /* 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));
+ }
- gsi = gsi_last_bb (bb);
- gsi_prev (&gsi);
- e = split_block (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 e->dest;
+ return e1->dest;
}
/* Return true when stmt is a reduction operation. */
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)
{
- 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 gsi;
- gsi_insert_before (&insert_gsi, assign, GSI_SAME_STMT);
+ insert_stmts (scop, assign, NULL, gsi_after_labels (gimple_bb (loop_phi)));
- 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);
+ 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
}
}
- for (i = 0; VEC_iterate (gimple, update, i, stmt); i++)
+ FOR_EACH_VEC_ELT (gimple, update, i, stmt)
update_stmt (stmt);
VEC_free (gimple, heap, update);
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;
tree red = NULL_TREE;
- for (i = 0; VEC_iterate (gimple, in, i, loop_phi); i++)
+ FOR_EACH_VEC_ELT (gimple, in, i, loop_phi)
{
gimple close_phi = VEC_index (gimple, out, i);
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
(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
- (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));
}
}
}
-/* Rewrites out of SSA a commutative reduction at CLOSE_PHI. */
+/* Rewrites out of SSA a commutative reduction at CLOSE_PHI. Returns
+ true when something has been changed. */
-static void
-rewrite_commutative_reductions_out_of_ssa_close_phi (gimple close_phi,
- sbitmap reductions)
+static bool
+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);
VEC (gimple, heap) *out = VEC_alloc (gimple, heap, 10);
detect_commutative_reduction (close_phi, &in, &out);
- if (VEC_length (gimple, in) > 0)
- translate_scalar_reduction_to_array (in, out, reductions);
+ res = VEC_length (gimple, in) > 0;
+ if (res)
+ translate_scalar_reduction_to_array (scop, in, out);
VEC_free (gimple, heap, in);
VEC_free (gimple, heap, out);
+ return res;
}
-/* Rewrites all the commutative reductions from LOOP out of SSA. */
+/* Rewrites all the commutative reductions from LOOP out of SSA.
+ Returns true when something has been changed. */
-static void
-rewrite_commutative_reductions_out_of_ssa_loop (loop_p loop,
- sbitmap reductions,
- sese region)
+static bool
+rewrite_commutative_reductions_out_of_ssa_loop (scop_p scop,
+ loop_p loop)
{
gimple_stmt_iterator gsi;
edge exit = single_exit (loop);
+ tree res;
+ bool changed = false;
if (!exit)
- return;
+ return false;
for (gsi = gsi_start_phis (exit->dest); !gsi_end_p (gsi); gsi_next (&gsi))
- if (!scev_analyzable_p (gimple_phi_result (gsi_stmt (gsi)), region))
- rewrite_commutative_reductions_out_of_ssa_close_phi (gsi_stmt (gsi),
- reductions);
+ if ((res = gimple_phi_result (gsi_stmt (gsi)))
+ && is_gimple_reg (res)
+ && !scev_analyzable_p (res, SCOP_REGION (scop)))
+ changed |= rewrite_commutative_reductions_out_of_ssa_close_phi
+ (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;
-
- if (!flag_associative_math)
- return;
+ bool changed = false;
+ sese region = SCOP_REGION (scop);
FOR_EACH_LOOP (li, loop, 0)
if (loop_in_sese_p (loop, region))
- rewrite_commutative_reductions_out_of_ssa_loop (loop, reductions, region);
+ changed |= rewrite_commutative_reductions_out_of_ssa_loop (scop, loop);
- gsi_commit_edge_inserts ();
- update_ssa (TODO_update_ssa);
+ if (changed)
+ {
+ scev_reset_htab ();
+ gsi_commit_edge_inserts ();
+ update_ssa (TODO_update_ssa);
#ifdef ENABLE_CHECKING
- verify_loop_closed_ssa (true);
+ verify_loop_closed_ssa (true);
#endif
+ }
}
/* Java does not initialize long_long_integer_type_node. */
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
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. */
OSDN Git Service
