From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 4463C394AC22; Thu, 13 Jan 2022 10:54:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4463C394AC22 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 r11-9458] tree-optimization/101615 - SLP permute opt with CTOR roots X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: d3b2060a0a6556d578eb87caebb50d7a33864929 X-Git-Newrev: 7f49f50f756c06f4093358ff77c11152777fff1c Message-Id: <20220113105410.4463C394AC22@sourceware.org> Date: Thu, 13 Jan 2022 10:54:10 +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: Thu, 13 Jan 2022 10:54:10 -0000 https://gcc.gnu.org/g:7f49f50f756c06f4093358ff77c11152777fff1c commit r11-9458-g7f49f50f756c06f4093358ff77c11152777fff1c Author: Richard Biener Date: Wed Jul 28 15:12:00 2021 +0200 tree-optimization/101615 - SLP permute opt with CTOR roots CTOR roots are not explicitely represented so we have to make sure to materialize permutes on SLP graph entries to them. 2021-07-28 Richard Biener PR tree-optimization/101615 PR tree-optimization/103995 * tree-vect-slp.c (vect_optimize_slp): Materialize permutes at CTOR SLP graph entries. * gcc.dg/vect/bb-slp-pr101615-2.c: New testcase. Diff: --- gcc/testsuite/gcc.dg/vect/bb-slp-pr101615-2.c | 23 +++++++++++++++++++++++ gcc/tree-vect-slp.c | 7 +++++++ 2 files changed, 30 insertions(+) diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-pr101615-2.c b/gcc/testsuite/gcc.dg/vect/bb-slp-pr101615-2.c new file mode 100644 index 00000000000..ac89883de22 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/bb-slp-pr101615-2.c @@ -0,0 +1,23 @@ +/* { dg-do run } */ +/* { dg-additional-options "-O3 -w -Wno-psabi" } */ + +#include "tree-vect.h" + +int res[6] = { 5, 7, 11, 3, 3, 3 }; +int a[6] = {5, 5, 8}; +int c; + +int main() +{ + check_vect (); + for (int b = 0; b <= 4; b++) + for (; c <= 4; c++) { + a[0] |= 1; + for (int e = 0; e <= 4; e++) + a[e + 1] |= 3; + } + for (int d = 0; d < 6; d++) + if (a[d] != res[d]) + __builtin_abort (); + return 0; +} diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index 3d4e701c0d8..230ff4081a5 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -3165,6 +3165,13 @@ vect_optimize_slp (vec_info *vinfo) n_perm[idx] = perms.length () - 1; } + /* In addition to the above we have to mark outgoing permutes facing + non-reduction graph entries that are not represented as to be + materialized. */ + for (slp_instance instance : vinfo->slp_instances) + if (SLP_INSTANCE_KIND (instance) == slp_inst_kind_ctor) + bitmap_set_bit (n_materialize, SLP_INSTANCE_TREE (instance)->vertex); + /* Propagate permutes along the graph and compute materialization points. */ bool changed; unsigned iteration = 0;