From afa60cb465b831392cb5c8a7e85285e86fab2fc3 Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 30 Aug 2013 07:49:54 +0000 Subject: [PATCH] 2013-08-30 Richard Biener PR tree-optimization/58228 * tree-vect-data-refs.c (vect_analyze_data_ref_access): Do not allow invariant loads in nested loop vectorization. * gcc.dg/torture/pr58228.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202097 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr58228.c | 15 +++++++++++++++ gcc/tree-vect-data-refs.c | 9 ++++++++- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr58228.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a8782b..5720a2a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2013-08-30 Richard Biener + PR tree-optimization/58228 + * tree-vect-data-refs.c (vect_analyze_data_ref_access): Do not + allow invariant loads in nested loop vectorization. + +2013-08-30 Richard Biener + PR tree-optimization/58223 * tree-loop-distribution.c (has_anti_dependence): Rename to ... (has_anti_or_output_dependence): ... this and adjust to also diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e6fa611..68861a8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2013-08-30 Richard Biener + PR tree-optimization/58228 + * gcc.dg/torture/pr58228.c: New testcase. + +2013-08-30 Richard Biener + PR tree-optimization/58223 * gcc.dg/torture/pr58223.c: New testcase. * gcc.dg/tree-ssa/ldist-16.c: Flip expected behavior. diff --git a/gcc/testsuite/gcc.dg/torture/pr58228.c b/gcc/testsuite/gcc.dg/torture/pr58228.c new file mode 100644 index 0000000..d12303a --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr58228.c @@ -0,0 +1,15 @@ +/* { dg-do run } */ + +extern void abort (void); +int a[8][8] = {{1}}; +int b, c, d, e; + +int main () +{ + for (c = 0; c < 8; c++) + for (b = 0; b < 2; b++) + a[b + 4][c] = a[c][0]; + if (a[4][4] != 1) + abort (); + return 0; +} diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 4c12f49..7ebdcfe 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -2271,10 +2271,17 @@ vect_analyze_data_ref_access (struct data_reference *dr) return false; } - /* Allow invariant loads in loops. */ + /* Allow invariant loads in not nested loops. */ if (loop_vinfo && integer_zerop (step)) { GROUP_FIRST_ELEMENT (vinfo_for_stmt (stmt)) = NULL; + if (nested_in_vect_loop_p (loop, stmt)) + { + if (dump_enabled_p ()) + dump_printf_loc (MSG_NOTE, vect_location, + "zero step in inner loop of nest"); + return false; + } return DR_IS_READ (dr); } -- 2.7.4