From 24942dafba52f73317ce1f8711f15184888147a9 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 28 Oct 2019 07:39:26 +0000 Subject: =?UTF-8?q?Fortran]=20OpenACC=20=E2=80=93=20libgomp/testsuite=20?= =?UTF-8?q?=E2=80=93=20use=20'stop'=20and=20'dg-do=20run'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@277503 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 63 +++++++++++++ libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 | 2 + libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 | 2 + .../libgomp.oacc-fortran/acc_on_device-1-1.f90 | 2 + .../libgomp.oacc-fortran/acc_on_device-1-2.f | 2 + .../libgomp.oacc-fortran/acc_on_device-1-3.f | 2 + .../libgomp.oacc-fortran/common-block-1.f90 | 2 +- .../libgomp.oacc-fortran/common-block-2.f90 | 4 +- .../libgomp.oacc-fortran/common-block-3.f90 | 4 +- libgomp/testsuite/libgomp.oacc-fortran/data-1.f90 | 100 ++++++++++----------- libgomp/testsuite/libgomp.oacc-fortran/data-2.f90 | 4 +- libgomp/testsuite/libgomp.oacc-fortran/data-5.f90 | 12 +-- .../testsuite/libgomp.oacc-fortran/dummy-array.f90 | 2 +- libgomp/testsuite/libgomp.oacc-fortran/gemm-2.f90 | 2 +- libgomp/testsuite/libgomp.oacc-fortran/gemm.f90 | 2 +- .../testsuite/libgomp.oacc-fortran/host_data-2.f90 | 2 +- .../testsuite/libgomp.oacc-fortran/host_data-3.f | 2 +- .../testsuite/libgomp.oacc-fortran/host_data-4.f90 | 2 +- .../kernels-acc-loop-reduction-2.f90 | 4 +- .../kernels-acc-loop-reduction.f90 | 4 +- .../libgomp.oacc-fortran/kernels-collapse-3.f90 | 4 +- .../libgomp.oacc-fortran/kernels-collapse-4.f90 | 4 +- .../libgomp.oacc-fortran/kernels-independent.f90 | 2 +- .../libgomp.oacc-fortran/kernels-loop-1.f90 | 4 +- .../libgomp.oacc-fortran/kernels-map-1.f90 | 4 +- .../kernels-parallel-loop-data-enter-exit.f95 | 2 +- .../kernels-private-vars-loop-gang-1.f90 | 2 +- .../kernels-private-vars-loop-gang-2.f90 | 2 +- .../kernels-private-vars-loop-gang-3.f90 | 2 +- .../kernels-private-vars-loop-gang-6.f90 | 2 +- .../kernels-private-vars-loop-vector-1.f90 | 2 +- .../kernels-private-vars-loop-vector-2.f90 | 2 +- .../kernels-private-vars-loop-worker-1.f90 | 2 +- .../kernels-private-vars-loop-worker-2.f90 | 2 +- .../kernels-private-vars-loop-worker-3.f90 | 2 +- .../kernels-private-vars-loop-worker-4.f90 | 2 +- .../kernels-private-vars-loop-worker-5.f90 | 2 +- .../kernels-private-vars-loop-worker-6.f90 | 2 +- .../kernels-private-vars-loop-worker-7.f90 | 2 +- .../libgomp.oacc-fortran/kernels-reduction-1.f90 | 2 +- libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90 | 2 + libgomp/testsuite/libgomp.oacc-fortran/lib-12.f90 | 8 +- libgomp/testsuite/libgomp.oacc-fortran/lib-13.f90 | 6 +- libgomp/testsuite/libgomp.oacc-fortran/lib-14.f90 | 26 +++--- libgomp/testsuite/libgomp.oacc-fortran/lib-15.f90 | 10 +-- .../testsuite/libgomp.oacc-fortran/lib-16-2.f90 | 10 +-- libgomp/testsuite/libgomp.oacc-fortran/lib-16.f90 | 10 +-- libgomp/testsuite/libgomp.oacc-fortran/lib-2.f | 2 + libgomp/testsuite/libgomp.oacc-fortran/lib-3.f | 2 + libgomp/testsuite/libgomp.oacc-fortran/map-1.f90 | 2 + .../libgomp.oacc-fortran/parallel-loop-1.f90 | 4 +- .../libgomp.oacc-fortran/pointer-align-1.f90 | 2 + libgomp/testsuite/libgomp.oacc-fortran/pr68813.f90 | 2 + libgomp/testsuite/libgomp.oacc-fortran/pr70289.f90 | 2 + libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90 | 2 + .../libgomp.oacc-fortran/reference-reductions.f90 | 2 +- .../testsuite/libgomp.oacc-fortran/subarrays-1.f90 | 2 + .../testsuite/libgomp.oacc-fortran/subarrays-2.f90 | 2 + .../libgomp.oacc-fortran/vector-routine.f90 | 2 +- 59 files changed, 231 insertions(+), 134 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 351df1153fd..aa30b809f15 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,66 @@ +2019-10-28 Tobias Burnus + + * 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 Tobias Burnus diff --git a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 index fc0af7ff7d8..70c05d7d3c1 100644 --- 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 97a692ba667..6671d46d8b8 100644 --- 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 d6c67a0c31a..1a8432cfa86 100644 --- 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 75e24509ce9..56f99d4f99b 100644 --- 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 908d185f40c..565723851b1 100644 --- 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 000d811a059..d77878ede39 100644 --- 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 4cfcded244d..018b37d00bb 100644 --- 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 5a68b485b1e..3c59b66246b 100644 --- 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 bf323b3f540..eeb06f3c84f 100644 --- 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 83a540070e6..ec206958e23 100644 --- 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 a8843dedc22..c68a2795900 100644 --- 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 e95563cd406..697d94d52aa 100644 --- 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 fe108732a5f..5fa93642477 100644 --- 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 de78148c7b3..9e8915fbb88 100644 --- 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 ff0921863f6..ab70e4e8dea 100644 --- 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 05ed949ee5c..434c18c9889 100644 --- 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 6e379b5485b..e81a8b292c1 100644 --- 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 fdf9409bde4..0a612a57964 100644 --- 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 912a22b5153..0b939c04fbb 100644 --- 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 4ef99cd3475..03b3a115d7b 100644 --- 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 db382a7deb6..15e33603adb 100644 --- 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 a881fbbe5cc..5a47aca2dba 100644 --- 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 edcdc56ec1c..37aa0ac4f63 100644 --- 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 704ff622854..736ce1791ae 100644 --- 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 fe1088c0d04..0d353e80131 100644 --- 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 5119fabadaf..bcc0476d665 100644 --- 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 5e46287497d..5571059588f 100644 --- 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 5cc3378f459..6abbed7f489 100644 --- 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 1e41555aa1c..d92be2d4f0e 100644 --- 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 3efd9fe473b..e9c0fb3f130 100644 --- 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 1cf3b9818ef..13badb51919 100644 --- 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 55e98e05c03..04d732ef410 100644 --- 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 7924e7f13a6..6c9a6b81c8a 100644 --- 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 598c6fd7226..fab14c3a953 100644 --- 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 8512d7c3966..71f4a110acb 100644 --- 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 c3ebf744578..bb457555a42 100644 --- 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 2a8a5905895..e169714dd51 100644 --- 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 7dd1d3da7be..e262c02ac00 100644 --- 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 c7a52ed98f6..4b85608f0de 100644 --- 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 901169aa119..760e21f916f 100644 --- 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 4cf62f2728a..efb921065ac 100644 --- 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 da944c35de9..deb2c288604 100644 --- 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 eb0206ccce1..bf35631c96b 100644 --- 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 3a834dbb22a..cbf7a6eccae 100644 --- 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 fa76f65912f..ddd557d3be0 100644 --- 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 011f9cf31db..ccd1ce6ee18 100644 --- 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 069e07ec035..3c8d8dba3e7 100644 --- 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 47424f14a15..54a781eae69 100644 --- 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 47859508c8f..c0e8f8f540c 100644 --- 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 754b833a4ba..676417cfecf 100644 --- 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 3f4b9fe070e..d0e7aa1c81b 100644 --- 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 735350f6aac..c4552053e28 100644 --- 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 63bde44100d..a516f9f32f6 100644 --- 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 c8a7922a415..42dc3193546 100644 --- 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 a684d07977c..b25430e59ed 100644 --- 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 8a2ec2cc97e..b67a8f482f4 100644 --- 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 914da5b4062..1cc6dd68820 100644 --- 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 1edcee48677..88b9ab411d4 100644 --- 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 -- cgit v1.2.3