From patchwork Thu Oct 29 12:14:19 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: 537810 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 1F1C9140D97 for ; Thu, 29 Oct 2015 23:14:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=kIKRu3R9; 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=T3rGl1MnbgWkgMu9X dg0TAu1Nh8vbaDQsCD+rGm3sgKyNXI724gRqSU23Fx55BQN/smDu3cNC6xJntFL7 5f2AvPJywQL5rUlvG82Oetaa+ppJo+4NpV7sVu/d6Tv9p2K2pGOJTVISvPldwajZ RcNgAxEpu1GJ/lpQBVNwcOm8r0= 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=8GYYddiQSU5wNKxjYRMJqj7 3nLc=; b=kIKRu3R9fgqgcxtUFWr1AHLYEnT6I0fCsPbn7RgvRltQyxl+61kiQuN 0hONcWD5NJLaoGuuXiTtKVbTY6y7j6H9ScNEdiQ7PqFNCpq+6kGTbVcR9EGI5V+J 7BTgOwpTMb8ikAWu9M3qX5eEBS3FAjpwYQ+ocnszWw4DKS2ly1as= Received: (qmail 123258 invoked by alias); 29 Oct 2015 12:14:36 -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 123223 invoked by uid 89); 29 Oct 2015 12:14:35 -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; Thu, 29 Oct 2015 12:14:33 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54666) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zrm6B-0001t9-FG for gcc-patches@gnu.org; Thu, 29 Oct 2015 08:14:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zrm67-0006g5-7e for gcc-patches@gnu.org; Thu, 29 Oct 2015 08:14:31 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:48314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrm66-0006fE-Vh for gcc-patches@gnu.org; Thu, 29 Oct 2015 08:14:27 -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 1Zrm64-0001wN-Ow from Tom_deVries@mentor.com ; Thu, 29 Oct 2015 05:14:25 -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; Thu, 29 Oct 2015 12:14:23 +0000 Subject: Re: [PATCH, 1/6] Simplify constraint handling To: Richard Biener References: <562E0CF5.8000606@mentor.com> <562E5381.5@mentor.com> <562F26E2.40906@mentor.com> <562F6D1A.4010001@mentor.com> <562F711F.80900@mentor.com> <5630F242.7040806@mentor.com> CC: Richard Biener , "gcc-patches@gnu.org" From: Tom de Vries Message-ID: <56320D9B.4070006@mentor.com> Date: Thu, 29 Oct 2015 13:14:19 +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 29/10/15 12:13, Richard Biener wrote: > On Wed, 28 Oct 2015, Tom de Vries wrote: > >> >On 28/10/15 16:35, 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 patch gets rid of this bit of code in intra_create_variable_infos: >>>> > > >... >>>> > > > if (restrict_pointer_p) >>>> > > > make_constraint_from_global_restrict (p, "PARM_RESTRICT"); >>>> > > > else >>>> > > >.. >>>> > > > >>>> > > >I already proposed to remove it here ( >>>> > > >https://gcc.gnu.org/ml/gcc-patches/2015-10/msg02426.html ) but there is a >>>> > > >problem with that approach: It can happen that restrict_pointer_p is true, >>>> > > >but >>>> > > >p->only_restrict_pointers is false. This happens with fipa-pta, when >>>> > > >create_function_info_for created a varinfo for the parameter before >>>> > > >intra_create_variable_infos was called. >>>> > > > >>>> > > >The patch handles that case now by setting p->only_restrict_pointers. >>> > > >>> > >Hmm, but ... restrict only has an effect in non-IPA mode. >> > >> >Indeed, I also realized that by now. >> > >> >I wrote attached patch to make that explicit and simplify fipa-pta. >> > >> >OK for trunk if bootstrap and reg-test succeeds? First, there was an error in the patch, it tested for flag_ipa_pta (so it also affected ealias), but it was supposed to test for in_ipa mode. That is fixed in attached version. > I don't see the patch simplifies anything but only removes spurious > settings by adding IMHO redundant checks. Consider testcase: ... int __attribute__((noinline, noclone)) foo (int *__restrict__ a, int *__restrict__ b) { *a = 1; *b = 2; } int __attribute__((noinline, noclone)) bar (int *a, int *b) { foo (a, b); } ... The impact of this patch in the pta dump (focusing on the constraints bit) is: ... Generating constraints for foo (foo) -foo.arg0 = &PARM_NOALIAS(20) -PARM_NOALIAS(20) = NONLOCAL -foo.arg1 = &PARM_NOALIAS(21) -PARM_NOALIAS(21) = NONLOCAL +foo.arg0 = &NONLOCAL +foo.arg1 = &NONLOCAL ... That's the kind of simplifications I'm trying to achieve. Thanks, - Tom Don't interpret restrict in ipa_pta_execute 2015-10-28 Tom de Vries * tree-ssa-structalias.c (push_fields_onto_fieldstack) (create_variable_info_for_1, create_variable_info_for) (intra_create_variable_infos): Ignore restrict if in_ipa_mode. --- gcc/tree-ssa-structalias.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 6f72dd3..66ff8cb 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5384,7 +5384,8 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack, e.must_have_pointers = must_have_pointers_p; e.may_have_pointers = true; e.only_restrict_pointers - = (!has_unknown_size + = (!in_ipa_mode + && !has_unknown_size && POINTER_TYPE_P (field_type) && TYPE_RESTRICT (field_type)); fieldstack->safe_push (e); @@ -5697,7 +5698,8 @@ create_variable_info_for_1 (tree decl, const char *name, bool add_id) vi->fullsize = tree_to_uhwi (declsize); vi->size = vi->fullsize; vi->is_full_var = true; - if (POINTER_TYPE_P (TREE_TYPE (decl)) + if (!in_ipa_mode + && POINTER_TYPE_P (TREE_TYPE (decl)) && TYPE_RESTRICT (TREE_TYPE (decl))) vi->only_restrict_pointers = 1; fieldstack.release (); @@ -5767,9 +5769,10 @@ create_variable_info_for (tree decl, const char *name, bool add_id) continue; /* Mark global restrict qualified pointers. */ - if ((POINTER_TYPE_P (TREE_TYPE (decl)) - && TYPE_RESTRICT (TREE_TYPE (decl))) - || vi->only_restrict_pointers) + if (!in_ipa_mode + && ((POINTER_TYPE_P (TREE_TYPE (decl)) + && TYPE_RESTRICT (TREE_TYPE (decl))) + || vi->only_restrict_pointers)) { varinfo_t rvi = make_constraint_from_global_restrict (vi, "GLOBAL_RESTRICT", @@ -5886,7 +5889,8 @@ intra_create_variable_infos (struct function *fn) passed-by-reference argument. */ for (t = DECL_ARGUMENTS (fn->decl); t; t = DECL_CHAIN (t)) { - bool restrict_pointer_p = (POINTER_TYPE_P (TREE_TYPE (t)) + bool restrict_pointer_p = (!in_ipa_mode + && POINTER_TYPE_P (TREE_TYPE (t)) && TYPE_RESTRICT (TREE_TYPE (t))); bool recursive_restrict_p = (restrict_pointer_p -- 1.9.1