From 00eb0812e6464307f9f971d2a743d720015e70cf Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 23 Oct 2023 13:42:53 +0200 Subject: [PATCH] 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. --- gcc/testsuite/gcc.dg/vect/pr111915.c | 12 ++++++++++++ gcc/tree-vect-slp.cc | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/vect/pr111915.c 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 @@ -1297,6 +1297,9 @@ vect_build_slp_tree_1 (vec_info *vinfo, unsigned char *swap, || rhs_code == INDIRECT_REF || 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)))