From patchwork Mon Nov 9 18:13:35 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: 541938 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 12CCC140D8F for ; Tue, 10 Nov 2015 05:14:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=xCsrxbyu; 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=I2whf9+tJPHpWWWFZ yKbN7a7rfdwPZMfAq5uo5Dg8shmSsRvwCxpSdsqqlqfadTz9DHD7MdMnvQvgHuZ3 cr6bdT1si/GePJFeY7DtxG7rwA9/Q8LcMevtX/o1+Jq64J2KY5KpVM+NCHNdXE29 tNAHolXLw0odC8/Ed7RKin9NOw= 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=CEgRrEao1AfB3Km3oSm+CeZ J0Ys=; b=xCsrxbyuLy7PovYM/60poT235I979fmjCzKeFv9tg9BRP3y4yDfwWgt eRc48YYQepMmgj1nwFcF2JJbWKFf1qVOFj6FIiX5tkVlOKCEO4jYsG6hQvQlvBr4 MLmO1eErfQOnG4qrHbYZSFQTaqH9lFB2oHG9Xs2lBrqqQozhFxq0= Received: (qmail 21861 invoked by alias); 9 Nov 2015 18:14:13 -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 21850 invoked by uid 89); 9 Nov 2015 18:14:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 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, 09 Nov 2015 18:14:10 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54789) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZvqxD-0006Je-Vq for gcc-patches@gnu.org; Mon, 09 Nov 2015 13:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvqxA-000868-3x for gcc-patches@gnu.org; Mon, 09 Nov 2015 13:14:07 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:44117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvqx9-000855-RR for gcc-patches@gnu.org; Mon, 09 Nov 2015 13:14:04 -0500 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 1Zvqx7-0006cd-Fo from Tom_deVries@mentor.com ; Mon, 09 Nov 2015 10:14:01 -0800 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; Mon, 9 Nov 2015 18:13:58 +0000 Subject: [PATCH, 7/16] Add pass_dominator_oacc_kernels To: "gcc-patches@gnu.org" References: <5640BD31.2060602@mentor.com> CC: Jakub Jelinek , Richard Biener From: Tom de Vries Message-ID: <5640E24F.3030602@mentor.com> Date: Mon, 9 Nov 2015 19:13:35 +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: <5640BD31.2060602@mentor.com> X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 On 09/11/15 16:35, Tom de Vries wrote: > Hi, > > this patch series for stage1 trunk adds support to: > - parallelize oacc kernels regions using parloops, and > - map the loops onto the oacc gang dimension. > > The patch series contains these patches: > > 1 Insert new exit block only when needed in > transform_to_exit_first_loop_alt > 2 Make create_parallel_loop return void > 3 Ignore reduction clause on kernels directive > 4 Implement -foffload-alias > 5 Add in_oacc_kernels_region in struct loop > 6 Add pass_oacc_kernels > 7 Add pass_dominator_oacc_kernels > 8 Add pass_ch_oacc_kernels > 9 Add pass_parallelize_loops_oacc_kernels > 10 Add pass_oacc_kernels pass group in passes.def > 11 Update testcases after adding kernels pass group > 12 Handle acc loop directive > 13 Add c-c++-common/goacc/kernels-*.c > 14 Add gfortran.dg/goacc/kernels-*.f95 > 15 Add libgomp.oacc-c-c++-common/kernels-*.c > 16 Add libgomp.oacc-fortran/kernels-*.f95 > > The first 9 patches are more or less independent, but patches 10-16 are > intended to be committed at the same time. > > Bootstrapped and reg-tested on x86_64. > > Build and reg-tested with nvidia accelerator, in combination with a > patch that enables accelerator testing (which is submitted at > https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01771.html ). > > I'll post the individual patches in reply to this message. this patch adds pass_dominator_oacc_kernels (which we may as well call pass_dominator_no_peel_loop_headers. It doesn't do anything oacc-kernels-specific), to be used in the kernels pass group. The reason I'm adding a new pass instead of using pass_dominator is that pass_dominator uses first_pass_instance. So adding a pass_dominator instance A before a pass_dominator instance B has the unexpected consequence that it may change the behaviour of instance B. I've filed PR68247 - "Remove pass_first_instance" to note this issue. Thanks, - Tom Add pass_dominator_oacc_kernels 2015-11-09 Tom de Vries * tree-pass.h (make_pass_dominator_oacc_kernels): Declare. * tree-ssa-dom.c (class dominator_base): New class. Factor out of ... (class pass_dominator): ... here. (dominator_base::may_peel_loop_headers_p) (pass_dominator::may_peel_loop_headers_p): New function. (pass_dominator_oacc_kernels): New pass. (make_pass_dominator_oacc_kernels): New function. (dominator_base::execute): Use may_peel_loop_headers_p. --- gcc/tree-pass.h | 1 + gcc/tree-ssa-dom.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index 4ed8da6..2825aea 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -395,6 +395,7 @@ extern gimple_opt_pass *make_pass_build_ssa (gcc::context *ctxt); extern gimple_opt_pass *make_pass_build_alias (gcc::context *ctxt); extern gimple_opt_pass *make_pass_build_ealias (gcc::context *ctxt); extern gimple_opt_pass *make_pass_dominator (gcc::context *ctxt); +extern gimple_opt_pass *make_pass_dominator_oacc_kernels (gcc::context *ctxt); extern gimple_opt_pass *make_pass_dce (gcc::context *ctxt); extern gimple_opt_pass *make_pass_cd_dce (gcc::context *ctxt); extern gimple_opt_pass *make_pass_call_cdce (gcc::context *ctxt); diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c index 3887bbe1..e4ff63a 100644 --- a/gcc/tree-ssa-dom.c +++ b/gcc/tree-ssa-dom.c @@ -519,6 +519,19 @@ private: namespace { +class dominator_base : public gimple_opt_pass +{ + protected: + dominator_base (pass_data data, gcc::context *ctxt) + : gimple_opt_pass (data, ctxt) + {} + + unsigned int execute (function *); + + protected: + virtual bool may_peel_loop_headers_p (void) { return true; } +}; // class dominator_base + const pass_data pass_data_dominator = { GIMPLE_PASS, /* type */ @@ -532,22 +545,23 @@ const pass_data pass_data_dominator = ( TODO_cleanup_cfg | TODO_update_ssa ), /* todo_flags_finish */ }; -class pass_dominator : public gimple_opt_pass +class pass_dominator : public dominator_base { public: pass_dominator (gcc::context *ctxt) - : gimple_opt_pass (pass_data_dominator, ctxt) + : dominator_base (pass_data_dominator, ctxt) {} /* opt_pass methods: */ opt_pass * clone () { return new pass_dominator (m_ctxt); } virtual bool gate (function *) { return flag_tree_dom != 0; } - virtual unsigned int execute (function *); + protected: + virtual bool may_peel_loop_headers_p (void) { return first_pass_instance; } }; // class pass_dominator unsigned int -pass_dominator::execute (function *fun) +dominator_base::execute (function *fun) { memset (&opt_stats, 0, sizeof (opt_stats)); @@ -619,7 +633,7 @@ pass_dominator::execute (function *fun) free_all_edge_infos (); /* Thread jumps, creating duplicate blocks as needed. */ - cfg_altered |= thread_through_all_blocks (first_pass_instance); + cfg_altered |= thread_through_all_blocks (may_peel_loop_headers_p ()); if (cfg_altered) free_dominance_info (CDI_DOMINATORS); @@ -700,6 +714,34 @@ pass_dominator::execute (function *fun) return 0; } +const pass_data pass_data_dominator_oacc_kernels = +{ + GIMPLE_PASS, /* type */ + "dom_oacc_kernels", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_TREE_SSA_DOMINATOR_OPTS, /* tv_id */ + ( PROP_cfg | PROP_ssa ), /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + ( TODO_cleanup_cfg | TODO_update_ssa ), /* todo_flags_finish */ +}; + +class pass_dominator_oacc_kernels : public dominator_base +{ +public: + pass_dominator_oacc_kernels (gcc::context *ctxt) + : dominator_base (pass_data_dominator_oacc_kernels, ctxt) + {} + + /* opt_pass methods: */ + opt_pass * clone () { return new pass_dominator_oacc_kernels (m_ctxt); } + virtual bool gate (function *) { return true; } + + protected: + virtual bool may_peel_loop_headers_p (void) { return false; } +}; // class pass_dominator_oacc_kernels + } // anon namespace gimple_opt_pass * @@ -708,6 +750,11 @@ make_pass_dominator (gcc::context *ctxt) return new pass_dominator (ctxt); } +gimple_opt_pass * +make_pass_dominator_oacc_kernels (gcc::context *ctxt) +{ + return new pass_dominator_oacc_kernels (ctxt); +} /* Given a conditional statement CONDSTMT, convert the condition to a canonical form. */ -- 1.9.1