diff options
| author | Tobias Grosser <grosser@fim.uni-passau.de> | 2008-06-12 21:02:52 +0000 |
|---|---|---|
| committer | Tobias Grosser <grosser@fim.uni-passau.de> | 2008-06-12 21:02:52 +0000 |
| commit | 39a453a140198a9f21ba39ce88c69e977f641191 (patch) | |
| tree | 083e1ff3cccf8144eabb60f92da6c64e8f105572 | |
| parent | 5a779c0acdb3eac938f5385674d2586150333ad8 (diff) | |
2008-06-12 Tobias Grosser <grosser@fim.uni-passau.de>
* graphite.c (end_scop): Style fix.
(schedule_to_scattering): Style and comment fix.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/graphite@136725 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.graphite | 4 | ||||
| -rw-r--r-- | gcc/graphite.c | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index a954a6430f6..77e2f310b19 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,9 @@ 2008-06-12 Tobias Grosser <grosser@fim.uni-passau.de> + * graphite.c (end_scop): Style fix. + (schedule_to_scattering): Style and comment fix. + +2008-06-12 Tobias Grosser <grosser@fim.uni-passau.de> * graphite.c (print_graphite_bb): Fix definiton of schedule_to_scattering. (initialize_cloog_names): Change nb_scattdims to max loop diff --git a/gcc/graphite.c b/gcc/graphite.c index 9321632f2cb..6b5515a6a3d 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -949,8 +949,7 @@ end_scop (scop_p scop, basic_block exit, basic_block *last, tree stmt) { /* XXX: Disable bb splitting, contains a bug (SIGSEGV in polyhedron aermod.f90). */ - if (0) - if (stmt && VEC_length (edge, exit->preds) == 1) + if (0 && stmt && VEC_length (edge, exit->preds) == 1) { edge e; @@ -1823,7 +1822,13 @@ setup_cloog_loop (scop_p scop, struct loop *loop, CloogMatrix *outer_cstr, } /* Converts the graphite scheduling function into a cloog scattering - function matrix, which restores the original control flow. */ + matrix. This scattering matrix is used to limit the possible cloog + output to valid programs in respect to the scheduling function. + + SCATTERING_DIMENSIONS specifies the dimensionality of the scattering + matrix. CLooG 0.14.0 and previous versions require, that all scattering + functions of one CloogProgram have the same dimensionality, therefore we + allow to specify it. (Should be removed in future versions. */ static CloogMatrix * schedule_to_scattering (graphite_bb_p gb, int scattering_dimensions) @@ -1832,14 +1837,6 @@ schedule_to_scattering (graphite_bb_p gb, int scattering_dimensions) scop_p scop = GBB_SCOP (gb); struct loop *loop; - /* For all bb in the same SCoP the scattering functions must have the same - dimensionality. So we always use a scattering function, that is large - enough for every bb of this SCoP. - (this is a CLooG 0.14.0 and previous versions requirement, it - should be removed in a future version). - - XXX: max_nb_iterators: The maximal possible loop depth in this SCoP - would be sufficient. */ int nb_iterators = nb_loops_around_gb (gb); /* The cloog scattering matrix consists of these colums: @@ -1872,7 +1869,7 @@ schedule_to_scattering (graphite_bb_p gb, int scattering_dimensions) CloogMatrix *scat = cloog_matrix_alloc (scattering_dimensions, nb_cols); - assert (scattering_dimensions >= nb_iterators * 2 + 1); + gcc_assert (scattering_dimensions >= nb_iterators * 2 + 1); /* Initialize the identity matrix. */ for (i = 0; i < scattering_dimensions; i++) |