From patchwork Wed Oct 28 21:32:20 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: 537574 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 DB8741402DD for ; Thu, 29 Oct 2015 08:32:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=fErbq7Es; 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=McDh3Cva2fBRh5j/K tP/c6Er58wEAvsx/5CZIdxIaXLGZat3izrPpBQoojH9tPxTMWU4oF+kgHcWtRXKT rj4OqzDDhXbbz/vBNFoAFksjLoVpvJHFB6QbHzUlZYAEmXR4MHU5lXcjOBgwaDUh eQqavZ8WYuKWA3SOAfxGogcA6c= 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=C1c14JYObJ9+PGIgIQksL68 aie8=; b=fErbq7EsA1HNVymsKtvLtwwnqz2eegbjos2zCs5aBr5xR+kgiHQwvID yxHvNVhnx+s6RqHsD6zPTR7sBSiWJsd1cVDHj6RTsMtal/O7WtixNrsKbCXgHUvS EebvZoZ1gRrW9g95HgYHsHCesopEoIrEQnpt/n50t6HDpci7if5c= Received: (qmail 65382 invoked by alias); 28 Oct 2015 21:32:34 -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 65361 invoked by uid 89); 28 Oct 2015 21:32:34 -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; Wed, 28 Oct 2015 21:32:32 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33595) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZrYKc-0001QU-2E for gcc-patches@gnu.org; Wed, 28 Oct 2015 17:32:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrYKY-0007lO-8L for gcc-patches@gnu.org; Wed, 28 Oct 2015 17:32:29 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:57895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrYKY-0007lF-1t for gcc-patches@gnu.org; Wed, 28 Oct 2015 17:32:26 -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 1ZrYKX-00075B-4Y from Tom_deVries@mentor.com ; Wed, 28 Oct 2015 14:32:25 -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; Wed, 28 Oct 2015 21:32:23 +0000 Subject: Re: [PATCH, 2/6] Rename make_restrict_var_constraints to make_param_constraints To: Richard Biener References: <562E0CF5.8000606@mentor.com> <562E5381.5@mentor.com> <562F26E2.40906@mentor.com> <562F6D1A.4010001@mentor.com> <562F72A9.6080401@mentor.com> CC: Richard Biener , "gcc-patches@gnu.org" From: Tom de Vries Message-ID: <56313EE4.40608@mentor.com> Date: Wed, 28 Oct 2015 22:32:20 +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 28/10/15 16:38, Richard Biener wrote: > On Tue, 27 Oct 2015, Tom de Vries wrote: > >> 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 no-functional-changes patch: >> - moves the one constraint handling loop left in >> intra_create_variable_infos to make_restrict_var_constraints >> - renames make_restrict_var_constraints to make_param_constraints >> - adds a parameter toplevel to make_param_constraints to distinguish >> between the two calling contexts > > Please pass in the name "PARAM_RESTRICT" vs. "GLOBAL_RESTRICT" instead. > I've added a restrict_name parameter. But I don't see how I can eliminate the toplevel parameter. Thanks, - Tom Rename make_restrict_var_constraints to make_param_constraints 2015-10-27 Tom de Vries * tree-ssa-structalias.c (make_restrict_var_constraints): Rename to ... (make_param_constraints): ... this. Add toplevel and restrict_name parameter. (intra_create_variable_infos): Use make_param_constraints. --- gcc/tree-ssa-structalias.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index e2fbbf1..6e16177 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5860,19 +5860,28 @@ debug_solution_for_var (unsigned int var) dump_solution_for_var (stderr, var); } -/* Register the constraints for restrict var VI. */ +/* Register the constraints for VI. If TOPLEVEL then VI is a function + parameter, otherwise VI is part of a function parameter. Use RESTRICT_NAME + as the base name of created restrict vars. */ static void -make_restrict_var_constraints (varinfo_t vi) +make_param_constraints (varinfo_t vi, bool toplevel, const char *restrict_name) { for (; vi; vi = vi_next (vi)) - if (vi->may_have_pointers) - { - if (vi->only_restrict_pointers) - make_constraint_from_global_restrict (vi, "GLOBAL_RESTRICT", true); - else - make_copy_constraint (vi, nonlocal_id); - } + { + if (vi->only_restrict_pointers) + make_constraint_from_global_restrict (vi, restrict_name, true); + else if (vi->may_have_pointers) + { + if (toplevel) + make_constraint_from (vi, nonlocal_id); + else + make_copy_constraint (vi, nonlocal_id); + } + + if (vi->is_full_var) + break; + } } /* Create varinfo structures for all of the variables in the @@ -5914,19 +5923,11 @@ intra_create_variable_infos (struct function *fn) vi->is_restrict_var = 1; insert_vi_for_tree (heapvar, vi); make_constraint_from (p, vi->id); - make_restrict_var_constraints (vi); + make_param_constraints (vi, false, "GLOBAL_RESTRICT"); continue; } - for (; p; p = vi_next (p)) - { - if (p->only_restrict_pointers) - make_constraint_from_global_restrict (p, "PARM_RESTRICT", true); - else if (p->may_have_pointers) - make_constraint_from (p, nonlocal_id); - if (p->is_full_var) - break; - } + make_param_constraints (p, true, "PARM_RESTRICT"); } /* Add a constraint for a result decl that is passed by reference. */ -- 1.9.1