From patchwork Thu Jun 2 09:14:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prathamesh Kulkarni X-Patchwork-Id: 69134 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp13853qgf; Thu, 2 Jun 2016 02:15:20 -0700 (PDT) X-Received: by 10.66.84.164 with SMTP id a4mr4024954paz.90.1464858920223; Thu, 02 Jun 2016 02:15:20 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id sv5si2280214pab.2.2016.06.02.02.15.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jun 2016 02:15:20 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-428854-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-428854-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-428854-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=b3bBqCgr4kB3UMjx7T Mw13jjFVkjbxK7Tmtk42J3zKn53X96SNNp4LlsruyEpQ1Tptt4b4owUp2kSVraGI H2MQG/nat82t8bCrTnfe8jmZHhcOJ0o4p7erlOp2gjhVgxJr8HYT2Y3X9kLJmphm ZXWbok1BVQwCkKHjjukFTHlG4= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=xEcQKYi7wStEIroqRKdViPgh JjI=; b=CBeMBl7HL1OYGANAvAeqhTR0y1BNcV0vTlvnJb1WnPwJwL1Q8fyDXq76 vL4vdgspsQXYT27q94/s06j8UL2kUkeCv8sm+hEHcWQpWZPes7niVxhBEs2a5it4 pK3DKIx5NakgiPa5BIMcIgUpam8w0jKpzFeRSVtKRc3uPrXPaH0= Received: (qmail 14799 invoked by alias); 2 Jun 2016 09:15:07 -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 14757 invoked by uid 89); 2 Jun 2016 09:15:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=states X-HELO: mail-io0-f173.google.com Received: from mail-io0-f173.google.com (HELO mail-io0-f173.google.com) (209.85.223.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 02 Jun 2016 09:14:53 +0000 Received: by mail-io0-f173.google.com with SMTP id o189so30177840ioe.2 for ; Thu, 02 Jun 2016 02:14:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=eXZIY26JhkJslt1Oto8kYQaiSxpNCNFj2/CrMHKaO74=; b=fsJjNEMAZDLyEjke26pYptEFvGiJ2losMIRfYLXehmP4D7d0IK36soI7oq3k+COA8D HVEmgPSCSIkopCTg65SQ3QSq9NOHZCTflR9ab22zvu5Kmg2dHtxJMQh0EaInrMVbWyzr gJjoGhrbuIG0ZR/qeClORKIJjvfGhv+LFWCw7K4ULHVW9K6VrzgVmrs7vYdw9Iokvwf0 Xk/nELSMMr0RXX3fkiRga4fXtizla4JMrerN3p8i8VeytBSfEM8x4pUe9KUbC1Ha39Ea BJ6hirRUM8++29GTV1RUmO5HZAj8hh1NnqX5a0YUOWBg00IP8fbfvquJnIqLpCEPTs9y 212g== X-Gm-Message-State: ALyK8tKe0GhVaGUZl5ZDnuGjIPE2KLes2hLHlQExvrLCRG9JMIErpmijatp7IDtM1SZ/WeBfsYLP9Ennp5OaEuyr MIME-Version: 1.0 X-Received: by 10.107.138.27 with SMTP id m27mr1870586iod.181.1464858891088; Thu, 02 Jun 2016 02:14:51 -0700 (PDT) Received: by 10.36.236.5 with HTTP; Thu, 2 Jun 2016 02:14:50 -0700 (PDT) In-Reply-To: References: Date: Thu, 2 Jun 2016 14:44:50 +0530 Message-ID: Subject: Re: move increase_alignment from simple to regular ipa pass From: Prathamesh Kulkarni To: Richard Biener Cc: gcc Patches , Jan Hubicka X-IsSubscribed: yes On 2 June 2016 at 13:23, Richard Biener wrote: > On Thu, 2 Jun 2016, Prathamesh Kulkarni wrote: > >> On 1 June 2016 at 18:37, Richard Biener wrote: >> > On Wed, 1 Jun 2016, Prathamesh Kulkarni wrote: >> > >> >> Hi Richard, >> >> This patch tries to move increase_alignment pass from small to regular ipa pass. >> >> Does the patch look correct ? >> >> Since we are only increasing alignment of varpool nodes, I am not sure >> >> if any ipa >> >> read/write hooks were necessary and passed NULL for them. >> >> Cross-tested on arm*-*-*, aarch64*-*-*, >> >> Bootstrap+test on aarch64-linux-gnu in progress. >> > >> > I think the patch looks sensible apart from the fact that both >> > flag_section_anchors and flag_tree_vectorize can have different >> > states for each function. This would mean the pass should get >> > its own non-Optimization flag initialized by targets where >> > section anchors are usually used and it means you'd want to >> > walk IPA refs to see whether variables are used in a function >> > with both section anchors and vectorization enabled. >> Hi, >> I have attached patch (stage-1 built) that walks ipa-refs to determine >> if function has flag_tree_loop_vectorize and flag_section_anchors set. >> Does it look OK ? >> >> "This would mean the pass should get its own non-Optimization flag >> initialized by targets where section anchors are usually used" >> IIUC should we add a new option -fno-increase_alignment and gate the >> pass on it ? Um sorry I didn't understand why targets >> with section anchors (arm, aarch64, ppc) should initialize this option ? > > Currently the pass is only run for targets with section anchors (and there > by default if they are enabled by default). So it makes sense to > run on those by default and the pass is not necessary on targets w/o > section anchors as the vectorizer can easily adjust alignment itself on > those. Ah indeed, thanks for explanation. Does the attached patch look OK (stage-1 built) ? I added new option -fipa-increase_alignment which is disabled by default and only enabled on arm, aarch64 and ppc. Thanks, Prathamesh > > Richard. > >> Thanks, >> Prathamesh >> > >> > Honza may have further comments. >> > >> > Thanks, >> > Richard. >> > >> >> Thanks, >> >> Prathamesh >> >> >> > >> > -- >> > Richard Biener >> > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg) >> > > -- > Richard Biener > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg) diff --git a/gcc/common.opt b/gcc/common.opt index fccd4b5..c964cf9 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -1586,6 +1586,10 @@ fira-algorithm= Common Joined RejectNegative Enum(ira_algorithm) Var(flag_ira_algorithm) Init(IRA_ALGORITHM_CB) Optimization -fira-algorithm=[CB|priority] Set the used IRA algorithm. +fipa-increase_alignment +Common Report Var(flag_ipa_increase_alignment) Init(0) Optimization +Option to gate increase_alignment ipa pass. + Enum Name(ira_algorithm) Type(enum ira_algorithm) UnknownError(unknown IRA algorithm %qs) diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 51d2d50..f1c383f 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -8251,6 +8251,8 @@ aarch64_override_options (void) aarch64_register_fma_steering (); + /* Enable increase_alignment pass. */ + flag_ipa_increase_alignment = 1; } /* Implement targetm.override_options_after_change. */ diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 4e453fd..5aca5d0 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3454,6 +3454,9 @@ arm_option_override (void) /* Init initial mode for testing. */ thumb_flipper = TARGET_THUMB; + + /* Enable increase_alignment pass. */ + flag_ipa_increase_alignment = 1; } static void diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index c6b2b6a..a046158 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -5011,6 +5011,9 @@ rs6000_option_override (void) = { pass_analyze_swaps, "cse1", 1, PASS_POS_INSERT_BEFORE }; register_pass (&analyze_swaps_info); + + /* Enable increase_alignment pass. */ + flag_ipa_increase_alignment = 1; } diff --git a/gcc/passes.def b/gcc/passes.def index 993ed28..a841183 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -138,12 +138,12 @@ along with GCC; see the file COPYING3. If not see PUSH_INSERT_PASSES_WITHIN (pass_ipa_tree_profile) NEXT_PASS (pass_feedback_split_functions); POP_INSERT_PASSES () - NEXT_PASS (pass_ipa_increase_alignment); NEXT_PASS (pass_ipa_tm); NEXT_PASS (pass_ipa_lower_emutls); TERMINATE_PASS_LIST (all_small_ipa_passes) INSERT_PASSES_AFTER (all_regular_ipa_passes) + NEXT_PASS (pass_ipa_increase_alignment); NEXT_PASS (pass_ipa_whole_program_visibility); NEXT_PASS (pass_ipa_profile); NEXT_PASS (pass_ipa_icf); diff --git a/gcc/testsuite/gcc.dg/vect/section-anchors-vect-73.c b/gcc/testsuite/gcc.dg/vect/section-anchors-vect-73.c new file mode 100644 index 0000000..74eaed8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/section-anchors-vect-73.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target section_anchors } */ +/* { dg-require-effective-target vect_int } */ + +#define N 32 + +/* Clone of section-anchors-vect-70.c with foo() having -fno-tree-loop-vectorize. */ + +static struct A { + int p1, p2; + int e[N]; +} a, b, c; + +__attribute__((optimize("-fno-tree-loop-vectorize"))) +int foo(void) +{ + for (int i = 0; i < N; i++) + a.e[i] = b.e[i] + c.e[i]; + + return a.e[0]; +} + +/* { dg-final { scan-ipa-dump-times "Increasing alignment of decl" 0 "increase_alignment" { target aarch64*-*-* } } } */ +/* { dg-final { scan-ipa-dump-times "Increasing alignment of decl" 0 "increase_alignment" { target powerpc64*-*-* } } } */ +/* { dg-final { scan-ipa-dump-times "Increasing alignment of decl" 0 "increase_alignment" { target arm*-*-* } } } */ diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index 66e103a..2d2e8fc 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -482,7 +482,7 @@ extern simple_ipa_opt_pass *make_pass_local_optimization_passes (gcc::context *c extern ipa_opt_pass_d *make_pass_ipa_whole_program_visibility (gcc::context *ctxt); -extern simple_ipa_opt_pass *make_pass_ipa_increase_alignment (gcc::context +extern ipa_opt_pass_d *make_pass_ipa_increase_alignment (gcc::context *ctxt); extern ipa_opt_pass_d *make_pass_ipa_inline (gcc::context *ctxt); extern simple_ipa_opt_pass *make_pass_ipa_free_lang_data (gcc::context *ctxt); diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c index 2669813..ff9333e 100644 --- a/gcc/tree-vectorizer.c +++ b/gcc/tree-vectorizer.c @@ -899,6 +899,34 @@ get_vec_alignment_for_type (tree type) return (alignment > TYPE_ALIGN (type)) ? alignment : 0; } +/* Return true if alignment should be increased for this vnode. + This is done if every function that references/referring to vnode + has flag_tree_loop_vectorize and flag_section_anchors set. */ + +static bool +increase_alignment_p (varpool_node *vnode) +{ + ipa_ref *ref; + + for (int i = 0; vnode->iterate_reference (i, ref); i++) + if (cgraph_node *cnode = dyn_cast (ref->referred)) + { + struct cl_optimization *opts = opts_for_fn (cnode->decl); + if (! (opts->x_flag_tree_vectorize && opts->x_flag_section_anchors)) + return false; + } + + for (int i = 0; vnode->iterate_referring (i, ref); i++) + if (cgraph_node *cnode = dyn_cast (ref->referring)) + { + struct cl_optimization *opts = opts_for_fn (cnode->decl); + if (! (opts->x_flag_tree_loop_vectorize && opts->x_flag_section_anchors)) + return false; + } + + return true; +} + /* Entry point to increase_alignment pass. */ static unsigned int increase_alignment (void) @@ -916,7 +944,8 @@ increase_alignment (void) if ((decl_in_symtab_p (decl) && !symtab_node::get (decl)->can_increase_alignment_p ()) - || DECL_USER_ALIGN (decl) || DECL_ARTIFICIAL (decl)) + || DECL_USER_ALIGN (decl) || DECL_ARTIFICIAL (decl) + || !increase_alignment_p (vnode)) continue; alignment = get_vec_alignment_for_type (TREE_TYPE (decl)); @@ -938,7 +967,7 @@ namespace { const pass_data pass_data_ipa_increase_alignment = { - SIMPLE_IPA_PASS, /* type */ + IPA_PASS, /* type */ "increase_alignment", /* name */ OPTGROUP_LOOP | OPTGROUP_VEC, /* optinfo_flags */ TV_IPA_OPT, /* tv_id */ @@ -949,17 +978,26 @@ const pass_data pass_data_ipa_increase_alignment = 0, /* todo_flags_finish */ }; -class pass_ipa_increase_alignment : public simple_ipa_opt_pass +class pass_ipa_increase_alignment : public ipa_opt_pass_d { public: pass_ipa_increase_alignment (gcc::context *ctxt) - : simple_ipa_opt_pass (pass_data_ipa_increase_alignment, ctxt) + : ipa_opt_pass_d (pass_data_ipa_increase_alignment, ctxt, + NULL, /* generate_summary */ + NULL, /* write summary */ + NULL, /* read summary */ + NULL, /* write optimization summary */ + NULL, /* read optimization summary */ + NULL, /* stmt fixup */ + 0, /* function_transform_todo_flags_start */ + NULL, /* transform function */ + NULL )/* variable transform */ {} /* opt_pass methods: */ virtual bool gate (function *) { - return flag_section_anchors && flag_tree_loop_vectorize; + return flag_ipa_increase_alignment != 0; } virtual unsigned int execute (function *) { return increase_alignment (); } @@ -968,7 +1006,7 @@ public: } // anon namespace -simple_ipa_opt_pass * +ipa_opt_pass_d * make_pass_ipa_increase_alignment (gcc::context *ctxt) { return new pass_ipa_increase_alignment (ctxt);