diff options
Diffstat (limited to 'gcc/graphite.c')
| -rw-r--r-- | gcc/graphite.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/gcc/graphite.c b/gcc/graphite.c index 90d8230..7df3028 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -1326,11 +1326,29 @@ scopdet_basic_block_info (basic_block bb, VEC (sd_region, heap) **scops, int i; build_scops_1 (bb, &tmp_scops, loop); - /* XXX: Use 'e->src' ot better 'bb'? */ + + /* Start at all bbs dominated by a loop exit that only exists in this + loop. */ for (i = 0; VEC_iterate (edge, exits, i, e); i++) - if (dominated_by_p (CDI_DOMINATORS, e->dest, e->src) - && e->src->loop_father == loop) - build_scops_1 (e->dest, &tmp_scops, e->dest->loop_father); + if (e->src->loop_father == loop) + { + VEC (basic_block, heap) *dominated; + basic_block b; + int j; + dominated = get_dominated_by (CDI_DOMINATORS, e->src); + for (j = 0; VEC_iterate (basic_block, dominated, j, b); j++) + /* Loop exit. */ + if (loop_depth (find_common_loop (loop, b->loop_father)) + < loop_depth (loop)) + { + /* Pass loop_outer to recognize b as loop header in + build_scops_1. */ + if (b->loop_father->header == b) + build_scops_1 (b, &tmp_scops, loop_outer (b->loop_father)); + else + build_scops_1 (b, &tmp_scops, b->loop_father); + } + } result.next = NULL; result.last = NULL; @@ -1440,7 +1458,8 @@ scopdet_basic_block_info (basic_block bb, VEC (sd_region, heap) **scops, for (i = 0; VEC_iterate (basic_block, dominated, i, dom_bb); i++) { /* Ignore loop exits: they will be handled after the loop body. */ - if (is_loop_exit (loop, dom_bb)) + if (loop_depth (find_common_loop (loop, dom_bb->loop_father)) + < loop_depth (loop)) { result.exits = true; continue; @@ -1790,7 +1809,6 @@ create_sese_edges (VEC (sd_region, heap) *regions) int i; sd_region *s; - for (i = 0; VEC_iterate (sd_region, regions, i, s); i++) create_single_entry_edge (s); |