From patchwork Wed May 27 13:56:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 477140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BD4EF14012C for ; Thu, 28 May 2015 00:16:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=kIT+1t0R; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :resent-from:resent-to:resent-date:resent-message-id:message-id :in-reply-to:references:from:date:subject:to; q=dns; s=default; b= HjAfiY68CwteEX1P58M3HUbD3pPR+q3pLrpZkl0ArOlTwuZYy75+54mg2glrSs5O 3ncfSO9Bjno9CKCHJpGO+8TJt6hW8rWT5gQXHHdi7Y6Oax+qhleGB1vDdVnI8CTZ /3KSDkzsRhTi7qtjbdyROflRqoOHFtv06nRefNeSt0I= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :resent-from:resent-to:resent-date:resent-message-id:message-id :in-reply-to:references:from:date:subject:to; s=default; bh=OHyb +8JgMYba5rz9AUPG0ClCizA=; b=kIT+1t0RAIkTurGDrgk4eP2qqaLvJsgO3ZkS BIXGzcUWSQRWEq+Yaq9s4w1qo2vozOFc9/ydM6Kxe5XlhNqeCEXL4tnv3o9fWB/K r0th1Iq8tO0MCH8OIOgzZDLLbp1xQpnSz04ETWkPaiICvNmSPtiEN9bg67p7Ttbt HfZ0m/o= Received: (qmail 82414 invoked by alias); 27 May 2015 14:16:17 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 82344 invoked by uid 89); 27 May 2015 14:16:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.7 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 27 May 2015 14:16:10 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxbsJ-0007MD-T3 for gcc-patches@gcc.gnu.org; Wed, 27 May 2015 10:00:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57526 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxbsJ-0007Eg-Kf for gcc-patches@gcc.gnu.org; Wed, 27 May 2015 10:00:03 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5FFD4AE0A for ; Wed, 27 May 2015 13:59:58 +0000 (UTC) Resent-From: =?UTF-8?B?TWFydGluIExpxaFrYQ==?= Resent-To: GCC Patches Resent-Date: Wed, 27 May 2015 15:59:58 +0200 Resent-Message-ID: <5565CDDE.2050509@suse.cz> Resent-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 Message-Id: In-Reply-To: <83d59ba92a3c4b3ba831ebc2fce325f0416848d0.1432735040.git.mliska@suse.cz> References: <83d59ba92a3c4b3ba831ebc2fce325f0416848d0.1432735040.git.mliska@suse.cz> From: mliska Date: Wed, 27 May 2015 15:56:55 +0200 Subject: [PATCH 31/35] Change use to type-based pool allocator in ipa-prop.c and ipa-cp.c. To: gcc-patches@gcc.gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-IsSubscribed: yes gcc/ChangeLog: 2015-04-30 Martin Liska * ipa-cp.c (ipcp_value::add_source): Use new type-based pool allocator. (allocate_and_init_ipcp_value): Likewise. (ipcp_lattice::add_value): Likewise. (merge_agg_lats_step): Likewise. (ipcp_driver): Likewise. * ipa-prop.c (ipa_free_all_structures_after_ipa_cp): Likewise. (ipa_free_all_structures_after_iinln): Likewise. * ipa-prop.h: Likewise. --- gcc/ipa-cp.c | 37 +++++++++++++++++-------------------- gcc/ipa-prop.c | 20 ++++++++------------ gcc/ipa-prop.h | 19 +++++++++++++++---- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index 356f402..0c3f885 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -291,10 +291,17 @@ public: /* Allocation pools for values and their sources in ipa-cp. */ -alloc_pool ipcp_cst_values_pool; -alloc_pool ipcp_poly_ctx_values_pool; -alloc_pool ipcp_sources_pool; -alloc_pool ipcp_agg_lattice_pool; +pool_allocator > ipcp_cst_values_pool ("IPA-CP constant values", + 32); + +pool_allocator > ipcp_poly_ctx_values_pool + ("IPA-CP polymorphic contexts", 32); + +pool_allocator > ipcp_sources_pool + ("IPA-CP value sources", 64); + +pool_allocator ipcp_agg_lattice_pool + ("IPA_CP aggregate lattices", 32); /* Maximal count found in program. */ @@ -1147,7 +1154,7 @@ ipcp_value::add_source (cgraph_edge *cs, ipcp_value *src_val, { ipcp_value_source *src; - src = new (pool_alloc (ipcp_sources_pool)) ipcp_value_source; + src = new (ipcp_sources_pool.allocate ()) ipcp_value_source; src->offset = offset; src->cs = cs; src->val = src_val; @@ -1165,7 +1172,7 @@ allocate_and_init_ipcp_value (tree source) { ipcp_value *val; - val = new (pool_alloc (ipcp_cst_values_pool)) ipcp_value; + val = ipcp_cst_values_pool.allocate (); memset (val, 0, sizeof (*val)); val->value = source; return val; @@ -1179,8 +1186,8 @@ allocate_and_init_ipcp_value (ipa_polymorphic_call_context source) { ipcp_value *val; - val = new (pool_alloc (ipcp_poly_ctx_values_pool)) - ipcp_value; + // TODO + val = ipcp_poly_ctx_values_pool.allocate (); memset (val, 0, sizeof (*val)); val->value = source; return val; @@ -1229,7 +1236,7 @@ ipcp_lattice::add_value (valtype newval, cgraph_edge *cs, { ipcp_value_source *src = val->sources; val->sources = src->next; - pool_free (ipcp_sources_pool, src); + ipcp_sources_pool.remove ((ipcp_value_source*)src); } } @@ -1599,7 +1606,7 @@ merge_agg_lats_step (struct ipcp_param_lattices *dest_plats, if (dest_plats->aggs_count == PARAM_VALUE (PARAM_IPA_MAX_AGG_ITEMS)) return false; dest_plats->aggs_count++; - new_al = (struct ipcp_agg_lattice *) pool_alloc (ipcp_agg_lattice_pool); + new_al = ipcp_agg_lattice_pool.allocate (); memset (new_al, 0, sizeof (*new_al)); new_al->offset = offset; @@ -4463,16 +4470,6 @@ ipcp_driver (void) edge_removal_hook_holder = symtab->add_edge_removal_hook (&ipcp_edge_removal_hook, NULL); - ipcp_cst_values_pool = create_alloc_pool ("IPA-CP constant values", - sizeof (ipcp_value), 32); - ipcp_poly_ctx_values_pool = create_alloc_pool - ("IPA-CP polymorphic contexts", - sizeof (ipcp_value), 32); - ipcp_sources_pool = create_alloc_pool ("IPA-CP value sources", - sizeof (ipcp_value_source), 64); - ipcp_agg_lattice_pool = create_alloc_pool ("IPA_CP aggregate lattices", - sizeof (struct ipcp_agg_lattice), - 32); if (dump_file) { fprintf (dump_file, "\nIPA structures before propagation:\n"); diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 80ce6b8..e90502b 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -3669,10 +3669,10 @@ ipa_free_all_structures_after_ipa_cp (void) { ipa_free_all_edge_args (); ipa_free_all_node_params (); - free_alloc_pool (ipcp_sources_pool); - free_alloc_pool (ipcp_cst_values_pool); - free_alloc_pool (ipcp_poly_ctx_values_pool); - free_alloc_pool (ipcp_agg_lattice_pool); + ipcp_sources_pool.release (); + ipcp_cst_values_pool.release (); + ipcp_poly_ctx_values_pool.release (); + ipcp_agg_lattice_pool.release (); ipa_unregister_cgraph_hooks (); ipa_refdesc_pool.release (); } @@ -3687,14 +3687,10 @@ ipa_free_all_structures_after_iinln (void) ipa_free_all_edge_args (); ipa_free_all_node_params (); ipa_unregister_cgraph_hooks (); - if (ipcp_sources_pool) - free_alloc_pool (ipcp_sources_pool); - if (ipcp_cst_values_pool) - free_alloc_pool (ipcp_cst_values_pool); - if (ipcp_poly_ctx_values_pool) - free_alloc_pool (ipcp_poly_ctx_values_pool); - if (ipcp_agg_lattice_pool) - free_alloc_pool (ipcp_agg_lattice_pool); + ipcp_sources_pool.release (); + ipcp_cst_values_pool.release (); + ipcp_poly_ctx_values_pool.release (); + ipcp_agg_lattice_pool.release (); ipa_refdesc_pool.release (); } diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h index 0488254..e6725aa 100644 --- a/gcc/ipa-prop.h +++ b/gcc/ipa-prop.h @@ -595,10 +595,21 @@ void ipa_print_node_jump_functions (FILE *f, struct cgraph_node *node); void ipa_print_all_jump_functions (FILE * f); void ipcp_verify_propagated_values (void); -extern alloc_pool ipcp_cst_values_pool; -extern alloc_pool ipcp_poly_ctx_values_pool; -extern alloc_pool ipcp_sources_pool; -extern alloc_pool ipcp_agg_lattice_pool; +template +class ipcp_value; + +extern pool_allocator > ipcp_cst_values_pool; +extern pool_allocator > + ipcp_poly_ctx_values_pool; + +template +class ipcp_value_source; + +extern pool_allocator > ipcp_sources_pool; + +class ipcp_agg_lattice; + +extern pool_allocator ipcp_agg_lattice_pool; /* Operation to be performed for the parameter in ipa_parm_adjustment below. */