From patchwork Wed Feb 14 11:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 200924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1150179dyb; Wed, 14 Feb 2024 03:43:48 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXjN6xda4sszLZfNJ3iLvcGUZ44sxbR+FkUxMKiPoS9wX6RqQjfuPParZLvIts8kGlEd8iZTwIED07oZ5mjleZ8bFV2eA== X-Google-Smtp-Source: AGHT+IGWk48Ho2p4067tGuZGH7/Xaj1MQ0pZlzAIOmz/yyBUr750HSqyyy8fDQpC2ts3jMe4hl3o X-Received: by 2002:a05:622a:1710:b0:42c:674b:fe70 with SMTP id h16-20020a05622a171000b0042c674bfe70mr2342740qtk.24.1707911027825; Wed, 14 Feb 2024 03:43:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707911027; cv=pass; d=google.com; s=arc-20160816; b=0RceRRQL0N2j7gIAPzSOw4e/mydguPSERiyhLMP2shwbbqm89q+RnCDbEmDW0qp766 cZ4rvbJRLNtuuGdDdSub0DCsMlC5tpZ9jH4DpytsdqOtku9fLyDE0IzsMCDAn5LrjnPZ 7baOERZLqF8UhPbKrawrAFK6SqoXxWo+Zy3TkyF/Zd0QMrJP96drM9YfpL6BEIrKbgIv b5ud26yX9CmQq6ck3yarnWAzC7aWynmXODQmnSpEEwUXqLHxujeWJSrycVvJYnUxmeYx UFfjM0E142ITOvkEoQMAWGb2TIstukGl+J2VVO816vPq15H4DN8r6vWVCEjRWrDtKKJs V+xg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:errors-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :subject:to:from:date:dkim-signature:dkim-signature:dkim-signature :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=VZ5hf/4LGtaYBt47683WcV/D1oDcfgFUMYsQW4nv2Is=; fh=OZh1x1SRSg507++wvUusJjyHi0e7c1zDDWbIV2Hm+NA=; b=aXjvBkydlvKGmAFeS+OKUJ9fZqW6+x7Y9zeyUwoXWAFzB6JmeTIK8MCUGWON2WBxmL 4mjvnguswREhznQG7XH+/H5GryhLvX0sV4E6DbSBkpwXeHnjR0Vnx4Nrv2BDDnTMQk/z vFOn7qygrZJMWLfaqdOfaozi2/73ZPB7IB4vM8ur9onx7z6RzE4BRcl+G1pa0/CKPGmZ koggWyOTukQDG9iJSEJBU9TIGd1k2RNQcY43inxYe5wOTmhiuVnTPbR0qkWbt011srlV sSsVtGpItdAOm/Nau+98P1VaAimq6PeevXVItkorkEY6/OK1axvKj1SWIMqoDU57Sxq8 KoKQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=PopSHeHT; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=JCgBPPuo; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 X-Forwarded-Encrypted: i=2; AJvYcCVibZxJvxPVBMmK/wOIXVZHbqSUg+aaEwTb3yz7EW9WqSAjFp//Xorx449TKis5z0jGh9q4p0z9+JFazVvezMGOQKfzaQ== Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b5-20020ac84f05000000b0042c5dc1edd7si4743393qte.256.2024.02.14.03.43.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 03:43:47 -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=PopSHeHT; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=JCgBPPuo; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 81ACF385DC33 for ; Wed, 14 Feb 2024 11:43:47 +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 [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 3CD973857011 for ; Wed, 14 Feb 2024 11:43:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3CD973857011 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 3CD973857011 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707910989; cv=none; b=N7JpzOvRoSkyzf6E0fu8A542p9OY5wH9H6cIxL+RGBNwyeduHBa8EzAZXYPTKJYhYg0LkncKXogbCVbFEsX0U3CYD8ZwVw6A0LoXnOuuVVnSdxL/4LBRD2q26hSZWH23xyxa8qO0JvhnGFmVNAEQ/YZeXqmOHIukO7Cq+fvb3/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707910989; c=relaxed/simple; bh=Z9mxVwDTwa8s3Xh1a4osOVPBZ8tuPdUab56yp+huwsg=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=dVfBb9r58234UmmMpxeF48nlTKc8Zq5v4s35broz37MB/VJv2DJZpWo8jQTIdhsvtbgdZgReU2HJzyt9Y2DJY5iIipRkP0nLXYe3LcQWAH2j+IPjpqMsA6+BGEbq+yNmx+XH1Jy57SwDFF/TETD8XEueterZEKKeKLKRrslJwjk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (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 E89AA221C7 for ; Wed, 14 Feb 2024 11:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707910986; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=VZ5hf/4LGtaYBt47683WcV/D1oDcfgFUMYsQW4nv2Is=; b=PopSHeHTTXQG6rRQ6nxpbZuXQrrCcY13Mw/45Z73qHq4yLrA0cS1gyFpkkGZFUQiavUkpg hPCnZqrEAq6NgLeci1Ae2rzSLb/DIfZcKzV40YMw8vcUbablOKaWKwBmjgtmgnyCU2FBNu 6PBINBQwyy6P+OifubQgObWaFe1dSZc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707910986; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=VZ5hf/4LGtaYBt47683WcV/D1oDcfgFUMYsQW4nv2Is=; b=jHhUJDIc+AADJTZpnOQ6DMVNldCXg/gvcUJp9WRRIIpCQP+XYozZcZDS/3basUxc9GO3FR ObpDHq01xu40kiAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707910985; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=VZ5hf/4LGtaYBt47683WcV/D1oDcfgFUMYsQW4nv2Is=; b=JCgBPPuoPccAwL2wuP5r4f2QCFqpvNr45zz/ujTt0euAqFycjPKip+NHUJQ6gc/w+/H+pR hZZFxqCoeCt/d1aqBmrs85SsPaykKlb6J0hTuhGEg5HhazQ/vbMnNEXfCnAoc0Bt6SRm4m pV3KPYIP1GonW2P3GYg1dVf9A4wnI9w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707910985; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=VZ5hf/4LGtaYBt47683WcV/D1oDcfgFUMYsQW4nv2Is=; b=UePfrsVeR+VF4alzRpmameHmCu2N+/b2NyKLrFE0/0Hyi32NBwz9Q+JyalV4eDGmGDVRlv q2qijBZfgyxfu+Bw== Date: Wed, 14 Feb 2024 12:43:04 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH][GCC 12] tree-optimization/113896 - reduction of permuted external vector MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 1.41 X-Spamd-Result: default: False [1.41 / 50.00]; TO_DN_NONE(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(3.00)[1.000]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com] X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, 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 Message-Id: <20240214114347.81ACF385DC33@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790874514024675440 X-GMAIL-MSGID: 1790874514024675440 The following fixes eliding of the permutation of a BB reduction of an existing vector which breaks materialization of live lanes as we fail to permute the SLP_TREE_SCALAR_STMTS vector. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/113896 * tree-vect-slp.cc (vect_optimize_slp): Permute SLP_TREE_SCALAR_STMTS when eliding a permuation in a VEC_PERM node we need to preserve because it wraps an extern vector. * g++.dg/torture/pr113896.C: New testcase. --- gcc/testsuite/g++.dg/torture/pr113896.C | 35 +++++++++++++++++++++++++ gcc/tree-vect-slp.cc | 9 +++++++ 2 files changed, 44 insertions(+) create mode 100644 gcc/testsuite/g++.dg/torture/pr113896.C diff --git a/gcc/testsuite/g++.dg/torture/pr113896.C b/gcc/testsuite/g++.dg/torture/pr113896.C new file mode 100644 index 00000000000..534c1c2e1cc --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr113896.C @@ -0,0 +1,35 @@ +// { dg-do run } +// { dg-additional-options "-ffast-math" } + +double a1 = 1.0; +double a2 = 1.0; + +void __attribute__((noipa)) +f(double K[2], bool b) +{ + double A[] = { + b ? a1 : a2, + 0, + 0, + 0 + }; + + double sum{}; + for(double a : A) sum += a; + for(double& a : A) a /= sum; + + if (b) { + K[0] = A[0]; // 1.0 + K[1] = A[1]; // 0.0 + } else { + K[0] = A[0] + A[1]; + } +} + +int main() +{ + double K[2]{}; + f(K, true); + if (K[0] != 1. || K[1] != 0.) + __builtin_abort (); +} diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index af477c31aa3..b3e3d9e7009 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -4058,6 +4058,15 @@ vect_optimize_slp (vec_info *vinfo) { /* Preserve the special VEC_PERM we use to shield existing vector defs from the rest. But make it a no-op. */ + auto_vec saved; + saved.create (SLP_TREE_SCALAR_STMTS (old).length ()); + for (unsigned i = 0; + i < SLP_TREE_SCALAR_STMTS (old).length (); ++i) + saved.quick_push (SLP_TREE_SCALAR_STMTS (old)[i]); + for (unsigned i = 0; + i < SLP_TREE_SCALAR_STMTS (old).length (); ++i) + SLP_TREE_SCALAR_STMTS (old)[i] + = saved[SLP_TREE_LANE_PERMUTATION (old)[i].second]; unsigned i = 0; for (std::pair &p : SLP_TREE_LANE_PERMUTATION (old))