From 03922af3f28531aeae1646fb56a7da7272ebc177 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Wed, 31 Mar 2010 18:36:54 +0000 Subject: [PATCH] Make print_scop output the scoplib format. 2010-03-16 Sebastian Pop * graphite-poly.c (print_scattering_function): Pretty print following the scoplib format. (print_pdr): Same. (print_pbb_domain): Same. (dump_gbb_cases): Same. (dump_gbb_conditions): Same. (print_pdrs): Same. (print_pbb): Same. (print_scop_params): Same. (print_scop_context): Same. (print_scop): Same. (print_pbb_body): New. (lst_indent_to): New. (print_lst): Start new lines with a #. * graphite-poly.h (pbb_bb): New. (pbb_index): Use pbb_bb. * graphite-ppl.c (ppl_print_powerset_matrix): Print the number of disjuncts. * tree-data-ref.c (dump_data_reference): Start new lines with a #. From-SVN: r157883 --- gcc/ChangeLog.graphite | 22 ++++++ gcc/graphite-poly.c | 159 ++++++++++++++++++++++++++++++++--------- gcc/graphite-poly.h | 9 ++- gcc/graphite-ppl.c | 4 ++ gcc/tree-data-ref.c | 10 +-- 5 files changed, 164 insertions(+), 40 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 1475ef6979b..fc7e16f36be 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,3 +1,25 @@ +2010-03-16 Sebastian Pop + + * graphite-poly.c (print_scattering_function): Pretty print following + the scoplib format. + (print_pdr): Same. + (print_pbb_domain): Same. + (dump_gbb_cases): Same. + (dump_gbb_conditions): Same. + (print_pdrs): Same. + (print_pbb): Same. + (print_scop_params): Same. + (print_scop_context): Same. + (print_scop): Same. + (print_pbb_body): New. + (lst_indent_to): New. + (print_lst): Start new lines with a #. + * graphite-poly.h (pbb_bb): New. + (pbb_index): Use pbb_bb. + * graphite-ppl.c (ppl_print_powerset_matrix): Print the number of + disjuncts. + * tree-data-ref.c (dump_data_reference): Start new lines with a #. + 2010-03-13 Sebastian Pop PR middle-end/43351 diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index 3e29b4bd4da..e8ab3218c39 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -145,7 +145,16 @@ print_scattering_function (FILE *file, poly_bb_p pbb) 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++) @@ -162,9 +171,14 @@ print_scattering_function (FILE *file, poly_bb_p pbb) 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. */ @@ -411,7 +425,7 @@ print_pdr_access_layout (FILE *file, poly_dr_p pdr) 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)) { @@ -433,12 +447,12 @@ print_pdr (FILE *file, poly_dr_p 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. */ @@ -503,7 +517,7 @@ print_pbb_domain (FILE *file, poly_bb_p pbb) 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++) @@ -516,8 +530,10 @@ print_pbb_domain (FILE *file, poly_bb_p pbb) 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. */ @@ -536,12 +552,15 @@ dump_gbb_cases (FILE *file, gimple_bb_p gbb) 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. */ @@ -560,12 +579,15 @@ dump_gbb_conditions (FILE *file, gimple_bb_p gbb) 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. */ @@ -575,9 +597,38 @@ print_pdrs (FILE *file, poly_bb_p 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++) - print_pdr (file, pdr); + 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++) + 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. */ @@ -588,18 +639,34 @@ debug_pdrs (poly_bb_p 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. */ @@ -610,14 +677,19 @@ print_scop_params (FILE *file, scop_p 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. */ @@ -626,7 +698,7 @@ print_scop_context (FILE *file, scop_p 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++) @@ -636,8 +708,10 @@ print_scop_context (FILE *file, scop_p scop) 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. */ @@ -648,22 +722,25 @@ print_scop (FILE *file, scop_p 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, "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"); + fprintf (file, "#)\n"); } /* Print to STDERR the domain of PBB. */ @@ -901,6 +978,20 @@ scop_to_lst (scop_p scop) 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. */ void @@ -909,7 +1000,7 @@ print_lst (FILE *file, lst_p lst, int indent) if (!lst) return; - indent_to (file, indent); + lst_indent_to (file, indent); if (LST_LOOP_P (lst)) { @@ -919,7 +1010,7 @@ print_lst (FILE *file, lst_p lst, int indent) if (LST_LOOP_FATHER (lst)) fprintf (file, "%d (loop", lst_dewey_number (lst)); else - fprintf (file, "(root"); + fprintf (file, "#(root"); for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++) print_lst (file, l, indent + 2); diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h index b5866995a63..665276bdaeb 100644 --- a/gcc/graphite-poly.h +++ b/gcc/graphite-poly.h @@ -385,12 +385,19 @@ number_of_write_pdrs (poly_bb_p pbb) return res; } +/* The basic block of the PBB. */ +static inline basic_block +pbb_bb (poly_bb_p pbb) +{ + return GBB_BB (PBB_BLACK_BOX (pbb)); +} + /* The index of the PBB. */ static inline int pbb_index (poly_bb_p pbb) { - return GBB_BB (PBB_BLACK_BOX (pbb))->index; + return pbb_bb (pbb)->index; } /* The loop of the PBB. */ diff --git a/gcc/graphite-ppl.c b/gcc/graphite-ppl.c index c80cf1b794c..fce69f75a0e 100644 --- a/gcc/graphite-ppl.c +++ b/gcc/graphite-ppl.c @@ -591,11 +591,15 @@ void ppl_print_powerset_matrix (FILE *file, ppl_Pointset_Powerset_C_Polyhedron_t ps) { + size_t nb_disjuncts; ppl_Pointset_Powerset_C_Polyhedron_iterator_t it, end; ppl_new_Pointset_Powerset_C_Polyhedron_iterator (&it); ppl_new_Pointset_Powerset_C_Polyhedron_iterator (&end); + ppl_Pointset_Powerset_C_Polyhedron_size (ps, &nb_disjuncts); + fprintf (file, "%d\n", (int) nb_disjuncts); + for (ppl_Pointset_Powerset_C_Polyhedron_iterator_begin (ps, it), ppl_Pointset_Powerset_C_Polyhedron_iterator_end (ps, end); !ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test (it, end); diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c index 9f5a623b2fa..0ddcbfc013f 100644 --- a/gcc/tree-data-ref.c +++ b/gcc/tree-data-ref.c @@ -203,19 +203,19 @@ dump_data_reference (FILE *outf, { unsigned int i; - fprintf (outf, "(Data Ref: \n stmt: "); + fprintf (outf, "#(Data Ref: \n# stmt: "); print_gimple_stmt (outf, DR_STMT (dr), 0, 0); - fprintf (outf, " ref: "); + fprintf (outf, "# ref: "); print_generic_stmt (outf, DR_REF (dr), 0); - fprintf (outf, " base_object: "); + fprintf (outf, "# base_object: "); print_generic_stmt (outf, DR_BASE_OBJECT (dr), 0); for (i = 0; i < DR_NUM_DIMENSIONS (dr); i++) { - fprintf (outf, " Access function %d: ", i); + fprintf (outf, "# Access function %d: ", i); print_generic_stmt (outf, DR_ACCESS_FN (dr, i), 0); } - fprintf (outf, ")\n"); + fprintf (outf, "#)\n"); } /* Dumps the affine function described by FN to the file OUTF. */ -- 2.30.2