From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 1A9193858C83 for ; Tue, 8 Mar 2022 21:51:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1A9193858C83 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id E4198210F4 for ; Tue, 8 Mar 2022 21:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1646776305; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=EfkfcDBO10x24NfEubzo+STQfT8DjZYd8M1aRfBCfXE=; b=NYGUT+PBq01h/BsdGSG3zxZumLiMOliz4R6gsuQfJAcVwR/XUzoMLGHwqGjfn9i3esTsnT cgBx8VOEJXnjEuTc0iRPRf8mYHz5cXau/TJXZCLd9+dkH/UFFjuj7/VtDMWgPzR4gnW+LR MnOOUAYLBfhSHC2zOeYXAr8/NR7qxJ4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1646776305; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=EfkfcDBO10x24NfEubzo+STQfT8DjZYd8M1aRfBCfXE=; b=VxiERFbxRIivwoAr2N4OAl4IB1SmwsfQ9JM0HXe9xw/LRtitNEOT7j7QhfYJDJMxL2fe7X LNF7e2BijEIN4eDA== Received: from suse.cz (virgil.suse.cz [10.100.13.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id D0E42A3B81; Tue, 8 Mar 2022 21:51:45 +0000 (UTC) From: Martin Jambor To: GCC Patches Cc: Jan Hubicka Subject: [PATCH] ipa-cp: Avoid adjusting references through self-recursion (PR 104813) User-Agent: Notmuch/0.34.1 (https://notmuchmail.org) Emacs/27.2 (x86_64-suse-linux-gnu) Date: Tue, 08 Mar 2022 22:51:45 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-11.0 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Tue, 08 Mar 2022 21:51:48 -0000 Hi, when writing the patch that downgrades address-taken references to load references when IPA-CP can prove that all uses of the taken address ends up in loads, I unfortunately did not take into account that find_more_scalar_values_for_callers_subset now happily adds self-recursive edges to the set of callers which should be immediately redirected (originally recursion was meant to be handled as edge redirection in a second pass over the SCC). The code as it is can now decrement the referece counters too many times. This can remedied by removing self-recursive edges earlier, we already do it because of thunk expansion issues, and so this patch does exactly that. Bootstrapped and LTO-bootstrapped and tested on x86_64-linux. OK for master? Thanks, Martin gcc/ChangeLog: 2022-03-07 Martin Jambor PR ipa/104813 * ipa-cp.cc (create_specialized_node): Move removal of self-recursive calls from callers vector before refrence adjustments. gcc/testsuite/ChangeLog: 2022-03-07 Martin Jambor PR ipa/104813 * gcc.dg/ipa/pr104813.c: New test. --- gcc/ipa-cp.cc | 20 +++++++++--------- gcc/testsuite/gcc.dg/ipa/pr104813.c | 32 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/ipa/pr104813.c diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc index 453e9c93cc3..18047c209a8 100644 --- a/gcc/ipa-cp.cc +++ b/gcc/ipa-cp.cc @@ -5099,6 +5099,16 @@ create_specialized_node (struct cgraph_node *node, else new_adjustments = NULL; + auto_vec self_recursive_calls; + for (i = callers.length () - 1; i >= 0; i--) + { + cgraph_edge *cs = callers[i]; + if (cs->caller == node) + { + self_recursive_calls.safe_push (cs); + callers.unordered_remove (i); + } + } replace_trees = cinfo ? vec_safe_copy (cinfo->tree_map) : NULL; for (i = 0; i < count; i++) { @@ -5129,16 +5139,6 @@ create_specialized_node (struct cgraph_node *node, if (replace_map) vec_safe_push (replace_trees, replace_map); } - auto_vec self_recursive_calls; - for (i = callers.length () - 1; i >= 0; i--) - { - cgraph_edge *cs = callers[i]; - if (cs->caller == node) - { - self_recursive_calls.safe_push (cs); - callers.unordered_remove (i); - } - } unsigned &suffix_counter = clone_num_suffixes->get_or_insert ( IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME ( diff --git a/gcc/testsuite/gcc.dg/ipa/pr104813.c b/gcc/testsuite/gcc.dg/ipa/pr104813.c new file mode 100644 index 00000000000..34f413e3823 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ipa/pr104813.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +int a, b, c, d, *e; +void f(int h) { + if (b) { + int g; + while (g++) + d = *e; + e++; + } +} +static void i(); +static void j(int *h, int k, int *l) { + if (c) { + int *o = h, m; + f(*l); + i(m); + j(o, 1, o); + for (;;) + ; + } +} +void i() { + int *n = &a; + while (1) + j(n, 1, n); +} +int main() { + j(&a, 0, &a); + return 0; +} -- 2.35.1