Fortran] OpenACC – libgomp/testsuite – use 'stop' and 'dg-do run'

        * testsuite/libgomp.oacc-fortran/abort-1.f90: Add 'dg-do run'.
        * testsuite/libgomp.oacc-fortran/abort-2.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/lib-1.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/common-block-1.f90:
        Use 'stop' not abort().
        * testsuite/libgomp.oacc-fortran/common-block-2.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/common-block-3.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/data-1.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/data-2.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/data-5.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/dummy-array.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/gemm-2.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/gemm.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/host_data-2.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/host_data-3.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/host_data-4.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-collapse-3.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-collapse-4.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-independent.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-loop-1.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-map-1.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-vector-1.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-vector-2.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-1.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-2.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-3.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-4.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-5.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-6.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-7.f90:
        Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/lib-12.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/lib-13.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/lib-14.f90: Ditto.
        * testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90:
        Likewise and also add 'dg-do run'.
        * testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction.f90:
        Ditto.

From-SVN: r277503

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 351df1153fdeec4e08fcff8e4762a0d06f410b08..aa30b809f1512c1db23f99db37e4c3d32bc9174c 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,66 @@
+2019-10-28  Tobias Burnus  <tobias@codesourcery.com>
+
+       * testsuite/libgomp.oacc-fortran/abort-1.f90: Add 'dg-do run'.
+       * testsuite/libgomp.oacc-fortran/abort-2.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/lib-1.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/common-block-1.f90:
+       Use 'stop' not abort().
+       * testsuite/libgomp.oacc-fortran/common-block-2.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/common-block-3.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/data-1.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/data-2.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/data-5.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/dummy-array.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/gemm-2.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/gemm.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/host_data-2.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/host_data-3.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/host_data-4.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-collapse-3.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-collapse-4.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-independent.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-loop-1.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-map-1.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-vector-1.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-vector-2.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-1.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-2.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-3.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-4.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-5.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-6.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-private-vars-worker-7.f90:
+       Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/lib-12.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/lib-13.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/lib-14.f90: Ditto.
+       * testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90:
+       Likewise and also add 'dg-do run'.
+       * testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction.f90:
+       Ditto.
+
 2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
            Tobias Burnus  <tobias@codesourcery.com>
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90
index fc0af7ff7d89e3dc7517f9d575369c16101c9126..70c05d7d3c1aa8309257b0bc09b19cf83132dee8 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 ! Verify that an unconditional "call abort" inside an OpenACC parallel region
 ! does the right thing.
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90
index 97a692ba6677851d0a71da9a92dfc9664dba0dab..6671d46d8b8594611e5627305f59ce9905d22684 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 ! Verify that a conditional "call abort" inside an OpenACC parallel region does
 ! the right thing.
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
index d6c67a0c31aad7ee010ba5c677c42edae521e803..1a8432cfa86206d97ffaae8bb31f8dbb4a98669b 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
@@ -1,4 +1,6 @@
+! { dg-do run }
 ! { dg-additional-options "-cpp" }
+!
 ! TODO: Have to disable the acc_on_device builtin for we want to test the
 ! libgomp library function?  The command line option
 ! '-fno-builtin-acc_on_device' is valid for C/C++/ObjC/ObjC++ but not for

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
index 75e24509ce9bdf0f727f2e4aa04a106d9611249c..56f99d4f99b938673d36ab4886210e23a2588e5d 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
@@ -1,4 +1,6 @@
+! { dg-do run }
 ! { dg-additional-options "-cpp" }
+!
 ! TODO: Have to disable the acc_on_device builtin for we want to test
 ! the libgomp library function?  The command line option
 ! '-fno-builtin-acc_on_device' is valid for C/C++/ObjC/ObjC++ but not

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
index 908d185f40c75efba7c4e88ce082b394ac81c869..565723851b1bfce2a30cdfdcdc3f3444f7e67490 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
@@ -1,4 +1,6 @@
+! { dg-do run }
 ! { dg-additional-options "-cpp" }
+!
 ! TODO: Have to disable the acc_on_device builtin for we want to test
 ! the libgomp library function?  The command line option
 ! '-fno-builtin-acc_on_device' is valid for C/C++/ObjC/ObjC++ but not

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/common-block-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/common-block-1.f90
index 000d811a05986e30ad41d60bdb7774cf104c7f78..d77878ede397cbc63749a83f9ae34f9ea81dbad7 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/common-block-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/common-block-1.f90
@@ -15,7 +15,7 @@ subroutine check
   common /BLOCK/ x, y
 
   do i = 1, n
