From 5f5772fbd374a3844ceefe1bbae44b3d38e707a4 Mon Sep 17 00:00:00 2001 From: rguenth Date: Mon, 2 Oct 2017 07:32:52 +0000 Subject: 2017-10-02 Richard Biener PR tree-optimization/82355 * graphite-isl-ast-to-gimple.c (build_iv_mapping): Also build a mapping for the enclosing loop but avoid generating one for the loop tree root. (copy_bb_and_scalar_dependences): Remove premature codegen error on PHIs in blocks duplicated into multiple places. * graphite-scop-detection.c (scop_detection::stmt_has_simple_data_refs_p): For a loop not in the region use it as loop and nest to analyze the DR in. (try_generate_gimple_bb): Likewise. * graphite-sese-to-poly.c (extract_affine_chrec): Adjust. (add_loop_constraints): For blocks in a loop not in the region create a dimension with a single iteration. * sese.h (gbb_loop_at_index): Remove assert. * gcc.dg/graphite/fuse-1.c: Adjust. * gcc.dg/graphite/fuse-2.c: Likewise. * gcc.dg/graphite/pr82355.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253336 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/graphite-scop-detection.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gcc/graphite-scop-detection.c') diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index b374ee1a4e1..eed4efa3e05 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -1055,10 +1055,12 @@ scop_detection::graphite_can_represent_expr (sese_l scop, loop_p loop, bool scop_detection::stmt_has_simple_data_refs_p (sese_l scop, gimple *stmt) { - loop_p nest = outermost_loop_in_sese (scop, gimple_bb (stmt)); + loop_p nest; loop_p loop = loop_containing_stmt (stmt); if (!loop_in_sese_p (loop, scop)) - loop = nest; + nest = loop; + else + nest = outermost_loop_in_sese (scop, gimple_bb (stmt)); auto_vec drs; if (! graphite_find_data_references_in_stmt (nest, loop, stmt, &drs)) @@ -1450,11 +1452,12 @@ try_generate_gimple_bb (scop_p scop, basic_block bb) vec reads = vNULL; sese_l region = scop->scop_info->region; - loop_p nest = outermost_loop_in_sese (region, bb); - + loop_p nest; loop_p loop = bb->loop_father; if (!loop_in_sese_p (loop, region)) - loop = nest; + nest = loop; + else + nest = outermost_loop_in_sese (region, bb); for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) -- cgit v1.2.1