From patchwork Tue Dec 12 07:14:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 177114 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7557616vqy; Mon, 11 Dec 2023 23:15:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6NEoY9kzTGEu4BReiX1GYjr9/ew7LPYmfZJNYavw1LR7A92q+z1iM3o+VSTHzq49cLpO4 X-Received: by 2002:a05:620a:55b4:b0:77d:8775:eb03 with SMTP id vr20-20020a05620a55b400b0077d8775eb03mr7342454qkn.69.1702365352419; Mon, 11 Dec 2023 23:15:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702365352; cv=pass; d=google.com; s=arc-20160816; b=Ssipaw1jVMV3nxY7Tx9wquz55PZ9AUIHS1FvZ6q1tDCcsxbUXh4PKrdEOiwx7wYcLu 16+Yj8LdTEWVO7Iy5kavVbgkQd4Z2nslVL/6R523mQW9g/kbh9mhzaaS7Dqa7y4D+BYc NF+hEVVz49xvFy4nkbkdbpRkoOCgYX/h8RFbtNMD/MUXfTgFJcxNjqi1LSPEopOB/aSy 1/I301Tkylszh8lyGM+zBWn5e/KzqxOlcIv/zIRX+xSd+JNqlXymcZkH8yQY1jrnht0K vcHtb31Y4ia43GAMEMLxczg4JyMP6dTWZEhIK9bhN6EJGuhQNUg52QO2BJkAeE6cm3Yt lNsA== 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=ugMQXjedq6sUf9efJBqC8c9be1DhMnwK1yBZBFu4pjg=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=qinFTiR+hCBex0Az+zAVFE0kvo5H18NmIA8TBMqA9Xr8cTnPbPrvCB6Fub5n13UUsL 2WQnAjSLuujbQk6ocOdYopqF9AkksSgBdGtar0DmJPOWmVs091zgy3b6mAlBwo7cWOAf j+c8/axkeGHVRo7W0ESv6ITUzDsSgz8n0o3dQhwCJoqkaYsBSQCUhB49YnZqZtkmx5tC h/K83Yd6Rh0V/56ZAKK2GNWOHpJe5YBFuQZbyvUIS8eAfvhGboKbWzDwJeubQ7G8CBkk kciSKvx27c51Wn9iWsCtJCZK0z/5yGaZhPUHjMmM0zJxGlvrDpdNvr6s1hVTwNpW7pfh +Zhw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=fhSbWGEq; dkim=neutral (no key) header.i=@suse.de header.b=QAafjh4c; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LyIbL2Zk; dkim=neutral (no key) header.i=@suse.de; 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 w5-20020a05620a0e8500b0077f2e9c0b73si9647151qkm.690.2023.12.11.23.15.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 23:15:52 -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=fhSbWGEq; dkim=neutral (no key) header.i=@suse.de header.b=QAafjh4c; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LyIbL2Zk; dkim=neutral (no key) header.i=@suse.de; 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 2CAE4385AC1C for ; Tue, 12 Dec 2023 07:15:52 +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 234143858433 for ; Tue, 12 Dec 2023 07:15:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 234143858433 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 234143858433 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=1702365330; cv=none; b=fEd5OshI0XmB3xwEQSL1a/HpeTcRVXA8RoXt2FGKBCiGvwLnHeFooHJVLF8VHgU4IvMNnpSM/UsjJ8ynlcayvUwqdxbfnHEsXajrMSoRiqMyIMxJh3ESI1A2E8tmMvvKgKUz6lcTQiLiDayIlpc3+OKGDygSpa2TLv6fdcutL2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702365330; c=relaxed/simple; bh=tLg+ctMPv3wgGldnC7rPcEjkzlTSMWprMAQyS9LUvMk=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=TZAJWUwpA43YDmKA3Y9yRIlOFNBZ6dayTr14GyW1aKUNQI6FN+jnA6EzTdrlMi06eNbS5gIvAseLfJ7LW1MOj5tWA15R7mxADYyeD0xZSFyLx2l/BeWL8vrL1QH7VmaIqbMG7dT/eHdMqpX+kipR9fgz/66EuXerxPPOjzllVPY= 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 D65312245A for ; Tue, 12 Dec 2023 07:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702365326; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=ugMQXjedq6sUf9efJBqC8c9be1DhMnwK1yBZBFu4pjg=; b=fhSbWGEqECOxt5srf9iJRy+ZGjVT5TOEWOrp8NAcRVDuENeDL6YtXOWW2Ztnth1d4VSjF9 XP4aPB21hWwutUFsMjQPPM0iaNuxGSoYHGad8Jes4GLBmT4I1M1CJvjUk0QtkRf4+EFSRW MaFcvX0b07C4Ag6NXQSHM6CCDjILEQk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702365326; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=ugMQXjedq6sUf9efJBqC8c9be1DhMnwK1yBZBFu4pjg=; b=QAafjh4cHe1Aj5JXGiiIR2mpHCiVWysrQZVkiUOPJVjKeb9kCMCbiVPzgJEgFvxbQwWsM+ CPkuYwrvHqLAfMDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702365325; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=ugMQXjedq6sUf9efJBqC8c9be1DhMnwK1yBZBFu4pjg=; b=LyIbL2ZkUfVNxCvjb5UO9Ji/dmevuZzWMrG6bF317dWLsqO9vICIvgUpk0DESeqovXw+FT YtYbEL0N52W7AvT7PPFs/JG4DE6OxKArukuiJpIbN9mHSvj7kYgpaXK58RxBqmFydN6qxe J+NE6XACv6cMmqKWdyugmOvNuu/7/cI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702365325; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=ugMQXjedq6sUf9efJBqC8c9be1DhMnwK1yBZBFu4pjg=; b=iCQ34iGplmvmSbBbczZoXw4bI2NNKRcnl3eJu74I8rGrFksxyjlIm8aTIWkqLaeOX/uJsu ZgHjXgIb+JhnQvAw== Date: Tue, 12 Dec 2023 08:14:23 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/112939 - VN PHI visiting and -ftrivial-auto-var-init MIME-Version: 1.0 X-Spam-Score: 5.86 X-Spamd-Result: default: False [5.86 / 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_SPAM_SHORT(2.99)[0.996]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_SPAM_LONG(3.48)[0.994]; FUZZY_BLOCKED(0.00)[rspamd.com] X-Spam-Flag: NO X-Spam-Score: 5.86 Authentication-Results: smtp-out1.suse.de; none X-Spam-Status: No, score=-10.7 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: <20231212071552.2CAE4385AC1C@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785059451323995491 X-GMAIL-MSGID: 1785059451323995491 The following builds upon the last fix, making sure we only value-number to visited (un-)defs, otherwise prefer .VN_TOP. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/112939 * tree-ssa-sccvn.cc (visit_phi): When all args are undefined make sure we end up with a value that was visited, otherwise fall back to .VN_TOP. * gcc.dg/pr112939.c: New testcase. --- gcc/testsuite/gcc.dg/pr112939.c | 23 +++++++++++++++++++++++ gcc/tree-ssa-sccvn.cc | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr112939.c diff --git a/gcc/testsuite/gcc.dg/pr112939.c b/gcc/testsuite/gcc.dg/pr112939.c new file mode 100644 index 00000000000..7017beff30a --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr112939.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O -ftrivial-auto-var-init=zero" } */ + +int i; + +void f (void) +{ + for (;;) + { + if (0) + for (;;) + { + int *a; + int *b = a; + + l1: + *b = (*b != 0) ? 0 : 2; + } + + if (i != 0) + goto l1; + } +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 11537fa3e0b..a178b768459 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -5946,6 +5946,8 @@ visit_phi (gimple *phi, bool *inserted, bool backedges_varying_p) if (TREE_CODE (def) == SSA_NAME) { tree val = SSA_VAL (def, &visited); + if (SSA_NAME_IS_DEFAULT_DEF (def)) + visited = true; if (!backedges_varying_p || !(e->flags & EDGE_DFS_BACK)) def = val; if (e->flags & EDGE_DFS_BACK) @@ -6091,7 +6093,7 @@ visit_phi (gimple *phi, bool *inserted, bool backedges_varying_p) /* If we saw only undefined values and VN_TOP use one of the undefined values. */ else if (sameval == VN_TOP) - result = seen_undef ? seen_undef : sameval; + result = (seen_undef && seen_undef_visited) ? seen_undef : sameval; /* First see if it is equivalent to a phi node in this block. We prefer this as it allows IV elimination - see PRs 66502 and 67167. */ else if ((result = vn_phi_lookup (phi, backedges_varying_p)))