-     if (x(i) .ne. y) call abort
+     if (x(i) .ne. y) stop 1
   end do
 end subroutine check
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/common-block-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/common-block-2.f90
index 4cfcded244d7a7ae3c37d14a34e9069234af6c05..018b37d00bb2cc7e76360ce1d35cfbdbefda557b 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/common-block-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/common-block-2.f90
@@ -16,7 +16,7 @@ subroutine validate
   common /BLOCK/ x, y, z, j
 
   do i = 1, n
-     if (abs(x(i) - i - z) .ge. 0.0001) call abort
+     if (abs(x(i) - i - z) .ge. 0.0001) stop 1
   end do
 end subroutine validate
 
@@ -135,7 +135,7 @@ program main
   end do
   !$acc end parallel
 
-  if (j .ne. n) call abort
+  if (j .ne. n) stop 2
 
   ! Test firstprivate, copy
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/common-block-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/common-block-3.f90
index 5a68b485b1ed90e53a116c2d1965b48c667a636a..3c59b66246be4a4337347b95672976aeb9a1ee54 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/common-block-3.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/common-block-3.f90
@@ -16,7 +16,7 @@ subroutine validate
   common /BLOCK/ x, y, z, j
 
   do i = 1, n
-     if (abs(x(i) - i - z) .ge. 0.0001) call abort
+     if (abs(x(i) - i - z) .ge. 0.0001) stop 1
   end do
 end subroutine validate
 
@@ -135,5 +135,5 @@ program main
   end do
   !$acc end parallel loop
 
