From patchwork Wed May 27 13:56:52 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: 477138 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 ADCA314012C for ; Thu, 28 May 2015 00:16:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=heXWjmRM; 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= GSv72XnZyki5+fZ8INp5tzf761nP0pGHnaTiEZZyvj8K/rprBuH+3C4pCod/mSNu RjYEVjgPdYouHvxdv5jf3cnQ8Q2JWNKv+06Qlng0+BJs2zBw2Fs9KBVp++UkWx65 6tRasIvVCvEuJ5gOUNq83kpDUlQJ/rIyiGFS7myoQqo= 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=PhZ6 Bg9n9REWhKg3Itc9JdrLvy4=; b=heXWjmRMFDZXuzycn5QqB+DmHP+vB75xjr6X pgkwbvQsFHHOt0azPJSNKURbw2Y/5CFW2vlgsodYOeLe/GZRNSWw5yTU5grf31Fi fUz1bJj2hUIg8riHCn69dDbGnPTh1RdcScUa9jv3OCcQes8Mz2+hVYcMDa0H9syj Q3qiUQM= Received: (qmail 79508 invoked by alias); 27 May 2015 14:16:00 -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 79260 invoked by uid 89); 27 May 2015 14:15:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.6 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:15:54 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxbsJ-0007LV-P8 for gcc-patches@gcc.gnu.org; Wed, 27 May 2015 10:00:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57539 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxbsJ-0007IB-EG for gcc-patches@gcc.gnu.org; Wed, 27 May 2015 10:00:03 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D2715AE03 for ; Wed, 27 May 2015 13:59:57 +0000 (UTC) Resent-From: =?UTF-8?B?TWFydGluIExpxaFrYQ==?= Resent-To: GCC Patches Resent-Date: Wed, 27 May 2015 15:59:57 +0200 Resent-Message-ID: <5565CDDD.6060906@suse.cz> Resent-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 Message-Id: <451bf86cfabcb965559ea94f1fd0d71f42eeb4d2.1432735040.git.mliska@suse.cz> 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:52 +0200 Subject: [PATCH 23/35] Change use to type-based pool allocator in tree-ssa-pre.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 * tree-ssa-pre.c (get_or_alloc_expr_for_name): Use new type-based pool allocator. (bitmap_set_new): Likewise. (get_or_alloc_expr_for_constant): Likewise. (get_or_alloc_expr_for): Likewise. (phi_translate_1): Likewise. (compute_avail): Likewise. (init_pre): Likewise. (fini_pre): Likewise. --- gcc/tree-ssa-pre.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index d857d84..082dbaf 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -380,7 +380,7 @@ clear_expression_ids (void) expressions.release (); } -static alloc_pool pre_expr_pool; +static pool_allocator pre_expr_pool ("pre_expr nodes", 30); /* Given an SSA_NAME NAME, get or create a pre_expr to represent it. */ @@ -398,7 +398,7 @@ get_or_alloc_expr_for_name (tree name) if (result_id != 0) return expression_for_id (result_id); - result = (pre_expr) pool_alloc (pre_expr_pool); + result = pre_expr_pool.allocate (); result->kind = NAME; PRE_EXPR_NAME (result) = name; alloc_expression_id (result); @@ -519,7 +519,7 @@ static unsigned int get_expr_value_id (pre_expr); /* We can add and remove elements and entries to and from sets and hash tables, so we use alloc pools for them. */ -static alloc_pool bitmap_set_pool; +static pool_allocator bitmap_set_pool ("Bitmap sets", 30); static bitmap_obstack grand_bitmap_obstack; /* Set of blocks with statements that have had their EH properties changed. */ @@ -635,7 +635,7 @@ add_to_value (unsigned int v, pre_expr e) static bitmap_set_t bitmap_set_new (void) { - bitmap_set_t ret = (bitmap_set_t) pool_alloc (bitmap_set_pool); + bitmap_set_t ret = bitmap_set_pool.allocate (); bitmap_initialize (&ret->expressions, &grand_bitmap_obstack); bitmap_initialize (&ret->values, &grand_bitmap_obstack); return ret; @@ -1125,7 +1125,7 @@ get_or_alloc_expr_for_constant (tree constant) if (result_id != 0) return expression_for_id (result_id); - newexpr = (pre_expr) pool_alloc (pre_expr_pool); + newexpr = pre_expr_pool.allocate (); newexpr->kind = CONSTANT; PRE_EXPR_CONSTANT (newexpr) = constant; alloc_expression_id (newexpr); @@ -1176,13 +1176,13 @@ get_or_alloc_expr_for (tree t) vn_nary_op_lookup (t, &result); if (result != NULL) { - pre_expr e = (pre_expr) pool_alloc (pre_expr_pool); + pre_expr e = pre_expr_pool.allocate (); e->kind = NARY; PRE_EXPR_NARY (e) = result; result_id = lookup_expression_id (e); if (result_id != 0) { - pool_free (pre_expr_pool, e); + pre_expr_pool.remove (e); e = expression_for_id (result_id); return e; } @@ -1526,7 +1526,7 @@ phi_translate_1 (pre_expr expr, bitmap_set_t set1, bitmap_set_t set2, if (result && is_gimple_min_invariant (result)) return get_or_alloc_expr_for_constant (result); - expr = (pre_expr) pool_alloc (pre_expr_pool); + expr = pre_expr_pool.allocate (); expr->kind = NARY; expr->id = 0; if (nary) @@ -1688,7 +1688,7 @@ phi_translate_1 (pre_expr expr, bitmap_set_t set1, bitmap_set_t set2, return NULL; } - expr = (pre_expr) pool_alloc (pre_expr_pool); + expr = pre_expr_pool.allocate (); expr->kind = REFERENCE; expr->id = 0; @@ -3795,7 +3795,7 @@ compute_avail (void) || gimple_bb (SSA_NAME_DEF_STMT (gimple_vuse (stmt))) != block) { - result = (pre_expr) pool_alloc (pre_expr_pool); + result = pre_expr_pool.allocate (); result->kind = REFERENCE; result->id = 0; PRE_EXPR_REFERENCE (result) = ref; @@ -3835,7 +3835,7 @@ compute_avail (void) && vn_nary_may_trap (nary)) continue; - result = (pre_expr) pool_alloc (pre_expr_pool); + result = pre_expr_pool.allocate (); result->kind = NARY; result->id = 0; PRE_EXPR_NARY (result) = nary; @@ -3876,7 +3876,7 @@ compute_avail (void) continue; } - result = (pre_expr) pool_alloc (pre_expr_pool); + result = pre_expr_pool.allocate (); result->kind = REFERENCE; result->id = 0; PRE_EXPR_REFERENCE (result) = ref; @@ -4779,10 +4779,6 @@ init_pre (void) bitmap_obstack_initialize (&grand_bitmap_obstack); phi_translate_table = new hash_table (5110); expression_to_id = new hash_table (num_ssa_names * 3); - bitmap_set_pool = create_alloc_pool ("Bitmap sets", - sizeof (struct bitmap_set), 30); - pre_expr_pool = create_alloc_pool ("pre_expr nodes", - sizeof (struct pre_expr_d), 30); FOR_ALL_BB_FN (bb, cfun) { EXP_GEN (bb) = bitmap_set_new (); @@ -4802,8 +4798,8 @@ fini_pre () value_expressions.release (); BITMAP_FREE (inserted_exprs); bitmap_obstack_release (&grand_bitmap_obstack); - free_alloc_pool (bitmap_set_pool); - free_alloc_pool (pre_expr_pool); + bitmap_set_pool.release (); + pre_expr_pool.release (); delete phi_translate_table; phi_translate_table = NULL; delete expression_to_id;