if (!PBB_TRANSFORMED (pbb))
return;
- fprintf (file, "scattering bb_%d (\n", pbb_index (pbb));
+ if (PBB_TRANSFORMED_SCATTERING (pbb)
+ || PBB_ORIGINAL_SCATTERING (pbb))
+ fprintf (file, "# Scattering function is provided\n1\n");
+ else
+ {
+ fprintf (file, "# Scattering function is not provided\n0\n");
+ return;
+ }
+
+ fprintf (file, "# scattering bb_%d (\n", pbb_index (pbb));
fprintf (file, "# eq");
for (i = 0; i < pbb_nb_scattering_transform (pbb); i++)
fprintf (file, " cst\n");
- ppl_print_polyhedron_matrix (file, PBB_TRANSFORMED_SCATTERING (pbb));
+ /* Number of disjunct components. Remove this when
+ PBB_TRANSFORMED_SCATTERING will be a pointset_powerset. */
+ fprintf (file, "1\n");
+ ppl_print_polyhedron_matrix (file, PBB_TRANSFORMED_SCATTERING (pbb)
+ ? PBB_TRANSFORMED_SCATTERING (pbb)
+ : PBB_ORIGINAL_SCATTERING (pbb));
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
}
/* Prints to FILE the iteration domain of PBB. */
transform_done = true;
if (flag_loop_block)
- {
- transform_done |= scop_do_strip_mine (scop);
- transform_done |= scop_do_interchange (scop);
- }
+ transform_done |= scop_do_block (scop);
else
{
if (flag_loop_strip_mine)
for (j = 0; VEC_iterate (poly_dr_p, collapsed, j, pdr2); j++)
if (!can_collapse_pdrs (pdr1, pdr2))
VEC_quick_push (poly_dr_p, collapsed, pdr1);
+
+ VEC_free (poly_dr_p, heap, collapsed);
+ PBB_PDR_DUPLICATES_REMOVED (pbb) = true;
}
/* Create a new polyhedral data reference and add it to PBB. It is
PBB_ORIGINAL (pbb) = NULL;
PBB_DRS (pbb) = VEC_alloc (poly_dr_p, heap, 3);
PBB_IS_REDUCTION (pbb) = reduction;
+ PBB_PDR_DUPLICATES_REMOVED (pbb) = false;
VEC_safe_push (poly_bb_p, heap, SCOP_BBS (scop), pbb);
}
void
print_pdr (FILE *file, poly_dr_p pdr)
{
- fprintf (file, "pdr_%d (", PDR_ID (pdr));
+ fprintf (file, "# pdr_%d (", PDR_ID (pdr));
switch (PDR_TYPE (pdr))
{
dump_data_reference (file, (data_reference_p) PDR_CDR (pdr));
- fprintf (file, "data accesses (\n");
+ fprintf (file, "# data accesses (\n");
print_pdr_access_layout (file, pdr);
ppl_print_powerset_matrix (file, PDR_ACCESSES (pdr));
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
}
/* Prints to STDERR the polyhedral data reference PDR. */
SCOP_BBS (scop) = VEC_alloc (poly_bb_p, heap, 3);
SCOP_ORIGINAL_PDDRS (scop) = htab_create (10, hash_poly_ddr_p,
eq_poly_ddr_p, free_poly_ddr);
+ SCOP_ORIGINAL_SCHEDULE (scop) = NULL;
+ SCOP_TRANSFORMED_SCHEDULE (scop) = NULL;
+ SCOP_SAVED_SCHEDULE (scop) = NULL;
+ POLY_SCOP_P (scop) = false;
+
return scop;
}
ppl_delete_Pointset_Powerset_C_Polyhedron (SCOP_CONTEXT (scop));
htab_delete (SCOP_ORIGINAL_PDDRS (scop));
+ free_lst (SCOP_ORIGINAL_SCHEDULE (scop));
+ free_lst (SCOP_TRANSFORMED_SCHEDULE (scop));
+ free_lst (SCOP_SAVED_SCHEDULE (scop));
XDELETE (scop);
}
if (!PBB_DOMAIN (pbb))
return;
- fprintf (file, "domains bb_%d (\n", GBB_BB (gbb)->index);
+ fprintf (file, "# Iteration domain of bb_%d (\n", GBB_BB (gbb)->index);
fprintf (file, "# eq");
for (i = 0; i < pbb_dim_iter_domain (pbb); i++)
if (PBB_DOMAIN (pbb))
ppl_print_powerset_matrix (file, PBB_DOMAIN (pbb));
+ else
+ fprintf (file, "0\n");
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
}
/* Dump the cases of a graphite basic block GBB on FILE. */
if (VEC_empty (gimple, cases))
return;
- fprintf (file, "cases bb_%d (", GBB_BB (gbb)->index);
+ fprintf (file, "# cases bb_%d (\n", GBB_BB (gbb)->index);
for (i = 0; VEC_iterate (gimple, cases, i, stmt); i++)
- print_gimple_stmt (file, stmt, 0, 0);
+ {
+ fprintf (file, "# ");
+ print_gimple_stmt (file, stmt, 0, 0);
+ }
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
}
/* Dump conditions of a graphite basic block GBB on FILE. */
if (VEC_empty (gimple, conditions))
return;
- fprintf (file, "conditions bb_%d (", GBB_BB (gbb)->index);
+ fprintf (file, "# conditions bb_%d (\n", GBB_BB (gbb)->index);
for (i = 0; VEC_iterate (gimple, conditions, i, stmt); i++)
- print_gimple_stmt (file, stmt, 0, 0);
+ {
+ fprintf (file, "# ");
+ print_gimple_stmt (file, stmt, 0, 0);
+ }
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
}
/* Print to FILE all the data references of PBB. */
{
int i;
poly_dr_p pdr;
+ int nb_reads = 0;
+ int nb_writes = 0;
+
+ if (VEC_length (poly_dr_p, PBB_DRS (pbb)) == 0)
+ {
+ fprintf (file, "# Access informations are not provided\n0\n");
+ return;
+ }
+ fprintf (file, "# Data references (\n");
+ fprintf (file, "# Access informations are provided\n1\n");
+
+ for (i = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb), i, pdr); i++)
+ if (PDR_TYPE (pdr) == PDR_READ)
+ nb_reads++;
+ else
+ nb_writes++;
+
+ fprintf (file, "# Read data references (\n");
+ fprintf (file, "# Read access informations\n%d\n", nb_reads);
+ for (i = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb), i, pdr); i++)
+ if (PDR_TYPE (pdr) == PDR_READ)
+ print_pdr (file, pdr);
+ fprintf (file, "#)\n");
+
+ fprintf (file, "# Write data references (\n");
+ fprintf (file, "# Write access informations\n%d\n", nb_writes);
for (i = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb), i, pdr); i++)
- print_pdr (file, pdr);
+ if (PDR_TYPE (pdr) != PDR_READ)
+ print_pdr (file, pdr);
+ fprintf (file, "#)\n");
+ fprintf (file, "#)\n");
}
/* Print to STDERR all the data references of PBB. */
print_pdrs (stderr, pbb);
}
+/* Print to FILE the body of PBB. */
+
+static void
+print_pbb_body (FILE *file, poly_bb_p pbb)
+{
+ fprintf (file, "# Body (\n");
+ fprintf (file, "# Statement body is provided\n1\n");
+ fprintf (file, "# Original iterator names\n# Iterator names are not provided yet.\n");
+ fprintf (file, "# Statement body\n");
+ fprintf (file, "{\n");
+ dump_bb (pbb_bb (pbb), file, 0);
+ fprintf (file, "}\n");
+ fprintf (file, "#)\n");
+}
+
/* Print to FILE the domain and scattering function of PBB. */
void
print_pbb (FILE *file, poly_bb_p pbb)
{
- fprintf (file, "pbb_%d (\n", pbb_index (pbb));
+ fprintf (file, "# pbb_%d (\n", pbb_index (pbb));
dump_gbb_conditions (file, PBB_BLACK_BOX (pbb));
dump_gbb_cases (file, PBB_BLACK_BOX (pbb));
- print_pdrs (file, pbb);
print_pbb_domain (file, pbb);
print_scattering_function (file, pbb);
- fprintf (file, ")\n");
+ print_pdrs (file, pbb);
+ print_pbb_body (file, pbb);
+ fprintf (file, "#)\n");
}
/* Print to FILE the parameters of SCOP. */
int i;
tree t;
- fprintf (file, "parameters (\n");
+ fprintf (file, "# parameters (\n");
+
+ if (VEC_length (tree, SESE_PARAMS (SCOP_REGION (scop))))
+ fprintf (file, "# Parameter names are provided\n1\n# Parameter names \n");
+ else
+ fprintf (file, "# Parameter names are not provided\n0\n");
+
for (i = 0; VEC_iterate (tree, SESE_PARAMS (SCOP_REGION (scop)), i, t); i++)
{
- fprintf (file, "p_%d -> ", i);
print_generic_expr (file, t, 0);
- fprintf (file, "\n");
+ fprintf (file, " # p_%d \n", i);
}
- fprintf (file, ")\n");
+ fprintf (file, "#)\n");
}
/* Print to FILE the context of SCoP. */
{
graphite_dim_t i;
- fprintf (file, "context (\n");
+ fprintf (file, "# Context (\n");
fprintf (file, "# eq");
for (i = 0; i < scop_nb_params (scop); i++)
if (SCOP_CONTEXT (scop))
ppl_print_powerset_matrix (file, SCOP_CONTEXT (scop));
+ else
+ fprintf (file, "0 %d\n", (int) scop_nb_params (scop) + 2);
- fprintf (file, ")\n");
+ fprintf (file, "# )\n");
}
/* Print to FILE the SCOP. */
int i;
poly_bb_p pbb;
- fprintf (file, "scop (\n");
- print_scop_params (file, scop);
+ fprintf (file, "SCoP #(\n");
+ fprintf (file, "# Language\nGimple\n");
print_scop_context (file, scop);
+ print_scop_params (file, scop);
+ fprintf (file, "# Number of statements\n%d\n",
+ VEC_length (poly_bb_p, SCOP_BBS (scop)));
for (i = 0; VEC_iterate (poly_bb_p, SCOP_BBS (scop), i, pbb); i++)
print_pbb (file, pbb);
- fprintf (file, ")\n");
-
- fprintf (file, "original_lst (\n");
+ fprintf (file, "# original_lst (\n");
print_lst (file, SCOP_ORIGINAL_SCHEDULE (scop), 0);
- fprintf (file, ")\n");
+ fprintf (file, "\n#)\n");
- fprintf (file, "transformed_lst (\n");
+ fprintf (file, "# transformed_lst (\n");
print_lst (file, SCOP_TRANSFORMED_SCHEDULE (scop), 0);
- fprintf (file, ")\n");
+ fprintf (file, "\n#)\n");
+
+ fprintf (file, "#)\n");
}
/* Print to STDERR the domain of PBB. */
ppl_Linear_Expression_t le;
ppl_dimension_type dim;
- value_set_si (niter, -1);
-
/* Takes together domain and scattering polyhedrons, and composes
them into the bigger polyhedron that has the following format:
- t0..t_{n-1} | l0..l_{nlcl-1} | i0..i_{niter-1} | g0..g_{nparm-1}.
- t0..t_{n-1} are time dimensions (scattering dimensions)
- l0..l_{nclc-1} are local variables in scatterin function
- i0..i_{niter-1} are original iteration variables
- g0..g_{nparam-1} are global parameters. */
+ t0..t_{n-1} | l0..l_{nlcl-1} | i0..i_{niter-1} | g0..g_{nparm-1}
+
+ where
+ | t0..t_{n-1} are time dimensions (scattering dimensions)
+ | l0..l_{nclc-1} are local variables in scattering function
+ | i0..i_{niter-1} are original iteration variables
+ | g0..g_{nparam-1} are global parameters. */
+
+ ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron (&sctr,
+ PBB_TRANSFORMED_SCATTERING (pbb));
+
+ /* Extend the iteration domain with the scattering dimensions:
+ 0..0 | 0..0 | i0..i_{niter-1} | g0..g_{nparm-1}. */
ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
(&ext_domain, PBB_DOMAIN (pbb));
ppl_insert_dimensions_pointset (ext_domain, 0,
pbb_nb_scattering_transform (pbb)
+ pbb_nb_local_vars (pbb));
- ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron (&sctr,
- PBB_TRANSFORMED_SCATTERING (pbb));
+
+ /* Add to sctr the extended domain. */
ppl_Pointset_Powerset_C_Polyhedron_intersection_assign (sctr, ext_domain);
+ /* Extract the number of iterations. */
ppl_Pointset_Powerset_C_Polyhedron_space_dimension (sctr, &dim);
ppl_new_Linear_Expression_with_dimension (&le, dim);
ppl_set_coef (le, time_depth, 1);
+ value_set_si (niter, -1);
ppl_max_for_le_pointset (sctr, le, niter);
ppl_delete_Linear_Expression (le);
void
scop_to_lst (scop_p scop)
{
- poly_bb_p pbb = VEC_index (poly_bb_p, SCOP_BBS (scop), 0);
- loop_p loop = outermost_loop_in_sese (SCOP_REGION (scop), GBB_BB (PBB_BLACK_BOX (pbb)));
- int i = 0;
+ lst_p res;
+ int i, n = VEC_length (poly_bb_p, SCOP_BBS (scop));
+ VEC (lst_p, heap) *seq = VEC_alloc (lst_p, heap, 5);
+ sese region = SCOP_REGION (scop);
- SCOP_ORIGINAL_SCHEDULE (scop) = loop_to_lst (loop, SCOP_BBS (scop), &i);
- SCOP_TRANSFORMED_SCHEDULE (scop) = copy_lst (SCOP_ORIGINAL_SCHEDULE (scop));
+ for (i = 0; i < n; i++)
+ {
+ poly_bb_p pbb = VEC_index (poly_bb_p, SCOP_BBS (scop), i);
+ loop_p loop = outermost_loop_in_sese (region, GBB_BB (PBB_BLACK_BOX (pbb)));
+
+ if (loop_in_sese_p (loop, region))
+ res = loop_to_lst (loop, SCOP_BBS (scop), &i);
+ else
+ res = new_lst_stmt (pbb);
+
+ VEC_safe_push (lst_p, heap, seq, res);
+ }
+
+ res = new_lst_loop (seq);
+ SCOP_ORIGINAL_SCHEDULE (scop) = res;
+ SCOP_TRANSFORMED_SCHEDULE (scop) = copy_lst (res);
+}
+
+/* Print to FILE on a new line COLUMN white spaces. */
+
+static void
+lst_indent_to (FILE *file, int column)
+{
+ int i;
+
+ if (column > 0)
+ fprintf (file, "\n#");
+
+ for (i = 0; i < column; i++)
+ fprintf (file, " ");
}
/* Print LST to FILE with INDENT spaces of indentation. */
if (!lst)
return;
- indent_to (file, indent);
+ lst_indent_to (file, indent);
if (LST_LOOP_P (lst))
{
int i;
lst_p l;
- fprintf (file, "%d (loop", lst_dewey_number (lst));
+ if (LST_LOOP_FATHER (lst))
+ fprintf (file, "%d (loop", lst_dewey_number (lst));
+ else
+ fprintf (file, "#(root");
for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++)
print_lst (file, l, indent + 2);
OSDN Git Service
