From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id C7B893858C83; Tue, 18 Oct 2022 10:50:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C7B893858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666090210; bh=97PCA9n0NC96OtUBGjBb51sWh8FX1HZuw1s1N8wcBnE=; h=From:To:Subject:Date:From; b=SiK3YQvMI0sNdwlHDEJOZdhkcfnSsbLfHcpURDWsDxTNXYY5W9txb5XfrYoSGxQXR o7s707H5QpLhfiejAXvtuIGi8/CkwBkRyBvBcwn+1O5Sb2kXlqYgCfuDlwTrxl6Jmk tqzdbC/k1wuNtNQlYOXvc34OBgDPnSM/hwgUYDNU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3356] tree-optimization/107302 - fix vec_perm placement for recurrence vect X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: aae016f99b121b55fc1bcdfc2403fd22f04fa2df X-Git-Newrev: 92ef7822bfd4ea3393e0a1dd40b4abef9fce027f Message-Id: <20221018105010.C7B893858C83@sourceware.org> Date: Tue, 18 Oct 2022 10:50:10 +0000 (GMT) List-Id: https://gcc.gnu.org/g:92ef7822bfd4ea3393e0a1dd40b4abef9fce027f commit r13-3356-g92ef7822bfd4ea3393e0a1dd40b4abef9fce027f Author: Richard Biener Date: Tue Oct 18 10:01:45 2022 +0200 tree-optimization/107302 - fix vec_perm placement for recurrence vect The following fixes the VEC_PERM_EXPR placement when the latch definition is a PHI node. PR tree-optimization/107302 * tree-vect-loop.cc (vectorizable_recurrence): Fix vec_perm placement for a PHI latch def. * gcc.dg/vect/pr107302.c: New testcase. Diff: --- gcc/testsuite/gcc.dg/vect/pr107302.c | 13 +++++++++++++ gcc/tree-vect-loop.cc | 12 +++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/pr107302.c b/gcc/testsuite/gcc.dg/vect/pr107302.c new file mode 100644 index 00000000000..293f7e4067a --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr107302.c @@ -0,0 +1,13 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-tree-pre" } */ + +int a[2000]; +int s292_im1; + +void +s292() { + for (int i = 0; i < 2000; i++) { + a[i] = s292_im1; + s292_im1 = i; + } +} diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index 63e86540d12..92790bd8095 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -8485,9 +8485,15 @@ vectorizable_recurr (loop_vec_info loop_vinfo, stmt_vec_info stmt_info, second and later operands are tentative and will be updated when we have vectorized the latch definition. */ edge le = loop_latch_edge (LOOP_VINFO_LOOP (loop_vinfo)); - gimple_stmt_iterator gsi2 - = gsi_for_stmt (SSA_NAME_DEF_STMT (PHI_ARG_DEF_FROM_EDGE (phi, le))); - gsi_next (&gsi2); + gimple *latch_def = SSA_NAME_DEF_STMT (PHI_ARG_DEF_FROM_EDGE (phi, le)); + gimple_stmt_iterator gsi2; + if (is_a (latch_def)) + gsi2 = gsi_after_labels (gimple_bb (latch_def)); + else + { + gsi2 = gsi_for_stmt (latch_def); + gsi_next (&gsi2); + } for (unsigned i = 0; i < ncopies; ++i) {