[committed,OG10] Fix patterns in Fortran tests for kernels loop annotation.

Message ID be0b96d4-2fc1-755c-b446-3dc9cc0aff98@codesourcery.com
State New
Headers show
Series
  • [committed,OG10] Fix patterns in Fortran tests for kernels loop annotation.
Related show

Commit Message

Sandra Loosemore Aug. 23, 2020, 6:22 a.m.
I've committed this relatively trivial patch to fix up some of the 
kernels loop annotation tests on the OG10 branch to match changes in the 
dump formatting.

-Sandra

Patch

commit 6d670e648e76fe44589a42ee458098ff84d24af1
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 --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 4adda2a..7b0b4c8 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 41f6307..42e751d 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 d51482e..6e2e2c4 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 3c4956d..03c4234 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 3ec459f..6aeb3f2 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 91f431c..7d1cff6 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 570c12d..dab0d40 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 6e44a30..15ef670 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 4624a05..2baaa59 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 daed8f7..e629891 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 0c4ad25..6c3300b 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 1c3f87e..52a9e7e 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 43173a7..60eb245 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 ec42213..438a13a 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 9188f70..aa97e37 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" } }