aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2023-10-23 13:42:53 +0200
committerRichard Biener <rguenther@suse.de>2023-10-23 15:30:02 +0200
commit00eb0812e6464307f9f971d2a743d720015e70cf (patch)
tree3829398b5d3df5ac8b7c0e8bf18ff531c8e374b0
parent738d44348e7392a9f8e370afa3a9d8c24ee080cd (diff)
tree-optimization/111915 - mixing grouped and non-grouped accesses
The change to allow SLP of non-grouped accesses failed to check for the case of mixing with grouped accesses. PR tree-optimization/111915 * tree-vect-slp.cc (vect_build_slp_tree_1): Check all accesses are either grouped or not. * gcc.dg/vect/pr111915.c: New testcase.
-rw-r--r--gcc/testsuite/gcc.dg/vect/pr111915.c12
-rw-r--r--gcc/tree-vect-slp.cc3
2 files changed, 15 insertions, 0 deletions
diff --git a/gcc/testsuite/gcc.dg/vect/pr111915.c b/gcc/testsuite/gcc.dg/vect/pr111915.c
new file mode 100644
index 00000000000..8614bac519c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr111915.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-fno-tree-vrp -fno-tree-dominator-opts -fno-tree-ccp" } */
+
+void
+foo (int * __restrict a, int * __restrict b, int * __restrict w)
+{
+ for (int i = 0; i < 16; ++i)
+ {
+ *a += w[2*i+0];
+ *b += w[2*i&1];
+ }
+}
diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc
index 24bf6582f8d..5eb310eceaf 100644
--- a/gcc/tree-vect-slp.cc
+++ b/gcc/tree-vect-slp.cc
@@ -1298,6 +1298,9 @@ vect_build_slp_tree_1 (vec_info *vinfo, unsigned char *swap,
|| rhs_code == COMPONENT_REF
|| rhs_code == MEM_REF)))
|| (ldst_p
+ && (STMT_VINFO_GROUPED_ACCESS (stmt_info)
+ != STMT_VINFO_GROUPED_ACCESS (first_stmt_info)))
+ || (ldst_p
&& (STMT_VINFO_GATHER_SCATTER_P (stmt_info)
!= STMT_VINFO_GATHER_SCATTER_P (first_stmt_info)))
|| first_stmt_ldst_p != ldst_p