From patchwork Thu Dec 14 15:08:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 178776 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8612617dys; Thu, 14 Dec 2023 07:08:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IEdJPgRATrlKOYxsoSJBsMz5ghM2VJ8HfjjRTspMe3SrAnGktt7/deDjtI0UjQdxgJTQTB4 X-Received: by 2002:a67:ff0e:0:b0:465:67c9:f2b7 with SMTP id v14-20020a67ff0e000000b0046567c9f2b7mr5898337vsp.63.1702566516830; Thu, 14 Dec 2023 07:08:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702566516; cv=pass; d=google.com; s=arc-20160816; b=MdNt0jtpgzYaj/RjDmnDeRjSiLaFcumVWz/e/IdL/2R/xasMkTxPBLy4USTJaqJ+Sp F/zWNYDs7bHXz8QHdNiFwd94KyK/HPU6mjjWZtKvMnDZ+8+g0Dp143ecCitHyaYtfILA kHgRBqAwiOJNWd/Eata/eIELqj5HNttNqjrqAA0bO4CaR6oMIw7WFWa5i6vhBw8FcFjc vBf0sopRVXvbm6PWtrVF2c73pt/seuvoQ2sRdSH9cYmlj4uuSpUNbLszePCS86nDKsVq h7yHU8FHRto0KKjmDCTLRnQ4LWTvnzi2n7hwyhwc0TyrgkEZ6ZV+gzsBcn9Yf0a39+wv pYSQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:message-id:mime-version:subject :to:from:date:dkim-signature:dkim-signature:dkim-signature :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=GbY3CaJ58vmTM6B4g5Cmzngw+tHHv/W5eH9VBjf3/N0=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=eOc8bvPCVvaBdmWclrFGaDPS06xWwf74fu72f5810NwUDvV8JkkH5ThlZt4fcFo8lk RhPNxgLjVATK+1KuIpcv4Vlo5+PLgg12blvaxxhm5ZDpdnOPx4UdBE3ooBprbHphMkrk uoT2DuMgfAtbbofVzY3Dl4/KwgtMcpwQJSbqRgbwn+/dxkuOh+1p2mcVMj3jECTcloNs 9uE0ilaavv+Axxr49r/ZHHd5DJ874dlA8eL+W9NLoUbv9B0V1D9ZSZNecDJT4JOV+D4e K2HE0OY0pEhJ3QVTXspaG3XdqdqwvCsPTYBdtNS0fO/X9l4+xWW/Uy74ruEL/3BOZ4iW /SDw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ODznyanG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ODznyanG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=CKhagRYk; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id r4-20020a67ea44000000b004666a51c4basi15526vso.116.2023.12.14.07.08.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 07:08:36 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ODznyanG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ODznyanG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=CKhagRYk; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DFD1386187C for ; Thu, 14 Dec 2023 15:08:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id CF0123858D20 for ; Thu, 14 Dec 2023 15:08:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CF0123858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CF0123858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702566493; cv=none; b=cOdcZHNPIr4ZxCIr7lkc28VT1trzWxkNMboLHhmtt0Vdg6jBLXSk6C9l0wBTF+ObqoJviN9GygfydVSdoiKHDjv+J8upUUG8mFnPnOlggXShAviF50xwEEe5/+gEkGKpMkLEUWjTl2uirVZrglCRAu+eNxeglcb5vKfqCkQIuKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702566493; c=relaxed/simple; bh=C+ZkZCZ0p4jVWku+GGreF2rp6wvdRrsfnLlLjCkW/ZE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=ZWH1vSUFDpL0uM4GkJ/ODAETBAAlKbJd+4JRJHTZOb5AQOTh6ZM0MDdBI5TtUhp0KlAgRRkBA3dGc6OB1MFX+FTJiXB1emNm5QDzf6esrOegUfjyUOY1b20JjYjzelBtf2yZL2iN9LTipmAISf5JoCJdG6N6uRf+yatvaA4Q2IU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 75BA721D30 for ; Thu, 14 Dec 2023 15:08:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702566486; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=GbY3CaJ58vmTM6B4g5Cmzngw+tHHv/W5eH9VBjf3/N0=; b=ODznyanGJNgyPWw3/wF02LWG2A309lzr0bW1pDuka3I3vuQ7z+yPlI2VI5YOP7rI5LR11L bP27IDG+NnRd4+5oWwJc8RkXWSy5vbyZ4bfowIJ3sj6PorOyniL1W7S+Kr+qIo3id3PdbK rpx6/IWWBjXKP4Y+2h+WCXPi4bpTc+M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702566486; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=GbY3CaJ58vmTM6B4g5Cmzngw+tHHv/W5eH9VBjf3/N0=; b=CKhagRYkFjvAS/YzmqR/SVQTazNuwOITr81Mu1Rr4nFFsyu5o+zw4ZxX7+zmCo7KO8/CDs 4M3Y2v8XurWly4Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702566486; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=GbY3CaJ58vmTM6B4g5Cmzngw+tHHv/W5eH9VBjf3/N0=; b=ODznyanGJNgyPWw3/wF02LWG2A309lzr0bW1pDuka3I3vuQ7z+yPlI2VI5YOP7rI5LR11L bP27IDG+NnRd4+5oWwJc8RkXWSy5vbyZ4bfowIJ3sj6PorOyniL1W7S+Kr+qIo3id3PdbK rpx6/IWWBjXKP4Y+2h+WCXPi4bpTc+M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702566486; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=GbY3CaJ58vmTM6B4g5Cmzngw+tHHv/W5eH9VBjf3/N0=; b=CKhagRYkFjvAS/YzmqR/SVQTazNuwOITr81Mu1Rr4nFFsyu5o+zw4ZxX7+zmCo7KO8/CDs 4M3Y2v8XurWly4Cw== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 519A1134B0 for ; Thu, 14 Dec 2023 15:08:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id GNUwEVYae2UIJAAAn2gu4w (envelope-from ) for ; Thu, 14 Dec 2023 15:08:06 +0000 Date: Thu, 14 Dec 2023 16:08:05 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/112793 - SLP of constant/external code-generated twice MIME-Version: 1.0 Message-Id: <20231214150806.519A1134B0@imap2.dmz-prg2.suse.org> X-Spam-Level: ********** X-Spam-Level: Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ODznyanG; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=CKhagRYk; dmarc=pass (policy=none) header.from=suse.de; spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:98 is neither permitted nor denied by domain of rguenther@suse.de) smtp.mailfrom=rguenther@suse.de X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-11.98 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; TO_DN_NONE(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; DMARC_POLICY_ALLOW(0.00)[suse.de,none]; MX_GOOD(-0.01)[]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; NEURAL_HAM_SHORT(-0.17)[-0.850]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; WHITELIST_DMARC(-7.00)[suse.de:D:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -11.98 X-Rspamd-Queue-Id: 75BA721D30 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785270387875954237 X-GMAIL-MSGID: 1785270387875954237 The following makes the attempt at code-generating a constant/external SLP node twice well-formed as that can happen when partitioning BB vectorization attempts where we keep constants/externals unpartitioned. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/112793 * tree-vect-slp.cc (vect_schedule_slp_node): Already code-generated constant/external nodes are OK. * g++.dg/vect/pr112793.cc: New testcase. --- gcc/testsuite/g++.dg/vect/pr112793.cc | 32 +++++++++++++++++++++++++++ gcc/tree-vect-slp.cc | 17 +++++++------- 2 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/vect/pr112793.cc diff --git a/gcc/testsuite/g++.dg/vect/pr112793.cc b/gcc/testsuite/g++.dg/vect/pr112793.cc new file mode 100644 index 00000000000..258d7c1b111 --- /dev/null +++ b/gcc/testsuite/g++.dg/vect/pr112793.cc @@ -0,0 +1,32 @@ +// { dg-do compile } +// { dg-require-effective-target c++11 } +// { dg-additional-options "-march=znver2" { target x86_64-*-* i?86-*-* } } + +typedef double T; +T c, s; +T a[16]; +struct Matrix4 { + Matrix4(){} + Matrix4(T e, T f, T i, T j) { + r[1] = r[4] = e; + r[5] = f; + r[8] = i; + r[9] = j; + } + Matrix4 operator*(Matrix4 a) { + return Matrix4( + r[0] * a.r[4] + r[4] + r[15] + r[6], + r[1] * a.r[4] + 1 + 2 + 3, r[0] * r[8] + 1 + 2 + 3, + r[1] * r[8] + r[1] + r[14] + r[2] * r[3]); + } + T r[16] = {}; +}; +Matrix4 t1, t2; +Matrix4 tt; +Matrix4 getRotAltAzToEquatorial() +{ + t2.r[4] = 0; + t1.r[1] = -s; + t1.r[8] = 0; + return t1 * t2; +} diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index b412ec38802..a82fca45161 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -9062,13 +9062,6 @@ vect_schedule_slp_node (vec_info *vinfo, int i; slp_tree child; - /* For existing vectors there's nothing to do. */ - if (SLP_TREE_DEF_TYPE (node) == vect_external_def - && SLP_TREE_VEC_DEFS (node).exists ()) - return; - - gcc_assert (SLP_TREE_VEC_DEFS (node).is_empty ()); - /* Vectorize externals and constants. */ if (SLP_TREE_DEF_TYPE (node) == vect_constant_def || SLP_TREE_DEF_TYPE (node) == vect_external_def) @@ -9079,10 +9072,18 @@ vect_schedule_slp_node (vec_info *vinfo, if (!SLP_TREE_VECTYPE (node)) return; - vect_create_constant_vectors (vinfo, node); + /* There are two reasons vector defs might already exist. The first + is that we are vectorizing an existing vector def. The second is + when performing BB vectorization shared constant/external nodes + are not split apart during partitioning so during the code-gen + DFS walk we can end up visiting them twice. */ + if (! SLP_TREE_VEC_DEFS (node).exists ()) + vect_create_constant_vectors (vinfo, node); return; } + gcc_assert (SLP_TREE_VEC_DEFS (node).is_empty ()); + stmt_vec_info stmt_info = SLP_TREE_REPRESENTATIVE (node); gcc_assert (SLP_TREE_NUMBER_OF_VEC_STMTS (node) != 0);