{
unsigned int i;
struct data_reference *dr;
- for (i = 0; VEC_iterate (data_reference_p, datarefs, i, dr); i++)
- if (dr->aux != NULL)
+
+ for (i = 0; VEC_iterate (data_reference_p, datarefs, i, dr); i++)
+ if (dr->aux)
{
base_alias_pair *bap = (base_alias_pair *)(dr->aux);
- if (bap->alias_set != NULL)
+
+ if (bap->alias_set)
free (bap->alias_set);
+
free (bap);
dr->aux = NULL;
}
static void
build_loop_iteration_domains (scop_p scop, struct loop *loop,
- ppl_Polyhedron_t outer_ph, int nb)
+ ppl_Polyhedron_t outer_ph, int nb,
+ ppl_Pointset_Powerset_C_Polyhedron_t *domains)
{
int i;
ppl_Polyhedron_t ph;
gcc_unreachable ();
if (loop->inner && loop_in_sese_p (loop->inner, region))
- build_loop_iteration_domains (scop, loop->inner, ph, nb + 1);
+ build_loop_iteration_domains (scop, loop->inner, ph, nb + 1, domains);
if (nb != 0
&& loop->next
&& loop_in_sese_p (loop->next, region))
- build_loop_iteration_domains (scop, loop->next, outer_ph, nb);
+ build_loop_iteration_domains (scop, loop->next, outer_ph, nb, domains);
ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
- ((ppl_Pointset_Powerset_C_Polyhedron_t *) &loop->aux, ph);
+ (&domains[loop->num], ph);
ppl_delete_Polyhedron (ph);
}
int i;
ppl_Polyhedron_t ph;
poly_bb_p pbb;
+ int nb_loops = number_of_loops ();
+ ppl_Pointset_Powerset_C_Polyhedron_t *domains
+ = XNEWVEC (ppl_Pointset_Powerset_C_Polyhedron_t, nb_loops);
+
+ for (i = 0; i < nb_loops; i++)
+ domains[i] = NULL;
ppl_new_C_Polyhedron_from_space_dimension (&ph, scop_nb_params (scop), 0);
for (i = 0; VEC_iterate (loop_p, SESE_LOOP_NEST (region), i, loop); i++)
if (!loop_in_sese_p (loop_outer (loop), region))
- build_loop_iteration_domains (scop, loop, ph, 0);
+ build_loop_iteration_domains (scop, loop, ph, 0, domains);
for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
- if (gbb_loop (PBB_BLACK_BOX (pbb))->aux)
+ if (domains[gbb_loop (PBB_BLACK_BOX (pbb))->num])
ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
(&PBB_DOMAIN (pbb), (ppl_const_Pointset_Powerset_C_Polyhedron_t)
- gbb_loop (PBB_BLACK_BOX (pbb))->aux);
+ domains[gbb_loop (PBB_BLACK_BOX (pbb))->num]);
else
ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
(&PBB_DOMAIN (pbb), ph);
- for (i = 0; VEC_iterate (loop_p, SESE_LOOP_NEST (region), i, loop); i++)
- if (loop->aux)
- {
- ppl_delete_Pointset_Powerset_C_Polyhedron
- ((ppl_Pointset_Powerset_C_Polyhedron_t) loop->aux);
- loop->aux = NULL;
- }
+ for (i = 0; i < nb_loops; i++)
+ if (domains[i])
+ ppl_delete_Pointset_Powerset_C_Polyhedron (domains[i]);
ppl_delete_Polyhedron (ph);
+ free (domains);
}
/* Add a constrain to the ACCESSES polyhedron for the alias set of
int alias_set_num = 0;
base_alias_pair *bap = (base_alias_pair *)(dr->aux);
- if (bap != NULL && bap->alias_set != NULL)
+ if (bap && bap->alias_set)
alias_set_num = *(bap->alias_set);
ppl_new_Linear_Expression_with_dimension (&alias, accessp_nb_dims);
accesses);
ppl_delete_Polyhedron (accesses);
- if (dr->aux != NULL)
+ if (dr->aux)
dr_base_object_set = ((base_alias_pair *)(dr->aux))->base_obj_set;
new_poly_dr (pbb, dr_base_object_set, accesses_ps, DR_IS_READ (dr) ? PDR_READ : PDR_WRITE,
int *all_vertices;
int *vertices;
struct graph_edge *e;
- int this_component_is_clique, all_components_are_cliques;
+ int this_component_is_clique;
+ int all_components_are_cliques = 1;
for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
for (j = i+1; VEC_iterate (data_reference_p, drs, j, dr2); j++)
{
data_reference_p dr = VEC_index (data_reference_p, drs, i);
base_alias_pair *bap;
- if (dr->aux != NULL)
+
+ if (dr->aux)
bap = (base_alias_pair *)(dr->aux);
+
bap->alias_set = XNEW (int);
*(bap->alias_set) = g->vertices[i].component + 1;
}
-
/* Verify if the DFS numbering results in optimal solution. */
for (i = 0; i < num_connected_components; i++)
{
struct graph *g = new_graph (num_vertex);
data_reference_p dr1, dr2;
int i, j;
- int num_component;
int *queue;
for (i = 0; VEC_iterate (data_reference_p, drs, i, dr1); i++)
for (i = 0; i < num_vertex; i++)
queue[i] = i;
- num_component = graphds_dfs (g, queue, num_vertex, NULL, true, NULL);
+ graphds_dfs (g, queue, num_vertex, NULL, true, NULL);
for (i = 0; i < g->n_vertices; i++)
{
data_reference_p dr = VEC_index (data_reference_p, drs, i);
base_alias_pair *bap;
- if (dr->aux != NULL)
+
+ if (dr->aux)
bap = (base_alias_pair *)(dr->aux);
+
bap->base_obj_set = g->vertices[i].component + 1;
}
build_poly_dr (dr, pbb);
}
+/* Dump to file the alias graphs for the data references in DRS. */
+
+static void
+dump_alias_graphs (VEC (data_reference_p, heap) *drs)
+{
+ char comment[100];
+ FILE *file_dimacs, *file_ecc, *file_dot;
+
+ file_dimacs = fopen ("/tmp/dr_alias_graph_dimacs", "ab");
+ if (file_dimacs)
+ {
+ snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
+ current_function_name ());
+ write_alias_graph_to_ascii_dimacs (file_dimacs, comment, drs);
+ fclose (file_dimacs);
+ }
+
+ file_ecc = fopen ("/tmp/dr_alias_graph_ecc", "ab");
+ if (file_ecc)
+ {
+ snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
+ current_function_name ());
+ write_alias_graph_to_ascii_ecc (file_ecc, comment, drs);
+ fclose (file_ecc);
+ }
+
+ file_dot = fopen ("/tmp/dr_alias_graph_dot", "ab");
+ if (file_dot)
+ {
+ snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
+ current_function_name ());
+ write_alias_graph_to_ascii_dot (file_dot, comment, drs);
+ fclose (file_dot);
+ }
+}
+
/* Build data references in SCOP. */
static void
/* When debugging, enable the following code. This cannot be used
in production compilers. */
-#if 0
- {
- char comment[100];
- FILE *file_dimacs, *file_ecc, *file_dot;
-
- file_dimacs = fopen ("/tmp/dr_alias_graph_dimacs", "ab");
- file_ecc = fopen ("/tmp/dr_alias_graph_ecc", "ab");
- file_dot = fopen ("/tmp/dr_alias_graph_dot", "ab");
- if (file_dimacs)
- {
- snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
- current_function_name ());
- write_alias_graph_to_ascii_dimacs (file_dimacs, comment, drs);
- fclose (file_dimacs);
- }
- if (file_ecc)
- {
- snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
- current_function_name ());
- write_alias_graph_to_ascii_ecc (file_ecc, comment, drs);
- fclose (file_ecc);
- }
- if (file_dot)
- {
- snprintf (comment, sizeof (comment), "%s %s", main_input_filename,
- current_function_name ());
- write_alias_graph_to_ascii_dot (file_dot, comment, drs);
- fclose (file_dot);
- }
- }
-#endif
+ if (0)
+ dump_alias_graphs (drs);
VEC_free (data_reference_p, heap, drs);
/* Creates a zero dimension array of the same type as VAR. */
static tree
-create_zero_dim_array (tree var)
+create_zero_dim_array (tree var, const char *base_name)
{
tree index_type = build_index_type (integer_zero_node);
tree elt_type = TREE_TYPE (var);
tree array_type = build_array_type (elt_type, index_type);
- tree base = create_tmp_var (array_type, "Red");
+ tree base = create_tmp_var (array_type, base_name);
add_referenced_var (base);
gimple phi = gsi_stmt (*psi);
tree res = gimple_phi_result (phi);
tree var = SSA_NAME_VAR (res);
- tree zero_dim_array = create_zero_dim_array (var);
+ tree zero_dim_array = create_zero_dim_array (var, "Close_Phi");
gimple_stmt_iterator gsi = gsi_after_labels (gimple_bb (phi));
gimple stmt = gimple_build_assign (res, zero_dim_array);
tree arg = gimple_phi_arg_def (phi, 0);
basic_block bb = gimple_bb (phi);
tree res = gimple_phi_result (phi);
tree var = SSA_NAME_VAR (res);
- tree zero_dim_array = create_zero_dim_array (var);
+ tree zero_dim_array = create_zero_dim_array (var, "General_Reduction");
gimple_stmt_iterator gsi;
gimple stmt;
gimple_seq stmts;
{
if (!zero_dim_array)
{
- zero_dim_array = create_zero_dim_array (SSA_NAME_VAR (def));
+ zero_dim_array = create_zero_dim_array
+ (SSA_NAME_VAR (def), "Cross_BB_scalar_dependence");
insert_out_of_ssa_copy (zero_dim_array, def);
gsi_next (gsi);
}
SET_BIT (reductions, bb->index);
gcc_assert (close_phi == loop_phi);
- red = create_zero_dim_array (gimple_assign_lhs (stmt));
+ red = create_zero_dim_array
+ (gimple_assign_lhs (stmt), "Commutative_Associative_Reduction");
translate_scalar_reduction_to_array_for_stmt
(red, stmt, VEC_index (gimple, in, 1));
continue;
#endif
}
+/* A LOOP is in normal form for Graphite when it contains only one
+ scalar phi node that defines the main induction variable of the
+ loop, only one increment of the IV, and only one exit condition. */
+
+static void
+graphite_loop_normal_form (loop_p loop)
+{
+ struct tree_niter_desc niter;
+ tree nit;
+ gimple_seq stmts;
+ edge exit = single_dom_exit (loop);
+
+ bool known_niter = number_of_iterations_exit (loop, exit, &niter, false);
+
+ /* At this point we should know the number of iterations, */
+ gcc_assert (known_niter);
+
+ nit = force_gimple_operand (unshare_expr (niter.niter), &stmts, true,
+ NULL_TREE);
+ if (stmts)
+ gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
+
+ loop->single_iv = canonicalize_loop_ivs (loop, &nit);
+}
+
+/* Rewrite all the loops of SCOP in normal form: one induction
+ variable per loop. */
+
+static void
+scop_canonicalize_loops (scop_p scop)
+{
+ loop_iterator li;
+ loop_p loop;
+
+ FOR_EACH_LOOP (li, loop, 0)
+ if (loop_in_sese_p (loop, SCOP_REGION (scop)))
+ graphite_loop_normal_form (loop);
+}
+
/* Builds the polyhedral representation for a SESE region. */
bool
if (nb_pbbs_in_loops (scop) == 0)
return false;
+ scop_canonicalize_loops (scop);
build_sese_loop_nests (region);
build_sese_conditions (region);
find_scop_parameters (scop);
OSDN Git Service
