[gomp4] Re: [PATCH, 4/16] Implement -foffload-alias

Hi!

On Wed, 16 Dec 2015 15:42:55 +0100, Tom de Vries <Tom_deVries@mentor.com> wrote:
> On 16/12/15 14:16, Richard Biener wrote:
> > On Mon, 14 Dec 2015, Tom de Vries wrote:
> >
> >> On 14/12/15 14:26, Richard Biener wrote:
> >>> On Sun, 13 Dec 2015, Tom de Vries wrote:
> >>>> This patch:
> >>>> - moves the kernels pass group to the first position in the pass list
> >>>>     after ealias where we're back in ipa mode
> >>>> - inserts an new ipa pass to contain the gimple pass group called
> >>>>     pass_oacc_ipa
> >>>> - inserts a version of ipa-pta before the pass group.

> Committed as attached [...]

> --- a/gcc/passes.def
> +++ b/gcc/passes.def
> @@ -88,24 +88,7 @@ along with GCC; see the file COPYING3.  If not see
>  	  /* pass_build_ealias is a dummy pass that ensures that we
>  	     execute TODO_rebuild_alias at this point.  */
>  	  NEXT_PASS (pass_build_ealias);
> -	  /* Pass group that runs when the function is an offloaded function
> -	     containing oacc kernels loops.  Part 1.  */
> -	  NEXT_PASS (pass_oacc_kernels);
> -	  PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels)
> -	      NEXT_PASS (pass_ch);
> -	  POP_INSERT_PASSES ()
>  	  NEXT_PASS (pass_fre);
> -	  /* Pass group that runs when the function is an offloaded function
> -	     containing oacc kernels loops.  Part 2.  */
> -	  NEXT_PASS (pass_oacc_kernels2);
> -	  PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels2)
> -	      /* We use pass_lim to rewrite in-memory iteration and reduction
> -		 variable accesses in loops into local variables accesses.  */
> -	      NEXT_PASS (pass_lim);
> -	      NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */);
> -	      NEXT_PASS (pass_dce);
> -	      NEXT_PASS (pass_expand_omp_ssa);
> -	  POP_INSERT_PASSES ()
>  	  NEXT_PASS (pass_merge_phi);
>            NEXT_PASS (pass_dse);
>  	  NEXT_PASS (pass_cd_dce);
> @@ -124,6 +107,30 @@ along with GCC; see the file COPYING3.  If not see
>        NEXT_PASS (pass_rebuild_cgraph_edges);
>        NEXT_PASS (pass_inline_parameters);
>    POP_INSERT_PASSES ()
> +
> +  NEXT_PASS (pass_ipa_oacc);
> +  PUSH_INSERT_PASSES_WITHIN (pass_ipa_oacc)
> +      NEXT_PASS (pass_ipa_pta);
> +      /* Pass group that runs when the function is an offloaded function
> +	 containing oacc kernels loops.	 */
> +      NEXT_PASS (pass_ipa_oacc_kernels);
> +      PUSH_INSERT_PASSES_WITHIN (pass_ipa_oacc_kernels)
> +	  NEXT_PASS (pass_oacc_kernels);
> +	  PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels)
> +	      NEXT_PASS (pass_ch);
> +	      NEXT_PASS (pass_fre);
> +	      /* We use pass_lim to rewrite in-memory iteration and reduction
> +		 variable accesses in loops into local variables accesses.  */
> +	      NEXT_PASS (pass_lim);
> +	      NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */);
> +	      NEXT_PASS (pass_dce);
> +	      /* pass_parallelize_loops_oacc_kernels */
> +	      NEXT_PASS (pass_expand_omp_ssa);
> +	      NEXT_PASS (pass_rebuild_cgraph_edges);
> +	  POP_INSERT_PASSES ()
> +      POP_INSERT_PASSES ()
> +  POP_INSERT_PASSES ()
> +
>    NEXT_PASS (pass_ipa_chkp_produce_thunks);
>    NEXT_PASS (pass_ipa_auto_profile);
>    NEXT_PASS (pass_ipa_free_inline_summary);

