From patchwork Mon Jul 24 07:50:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 124662 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1636851vqg; Mon, 24 Jul 2023 00:51:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5uAGobF7EI2Pq0UTJp32k5MjCywKTp5RaOUogepJa4ApTlE5T7HD/Ewf8XFMGplPCQmIm X-Received: by 2002:a05:6512:39cf:b0:4f9:54f0:b6db with SMTP id k15-20020a05651239cf00b004f954f0b6dbmr5042360lfu.13.1690185101685; Mon, 24 Jul 2023 00:51:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690185101; cv=none; d=google.com; s=arc-20160816; b=RKoYdZoVp9Uo00c4ahnUglD2He/P2fWYk+D2e/qzx6IYKhGf4jP4Csv/J9HifUef39 hvpSISzOHffzY1M8SMuwyo9Uxt0UGIWXx17xlS4gGrLWX1nz2Le10j9ZO4l+0p9TGT1C +B5xe6px0ko2h7XalJLPYlIZd0jy/afoPgGnKT4n5Sga9vaYLMX/nkBXXdGko8YhLO+6 BsKiJ9OYHqa/WmTez2V8IK1l57PVJTy+BhqKpzZLUIuBzp/Zo3z3dZqCac8gc/Y5XUlT vEuIIz8WjujIqSpVA+da7CEfFlzmUqaS59S9BRMjlAbs2auYbvxGH2RRAu0gVqShD5HE /fOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:message-id :mime-version:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=wD5fYhKP80KxsRSH48E/mYlTd3bF4L4gXpbrmmqrdWw=; fh=etb9MYHN7HLF/sff76ICVdPeKiI8ZsjoOL2bcdG0aog=; b=Pri7ZQSC8emw39LZNoZTvv2OBHk1SRSLUYN6sijRn700FixZysB6VPJOQGnKKipomh Q7uv7FjXAgcvN7qR1sAESsufCEfCw9HWn2a2BqIkUAywmXBSUKeE3PMjeSza0f1ztjlj 35kFkWh0s2Gdf9RMsJ+0qwPbyNer64hLmeZVCEpBvIuLtMgVc2NjGOpiZmOoM8AfvbCv qAZON+1vFuiVpIIo0yHXbU/rsoHACJgaCDx3BrK79rcMSwdspc+qlo9NWsgFgaGChIIt KQ8KvpWTeU9q57oZ9co4FALXvjjE1h282IjHXdVqqWcwVDEzXqWZswBy3ai+x1nCWwRG L+Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jIIZxxva; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id a24-20020a50e718000000b00521a9ae22adsi5751164edn.104.2023.07.24.00.51.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 00:51:41 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jIIZxxva; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4A030385EC55 for ; Mon, 24 Jul 2023 07:50:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A030385EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1690185055; bh=wD5fYhKP80KxsRSH48E/mYlTd3bF4L4gXpbrmmqrdWw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jIIZxxvaS6ach3ofW+y1GpqRz4jSxZ71iMzCRA1j5NTlOzFovJwleMY5wVY/aJETZ QBojiR2UAD1zMTxTjQszji0Grp4SLu3YkQsu9joNi/k1qAPEaBPUWE5ELSqbxUHaKG 81aGGMrGmrL8ljEmBDuTZQ7FyPbu3wGZyjSuTPyI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id CD380385840E for ; Mon, 24 Jul 2023 07:50:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD380385840E Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 702C320568 for ; Mon, 24 Jul 2023 07:50:08 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5B449138E8 for ; Mon, 24 Jul 2023 07:50:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id RymjFDAtvmR8bQAAMHmgww (envelope-from ) for ; Mon, 24 Jul 2023 07:50:08 +0000 Date: Mon, 24 Jul 2023 09:50:07 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/110777 - abnormals and recent PRE optimization MIME-Version: 1.0 Message-Id: <20230724075008.5B449138E8@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.5 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772287533288015761 X-GMAIL-MSGID: 1772287533288015761 The following avoids propagating abnormals with the recent tweak to look through PRE introduced copies between equal values. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/110777 * tree-ssa-sccvn.cc (eliminate_dom_walker::eliminate_avail): Avoid propagating abnormals. * gcc.dg/pr110777.c: New testcase. --- gcc/testsuite/gcc.dg/pr110777.c | 22 ++++++++++++++++++++++ gcc/tree-ssa-sccvn.cc | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr110777.c diff --git a/gcc/testsuite/gcc.dg/pr110777.c b/gcc/testsuite/gcc.dg/pr110777.c new file mode 100644 index 00000000000..253c2a44d3d --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr110777.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -w" } */ + +void pm_message (int); +int *findOrAddBackgroundInPalette_palette_pnm; +static void findOrAddBackgroundInPalette(unsigned *paletteSizeP, + int *backgroundIndexP) { + if (*paletteSizeP) { + *backgroundIndexP = (*paletteSizeP)++; + pm_message(0); + } + pm_message(findOrAddBackgroundInPalette_palette_pnm[*backgroundIndexP]); +} +void computeColorMap(int *backgroundIndexP) { + unsigned paletteSize; + findOrAddBackgroundInPalette(&paletteSize, backgroundIndexP); +} +int main() { + unsigned backgroundIndex; + _setjmp(); + computeColorMap(&backgroundIndex); +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index ebe8006bb8b..32e06fae3b9 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -6608,7 +6608,9 @@ eliminate_dom_walker::eliminate_avail (basic_block, tree op) if (gimple_assign_rhs_class (ass) == GIMPLE_SINGLE_RHS) { tree rhs1 = gimple_assign_rhs1 (ass); - if (CONSTANT_CLASS_P (rhs1) || TREE_CODE (rhs1) == SSA_NAME) + if (CONSTANT_CLASS_P (rhs1) + || (TREE_CODE (rhs1) == SSA_NAME + && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (rhs1))) av = rhs1; } return av;