diff options
| author | Richard Biener <rguenther@suse.de> | 2019-10-24 06:19:01 +0000 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2019-10-24 06:19:01 +0000 |
| commit | a20734d34364748a217ba7c3bc938d5ff408a9c9 (patch) | |
| tree | 9a26fc2f676c7c66aa89fc8a1be19e293eb385d4 | |
| parent | 9a76d6cba8e9e23669261357bd5177b8cc246ee4 (diff) | |
2019-10-24 Richard Biener <rguenther@suse.de>
* tree-vect-slp.c (vect_analyze_slp): When reduction group
SLP discovery fails try to handle the reduction as part
of SLP reduction discovery.
* gcc.dg/vect/slp-reduc-9.c: New testcase.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@277366 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vect/slp-reduc-9.c | 25 | ||||
| -rw-r--r-- | gcc/tree-vect-slp.c | 4 |
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0c81a1077af..9296d5d7236 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-10-24 Richard Biener <rguenther@suse.de> + + * tree-vect-slp.c (vect_analyze_slp): When reduction group + SLP discovery fails try to handle the reduction as part + of SLP reduction discovery. + 2019-10-23 Michael Meissner <meissner@linux.ibm.com> * config/rs6000/rs6000-protos.h (rs6000_adjust_insn_length): New diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b3d44fa8ed9..a752086d4cc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-10-24 Richard Biener <rguenther@suse.de> + + * gcc.dg/vect/slp-reduc-9.c: New testcase. + 2019-10-23 David Edelsohn <dje.gcc@gmail.com> * gcc.target/powerpc/pr70010.c: Add -Wno-psabi. diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-9.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-9.c new file mode 100644 index 00000000000..bee642ee999 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-9.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target vect_int_mult } */ + +int +bar (int *x, int a, int b, int n) +{ + x = __builtin_assume_aligned (x, __BIGGEST_ALIGNMENT__); + int sum1 = 0; + int sum2 = 0; + for (int i = 0; i < n; ++i) + { + /* Reduction chain vectorization fails here because of the + different operations but we can still vectorize both + reductions as SLP reductions, saving IVs. */ + sum1 += x[2*i] - a; + sum1 += x[2*i+1] * b; + sum2 += x[2*i] - b; + sum2 += x[2*i+1] * a; + } + return sum1 + sum2; +} + +/* { dg-final { scan-tree-dump "Loop contains only SLP stmts" "vect" } } */ +/* { dg-final { scan-tree-dump "vectorizing stmts using SLP" "vect" } } */ +/* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */ diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index e1061ede061..0af51197a84 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -2271,14 +2271,18 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size) { /* Dissolve reduction chain group. */ stmt_vec_info vinfo = first_element; + stmt_vec_info last = NULL; while (vinfo) { stmt_vec_info next = REDUC_GROUP_NEXT_ELEMENT (vinfo); REDUC_GROUP_FIRST_ELEMENT (vinfo) = NULL; REDUC_GROUP_NEXT_ELEMENT (vinfo) = NULL; + last = vinfo; vinfo = next; } STMT_VINFO_DEF_TYPE (first_element) = vect_internal_def; + /* It can be still vectorized as part of an SLP reduction. */ + loop_vinfo->reductions.safe_push (last); } } |