Merging this patch into gomp-4_0-branch, as before --
<http://news.gmane.org/find-root.php?message_id=%3C87io4jo0ei.fsf%40kepler.schwinge.homeip.net%3E>
-- I again did not clean up but instead just copied the existing OpenACC
kernels pass structure verbatim, so on gomp-4_0-branch we currently got
these additional passes wired up:

           PUSH_INSERT_PASSES_WITHIN (pass_ipa_oacc_kernels)
              NEXT_PASS (pass_oacc_kernels);
              PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels)
    +             NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */);
                  NEXT_PASS (pass_ch);
    +             NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */);
                  NEXT_PASS (pass_fre);
                  /* We use pass_lim to rewrite in-memory iteration and reduction
                     variable accesses in loops into local variables accesses.  */
    +             NEXT_PASS (pass_tree_loop_init);
                  NEXT_PASS (pass_lim);
    +             NEXT_PASS (pass_copy_prop);
    +             NEXT_PASS (pass_lim);
    +             NEXT_PASS (pass_copy_prop);
    +             NEXT_PASS (pass_scev_cprop);
    +             NEXT_PASS (pass_tree_loop_done);
                  NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */);
                  NEXT_PASS (pass_dce);
    -             /* pass_parallelize_loops_oacc_kernels */
    +             NEXT_PASS (pass_tree_loop_init);
    +             NEXT_PASS (pass_parallelize_loops_oacc_kernels);
                  NEXT_PASS (pass_expand_omp_ssa);
    +             NEXT_PASS (pass_tree_loop_done);
                  NEXT_PASS (pass_rebuild_cgraph_edges);
              POP_INSERT_PASSES ()
           POP_INSERT_PASSES ()

That is, in r231753 I effectively merged trunk r231690 into
gomp-4_0-branch as follows:

commit 6a16087c1ab71a9539f538b90a2d98cecab90e82
Merge: 49a5b61 f71e6ee
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Thu Dec 17 11:43:00 2015 +0000

    svn merge -r 231689:231690 svn+ssh://gcc.gnu.org/svn/gcc/trunk

    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@231753 138bc75d-0d04-0410-961f-82ee72b054a4

 gcc/ChangeLog                            | 12 +++++
 gcc/opts.c                               | 10 ++++
 gcc/passes.def                           | 62 +++++++++++++------------
 gcc/testsuite/ChangeLog                  | 18 ++++++++
 gcc/testsuite/g++.dg/ipa/devirt-37.C     | 10 ++--
 gcc/testsuite/g++.dg/ipa/devirt-40.C     |  4 +-
 gcc/testsuite/g++.dg/tree-ssa/pr61034.C  | 10 ++--
 gcc/testsuite/gcc.dg/ipa/ipa-pta-1.c     | 12 ++---
 gcc/testsuite/gcc.dg/ipa/ipa-pta-10.c    |  4 +-
 gcc/testsuite/gcc.dg/ipa/ipa-pta-11.c    | 12 ++---
 gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c    | 14 +++---
 gcc/testsuite/gcc.dg/ipa/ipa-pta-14.c    |  6 +--
 gcc/testsuite/gcc.dg/ipa/ipa-pta-16.c    |  4 +-
 gcc/testsuite/gcc.dg/ipa/ipa-pta-2.c     |  4 +-
 gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c     |  8 ++--
 gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c     |  8 ++--
 gcc/testsuite/gcc.dg/ipa/ipa-pta-5.c     |  2 +-
 gcc/testsuite/gcc.dg/ipa/ipa-pta-6.c     |  4 +-
 gcc/testsuite/gcc.dg/torture/ipa-pta-1.c |  4 +-
 gcc/tree-pass.h                          |  3 +-
 gcc/tree-ssa-loop.c                      | 78 +++++++++++++++++++++++---------
 gcc/tree-ssa-structalias.c               |  2 +
 22 files changed, 187 insertions(+), 104 deletions(-)

[diff --git gcc/ChangeLog gcc/ChangeLog]

Grüße
 Thomas

[gomp4] Re: [PATCH, 4/16] Implement -foffload-alias

Commit Message

Patch