Hi! On Tue, 5 Apr 2016 11:12:44 +0200, Tom de Vries <tom_devr...@mentor.com> wrote: > On 18/03/16 13:37, Thomas Schwinge wrote: > > On Wed, 9 Mar 2016 10:17:28 +0100, Tom de Vries <tom_devr...@mentor.com> > > wrote: > >> [Should have cited > >> <http://news.gmane.org/find-root.php?message_id=%3C5640FD6A.3080807%40mentor.com%3E> > >> instead of the C/C++ tests] > > > >> Retested on current trunk. > >> > >> Committed, minus the kernels-parallel-loop-data-enter-exit.f95 test. > > > > [tree scanning tests (as > > done for C/C++, and also present for Fortran on gomp-4_0-branch)]
> > (Note > > that I had to XFAIL gfortran.dg/goacc/kernels-loop-n.f95.) > > Right. I remember looking into this before, and classified it as the > openacc version of PR68787 - fipa-pta to interpret restrict. > > Now that we'll have an xfail for it, I've filed it as PR70545 - > '[openacc] gfortran.dg/goacc/kernels-loop-n.f95 not parallelized'. Makes sense to specify that PR70545 "Depends on: PR68787", and add "Keywords: openacc"? > > OK to commit? > > Yes please. With the XFAIL noted in the respective test case, committed in r234809: commit 1b61585a37935375c252a27648089c37018f459e Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Thu Apr 7 15:21:37 2016 +0000 Scan for parallelization of the oacc kernels test-cases in gfortran.dg/goacc gcc/testsuite/ * gfortran.dg/goacc/kernels-loop-2.f95: Scan for parallelization. * gfortran.dg/goacc/kernels-loop-data-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data-enter-exit.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data-update.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data.f95: Likewise. * gfortran.dg/goacc/kernels-loop.f95: Likewise. * gfortran.dg/goacc/kernels-loop-n.f95: Likewise, XFAILed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234809 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 12 ++++++++++++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 | 1 + .../gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 | 2 ++ .../gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 | 3 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 | 2 ++ 9 files changed, 28 insertions(+) diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog index d3c74ed..7688a83 100644 --- gcc/testsuite/ChangeLog +++ gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2016-04-07 Thomas Schwinge <tho...@codesourcery.com> + Tom de Vries <t...@codesourcery.com> + + * gfortran.dg/goacc/kernels-loop-2.f95: Scan for parallelization. + * gfortran.dg/goacc/kernels-loop-data-2.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-data-enter-exit.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-data-update.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-data.f95: Likewise. + * gfortran.dg/goacc/kernels-loop.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-n.f95: Likewise, XFAILed. + 2016-04-06 Patrick Palka <ppa...@gcc.gnu.org> PR c/70436 diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 index 5cc2e8b..865f7a6 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 @@ -40,3 +40,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 index d1bfc70..c9f3a62 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 @@ -47,3 +47,4 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 index feac7b2..3361607 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 @@ -46,3 +46,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 index 632983f..5ba56fb 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 @@ -44,3 +44,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 index 41b0d96..a622a96 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 @@ -43,3 +43,5 @@ end program main ! Check that the loop has been split off into a function. ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 2 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 index 3de2057..4ec2ac3 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 @@ -44,3 +44,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 index 21e2e86..409fe6f 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 @@ -36,3 +36,6 @@ end module test ! Check that the loop has been split off into a function. ! { dg-final { scan-tree-dump-times "(?n);; Function __test_MOD_foo._omp_fn.0 " 1 "optimized" } } + +! TODO, PR70545. +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 1 "parloops1" { xfail *-*-* } } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 index f7e14b4..ae2cac6 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 @@ -34,3 +34,5 @@ end program main ! Check that the loop has been split off into a function. ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 1 "parloops1" } } Grüße Thomas