public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-12] Fix patterns in Fortran tests for kernels loop annotation.
@ 2022-06-29 14:38 Kwok Yeung
  0 siblings, 0 replies; only message in thread
From: Kwok Yeung @ 2022-06-29 14:38 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:a929984b858c4f8267f16460af2c39b9783cef2a

commit a929984b858c4f8267f16460af2c39b9783cef2a
Author: Sandra Loosemore <sandra@codesourcery.com>
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  <sandra@codesourcery.com>
    
            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 7ef9c3d6c9b..261e506c40f 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,21 @@
+2020-08-23   Sandra Loosemore  <sandra@codesourcery.com>
+
+	* 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  <sandra@codesourcery.com>
 
 	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" } }


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-06-29 14:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-29 14:38 [gcc/devel/omp/gcc-12] Fix patterns in Fortran tests for kernels loop annotation Kwok Yeung

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).