/* Conversion of SESE regions to Polyhedra.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010 Free Software Foundation, Inc.
Contributed by Sebastian Pop <sebastian.pop@amd.com>.
This file is part of GCC.
#include "sese.h"
#ifdef HAVE_cloog
-#include "cloog/cloog.h"
#include "ppl_c.h"
#include "graphite-ppl.h"
#include "graphite.h"
#include "graphite-poly.h"
#include "graphite-scop-detection.h"
-#include "graphite-clast-to-gimple.h"
#include "graphite-sese-to-poly.h"
/* Check if VAR is used in a phi node, that is no loop header. */
return result;
}
-/* Returns the index of the phi argument corresponding to the initial
- value in the loop. */
+/* Returns the index of the PHI argument defined in the outermost
+ loop. */
static size_t
-loop_entry_phi_arg (gimple phi)
+phi_arg_in_outermost_loop (gimple phi)
{
loop_p loop = gimple_bb (phi)->loop_father;
- size_t i;
+ size_t i, res = 0;
for (i = 0; i < gimple_phi_num_args (phi); i++)
if (!flow_bb_inside_loop_p (loop, gimple_phi_arg_edge (phi, i)->src))
- return i;
+ {
+ loop = gimple_phi_arg_edge (phi, i)->src->loop_father;
+ res = i;
+ }
- gcc_unreachable ();
- return 0;
+ return res;
}
/* Removes a simple copy phi node "RES = phi (INIT, RES)" at position
{
gimple phi = gsi_stmt (*psi);
tree res = gimple_phi_result (phi);
- size_t entry = loop_entry_phi_arg (phi);
+ size_t entry = phi_arg_in_outermost_loop (phi);
tree init = gimple_phi_arg_def (phi, entry);
gimple stmt = gimple_build_assign (res, init);
edge e = gimple_phi_arg_edge (phi, entry);
loop_p loop = loop_containing_stmt (phi);
tree res = gimple_phi_result (phi);
tree scev = scalar_evolution_in_region (region, loop, res);
- size_t entry = loop_entry_phi_arg (phi);
+ size_t entry = phi_arg_in_outermost_loop (phi);
edge e = gimple_phi_arg_edge (phi, entry);
tree var;
gimple stmt;
reduction_phi_p (sese region, gimple_stmt_iterator *psi)
{
loop_p loop;
- tree scev;
- affine_iv iv;
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))
{
- /* FIXME: PRE introduces phi nodes like these, for an example,
+ /* PRE introduces phi nodes like these, for an example,
see id-5.f in the fortran graphite testsuite:
# prephitmp.85_265 = PHI <prephitmp.85_258(33), prephitmp.85_265(18)>
return false;
}
- /* Main induction variables with constant strides in LOOP are not
- reductions. */
- if (simple_iv (loop, loop, res, &iv, true))
+ if (scev_analyzable_p (res, region))
{
- if (integer_zerop (iv.step))
+ tree scev = scalar_evolution_in_region (region, loop, res);
+
+ if (evolution_function_is_invariant_p (scev, loop->num))
remove_invariant_phi (region, psi);
else
gsi_next (psi);
return false;
}
- scev = scalar_evolution_in_region (region, loop, res);
- if (chrec_contains_undetermined (scev))
- return true;
-
- if (evolution_function_is_invariant_p (scev, loop->num))
- {
- remove_invariant_phi (region, psi);
- return false;
- }
-
/* All the other cases are considered reductions. */
return true;
}
GBB_DATA_REFS (gbb) = drs;
GBB_CONDITIONS (gbb) = NULL;
GBB_CONDITION_CASES (gbb) = NULL;
- GBB_CLOOG_IV_TYPES (gbb) = NULL;
return gbb;
}
unsigned int i;
struct data_reference *dr;
- for (i = 0; VEC_iterate (data_reference_p, datarefs, i, dr); i++)
- if (!dr->aux)
+ FOR_EACH_VEC_ELT (data_reference_p, datarefs, i, dr)
+ if (dr->aux)
{
- free (dr->aux);
+ base_alias_pair *bap = (base_alias_pair *)(dr->aux);
+
+ if (bap->alias_set)
+ free (bap->alias_set);
+
+ free (bap);
dr->aux = NULL;
}
}
-
/* Frees GBB. */
static void
free_gimple_bb (struct gimple_bb *gbb)
{
- if (GBB_CLOOG_IV_TYPES (gbb))
- htab_delete (GBB_CLOOG_IV_TYPES (gbb));
-
free_data_refs_aux (GBB_DATA_REFS (gbb));
free_data_refs (GBB_DATA_REFS (gbb));
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));
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. */
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);
/* Gather the basic blocks belonging to the SCOP. */
-static void
+void
build_scop_bbs (scop_p scop, sbitmap reductions)
{
sbitmap visited = sbitmap_alloc (last_basic_block);
int nb_params = scop_nb_params (scop);
ppl_Coefficient_t c;
ppl_dimension_type dim = scattering_dimensions + nb_iterators + nb_params;
- Value v;
+ mpz_t v;
gcc_assert (scattering_dimensions >= used_scattering_dimensions);
- value_init (v);
+ mpz_init (v);
ppl_new_Coefficient (&c);
PBB_TRANSFORMED (pbb) = poly_scattering_new ();
ppl_new_C_Polyhedron_from_space_dimension
ppl_Linear_Expression_t expr;
ppl_new_Linear_Expression_with_dimension (&expr, dim);
- value_set_si (v, 1);
+ mpz_set_si (v, 1);
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_coefficient (expr, i, c);
{
ppl_Linear_Expression_coefficient (static_schedule, i / 2, c);
ppl_Coefficient_to_mpz_t (c, v);
- value_oppose (v, v);
+ mpz_neg (v, v);
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_inhomogeneous (expr, c);
}
{
int loop = (i - 1) / 2;
- value_set_si (v, -1);
+ mpz_set_si (v, -1);
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_coefficient
(expr, scattering_dimensions + loop, c);
ppl_delete_Constraint (cstr);
}
- value_clear (v);
+ mpz_clear (v);
ppl_delete_Coefficient (c);
PBB_ORIGINAL (pbb) = poly_scattering_copy (PBB_TRANSFORMED (pbb));
gimple_bb_p previous_gbb = NULL;
ppl_Linear_Expression_t static_schedule;
ppl_Coefficient_t c;
- Value v;
+ mpz_t v;
- value_init (v);
+ mpz_init (v);
ppl_new_Coefficient (&c);
ppl_new_Linear_Expression (&static_schedule);
because we cannot compare_prefix_loops against a previous loop,
prefix will be equal to zero, and that index will be
incremented before copying. */
- value_set_si (v, -1);
+ mpz_set_si (v, -1);
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;
ppl_assign_Linear_Expression_from_Linear_Expression (common,
static_schedule);
- value_set_si (v, 1);
+ mpz_set_si (v, 1);
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_coefficient (common, prefix, c);
ppl_assign_Linear_Expression_from_Linear_Expression (static_schedule,
ppl_delete_Linear_Expression (common);
}
- value_clear (v);
+ mpz_clear (v);
ppl_delete_Coefficient (c);
ppl_delete_Linear_Expression (static_schedule);
}
static void
add_value_to_dim (ppl_dimension_type d, ppl_Linear_Expression_t expr,
- Value k)
+ mpz_t k)
{
- Value val;
+ mpz_t val;
ppl_Coefficient_t coef;
ppl_new_Coefficient (&coef);
ppl_Linear_Expression_coefficient (expr, d, coef);
- value_init (val);
+ mpz_init (val);
ppl_Coefficient_to_mpz_t (coef, val);
- value_addto (val, val, k);
+ mpz_add (val, val, k);
ppl_assign_Coefficient_from_mpz_t (coef, val);
ppl_Linear_Expression_add_to_coefficient (expr, d, coef);
- value_clear (val);
+ mpz_clear (val);
ppl_delete_Coefficient (coef);
}
{
loop_p loop = get_loop (var);
ppl_dimension_type l = sese_loop_depth (s, loop) - 1;
- Value val;
+ mpz_t val;
/* Scalar evolutions should happen in the sese region. */
gcc_assert (sese_loop_depth (s, loop) > 0);
| a [i * p] = ... */
gcc_assert (TREE_CODE (e) == INTEGER_CST);
- value_init (val);
- value_set_si (val, int_cst_value (e));
+ mpz_init (val);
+ mpz_set_si (val, int_cst_value (e));
add_value_to_dim (l, expr, val);
- value_clear (val);
+ mpz_clear (val);
}
}
linear expression EXPR. K is the multiplier of the constant. */
static void
-scan_tree_for_params_int (tree cst, ppl_Linear_Expression_t expr, Value k)
+scan_tree_for_params_int (tree cst, ppl_Linear_Expression_t expr, mpz_t k)
{
- Value val;
+ mpz_t val;
ppl_Coefficient_t coef;
int v = int_cst_value (cst);
- value_init (val);
- value_set_si (val, 0);
+ mpz_init (val);
+ mpz_set_si (val, 0);
/* Necessary to not get "-1 = 2^n - 1". */
if (v < 0)
- value_sub_int (val, val, -v);
+ mpz_sub_ui (val, val, -v);
else
- value_add_int (val, val, v);
+ mpz_add_ui (val, val, v);
- value_multiply (val, val, k);
+ mpz_mul (val, val, k);
ppl_new_Coefficient (&coef);
ppl_assign_Coefficient_from_mpz_t (coef, val);
ppl_Linear_Expression_add_to_inhomogeneous (expr, coef);
- value_clear (val);
+ mpz_clear (val);
ppl_delete_Coefficient (coef);
}
-/* Saves in NV at index I a new name for variable P. */
-
-static void
-save_var_name (char **nv, int i, tree p)
-{
- const char *name = get_name (SSA_NAME_VAR (p));
-
- if (name)
- {
- int len = strlen (name) + 16;
- nv[i] = XNEWVEC (char, len);
- snprintf (nv[i], len, "%s_%d", name, SSA_NAME_VERSION (p));
- }
- else
- {
- nv[i] = XNEWVEC (char, 16);
- snprintf (nv[i], 2 + 16, "T_%d", SSA_NAME_VERSION (p));
- }
-}
-
/* When parameter NAME is in REGION, returns its index in SESE_PARAMS.
Otherwise returns -1. */
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;
gcc_assert (SESE_ADD_PARAMS (region));
i = VEC_length (tree, SESE_PARAMS (region));
- save_var_name (SESE_PARAMS_NAMES (region), i, name);
- save_clast_name_index (SESE_PARAMS_INDEX (region),
- SESE_PARAMS_NAMES (region)[i], i);
VEC_safe_push (tree, heap, SESE_PARAMS (region), name);
return i;
}
static void
scan_tree_for_params (sese s, tree e, ppl_Linear_Expression_t c,
- Value k)
+ mpz_t k)
{
if (e == chrec_dont_know)
return;
{
if (c)
{
- Value val;
+ mpz_t val;
gcc_assert (host_integerp (TREE_OPERAND (e, 1), 0));
- value_init (val);
- value_set_si (val, int_cst_value (TREE_OPERAND (e, 1)));
- value_multiply (val, val, k);
+ mpz_init (val);
+ mpz_set_si (val, int_cst_value (TREE_OPERAND (e, 1)));
+ mpz_mul (val, val, k);
scan_tree_for_params (s, TREE_OPERAND (e, 0), c, val);
- value_clear (val);
+ mpz_clear (val);
}
else
scan_tree_for_params (s, TREE_OPERAND (e, 0), c, k);
{
if (c)
{
- Value val;
+ mpz_t val;
gcc_assert (host_integerp (TREE_OPERAND (e, 0), 0));
- value_init (val);
- value_set_si (val, int_cst_value (TREE_OPERAND (e, 0)));
- value_multiply (val, val, k);
+ mpz_init (val);
+ mpz_set_si (val, int_cst_value (TREE_OPERAND (e, 0)));
+ mpz_mul (val, val, k);
scan_tree_for_params (s, TREE_OPERAND (e, 1), c, val);
- value_clear (val);
+ mpz_clear (val);
}
else
scan_tree_for_params (s, TREE_OPERAND (e, 1), c, k);
if (c)
{
ppl_Coefficient_t coef;
- Value minus_one;
+ mpz_t minus_one;
ppl_subtract_Linear_Expression_from_Linear_Expression (c,
tmp_expr);
ppl_delete_Linear_Expression (tmp_expr);
- value_init (minus_one);
- value_set_si (minus_one, -1);
+ mpz_init (minus_one);
+ mpz_set_si (minus_one, -1);
ppl_new_Coefficient_from_mpz_t (&coef, minus_one);
ppl_Linear_Expression_add_to_inhomogeneous (c, coef);
- value_clear (minus_one);
+ mpz_clear (minus_one);
ppl_delete_Coefficient (coef);
}
data_reference_p dr;
gimple stmt;
loop_p loop = GBB_BB (gbb)->loop_father;
- Value one;
+ mpz_t one;
- value_init (one);
- value_set_si (one, 1);
+ mpz_init (one);
+ 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));
scan_tree_for_params (region, rhs, NULL, one);
}
- value_clear (one);
+ mpz_clear (one);
}
/* Record the parameters used in the SCOP. A variable is a parameter
unsigned i;
sese region = SCOP_REGION (scop);
struct loop *loop;
- Value one;
+ mpz_t one;
- value_init (one);
- value_set_si (one, 1);
+ mpz_init (one);
+ 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);
scan_tree_for_params (region, nb_iters, NULL, one);
}
- value_clear (one);
+ 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));
SESE_ADD_PARAMS (region) = false;
+
+ ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension
+ (&SCOP_CONTEXT (scop), scop_nb_params (scop), 0);
}
/* Returns a gimple_bb from 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
+ the estimation NIT. */
+
+static void
+add_upper_bounds_from_estimated_nit (scop_p scop, double_int nit,
+ ppl_dimension_type dim,
+ ppl_Linear_Expression_t ub_expr)
+{
+ mpz_t val;
+ ppl_Linear_Expression_t nb_iters_le;
+ ppl_Polyhedron_t pol;
+ ppl_Coefficient_t coef;
+ ppl_Constraint_t ub;
+
+ ppl_new_C_Polyhedron_from_space_dimension (&pol, dim, 0);
+ ppl_new_Linear_Expression_from_Linear_Expression (&nb_iters_le,
+ ub_expr);
+
+ /* Construct the negated number of last iteration in VAL. */
+ mpz_init (val);
+ mpz_set_double_int (val, nit, false);
+ mpz_sub_ui (val, val, 1);
+ mpz_neg (val, val);
+
+ /* NB_ITERS_LE holds the number of last iteration in
+ parametrical form. Subtract estimated number of last
+ iteration and assert that result is not positive. */
+ ppl_new_Coefficient_from_mpz_t (&coef, val);
+ ppl_Linear_Expression_add_to_inhomogeneous (nb_iters_le, coef);
+ ppl_delete_Coefficient (coef);
+ ppl_new_Constraint (&ub, nb_iters_le,
+ PPL_CONSTRAINT_TYPE_LESS_OR_EQUAL);
+ ppl_Polyhedron_add_constraint (pol, ub);
+
+ /* Remove all but last GDIM dimensions from POL to obtain
+ only the constraints on the parameters. */
+ {
+ graphite_dim_t gdim = scop_nb_params (scop);
+ ppl_dimension_type *dims = XNEWVEC (ppl_dimension_type, dim - gdim);
+ graphite_dim_t i;
+
+ for (i = 0; i < dim - gdim; i++)
+ dims[i] = i;
+
+ ppl_Polyhedron_remove_space_dimensions (pol, dims, dim - gdim);
+ XDELETEVEC (dims);
+ }
+
+ /* Add the constraints on the parameters to the SCoP context. */
+ {
+ ppl_Pointset_Powerset_C_Polyhedron_t constraints_ps;
+
+ ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
+ (&constraints_ps, pol);
+ ppl_Pointset_Powerset_C_Polyhedron_intersection_assign
+ (SCOP_CONTEXT (scop), constraints_ps);
+ ppl_delete_Pointset_Powerset_C_Polyhedron (constraints_ps);
+ }
+
+ ppl_delete_Polyhedron (pol);
+ ppl_delete_Linear_Expression (nb_iters_le);
+ ppl_delete_Constraint (ub);
+ mpz_clear (val);
+}
+
/* Builds the constraint polyhedra for LOOP in SCOP. OUTER_PH gives
the constraints for the surrounding loops. */
static void
build_loop_iteration_domains (scop_p scop, struct loop *loop,
- ppl_Polyhedron_t outer_ph, int nb)
+ ppl_Polyhedron_t outer_ph, int nb,
+ ppl_Pointset_Powerset_C_Polyhedron_t *domains)
{
int i;
ppl_Polyhedron_t ph;
}
else if (!chrec_contains_undetermined (nb_iters))
{
- Value one;
+ mpz_t one;
ppl_Constraint_t ub;
ppl_Linear_Expression_t ub_expr;
+ double_int nit;
- value_init (one);
- value_set_si (one, 1);
+ mpz_init (one);
+ mpz_set_si (one, 1);
ppl_new_Linear_Expression_with_dimension (&ub_expr, dim);
nb_iters = scalar_evolution_in_region (region, loop, nb_iters);
scan_tree_for_params (SCOP_REGION (scop), nb_iters, ub_expr, one);
- value_clear (one);
+ mpz_clear (one);
+
+ if (estimated_loop_iterations (loop, true, &nit))
+ add_upper_bounds_from_estimated_nit (scop, nit, dim, ub_expr);
/* loop_i <= expr_nb_iters */
ppl_set_coef (ub_expr, nb, -1);
gcc_unreachable ();
if (loop->inner && loop_in_sese_p (loop->inner, region))
- build_loop_iteration_domains (scop, loop->inner, ph, nb + 1);
+ build_loop_iteration_domains (scop, loop->inner, ph, nb + 1, domains);
if (nb != 0
&& loop->next
&& loop_in_sese_p (loop->next, region))
- build_loop_iteration_domains (scop, loop->next, outer_ph, nb);
+ build_loop_iteration_domains (scop, loop->next, outer_ph, nb, domains);
ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
- ((ppl_Pointset_Powerset_C_Polyhedron_t *) &loop->aux, ph);
+ (&domains[loop->num], ph);
ppl_delete_Polyhedron (ph);
}
static ppl_Linear_Expression_t
create_linear_expr_from_tree (poly_bb_p pbb, tree t)
{
- Value one;
+ mpz_t one;
ppl_Linear_Expression_t res;
ppl_dimension_type dim;
sese region = SCOP_REGION (PBB_SCOP (pbb));
t = scalar_evolution_in_region (region, loop, t);
gcc_assert (!automatically_generated_chrec_p (t));
- value_init (one);
- value_set_si (one, 1);
+ mpz_init (one);
+ mpz_set_si (one, 1);
scan_tree_for_params (region, t, res, one);
- value_clear (one);
+ mpz_clear (one);
return res;
}
add_condition_to_domain (ppl_Pointset_Powerset_C_Polyhedron_t ps, gimple stmt,
poly_bb_p pbb, enum tree_code code)
{
- Value v;
+ mpz_t v;
ppl_Coefficient_t c;
ppl_Linear_Expression_t left, right;
ppl_Constraint_t cstr;
the left or the right side of the expression. */
if (code == LT_EXPR)
{
- value_init (v);
- value_set_si (v, 1);
+ mpz_init (v);
+ mpz_set_si (v, 1);
ppl_new_Coefficient (&c);
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_inhomogeneous (left, c);
ppl_delete_Coefficient (c);
- value_clear (v);
+ mpz_clear (v);
code = LE_EXPR;
}
else if (code == GT_EXPR)
{
- value_init (v);
- value_set_si (v, 1);
+ mpz_init (v);
+ mpz_set_si (v, 1);
ppl_new_Coefficient (&c);
ppl_assign_Coefficient_from_mpz_t (c, v);
ppl_Linear_Expression_add_to_inhomogeneous (right, c);
ppl_delete_Coefficient (c);
- value_clear (v);
+ mpz_clear (v);
code = GE_EXPR;
}
(&right, left);
add_condition_to_domain (left, stmt, pbb, LT_EXPR);
add_condition_to_domain (right, stmt, pbb, GT_EXPR);
- ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign (left,
- right);
+ ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign (left, right);
ppl_delete_Pointset_Powerset_C_Polyhedron (right);
}
else
unsigned int i;
gimple stmt;
gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
- VEC (gimple, heap) *conditions = GBB_CONDITIONS (gbb);
- if (VEC_empty (gimple, conditions))
+ if (VEC_empty (gimple, GBB_CONDITIONS (gbb)))
return;
- for (i = 0; VEC_iterate (gimple, conditions, i, stmt); i++)
+ FOR_EACH_VEC_ELT (gimple, GBB_CONDITIONS (gbb), i, stmt)
switch (gimple_code (stmt))
{
case GIMPLE_COND:
enum tree_code code = gimple_cond_code (stmt);
/* The conditions for ELSE-branches are inverted. */
- if (VEC_index (gimple, gbb->condition_cases, i) == NULL)
+ if (!VEC_index (gimple, GBB_CONDITION_CASES (gbb), i))
code = invert_tree_comparison (code, false);
add_condition_to_pbb (pbb, stmt, code);
sese region;
};
-/* Returns non NULL when BB has a single predecessor and the last
- statement of that predecessor is a COND_EXPR. */
+/* Returns a COND_EXPR statement when BB has a single predecessor, the
+ edge between BB and its predecessor is not a loop exit edge, and
+ the last statement of the single predecessor is a COND_EXPR. */
static gimple
-single_pred_cond (basic_block bb)
+single_pred_cond_non_loop_exit (basic_block bb)
{
if (single_pred_p (bb))
{
edge e = single_pred_edge (bb);
basic_block pred = e->src;
- gimple stmt = last_stmt (pred);
+ gimple stmt;
+
+ if (loop_depth (pred->loop_father) > loop_depth (bb->loop_father))
+ return NULL;
+
+ stmt = last_stmt (pred);
if (stmt && gimple_code (stmt) == GIMPLE_COND)
return stmt;
}
+
return NULL;
}
struct bsc *data = (struct bsc *) dw_data->global_data;
VEC (gimple, heap) **conditions = data->conditions;
VEC (gimple, heap) **cases = data->cases;
- gimple_bb_p gbb = gbb_from_bb (bb);
- gimple stmt = single_pred_cond (bb);
+ gimple_bb_p gbb;
+ gimple stmt;
if (!bb_in_sese_p (bb, data->region))
return;
+ stmt = single_pred_cond_non_loop_exit (bb);
+
if (stmt)
{
edge e = single_pred_edge (bb);
VEC_safe_push (gimple, heap, *cases, NULL);
}
+ gbb = gbb_from_bb (bb);
+
if (gbb)
{
GBB_CONDITIONS (gbb) = VEC_copy (gimple, heap, *conditions);
if (!bb_in_sese_p (bb, data->region))
return;
- if (single_pred_cond (bb))
+ if (single_pred_cond_non_loop_exit (bb))
{
VEC_pop (gimple, *conditions);
VEC_pop (gimple, *cases);
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)
add_conditions_to_domain (pbb);
}
ppl_Linear_Expression_t le;
tree parameter = VEC_index (tree, SESE_PARAMS (SCOP_REGION (scop)), p);
tree type = TREE_TYPE (parameter);
- tree lb, ub;
-
- /* Disabled until we fix CPU2006. */
- return;
+ tree lb = NULL_TREE;
+ tree ub = NULL_TREE;
- if (!INTEGRAL_TYPE_P (type))
- return;
+ if (POINTER_TYPE_P (type) || !TYPE_MIN_VALUE (type))
+ lb = lower_bound_in_type (type, type);
+ else
+ lb = TYPE_MIN_VALUE (type);
- lb = TYPE_MIN_VALUE (type);
- ub = TYPE_MAX_VALUE (type);
+ if (POINTER_TYPE_P (type) || !TYPE_MAX_VALUE (type))
+ ub = upper_bound_in_type (type, type);
+ else
+ ub = TYPE_MAX_VALUE (type);
if (lb)
{
build_scop_context (scop_p scop)
{
ppl_Polyhedron_t context;
+ ppl_Pointset_Powerset_C_Polyhedron_t ps;
graphite_dim_t p, n = scop_nb_params (scop);
ppl_new_C_Polyhedron_from_space_dimension (&context, n, 0);
add_param_constraints (scop, context, p);
ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
- (&SCOP_CONTEXT (scop), context);
+ (&ps, context);
+ ppl_Pointset_Powerset_C_Polyhedron_intersection_assign
+ (SCOP_CONTEXT (scop), ps);
+ ppl_delete_Pointset_Powerset_C_Polyhedron (ps);
ppl_delete_Polyhedron (context);
}
int i;
ppl_Polyhedron_t ph;
poly_bb_p pbb;
+ int nb_loops = number_of_loops ();
+ ppl_Pointset_Powerset_C_Polyhedron_t *domains
+ = XNEWVEC (ppl_Pointset_Powerset_C_Polyhedron_t, nb_loops);
+
+ for (i = 0; i < nb_loops; i++)
+ domains[i] = NULL;
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);
+ build_loop_iteration_domains (scop, loop, ph, 0, domains);
- for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
- if (gbb_loop (PBB_BLACK_BOX (pbb))->aux)
+ 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)
- gbb_loop (PBB_BLACK_BOX (pbb))->aux);
+ domains[gbb_loop (PBB_BLACK_BOX (pbb))->num]);
else
ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
(&PBB_DOMAIN (pbb), ph);
- for (i = 0; VEC_iterate (loop_p, SESE_LOOP_NEST (region), i, loop); i++)
- if (loop->aux)
- {
- ppl_delete_Pointset_Powerset_C_Polyhedron
- ((ppl_Pointset_Powerset_C_Polyhedron_t) loop->aux);
- loop->aux = NULL;
- }
+ for (i = 0; i < nb_loops; i++)
+ if (domains[i])
+ ppl_delete_Pointset_Powerset_C_Polyhedron (domains[i]);
ppl_delete_Polyhedron (ph);
+ free (domains);
}
/* Add a constrain to the ACCESSES polyhedron for the alias set of
ppl_Linear_Expression_t alias;
ppl_Constraint_t cstr;
int alias_set_num = 0;
+ base_alias_pair *bap = (base_alias_pair *)(dr->aux);
- if (dr->aux != NULL)
- alias_set_num = ((int *)(dr->aux))[ALIAS_SET_INDEX];
+ if (bap && bap->alias_set)
+ alias_set_num = *(bap->alias_set);
ppl_new_Linear_Expression_with_dimension (&alias, accessp_nb_dims);
poly_bb_p pbb)
{
int i, nb_subscripts = DR_NUM_DIMENSIONS (dr);
- Value v;
+ mpz_t v;
scop_p scop = PBB_SCOP (pbb);
sese region = SCOP_REGION (scop);
- value_init (v);
+ mpz_init (v);
for (i = 0; i < nb_subscripts; i++)
{
ppl_new_Linear_Expression_with_dimension (&fn, dom_nb_dims);
ppl_new_Linear_Expression_with_dimension (&access, accessp_nb_dims);
- value_set_si (v, 1);
+ mpz_set_si (v, 1);
scan_tree_for_params (region, afn, fn, v);
ppl_assign_Linear_Expression_from_Linear_Expression (access, fn);
ppl_delete_Constraint (cstr);
}
- value_clear (v);
+ mpz_clear (v);
}
/* Add constrains representing the size of the accessed data to the
high = array_ref_up_bound (ref);
- /* high - subscript >= 0
- XXX: 1-element arrays at end of structures may extend over their
- declared size. */
- if (high && host_integerp (high, 0))
+ /* high - subscript >= 0 */
+ if (high && host_integerp (high, 0)
+ /* 1-element arrays at end of structures may extend over
+ their declared size. */
+ && !(array_at_struct_end_p (ref)
+ && operand_equal_p (low, high, 0)))
{
ppl_new_Linear_Expression_with_dimension (&expr, accessp_nb_dims);
ppl_set_coef (expr, subscript, -1);
accesses);
ppl_delete_Polyhedron (accesses);
- dr_base_object_set = ((int *)(dr->aux))[BASE_OBJECT_SET_INDEX];
+ gcc_assert (dr->aux);
+ dr_base_object_set = ((base_alias_pair *)(dr->aux))->base_obj_set;
- new_poly_dr (pbb, dr_base_object_set, accesses_ps, DR_IS_READ (dr) ? PDR_READ : PDR_WRITE,
+ new_poly_dr (pbb, dr_base_object_set, accesses_ps,
+ DR_IS_READ (dr) ? PDR_READ : PDR_WRITE,
dr, DR_NUM_DIMENSIONS (dr));
}
-/* Write to FILE the alias graph of data references with DIMACS format. */
+/* Write to FILE the alias graph of data references in DIMACS format. */
static inline bool
write_alias_graph_to_ascii_dimacs (FILE *file, char *comment,
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);
return true;
}
-static void
-partition_drs_to_sets (VEC (data_reference_p, heap) *drs, int choice,
- bool (* edge_exist_p) (const struct data_reference *,
- const struct data_reference *))
+/* Write to FILE the alias graph of data references in DOT format. */
+
+static inline bool
+write_alias_graph_to_ascii_dot (FILE *file, char *comment,
+ VEC (data_reference_p, heap) *drs)
{
int num_vertex = VEC_length (data_reference_p, drs);
- struct graph *g = new_graph (num_vertex);
data_reference_p dr1, dr2;
int i, j;
- int num_component;
- int *queue;
- for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
+ if (num_vertex == 0)
+ return true;
+
+ fprintf (file, "$\n");
+
+ if (comment)
+ fprintf (file, "c %s\n", comment);
+
+ /* First print all the vertices. */
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
+ fprintf (file, "n%d;\n", 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 ((*edge_exist_p) (dr1, dr2))
- {
- add_edge (g, i, j);
- add_edge (g, j, i);
- }
+ if (dr_may_alias_p (dr1, dr2))
+ fprintf (file, "n%d n%d\n", i, j);
- queue = XNEWVEC (int, num_vertex);
- for (i = 0; i < num_vertex; i++)
- queue[i] = i;
+ return true;
+}
- num_component = graphds_dfs (g, queue, num_vertex, NULL, true, NULL);
+/* Write to FILE the alias graph of data references in ECC format. */
- for (i = 0; i < g->n_vertices; i++)
- {
- data_reference_p dr = VEC_index (data_reference_p, drs, i);
- if (!dr->aux)
- dr->aux = XNEWVEC (int, 2);
- ((int *)(dr->aux))[choice] = g->vertices[i].component + 1;
- }
+static inline bool
+write_alias_graph_to_ascii_ecc (FILE *file, char *comment,
+ VEC (data_reference_p, heap) *drs)
+{
+ int num_vertex = VEC_length (data_reference_p, drs);
+ data_reference_p dr1, dr2;
+ int i, j;
- free (queue);
- free_graph (g);
+ if (num_vertex == 0)
+ return true;
+
+ fprintf (file, "$\n");
+
+ if (comment)
+ fprintf (file, "c %s\n", comment);
+
+ 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);
+
+ return true;
}
+/* Check if DR1 and DR2 are in the same object set. */
+
static bool
dr_same_base_object_p (const struct data_reference *dr1,
const struct data_reference *dr2)
return operand_equal_p (DR_BASE_OBJECT (dr1), DR_BASE_OBJECT (dr2), 0);
}
-/* Group each data reference in DRS with it's alias set num. */
+/* Uses DFS component number as representative of alias-sets. Also tests for
+ optimality by verifying if every connected component is a clique. Returns
+ true (1) if the above test is true, and false (0) otherwise. */
-static void
-build_alias_set_for_drs (VEC (data_reference_p, heap) *drs)
+static int
+build_alias_set_optimal_p (VEC (data_reference_p, heap) *drs)
{
- partition_drs_to_sets (drs, ALIAS_SET_INDEX, dr_may_alias_p);
+ int num_vertices = VEC_length (data_reference_p, drs);
+ struct graph *g = new_graph (num_vertices);
+ data_reference_p dr1, dr2;
+ int i, j;
+ int num_connected_components;
+ int v_indx1, v_indx2, num_vertices_in_component;
+ int *all_vertices;
+ int *vertices;
+ struct graph_edge *e;
+ int this_component_is_clique;
+ int all_components_are_cliques = 1;
+
+ 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))
+ {
+ add_edge (g, i, j);
+ add_edge (g, j, i);
+ }
+
+ all_vertices = XNEWVEC (int, num_vertices);
+ vertices = XNEWVEC (int, num_vertices);
+ for (i = 0; i < num_vertices; i++)
+ all_vertices[i] = i;
+
+ num_connected_components = graphds_dfs (g, all_vertices, num_vertices,
+ NULL, true, NULL);
+ for (i = 0; i < g->n_vertices; i++)
+ {
+ data_reference_p dr = VEC_index (data_reference_p, drs, i);
+ base_alias_pair *bap;
+
+ gcc_assert (dr->aux);
+ bap = (base_alias_pair *)(dr->aux);
+
+ bap->alias_set = XNEW (int);
+ *(bap->alias_set) = g->vertices[i].component + 1;
+ }
+
+ /* Verify if the DFS numbering results in optimal solution. */
+ for (i = 0; i < num_connected_components; i++)
+ {
+ num_vertices_in_component = 0;
+ /* Get all vertices whose DFS component number is the same as i. */
+ for (j = 0; j < num_vertices; j++)
+ if (g->vertices[j].component == i)
+ vertices[num_vertices_in_component++] = j;
+
+ /* Now test if the vertices in 'vertices' form a clique, by testing
+ for edges among each pair. */
+ this_component_is_clique = 1;
+ for (v_indx1 = 0; v_indx1 < num_vertices_in_component; v_indx1++)
+ {
+ for (v_indx2 = v_indx1+1; v_indx2 < num_vertices_in_component; v_indx2++)
+ {
+ /* Check if the two vertices are connected by iterating
+ through all the edges which have one of these are source. */
+ e = g->vertices[vertices[v_indx2]].pred;
+ while (e)
+ {
+ if (e->src == vertices[v_indx1])
+ break;
+ e = e->pred_next;
+ }
+ if (!e)
+ {
+ this_component_is_clique = 0;
+ break;
+ }
+ }
+ if (!this_component_is_clique)
+ all_components_are_cliques = 0;
+ }
+ }
+
+ free (all_vertices);
+ free (vertices);
+ free_graph (g);
+ return all_components_are_cliques;
}
/* Group each data reference in DRS with it's base object set num. */
static void
build_base_obj_set_for_drs (VEC (data_reference_p, heap) *drs)
{
- partition_drs_to_sets (drs, BASE_OBJECT_SET_INDEX, dr_same_base_object_p);
+ int num_vertex = VEC_length (data_reference_p, drs);
+ struct graph *g = new_graph (num_vertex);
+ data_reference_p dr1, dr2;
+ int i, j;
+ int *queue;
+
+ 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))
+ {
+ add_edge (g, i, j);
+ add_edge (g, j, i);
+ }
+
+ queue = XNEWVEC (int, num_vertex);
+ for (i = 0; i < num_vertex; i++)
+ queue[i] = i;
+
+ graphds_dfs (g, queue, num_vertex, NULL, true, NULL);
+
+ for (i = 0; i < g->n_vertices; i++)
+ {
+ data_reference_p dr = VEC_index (data_reference_p, drs, i);
+ base_alias_pair *bap;
+
+ gcc_assert (dr->aux);
+ bap = (base_alias_pair *)(dr->aux);
+
+ bap->base_obj_set = g->vertices[i].component + 1;
+ }
+
+ free (queue);
+ free_graph (g);
}
/* Build the data references for PBB. */
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);
}
+/* Dump to file the alias graphs for the data references in DRS. */
+
+static void
+dump_alias_graphs (VEC (data_reference_p, heap) *drs)
+{
+ char comment[100];
+ FILE *file_dimacs, *file_ecc, *file_dot;
+
+ file_dimacs = fopen ("/tmp/dr_alias_graph_dimacs", "ab");
+ if (file_dimacs)
+ {
+ snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
+ current_function_name ());
+ write_alias_graph_to_ascii_dimacs (file_dimacs, comment, drs);
+ fclose (file_dimacs);
+ }
+
+ file_ecc = fopen ("/tmp/dr_alias_graph_ecc", "ab");
+ if (file_ecc)
+ {
+ snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
+ current_function_name ());
+ write_alias_graph_to_ascii_ecc (file_ecc, comment, drs);
+ fclose (file_ecc);
+ }
+
+ file_dot = fopen ("/tmp/dr_alias_graph_dot", "ab");
+ if (file_dot)
+ {
+ snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
+ current_function_name ());
+ write_alias_graph_to_ascii_dot (file_dot, comment, drs);
+ fclose (file_dot);
+ }
+}
+
/* Build data references in SCOP. */
static void
data_reference_p dr;
VEC (data_reference_p, heap) *drs = VEC_alloc (data_reference_p, heap, 3);
- 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)
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);
- build_alias_set_for_drs (drs);
+ FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr)
+ dr->aux = XNEW (base_alias_pair);
+
+ if (!build_alias_set_optimal_p (drs))
+ {
+ /* TODO: Add support when building alias set is not optimal. */
+ ;
+ }
+
build_base_obj_set_for_drs (drs);
/* When debugging, enable the following code. This cannot be used
in production compilers. */
-#if 0
- {
- char comment[100];
- FILE *file;
-
- file = fopen ("/tmp/dr_alias_graph", "ab");
- if (file)
- {
- snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
- current_function_name ());
- write_alias_graph_to_ascii_dimacs (file, comment, drs);
- fclose (file);
- }
- }
-#endif
+ if (0)
+ dump_alias_graphs (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 the definition of VAR. */
+/* Insert the assignment "RES := VAR" just after AFTER_STMT. */
static void
-insert_out_of_ssa_copy (tree res, tree var)
+insert_out_of_ssa_copy (tree res, tree var, gimple after_stmt)
{
gimple stmt;
gimple_seq stmts;
si = gsi_last (stmts);
gsi_insert_after (&si, stmt, GSI_NEW_STMT);
- stmt = SSA_NAME_DEF_STMT (var);
- if (gimple_code (stmt) == GIMPLE_PHI)
+ if (gimple_code (after_stmt) == GIMPLE_PHI)
{
- gsi = gsi_after_labels (gimple_bb (stmt));
+ gsi = gsi_after_labels (gimple_bb (after_stmt));
gsi_insert_seq_before (&gsi, stmts, GSI_NEW_STMT);
}
else
{
- gsi = gsi_for_stmt (stmt);
+ gsi = gsi_for_stmt (after_stmt);
gsi_insert_seq_after (&gsi, stmts, GSI_NEW_STMT);
}
}
/* Creates a zero dimension array of the same type as VAR. */
static tree
-create_zero_dim_array (tree var)
+create_zero_dim_array (tree var, const char *base_name)
{
tree index_type = build_index_type (integer_zero_node);
tree elt_type = TREE_TYPE (var);
tree array_type = build_array_type (elt_type, index_type);
- tree base = create_tmp_var (array_type, "Red");
+ tree base = create_tmp_var (array_type, base_name);
add_referenced_var (base);
|| !is_gimple_reg (gimple_phi_result (phi)))
return false;
+ /* Note that loop close phi nodes should have a single argument
+ because we translated the representation into a canonical form
+ before Graphite: see canonicalize_loop_closed_ssa_form. */
return (gimple_phi_num_args (phi) == 1);
}
+/* For a definition DEF in REGION, propagates the expression EXPR in
+ all the uses of DEF outside REGION. */
+
+static void
+propagate_expr_outside_region (tree def, tree expr, sese region)
+{
+ imm_use_iterator imm_iter;
+ gimple use_stmt;
+ gimple_seq stmts;
+ bool replaced_once = false;
+
+ gcc_assert (TREE_CODE (def) == SSA_NAME);
+
+ expr = force_gimple_operand (unshare_expr (expr), &stmts, true,
+ NULL_TREE);
+
+ FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
+ if (!is_gimple_debug (use_stmt)
+ && !bb_in_sese_p (gimple_bb (use_stmt), region))
+ {
+ ssa_op_iter iter;
+ use_operand_p use_p;
+
+ FOR_EACH_PHI_OR_STMT_USE (use_p, use_stmt, iter, SSA_OP_ALL_USES)
+ if (operand_equal_p (def, USE_FROM_PTR (use_p), 0)
+ && (replaced_once = true))
+ replace_exp (use_p, expr);
+
+ update_stmt (use_stmt);
+ }
+
+ if (replaced_once)
+ {
+ gsi_insert_seq_on_edge (SESE_ENTRY (region), stmts);
+ gsi_commit_edge_inserts ();
+ }
+}
+
/* Rewrite out of SSA the reduction phi node at PSI by creating a zero
dimension array for it. */
static void
-rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi)
+rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region)
{
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);
- gimple_stmt_iterator gsi = gsi_after_labels (gimple_bb (phi));
- gimple stmt = gimple_build_assign (res, zero_dim_array);
+ basic_block bb = gimple_bb (phi);
+ gimple_stmt_iterator gsi = gsi_after_labels (bb);
tree arg = gimple_phi_arg_def (phi, 0);
+ gimple stmt;
- insert_out_of_ssa_copy (zero_dim_array, arg);
+ /* Note that loop close phi nodes should have a single argument
+ because we translated the representation into a canonical form
+ before Graphite: see canonicalize_loop_closed_ssa_form. */
+ gcc_assert (gimple_phi_num_args (phi) == 1);
+
+ /* The phi node can be a non close phi node, when its argument is
+ invariant, or a default definition. */
+ if (is_gimple_min_invariant (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
+ out of Graphite pass. */
+ else if (scev_analyzable_p (res, region))
+ {
+ loop_p loop = loop_containing_stmt (SSA_NAME_DEF_STMT (res));
+ tree scev;
+
+ if (!loop_in_sese_p (loop, region))
+ {
+ loop = loop_containing_stmt (SSA_NAME_DEF_STMT (arg));
+ scev = scalar_evolution_in_region (region, loop, arg);
+ scev = compute_overall_effect_of_inner_loop (loop, scev);
+ }
+ else
+ scev = scalar_evolution_in_region (region, loop, res);
+
+ if (tree_does_not_contain_chrecs (scev))
+ propagate_expr_outside_region (res, scev, region);
+
+ gsi_next (psi);
+ return;
+ }
+ else
+ {
+ tree zero_dim_array = create_zero_dim_array (var, "Close_Phi");
+
+ stmt = gimple_build_assign (res, zero_dim_array);
+
+ if (TREE_CODE (arg) == SSA_NAME)
+ insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg));
+ else
+ insert_out_of_ssa_copy_on_edge (single_pred_edge (bb),
+ zero_dim_array, arg);
+ }
remove_phi_node (psi, false);
gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);
basic_block bb = gimple_bb (phi);
tree res = gimple_phi_result (phi);
tree var = SSA_NAME_VAR (res);
- tree zero_dim_array = create_zero_dim_array (var);
+ tree zero_dim_array = create_zero_dim_array (var, "phi_out_of_ssa");
gimple_stmt_iterator gsi;
gimple stmt;
gimple_seq stmts;
for (i = 0; i < gimple_phi_num_args (phi); i++)
{
tree arg = gimple_phi_arg_def (phi, i);
+ edge e = gimple_phi_arg_edge (phi, i);
- /* Try to avoid the insertion on edges as much as possible: this
- would avoid the insertion of code on loop latch edges, making
- the pattern matching of the vectorizer happy, or it would
- avoid the insertion of useless basic blocks. Note that it is
- incorrect to insert out of SSA copies close by their
- definition when they are more than two loop levels apart:
- for example, starting from a double nested loop
-
- | a = ...
- | loop_1
- | loop_2
- | b = phi (a, c)
- | c = ...
- | end_2
- | end_1
-
- the following transform is incorrect
-
- | a = ...
- | Red[0] = a
- | loop_1
- | loop_2
- | b = Red[0]
- | c = ...
- | Red[0] = c
- | end_2
- | end_1
-
- whereas inserting the copy on the incomming edge is correct
-
- | a = ...
- | loop_1
- | Red[0] = a
- | loop_2
- | b = Red[0]
- | c = ...
- | Red[0] = c
- | end_2
- | end_1
- */
+ /* Avoid the insertion of code in the loop latch to please the
+ pattern matching of the vectorizer. */
if (TREE_CODE (arg) == SSA_NAME
- && is_gimple_reg (arg)
- && gimple_bb (SSA_NAME_DEF_STMT (arg))
- && (flow_bb_inside_loop_p (bb->loop_father,
- gimple_bb (SSA_NAME_DEF_STMT (arg)))
- || flow_bb_inside_loop_p (loop_outer (bb->loop_father),
- gimple_bb (SSA_NAME_DEF_STMT (arg)))))
- insert_out_of_ssa_copy (zero_dim_array, arg);
+ && e->src == bb->loop_father->latch)
+ insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg));
else
- insert_out_of_ssa_copy_on_edge (gimple_phi_arg_edge (phi, i),
- zero_dim_array, arg);
+ insert_out_of_ssa_copy_on_edge (e, zero_dim_array, arg);
}
var = force_gimple_operand (zero_dim_array, &stmts, true, NULL_TREE);
gsi_insert_seq_before (&gsi, stmts, GSI_NEW_STMT);
}
-/* Return true when DEF can be analyzed in REGION by the scalar
- evolution analyzer. */
+/* Rewrite the degenerate phi node at position PSI from the degenerate
+ form "x = phi (y, y, ..., y)" to "x = y". */
-static bool
-scev_analyzable_p (tree def, sese region)
+static void
+rewrite_degenerate_phi (gimple_stmt_iterator *psi)
{
- gimple stmt = SSA_NAME_DEF_STMT (def);
- loop_p loop = loop_containing_stmt (stmt);
- tree scev = scalar_evolution_in_region (region, loop, def);
+ tree rhs;
+ gimple stmt;
+ gimple_stmt_iterator gsi;
+ gimple phi = gsi_stmt (*psi);
+ tree res = gimple_phi_result (phi);
+ basic_block bb;
+
+ bb = gimple_bb (phi);
+ rhs = degenerate_phi_result (phi);
+ gcc_assert (rhs);
+
+ stmt = gimple_build_assign (res, rhs);
+ remove_phi_node (psi, false);
+ SSA_NAME_DEF_STMT (res) = stmt;
+
+ gsi = gsi_after_labels (bb);
+ gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);
+}
+
+/* Rewrite out of SSA all the reduction phi nodes of SCOP. */
+
+void
+rewrite_reductions_out_of_ssa (scop_p scop)
+{
+ basic_block bb;
+ gimple_stmt_iterator psi;
+ sese region = SCOP_REGION (scop);
+
+ FOR_EACH_BB (bb)
+ if (bb_in_sese_p (bb, region))
+ for (psi = gsi_start_phis (bb); !gsi_end_p (psi);)
+ {
+ 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);
+
+ else if (reduction_phi_p (region, &psi))
+ rewrite_phi_out_of_ssa (&psi);
+ }
- return !chrec_contains_undetermined (scev);
+ update_ssa (TODO_update_ssa);
+#ifdef ENABLE_CHECKING
+ verify_loop_closed_ssa (true);
+#endif
}
/* Rewrite the scalar dependence of DEF used in USE_STMT with a memory
use_operand_p use_p;
gimple_stmt_iterator gsi;
- gimple_assign_set_lhs (name_stmt, name);
+ gcc_assert (gimple_code (use_stmt) != GIMPLE_PHI);
- if (gimple_code (use_stmt) == GIMPLE_PHI)
- {
- gimple phi = use_stmt;
- edge entry;
- unsigned i;
+ gimple_assign_set_lhs (name_stmt, name);
- for (i = 0; i < gimple_phi_num_args (phi); i++)
- if (operand_equal_p (def, gimple_phi_arg_def (phi, i), 0))
- {
- entry = gimple_phi_arg_edge (phi, i);
- break;
- }
+ gsi = gsi_for_stmt (use_stmt);
+ gsi_insert_before (&gsi, name_stmt, GSI_NEW_STMT);
- FOR_EACH_PHI_ARG (use_p, phi, iter, SSA_OP_USE)
- if (operand_equal_p (def, USE_FROM_PTR (use_p), 0))
- {
- gsi = gsi_last_bb (entry->src);
- gsi_insert_after (&gsi, name_stmt, GSI_NEW_STMT);
- SET_USE (use_p, name);
- break;
- }
- }
- else
- {
- gsi = gsi_for_stmt (use_stmt);
- gsi_insert_before (&gsi, name_stmt, GSI_NEW_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))
- replace_exp (use_p, name);
- }
+ 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))
+ replace_exp (use_p, name);
update_stmt (use_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
+static bool
rewrite_cross_bb_scalar_deps (sese region, gimple_stmt_iterator *gsi)
{
gimple stmt = gsi_stmt (*gsi);
basic_block def_bb;
tree zero_dim_array = NULL_TREE;
gimple use_stmt;
+ bool res = false;
- if (gimple_code (stmt) != GIMPLE_ASSIGN)
- return;
+ switch (gimple_code (stmt))
+ {
+ case GIMPLE_ASSIGN:
+ def = gimple_assign_lhs (stmt);
+ break;
- def = gimple_assign_lhs (stmt);
- if (!is_gimple_reg (def)
- || scev_analyzable_p (def, region))
- return;
+ case GIMPLE_CALL:
+ def = gimple_call_lhs (stmt);
+ break;
+
+ default:
+ return false;
+ }
+
+ 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_contains_chrecs (scev, NULL))
+ return false;
+
+ propagate_expr_outside_region (def, scev, region);
+ return true;
+ }
def_bb = gimple_bb (stmt);
FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def)
- if (def_bb != gimple_bb (use_stmt))
+ if (gimple_code (use_stmt) == GIMPLE_PHI
+ && (res = true))
+ {
+ 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);
+ else
+ rewrite_phi_out_of_ssa (&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));
- insert_out_of_ssa_copy (zero_dim_array, def);
+ zero_dim_array = create_zero_dim_array
+ (SSA_NAME_VAR (def), "Cross_BB_scalar_dependence");
+ insert_out_of_ssa_copy (zero_dim_array, def,
+ SSA_NAME_DEF_STMT (def));
gsi_next (gsi);
}
rewrite_cross_bb_scalar_dependence (zero_dim_array, def, use_stmt);
}
+
+ return res;
}
/* Rewrite out of SSA all the reduction phi nodes of SCOP. */
-static void
-rewrite_reductions_out_of_ssa (scop_p scop)
+void
+rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p scop)
{
basic_block bb;
gimple_stmt_iterator psi;
sese region = SCOP_REGION (scop);
-
- FOR_EACH_BB (bb)
- if (bb_in_sese_p (bb, region))
- for (psi = gsi_start_phis (bb); !gsi_end_p (psi);)
- {
- if (scalar_close_phi_node_p (gsi_stmt (psi)))
- rewrite_close_phi_out_of_ssa (&psi);
- else if (reduction_phi_p (region, &psi))
- rewrite_phi_out_of_ssa (&psi);
- }
-
- update_ssa (TODO_update_ssa);
-#ifdef ENABLE_CHECKING
- verify_ssa (false);
- verify_loop_closed_ssa ();
-#endif
+ bool changed = false;
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_scalar_deps (region, &psi);
+ changed |= rewrite_cross_bb_scalar_deps (region, &psi);
- update_ssa (TODO_update_ssa);
+ if (changed)
+ {
+ scev_reset_htab ();
+ update_ssa (TODO_update_ssa);
#ifdef ENABLE_CHECKING
- verify_ssa (false);
- verify_loop_closed_ssa ();
+ 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++;
split_block (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));
static inline bool
is_reduction_operation_p (gimple stmt)
{
+ enum tree_code code;
+
+ gcc_assert (is_gimple_assign (stmt));
+ code = gimple_assign_rhs_code (stmt);
+
return flag_associative_math
- && commutative_tree_code (gimple_assign_rhs_code (stmt))
- && associative_tree_code (gimple_assign_rhs_code (stmt));
+ && commutative_tree_code (code)
+ && associative_tree_code (code);
}
/* Returns true when PHI contains an argument ARG. */
stmt = SSA_NAME_DEF_STMT (arg);
+ if (gimple_code (stmt) == GIMPLE_NOP
+ || gimple_code (stmt) == GIMPLE_CALL)
+ return NULL;
+
if (gimple_code (stmt) == GIMPLE_PHI)
{
if (phi_contains_arg (stmt, lhs))
return NULL;
}
+ if (!is_gimple_assign (stmt))
+ return NULL;
+
if (gimple_num_ops (stmt) == 2)
return follow_ssa_with_commutative_ops (gimple_assign_rhs1 (stmt), lhs);
}
/* Detect commutative and associative scalar reductions starting at
- the STMT. */
+ the STMT. Return the phi node of the reduction cycle, or NULL. */
static gimple
detect_commutative_reduction_arg (tree lhs, gimple stmt, tree arg,
{
gimple phi = follow_ssa_with_commutative_ops (arg, lhs);
- if (phi)
- {
- VEC_safe_push (gimple, heap, *in, stmt);
- VEC_safe_push (gimple, heap, *out, stmt);
- return phi;
- }
+ if (!phi)
+ return NULL;
- return NULL;
+ VEC_safe_push (gimple, heap, *in, stmt);
+ VEC_safe_push (gimple, heap, *out, stmt);
+ return phi;
}
/* Detect commutative and associative scalar reductions starting at
- the STMT. */
+ STMT. Return the phi node of the reduction cycle, or NULL. */
static gimple
detect_commutative_reduction_assign (gimple stmt, VEC (gimple, heap) **in,
}
/* Detect commutative and associative scalar reductions starting at
- the loop closed phi node CLOSE_PHI. */
+ the loop closed phi node STMT. Return the phi node of the
+ reduction cycle, or NULL. */
static gimple
detect_commutative_reduction (gimple stmt, VEC (gimple, heap) **in,
if (scalar_close_phi_node_p (stmt))
{
tree arg = gimple_phi_arg_def (stmt, 0);
- gimple def = SSA_NAME_DEF_STMT (arg);
- gimple loop_phi = detect_commutative_reduction (def, in, out);
+ gimple def, loop_phi;
+
+ if (TREE_CODE (arg) != SSA_NAME)
+ return NULL;
+
+ /* Note that loop close phi nodes should have a single argument
+ because we translated the representation into a canonical form
+ before Graphite: see canonicalize_loop_closed_ssa_form. */
+ gcc_assert (gimple_phi_num_args (stmt) == 1);
+
+ def = SSA_NAME_DEF_STMT (arg);
+ loop_phi = detect_commutative_reduction (def, in, out);
if (loop_phi)
{
translate_scalar_reduction_to_array_for_stmt (tree red, gimple stmt,
gimple loop_phi)
{
- basic_block bb = gimple_bb (stmt);
- gimple_stmt_iterator insert_gsi = gsi_after_labels (bb);
+ 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);
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);
}
-/* Insert the assignment "result (CLOSE_PHI) = RED". */
+/* Removes the PHI node and resets all the debug stmts that are using
+ the PHI_RESULT. */
static void
-insert_copyout (tree red, gimple close_phi)
+remove_phi (gimple phi)
{
- tree res = gimple_phi_result (close_phi);
- basic_block bb = gimple_bb (close_phi);
- gimple_stmt_iterator insert_gsi = gsi_after_labels (bb);
- gimple assign = gimple_build_assign (res, red);
+ imm_use_iterator imm_iter;
+ tree def;
+ use_operand_p use_p;
+ gimple_stmt_iterator gsi;
+ VEC (gimple, heap) *update = VEC_alloc (gimple, heap, 3);
+ unsigned int i;
+ gimple stmt;
- gsi_insert_before (&insert_gsi, assign, GSI_SAME_STMT);
-}
+ def = PHI_RESULT (phi);
+ FOR_EACH_IMM_USE_FAST (use_p, imm_iter, def)
+ {
+ stmt = USE_STMT (use_p);
-/* Insert the assignment "RED = initial_value (LOOP_PHI)". */
+ if (is_gimple_debug (stmt))
+ {
+ gimple_debug_bind_reset_value (stmt);
+ VEC_safe_push (gimple, heap, update, stmt);
+ }
+ }
-static void
-insert_copyin (tree red, gimple loop_phi)
-{
- gimple_seq stmts;
- tree init = initial_value_for_loop_phi (loop_phi);
- edge e = edge_initial_value_for_loop_phi (loop_phi);
- basic_block bb = e->src;
- gimple_stmt_iterator insert_gsi = gsi_last_bb (bb);
- tree expr = build2 (MODIFY_EXPR, TREE_TYPE (init), red, init);
+ FOR_EACH_VEC_ELT (gimple, update, i, stmt)
+ update_stmt (stmt);
- force_gimple_operand (expr, &stmts, true, NULL);
- gsi_insert_seq_before (&insert_gsi, stmts, GSI_SAME_STMT);
+ VEC_free (gimple, heap, update);
+
+ gsi = gsi_for_phi_node (phi);
+ remove_phi_node (&gsi, false);
}
/* Rewrite out of SSA the reduction described by the loop phi nodes
{
unsigned int i;
gimple loop_phi;
- tree red;
- gimple_stmt_iterator gsi;
+ 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);
SET_BIT (reductions, bb->index);
gcc_assert (close_phi == loop_phi);
- red = create_zero_dim_array (gimple_assign_lhs (stmt));
+ 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));
continue;
if (i == VEC_length (gimple, in) - 1)
{
- insert_copyout (red, close_phi);
- insert_copyin (red, loop_phi);
+ 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),
+ red, initial_value_for_loop_phi (loop_phi));
}
- gsi = gsi_for_phi_node (loop_phi);
- remove_phi_node (&gsi, false);
-
- gsi = gsi_for_phi_node (close_phi);
- remove_phi_node (&gsi, false);
+ remove_phi (loop_phi);
+ remove_phi (close_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
+static bool
rewrite_commutative_reductions_out_of_ssa_close_phi (gimple close_phi,
sbitmap reductions)
{
+ 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)
+ res = VEC_length (gimple, in) > 0;
+ if (res)
translate_scalar_reduction_to_array (in, out, reductions);
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
+static bool
rewrite_commutative_reductions_out_of_ssa_loop (loop_p loop,
- sbitmap reductions)
+ sbitmap reductions,
+ sese region)
{
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))
- 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, region))
+ changed |= rewrite_commutative_reductions_out_of_ssa_close_phi
+ (gsi_stmt (gsi), reductions);
+
+ return changed;
}
/* Rewrites all the commutative reductions from SCOP out of SSA. */
-static void
+void
rewrite_commutative_reductions_out_of_ssa (sese region, sbitmap reductions)
{
loop_iterator li;
loop_p loop;
+ bool changed = false;
+
+ if (!flag_associative_math)
+ return;
FOR_EACH_LOOP (li, loop, 0)
if (loop_in_sese_p (loop, region))
- rewrite_commutative_reductions_out_of_ssa_loop (loop, reductions);
+ changed |= rewrite_commutative_reductions_out_of_ssa_loop (loop,
+ reductions,
+ region);
+
+ if (changed)
+ {
+ scev_reset_htab ();
+ gsi_commit_edge_inserts ();
+ update_ssa (TODO_update_ssa);
+#ifdef ENABLE_CHECKING
+ verify_loop_closed_ssa (true);
+#endif
+ }
+}
+
+/* Java does not initialize long_long_integer_type_node. */
+#define my_long_long (long_long_integer_type_node ? long_long_integer_type_node : ssizetype)
+
+/* Can all ivs be represented by a signed integer?
+ As CLooG might generate negative values in its expressions, signed loop ivs
+ are required in the backend. */
+
+static bool
+scop_ivs_can_be_represented (scop_p scop)
+{
+ loop_iterator li;
+ loop_p loop;
+ gimple_stmt_iterator psi;
+
+ FOR_EACH_LOOP (li, loop, 0)
+ {
+ if (!loop_in_sese_p (loop, SCOP_REGION (scop)))
+ continue;
+
+ for (psi = gsi_start_phis (loop->header);
+ !gsi_end_p (psi); gsi_next (&psi))
+ {
+ gimple phi = gsi_stmt (psi);
+ tree res = PHI_RESULT (phi);
+ tree type = TREE_TYPE (res);
+
+ if (TYPE_UNSIGNED (type)
+ && TYPE_PRECISION (type) >= TYPE_PRECISION (my_long_long))
+ return false;
+ }
+ }
+
+ return true;
}
+#undef my_long_long
+
/* Builds the polyhedral representation for a SESE region. */
-bool
+void
build_poly_scop (scop_p scop)
{
sese region = SCOP_REGION (scop);
- sbitmap reductions = sbitmap_alloc (last_basic_block * 2);
+ graphite_dim_t max_dim;
- sbitmap_zero (reductions);
- rewrite_commutative_reductions_out_of_ssa (region, reductions);
- rewrite_reductions_out_of_ssa (scop);
- build_scop_bbs (scop, reductions);
- sbitmap_free (reductions);
/* FIXME: This restriction is needed to avoid a problem in CLooG.
Once CLooG is fixed, remove this guard. Anyways, it makes no
sense to optimize a scop containing only PBBs that do not belong
to any loops. */
if (nb_pbbs_in_loops (scop) == 0)
- return false;
+ return;
+
+ if (!scop_ivs_can_be_represented (scop))
+ return;
build_sese_loop_nests (region);
build_sese_conditions (region);
find_scop_parameters (scop);
+ max_dim = PARAM_VALUE (PARAM_GRAPHITE_MAX_NB_SCOP_PARAMS);
+ if (scop_nb_params (scop) > max_dim)
+ return;
+
build_scop_iteration_domain (scop);
build_scop_context (scop);
build_scop_scattering (scop);
build_scop_drs (scop);
- return true;
-}
-
-/* Always return false. Exercise the scop_to_clast function. */
-
-void
-check_poly_representation (scop_p scop ATTRIBUTE_UNUSED)
-{
-#ifdef ENABLE_CHECKING
- cloog_prog_clast pc = scop_to_clast (scop);
- cloog_clast_free (pc.stmt);
- cloog_program_free (pc.prog);
-#endif
+ /* This SCoP has been translated to the polyhedral
+ representation. */
+ POLY_SCOP_P (scop) = true;
}
#endif
OSDN Git Service
