From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1130) id 7789A3858407; Fri, 17 Dec 2021 14:18:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7789A3858407 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Richard Sandiford To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6041] vect: Fix multi-vector SLP gather loads [PR103744] X-Act-Checkin: gcc X-Git-Author: Richard Sandiford X-Git-Refname: refs/heads/master X-Git-Oldrev: 7dca2ad64910ba4aeae8e1f373f4d4796702b42b X-Git-Newrev: e781cb93d7d908f1f4f1611d0034eccbd1478e91 Message-Id: <20211217141849.7789A3858407@sourceware.org> Date: Fri, 17 Dec 2021 14:18:49 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Dec 2021 14:18:49 -0000 https://gcc.gnu.org/g:e781cb93d7d908f1f4f1611d0034eccbd1478e91 commit r12-6041-ge781cb93d7d908f1f4f1611d0034eccbd1478e91 Author: Richard Sandiford Date: Fri Dec 17 14:18:39 2021 +0000 vect: Fix multi-vector SLP gather loads [PR103744] This PR shows that I didn't properly test the multi-vector case when adding support for SLP gather loads. The patch fixes that case using the same approach as we do for non-SLP cases: keep the scalar base the same, but iterate through the (also multi-vector) vector offsets. “vec_num * j + i” is already used elsewhere as a way of handling both the multi-vector SLP case and the multi-vector non-SLP case. gcc/ PR tree-optimization/103744 * tree-vect-stmts.c (vectorizable_load): Handle multi-vector SLP gather loads. gcc/testsuite/ PR tree-optimization/103744 * gcc.dg/vect/pr103744-1.c: New test. * gcc.dg/vect/pr103744-2.c: Likewise. Diff: --- gcc/testsuite/gcc.dg/vect/pr103744-1.c | 20 ++++++++++++++++++++ gcc/testsuite/gcc.dg/vect/pr103744-2.c | 31 +++++++++++++++++++++++++++++++ gcc/tree-vect-stmts.c | 6 ++++-- 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/pr103744-1.c b/gcc/testsuite/gcc.dg/vect/pr103744-1.c new file mode 100644 index 00000000000..1bc81e26fe4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr103744-1.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ + +int r; + +void +foo (short int *s, short int *d1, short int *d2, int z) +{ + int *a; + + while (z < 1) + { + int i; + + i = *s++ - (*d1++ + *d2++); + r += a[i]; + i = *s++ - (*d1++ + *d2++); + r += a[i]; + ++z; + } +} diff --git a/gcc/testsuite/gcc.dg/vect/pr103744-2.c b/gcc/testsuite/gcc.dg/vect/pr103744-2.c new file mode 100644 index 00000000000..52307abf246 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr103744-2.c @@ -0,0 +1,31 @@ +/* { dg-do compile } */ + +int +f1 (int *restrict x, unsigned short *restrict y) +{ + int res = 0; + for (int i = 0; i < 100; i += 2) + { + unsigned short i1 = y[i + 0] + 1; + unsigned short i2 = y[i + 1] + 2; + res += x[i1]; + res += x[i2]; + } + return res; +} + +void +f2 (int *restrict x, unsigned short *restrict y) +{ + int res1 = 0; + int res2 = 0; + for (int i = 0; i < 100; i += 2) + { + unsigned short i1 = y[i + 0] + 1; + unsigned short i2 = y[i + 1] + 2; + res1 += x[i1]; + res2 += x[i2]; + } + x[0] = res1; + x[1] = res2; +} diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index ad90cdb0473..c842d500d10 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -9249,6 +9249,8 @@ vectorizable_load (vec_info *vinfo, group_size = vec_num = 1; group_gap_adj = 0; ref_type = reference_alias_ptr_type (DR_REF (first_dr_info->dr)); + if (slp) + vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node); } gcc_assert (alignment_support_scheme); @@ -9594,7 +9596,7 @@ vectorizable_load (vec_info *vinfo, final_mask = prepare_vec_mask (loop_vinfo, mask_vectype, final_mask, vec_mask, gsi); - if (i > 0) + if (i > 0 && !STMT_VINFO_GATHER_SCATTER_P (stmt_info)) dataref_ptr = bump_vector_ptr (vinfo, dataref_ptr, ptr_incr, gsi, stmt_info, bump); @@ -9611,7 +9613,7 @@ vectorizable_load (vec_info *vinfo, && gs_info.ifn != IFN_LAST) { if (STMT_VINFO_GATHER_SCATTER_P (stmt_info)) - vec_offset = vec_offsets[j]; + vec_offset = vec_offsets[vec_num * j + i]; tree zero = build_zero_cst (vectype); tree scale = size_int (gs_info.scale); gcall *call;