From patchwork Tue Oct 27 12:56:45 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: 536612 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 AB975141368 for ; Tue, 27 Oct 2015 23:57:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=KfgIY5GL; 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=T48uNF+BDzOoqEzFr /dRUm2ebuRymUlCpd17YYlTf5K1yNYkjUFcOVrzet7wj2fp6HJ/Xb2EihiCXk1N2 /q7Y/XX6MUFi5F9X2dKjkmWr1G8Uxuprx9Uj80AzkwcuYcU011TDrYNTn9v6dIrb M+3Yb3OBY+GCvDejEZN9CjNkbM= 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=TU9IrvwQqJmuwsnasLy0gQl mwQU=; b=KfgIY5GL+COrAVi7EppN18YjYKoNEU4ac5V6/t2+0s4ipeFi8kQ0QFj rlVp/NET+N2WsQVekkdm4IZRo9DrTCXVW7Qx16f8gbIvKitfKEjiVAIyJ3zAeYbT O3SdS0PNdB8v1u+2C2p6QU0nBfuA1bz3tUpp8rj5AKZ5K6th7i+s= Received: (qmail 115230 invoked by alias); 27 Oct 2015 12:57:15 -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 115217 invoked by uid 89); 27 Oct 2015 12:57:14 -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; Tue, 27 Oct 2015 12:57:12 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55424) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zr3oM-0004XY-Ct for gcc-patches@gnu.org; Tue, 27 Oct 2015 08:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zr3oH-0003Di-Om for gcc-patches@gnu.org; Tue, 27 Oct 2015 08:57:09 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:63372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr3oH-0003DW-GR for gcc-patches@gnu.org; Tue, 27 Oct 2015 08:57:05 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zr3oG-0004ix-2x from Tom_deVries@mentor.com ; Tue, 27 Oct 2015 05:57:04 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Tue, 27 Oct 2015 12:57:02 +0000 Subject: [PATCH, 3/6] Add recursion to make_param_constraints To: Richard Biener References: <562E0CF5.8000606@mentor.com> <562E5381.5@mentor.com> <562F26E2.40906@mentor.com> <562F6D1A.4010001@mentor.com> CC: Richard Biener , "gcc-patches@gnu.org" From: Tom de Vries Message-ID: <562F748D.5020507@mentor.com> Date: Tue, 27 Oct 2015 13:56:45 +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: <562F6D1A.4010001@mentor.com> X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 On 27/10/15 13:24, Tom de Vries wrote: > Thinking it over a bit more, I realized the constraint handling started > to be messy. I've reworked the patch series to simplify that first. > > 1 Simplify constraint handling > 2 Rename make_restrict_var_constraints to make_param_constraints > 3 Add recursion to make_param_constraints > 4 Add handle_param parameter to create_variable_info_for_1 > 5 Handle recursive restrict pointer in create_variable_info_for_1 > 6 Handle restrict struct fields recursively > > Currently doing bootstrap and regtest on x86_64. > > I'll repost the patch series in reply to this message. > This patch: - registers the connection between a restrict pointer var and a restrict var in a new hash_map restrict_pointed_var. - move the restrict pointer constraint handling from intra_create_variable_infos to make_param_constraints The result of this and the two preceding patches is that the constraint handling for params in intra_create_variable_infos is reduced to a single call to make_param_constraints. Thanks, - Tom Add recursion to make_param_constraints 2015-10-27 Tom de Vries * tree-ssa-structalias.c (restrict_pointed_var): New static var. (insert_restrict_pointed_var, lookup_restrict_pointed_var): New function. (make_param_constraints): Handle case that lookup_restrict_pointed_var (vi) != NULL. (intra_create_variable_infos): Call insert_restrict_pointed_var. Simplify constraint handling. Delete restrict_pointed_var. --- gcc/tree-ssa-structalias.c | 48 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index e88fbf0..93bc325 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5607,6 +5607,39 @@ 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. */ @@ -5856,7 +5889,13 @@ make_param_constraints (varinfo_t vi, bool toplevel) { if (vi->only_restrict_pointers) { - if (toplevel) + varinfo_t rvi = lookup_restrict_pointed_var (vi); + if (rvi != NULL) + { + make_constraint_from (vi, rvi->id); + make_param_constraints (rvi, false); + } + else if (toplevel) make_constraint_from_global_restrict (vi, "PARM_RESTRICT"); else make_constraint_from_global_restrict (vi, "GLOBAL_RESTRICT"); @@ -5910,14 +5949,15 @@ intra_create_variable_infos (struct function *fn) vi = create_variable_info_for_1 (heapvar, "PARM_NOALIAS"); vi->is_restrict_var = 1; insert_vi_for_tree (heapvar, vi); - make_constraint_from (p, vi->id); - make_param_constraints (vi, false); - continue; + insert_restrict_pointed_var (p, vi); } make_param_constraints (p, true); } + 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