-  if (j .ne. n) call abort
+  if (j .ne. n) stop 2
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90
index bf323b3f54057edd2ff6d76d3aed1d7a9972ef77..eeb06f3c84ffdbe5e41c5dbd6e36b7458c86b742 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90
@@ -26,32 +26,32 @@ program main
   j = -2
 
   !$acc data copyin (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 1
+    if (is_mapped (j) .eqv. .FALSE.) stop 2
 
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 3
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 4
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 5
 
   i = -1
   j = -2
 
   !$acc data copyout (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 6
+    if (is_mapped (j) .eqv. .FALSE.) stop 7
 
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 8
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 9
 
     !$acc parallel present (i, j)
       i = 4
@@ -59,55 +59,55 @@ program main
     !$acc end parallel
   !$acc end data
 
-  if (i .ne. 4 .or. j .ne. 2) call abort
+  if (i .ne. 4 .or. j .ne. 2) stop 10
 
   i = -1
   j = -2
 
   !$acc data create (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 11
+    if (is_mapped (j) .eqv. .FALSE.) stop 12
 
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 13
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 14
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 15
 
   i = -1
   j = -2
 
   !$acc data present_or_copyin (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 16
+    if (is_mapped (j) .eqv. .FALSE.) stop 17
 
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 18
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 19
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 20
 
   i = -1
   j = -2
 
   !$acc data present_or_copyout (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 21
+    if (is_mapped (j) .eqv. .FALSE.) stop 22
 
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 23
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 24
 
     !$acc parallel present (i, j)
       i = 4
@@ -115,98 +115,98 @@ program main
     !$acc end parallel
   !$acc end data
 
-  if (i .ne. 4 .or. j .ne. 2) call abort
+  if (i .ne. 4 .or. j .ne. 2) stop 25
 
   i = -1
   j = -2
 
   !$acc data present_or_copy (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 26
+    if (is_mapped (j) .eqv. .FALSE.) stop 27
 
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 28
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 29
   !$acc end data
 
 #if ACC_MEM_SHARED
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 30
 #else
-  if (i .ne. -1 .or. j .ne. -2) call abort
+  if (i .ne. -1 .or. j .ne. -2) stop 31
 #endif
 
   i = -1
   j = -2
 
   !$acc data present_or_create (i, j)
-    if (is_mapped (i) .eqv. .FALSE.) call abort
-    if (is_mapped (j) .eqv. .FALSE.) call abort
+    if (is_mapped (i) .eqv. .FALSE.) stop 32
+    if (is_mapped (j) .eqv. .FALSE.) stop 33
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 34
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 35
 
   i = -1
   j = -2
 
   !$acc data copyin (i, j)
     !$acc data present (i, j)
-      if (is_mapped (i) .eqv. .FALSE.) call abort
-      if (is_mapped (j) .eqv. .FALSE.) call abort
+      if (is_mapped (i) .eqv. .FALSE.) stop 36
+      if (is_mapped (j) .eqv. .FALSE.) stop 37
 
-      if (i .ne. -1 .or. j .ne. -2) call abort
+      if (i .ne. -1 .or. j .ne. -2) stop 38
 
       i = 2
       j = 1
 
-      if (i .ne. 2 .or. j .ne. 1) call abort
+      if (i .ne. 2 .or. j .ne. 1) stop 39
     !$acc end data
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 40
 
   i = -1
   j = -2
 
   !$acc data copyin (i, j)
     !$acc data present (i, j)
-      if (is_mapped (i) .eqv. .FALSE.) call abort
-      if (is_mapped (j) .eqv. .FALSE.) call abort
+      if (is_mapped (i) .eqv. .FALSE.) stop 41
+      if (is_mapped (j) .eqv. .FALSE.) stop 42
 
-      if (i .ne. -1 .or. j .ne. -2) call abort
+      if (i .ne. -1 .or. j .ne. -2) stop 43
 
       i = 2
       j = 1
 
-      if (i .ne. 2 .or. j .ne. 1) call abort
+      if (i .ne. 2 .or. j .ne. 1) stop 44
     !$acc end data
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 45
 
   i = -1
   j = -2
 
   !$acc data
 #if !ACC_MEM_SHARED
-    if (is_mapped (i) .eqv. .TRUE.) call abort
-    if (is_mapped (j) .eqv. .TRUE.) call abort
+    if (is_mapped (i) .eqv. .TRUE.) stop 46
+    if (is_mapped (j) .eqv. .TRUE.) stop 47
 #endif
-    if (i .ne. -1 .or. j .ne. -2) call abort
+    if (i .ne. -1 .or. j .ne. -2) stop 48
 
     i = 2
     j = 1
 
-    if (i .ne. 2 .or. j .ne. 1) call abort
+    if (i .ne. 2 .or. j .ne. 1) stop 49
   !$acc end data
 
-  if (i .ne. 2 .or. j .ne. 1) call abort
+  if (i .ne. 2 .or. j .ne. 1) stop 50
 
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90
index 83a540070e6b66af90c313beee35b6f654de3f1a..ec206958e23cf2b798acdccfb039d6404be81905 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90
@@ -54,7 +54,7 @@ program test
   !$acc wait
 
   do i = 1, N
-    if (d(i) .ne. 4.0) call abort
+    if (d(i) .ne. 4.0) STOP 3
   end do
 
   c(:) = 3.0
@@ -75,7 +75,7 @@ program test
   !$acc wait
 
   do i = 1, N
-    if (d(i) .ne. 4.0) call abort
+    if (d(i) .ne. 4.0) STOP 4
   end do
 
 end program test

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-5.f90
index a8843dedc22281b4762ce0ecc5378e48a2bf6cfb..c68a27959008246e673fc0c7c5d96714ea0da920 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-5.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-5.f90
@@ -23,8 +23,8 @@ program refcount_test
      if (h(i) .eq. i) c = c + 1
   end do
   ! h[] should be filled with uninitialized device values,
-  ! abort if it's not.
-  if (c .eq. N) call abort
+  ! 'stop' if it's not.
+  if (c .eq. N) stop 1
 
   h(:) = 0
 
@@ -37,20 +37,20 @@ program refcount_test
   ! No actual copyout should happen.
   call acc_copyout (h)
   do i = 1, N
-     if (h(i) .ne. 0) call abort
+     if (h(i) .ne. 0) stop 2
   end do
 
   !$acc exit data delete (h(1:N))
 
   ! This should not actually be deleted yet.
-  if (acc_is_present (h) .eqv. .FALSE.) call abort
+  if (acc_is_present (h) .eqv. .FALSE.) stop 3
 
   !$acc exit data copyout (h(1:N)) finalize
 
   do i = 1, N
-     if (h(i) .ne. 111) call abort
+     if (h(i) .ne. 111) stop 4
   end do
 
-  if (acc_is_present (h) .eqv. .TRUE.) call abort
+  if (acc_is_present (h) .eqv. .TRUE.) stop 5
 
 end program refcount_test

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/dummy-array.f90 b/libgomp/testsuite/libgomp.oacc-fortran/dummy-array.f90
index e95563cd4060bfe6fa5a473518508e6e60371767..697d94d52aa2c56498838993bd6106c17d1ccf5d 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/dummy-array.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/dummy-array.f90
@@ -13,7 +13,7 @@ program main
   call dummy_array (a, n)
   
   do i = 1, n
-     if (a(i) .ne. i) call abort
+     if (a(i) .ne. i) stop 1
   end do
 end program main
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/gemm-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/gemm-2.f90
index fe108732a5fd5fe8f82dbae684b173311410b532..5fa936424771a32167bc30dcd04fc920a4ee2bb2 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/gemm-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/gemm-2.f90
@@ -74,7 +74,7 @@ program main
 
   do i = 1, m
      do j = 1, n
-        if (c(i,j) /= e(i,j)) call abort
+        if (c(i,j) /= e(i,j)) stop 1
      end do
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/gemm.f90 b/libgomp/testsuite/libgomp.oacc-fortran/gemm.f90
index de78148c7b36ca74a2d81313c46a3bd8a2fcbb11..9e8915fbb881b804be51794e6f46172088ae26f4 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/gemm.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/gemm.f90
@@ -73,7 +73,7 @@ program main
 
   do i = 1, m
      do j = 1, n
-        if (d(i,j) /= e(i,j)) call abort
+        if (d(i,j) /= e(i,j)) stop 1
      end do
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/host_data-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/host_data-2.f90
index ff0921863f6259f58952f49ae742ea7f06ceb64f..ab70e4e8deae05f6338009653c5de99c84a0a131 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/host_data-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/host_data-2.f90
@@ -93,6 +93,6 @@ subroutine validate_results (n, a, b)
   real*4 :: a(n), b(n)
 
   do i = 1, N
-     if (abs(a(i) - b(i)) > 0.0001) call abort
+     if (abs(a(i) - b(i)) > 0.0001) stop 1
   end do
 end subroutine validate_results

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/host_data-3.f b/libgomp/testsuite/libgomp.oacc-fortran/host_data-3.f
index 05ed949ee5cba22eb9dc8da38d625011a1238e63..434c18c9889eaa7e788be45b9957a8cd7363665a 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/host_data-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/host_data-3.f
@@ -79,7 +79,7 @@
       real*4 :: a(n), b(n)
 
       do i = 1, N
-         if (abs(a(i) - b(i)) > 0.0001) call abort
+         if (abs(a(i) - b(i)) > 0.0001) stop 1
       end do
       end subroutine validate_results
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/host_data-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/host_data-4.f90
index 6e379b5485bed5d721484015cd7f714a8ce0ee72..e81a8b292c1d24a2ba03aae1c188dcf70f65ea38 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/host_data-4.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/host_data-4.f90
@@ -33,7 +33,7 @@ contains
     real*4 :: a(n), b(n)
 
     do i = 1, N
-       if (abs(a(i) - b(i)) > 0.0001) call abort
+       if (abs(a(i) - b(i)) > 0.0001) stop 1
     end do
   end subroutine validate_results
 end module cublas

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90
index fdf9409bde4d3acb85037013d19f0bce0c20b168..0a612a57964e646e6185d18086a9d9ddebd240d2 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 program foo
 
   IMPLICIT NONE
@@ -5,7 +7,7 @@ program foo
 
   call bar (vol)
 
-  if (vol .ne. 4) call abort
+  if (vol .ne. 4) stop 1
 end program foo
 
 subroutine bar(vol)

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction.f90
index 912a22b5153bd69a99ab3613173a0bcf9c318abe..0b939c04fbb8f7932374c413b1c2603c0450d85e 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction.f90
@@ -1,10 +1,12 @@
+! { dg-do run }
+!
 program foo
   IMPLICIT NONE
   INTEGER :: vol = 0
 
   call bar (vol)
 
-  if (vol .ne. 2) call abort
+  if (vol .ne. 2) stop 1
 end program foo
 
 subroutine bar(vol)

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-3.f90
index 4ef99cd3475221368ca06b148c7421692976fe33..03b3a115d7b2bfc09ab23098520ddd5a5e166ea3 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-3.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-3.f90
@@ -14,7 +14,7 @@ dokk: do kk=1,3
       enddo dokk
 115   continue
   !$acc end kernels
-  if (any(a(1:3,1:3,1:3).ne.1)) call abort
+  if (any(a(1:3,1:3,1:3).ne.1)) stop 1
 
   !$acc kernels
   !$acc loop collapse(3)
@@ -26,5 +26,5 @@ doll: do ll=1,3
       enddo doll
 120 end do dol
   !$acc end kernels
-  if (any(a(1:3,1:3,1:3).ne.2)) call abort
+  if (any(a(1:3,1:3,1:3).ne.2)) stop 2
 end program collapse3

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-4.f90
index db382a7deb68f308349ed752ce0e63b60364d647..15e33603adbe32264473c7606ed6b79ab72f5456 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-4.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-collapse-4.f90
@@ -30,11 +30,11 @@ program collapse4
       end do
     end do
   end do
-  if (l .neqv. r) call abort
+  if (l .neqv. r) stop 1
   do i = 2, 6
     do j = -2, 4
       do k = 13, 18
-         if (a(i, j, k) .ne. b(i, j, k)) call abort
+         if (a(i, j, k) .ne. b(i, j, k)) stop 2
       end do
     end do
   end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-independent.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-independent.f90
index a881fbbe5cca2a6bad080832fe74efc76ae41e49..5a47aca2dba2ccf267f166458467dbf2744c4b54 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-independent.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-independent.f90
@@ -26,7 +26,7 @@ subroutine foo (a,  b,  c)
   !$acc end kernels
 
   do i = 1, n
-    if (c(i) .ne. a(i) + b(i)) call abort
+    if (c(i) .ne. a(i) + b(i)) stop 1
   end do
 
 end subroutine

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-1.f90
index edcdc56ec1c96cf0a0351d13b2cfb2be488d5719..37aa0ac4f63277eea602a739505c969c0b906ff2 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-1.f90
@@ -37,7 +37,7 @@ program loops
   !$acc end kernels
 
   do i = 1, n
-     if (a(i) .ne. b(i)) call abort
+     if (a(i) .ne. b(i)) stop 1
   end do
   call check (a, b, n)
 
@@ -61,6 +61,6 @@ subroutine check (a, b, n)
   integer :: i
 
   do i = 1, n
-     if (a(i) .ne. b(i)) call abort
+     if (a(i) .ne. b(i)) stop 2
   end do
 end subroutine check

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-map-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-map-1.f90
index 704ff622854ad970f7150207f663012a1b8c3024..736ce1791aeda51c9a0e08e03c9f09f1931e270b 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-map-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-map-1.f90
@@ -37,7 +37,7 @@ program map
   !$acc end kernels
 
   do i = 1, n
-     if (a(i) .ne. b(i)) call abort
+     if (a(i) .ne. b(i)) stop 1
   end do
   call check (a, b, n)
 
@@ -111,6 +111,6 @@ subroutine check (a, b, n)
   integer :: i
 
   do i = 1, n
-     if (a(i) .ne. b(i)) call abort
+     if (a(i) .ne. b(i)) stop 2
   end do
 end subroutine check

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95
index fe1088c0d04cb792acf6171897676ace217938df..0d353e80131cc217af0daefdc6143440220260dd 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95
@@ -30,7 +30,7 @@ program main
   !$acc exit data copyout (a(0:n-1), b(0:n-1), c(0:n-1))
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) stop 1
   end do
 
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90
index 5119fabadaff644514f3f344ae38ea899de059a2..bcc0476d6654c80f01ac5fa8741b49d56a402857 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90
@@ -18,6 +18,6 @@ program main
   !$acc end kernels
 
   do i = 1, 32
-     if (arr(i) .ne. i * 3) call abort
+     if (arr(i) .ne. i * 3) stop 1
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90
index 5e46287497d81d7063085f0c9c7b44748c4bbe60..5571059588ffa4c30db876e91896ff00d6c6fd69 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90
@@ -23,6 +23,6 @@ program main
   !$acc end kernels
 
   do i = 0, 32 * 32 - 1
-     if (arr(i) .ne. i + (i / 32) * 2) call abort
+     if (arr(i) .ne. i + (i / 32) * 2) stop 1
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90
index 5cc3378f4592d545fab08a3250858f2292173431..6abbed7f489461f3c03156d42fb0a01ad805cd16 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90
@@ -23,6 +23,6 @@ program main
   !$acc end kernels
 
   do i = 0, 32 * 32 - 1
-     if (arr(i) .ne. i + (i / 32) * 2) call abort
+     if (arr(i) .ne. i + (i / 32) * 2) stop 1
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90
index 1e41555aa1ca322f80fc29eb443ac72ad38b6caa..d92be2d4f0e8db28ad44420653957cfce3bcc7ef 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90
@@ -31,6 +31,6 @@ program main
   !$acc end kernels
 
   do i = 0, 32 * 32 - 1
-     if (arr(i) .ne. i + (i / 32) * 13) call abort
+     if (arr(i) .ne. i + (i / 32) * 13) stop 1
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-1.f90
index 3efd9fe473bba4dd4802ec3b2784221632d4a41a..e9c0fb3f1307d9211bb19b7f2aae94ac160e4fd6 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-1.f90
@@ -33,7 +33,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-2.f90
index 1cf3b9818ef127f392b16cc51786053fe79ba0c3..13badb51919e2f5c69aaa4d0ca375f47ec861c82 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-2.f90
@@ -30,7 +30,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-1.f90
index 55e98e05c032b3060a3e85c9e37213bb9a08a91b..04d732ef41028fa53542dd6139856809a95012c4 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-1.f90
@@ -22,6 +22,6 @@ program main
   !$acc end kernels
 
   do i = 0, 32 * 32 - 1
-     if (arr(i) .ne. i + ieor(i / 32, mod(i, 32) * 3)) call abort
+     if (arr(i) .ne. i + ieor(i / 32, mod(i, 32) * 3)) stop 1
   end do
 end program main

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-2.f90
index 7924e7f13a62004898ce40ae2f8206a5564095cd..6c9a6b81c8a8aedc9c4a4414f787d6b9f4ebd99d 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-2.f90
@@ -29,7 +29,7 @@ program main
      do j = 0, 32 -1
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
-           if (arr(idx) .ne. idx + ieor(i, j * 3) * k) call abort
+           if (arr(idx) .ne. idx + ieor(i, j * 3) * k) stop 1
         end do
      end do
   end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-3.f90
index 598c6fd7226f2c20d121c21e831e26c41f221881..fab14c3a953b2ba99524e5de49acc25cbfbe1fda 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-3.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-3.f90
@@ -40,7 +40,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-4.f90
index 8512d7c3966c9a2f0837040e78dd1045510790d1..71f4a110acb27284de5372b8b9ee9eaa9243bc18 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-4.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-4.f90
@@ -37,7 +37,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-5.f90
index c3ebf7445789da81a922e32997be94e1d3d0cecf..bb457555a42d60378e795af1f261e17dd0ed8e51 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-5.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-5.f90
@@ -40,7 +40,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-6.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-6.f90
index 2a8a590589506ee1acc42e06700ccba391bd0d0c..e169714dd512ddbef1514750274e53245a0311fa 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-6.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-6.f90
@@ -41,7 +41,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-7.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-7.f90
index 7dd1d3da7becf9b3b5939b420811c8b446c7fb97..e262c02ac00944ef1781290089f6bf2b312438a4 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-7.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-7.f90
@@ -36,7 +36,7 @@ program main
         do k = 0, 32 - 1
            idx = i * 1024 + j * 32 + k
            if (arr(idx) .ne. idx + ieor(i, j * 3) * k + ior(i, j * 5) * k) then
-              call abort
+              stop 1
            end if
         end do
      end do

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90
index c7a52ed98f6e6cacb6a586f9b4f95e83dbe5c21d..4b85608f0de6e29daae6ab076dd77062f1abfb6f 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90
@@ -15,5 +15,5 @@ program reduction
   end do
   !$acc end kernels
 
-  if (red .ne. n) call abort
+  if (red .ne. n) stop 1
 end program reduction

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90
index 901169aa11980ee332b40f437e2c1b70b96cffda..760e21f916f35d6a9cb4009b88ee81e0492c29e2 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 use openacc
 
 if (acc_get_num_devices (acc_device_host) .ne. 1) STOP 1

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-12.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-12.f90
index 4cf62f2728add0086d6a3bcb718c1c71ddd115cd..efb921065acd965d27f39ce061a632839d200d4e 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-12.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-12.f90
@@ -18,13 +18,13 @@ program main
   call acc_wait_async (0, 1)
 
   ! Test unseen async-argument.
-  if (acc_async_test (2) .neqv. .TRUE.) call abort
+  if (acc_async_test (2) .neqv. .TRUE.) stop 1
   call acc_wait_async (2, 1)
 
   call acc_wait (1)
 
-  if (acc_async_test (0) .neqv. .TRUE.) call abort
-  if (acc_async_test (1) .neqv. .TRUE.) call abort
-  if (acc_async_test (2) .neqv. .TRUE.) call abort
+  if (acc_async_test (0) .neqv. .TRUE.) stop 2
+  if (acc_async_test (1) .neqv. .TRUE.) stop 3
+  if (acc_async_test (2) .neqv. .TRUE.) stop 4
 
 end program

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-13.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-13.f90
index da944c35de9445b45865d8a15d5387d594963a96..deb2c28860484194059b47ff3a23c979d4a2de22 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-13.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-13.f90
@@ -25,8 +25,8 @@ program main
 
   call acc_wait (nprocs + 1)
 
-  if (acc_async_test (1) .neqv. .TRUE.) call abort
-  if (acc_async_test (2) .neqv. .TRUE.) call abort
-  if (acc_async_test (nprocs + 1) .neqv. .TRUE.) call abort
+  if (acc_async_test (1) .neqv. .TRUE.) stop 1
+  if (acc_async_test (2) .neqv. .TRUE.) stop 2
+  if (acc_async_test (nprocs + 1) .neqv. .TRUE.) stop 3
 
 end program

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-14.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-14.f90
index eb0206ccce1e0902cb421868e5f066a4a7ff49ec..bf35631c96bc00cf4f05c2648a030324fed62ba8 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-14.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-14.f90
@@ -19,14 +19,14 @@ program main
 
   call acc_present_or_copyin (h)
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   call acc_copyout (h)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 1
 
   do i = 1, N
-    if (h(i) /= i) call abort
+    if (h(i) /= i) stop 1
   end do
 
   do i = 1, N
@@ -35,19 +35,19 @@ program main
 
   call acc_pcopyin (h, sizeof (h))
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   call acc_copyout (h)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 1
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 1
   end do
 
   call acc_create (h)
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   !$acc parallel loop
     do i = 1, N
@@ -57,26 +57,26 @@ program main
 
   call acc_copyout (h)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 1
 
   do i = 1, N
-    if (h(i) /= i) call abort
+    if (h(i) /= i) stop 1
   end do
 
   call acc_present_or_create (h, sizeof (h))
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   call acc_delete (h)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 1
 
   call acc_pcreate (h)
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   call acc_delete (h)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 1
 
 end program

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-15.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-15.f90
index 3a834dbb22a1539935207085be41f5399934f3fb..cbf7a6eccae56fa1cf4290658ae46cb9e853ffe3 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-15.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-15.f90
@@ -23,14 +23,14 @@ program main
 
   call acc_update_device (h, sizeof (h))
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   h(:) = 0
 
   call acc_copyout (h, sizeof (h))
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 2
   end do 
 
   call acc_copyin (h, sizeof (h))
@@ -39,14 +39,14 @@ program main
 
   call acc_update_self (h, sizeof (h))
   
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 3
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 4
   end do 
 
   call acc_delete (h)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 4
   
 end program

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-16-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-16-2.f90
index fa76f65912fb2d74ca8a4d0104bb9c6dca27698f..ddd557d3be088633c47c2d13aedd17e017db5e83 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-16-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-16-2.f90
@@ -25,7 +25,7 @@ program main
 
   call acc_update_device_async (h, sizeof (h), async)
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   h(:) = 0
 
@@ -34,7 +34,7 @@ program main
   call acc_wait (async)
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 2
   end do 
 
   call acc_copyin (h, sizeof (h))
@@ -43,16 +43,16 @@ program main
 
   call acc_update_self_async (h, sizeof (h), async)
   
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 3
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 4
   end do 
 
   call acc_delete_async (h, async)
 
   call acc_wait (async)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 5
   
 end program

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-16.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-16.f90
index 011f9cf31db4b1f8db724c5e79feae8072054656..ccd1ce6ee18ec5a87cc0d78172fc7e89ac2e41e1 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-16.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-16.f90
@@ -25,7 +25,7 @@ program main
 
   call acc_update_device_async (h, sizeof (h), async)
 
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 1
 
   h(:) = 0
 
@@ -34,7 +34,7 @@ program main
   call acc_wait (async)
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 2
   end do 
 
   call acc_copyin (h, sizeof (h))
@@ -43,16 +43,16 @@ program main
 
   call acc_update_self_async (h, sizeof (h), async)
   
-  if (acc_is_present (h) .neqv. .TRUE.) call abort
+  if (acc_is_present (h) .neqv. .TRUE.) stop 3
 
   do i = 1, N
-    if (h(i) /= i + i) call abort
+    if (h(i) /= i + i) stop 4
   end do 
 
   call acc_delete_async (h, async)
 
   call acc_wait (async)
 
-  if (acc_is_present (h) .neqv. .FALSE.) call abort
+  if (acc_is_present (h) .neqv. .FALSE.) stop 5
   
 end program

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f b/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f
index 069e07ec03584ebd4c44c2b3b87a8f492ccc5655..3c8d8dba3e79f1809973c0c418930b3c8da8416e 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
       USE OPENACC
 
       IF (ACC_GET_NUM_DEVICES (ACC_DEVICE_HOST) .NE. 1) STOP 1

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f b/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f
index 47424f14a15111ae73412017bd2362ef30e1d898..54a781eae69e96423ae2a482a9c93048c75591a2 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
       INCLUDE "openacc_lib.h"
 
       IF (ACC_GET_NUM_DEVICES (ACC_DEVICE_HOST) .NE. 1) STOP 1

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90
index 47859508c8f748782a8dbcaf5d9b09ef73e1e224..c0e8f8f540c7213eb53832409b6c8c986b5e6557 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 program map
   integer, parameter     :: n = 20, c = 10
   integer                :: i, a(n), b(n)

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-loop-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-loop-1.f90
index 754b833a4ba722d517e4a4db41d56716030cafcc..676417cfecfd569de36229c76593feabe88e0a25 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-loop-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-loop-1.f90
@@ -37,7 +37,7 @@ program loops
   !$acc end parallel
 
   do i = 1, n
-     if (a(i) .ne. b(i)) call abort
+     if (a(i) .ne. b(i)) stop 1
   end do
   call check (a, b, n)
 
@@ -72,6 +72,6 @@ subroutine check (a, b, n)
   integer :: i
 
   do i = 1, n
-     if (a(i) .ne. b(i)) call abort
+     if (a(i) .ne. b(i)) stop 2
   end do
 end subroutine check

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90
index 3f4b9fe070e1ff176c017bf09db30c1b266c1b89..d0e7aa1c81b4579b8915f4b055ba5cbd325c4054 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 ! PR middle-end/63247
 
 program test

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr68813.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr68813.f90
index 735350f6aac30bfde378be628549f72f6d782dcd..c4552053e28c5d25b4d434da3439dc8dea65dfef 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/pr68813.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/pr68813.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 program foo
   implicit none
   integer, parameter :: n = 100

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr70289.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr70289.f90
index 63bde44100da8eaa181d875319f3e63f8f2cf8f0..a516f9f32f623e1bd917b2cb85e2206e2afcf6b1 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/pr70289.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/pr70289.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 program foo
   implicit none
   integer :: i

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90
index c8a7922a4156a13abdff6abff2f5d1c708706a78..42dc3193546b5c255dacad103077f2a6ab1f3fd5 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 MODULE reduction_test
 
 CONTAINS

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reference-reductions.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reference-reductions.f90
index a684d07977cde8614941cf6c2553a74b567f22dc..b25430e59ed0f92160a7eba4723aafe0aa13f006 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/reference-reductions.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/reference-reductions.f90
@@ -34,5 +34,5 @@ program test
   r=10.0
   call param_reduction (r)
 
-  if (r .ne. 1010) call abort ()
+  if (r .ne. 1010) stop 1
 end program test

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90
index 8a2ec2cc97eea5799022c70d6eed8582bb54d22f..b67a8f482f41a49657e60b2dfdbef9d7e5bef495 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 program subarrays
   integer, parameter     :: n = 20, c = 10
   integer                :: i, a(n), b(n)

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90
index 914da5b4062588982526a931904281280a079b6c..1cc6dd6882014360f124730e7ec53eb3de81c291 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90
@@ -1,3 +1,5 @@
+! { dg-do run }
+!
 program subarrays
   integer, parameter     :: n = 20, c = 10, low = 5, high = 10
   integer                :: i, a(n), b(n)

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/vector-routine.f90 b/libgomp/testsuite/libgomp.oacc-fortran/vector-routine.f90
index 1edcee48677e2b9633c2d7e2124d0def66d40a57..88b9ab411d4bcb411be660c1e3e8ee7135b7369e 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/vector-routine.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/vector-routine.f90
@@ -21,7 +21,7 @@ program main
   !$acc end parallel
 
   do i = 1, N
-    if (a(i) .ne. 0) call abort
+    if (a(i) .ne. 0) stop 1
   end do
 
 contains