From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id AA1943AA7C96; Thu, 13 May 2021 16:17:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AA1943AA7C96 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] Fix patterns in Fortran tests for kernels loop annotation. X-Act-Checkin: gcc X-Git-Author: Sandra Loosemore X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: e7ec288791481ace60552f3686daf7063aa0dac6 X-Git-Newrev: 6313db3dbc51896f4be3eb2cc76e8731eec1e2ff Message-Id: <20210513161734.AA1943AA7C96@sourceware.org> Date: Thu, 13 May 2021 16:17:34 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 16:17:34 -0000 https://gcc.gnu.org/g:6313db3dbc51896f4be3eb2cc76e8731eec1e2ff commit 6313db3dbc51896f4be3eb2cc76e8731eec1e2ff Author: Sandra Loosemore Date: Sat Aug 22 22:43:57 2020 -0700 Fix patterns in Fortran tests for kernels loop annotation. Several of the Fortran tests for kernels loop annotation were failing due to changes in the formatting of "acc loop" constructs in the dump file. Now the "auto" clause appears first, instead of after "private". 2020-08-23 Sandra Loosemore gcc/testsuite/ * gfortran.dg/goacc/kernels-loop-annotation-1.f95: Update expected output. * gfortran.dg/goacc/kernels-loop-annotation-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-3.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-4.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-5.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-6.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-7.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-8.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-11.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-12.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-13.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-14.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-15.f95: Likewise. * gfortran.dg/goacc/kernels-loop-annotation-16.f95: Likewise. Diff: --- gcc/testsuite/ChangeLog.omp | 18 ++++++++++++++++++ .../gfortran.dg/goacc/kernels-loop-annotation-1.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-11.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-12.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-13.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-14.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-15.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-16.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-2.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-3.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-4.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-5.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-6.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-7.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-annotation-8.f95 | 2 +- 15 files changed, 32 insertions(+), 14 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 7672b8d76f8..00cc4332d00 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,21 @@ +2020-08-23 Sandra Loosemore + + * gfortran.dg/goacc/kernels-loop-annotation-1.f95: Update + expected output. + * gfortran.dg/goacc/kernels-loop-annotation-2.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-3.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-4.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-5.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-6.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-7.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-8.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-11.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-12.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-13.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-14.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-15.f95: Likewise. + * gfortran.dg/goacc/kernels-loop-annotation-16.f95: Likewise. + 2020-08-22 Sandra Loosemore Test cases for allowing calls to C/C++ builtins and Fortran diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-1.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-1.f95 index 41f6307dbb1..42e751dbfb8 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-1.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-1.f95 @@ -30,4 +30,4 @@ subroutine f (a, b, c) !$acc end kernels end subroutine f -! { dg-final { scan-tree-dump-times "acc loop private\\(.\\) auto" 3 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 3 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-11.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-11.f95 index d51482e4685..6e2e2c41172 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-11.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-11.f95 @@ -31,4 +31,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 0 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-12.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-12.f95 index 3c4956d7077..03c4234ce7c 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-12.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-12.f95 @@ -36,4 +36,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 1 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-13.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-13.f95 index 3ec459f0a8d..6aeb3f2fe4d 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-13.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-13.f95 @@ -35,4 +35,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 1 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-14.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-14.f95 index 91f431cca43..7d1cff64a3d 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-14.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-14.f95 @@ -32,4 +32,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 0 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-15.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-15.f95 index 570c12d3ad7..dab0d4030d0 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-15.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-15.f95 @@ -32,4 +32,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 0 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-16.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-16.f95 index 6e44a304b28..15ef670e246 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-16.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-16.f95 @@ -31,4 +31,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 0 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-2.f95 index 4624a05247d..2baaa594be1 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-2.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-2.f95 @@ -29,4 +29,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 1 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-3.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-3.f95 index daed8f7f6e9..e629891e31f 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-3.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-3.f95 @@ -30,4 +30,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 1 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-4.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-4.f95 index 0c4ad256b7e..6c3300b7053 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-4.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-4.f95 @@ -31,4 +31,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 1 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-5.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-5.f95 index 1c3f87eed6e..52a9e7e7a85 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-5.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-5.f95 @@ -31,5 +31,5 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 1 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-6.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-6.f95 index 43173a70df2..60eb245a22a 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-6.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-6.f95 @@ -31,4 +31,4 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 0 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-7.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-7.f95 index ec42213220e..438a13acee1 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-7.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-7.f95 @@ -44,5 +44,5 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private.* auto" 0 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-8.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-8.f95 index 9188f70d966..aa97e37c054 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-8.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-annotation-8.f95 @@ -46,5 +46,5 @@ function f (a, b) end function f -! { dg-final { scan-tree-dump-times "acc loop private\\(i\\) auto" 2 "original" } } +! { dg-final { scan-tree-dump-times "acc loop auto" 2 "original" } }