From patchwork Mon Oct 26 16:23:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 536102 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 C4FF41412FD for ; Tue, 27 Oct 2015 03:24:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=eVZtCBKq; 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 :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=xExXo2yfpR5QJ1XFs Teo+77VriaUFpNtKCCIGwlSmJxhmsJbGcls1lyS5eGHZe7lgmMEjokhZh4xtqiOy +ck1Ndny8mdm+5dIKm8Oeva4cpKnaRezMgcQxAjxSfmzpBhcF+kL0hWKqMYrMlbk TiBf8IU0ftCiSpTnhCWuQMNg8Q= 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 :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=5dc6jF8/TRVta6N5PjGlLBY dXrc=; b=eVZtCBKqO88ATW7BvFKFrDNsMOSmpAVKtgjz93X21yU9vZ/+xNl/DgR 5dG4UVaE5uo4ow5UcyrlvGffphD6XRerUunWBLIlJuwyXpGmHKbrY+cT1XzeOxjw 5EX/uC/kjdFVVM0DfzoH5XyzfdmtU2B6mDx4HfS32eoBfvmg0E58= Received: (qmail 105267 invoked by alias); 26 Oct 2015 16:23:57 -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 105250 invoked by uid 89); 26 Oct 2015 16:23:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 26 Oct 2015 16:23:55 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53370) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZqkYq-0007fq-PR for gcc-patches@gnu.org; Mon, 26 Oct 2015 12:23:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqkYn-0008Ce-6r for gcc-patches@gnu.org; Mon, 26 Oct 2015 12:23:52 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:52096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqkYm-0008CS-UA for gcc-patches@gnu.org; Mon, 26 Oct 2015 12:23:49 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZqkYk-00040k-NE from Tom_deVries@mentor.com ; Mon, 26 Oct 2015 09:23:47 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Mon, 26 Oct 2015 16:23:45 +0000 Subject: Re: [PATCH, 1/2] Add handle_param parameter to create_variable_info_for_1 To: Richard Biener References: <562E0CF5.8000606@mentor.com> CC: Richard Biener , "gcc-patches@gnu.org" From: Tom de Vries Message-ID: <562E5381.5@mentor.com> Date: Mon, 26 Oct 2015 17:23:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 On 26/10/15 14:42, Richard Biener wrote: > On Mon, Oct 26, 2015 at 12:22 PM, Tom de Vries wrote: >> >Hi, >> > >> >this no-functional-changes patch copies the restrict var declaration code >> >from intra_create_variable_infos to create_variable_info_for_1. >> > >> >The code was copied rather than moved, since in fipa-pta mode the varinfo p >> >for the parameter t may already exist due to create_function_info_for, in >> >which case we're not calling create_variable_info_for_1 to set p, meaning >> >the copied code won't get triggered. >> > >> >Bootstrapped and reg-tested on x86_64. >> > >> >OK for trunk? > @@ -272,6 +272,9 @@ struct variable_info > /* True if this field has only restrict qualified pointers. */ > unsigned int only_restrict_pointers : 1; > > + /* The id of the pointed-to restrict var in case only_restrict_pointers. */ > + unsigned int restrict_pointed_var; > + > /* True if this represents a heap var created for a restrict qualified > pointer. */ > unsigned int is_restrict_var : 1; > @@ -5608,10 +5611,10 @@ check_for_overlaps (vec fieldstack) > > > Please don't split the bitfield like that. Ah, indeed. > Note that variable_info > is kept as small as > possible because there may be a_lot_ of them. Is it really necessary to have > this info be persistent? The info is only needed for a short period, roughly the period of an invocation of intra_create_variable_infos. I've removed the field, and now the info is stored in a hash_map. > Why does create_variable_info_for_1 only handle > the single-field case? That is, I expected this to be handled by c_v_r_f_1 > fully. > Yep, that's the goal of PR67742. I've written a patch in an earlier version of the patch series that implements that, I'm currently porting that patch to this patch series. I'll post asap. I decided to post these two patches which do not present a full solution, since they are already an improvement over the current situation. Thanks, - Tom Add handle_param parameter to create_variable_info_for_1 2015-10-26 Tom de Vries * tree-ssa-structalias.c (restrict_pointed_var): New static variable. * (insert_restrict_pointed_var, lookup_restrict_pointed_var): New function. (create_variable_info_for_1): Add and handle handle_param parameter. (create_variable_info_for): Call create_variable_info_for_1 with extra arg. (intra_create_variable_infos): Same. Handle case that lookup_restrict_pointed_var (p) is not NULL. --- gcc/tree-ssa-structalias.c | 73 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 10 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 63a3d02..f1325e0 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5606,12 +5606,45 @@ check_for_overlaps (vec fieldstack) return false; } +/* Map from restrict pointer variable info to restrict var variable info. */ + +static hash_map *restrict_pointed_var = NULL; + +/* Insert VI2 as the restrict var for VI in the restrict_pointed_var map. */ + +static void +insert_restrict_pointed_var (varinfo_t vi, varinfo_t vi2) +{ + if (restrict_pointed_var == NULL) + restrict_pointed_var = new hash_map; + + bool mapped = restrict_pointed_var->put (vi, vi2); + gcc_assert (!mapped); +} + +/* Find the restrict var for restrict pointer VI in the restrict_pointed_var + map. If VI does not exist in the map, return NULL, otherwise, return the + varinfo we found. */ + +static varinfo_t +lookup_restrict_pointed_var (varinfo_t vi) +{ + if (restrict_pointed_var == NULL) + return NULL; + varinfo_t *slot = restrict_pointed_var->get (vi); + if (slot == NULL) + return NULL; + + return *slot; +} + + /* Create a varinfo structure for NAME and DECL, and add it to VARMAP. This will also create any varinfo structures necessary for fields - of DECL. */ + of DECL. DECL is a function parameter if HANDLE_PARAM is set. */ static varinfo_t -create_variable_info_for_1 (tree decl, const char *name) +create_variable_info_for_1 (tree decl, const char *name, bool handle_param) { varinfo_t vi, newvi; tree decl_type = TREE_TYPE (decl); @@ -5687,6 +5720,17 @@ create_variable_info_for_1 (tree decl, const char *name) if (POINTER_TYPE_P (TREE_TYPE (decl)) && TYPE_RESTRICT (TREE_TYPE (decl))) vi->only_restrict_pointers = 1; + if (vi->only_restrict_pointers + && handle_param) + { + varinfo_t rvi; + tree heapvar = build_fake_var_decl (TREE_TYPE (decl_type)); + DECL_EXTERNAL (heapvar) = 1; + rvi = create_variable_info_for_1 (heapvar, "PARM_NOALIAS", false); + rvi->is_restrict_var = 1; + insert_vi_for_tree (heapvar, rvi); + insert_restrict_pointed_var (vi, rvi); + } fieldstack.release (); return vi; } @@ -5738,7 +5782,7 @@ create_variable_info_for_1 (tree decl, const char *name) static unsigned int create_variable_info_for (tree decl, const char *name) { - varinfo_t vi = create_variable_info_for_1 (decl, name); + varinfo_t vi = create_variable_info_for_1 (decl, name, false); unsigned int id = vi->id; insert_vi_for_tree (decl, vi); @@ -5880,7 +5924,8 @@ intra_create_variable_infos (struct function *fn) varinfo_t p = lookup_vi_for_tree (t); if (p == NULL) { - p = create_variable_info_for_1 (t, alias_get_name (t)); + p = create_variable_info_for_1 (t, alias_get_name (t), + recursive_restrict_p); insert_vi_for_tree (t, p); } @@ -5890,12 +5935,17 @@ intra_create_variable_infos (struct function *fn) in the first/last subfield of the object. */ if (recursive_restrict_p) { - varinfo_t vi; - tree heapvar = build_fake_var_decl (TREE_TYPE (TREE_TYPE (t))); - DECL_EXTERNAL (heapvar) = 1; - vi = create_variable_info_for_1 (heapvar, "PARM_NOALIAS"); - vi->is_restrict_var = 1; - insert_vi_for_tree (heapvar, vi); + varinfo_t vi = lookup_restrict_pointed_var (p); + if (vi == NULL) + { + tree heapvar = build_fake_var_decl (TREE_TYPE (TREE_TYPE (t))); + DECL_EXTERNAL (heapvar) = 1; + vi = create_variable_info_for_1 (heapvar, "PARM_NOALIAS", false); + vi->is_restrict_var = 1; + insert_vi_for_tree (heapvar, vi); + insert_restrict_pointed_var (p, vi); + p->only_restrict_pointers = 1; + } make_constraint_from (p, vi->id); make_restrict_var_constraints (vi); continue; @@ -5915,6 +5965,9 @@ intra_create_variable_infos (struct function *fn) } } + delete restrict_pointed_var; + restrict_pointed_var = NULL; + /* Add a constraint for a result decl that is passed by reference. */ if (DECL_RESULT (fn->decl) && DECL_BY_REFERENCE (DECL_RESULT (fn->decl))) -- 1.9.1