From e3bde9f4bc8a008a07e1caba789562d0abd627d6 Mon Sep 17 00:00:00 2001 From: Sebastian Pop <sebastian.pop@amd.com> Date: Wed, 25 Nov 2009 05:30:35 +0000 Subject: [PATCH] graphite-blocking.c (pbb_strip_mine_profitable_p): The parameter depth is the loop nesting depth in the LST. 2009-11-18 Sebastian Pop <sebastian.pop@amd.com> * graphite-blocking.c (pbb_strip_mine_profitable_p): The parameter depth is the loop nesting depth in the LST. Call psct_dynamic_dim to transform depth into the time_depth before calling pbb_number_of_iterations_at_time. (lst_do_strip_mine): Use a scalar variable instead of recomputing lst_depth. From-SVN: r154637 --- gcc/ChangeLog.graphite | 9 +++++++++ gcc/graphite-blocking.c | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index bd40eafd6364..b5e20d7103ca 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,3 +1,12 @@ +2009-11-18 Sebastian Pop <sebastian.pop@amd.com> + + * graphite-blocking.c (pbb_strip_mine_profitable_p): The parameter + depth is the loop nesting depth in the LST. Call psct_dynamic_dim + to transform depth into the time_depth before calling + pbb_number_of_iterations_at_time. + (lst_do_strip_mine): Use a scalar variable instead of recomputing + lst_depth. + 2009-11-18 Sebastian Pop <sebastian.pop@amd.com> Reverted the patch for "scattering permutations" from 2009-10-28. diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c index e44ad8a921cc..4c8a700f9ec5 100644 --- a/gcc/graphite-blocking.c +++ b/gcc/graphite-blocking.c @@ -174,11 +174,11 @@ pbb_strip_mine_time_depth (poly_bb_p pbb, int time_depth, int stride) } /* Returns true when strip mining with STRIDE of the loop around PBB - at scattering time TIME_DEPTH is profitable. */ + at DEPTH is profitable. */ static bool pbb_strip_mine_profitable_p (poly_bb_p pbb, - graphite_dim_t time_depth, + graphite_dim_t depth, int stride) { Value niter, strip_stride; @@ -187,7 +187,7 @@ pbb_strip_mine_profitable_p (poly_bb_p pbb, value_init (strip_stride); value_init (niter); value_set_si (strip_stride, stride); - pbb_number_of_iterations_at_time (pbb, time_depth, niter); + pbb_number_of_iterations_at_time (pbb, psct_dynamic_dim (pbb, depth), niter); res = value_gt (niter, strip_stride); value_clear (strip_stride); value_clear (niter); @@ -234,6 +234,7 @@ lst_do_strip_mine (lst_p lst) lst_p l; bool res = false; int stride = PARAM_VALUE (PARAM_LOOP_BLOCK_TILE_SIZE); + int depth; if (!lst || !LST_LOOP_P (lst)) @@ -242,9 +243,10 @@ lst_do_strip_mine (lst_p lst) for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++) res |= lst_do_strip_mine (l); - if (lst_depth (lst) >= 0 + depth = lst_depth (lst); + if (depth >= 0 && pbb_strip_mine_profitable_p (LST_PBB (lst_find_first_pbb (lst)), - lst_depth (lst), stride)) + depth, stride)) { res |= lst_do_strip_mine_loop (lst, lst_depth (lst)); lst_add_loop_under_loop (lst); -- GitLab