/* Conversion of SESE regions to Polyhedra.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015 Free Software Foundation, Inc.
Contributed by Sebastian Pop <sebastian.pop@amd.com>.
This file is part of GCC.
<http://www.gnu.org/licenses/>. */
#include "config.h"
+
+#ifdef HAVE_isl
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/union_map.h>
+#include <isl/constraint.h>
+#include <isl/aff.h>
+#include <isl/val.h>
+
+/* Since ISL-0.13, the extern is in val_gmp.h. */
+#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
+extern "C" {
+#endif
+#include <isl/val_gmp.h>
+#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
+}
+#endif
+#endif
+
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
+#include "alias.h"
+#include "symtab.h"
+#include "options.h"
#include "tree.h"
-#include "rtl.h"
+#include "fold-const.h"
+#include "predict.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "dominance.h"
+#include "cfg.h"
#include "basic-block.h"
-#include "diagnostic.h"
-#include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
+#include "tree-ssa-alias.h"
+#include "internal-fn.h"
+#include "gimple-expr.h"
+#include "gimple.h"
+#include "gimple-iterator.h"
+#include "gimplify.h"
+#include "gimplify-me.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "stringpool.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop-manip.h"
+#include "tree-ssa-loop-niter.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-pass.h"
#include "cfgloop.h"
#include "tree-chrec.h"
#include "tree-data-ref.h"
#include "tree-scalar-evolution.h"
-#include "tree-pass.h"
#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
#include "sese.h"
+#include "tree-ssa-propagate.h"
-#ifdef HAVE_cloog
-#include "ppl_c.h"
-#include "graphite-ppl.h"
-#include "graphite.h"
+#ifdef HAVE_isl
+#include "rtl.h"
+#include "flags.h"
+#include "insn-config.h"
+#include "expmed.h"
+#include "dojump.h"
+#include "explow.h"
+#include "calls.h"
+#include "emit-rtl.h"
+#include "varasm.h"
+#include "stmt.h"
+#include "expr.h"
#include "graphite-poly.h"
-#include "graphite-scop-detection.h"
#include "graphite-sese-to-poly.h"
+
+/* Assigns to RES the value of the INTEGER_CST T. */
+
+static inline void
+tree_int_to_gmp (tree t, mpz_t res)
+{
+ wi::to_mpz (t, res, TYPE_SIGN (TREE_TYPE (t)));
+}
+
/* Returns the index of the PHI argument defined in the outermost
loop. */
static size_t
-phi_arg_in_outermost_loop (gimple phi)
+phi_arg_in_outermost_loop (gphi *phi)
{
loop_p loop = gimple_bb (phi)->loop_father;
size_t i, res = 0;
PSI by inserting on the loop ENTRY edge assignment "RES = INIT". */
static void
-remove_simple_copy_phi (gimple_stmt_iterator *psi)
+remove_simple_copy_phi (gphi_iterator *psi)
{
- gimple phi = gsi_stmt (*psi);
+ gphi *phi = psi->phi ();
tree res = gimple_phi_result (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);
+ gassign *stmt = gimple_build_assign (res, init);
edge e = gimple_phi_arg_edge (phi, entry);
remove_phi_node (psi, false);
gsi_insert_on_edge_immediate (e, stmt);
- SSA_NAME_DEF_STMT (res) = stmt;
}
/* Removes an invariant phi node at position PSI by inserting on the
loop ENTRY edge the assignment RES = INIT. */
static void
-remove_invariant_phi (sese region, gimple_stmt_iterator *psi)
+remove_invariant_phi (sese region, gphi_iterator *psi)
{
- gimple phi = gsi_stmt (*psi);
+ gphi *phi = psi->phi ();
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 = phi_arg_in_outermost_loop (phi);
edge e = gimple_phi_arg_edge (phi, entry);
tree var;
- gimple stmt;
- gimple_seq stmts;
- gimple_stmt_iterator gsi;
+ gassign *stmt;
+ gimple_seq stmts = NULL;
if (tree_contains_chrecs (scev, NULL))
scev = gimple_phi_arg_def (phi, entry);
stmt = gimple_build_assign (res, var);
remove_phi_node (psi, false);
- if (!stmts)
- stmts = gimple_seq_alloc ();
-
- gsi = gsi_last (stmts);
- gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
+ gimple_seq_add_stmt (&stmts, stmt);
gsi_insert_seq_on_edge (e, stmts);
gsi_commit_edge_inserts ();
SSA_NAME_DEF_STMT (res) = stmt;
/* Returns true when the phi node at PSI is of the form "a = phi (a, x)". */
static inline bool
-simple_copy_phi_p (gimple phi)
+simple_copy_phi_p (gphi *phi)
{
tree res;
be considered. */
static bool
-reduction_phi_p (sese region, gimple_stmt_iterator *psi)
+reduction_phi_p (sese region, gphi_iterator *psi)
{
loop_p loop;
- gimple phi = gsi_stmt (*psi);
+ gphi *phi = psi->phi ();
tree res = gimple_phi_result (phi);
loop = loop_containing_stmt (phi);
/* Store the GRAPHITE representation of BB. */
static gimple_bb_p
-new_gimple_bb (basic_block bb, VEC (data_reference_p, heap) *drs)
+new_gimple_bb (basic_block bb, vec<data_reference_p> drs)
{
struct gimple_bb *gbb;
bb->aux = gbb;
GBB_BB (gbb) = bb;
GBB_DATA_REFS (gbb) = drs;
- GBB_CONDITIONS (gbb) = NULL;
- GBB_CONDITION_CASES (gbb) = NULL;
+ GBB_CONDITIONS (gbb).create (0);
+ GBB_CONDITION_CASES (gbb).create (0);
return gbb;
}
static void
-free_data_refs_aux (VEC (data_reference_p, heap) *datarefs)
+free_data_refs_aux (vec<data_reference_p> datarefs)
{
unsigned int i;
struct data_reference *dr;
- FOR_EACH_VEC_ELT (data_reference_p, datarefs, i, dr)
+ FOR_EACH_VEC_ELT (datarefs, i, dr)
if (dr->aux)
{
base_alias_pair *bap = (base_alias_pair *)(dr->aux);
- if (bap->alias_set)
- free (bap->alias_set);
+ free (bap->alias_set);
free (bap);
dr->aux = NULL;
free_data_refs_aux (GBB_DATA_REFS (gbb));
free_data_refs (GBB_DATA_REFS (gbb));
- VEC_free (gimple, heap, GBB_CONDITIONS (gbb));
- VEC_free (gimple, heap, GBB_CONDITION_CASES (gbb));
+ GBB_CONDITIONS (gbb).release ();
+ GBB_CONDITION_CASES (gbb).release ();
GBB_BB (gbb)->aux = 0;
XDELETE (gbb);
}
int i;
poly_bb_p pbb;
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
free_gimple_bb (PBB_BLACK_BOX (pbb));
}
/* Deletes all scops in SCOPS. */
void
-free_scops (VEC (scop_p, heap) *scops)
+free_scops (vec<scop_p> scops)
{
int i;
scop_p scop;
- FOR_EACH_VEC_ELT (scop_p, scops, i, scop)
+ FOR_EACH_VEC_ELT (scops, i, scop)
{
remove_gbbs_in_scop (scop);
free_sese (SCOP_REGION (scop));
free_scop (scop);
}
- VEC_free (scop_p, heap, scops);
+ scops.release ();
+}
+
+/* Same as outermost_loop_in_sese, returns the outermost loop
+ containing BB in REGION, but makes sure that the returned loop
+ belongs to the REGION, and so this returns the first loop in the
+ REGION when the loop containing BB does not belong to REGION. */
+
+static loop_p
+outermost_loop_in_sese_1 (sese region, basic_block bb)
+{
+ loop_p nest = outermost_loop_in_sese (region, bb);
+
+ if (loop_in_sese_p (nest, region))
+ return nest;
+
+ /* When the basic block BB does not belong to a loop in the region,
+ return the first loop in the region. */
+ nest = nest->inner;
+ while (nest)
+ if (loop_in_sese_p (nest, region))
+ break;
+ else
+ nest = nest->next;
+
+ gcc_assert (nest);
+ return nest;
}
/* Generates a polyhedral black box only if the bb contains interesting
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);
+ vec<data_reference_p> drs;
+ drs.create (5);
+ sese region = SCOP_REGION (scop);
+ loop_p nest = outermost_loop_in_sese_1 (region, bb);
gimple_stmt_iterator gsi;
for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
{
gimple stmt = gsi_stmt (gsi);
- if (!is_gimple_debug (stmt))
- graphite_find_data_references_in_stmt (nest, stmt, &drs);
+ loop_p loop;
+
+ if (is_gimple_debug (stmt))
+ continue;
+
+ loop = loop_containing_stmt (stmt);
+ if (!loop_in_sese_p (loop, region))
+ loop = nest;
+
+ graphite_find_data_references_in_stmt (nest, loop, stmt, &drs);
}
return new_gimple_bb (bb, drs);
edge_iterator ei;
FOR_EACH_EDGE (e, ei, bb->preds)
- if (!TEST_BIT (map, e->src->index)
+ if (!bitmap_bit_p (map, e->src->index)
&& !dominated_by_p (CDI_DOMINATORS, e->src, bb))
return false;
a deepest loop level. */
static void
-graphite_sort_dominated_info (VEC (basic_block, heap) *dom)
+graphite_sort_dominated_info (vec<basic_block> dom)
{
- VEC_qsort (basic_block, dom, compare_bb_depths);
+ dom.qsort (compare_bb_depths);
}
/* Recursive helper function for build_scops_bbs. */
build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb)
{
sese region = SCOP_REGION (scop);
- VEC (basic_block, heap) *dom;
+ vec<basic_block> dom;
poly_bb_p pbb;
- if (TEST_BIT (visited, bb->index)
+ if (bitmap_bit_p (visited, bb->index)
|| !bb_in_sese_p (bb, region))
return;
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);
+ SCOP_BBS (scop).safe_push (pbb);
+ bitmap_set_bit (visited, bb->index);
dom = get_dominated_by (CDI_DOMINATORS, bb);
- if (dom == NULL)
+ if (!dom.exists ())
return;
graphite_sort_dominated_info (dom);
- while (!VEC_empty (basic_block, dom))
+ while (!dom.is_empty ())
{
int i;
basic_block dom_bb;
- FOR_EACH_VEC_ELT (basic_block, dom, i, dom_bb)
+ FOR_EACH_VEC_ELT (dom, i, dom_bb)
if (all_non_dominated_preds_marked_p (dom_bb, visited))
{
build_scop_bbs_1 (scop, visited, dom_bb);
- VEC_unordered_remove (basic_block, dom, i);
+ dom.unordered_remove (i);
break;
}
}
- VEC_free (basic_block, heap, dom);
+ dom.release ();
}
/* Gather the basic blocks belonging to the SCOP. */
static void
build_scop_bbs (scop_p scop)
{
- sbitmap visited = sbitmap_alloc (last_basic_block);
+ sbitmap visited = sbitmap_alloc (last_basic_block_for_fn (cfun));
sese region = SCOP_REGION (scop);
- sbitmap_zero (visited);
+ bitmap_clear (visited);
build_scop_bbs_1 (scop, visited, SESE_ENTRY_BB (region));
sbitmap_free (visited);
}
+/* Return an ISL identifier for the polyhedral basic block PBB. */
+
+static isl_id *
+isl_id_for_pbb (scop_p s, poly_bb_p pbb)
+{
+ char name[50];
+ snprintf (name, sizeof (name), "S_%d", pbb_index (pbb));
+ return isl_id_alloc (s->ctx, name, pbb);
+}
+
/* Converts the STATIC_SCHEDULE of PBB into a scattering polyhedron.
We generate SCATTERING_DIMENSIONS scattering dimensions.
| 0 0 1 0 0 0 0 0 -5 = 0 */
static void
-build_pbb_scattering_polyhedrons (ppl_Linear_Expression_t static_schedule,
+build_pbb_scattering_polyhedrons (isl_aff *static_sched,
poly_bb_p pbb, int scattering_dimensions)
{
int i;
- scop_p scop = PBB_SCOP (pbb);
int nb_iterators = pbb_dim_iter_domain (pbb);
int used_scattering_dimensions = nb_iterators * 2 + 1;
- int nb_params = scop_nb_params (scop);
- ppl_Coefficient_t c;
- ppl_dimension_type dim = scattering_dimensions + nb_iterators + nb_params;
- mpz_t v;
+ isl_val *val;
+ isl_space *dc, *dm;
gcc_assert (scattering_dimensions >= used_scattering_dimensions);
- mpz_init (v);
- ppl_new_Coefficient (&c);
- PBB_TRANSFORMED (pbb) = poly_scattering_new ();
- ppl_new_C_Polyhedron_from_space_dimension
- (&PBB_TRANSFORMED_SCATTERING (pbb), dim, 0);
-
- PBB_NB_SCATTERING_TRANSFORM (pbb) = scattering_dimensions;
+ dc = isl_set_get_space (pbb->domain);
+ dm = isl_space_add_dims (isl_space_from_domain (dc),
+ isl_dim_out, scattering_dimensions);
+ pbb->schedule = isl_map_universe (dm);
for (i = 0; i < scattering_dimensions; i++)
{
- ppl_Constraint_t cstr;
- ppl_Linear_Expression_t expr;
-
- ppl_new_Linear_Expression_with_dimension (&expr, dim);
- mpz_set_si (v, 1);
- ppl_assign_Coefficient_from_mpz_t (c, v);
- ppl_Linear_Expression_add_to_coefficient (expr, i, c);
-
/* Textual order inside this loop. */
if ((i % 2) == 0)
{
- ppl_Linear_Expression_coefficient (static_schedule, i / 2, c);
- ppl_Coefficient_to_mpz_t (c, v);
- mpz_neg (v, v);
- ppl_assign_Coefficient_from_mpz_t (c, v);
- ppl_Linear_Expression_add_to_inhomogeneous (expr, c);
+ isl_constraint *c = isl_equality_alloc
+ (isl_local_space_from_space (isl_map_get_space (pbb->schedule)));
+
+ val = isl_aff_get_coefficient_val (static_sched, isl_dim_in, i / 2);
+
+ val = isl_val_neg (val);
+ c = isl_constraint_set_constant_val (c, val);
+ c = isl_constraint_set_coefficient_si (c, isl_dim_out, i, 1);
+ pbb->schedule = isl_map_add_constraint (pbb->schedule, c);
}
/* Iterations of this loop. */
else /* if ((i % 2) == 1) */
{
int loop = (i - 1) / 2;
-
- mpz_set_si (v, -1);
- ppl_assign_Coefficient_from_mpz_t (c, v);
- ppl_Linear_Expression_add_to_coefficient
- (expr, scattering_dimensions + loop, c);
+ pbb->schedule = isl_map_equate (pbb->schedule, isl_dim_in, loop,
+ isl_dim_out, i);
}
-
- ppl_new_Constraint (&cstr, expr, PPL_CONSTRAINT_TYPE_EQUAL);
- ppl_Polyhedron_add_constraint (PBB_TRANSFORMED_SCATTERING (pbb), cstr);
- ppl_delete_Linear_Expression (expr);
- ppl_delete_Constraint (cstr);
}
- mpz_clear (v);
- ppl_delete_Coefficient (c);
-
- PBB_ORIGINAL (pbb) = poly_scattering_copy (PBB_TRANSFORMED (pbb));
+ pbb->transformed = isl_map_copy (pbb->schedule);
}
/* Build for BB the static schedule.
int i;
poly_bb_p pbb;
gimple_bb_p previous_gbb = NULL;
- ppl_Linear_Expression_t static_schedule;
- ppl_Coefficient_t c;
- mpz_t v;
+ isl_space *dc = isl_set_get_space (scop->context);
+ isl_aff *static_sched;
- mpz_init (v);
- ppl_new_Coefficient (&c);
- ppl_new_Linear_Expression (&static_schedule);
+ dc = isl_space_add_dims (dc, isl_dim_set, number_of_loops (cfun));
+ static_sched = isl_aff_zero_on_domain (isl_local_space_from_space (dc));
/* We have to start schedules at 0 on the first component and
because we cannot compare_prefix_loops against a previous loop,
prefix will be equal to zero, and that index will be
incremented before copying. */
- mpz_set_si (v, -1);
- ppl_assign_Coefficient_from_mpz_t (c, v);
- ppl_Linear_Expression_add_to_coefficient (static_schedule, 0, c);
+ static_sched = isl_aff_add_coefficient_si (static_sched, isl_dim_in, 0, -1);
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
{
gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
- ppl_Linear_Expression_t common;
int prefix;
int nb_scat_dims = pbb_dim_iter_domain (pbb) * 2 + 1;
prefix = 0;
previous_gbb = gbb;
- ppl_new_Linear_Expression_with_dimension (&common, prefix + 1);
- ppl_assign_Linear_Expression_from_Linear_Expression (common,
- static_schedule);
- 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,
- common);
+ static_sched = isl_aff_add_coefficient_si (static_sched, isl_dim_in,
+ prefix, 1);
+ build_pbb_scattering_polyhedrons (static_sched, pbb, nb_scat_dims);
+ }
+
+ isl_aff_free (static_sched);
+}
+
+static isl_pw_aff *extract_affine (scop_p, tree, __isl_take isl_space *space);
+
+/* Extract an affine expression from the chain of recurrence E. */
- build_pbb_scattering_polyhedrons (common, pbb, nb_scat_dims);
+static isl_pw_aff *
+extract_affine_chrec (scop_p s, tree e, __isl_take isl_space *space)
+{
+ isl_pw_aff *lhs = extract_affine (s, CHREC_LEFT (e), isl_space_copy (space));
+ isl_pw_aff *rhs = extract_affine (s, CHREC_RIGHT (e), isl_space_copy (space));
+ isl_local_space *ls = isl_local_space_from_space (space);
+ unsigned pos = sese_loop_depth ((sese) s->region, get_chrec_loop (e)) - 1;
+ isl_aff *loop = isl_aff_set_coefficient_si
+ (isl_aff_zero_on_domain (ls), isl_dim_in, pos, 1);
+ isl_pw_aff *l = isl_pw_aff_from_aff (loop);
+
+ /* Before multiplying, make sure that the result is affine. */
+ gcc_assert (isl_pw_aff_is_cst (rhs)
+ || isl_pw_aff_is_cst (l));
+
+ return isl_pw_aff_add (lhs, isl_pw_aff_mul (rhs, l));
+}
+
+/* Extract an affine expression from the mult_expr E. */
+
+static isl_pw_aff *
+extract_affine_mul (scop_p s, tree e, __isl_take isl_space *space)
+{
+ isl_pw_aff *lhs = extract_affine (s, TREE_OPERAND (e, 0),
+ isl_space_copy (space));
+ isl_pw_aff *rhs = extract_affine (s, TREE_OPERAND (e, 1), space);
- ppl_delete_Linear_Expression (common);
+ if (!isl_pw_aff_is_cst (lhs)
+ && !isl_pw_aff_is_cst (rhs))
+ {
+ isl_pw_aff_free (lhs);
+ isl_pw_aff_free (rhs);
+ return NULL;
}
- mpz_clear (v);
- ppl_delete_Coefficient (c);
- ppl_delete_Linear_Expression (static_schedule);
+ return isl_pw_aff_mul (lhs, rhs);
}
-/* Add the value K to the dimension D of the linear expression EXPR. */
+/* Return an ISL identifier from the name of the ssa_name E. */
-static void
-add_value_to_dim (ppl_dimension_type d, ppl_Linear_Expression_t expr,
- mpz_t k)
+static isl_id *
+isl_id_for_ssa_name (scop_p s, tree e)
{
- mpz_t val;
- ppl_Coefficient_t coef;
+ const char *name = get_name (e);
+ isl_id *id;
- ppl_new_Coefficient (&coef);
- ppl_Linear_Expression_coefficient (expr, d, coef);
- mpz_init (val);
- ppl_Coefficient_to_mpz_t (coef, val);
+ if (name)
+ id = isl_id_alloc (s->ctx, name, e);
+ else
+ {
+ char name1[50];
+ snprintf (name1, sizeof (name1), "P_%d", SSA_NAME_VERSION (e));
+ id = isl_id_alloc (s->ctx, name1, e);
+ }
- mpz_add (val, val, k);
+ return id;
+}
- ppl_assign_Coefficient_from_mpz_t (coef, val);
- ppl_Linear_Expression_add_to_coefficient (expr, d, coef);
- mpz_clear (val);
- ppl_delete_Coefficient (coef);
+/* Return an ISL identifier for the data reference DR. */
+
+static isl_id *
+isl_id_for_dr (scop_p s, data_reference_p dr ATTRIBUTE_UNUSED)
+{
+ /* Data references all get the same isl_id. They need to be comparable
+ and are distinguished through the first dimension, which contains the
+ alias set number. */
+ return isl_id_alloc (s->ctx, "", 0);
}
-/* In the context of scop S, scan E, the right hand side of a scalar
- evolution function in loop VAR, and translate it to a linear
- expression EXPR. */
+/* Extract an affine expression from the ssa_name E. */
-static void
-scan_tree_for_params_right_scev (sese s, tree e, int var,
- ppl_Linear_Expression_t expr)
+static isl_pw_aff *
+extract_affine_name (scop_p s, tree e, __isl_take isl_space *space)
{
- if (expr)
- {
- loop_p loop = get_loop (var);
- ppl_dimension_type l = sese_loop_depth (s, loop) - 1;
- mpz_t val;
+ isl_aff *aff;
+ isl_set *dom;
+ isl_id *id;
+ int dimension;
- /* Scalar evolutions should happen in the sese region. */
- gcc_assert (sese_loop_depth (s, loop) > 0);
+ id = isl_id_for_ssa_name (s, e);
+ dimension = isl_space_find_dim_by_id (space, isl_dim_param, id);
+ isl_id_free (id);
+ dom = isl_set_universe (isl_space_copy (space));
+ aff = isl_aff_zero_on_domain (isl_local_space_from_space (space));
+ aff = isl_aff_add_coefficient_si (aff, isl_dim_param, dimension, 1);
+ return isl_pw_aff_alloc (dom, aff);
+}
- /* We can not deal with parametric strides like:
+/* Extract an affine expression from the gmp constant G. */
- | p = parameter;
- |
- | for i:
- | a [i * p] = ... */
- gcc_assert (TREE_CODE (e) == INTEGER_CST);
+static isl_pw_aff *
+extract_affine_gmp (mpz_t g, __isl_take isl_space *space)
+{
+ isl_local_space *ls = isl_local_space_from_space (isl_space_copy (space));
+ isl_aff *aff = isl_aff_zero_on_domain (ls);
+ isl_set *dom = isl_set_universe (space);
+ isl_val *v;
+ isl_ctx *ct;
- mpz_init (val);
- mpz_set_si (val, int_cst_value (e));
- add_value_to_dim (l, expr, val);
- mpz_clear (val);
- }
+ ct = isl_aff_get_ctx (aff);
+ v = isl_val_int_from_gmp (ct, g);
+ aff = isl_aff_add_constant_val (aff, v);
+
+ return isl_pw_aff_alloc (dom, aff);
}
-/* Scan the integer constant CST, and add it to the inhomogeneous part of the
- linear expression EXPR. K is the multiplier of the constant. */
+/* Extract an affine expression from the integer_cst E. */
-static void
-scan_tree_for_params_int (tree cst, ppl_Linear_Expression_t expr, mpz_t k)
+static isl_pw_aff *
+extract_affine_int (tree e, __isl_take isl_space *space)
{
- mpz_t val;
- ppl_Coefficient_t coef;
- int v = int_cst_value (cst);
+ isl_pw_aff *res;
+ mpz_t g;
- mpz_init (val);
- mpz_set_si (val, 0);
+ mpz_init (g);
+ tree_int_to_gmp (e, g);
+ res = extract_affine_gmp (g, space);
+ mpz_clear (g);
- /* Necessary to not get "-1 = 2^n - 1". */
- if (v < 0)
- mpz_sub_ui (val, val, -v);
- else
- mpz_add_ui (val, val, v);
+ return res;
+}
+
+/* Compute pwaff mod 2^width. */
- 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);
- mpz_clear (val);
- ppl_delete_Coefficient (coef);
+extern isl_ctx *the_isl_ctx;
+
+static isl_pw_aff *
+wrap (isl_pw_aff *pwaff, unsigned width)
+{
+ isl_val *mod;
+
+ mod = isl_val_int_from_ui(the_isl_ctx, width);
+ mod = isl_val_2exp (mod);
+ pwaff = isl_pw_aff_mod_val (pwaff, mod);
+
+ return pwaff;
}
/* When parameter NAME is in REGION, returns its index in SESE_PARAMS.
gcc_assert (TREE_CODE (name) == SSA_NAME);
- FOR_EACH_VEC_ELT (tree, SESE_PARAMS (region), i, p)
+ FOR_EACH_VEC_ELT (SESE_PARAMS (region), i, p)
if (p == name)
return i;
gcc_assert (SESE_ADD_PARAMS (region));
- i = VEC_length (tree, SESE_PARAMS (region));
- VEC_safe_push (tree, heap, SESE_PARAMS (region), name);
+ i = SESE_PARAMS (region).length ();
+ SESE_PARAMS (region).safe_push (name);
return i;
}
-/* In the context of sese S, scan the expression E and translate it to
- a linear expression C. When parsing a symbolic multiplication, K
- represents the constant multiplier of an expression containing
- parameters. */
+/* Extract an affine expression from the tree E in the scop S. */
-static void
-scan_tree_for_params (sese s, tree e, ppl_Linear_Expression_t c,
- mpz_t k)
+static isl_pw_aff *
+extract_affine (scop_p s, tree e, __isl_take isl_space *space)
{
- if (e == chrec_dont_know)
- return;
+ isl_pw_aff *lhs, *rhs, *res;
+ tree type;
+
+ if (e == chrec_dont_know) {
+ isl_space_free (space);
+ return NULL;
+ }
switch (TREE_CODE (e))
{
case POLYNOMIAL_CHREC:
- scan_tree_for_params_right_scev (s, CHREC_RIGHT (e),
- CHREC_VARIABLE (e), c);
- scan_tree_for_params (s, CHREC_LEFT (e), c, k);
+ res = extract_affine_chrec (s, e, space);
break;
case MULT_EXPR:
- if (chrec_contains_symbols (TREE_OPERAND (e, 0)))
- {
- if (c)
- {
- mpz_t val;
- gcc_assert (host_integerp (TREE_OPERAND (e, 1), 0));
- 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);
- mpz_clear (val);
- }
- else
- scan_tree_for_params (s, TREE_OPERAND (e, 0), c, k);
- }
- else
- {
- if (c)
- {
- mpz_t val;
- gcc_assert (host_integerp (TREE_OPERAND (e, 0), 0));
- 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);
- mpz_clear (val);
- }
- else
- scan_tree_for_params (s, TREE_OPERAND (e, 1), c, k);
- }
+ res = extract_affine_mul (s, e, space);
break;
case PLUS_EXPR:
case POINTER_PLUS_EXPR:
- scan_tree_for_params (s, TREE_OPERAND (e, 0), c, k);
- scan_tree_for_params (s, TREE_OPERAND (e, 1), c, k);
+ lhs = extract_affine (s, TREE_OPERAND (e, 0), isl_space_copy (space));
+ rhs = extract_affine (s, TREE_OPERAND (e, 1), space);
+ res = isl_pw_aff_add (lhs, rhs);
break;
case MINUS_EXPR:
- {
- ppl_Linear_Expression_t tmp_expr = NULL;
-
- if (c)
- {
- ppl_dimension_type dim;
- ppl_Linear_Expression_space_dimension (c, &dim);
- ppl_new_Linear_Expression_with_dimension (&tmp_expr, dim);
- }
-
- scan_tree_for_params (s, TREE_OPERAND (e, 0), c, k);
- scan_tree_for_params (s, TREE_OPERAND (e, 1), tmp_expr, k);
-
- if (c)
- {
- ppl_subtract_Linear_Expression_from_Linear_Expression (c,
- tmp_expr);
- ppl_delete_Linear_Expression (tmp_expr);
- }
-
- break;
- }
+ lhs = extract_affine (s, TREE_OPERAND (e, 0), isl_space_copy (space));
+ rhs = extract_affine (s, TREE_OPERAND (e, 1), space);
+ res = isl_pw_aff_sub (lhs, rhs);
+ break;
case NEGATE_EXPR:
- {
- ppl_Linear_Expression_t tmp_expr = NULL;
-
- if (c)
- {
- ppl_dimension_type dim;
- ppl_Linear_Expression_space_dimension (c, &dim);
- ppl_new_Linear_Expression_with_dimension (&tmp_expr, dim);
- }
+ case BIT_NOT_EXPR:
+ lhs = extract_affine (s, TREE_OPERAND (e, 0), isl_space_copy (space));
+ rhs = extract_affine (s, integer_minus_one_node, space);
+ res = isl_pw_aff_mul (lhs, rhs);
+ break;
- scan_tree_for_params (s, TREE_OPERAND (e, 0), tmp_expr, k);
+ case SSA_NAME:
+ gcc_assert (-1 != parameter_index_in_region_1 (e, SCOP_REGION (s)));
+ res = extract_affine_name (s, e, space);
+ break;
- if (c)
- {
- ppl_subtract_Linear_Expression_from_Linear_Expression (c,
- tmp_expr);
- ppl_delete_Linear_Expression (tmp_expr);
- }
+ case INTEGER_CST:
+ res = extract_affine_int (e, space);
+ /* No need to wrap a single integer. */
+ return res;
- break;
- }
+ CASE_CONVERT:
+ case NON_LVALUE_EXPR:
+ res = extract_affine (s, TREE_OPERAND (e, 0), space);
+ break;
- case BIT_NOT_EXPR:
- {
- ppl_Linear_Expression_t tmp_expr = NULL;
+ default:
+ gcc_unreachable ();
+ break;
+ }
- if (c)
- {
- ppl_dimension_type dim;
- ppl_Linear_Expression_space_dimension (c, &dim);
- ppl_new_Linear_Expression_with_dimension (&tmp_expr, dim);
- }
+ type = TREE_TYPE (e);
+ if (TYPE_UNSIGNED (type))
+ res = wrap (res, TYPE_PRECISION (type));
- scan_tree_for_params (s, TREE_OPERAND (e, 0), tmp_expr, k);
+ return res;
+}
- if (c)
- {
- ppl_Coefficient_t coef;
- mpz_t minus_one;
-
- ppl_subtract_Linear_Expression_from_Linear_Expression (c,
- tmp_expr);
- ppl_delete_Linear_Expression (tmp_expr);
- 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);
- mpz_clear (minus_one);
- ppl_delete_Coefficient (coef);
- }
+/* In the context of sese S, scan the expression E and translate it to
+ a linear expression C. When parsing a symbolic multiplication, K
+ represents the constant multiplier of an expression containing
+ parameters. */
- break;
- }
+static void
+scan_tree_for_params (sese s, tree e)
+{
+ if (e == chrec_dont_know)
+ return;
- case SSA_NAME:
- {
- ppl_dimension_type p = parameter_index_in_region (e, s);
+ switch (TREE_CODE (e))
+ {
+ case POLYNOMIAL_CHREC:
+ scan_tree_for_params (s, CHREC_LEFT (e));
+ break;
- if (c)
- {
- ppl_dimension_type dim;
- ppl_Linear_Expression_space_dimension (c, &dim);
- p += dim - sese_nb_params (s);
- add_value_to_dim (p, c, k);
- }
- break;
- }
+ case MULT_EXPR:
+ if (chrec_contains_symbols (TREE_OPERAND (e, 0)))
+ scan_tree_for_params (s, TREE_OPERAND (e, 0));
+ else
+ scan_tree_for_params (s, TREE_OPERAND (e, 1));
+ break;
- case INTEGER_CST:
- if (c)
- scan_tree_for_params_int (e, c, k);
+ case PLUS_EXPR:
+ case POINTER_PLUS_EXPR:
+ case MINUS_EXPR:
+ scan_tree_for_params (s, TREE_OPERAND (e, 0));
+ scan_tree_for_params (s, TREE_OPERAND (e, 1));
break;
+ case NEGATE_EXPR:
+ case BIT_NOT_EXPR:
CASE_CONVERT:
case NON_LVALUE_EXPR:
- scan_tree_for_params (s, TREE_OPERAND (e, 0), c, k);
+ scan_tree_for_params (s, TREE_OPERAND (e, 0));
+ break;
+
+ case SSA_NAME:
+ parameter_index_in_region (e, s);
+ break;
+
+ case INTEGER_CST:
+ case ADDR_EXPR:
break;
default:
data_reference_p dr;
gimple stmt;
loop_p loop = GBB_BB (gbb)->loop_father;
- mpz_t one;
-
- mpz_init (one);
- mpz_set_si (one, 1);
/* Find parameters in the access functions of data references. */
- FOR_EACH_VEC_ELT (data_reference_p, GBB_DATA_REFS (gbb), i, dr)
+ FOR_EACH_VEC_ELT (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);
+ scan_tree_for_params (region, DR_ACCESS_FN (dr, j));
/* Find parameters in conditional statements. */
- FOR_EACH_VEC_ELT (gimple, GBB_CONDITIONS (gbb), i, stmt)
+ FOR_EACH_VEC_ELT (GBB_CONDITIONS (gbb), i, stmt)
{
tree lhs = scalar_evolution_in_region (region, loop,
gimple_cond_lhs (stmt));
tree rhs = scalar_evolution_in_region (region, loop,
gimple_cond_rhs (stmt));
- scan_tree_for_params (region, lhs, NULL, one);
- scan_tree_for_params (region, rhs, NULL, one);
+ scan_tree_for_params (region, lhs);
+ scan_tree_for_params (region, rhs);
}
-
- 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;
- mpz_t one;
-
- mpz_init (one);
- mpz_set_si (one, 1);
+ int nbp;
/* Find the parameters used in the loop bounds. */
- FOR_EACH_VEC_ELT (loop_p, SESE_LOOP_NEST (region), i, loop)
+ FOR_EACH_VEC_ELT (SESE_LOOP_NEST (region), i, loop)
{
tree nb_iters = number_of_latch_executions (loop);
continue;
nb_iters = scalar_evolution_in_region (region, loop, nb_iters);
- scan_tree_for_params (region, nb_iters, NULL, one);
+ scan_tree_for_params (region, nb_iters);
}
- mpz_clear (one);
-
/* Find the parameters used in data accesses. */
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
find_params_in_bb (region, PBB_BLACK_BOX (pbb));
- scop_set_nb_params (scop, sese_nb_params (region));
+ nbp = sese_nb_params (region);
+ scop_set_nb_params (scop, nbp);
SESE_ADD_PARAMS (region) = false;
- ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension
- (&SCOP_CONTEXT (scop), scop_nb_params (scop), 0);
-}
-
-/* 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;
+ tree e;
+ isl_space *space = isl_space_set_alloc (scop->ctx, nbp, 0);
- 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;
+ FOR_EACH_VEC_ELT (SESE_PARAMS (region), i, e)
+ space = isl_space_set_dim_id (space, isl_dim_param, i,
+ isl_id_for_ssa_name (scop, e));
- 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);
+ scop->context = isl_set_universe (space);
}
-
- 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
static void
build_loop_iteration_domains (scop_p scop, struct loop *loop,
- ppl_Polyhedron_t outer_ph, int nb,
- ppl_Pointset_Powerset_C_Polyhedron_t *domains)
+ int nb,
+ isl_set *outer, isl_set **doms)
{
- int i;
- ppl_Polyhedron_t ph;
tree nb_iters = number_of_latch_executions (loop);
- ppl_dimension_type dim = nb + 1 + scop_nb_params (scop);
sese region = SCOP_REGION (scop);
- {
- ppl_const_Constraint_System_t pcs;
- ppl_dimension_type *map
- = (ppl_dimension_type *) XNEWVEC (ppl_dimension_type, dim);
-
- ppl_new_C_Polyhedron_from_space_dimension (&ph, dim, 0);
- ppl_Polyhedron_get_constraints (outer_ph, &pcs);
- ppl_Polyhedron_add_constraints (ph, pcs);
-
- for (i = 0; i < (int) nb; i++)
- map[i] = i;
- for (i = (int) nb; i < (int) dim - 1; i++)
- map[i] = i + 1;
- map[dim - 1] = nb;
-
- ppl_Polyhedron_map_space_dimensions (ph, map, dim);
- free (map);
- }
+ isl_set *inner = isl_set_copy (outer);
+ isl_space *space;
+ isl_constraint *c;
+ int pos = isl_set_dim (outer, isl_dim_set);
+ isl_val *v;
+ mpz_t g;
+
+ mpz_init (g);
+
+ inner = isl_set_add_dims (inner, isl_dim_set, 1);
+ space = isl_set_get_space (inner);
/* 0 <= loop_i */
- {
- ppl_Constraint_t lb;
- ppl_Linear_Expression_t lb_expr;
-
- ppl_new_Linear_Expression_with_dimension (&lb_expr, dim);
- ppl_set_coef (lb_expr, nb, 1);
- ppl_new_Constraint (&lb, lb_expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
- ppl_delete_Linear_Expression (lb_expr);
- ppl_Polyhedron_add_constraint (ph, lb);
- ppl_delete_Constraint (lb);
- }
+ c = isl_inequality_alloc
+ (isl_local_space_from_space (isl_space_copy (space)));
+ c = isl_constraint_set_coefficient_si (c, isl_dim_set, pos, 1);
+ inner = isl_set_add_constraint (inner, c);
+ /* loop_i <= cst_nb_iters */
if (TREE_CODE (nb_iters) == INTEGER_CST)
{
- ppl_Constraint_t ub;
- ppl_Linear_Expression_t ub_expr;
-
- ppl_new_Linear_Expression_with_dimension (&ub_expr, dim);
-
- /* loop_i <= cst_nb_iters */
- ppl_set_coef (ub_expr, nb, -1);
- ppl_set_inhomogeneous_tree (ub_expr, nb_iters);
- ppl_new_Constraint (&ub, ub_expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
- ppl_Polyhedron_add_constraint (ph, ub);
- ppl_delete_Linear_Expression (ub_expr);
- ppl_delete_Constraint (ub);
+ c = isl_inequality_alloc
+ (isl_local_space_from_space (isl_space_copy (space)));
+ c = isl_constraint_set_coefficient_si (c, isl_dim_set, pos, -1);
+ tree_int_to_gmp (nb_iters, g);
+ v = isl_val_int_from_gmp (the_isl_ctx, g);
+ c = isl_constraint_set_constant_val (c, v);
+ inner = isl_set_add_constraint (inner, c);
}
+
+ /* loop_i <= expr_nb_iters */
else if (!chrec_contains_undetermined (nb_iters))
{
- mpz_t one;
- ppl_Constraint_t ub;
- ppl_Linear_Expression_t ub_expr;
- double_int nit;
-
- mpz_init (one);
- mpz_set_si (one, 1);
- ppl_new_Linear_Expression_with_dimension (&ub_expr, dim);
+ widest_int nit;
+ isl_pw_aff *aff;
+ isl_set *valid;
+ isl_local_space *ls;
+ isl_aff *al;
+ isl_set *le;
+
nb_iters = scalar_evolution_in_region (region, loop, nb_iters);
- scan_tree_for_params (SCOP_REGION (scop), nb_iters, ub_expr, 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);
- ppl_new_Constraint (&ub, ub_expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
- ppl_Polyhedron_add_constraint (ph, ub);
- ppl_delete_Linear_Expression (ub_expr);
- ppl_delete_Constraint (ub);
+
+ aff = extract_affine (scop, nb_iters, isl_set_get_space (inner));
+ valid = isl_pw_aff_nonneg_set (isl_pw_aff_copy (aff));
+ valid = isl_set_project_out (valid, isl_dim_set, 0,
+ isl_set_dim (valid, isl_dim_set));
+ scop->context = isl_set_intersect (scop->context, valid);
+
+ ls = isl_local_space_from_space (isl_space_copy (space));
+ al = isl_aff_set_coefficient_si (isl_aff_zero_on_domain (ls),
+ isl_dim_in, pos, 1);
+ le = isl_pw_aff_le_set (isl_pw_aff_from_aff (al),
+ isl_pw_aff_copy (aff));
+ inner = isl_set_intersect (inner, le);
+
+ if (max_stmt_executions (loop, &nit))
+ {
+ /* Insert in the context the constraints from the
+ estimation of the number of iterations NIT and the
+ symbolic number of iterations (involving parameter
+ names) NB_ITERS. First, build the affine expression
+ "NIT - NB_ITERS" and then say that it is positive,
+ i.e., NIT approximates NB_ITERS: "NIT >= NB_ITERS". */
+ isl_pw_aff *approx;
+ mpz_t g;
+ isl_set *x;
+ isl_constraint *c;
+
+ mpz_init (g);
+ wi::to_mpz (nit, g, SIGNED);
+ mpz_sub_ui (g, g, 1);
+ approx = extract_affine_gmp (g, isl_set_get_space (inner));
+ x = isl_pw_aff_ge_set (approx, aff);
+ x = isl_set_project_out (x, isl_dim_set, 0,
+ isl_set_dim (x, isl_dim_set));
+ scop->context = isl_set_intersect (scop->context, x);
+
+ c = isl_inequality_alloc
+ (isl_local_space_from_space (isl_space_copy (space)));
+ c = isl_constraint_set_coefficient_si (c, isl_dim_set, pos, -1);
+ v = isl_val_int_from_gmp (the_isl_ctx, g);
+ mpz_clear (g);
+ c = isl_constraint_set_constant_val (c, v);
+ inner = isl_set_add_constraint (inner, c);
+ }
+ else
+ isl_pw_aff_free (aff);
}
else
gcc_unreachable ();
if (loop->inner && loop_in_sese_p (loop->inner, region))
- build_loop_iteration_domains (scop, loop->inner, ph, nb + 1, domains);
+ build_loop_iteration_domains (scop, loop->inner, nb + 1,
+ isl_set_copy (inner), doms);
if (nb != 0
&& loop->next
&& loop_in_sese_p (loop->next, region))
- build_loop_iteration_domains (scop, loop->next, outer_ph, nb, domains);
+ build_loop_iteration_domains (scop, loop->next, nb,
+ isl_set_copy (outer), doms);
- ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
- (&domains[loop->num], ph);
+ doms[loop->num] = inner;
- ppl_delete_Polyhedron (ph);
+ isl_set_free (outer);
+ isl_space_free (space);
+ mpz_clear (g);
}
/* Returns a linear expression for tree T evaluated in PBB. */
-static ppl_Linear_Expression_t
-create_linear_expr_from_tree (poly_bb_p pbb, tree t)
+static isl_pw_aff *
+create_pw_aff_from_tree (poly_bb_p pbb, tree t)
{
- mpz_t one;
- ppl_Linear_Expression_t res;
- ppl_dimension_type dim;
- sese region = SCOP_REGION (PBB_SCOP (pbb));
- loop_p loop = pbb_loop (pbb);
-
- dim = pbb_dim_iter_domain (pbb) + pbb_nb_params (pbb);
- ppl_new_Linear_Expression_with_dimension (&res, dim);
+ scop_p scop = PBB_SCOP (pbb);
- t = scalar_evolution_in_region (region, loop, t);
+ t = scalar_evolution_in_region (SCOP_REGION (scop), pbb_loop (pbb), t);
gcc_assert (!automatically_generated_chrec_p (t));
- mpz_init (one);
- mpz_set_si (one, 1);
- scan_tree_for_params (region, t, res, one);
- mpz_clear (one);
-
- return res;
+ return extract_affine (scop, t, isl_set_get_space (pbb->domain));
}
-/* Returns the ppl constraint type from the gimple tree code CODE. */
-
-static enum ppl_enum_Constraint_Type
-ppl_constraint_type_from_tree_code (enum tree_code code)
-{
- switch (code)
- {
- /* We do not support LT and GT to be able to work with C_Polyhedron.
- As we work on integer polyhedron "a < b" can be expressed by
- "a + 1 <= b". */
- case LT_EXPR:
- case GT_EXPR:
- gcc_unreachable ();
-
- case LE_EXPR:
- return PPL_CONSTRAINT_TYPE_LESS_OR_EQUAL;
-
- case GE_EXPR:
- return PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL;
-
- case EQ_EXPR:
- return PPL_CONSTRAINT_TYPE_EQUAL;
-
- default:
- gcc_unreachable ();
- }
-}
-
-/* Add conditional statement STMT to PS. It is evaluated in PBB and
- CODE is used as the comparison operator. This allows us to invert the
- condition or to handle inequalities. */
+/* Add conditional statement STMT to pbb. CODE is used as the comparison
+ operator. This allows us to invert the condition or to handle
+ inequalities. */
static void
-add_condition_to_domain (ppl_Pointset_Powerset_C_Polyhedron_t ps, gimple stmt,
- poly_bb_p pbb, enum tree_code code)
+add_condition_to_pbb (poly_bb_p pbb, gcond *stmt, enum tree_code code)
{
- mpz_t v;
- ppl_Coefficient_t c;
- ppl_Linear_Expression_t left, right;
- ppl_Constraint_t cstr;
- enum ppl_enum_Constraint_Type type;
-
- left = create_linear_expr_from_tree (pbb, gimple_cond_lhs (stmt));
- right = create_linear_expr_from_tree (pbb, gimple_cond_rhs (stmt));
+ isl_pw_aff *lhs = create_pw_aff_from_tree (pbb, gimple_cond_lhs (stmt));
+ isl_pw_aff *rhs = create_pw_aff_from_tree (pbb, gimple_cond_rhs (stmt));
+ isl_set *cond;
- /* If we have < or > expressions convert them to <= or >= by adding 1 to
- the left or the right side of the expression. */
- if (code == LT_EXPR)
- {
- 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);
- mpz_clear (v);
-
- code = LE_EXPR;
- }
- else if (code == GT_EXPR)
+ switch (code)
{
- 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);
- mpz_clear (v);
-
- code = GE_EXPR;
- }
+ case LT_EXPR:
+ cond = isl_pw_aff_lt_set (lhs, rhs);
+ break;
- type = ppl_constraint_type_from_tree_code (code);
+ case GT_EXPR:
+ cond = isl_pw_aff_gt_set (lhs, rhs);
+ break;
- ppl_subtract_Linear_Expression_from_Linear_Expression (left, right);
+ case LE_EXPR:
+ cond = isl_pw_aff_le_set (lhs, rhs);
+ break;
- ppl_new_Constraint (&cstr, left, type);
- ppl_Pointset_Powerset_C_Polyhedron_add_constraint (ps, cstr);
+ case GE_EXPR:
+ cond = isl_pw_aff_ge_set (lhs, rhs);
+ break;
- ppl_delete_Constraint (cstr);
- ppl_delete_Linear_Expression (left);
- ppl_delete_Linear_Expression (right);
-}
+ case EQ_EXPR:
+ cond = isl_pw_aff_eq_set (lhs, rhs);
+ break;
-/* Add conditional statement STMT to pbb. CODE is used as the comparision
- operator. This allows us to invert the condition or to handle
- inequalities. */
+ case NE_EXPR:
+ cond = isl_pw_aff_ne_set (lhs, rhs);
+ break;
-static void
-add_condition_to_pbb (poly_bb_p pbb, gimple stmt, enum tree_code code)
-{
- if (code == NE_EXPR)
- {
- ppl_Pointset_Powerset_C_Polyhedron_t left = PBB_DOMAIN (pbb);
- ppl_Pointset_Powerset_C_Polyhedron_t right;
- ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
- (&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_delete_Pointset_Powerset_C_Polyhedron (right);
+ default:
+ isl_pw_aff_free (lhs);
+ isl_pw_aff_free (rhs);
+ return;
}
- else
- add_condition_to_domain (PBB_DOMAIN (pbb), stmt, pbb, code);
+
+ cond = isl_set_coalesce (cond);
+ cond = isl_set_set_tuple_id (cond, isl_set_get_tuple_id (pbb->domain));
+ pbb->domain = isl_set_intersect (pbb->domain, cond);
}
/* Add conditions to the domain of PBB. */
gimple stmt;
gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
- if (VEC_empty (gimple, GBB_CONDITIONS (gbb)))
+ if (GBB_CONDITIONS (gbb).is_empty ())
return;
- FOR_EACH_VEC_ELT (gimple, GBB_CONDITIONS (gbb), i, stmt)
+ FOR_EACH_VEC_ELT (GBB_CONDITIONS (gbb), i, stmt)
switch (gimple_code (stmt))
{
case GIMPLE_COND:
{
- enum tree_code code = gimple_cond_code (stmt);
+ gcond *cond_stmt = as_a <gcond *> (stmt);
+ enum tree_code code = gimple_cond_code (cond_stmt);
/* The conditions for ELSE-branches are inverted. */
- if (!VEC_index (gimple, GBB_CONDITION_CASES (gbb), i))
+ if (!GBB_CONDITION_CASES (gbb)[i])
code = invert_tree_comparison (code, false);
- add_condition_to_pbb (pbb, stmt, code);
+ add_condition_to_pbb (pbb, cond_stmt, code);
break;
}
case GIMPLE_SWITCH:
- /* Switch statements are not supported right now - fall throught. */
+ /* Switch statements are not supported right now - fall through. */
default:
gcc_unreachable ();
int i;
poly_bb_p pbb;
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
add_conditions_to_domain (pbb);
}
-/* Structure used to pass data to dom_walk. */
-
-struct bsc
-{
- VEC (gimple, heap) **conditions, **cases;
- sese region;
-};
-
/* 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
+static gcond *
single_pred_cond_non_loop_exit (basic_block bb)
{
if (single_pred_p (bb))
stmt = last_stmt (pred);
if (stmt && gimple_code (stmt) == GIMPLE_COND)
- return stmt;
+ return as_a <gcond *> (stmt);
}
return NULL;
}
+class sese_dom_walker : public dom_walker
+{
+public:
+ sese_dom_walker (cdi_direction, sese);
+
+ virtual void before_dom_children (basic_block);
+ virtual void after_dom_children (basic_block);
+
+private:
+ auto_vec<gimple, 3> m_conditions, m_cases;
+ sese m_region;
+};
+
+sese_dom_walker::sese_dom_walker (cdi_direction direction, sese region)
+ : dom_walker (direction), m_region (region)
+{
+}
+
/* Call-back for dom_walk executed before visiting the dominated
blocks. */
-static void
-build_sese_conditions_before (struct dom_walk_data *dw_data,
- basic_block bb)
+void
+sese_dom_walker::before_dom_children (basic_block bb)
{
- 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;
- gimple stmt;
+ gcond *stmt;
- if (!bb_in_sese_p (bb, data->region))
+ if (!bb_in_sese_p (bb, m_region))
return;
stmt = single_pred_cond_non_loop_exit (bb);
{
edge e = single_pred_edge (bb);
- VEC_safe_push (gimple, heap, *conditions, stmt);
+ m_conditions.safe_push (stmt);
if (e->flags & EDGE_TRUE_VALUE)
- VEC_safe_push (gimple, heap, *cases, stmt);
+ m_cases.safe_push (stmt);
else
- VEC_safe_push (gimple, heap, *cases, NULL);
+ m_cases.safe_push (NULL);
}
gbb = gbb_from_bb (bb);
if (gbb)
{
- GBB_CONDITIONS (gbb) = VEC_copy (gimple, heap, *conditions);
- GBB_CONDITION_CASES (gbb) = VEC_copy (gimple, heap, *cases);
+ GBB_CONDITIONS (gbb) = m_conditions.copy ();
+ GBB_CONDITION_CASES (gbb) = m_cases.copy ();
}
}
/* Call-back for dom_walk executed after visiting the dominated
blocks. */
-static void
-build_sese_conditions_after (struct dom_walk_data *dw_data,
- basic_block bb)
+void
+sese_dom_walker::after_dom_children (basic_block bb)
{
- struct bsc *data = (struct bsc *) dw_data->global_data;
- VEC (gimple, heap) **conditions = data->conditions;
- VEC (gimple, heap) **cases = data->cases;
-
- if (!bb_in_sese_p (bb, data->region))
+ if (!bb_in_sese_p (bb, m_region))
return;
if (single_pred_cond_non_loop_exit (bb))
{
- VEC_pop (gimple, *conditions);
- VEC_pop (gimple, *cases);
+ m_conditions.pop ();
+ m_cases.pop ();
}
}
-/* Record all conditions in REGION. */
-
-static void
-build_sese_conditions (sese region)
-{
- struct dom_walk_data walk_data;
- VEC (gimple, heap) *conditions = VEC_alloc (gimple, heap, 3);
- VEC (gimple, heap) *cases = VEC_alloc (gimple, heap, 3);
- struct bsc data;
-
- data.conditions = &conditions;
- data.cases = &cases;
- data.region = region;
-
- walk_data.dom_direction = CDI_DOMINATORS;
- walk_data.initialize_block_local_data = NULL;
- walk_data.before_dom_children = build_sese_conditions_before;
- walk_data.after_dom_children = build_sese_conditions_after;
- walk_data.global_data = &data;
- walk_data.block_local_data_size = 0;
-
- init_walk_dominator_tree (&walk_data);
- walk_dominator_tree (&walk_data, SESE_ENTRY_BB (region));
- fini_walk_dominator_tree (&walk_data);
-
- VEC_free (gimple, heap, conditions);
- VEC_free (gimple, heap, cases);
-}
-
/* Add constraints on the possible values of parameter P from the type
of P. */
static void
-add_param_constraints (scop_p scop, ppl_Polyhedron_t context, graphite_dim_t p)
+add_param_constraints (scop_p scop, graphite_dim_t p)
{
- ppl_Constraint_t cstr;
- ppl_Linear_Expression_t le;
- tree parameter = VEC_index (tree, SESE_PARAMS (SCOP_REGION (scop)), p);
+ tree parameter = SESE_PARAMS (SCOP_REGION (scop))[p];
tree type = TREE_TYPE (parameter);
tree lb = NULL_TREE;
tree ub = NULL_TREE;
if (lb)
{
- ppl_new_Linear_Expression_with_dimension (&le, scop_nb_params (scop));
- ppl_set_coef (le, p, -1);
- ppl_set_inhomogeneous_tree (le, lb);
- ppl_new_Constraint (&cstr, le, PPL_CONSTRAINT_TYPE_LESS_OR_EQUAL);
- ppl_Polyhedron_add_constraint (context, cstr);
- ppl_delete_Linear_Expression (le);
- ppl_delete_Constraint (cstr);
+ isl_space *space = isl_set_get_space (scop->context);
+ isl_constraint *c;
+ mpz_t g;
+ isl_val *v;
+
+ c = isl_inequality_alloc (isl_local_space_from_space (space));
+ mpz_init (g);
+ tree_int_to_gmp (lb, g);
+ v = isl_val_int_from_gmp (the_isl_ctx, g);
+ v = isl_val_neg (v);
+ mpz_clear (g);
+ c = isl_constraint_set_constant_val (c, v);
+ c = isl_constraint_set_coefficient_si (c, isl_dim_param, p, 1);
+
+ scop->context = isl_set_add_constraint (scop->context, c);
}
if (ub)
{
- ppl_new_Linear_Expression_with_dimension (&le, scop_nb_params (scop));
- ppl_set_coef (le, p, -1);
- ppl_set_inhomogeneous_tree (le, ub);
- ppl_new_Constraint (&cstr, le, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
- ppl_Polyhedron_add_constraint (context, cstr);
- ppl_delete_Linear_Expression (le);
- ppl_delete_Constraint (cstr);
+ isl_space *space = isl_set_get_space (scop->context);
+ isl_constraint *c;
+ mpz_t g;
+ isl_val *v;
+
+ c = isl_inequality_alloc (isl_local_space_from_space (space));
+
+ mpz_init (g);
+ tree_int_to_gmp (ub, g);
+ v = isl_val_int_from_gmp (the_isl_ctx, g);
+ mpz_clear (g);
+ c = isl_constraint_set_constant_val (c, v);
+ c = isl_constraint_set_coefficient_si (c, isl_dim_param, p, -1);
+
+ scop->context = isl_set_add_constraint (scop->context, c);
}
}
static void
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);
-
for (p = 0; p < n; p++)
- add_param_constraints (scop, context, p);
-
- ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
- (&ps, context);
- ppl_Pointset_Powerset_C_Polyhedron_intersection_assign
- (SCOP_CONTEXT (scop), ps);
-
- ppl_delete_Pointset_Powerset_C_Polyhedron (ps);
- ppl_delete_Polyhedron (context);
+ add_param_constraints (scop, p);
}
/* Build the iteration domains: the loops belonging to the current
struct loop *loop;
sese region = SCOP_REGION (scop);
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);
+ int nb_loops = number_of_loops (cfun);
+ isl_set **doms = XCNEWVEC (isl_set *, nb_loops);
- for (i = 0; i < nb_loops; i++)
- domains[i] = NULL;
+ FOR_EACH_VEC_ELT (SESE_LOOP_NEST (region), i, loop)
+ if (!loop_in_sese_p (loop_outer (loop), region))
+ build_loop_iteration_domains (scop, loop, 0,
+ isl_set_copy (scop->context), doms);
- ppl_new_C_Polyhedron_from_space_dimension (&ph, scop_nb_params (scop), 0);
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
+ {
+ loop = pbb_loop (pbb);
- 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);
+ if (doms[loop->num])
+ pbb->domain = isl_set_copy (doms[loop->num]);
+ else
+ pbb->domain = isl_set_copy (scop->context);
- 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)
- domains[gbb_loop (PBB_BLACK_BOX (pbb))->num]);
- else
- ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
- (&PBB_DOMAIN (pbb), ph);
+ pbb->domain = isl_set_set_tuple_id (pbb->domain,
+ isl_id_for_pbb (scop, pbb));
+ }
for (i = 0; i < nb_loops; i++)
- if (domains[i])
- ppl_delete_Pointset_Powerset_C_Polyhedron (domains[i]);
+ if (doms[i])
+ isl_set_free (doms[i]);
- ppl_delete_Polyhedron (ph);
- free (domains);
+ free (doms);
}
/* Add a constrain to the ACCESSES polyhedron for the alias set of
ACCESSES polyhedron, DOM_NB_DIMS is the dimension of the iteration
domain. */
-static void
-pdr_add_alias_set (ppl_Polyhedron_t accesses, data_reference_p dr,
- ppl_dimension_type accessp_nb_dims,
- ppl_dimension_type dom_nb_dims)
+static isl_map *
+pdr_add_alias_set (isl_map *acc, data_reference_p dr)
{
- ppl_Linear_Expression_t alias;
- ppl_Constraint_t cstr;
+ isl_constraint *c;
int alias_set_num = 0;
base_alias_pair *bap = (base_alias_pair *)(dr->aux);
if (bap && bap->alias_set)
alias_set_num = *(bap->alias_set);
- ppl_new_Linear_Expression_with_dimension (&alias, accessp_nb_dims);
+ c = isl_equality_alloc
+ (isl_local_space_from_space (isl_map_get_space (acc)));
+ c = isl_constraint_set_constant_si (c, -alias_set_num);
+ c = isl_constraint_set_coefficient_si (c, isl_dim_out, 0, 1);
- ppl_set_coef (alias, dom_nb_dims, 1);
- ppl_set_inhomogeneous (alias, -alias_set_num);
- ppl_new_Constraint (&cstr, alias, PPL_CONSTRAINT_TYPE_EQUAL);
- ppl_Polyhedron_add_constraint (accesses, cstr);
+ return isl_map_add_constraint (acc, c);
+}
+
+/* Assign the affine expression INDEX to the output dimension POS of
+ MAP and return the result. */
- ppl_delete_Linear_Expression (alias);
- ppl_delete_Constraint (cstr);
+static isl_map *
+set_index (isl_map *map, int pos, isl_pw_aff *index)
+{
+ isl_map *index_map;
+ int len = isl_map_dim (map, isl_dim_out);
+ isl_id *id;
+
+ index_map = isl_map_from_pw_aff (index);
+ index_map = isl_map_insert_dims (index_map, isl_dim_out, 0, pos);
+ index_map = isl_map_add_dims (index_map, isl_dim_out, len - pos - 1);
+
+ id = isl_map_get_tuple_id (map, isl_dim_out);
+ index_map = isl_map_set_tuple_id (index_map, isl_dim_out, id);
+ id = isl_map_get_tuple_id (map, isl_dim_in);
+ index_map = isl_map_set_tuple_id (index_map, isl_dim_in, id);
+
+ return isl_map_intersect (map, index_map);
}
/* Add to ACCESSES polyhedron equalities defining the access functions
polyhedron, DOM_NB_DIMS is the dimension of the iteration domain.
PBB is the poly_bb_p that contains the data reference DR. */
-static void
-pdr_add_memory_accesses (ppl_Polyhedron_t accesses, data_reference_p dr,
- ppl_dimension_type accessp_nb_dims,
- ppl_dimension_type dom_nb_dims,
- poly_bb_p pbb)
+static isl_map *
+pdr_add_memory_accesses (isl_map *acc, data_reference_p dr, poly_bb_p pbb)
{
int i, nb_subscripts = DR_NUM_DIMENSIONS (dr);
- mpz_t v;
scop_p scop = PBB_SCOP (pbb);
- sese region = SCOP_REGION (scop);
-
- mpz_init (v);
for (i = 0; i < nb_subscripts; i++)
{
- ppl_Linear_Expression_t fn, access;
- ppl_Constraint_t cstr;
- ppl_dimension_type subscript = dom_nb_dims + 1 + i;
+ isl_pw_aff *aff;
tree afn = DR_ACCESS_FN (dr, nb_subscripts - 1 - i);
- ppl_new_Linear_Expression_with_dimension (&fn, dom_nb_dims);
- ppl_new_Linear_Expression_with_dimension (&access, accessp_nb_dims);
-
- mpz_set_si (v, 1);
- scan_tree_for_params (region, afn, fn, v);
- ppl_assign_Linear_Expression_from_Linear_Expression (access, fn);
-
- ppl_set_coef (access, subscript, -1);
- ppl_new_Constraint (&cstr, access, PPL_CONSTRAINT_TYPE_EQUAL);
- ppl_Polyhedron_add_constraint (accesses, cstr);
-
- ppl_delete_Linear_Expression (fn);
- ppl_delete_Linear_Expression (access);
- ppl_delete_Constraint (cstr);
+ aff = extract_affine (scop, afn,
+ isl_space_domain (isl_map_get_space (acc)));
+ acc = set_index (acc, i + 1, aff);
}
- mpz_clear (v);
+ return acc;
}
/* Add constrains representing the size of the accessed data to the
ACCESSES polyhedron, DOM_NB_DIMS is the dimension of the iteration
domain. */
-static void
-pdr_add_data_dimensions (ppl_Polyhedron_t accesses, data_reference_p dr,
- ppl_dimension_type accessp_nb_dims,
- ppl_dimension_type dom_nb_dims)
+static isl_set *
+pdr_add_data_dimensions (isl_set *extent, scop_p scop, data_reference_p dr)
{
tree ref = DR_REF (dr);
int i, nb_subscripts = DR_NUM_DIMENSIONS (dr);
for (i = nb_subscripts - 1; i >= 0; i--, ref = TREE_OPERAND (ref, 0))
{
- ppl_Linear_Expression_t expr;
- ppl_Constraint_t cstr;
- ppl_dimension_type subscript = dom_nb_dims + 1 + i;
tree low, high;
if (TREE_CODE (ref) != ARRAY_REF)
break;
low = array_ref_low_bound (ref);
-
- /* subscript - low >= 0 */
- if (host_integerp (low, 0))
- {
- ppl_new_Linear_Expression_with_dimension (&expr, accessp_nb_dims);
- ppl_set_coef (expr, subscript, 1);
-
- ppl_set_inhomogeneous (expr, -int_cst_value (low));
-
- ppl_new_Constraint (&cstr, expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
- ppl_Polyhedron_add_constraint (accesses, cstr);
- ppl_delete_Linear_Expression (expr);
- ppl_delete_Constraint (cstr);
- }
-
high = array_ref_up_bound (ref);
- /* high - subscript >= 0 */
- if (high && host_integerp (high, 0)
+ /* XXX The PPL code dealt separately with
+ subscript - low >= 0 and high - subscript >= 0 in case one of
+ the two bounds isn't known. Do the same here? */
+
+ if (tree_fits_shwi_p (low)
+ && high
+ && tree_fits_shwi_p (high)
/* 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);
-
- ppl_set_inhomogeneous (expr, int_cst_value (high));
-
- ppl_new_Constraint (&cstr, expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
- ppl_Polyhedron_add_constraint (accesses, cstr);
- ppl_delete_Linear_Expression (expr);
- ppl_delete_Constraint (cstr);
+ isl_id *id;
+ isl_aff *aff;
+ isl_set *univ, *lbs, *ubs;
+ isl_pw_aff *index;
+ isl_space *space;
+ isl_set *valid;
+ isl_pw_aff *lb = extract_affine_int (low, isl_set_get_space (extent));
+ isl_pw_aff *ub = extract_affine_int (high, isl_set_get_space (extent));
+
+ /* high >= 0 */
+ valid = isl_pw_aff_nonneg_set (isl_pw_aff_copy (ub));
+ valid = isl_set_project_out (valid, isl_dim_set, 0,
+ isl_set_dim (valid, isl_dim_set));
+ scop->context = isl_set_intersect (scop->context, valid);
+
+ space = isl_set_get_space (extent);
+ aff = isl_aff_zero_on_domain (isl_local_space_from_space (space));
+ aff = isl_aff_add_coefficient_si (aff, isl_dim_in, i + 1, 1);
+ univ = isl_set_universe (isl_space_domain (isl_aff_get_space (aff)));
+ index = isl_pw_aff_alloc (univ, aff);
+
+ id = isl_set_get_tuple_id (extent);
+ lb = isl_pw_aff_set_tuple_id (lb, isl_dim_in, isl_id_copy (id));
+ ub = isl_pw_aff_set_tuple_id (ub, isl_dim_in, id);
+
+ /* low <= sub_i <= high */
+ lbs = isl_pw_aff_ge_set (isl_pw_aff_copy (index), lb);
+ ubs = isl_pw_aff_le_set (index, ub);
+ extent = isl_set_intersect (extent, lbs);
+ extent = isl_set_intersect (extent, ubs);
}
}
+
+ return extent;
}
/* Build data accesses for DR in PBB. */
static void
build_poly_dr (data_reference_p dr, poly_bb_p pbb)
{
- ppl_Polyhedron_t accesses;
- ppl_Pointset_Powerset_C_Polyhedron_t accesses_ps;
- ppl_dimension_type dom_nb_dims;
- ppl_dimension_type accessp_nb_dims;
int dr_base_object_set;
+ isl_map *acc;
+ isl_set *extent;
+ scop_p scop = PBB_SCOP (pbb);
- ppl_Pointset_Powerset_C_Polyhedron_space_dimension (PBB_DOMAIN (pbb),
- &dom_nb_dims);
- accessp_nb_dims = dom_nb_dims + 1 + DR_NUM_DIMENSIONS (dr);
+ {
+ isl_space *dc = isl_set_get_space (pbb->domain);
+ int nb_out = 1 + DR_NUM_DIMENSIONS (dr);
+ isl_space *space = isl_space_add_dims (isl_space_from_domain (dc),
+ isl_dim_out, nb_out);
- ppl_new_C_Polyhedron_from_space_dimension (&accesses, accessp_nb_dims, 0);
+ acc = isl_map_universe (space);
+ acc = isl_map_set_tuple_id (acc, isl_dim_out, isl_id_for_dr (scop, dr));
+ }
- pdr_add_alias_set (accesses, dr, accessp_nb_dims, dom_nb_dims);
- pdr_add_memory_accesses (accesses, dr, accessp_nb_dims, dom_nb_dims, pbb);
- pdr_add_data_dimensions (accesses, dr, accessp_nb_dims, dom_nb_dims);
+ acc = pdr_add_alias_set (acc, dr);
+ acc = pdr_add_memory_accesses (acc, dr, pbb);
- ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron (&accesses_ps,
- accesses);
- ppl_delete_Polyhedron (accesses);
+ {
+ isl_id *id = isl_id_for_dr (scop, dr);
+ int nb = 1 + DR_NUM_DIMENSIONS (dr);
+ isl_space *space = isl_space_set_alloc (scop->ctx, 0, nb);
+ int alias_set_num = 0;
+ base_alias_pair *bap = (base_alias_pair *)(dr->aux);
+
+ if (bap && bap->alias_set)
+ alias_set_num = *(bap->alias_set);
+
+ space = isl_space_set_tuple_id (space, isl_dim_set, id);
+ extent = isl_set_nat_universe (space);
+ extent = isl_set_fix_si (extent, isl_dim_set, 0, alias_set_num);
+ extent = pdr_add_data_dimensions (extent, scop, dr);
+ }
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,
+ new_poly_dr (pbb, dr_base_object_set,
DR_IS_READ (dr) ? PDR_READ : PDR_WRITE,
- dr, DR_NUM_DIMENSIONS (dr));
+ dr, DR_NUM_DIMENSIONS (dr), acc, extent);
}
/* 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,
- VEC (data_reference_p, heap) *drs)
+ vec<data_reference_p> drs)
{
- int num_vertex = VEC_length (data_reference_p, drs);
+ int num_vertex = drs.length ();
int edge_num = 0;
data_reference_p dr1, dr2;
int i, j;
if (num_vertex == 0)
return true;
- 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))
+ FOR_EACH_VEC_ELT (drs, i, dr1)
+ for (j = i + 1; drs.iterate (j, &dr2); j++)
+ if (dr_may_alias_p (dr1, dr2, true))
edge_num++;
fprintf (file, "$\n");
fprintf (file, "p edge %d %d\n", num_vertex, edge_num);
- 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))
+ FOR_EACH_VEC_ELT (drs, i, dr1)
+ for (j = i + 1; drs.iterate (j, &dr2); j++)
+ if (dr_may_alias_p (dr1, dr2, true))
fprintf (file, "e %d %d\n", i + 1, j + 1);
return true;
static inline bool
write_alias_graph_to_ascii_dot (FILE *file, char *comment,
- VEC (data_reference_p, heap) *drs)
+ vec<data_reference_p> drs)
{
- int num_vertex = VEC_length (data_reference_p, drs);
+ int num_vertex = drs.length ();
data_reference_p dr1, dr2;
int i, j;
fprintf (file, "c %s\n", comment);
/* First print all the vertices. */
- FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr1)
+ FOR_EACH_VEC_ELT (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 (dr_may_alias_p (dr1, dr2))
+ FOR_EACH_VEC_ELT (drs, i, dr1)
+ for (j = i + 1; drs.iterate (j, &dr2); j++)
+ if (dr_may_alias_p (dr1, dr2, true))
fprintf (file, "n%d n%d\n", i, j);
return true;
static inline bool
write_alias_graph_to_ascii_ecc (FILE *file, char *comment,
- VEC (data_reference_p, heap) *drs)
+ vec<data_reference_p> drs)
{
- int num_vertex = VEC_length (data_reference_p, drs);
+ int num_vertex = drs.length ();
data_reference_p dr1, dr2;
int i, j;
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))
+ FOR_EACH_VEC_ELT (drs, i, dr1)
+ for (j = i + 1; drs.iterate (j, &dr2); j++)
+ if (dr_may_alias_p (dr1, dr2, true))
fprintf (file, "%d %d\n", i, j);
return true;
true (1) if the above test is true, and false (0) otherwise. */
static int
-build_alias_set_optimal_p (VEC (data_reference_p, heap) *drs)
+build_alias_set_optimal_p (vec<data_reference_p> drs)
{
- int num_vertices = VEC_length (data_reference_p, drs);
+ int num_vertices = drs.length ();
struct graph *g = new_graph (num_vertices);
data_reference_p dr1, dr2;
int i, j;
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))
+ FOR_EACH_VEC_ELT (drs, i, dr1)
+ for (j = i+1; drs.iterate (j, &dr2); j++)
+ if (dr_may_alias_p (dr1, dr2, true))
{
add_edge (g, i, j);
add_edge (g, j, i);
NULL, true, NULL);
for (i = 0; i < g->n_vertices; i++)
{
- data_reference_p dr = VEC_index (data_reference_p, drs, i);
+ data_reference_p dr = drs[i];
base_alias_pair *bap;
gcc_assert (dr->aux);
/* 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)
+build_base_obj_set_for_drs (vec<data_reference_p> drs)
{
- int num_vertex = VEC_length (data_reference_p, drs);
+ int num_vertex = drs.length ();
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++)
+ FOR_EACH_VEC_ELT (drs, i, dr1)
+ for (j = i + 1; drs.iterate (j, &dr2); j++)
if (dr_same_base_object_p (dr1, dr2))
{
add_edge (g, i, j);
for (i = 0; i < g->n_vertices; i++)
{
- data_reference_p dr = VEC_index (data_reference_p, drs, i);
+ data_reference_p dr = drs[i];
base_alias_pair *bap;
gcc_assert (dr->aux);
{
int j;
data_reference_p dr;
- VEC (data_reference_p, heap) *gbb_drs = GBB_DATA_REFS (PBB_BLACK_BOX (pbb));
+ vec<data_reference_p> gbb_drs = GBB_DATA_REFS (PBB_BLACK_BOX (pbb));
- FOR_EACH_VEC_ELT (data_reference_p, gbb_drs, j, dr)
+ FOR_EACH_VEC_ELT (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)
+dump_alias_graphs (vec<data_reference_p> drs)
{
char comment[100];
FILE *file_dimacs, *file_ecc, *file_dot;
int i, j;
poly_bb_p pbb;
data_reference_p dr;
- VEC (data_reference_p, heap) *drs = VEC_alloc (data_reference_p, heap, 3);
+ auto_vec<data_reference_p, 3> drs;
/* 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))))
+ for (i = 0; SCOP_BBS (scop).iterate (i, &pbb); i++)
+ if (GBB_DATA_REFS (PBB_BLACK_BOX (pbb)).is_empty ())
{
- VEC_ordered_remove (poly_bb_p, SCOP_BBS (scop), i);
+ free_gimple_bb (PBB_BLACK_BOX (pbb));
+ free_poly_bb (pbb);
+ SCOP_BBS (scop).ordered_remove (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_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
+ for (j = 0; GBB_DATA_REFS (PBB_BLACK_BOX (pbb)).iterate (j, &dr); j++)
+ drs.safe_push (dr);
- FOR_EACH_VEC_ELT (data_reference_p, drs, i, dr)
+ FOR_EACH_VEC_ELT (drs, i, dr)
dr->aux = XNEW (base_alias_pair);
if (!build_alias_set_optimal_p (drs))
if (0)
dump_alias_graphs (drs);
- VEC_free (data_reference_p, heap, drs);
+ drs.release ();
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
build_pbb_drs (pbb);
}
/* Return a gsi at the position of the phi node STMT. */
-static gimple_stmt_iterator
-gsi_for_phi_node (gimple stmt)
+static gphi_iterator
+gsi_for_phi_node (gphi *stmt)
{
- gimple_stmt_iterator psi;
+ gphi_iterator psi;
basic_block bb = gimple_bb (stmt);
for (psi = gsi_start_phis (bb); !gsi_end_p (psi); gsi_next (&psi))
- if (stmt == gsi_stmt (psi))
+ if (stmt == psi.phi ())
return psi;
gcc_unreachable ();
GBB_DATA_REFS vector of BB. */
static void
-analyze_drs_in_stmts (scop_p scop, basic_block bb, VEC (gimple, heap) *stmts)
+analyze_drs_in_stmts (scop_p scop, basic_block bb, vec<gimple> stmts)
{
loop_p nest;
gimple_bb_p gbb;
gimple stmt;
int i;
+ sese region = SCOP_REGION (scop);
- if (!bb_in_sese_p (bb, SCOP_REGION (scop)))
+ if (!bb_in_sese_p (bb, region))
return;
- nest = outermost_loop_in_sese (SCOP_REGION (scop), bb);
+ nest = outermost_loop_in_sese_1 (region, 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,
+ FOR_EACH_VEC_ELT (stmts, i, stmt)
+ {
+ loop_p loop;
+
+ if (is_gimple_debug (stmt))
+ continue;
+
+ loop = loop_containing_stmt (stmt);
+ if (!loop_in_sese_p (loop, region))
+ loop = nest;
+
+ graphite_find_data_references_in_stmt (nest, loop, stmt,
&GBB_DATA_REFS (gbb));
+ }
}
/* Insert STMT at the end of the STMTS sequence and then insert the
gimple_stmt_iterator insert_gsi)
{
gimple_stmt_iterator gsi;
- VEC (gimple, heap) *x = VEC_alloc (gimple, heap, 3);
-
- if (!stmts)
- stmts = gimple_seq_alloc ();
+ auto_vec<gimple, 3> x;
- gsi = gsi_last (stmts);
- gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
+ gimple_seq_add_stmt (&stmts, stmt);
for (gsi = gsi_start (stmts); !gsi_end_p (gsi); gsi_next (&gsi))
- VEC_safe_push (gimple, heap, x, gsi_stmt (gsi));
+ x.safe_push (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. */
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);
+ gassign *stmt = gimple_build_assign (unshare_expr (res), var);
+ auto_vec<gimple, 3> x;
- if (!stmts)
- stmts = gimple_seq_alloc ();
- si = gsi_last (stmts);
- gsi_insert_after (&si, stmt, GSI_NEW_STMT);
+ gimple_seq_add_stmt (&stmts, stmt);
for (gsi = gsi_start (stmts); !gsi_end_p (gsi); gsi_next (&gsi))
- VEC_safe_push (gimple, heap, x, gsi_stmt (gsi));
+ x.safe_push (gsi_stmt (gsi));
if (gimple_code (after_stmt) == GIMPLE_PHI)
{
}
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);
+ vec<data_reference_p> drs;
+ drs.create (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));
+ int index, n = SCOP_BBS (scop).length ();
/* The INDEX of PBB in SCOP_BBS. */
for (index = 0; index < n; index++)
- if (VEC_index (poly_bb_p, SCOP_BBS (scop), index) == pbb)
+ if (SCOP_BBS (scop)[index] == pbb)
break;
+ pbb1->domain = isl_set_copy (pbb->domain);
+ pbb1->domain = isl_set_set_tuple_id (pbb1->domain,
+ isl_id_for_pbb (scop, pbb1));
+
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);
+ GBB_CONDITIONS (gbb1) = GBB_CONDITIONS (gbb).copy ();
+ GBB_CONDITION_CASES (gbb1) = GBB_CONDITION_CASES (gbb).copy ();
+ SCOP_BBS (scop).safe_insert (index + 1, pbb1);
}
/* Insert on edge E the assignment "RES := EXPR". */
insert_out_of_ssa_copy_on_edge (scop_p scop, edge e, tree res, tree expr)
{
gimple_stmt_iterator gsi;
- gimple_seq stmts;
+ gimple_seq stmts = NULL;
tree var = force_gimple_operand (expr, &stmts, true, NULL_TREE);
- gimple stmt = gimple_build_assign (res, var);
+ gimple stmt = gimple_build_assign (unshare_expr (res), var);
basic_block bb;
- VEC (gimple, heap) *x = VEC_alloc (gimple, heap, 3);
-
- if (!stmts)
- stmts = gimple_seq_alloc ();
+ auto_vec<gimple, 3> x;
- gsi = gsi_last (stmts);
- gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
+ gimple_seq_add_stmt (&stmts, stmt);
for (gsi = gsi_start (stmts); !gsi_end_p (gsi); gsi_next (&gsi))
- VEC_safe_push (gimple, heap, x, gsi_stmt (gsi));
+ x.safe_push (gsi_stmt (gsi));
gsi_insert_seq_on_edge (e, stmts);
gsi_commit_edge_inserts ();
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. */
tree array_type = build_array_type (elt_type, index_type);
tree base = create_tmp_var (array_type, base_name);
- add_referenced_var (base);
-
return build4 (ARRAY_REF, elt_type, base, integer_zero_node, NULL_TREE,
NULL_TREE);
}
scalar_close_phi_node_p (gimple phi)
{
if (gimple_code (phi) != GIMPLE_PHI
- || !is_gimple_reg (gimple_phi_result (phi)))
+ || virtual_operand_p (gimple_phi_result (phi)))
return false;
/* Note that loop close phi nodes should have a single argument
sese region = SCOP_REGION (scop);
gimple phi = gsi_stmt (*psi);
tree res = gimple_phi_result (phi);
- tree var = SSA_NAME_VAR (res);
basic_block bb = gimple_bb (phi);
gimple_stmt_iterator gsi = gsi_after_labels (bb);
tree arg = gimple_phi_arg_def (phi, 0);
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;
}
}
else
{
- tree zero_dim_array = create_zero_dim_array (var, "Close_Phi");
+ tree zero_dim_array = create_zero_dim_array (res, "Close_Phi");
- stmt = gimple_build_assign (res, zero_dim_array);
+ stmt = gimple_build_assign (res, unshare_expr (zero_dim_array));
if (TREE_CODE (arg) == SSA_NAME)
insert_out_of_ssa_copy (scop, zero_dim_array, arg,
dimension array for it. */
static void
-rewrite_phi_out_of_ssa (scop_p scop, gimple_stmt_iterator *psi)
+rewrite_phi_out_of_ssa (scop_p scop, gphi_iterator *psi)
{
size_t i;
- gimple phi = gsi_stmt (*psi);
+ gphi *phi = psi->phi ();
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, "phi_out_of_ssa");
+ tree zero_dim_array = create_zero_dim_array (res, "phi_out_of_ssa");
gimple stmt;
- gimple_seq stmts;
for (i = 0; i < gimple_phi_num_args (phi); i++)
{
/* Avoid the insertion of code in the loop latch to please the
pattern matching of the vectorizer. */
if (TREE_CODE (arg) == SSA_NAME
+ && !SSA_NAME_IS_DEFAULT_DEF (arg)
&& e->src == bb->loop_father->latch)
insert_out_of_ssa_copy (scop, zero_dim_array, arg,
SSA_NAME_DEF_STMT (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);
-
- stmt = gimple_build_assign (res, var);
+ stmt = gimple_build_assign (res, unshare_expr (zero_dim_array));
remove_phi_node (psi, false);
- SSA_NAME_DEF_STMT (res) = stmt;
-
- insert_stmts (scop, stmt, stmts, gsi_after_labels (bb));
+ insert_stmts (scop, stmt, NULL, gsi_after_labels (bb));
}
/* Rewrite the degenerate phi node at position PSI from the degenerate
form "x = phi (y, y, ..., y)" to "x = y". */
static void
-rewrite_degenerate_phi (gimple_stmt_iterator *psi)
+rewrite_degenerate_phi (gphi_iterator *psi)
{
tree rhs;
gimple stmt;
gimple_stmt_iterator gsi;
- gimple phi = gsi_stmt (*psi);
+ gphi *phi = psi->phi ();
tree res = gimple_phi_result (phi);
basic_block bb;
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_reductions_out_of_ssa (scop_p scop)
{
basic_block bb;
- gimple_stmt_iterator psi;
+ gphi_iterator psi;
sese region = SCOP_REGION (scop);
- FOR_EACH_BB (bb)
+ FOR_EACH_BB_FN (bb, cfun)
if (bb_in_sese_p (bb, region))
for (psi = gsi_start_phis (bb); !gsi_end_p (psi);)
{
- gimple phi = gsi_stmt (psi);
+ gphi *phi = psi.phi ();
- if (!is_gimple_reg (gimple_phi_result (phi)))
+ if (virtual_operand_p (gimple_phi_result (phi)))
{
gsi_next (&psi);
continue;
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);
+ gimple name_stmt;
+ tree name;
ssa_op_iter iter;
use_operand_p use_p;
gcc_assert (gimple_code (use_stmt) != GIMPLE_PHI);
+ name = copy_ssa_name (def);
+ name_stmt = gimple_build_assign (name, zero_dim_array);
+
gimple_assign_set_lhs (name_stmt, name);
insert_stmts (scop, name_stmt, NULL, gsi_for_stmt (use_stmt));
static void
handle_scalar_deps_crossing_scop_limits (scop_p scop, tree def, gimple stmt)
{
- tree var = create_tmp_reg (TREE_TYPE (def), NULL);
+ tree var = create_tmp_reg (TREE_TYPE (def));
tree new_name = make_ssa_name (var, stmt);
bool needs_copy = false;
use_operand_p use_p;
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);
}
if (gimple_code (use_stmt) == GIMPLE_PHI
&& (res = true))
{
- gimple_stmt_iterator psi = gsi_for_stmt (use_stmt);
+ gphi_iterator psi = gsi_start_phis (gimple_bb (use_stmt));
if (scalar_close_phi_node_p (gsi_stmt (psi)))
rewrite_close_phi_out_of_ssa (scop, &psi);
if (!zero_dim_array)
{
zero_dim_array = create_zero_dim_array
- (SSA_NAME_VAR (def), "Cross_BB_scalar_dependence");
+ (def, "Cross_BB_scalar_dependence");
insert_out_of_ssa_copy (scop, zero_dim_array, def,
SSA_NAME_DEF_STMT (def));
gsi_next (gsi);
}
- rewrite_cross_bb_scalar_dependence (scop, zero_dim_array,
+ rewrite_cross_bb_scalar_dependence (scop, unshare_expr (zero_dim_array),
def, use_stmt);
}
/* Create an extra empty BB after the scop. */
split_edge (SESE_EXIT (region));
- FOR_EACH_BB (bb)
+ FOR_EACH_BB_FN (bb, cfun)
if (bb_in_sese_p (bb, region))
for (psi = gsi_start_bb (bb); !gsi_end_p (psi); gsi_next (&psi))
changed |= rewrite_cross_bb_scalar_deps (scop, &psi);
poly_bb_p pbb;
int res = 0;
- FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
+ FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb)
if (loop_in_sese_p (gbb_loop (PBB_BLACK_BOX (pbb)), SCOP_REGION (scop)))
res++;
/* 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)
+ if (nb_data_writes_in_bb (bb) == 0
+ /* Or if we have already marked BB as a reduction. */
+ || PBB_IS_REDUCTION (pbb_from_bb (bb)))
return bb;
e1 = split_pbb (scop, pbb, bb, stmt);
/* 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)
+ FOR_EACH_VEC_ELT (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);
+ GBB_DATA_REFS (gbb1).safe_push (dr);
+ GBB_DATA_REFS (gbb).ordered_remove (i);
i--;
}
}
/* Returns true when PHI contains an argument ARG. */
static bool
-phi_contains_arg (gimple phi, tree arg)
+phi_contains_arg (gphi *phi, tree arg)
{
size_t i;
/* Return a loop phi node that corresponds to a reduction containing LHS. */
-static gimple
+static gphi *
follow_ssa_with_commutative_ops (tree arg, tree lhs)
{
gimple stmt;
|| gimple_code (stmt) == GIMPLE_CALL)
return NULL;
- if (gimple_code (stmt) == GIMPLE_PHI)
+ if (gphi *phi = dyn_cast <gphi *> (stmt))
{
- if (phi_contains_arg (stmt, lhs))
- return stmt;
+ if (phi_contains_arg (phi, lhs))
+ return phi;
return NULL;
}
if (is_reduction_operation_p (stmt))
{
- gimple res = follow_ssa_with_commutative_ops (gimple_assign_rhs1 (stmt), lhs);
+ gphi *res
+ = follow_ssa_with_commutative_ops (gimple_assign_rhs1 (stmt), lhs);
return res ? res :
follow_ssa_with_commutative_ops (gimple_assign_rhs2 (stmt), lhs);
/* Detect commutative and associative scalar reductions starting at
the STMT. Return the phi node of the reduction cycle, or NULL. */
-static gimple
+static gphi *
detect_commutative_reduction_arg (tree lhs, gimple stmt, tree arg,
- VEC (gimple, heap) **in,
- VEC (gimple, heap) **out)
+ vec<gimple> *in,
+ vec<gimple> *out)
{
- gimple phi = follow_ssa_with_commutative_ops (arg, lhs);
+ gphi *phi = follow_ssa_with_commutative_ops (arg, lhs);
if (!phi)
return NULL;
- VEC_safe_push (gimple, heap, *in, stmt);
- VEC_safe_push (gimple, heap, *out, stmt);
+ in->safe_push (stmt);
+ out->safe_push (stmt);
return phi;
}
/* Detect commutative and associative scalar reductions starting at
STMT. Return the phi node of the reduction cycle, or NULL. */
-static gimple
-detect_commutative_reduction_assign (gimple stmt, VEC (gimple, heap) **in,
- VEC (gimple, heap) **out)
+static gphi *
+detect_commutative_reduction_assign (gimple stmt, vec<gimple> *in,
+ vec<gimple> *out)
{
tree lhs = gimple_assign_lhs (stmt);
if (is_reduction_operation_p (stmt))
{
- gimple res = detect_commutative_reduction_arg (lhs, stmt,
- gimple_assign_rhs1 (stmt),
- in, out);
+ gphi *res = detect_commutative_reduction_arg (lhs, stmt,
+ gimple_assign_rhs1 (stmt),
+ in, out);
return res ? res
: detect_commutative_reduction_arg (lhs, stmt,
gimple_assign_rhs2 (stmt),
/* Return a loop phi node that corresponds to a reduction containing LHS. */
-static gimple
+static gphi *
follow_inital_value_to_phi (tree arg, tree lhs)
{
gimple stmt;
stmt = SSA_NAME_DEF_STMT (arg);
- if (gimple_code (stmt) == GIMPLE_PHI
- && phi_contains_arg (stmt, lhs))
- return stmt;
+ if (gphi *phi = dyn_cast <gphi *> (stmt))
+ if (phi_contains_arg (phi, lhs))
+ return phi;
return NULL;
}
-/* Return the argument of the loop PHI that is the inital value coming
+/* Return the argument of the loop PHI that is the initial value coming
from outside the loop. */
static edge
-edge_initial_value_for_loop_phi (gimple phi)
+edge_initial_value_for_loop_phi (gphi *phi)
{
size_t i;
return NULL;
}
-/* Return the argument of the loop PHI that is the inital value coming
+/* Return the argument of the loop PHI that is the initial value coming
from outside the loop. */
static tree
-initial_value_for_loop_phi (gimple phi)
+initial_value_for_loop_phi (gphi *phi)
{
size_t i;
return NULL_TREE;
}
-/* Detect commutative and associative scalar reductions starting at
- the loop closed phi node STMT. Return the phi node of the
- reduction cycle, or NULL. */
+/* Returns true when DEF is used outside the reduction cycle of
+ LOOP_PHI. */
+
+static bool
+used_outside_reduction (tree def, gimple loop_phi)
+{
+ use_operand_p use_p;
+ imm_use_iterator imm_iter;
+ loop_p loop = loop_containing_stmt (loop_phi);
+
+ /* In LOOP, DEF should be used only in LOOP_PHI. */
+ FOR_EACH_IMM_USE_FAST (use_p, imm_iter, def)
+ {
+ gimple stmt = USE_STMT (use_p);
+
+ if (stmt != loop_phi
+ && !is_gimple_debug (stmt)
+ && flow_bb_inside_loop_p (loop, gimple_bb (stmt)))
+ return true;
+ }
+
+ return false;
+}
-static gimple
-detect_commutative_reduction (gimple stmt, VEC (gimple, heap) **in,
- VEC (gimple, heap) **out)
+/* Detect commutative and associative scalar reductions belonging to
+ the SCOP starting at the loop closed phi node STMT. Return the phi
+ node of the reduction cycle, or NULL. */
+
+static gphi *
+detect_commutative_reduction (scop_p scop, gimple stmt, vec<gimple> *in,
+ vec<gimple> *out)
{
if (scalar_close_phi_node_p (stmt))
{
- tree arg = gimple_phi_arg_def (stmt, 0);
- gimple def, loop_phi;
+ gimple def;
+ gphi *loop_phi, *phi, *close_phi = as_a <gphi *> (stmt);
+ tree init, lhs, arg = gimple_phi_arg_def (close_phi, 0);
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);
+ gcc_assert (gimple_phi_num_args (close_phi) == 1);
def = SSA_NAME_DEF_STMT (arg);
- loop_phi = detect_commutative_reduction (def, in, out);
+ if (!stmt_in_sese_p (def, SCOP_REGION (scop))
+ || !(loop_phi = detect_commutative_reduction (scop, def, in, out)))
+ return NULL;
- if (loop_phi)
- {
- tree lhs = gimple_phi_result (stmt);
- tree init = initial_value_for_loop_phi (loop_phi);
- gimple phi = follow_inital_value_to_phi (init, lhs);
+ lhs = gimple_phi_result (close_phi);
+ init = initial_value_for_loop_phi (loop_phi);
+ phi = follow_inital_value_to_phi (init, lhs);
- VEC_safe_push (gimple, heap, *in, loop_phi);
- VEC_safe_push (gimple, heap, *out, stmt);
- return phi;
- }
- else
+ if (phi && (used_outside_reduction (lhs, phi)
+ || !has_single_use (gimple_phi_result (phi))))
return NULL;
+
+ in->safe_push (loop_phi);
+ out->safe_push (close_phi);
+ return phi;
}
if (gimple_code (stmt) == GIMPLE_ASSIGN)
static void
translate_scalar_reduction_to_array_for_stmt (scop_p scop, tree red,
- gimple stmt, gimple loop_phi)
+ gimple stmt, gphi *loop_phi)
{
tree res = gimple_phi_result (loop_phi);
- gimple assign = gimple_build_assign (res, red);
+ gassign *assign = gimple_build_assign (res, unshare_expr (red));
gimple_stmt_iterator gsi;
insert_stmts (scop, assign, NULL, gsi_after_labels (gimple_bb (loop_phi)));
- assign = gimple_build_assign (red, gimple_assign_lhs (stmt));
+ assign = gimple_build_assign (unshare_expr (red), gimple_assign_lhs (stmt));
gsi = gsi_for_stmt (stmt);
gsi_next (&gsi);
insert_stmts (scop, assign, NULL, gsi);
the PHI_RESULT. */
static void
-remove_phi (gimple phi)
+remove_phi (gphi *phi)
{
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);
+ auto_vec<gimple, 3> update;
unsigned int i;
gimple stmt;
if (is_gimple_debug (stmt))
{
gimple_debug_bind_reset_value (stmt);
- VEC_safe_push (gimple, heap, update, stmt);
+ update.safe_push (stmt);
}
}
- FOR_EACH_VEC_ELT (gimple, update, i, stmt)
+ FOR_EACH_VEC_ELT (update, i, stmt)
update_stmt (stmt);
- VEC_free (gimple, heap, update);
-
gsi = gsi_for_phi_node (phi);
remove_phi_node (&gsi, false);
}
+/* Helper function for for_each_index. For each INDEX of the data
+ reference REF, returns true when its indices are valid in the loop
+ nest LOOP passed in as DATA. */
+
+static bool
+dr_indices_valid_in_loop (tree ref ATTRIBUTE_UNUSED, tree *index, void *data)
+{
+ loop_p loop;
+ basic_block header, def_bb;
+ gimple stmt;
+
+ if (TREE_CODE (*index) != SSA_NAME)
+ return true;
+
+ loop = *((loop_p *) data);
+ header = loop->header;
+ stmt = SSA_NAME_DEF_STMT (*index);
+
+ if (!stmt)
+ return true;
+
+ def_bb = gimple_bb (stmt);
+
+ if (!def_bb)
+ return true;
+
+ return dominated_by_p (CDI_DOMINATORS, header, def_bb);
+}
+
+/* When the result of a CLOSE_PHI is written to a memory location,
+ return a pointer to that memory reference, otherwise return
+ NULL_TREE. */
+
+static tree
+close_phi_written_to_memory (gphi *close_phi)
+{
+ imm_use_iterator imm_iter;
+ use_operand_p use_p;
+ gimple stmt;
+ tree res, def = gimple_phi_result (close_phi);
+
+ FOR_EACH_IMM_USE_FAST (use_p, imm_iter, def)
+ if ((stmt = USE_STMT (use_p))
+ && gimple_code (stmt) == GIMPLE_ASSIGN
+ && (res = gimple_assign_lhs (stmt)))
+ {
+ switch (TREE_CODE (res))
+ {
+ case VAR_DECL:
+ case PARM_DECL:
+ case RESULT_DECL:
+ return res;
+
+ case ARRAY_REF:
+ case MEM_REF:
+ {
+ tree arg = gimple_phi_arg_def (close_phi, 0);
+ loop_p nest = loop_containing_stmt (SSA_NAME_DEF_STMT (arg));
+
+ /* FIXME: this restriction is for id-{24,25}.f and
+ could be handled by duplicating the computation of
+ array indices before the loop of the close_phi. */
+ if (for_each_index (&res, dr_indices_valid_in_loop, &nest))
+ return res;
+ }
+ /* Fallthru. */
+
+ default:
+ continue;
+ }
+ }
+ return NULL_TREE;
+}
+
/* Rewrite out of SSA the reduction described by the loop phi nodes
IN, and the close phi nodes OUT. IN and OUT are structured by loop
levels like this:
static void
translate_scalar_reduction_to_array (scop_p scop,
- VEC (gimple, heap) *in,
- VEC (gimple, heap) *out)
+ vec<gimple> in,
+ vec<gimple> out)
{
- unsigned int i;
- gimple loop_phi;
- tree red = NULL_TREE;
+ gimple loop_stmt;
+ unsigned int i = out.length () - 1;
+ tree red = close_phi_written_to_memory (as_a <gphi *> (out[i]));
- FOR_EACH_VEC_ELT (gimple, in, i, loop_phi)
+ FOR_EACH_VEC_ELT (in, i, loop_stmt)
{
- gimple close_phi = VEC_index (gimple, out, i);
+ gimple close_stmt = out[i];
if (i == 0)
{
- gimple stmt = loop_phi;
- basic_block bb = split_reduction_stmt (scop, stmt);
+ basic_block bb = split_reduction_stmt (scop, loop_stmt);
poly_bb_p pbb = pbb_from_bb (bb);
PBB_IS_REDUCTION (pbb) = true;
- gcc_assert (close_phi == loop_phi);
+ gcc_assert (close_stmt == loop_stmt);
+
+ if (!red)
+ red = create_zero_dim_array
+ (gimple_assign_lhs (loop_stmt), "Commutative_Associative_Reduction");
- red = create_zero_dim_array
- (gimple_assign_lhs (stmt), "Commutative_Associative_Reduction");
- translate_scalar_reduction_to_array_for_stmt
- (scop, red, stmt, VEC_index (gimple, in, 1));
+ translate_scalar_reduction_to_array_for_stmt (scop, red, loop_stmt,
+ as_a <gphi *> (in[1]));
continue;
}
- if (i == VEC_length (gimple, in) - 1)
+ gphi *loop_phi = as_a <gphi *> (loop_stmt);
+ gphi *close_phi = as_a <gphi *> (close_stmt);
+
+ if (i == in.length () - 1)
{
- insert_out_of_ssa_copy (scop, gimple_phi_result (close_phi), red,
- close_phi);
+ insert_out_of_ssa_copy (scop, gimple_phi_result (close_phi),
+ unshare_expr (red), close_phi);
insert_out_of_ssa_copy_on_edge
(scop, edge_initial_value_for_loop_phi (loop_phi),
- red, initial_value_for_loop_phi (loop_phi));
+ unshare_expr (red), initial_value_for_loop_phi (loop_phi));
}
remove_phi (loop_phi);
static bool
rewrite_commutative_reductions_out_of_ssa_close_phi (scop_p scop,
- gimple close_phi)
+ gphi *close_phi)
{
bool res;
- VEC (gimple, heap) *in = VEC_alloc (gimple, heap, 10);
- VEC (gimple, heap) *out = VEC_alloc (gimple, heap, 10);
+ auto_vec<gimple, 10> in;
+ auto_vec<gimple, 10> out;
- detect_commutative_reduction (close_phi, &in, &out);
- res = VEC_length (gimple, in) > 0;
+ detect_commutative_reduction (scop, close_phi, &in, &out);
+ res = in.length () > 1;
if (res)
translate_scalar_reduction_to_array (scop, in, out);
- VEC_free (gimple, heap, in);
- VEC_free (gimple, heap, out);
return res;
}
rewrite_commutative_reductions_out_of_ssa_loop (scop_p scop,
loop_p loop)
{
- gimple_stmt_iterator gsi;
+ gphi_iterator gsi;
edge exit = single_exit (loop);
tree res;
bool changed = false;
return false;
for (gsi = gsi_start_phis (exit->dest); !gsi_end_p (gsi); gsi_next (&gsi))
- if ((res = gimple_phi_result (gsi_stmt (gsi)))
- && is_gimple_reg (res)
+ if ((res = gimple_phi_result (gsi.phi ()))
+ && !virtual_operand_p (res)
&& !scev_analyzable_p (res, SCOP_REGION (scop)))
changed |= rewrite_commutative_reductions_out_of_ssa_close_phi
- (scop, gsi_stmt (gsi));
+ (scop, gsi.phi ());
return changed;
}
static void
rewrite_commutative_reductions_out_of_ssa (scop_p scop)
{
- loop_iterator li;
loop_p loop;
bool changed = false;
sese region = SCOP_REGION (scop);
- FOR_EACH_LOOP (li, loop, 0)
+ FOR_EACH_LOOP (loop, 0)
if (loop_in_sese_p (loop, region))
changed |= rewrite_commutative_reductions_out_of_ssa_loop (scop, loop);
}
}
-/* 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;
+ gphi_iterator psi;
+ bool result = true;
- FOR_EACH_LOOP (li, loop, 0)
+ FOR_EACH_LOOP (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);
+ gphi *phi = psi.phi ();
tree res = PHI_RESULT (phi);
tree type = TREE_TYPE (res);
if (TYPE_UNSIGNED (type)
- && TYPE_PRECISION (type) >= TYPE_PRECISION (my_long_long))
- return false;
+ && TYPE_PRECISION (type) >= TYPE_PRECISION (long_long_integer_type_node))
+ {
+ result = false;
+ break;
+ }
}
+ if (!result)
+ break;
}
- return true;
+ return result;
}
-#undef my_long_long
-
/* Builds the polyhedral representation for a SESE region. */
void
if (!scop_ivs_can_be_represented (scop))
return;
+ if (flag_associative_math)
+ rewrite_commutative_reductions_out_of_ssa (scop);
+
build_sese_loop_nests (region);
- build_sese_conditions (region);
+ /* Record all conditions in REGION. */
+ sese_dom_walker (CDI_DOMINATORS, region).walk (cfun->cfg->x_entry_block_ptr);
find_scop_parameters (scop);
max_dim = PARAM_VALUE (PARAM_GRAPHITE_MAX_NB_SCOP_PARAMS);
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);