From 7e99af4816cfad578094fcf08e2377f3ed76e201 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 29 Nov 2019 14:48:30 +0000 Subject: [PATCH] Fix DR_GROUP_GAP for strided accesses (PR 92677) When dissolving an SLP-only group of accesses, we should only set the gap to group_size - 1 for normal non-strided groups. 2019-11-29 Richard Sandiford gcc/ PR tree-optimization/92677 * tree-vect-loop.c (vect_dissolve_slp_only_groups): Set the gap to zero when dissolving a group of strided accesses. gcc/testsuite/ PR tree-optimization/92677 * gcc.dg/vect/pr92677.c: New test. From-SVN: r278852 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/vect/pr92677.c | 26 ++++++++++++++++++++++++++ gcc/tree-vect-loop.c | 5 ++++- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/vect/pr92677.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 002d9aa..ea1a587 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2019-11-29 Richard Sandiford + PR tree-optimization/92677 + * tree-vect-loop.c (vect_dissolve_slp_only_groups): Set the gap + to zero when dissolving a group of strided accesses. + +2019-11-29 Richard Sandiford + PR tree-optimization/92596 * tree-vect-stmts.c (vectorizable_call): Punt on hybrid mask/nonmask operations. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 57544a5..375202b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-11-29 Richard Sandiford + PR tree-optimization/92677 + * gcc.dg/vect/pr92677.c: New test. + +2019-11-29 Richard Sandiford + PR tree-optimization/92596 * gcc.dg/vect/bb-slp-pr92596.c: New test. * gcc.dg/vect/bb-slp-43.c: Likewise. diff --git a/gcc/testsuite/gcc.dg/vect/pr92677.c b/gcc/testsuite/gcc.dg/vect/pr92677.c new file mode 100644 index 0000000..3f85b29 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr92677.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O3" } */ + +int a, c; +int *b; +long d; +double *e; + +void fn1() { + long f; + double g, h; + while (c) { + if (d) { + g = *e; + *(b + 4) = g; + } + if (f) { + h = *(e + 2); + *(b + 6) = h; + } + e += a; + b += 8; + c--; + d += 2; + } +} diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index ab48a05..77c5a98 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -1829,7 +1829,10 @@ vect_dissolve_slp_only_groups (loop_vec_info loop_vinfo) DR_GROUP_FIRST_ELEMENT (vinfo) = vinfo; DR_GROUP_NEXT_ELEMENT (vinfo) = NULL; DR_GROUP_SIZE (vinfo) = 1; - DR_GROUP_GAP (vinfo) = group_size - 1; + if (STMT_VINFO_STRIDED_P (first_element)) + DR_GROUP_GAP (vinfo) = 0; + else + DR_GROUP_GAP (vinfo) = group_size - 1; vinfo = next; } } -- 2.7.4