From 05575a4695b01941551f84e718997f6803c82dbc Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Wed, 15 Dec 2010 05:04:50 +0000 Subject: [PATCH] Fix PR46845: handle scop parameters before scev analysis. 2010-12-14 Sebastian Pop PR tree-optimization/46845 * sese.c (scalar_evolution_in_region): Handle scop parameters before scev analysis. * gcc.dg/graphite/id-pr46845.c: New. From-SVN: r167844 --- gcc/ChangeLog | 6 ++++++ gcc/sese.c | 8 +++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/graphite/id-pr46845.c | 17 +++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/graphite/id-pr46845.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 66c11c4..549b290 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2010-12-14 Sebastian Pop + PR tree-optimization/46845 + * sese.c (scalar_evolution_in_region): Handle scop parameters + before scev analysis. + +2010-12-14 Sebastian Pop + PR tree-optimization/46928 * tree-data-ref.c (analyze_overlapping_iterations): Handle "A[p] == A[p]" in data dependence analysis with p a parameter of the loop. diff --git a/gcc/sese.c b/gcc/sese.c index 3bf6bea..076f07a 100644 --- a/gcc/sese.c +++ b/gcc/sese.c @@ -801,14 +801,16 @@ scalar_evolution_in_region (sese region, loop_p loop, tree t) struct loop *def_loop; basic_block before = block_before_sese (region); + /* SCOP parameters. */ + if (TREE_CODE (t) == SSA_NAME + && !defined_in_sese_p (t, region)) + return t; + if (TREE_CODE (t) != SSA_NAME || loop_in_sese_p (loop, region)) return instantiate_scev (before, loop, analyze_scalar_evolution (loop, t)); - if (!defined_in_sese_p (t, region)) - return t; - def = SSA_NAME_DEF_STMT (t); def_loop = loop_containing_stmt (def); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fae339b..ce47905 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2010-12-14 Sebastian Pop + PR tree-optimization/46845 + * gcc.dg/graphite/id-pr46845.c: New. + +2010-12-14 Sebastian Pop + PR tree-optimization/46928 * gcc.dg/tree-ssa/ldist-17.c: New. diff --git a/gcc/testsuite/gcc.dg/graphite/id-pr46845.c b/gcc/testsuite/gcc.dg/graphite/id-pr46845.c new file mode 100644 index 0000000..f4da78e --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/id-pr46845.c @@ -0,0 +1,17 @@ +/* { dg-options "-O2 -ffast-math -fgraphite-identity -w -Wno-psabi" { target { i?86-*-* x86_64-*-* } } } */ + +typedef float V2SF __attribute__ ((vector_size (128))); + +V2SF +foo (int x, V2SF a) +{ + V2SF b; + if (x & 42) + b = a; + else + b = a + (V2SF) {1.0f/0.0f - 1.0f/0.0f, 1.0f/0.0f - 1.0f/0.0f}; + while (x--) + a += b; + + return a; +} -- 2.7.4