From a5aeee56d897cb1120bf4d2a61c8f62c45fecb5b Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 11 Nov 2019 10:26:40 +0100 Subject: [PATCH] Fix OpenACC directives nesting in 'gfortran.dg/goacc/common-block-1.f90', 'gfortran.dg/goacc/common-block-2.f90' gcc/testsuite/ * gfortran.dg/goacc/common-block-1.f90: Fix OpenACC directives nesting. * gfortran.dg/goacc/common-block-2.f90: Likewise. From-SVN: r278047 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 | 3 ++- gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cc60856a6a6..f8e626b2fd4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-11-11 Thomas Schwinge + + * gfortran.dg/goacc/common-block-1.f90: Fix OpenACC directives + nesting. + * gfortran.dg/goacc/common-block-2.f90: Likewise. + 2019-11-11 Jiufu Guo PR tree-optimization/88760 diff --git a/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 b/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 index ea437526b46..228637f5883 100644 --- a/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 @@ -55,10 +55,11 @@ program test !$acc end parallel !$acc parallel firstprivate(/blockA/, /blockB/, e, v) + !$acc end parallel + !$acc update device(/blockA/) !$acc update self(/blockB/, v) !$acc update host(/blockA/, e, /blockB/) - !$acc end parallel !$acc enter data pcopyin(/blockA/, /blockB/, e, v) !$acc exit data delete(/blockA/, /blockB/, e, v) diff --git a/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 b/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 index 1ba945019f9..5d49f6195b8 100644 --- a/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 @@ -43,10 +43,11 @@ program test !$acc end parallel !$acc parallel firstprivate(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" } + !$acc end parallel + !$acc update device(b, /blockA/, x) ! { dg-error "Symbol .x. present on multiple clauses" } !$acc update self(z, /blockB/, v) ! { dg-error "Symbol .z. present on multiple clauses" } !$acc update host(/blockA/, c) ! { dg-error "Symbol .c. present on multiple clauses" } - !$acc end parallel !$acc enter data copyin(/blockB/, e, v, a, c, y) ! { dg-error "Symbol .y. present on multiple clauses" } !$acc exit data delete(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" } -- 2.30.2