From patchwork Mon Sep 28 18:47:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 1373554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 ozlabs.org (Postfix) with ESMTPS id 4C17282zn0z9sT6 for ; Wed, 30 Sep 2020 04:19:12 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 225073973081; Tue, 29 Sep 2020 18:19:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id D947138708AA for ; Tue, 29 Sep 2020 18:19:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D947138708AA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mjambor@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id EC8B2B202 for ; Tue, 29 Sep 2020 18:19:01 +0000 (UTC) Resent-From: Martin Jambor Resent-Date: Tue, 29 Sep 2020 20:19:01 +0200 Resent-Message-ID: <20200929181901.GC13380@virgil.suse.cz> Resent-To: GCC Patches Message-Id: In-Reply-To: References: From: Martin Jambor Date: Mon, 28 Sep 2020 20:47:38 +0200 Subject: [PATCH 2/6] ipa: Introduce ipa_cached_call_context To: GCC Patches X-Spam-Status: No, score=-3038.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Jan Hubicka Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, as we discussed with Honza on the mailin glist last week, making cached call context structure distinct from the normal one may make it clearer that the cached data need to be explicitely deallocated. This patch does that division. It is not mandatory for the overall main goals of the patch set and can be dropped if deemed superfluous. gcc/ChangeLog: 2020-09-02 Martin Jambor * ipa-fnsummary.h (ipa_cached_call_context): New forward declaration and class. (class ipa_call_context): Make friend ipa_cached_call_context. Moved methods duplicate_from and release to it too. * ipa-fnsummary.c (ipa_call_context::duplicate_from): Moved to class ipa_cached_call_context. (ipa_call_context::release): Likewise, removed the parameter. * ipa-inline-analysis.c (node_context_cache_entry): Change the type of ctx to ipa_cached_call_context. (do_estimate_edge_time): Remove parameter from the call to ipa_cached_call_context::release. --- gcc/ipa-fnsummary.c | 21 ++++++++------------- gcc/ipa-fnsummary.h | 16 ++++++++++++++-- gcc/ipa-inline-analysis.c | 4 ++-- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c index e8645aa0a1b..4ef7d2570e9 100644 --- a/gcc/ipa-fnsummary.c +++ b/gcc/ipa-fnsummary.c @@ -3329,7 +3329,7 @@ ipa_call_context::ipa_call_context (cgraph_node *node, clause_t possible_truths, /* Set THIS to be a duplicate of CTX. Copy all relevant info. */ void -ipa_call_context::duplicate_from (const ipa_call_context &ctx) +ipa_cached_call_context::duplicate_from (const ipa_call_context &ctx) { m_node = ctx.m_node; m_possible_truths = ctx.m_possible_truths; @@ -3399,24 +3399,19 @@ ipa_call_context::duplicate_from (const ipa_call_context &ctx) m_avals.m_known_value_ranges = vNULL; } -/* Release memory used by known_vals/contexts/aggs vectors. - If ALL is true release also inline_param_summary. - This happens when context was previously duplicated to be stored - into cache. */ +/* Release memory used by known_vals/contexts/aggs vectors. and + inline_param_summary. */ void -ipa_call_context::release (bool all) +ipa_cached_call_context::release () { /* See if context is initialized at first place. */ if (!m_node) return; - ipa_release_agg_values (m_avals.m_known_aggs, all); - if (all) - { - m_avals.m_known_vals.release (); - m_avals.m_known_contexts.release (); - m_inline_param_summary.release (); - } + ipa_release_agg_values (m_avals.m_known_aggs, true); + m_avals.m_known_vals.release (); + m_avals.m_known_contexts.release (); + m_inline_param_summary.release (); } /* Return true if CTX describes the same call context as THIS. */ diff --git a/gcc/ipa-fnsummary.h b/gcc/ipa-fnsummary.h index 6893858d18e..020a6f0425d 100644 --- a/gcc/ipa-fnsummary.h +++ b/gcc/ipa-fnsummary.h @@ -287,6 +287,8 @@ public: ipa_call_summary *dst_data); }; +class ipa_cached_call_context; + /* This object describe a context of call. That is a summary of known information about its parameters. Main purpose of this context is to give more realistic estimations of function runtime, size and @@ -307,8 +309,6 @@ public: sreal *ret_time, sreal *ret_nonspecialized_time, ipa_hints *ret_hints); - void duplicate_from (const ipa_call_context &ctx); - void release (bool all = false); bool equal_to (const ipa_call_context &); bool exists_p () { @@ -329,6 +329,18 @@ private: /* Even after having calculated clauses, the information about argument values is used to resolve indirect calls. */ ipa_call_arg_values m_avals; + + friend ipa_cached_call_context; +}; + +/* Variant of ipa_call_context that is stored in a cache over a longer period + of time. */ + +class ipa_cached_call_context : public ipa_call_context +{ +public: + void duplicate_from (const ipa_call_context &ctx); + void release (); }; extern fast_call_summary *ipa_call_summaries; diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index d2ae8196d09..b7af77f7b9b 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -57,7 +57,7 @@ fast_call_summary *edge_growth_cache = NULL; class node_context_cache_entry { public: - ipa_call_context ctx; + ipa_cached_call_context ctx; sreal time, nonspec_time; int size; ipa_hints hints; @@ -226,7 +226,7 @@ do_estimate_edge_time (struct cgraph_edge *edge, sreal *ret_nonspec_time) node_context_cache_miss++; else node_context_cache_clear++; - e->entry.ctx.release (true); + e->entry.ctx.release (); ctx.estimate_size_and_time (&size, &min_size, &time, &nonspec_time, &hints); e->entry.size = size;