diff options
Diffstat (limited to 'libgomp/testsuite/libgomp.oacc-fortran')
91 files changed, 843 insertions, 843 deletions
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 index b38303d..dde3512 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 @@ -3,7 +3,7 @@ program main print *, "CheCKpOInT" !$acc parallel - call abort + STOP 1 !$acc end parallel end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 index 2ba2bcb..68d90e9 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 @@ -6,7 +6,7 @@ program main !$acc parallel copyin(argc) if (argc .ne. 0) then - call abort + STOP 1 end if !$acc end parallel 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 1a10f32..d6c67a0 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 @@ -9,19 +9,19 @@ implicit none ! Host. -if (.not. acc_on_device (acc_device_none)) call abort -if (.not. acc_on_device (acc_device_host)) call abort -if (acc_on_device (acc_device_not_host)) call abort -if (acc_on_device (acc_device_nvidia)) call abort +if (.not. acc_on_device (acc_device_none)) STOP 1 +if (.not. acc_on_device (acc_device_host)) STOP 2 +if (acc_on_device (acc_device_not_host)) STOP 3 +if (acc_on_device (acc_device_nvidia)) STOP 4 ! Host via offloading fallback mode. !$acc parallel if(.false.) -if (.not. acc_on_device (acc_device_none)) call abort -if (.not. acc_on_device (acc_device_host)) call abort -if (acc_on_device (acc_device_not_host)) call abort -if (acc_on_device (acc_device_nvidia)) call abort +if (.not. acc_on_device (acc_device_none)) STOP 5 +if (.not. acc_on_device (acc_device_host)) STOP 6 +if (acc_on_device (acc_device_not_host)) STOP 7 +if (acc_on_device (acc_device_nvidia)) STOP 8 !$acc end parallel @@ -30,13 +30,13 @@ if (acc_on_device (acc_device_nvidia)) call abort ! Offloaded. !$acc parallel -if (acc_on_device (acc_device_none)) call abort -if (acc_on_device (acc_device_host)) call abort -if (.not. acc_on_device (acc_device_not_host)) call abort +if (acc_on_device (acc_device_none)) STOP 9 +if (acc_on_device (acc_device_host)) STOP 10 +if (.not. acc_on_device (acc_device_not_host)) STOP 11 #if ACC_DEVICE_TYPE_nvidia -if (.not. acc_on_device (acc_device_nvidia)) call abort +if (.not. acc_on_device (acc_device_nvidia)) STOP 12 #else -if (acc_on_device (acc_device_nvidia)) call abort +if (acc_on_device (acc_device_nvidia)) STOP 13 #endif !$acc end parallel 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 a19045b..75e2450 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 @@ -9,19 +9,19 @@ !Host. - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) CALL ABORT - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) STOP 1 + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) STOP 2 + IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) STOP 3 + IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 4 !Host via offloading fallback mode. !$ACC PARALLEL IF(.FALSE.) - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) CALL ABORT - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) STOP 5 + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) STOP 6 + IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) STOP 7 + IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 8 !$ACC END PARALLEL @@ -30,13 +30,13 @@ ! Offloaded. !$ACC PARALLEL - IF (ACC_ON_DEVICE (ACC_DEVICE_NONE)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_HOST)) CALL ABORT - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) CALL ABORT + IF (ACC_ON_DEVICE (ACC_DEVICE_NONE)) STOP 9 + IF (ACC_ON_DEVICE (ACC_DEVICE_HOST)) STOP 10 + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) STOP 11 #if ACC_DEVICE_TYPE_nvidia - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 12 #else - IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 13 #endif !$ACC END PARALLEL 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 c391776..908d185 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 @@ -9,19 +9,19 @@ !Host. - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) CALL ABORT - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) STOP 1 + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) STOP 2 + IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) STOP 3 + IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 4 !Host via offloading fallback mode. !$ACC PARALLEL IF(.FALSE.) - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) CALL ABORT - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NONE)) STOP 5 + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_HOST)) STOP 6 + IF (ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) STOP 7 + IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 8 !$ACC END PARALLEL @@ -30,13 +30,13 @@ ! Offloaded. !$ACC PARALLEL - IF (ACC_ON_DEVICE (ACC_DEVICE_NONE)) CALL ABORT - IF (ACC_ON_DEVICE (ACC_DEVICE_HOST)) CALL ABORT - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) CALL ABORT + IF (ACC_ON_DEVICE (ACC_DEVICE_NONE)) STOP 9 + IF (ACC_ON_DEVICE (ACC_DEVICE_HOST)) STOP 10 + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NOT_HOST)) STOP 11 #if ACC_DEVICE_TYPE_nvidia - IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (.NOT. ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 12 #else - IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) CALL ABORT + IF (ACC_ON_DEVICE (ACC_DEVICE_NVIDIA)) STOP 13 #endif !$ACC END PARALLEL diff --git a/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-1.f90 index 01728bd..f027c31 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-1.f90 @@ -27,8 +27,8 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 + if (b(i) .ne. 3.0) STOP 2 end do a(:) = 2.0 @@ -47,8 +47,8 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 2.0) call abort + if (a(i) .ne. 2.0) STOP 3 + if (b(i) .ne. 2.0) STOP 4 end do a(:) = 3.0 @@ -81,10 +81,10 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 9.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort + if (a(i) .ne. 3.0) STOP 5 + if (b(i) .ne. 9.0) STOP 6 + if (c(i) .ne. 4.0) STOP 7 + if (d(i) .ne. 1.0) STOP 8 end do a(:) = 2.0 @@ -126,11 +126,11 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 4.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort - if (e(i) .ne. 11.0) call abort + if (a(i) .ne. 2.0) STOP 9 + if (b(i) .ne. 4.0) STOP 10 + if (c(i) .ne. 4.0) STOP 11 + if (d(i) .ne. 1.0) STOP 12 + if (e(i) .ne. 11.0) STOP 13 end do a(:) = 3.0 @@ -149,8 +149,8 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 14 + if (b(i) .ne. 3.0) STOP 15 end do a(:) = 2.0 @@ -169,8 +169,8 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 2.0) call abort + if (a(i) .ne. 2.0) STOP 16 + if (b(i) .ne. 2.0) STOP 17 end do a(:) = 3.0 @@ -203,10 +203,10 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 9.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort + if (a(i) .ne. 3.0) STOP 18 + if (b(i) .ne. 9.0) STOP 19 + if (c(i) .ne. 4.0) STOP 20 + if (d(i) .ne. 1.0) STOP 21 end do a(:) = 2.0 @@ -248,10 +248,10 @@ program asyncwait !$acc end data do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 4.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort - if (e(i) .ne. 11.0) call abort + if (a(i) .ne. 2.0) STOP 22 + if (b(i) .ne. 4.0) STOP 23 + if (c(i) .ne. 4.0) STOP 24 + if (d(i) .ne. 1.0) STOP 25 + if (e(i) .ne. 11.0) STOP 26 end do end program asyncwait diff --git a/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-2.f90 index fe131b6..7f5080a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-2.f90 @@ -31,7 +31,7 @@ program asyncwait !$acc end parallel do i = 1, N - if (c(i) .ne. 2.0) call abort + if (c(i) .ne. 2.0) STOP 1 end do !$acc kernels async (0) @@ -56,7 +56,7 @@ program asyncwait !$acc end kernels do i = 1, N - if (c(i) .ne. 2.0) call abort + if (c(i) .ne. 2.0) STOP 2 end do deallocate (a) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-3.f90 index fa96a01..6d9ed0c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/asyncwait-3.f90 @@ -33,7 +33,7 @@ program asyncwait !$acc end parallel do i = 1, N - if (c(i) .ne. 2.0) call abort + if (c(i) .ne. 2.0) STOP 1 end do !$acc kernels async (0) @@ -60,7 +60,7 @@ program asyncwait !$acc end kernels do i = 1, N - if (c(i) .ne. 2.0) call abort + if (c(i) .ne. 2.0) STOP 2 end do deallocate (a) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 index 27c5c9e..5a7e1e5 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 @@ -18,8 +18,8 @@ program main end do !$acc end parallel - if (igot /= iexp) call abort - if (itmp /= iexp - 2) call abort + if (igot /= iexp) STOP 1 + if (itmp /= iexp - 2) STOP 2 fgot = 1234.0 fexp = 1266.0 @@ -33,8 +33,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp - 1.0) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp - 1.0) STOP 3 + if (fgot /= fexp) STOP 4 fgot = 1.0 fexp = 2.0**32 @@ -48,8 +48,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp / 2.0) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp / 2.0) STOP 5 + if (fgot /= fexp) STOP 6 fgot = 32.0 fexp = fgot - N @@ -63,8 +63,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp + 1.0) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp + 1.0) STOP 7 + if (fgot /= fexp) STOP 8 fgot = 2**32.0 fexp = 1.0 @@ -78,8 +78,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fgot * 2.0) call abort - if (fgot /= fexp) call abort + if (ftmp /= fgot * 2.0) STOP 9 + if (fgot /= fexp) STOP 10 lgot = .TRUE. lexp = .FALSE. @@ -91,8 +91,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. .not. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. .not. lexp) STOP 11 + if (lgot .neqv. lexp) STOP 12 lgot = .FALSE. lexp = .FALSE. @@ -104,8 +104,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 13 + if (lgot .neqv. lexp) STOP 14 lgot = .FALSE. lexp = .FALSE. @@ -117,8 +117,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 15 + if (lgot .neqv. lexp) STOP 16 lgot = .FALSE. lexp = .TRUE. @@ -130,8 +130,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. .not. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. .not. lexp) STOP 17 + if (lgot .neqv. lexp) STOP 18 fgot = 1234.0 fexp = 1266.0 @@ -145,8 +145,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp - 1.0) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp - 1.0) STOP 19 + if (fgot /= fexp) STOP 20 fgot = 1.0 fexp = 2.0**32 @@ -160,8 +160,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp / 2.0) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp / 2.0) STOP 21 + if (fgot /= fexp) STOP 22 fgot = 32.0 fexp = 32.0 @@ -175,8 +175,8 @@ program main end do !$acc end parallel loop - if (ftmp /= 2.0 - fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= 2.0 - fexp) STOP 23 + if (fgot /= fexp) STOP 24 fgot = 2.0**16 fexp = 2.0**16 @@ -190,8 +190,8 @@ program main end do !$acc end parallel loop - if (ftmp /= 2.0 / fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= 2.0 / fexp) STOP 25 + if (fgot /= fexp) STOP 26 lgot = .TRUE. lexp = .FALSE. @@ -203,8 +203,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. .not. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. .not. lexp) STOP 27 + if (lgot .neqv. lexp) STOP 28 lgot = .FALSE. lexp = .FALSE. @@ -216,8 +216,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 29 + if (lgot .neqv. lexp) STOP 30 lgot = .FALSE. lexp = .FALSE. @@ -229,8 +229,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 31 + if (lgot .neqv. lexp) STOP 32 lgot = .FALSE. lexp = .TRUE. @@ -242,8 +242,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. .not. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. .not. lexp) STOP 33 + if (lgot .neqv. lexp) STOP 34 igot = 1 iexp = N @@ -257,8 +257,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp - 1) call abort - if (igot /= iexp) call abort + if (itmp /= iexp - 1) STOP 35 + if (igot /= iexp) STOP 36 igot = N iexp = 1 @@ -272,8 +272,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 37 + if (igot /= iexp) STOP 38 igot = -1 iexp = 0 @@ -288,8 +288,8 @@ program main end do !$acc end parallel loop - if (itmp /= ibset (iexp, N - 1)) call abort - if (igot /= iexp) call abort + if (itmp /= ibset (iexp, N - 1)) STOP 39 + if (igot /= iexp) STOP 40 igot = 0 iexp = -1 @@ -304,8 +304,8 @@ program main end do !$acc end parallel loop - if (itmp /= ieor (iexp, lshift (1, N - 1))) call abort - if (igot /= iexp) call abort + if (itmp /= ieor (iexp, lshift (1, N - 1))) STOP 41 + if (igot /= iexp) STOP 42 igot = -1 iexp = 0 @@ -320,8 +320,8 @@ program main end do !$acc end parallel loop - if (itmp /= ior (iexp, lshift (1, N - 1))) call abort - if (igot /= iexp) call abort + if (itmp /= ior (iexp, lshift (1, N - 1))) STOP 43 + if (igot /= iexp) STOP 44 igot = 1 iexp = N @@ -335,8 +335,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp - 1) call abort - if (igot /= iexp) call abort + if (itmp /= iexp - 1) STOP 45 + if (igot /= iexp) STOP 46 igot = N iexp = 1 @@ -350,8 +350,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 47 + if (igot /= iexp) STOP 48 igot = -1 iexp = 0 @@ -366,8 +366,8 @@ program main end do !$acc end parallel loop - if (itmp /= ibset (iexp, N - 1)) call abort - if (igot /= iexp) call abort + if (itmp /= ibset (iexp, N - 1)) STOP 49 + if (igot /= iexp) STOP 50 igot = 0 iexp = -1 @@ -382,8 +382,8 @@ program main end do !$acc end parallel loop - if (itmp /= ieor (iexp, lshift (1, N - 1))) call abort - if (igot /= iexp) call abort + if (itmp /= ieor (iexp, lshift (1, N - 1))) STOP 51 + if (igot /= iexp) STOP 52 igot = -1 iexp = 0 @@ -398,8 +398,8 @@ program main end do !$acc end parallel loop - if (itmp /= ior (iexp, lshift (1, N - 1))) call abort - if (igot /= iexp) call abort + if (itmp /= ior (iexp, lshift (1, N - 1))) STOP 53 + if (igot /= iexp) STOP 54 fgot = 1234.0 fexp = 1266.0 @@ -413,8 +413,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 55 + if (fgot /= fexp) STOP 56 fgot = 1.0 fexp = 2.0**32 @@ -428,8 +428,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 57 + if (fgot /= fexp) STOP 58 fgot = 32.0 fexp = fgot - N @@ -443,8 +443,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 59 + if (fgot /= fexp) STOP 60 fgot = 2**32.0 fexp = 1.0 @@ -458,8 +458,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 61 + if (fgot /= fexp) STOP 62 lgot = .TRUE. lexp = .FALSE. @@ -471,8 +471,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 63 + if (lgot .neqv. lexp) STOP 64 lgot = .FALSE. lexp = .FALSE. @@ -484,8 +484,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 65 + if (lgot .neqv. lexp) STOP 66 lgot = .FALSE. lexp = .FALSE. @@ -497,8 +497,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 67 + if (lgot .neqv. lexp) STOP 68 lgot = .FALSE. lexp = .TRUE. @@ -510,8 +510,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 69 + if (lgot .neqv. lexp) STOP 70 fgot = 1234.0 fexp = 1266.0 @@ -525,8 +525,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 71 + if (fgot /= fexp) STOP 72 fgot = 1.0 fexp = 2.0**32 @@ -540,8 +540,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 73 + if (fgot /= fexp) STOP 74 fgot = 32.0 fexp = 32.0 @@ -555,8 +555,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 75 + if (fgot /= fexp) STOP 76 fgot = 2.0**16 fexp = 2.0**16 @@ -570,8 +570,8 @@ program main end do !$acc end parallel loop - if (ftmp /= fexp) call abort - if (fgot /= fexp) call abort + if (ftmp /= fexp) STOP 77 + if (fgot /= fexp) STOP 78 lgot = .TRUE. lexp = .FALSE. @@ -583,8 +583,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 79 + if (lgot .neqv. lexp) STOP 80 lgot = .FALSE. lexp = .FALSE. @@ -596,8 +596,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 81 + if (lgot .neqv. lexp) STOP 82 lgot = .FALSE. lexp = .FALSE. @@ -609,8 +609,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 83 + if (lgot .neqv. lexp) STOP 84 lgot = .FALSE. lexp = .TRUE. @@ -622,8 +622,8 @@ program main !$acc end atomic !$acc end parallel - if (ltmp .neqv. lexp) call abort - if (lgot .neqv. lexp) call abort + if (ltmp .neqv. lexp) STOP 85 + if (lgot .neqv. lexp) STOP 86 igot = 1 iexp = N @@ -637,8 +637,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 87 + if (igot /= iexp) STOP 88 igot = N iexp = 1 @@ -652,8 +652,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 89 + if (igot /= iexp) STOP 90 igot = -1 iexp = 0 @@ -668,8 +668,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 91 + if (igot /= iexp) STOP 92 igot = 0 iexp = -1 @@ -684,8 +684,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 93 + if (igot /= iexp) STOP 94 igot = -1 iexp = 0 @@ -700,8 +700,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 95 + if (igot /= iexp) STOP 96 igot = 1 iexp = N @@ -715,8 +715,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 97 + if (igot /= iexp) STOP 98 igot = N iexp = 1 @@ -730,8 +730,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 99 + if (igot /= iexp) STOP 100 igot = -1 iexp = 0 @@ -746,8 +746,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 101 + if (igot /= iexp) STOP 102 igot = 0 iexp = -1 @@ -762,8 +762,8 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 103 + if (igot /= iexp) STOP 104 igot = -1 iexp = 0 @@ -778,7 +778,7 @@ program main end do !$acc end parallel loop - if (itmp /= iexp) call abort - if (igot /= iexp) call abort + if (itmp /= iexp) STOP 105 + if (igot /= iexp) STOP 106 end program diff --git a/libgomp/testsuite/libgomp.oacc-fortran/atomic_rw-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/atomic_rw-1.f90 index 51ec9aa..cbbfe9f 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/atomic_rw-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/atomic_rw-1.f90 @@ -22,8 +22,8 @@ program main !$acc end parallel - if (v1 .ne. 99) call abort + if (v1 .ne. 99) STOP 1 - if (v2 .ne. 32) call abort + if (v2 .ne. 32) STOP 2 end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/atomic_update-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/atomic_update-1.f90 index 6607c77..c99d1f3 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/atomic_update-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/atomic_update-1.f90 @@ -18,7 +18,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 1 fgot = 1.0 fexp = 2.0**32 @@ -31,7 +31,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 2 fgot = 32.0 fexp = fgot - N @@ -44,7 +44,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 3 fgot = 2**32.0 fexp = 1.0 @@ -57,7 +57,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 4 lgot = .TRUE. lexp = .FALSE. @@ -68,7 +68,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 5 lgot = .FALSE. lexp = .FALSE. @@ -79,7 +79,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 6 lgot = .FALSE. lexp = .FALSE. @@ -90,7 +90,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 7 lgot = .FALSE. lexp = .TRUE. @@ -101,7 +101,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 8 fgot = 1234.0 fexp = 1266.0 @@ -114,7 +114,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 9 fgot = 1.0 fexp = 2.0**32 @@ -127,7 +127,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 10 fgot = 32.0 fexp = 32.0 @@ -140,7 +140,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 11 fgot = 2.0**16 fexp = 2.0**16 @@ -153,7 +153,7 @@ program main end do !$acc end parallel loop - if (fgot /= fexp) call abort + if (fgot /= fexp) STOP 12 lgot = .TRUE. lexp = .FALSE. @@ -164,7 +164,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 13 lgot = .FALSE. lexp = .FALSE. @@ -175,7 +175,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 14 lgot = .FALSE. lexp = .FALSE. @@ -186,7 +186,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 15 lgot = .FALSE. lexp = .TRUE. @@ -197,7 +197,7 @@ program main !$acc end atomic !$acc end parallel - if (lgot .neqv. lexp) call abort + if (lgot .neqv. lexp) STOP 16 igot = 1 iexp = N @@ -210,7 +210,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 17 igot = N iexp = 1 @@ -223,7 +223,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 18 igot = -1 iexp = 0 @@ -237,7 +237,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 19 igot = 0 iexp = -1 @@ -251,7 +251,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 20 igot = -1 iexp = 0 @@ -265,7 +265,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 21 igot = 1 iexp = N @@ -278,7 +278,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 22 igot = N iexp = 1 @@ -291,7 +291,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 23 igot = -1 iexp = 0 @@ -305,7 +305,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 24 igot = 0 iexp = -1 @@ -319,7 +319,7 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 25 igot = -1 iexp = 0 @@ -333,6 +333,6 @@ program main end do !$acc end parallel loop - if (igot /= iexp) call abort + if (igot /= iexp) STOP 26 end program diff --git a/libgomp/testsuite/libgomp.oacc-fortran/clauses-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/clauses-1.f90 index e6ab78d..1d05e4a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/clauses-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/clauses-1.f90 @@ -25,11 +25,11 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 3.0) call abort + if (b(i) .ne. 3.0) STOP 1 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 2 + if (acc_is_present (b) .eqv. .TRUE.) STOP 3 a(:) = 5.0 b(:) = 1.0 @@ -41,11 +41,11 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 5.0) call abort + if (b(i) .ne. 5.0) STOP 4 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 5 + if (acc_is_present (b) .eqv. .TRUE.) STOP 6 a(:) = 6.0 b(:) = 0.0 @@ -61,13 +61,13 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 6.0) call abort + if (b(i) .ne. 6.0) STOP 7 end do call acc_copyout (a, sizeof (a)) - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 8 + if (acc_is_present (b) .eqv. .TRUE.) STOP 9 a(:) = 6.0 b(:) = 0.0 @@ -79,11 +79,11 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 6.0) call abort + if (b(i) .ne. 6.0) STOP 10 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 11 + if (acc_is_present (b) .eqv. .TRUE.) STOP 12 a(:) = 5.0 b(:) = 2.0 @@ -97,14 +97,14 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 2.0) call abort + if (a(i) .ne. 5.0) STOP 13 + if (b(i) .ne. 2.0) STOP 14 end do call acc_copyout (b, sizeof (b)) - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 15 + if (acc_is_present (b) .eqv. .TRUE.) STOP 16 a(:) = 3.0; b(:) = 4.0; @@ -117,12 +117,12 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 4.0) call abort - if (b(i) .ne. 6.0) call abort + if (a(i) .ne. 4.0) STOP 17 + if (b(i) .ne. 6.0) STOP 18 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 19 + if (acc_is_present (b) .eqv. .TRUE.) STOP 20 a(:) = 4.0 b(:) = 7.0 @@ -135,12 +135,12 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 9.0) call abort + if (a(i) .ne. 5.0) STOP 21 + if (b(i) .ne. 9.0) STOP 22 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 23 + if (acc_is_present (b) .eqv. .TRUE.) STOP 24 a(:) = 3.0 b(:) = 7.0 @@ -156,15 +156,15 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 7.0) call abort + if (a(i) .ne. 3.0) STOP 25 + if (b(i) .ne. 7.0) STOP 26 end do call acc_copyout (a, sizeof (a)) call acc_copyout (b, sizeof (b)) - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 27 + if (acc_is_present (b) .eqv. .TRUE.) STOP 28 a(:) = 3.0 b(:) = 7.0 @@ -177,13 +177,13 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 29 + if (b(i) .ne. 3.0) STOP 30 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort - if (acc_is_present (c) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 31 + if (acc_is_present (b) .eqv. .TRUE.) STOP 32 + if (acc_is_present (c) .eqv. .TRUE.) STOP 33 a(:) = 4.0 b(:) = 8.0 @@ -196,13 +196,13 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 4.0) call abort - if (b(i) .ne. 4.0) call abort + if (a(i) .ne. 4.0) STOP 34 + if (b(i) .ne. 4.0) STOP 35 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort - if (acc_is_present (c) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 36 + if (acc_is_present (b) .eqv. .TRUE.) STOP 37 + if (acc_is_present (c) .eqv. .TRUE.) STOP 38 a(:) = 4.0 @@ -222,13 +222,13 @@ program main call acc_copyout (c, sizeof (c)) do i = 1, N - if (a(i) .ne. 4.0) call abort - if (b(i) .ne. 4.0) call abort + if (a(i) .ne. 4.0) STOP 39 + if (b(i) .ne. 4.0) STOP 40 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort - if (acc_is_present (c) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 41 + if (acc_is_present (b) .eqv. .TRUE.) STOP 42 + if (acc_is_present (c) .eqv. .TRUE.) STOP 43 a(:) = 6.0 b(:) = 0.0 @@ -244,13 +244,13 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 6.0) call abort + if (b(i) .ne. 6.0) STOP 44 end do call acc_copyout (a, sizeof (a)) - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 45 + if (acc_is_present (b) .eqv. .TRUE.) STOP 46 a(:) = 6.0 b(:) = 0.0 @@ -262,11 +262,11 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 6.0) call abort + if (b(i) .ne. 6.0) STOP 47 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 48 + if (acc_is_present (b) .eqv. .TRUE.) STOP 49 a(:) = 5.0 b(:) = 7.0 @@ -279,12 +279,12 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 5.0) call abort + if (a(i) .ne. 5.0) STOP 50 + if (b(i) .ne. 5.0) STOP 51 end do - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort - if (acc_is_present (c) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 52 + if (acc_is_present (b) .eqv. .TRUE.) STOP 53 + if (acc_is_present (c) .eqv. .TRUE.) STOP 54 end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/collapse-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-1.f90 index 4c07bc2..918c5d0 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-1.f90 @@ -23,5 +23,5 @@ program collapse1 end do end do !$acc end parallel - if (l) call abort + if (l) STOP 1 end program collapse1 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 index ca3b638..4f45537 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 @@ -21,5 +21,5 @@ firstdo: do i = 1, 3 end do end do firstdo !$acc end parallel - if (l) call abort + if (l) STOP 1 end program collapse2 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/collapse-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-3.f90 index 50e6100..aa40790 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-3.f90 @@ -12,7 +12,7 @@ dokk: do kk=1,3 enddo dokk 115 continue !$acc end parallel - 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 parallel !$acc loop collapse(3) @@ -24,5 +24,5 @@ doll: do ll=1,3 enddo doll 120 end do dol !$acc end parallel - 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/collapse-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-4.f90 index 41b66db..0cb990b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-4.f90 @@ -29,11 +29,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/collapse-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-5.f90 index 8c20f04..54012c7 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-5.f90 @@ -37,11 +37,11 @@ program collapse5 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 1 do i = v1, v2 do j = v3, v4 do k = v5, v6 - 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/collapse-6.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-6.f90 index 7404b91..f961f7d 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-6.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-6.f90 @@ -39,11 +39,11 @@ program collapse6 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 1 do i = v1, v2, v7 do j = v3, v4, v8 do k = v5, v6, v9 - 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/collapse-7.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-7.f90 index 12efd8c..9c13c79 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-7.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-7.f90 @@ -29,11 +29,11 @@ program collapse7 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 1 do i = 1, 7 do j = -3, 5 do k = 12, 19 - 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/collapse-8.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-8.f90 index 04fbcfe..48d8447 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-8.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-8.f90 @@ -36,11 +36,11 @@ program collapse8 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 1 do i = v1, v2 do j = v3, v4 do k = v5, v6 - 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/combined-directives-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/combined-directives-1.f90 index 94100b2..b980bc9 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/combined-directives-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/combined-directives-1.f90 @@ -19,9 +19,9 @@ program main end do do i = 1, n - if (a(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 - if (b(i) .ne. 2.0) call abort + if (b(i) .ne. 2.0) STOP 2 end do !$acc kernels loop copy (a(1:n)) copy (b(1:n)) @@ -31,9 +31,9 @@ program main end do do i = 1, n - if (a(i) .ne. 6.0) call abort + if (a(i) .ne. 6.0) STOP 3 - if (b(i) .ne. 3.0) call abort + if (b(i) .ne. 3.0) STOP 4 end do end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/combined-reduction.f90 b/libgomp/testsuite/libgomp.oacc-fortran/combined-reduction.f90 index d3a61b5..8c40d22 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/combined-reduction.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/combined-reduction.f90 @@ -15,5 +15,5 @@ program test end do !$acc end parallel loop - if (var .ne. n) call abort + if (var .ne. n) STOP 1 end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90 index 5e94e2d..f4e9053 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/data-1.f90 @@ -21,8 +21,8 @@ program test !$acc exit data copyout (a(1:N), b(1:N)) do i = 1, n - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 + if (b(i) .ne. 3.0) STOP 2 end do a(:) = 5.0 @@ -39,7 +39,7 @@ program test !$acc exit data copyout (a(1:N), b(1:N)) do i = 1, n - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 5.0) call abort + if (a(i) .ne. 5.0) STOP 3 + if (b(i) .ne. 5.0) STOP 4 end do end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90 index 8736c2a..22525b8 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/data-2.f90 @@ -24,8 +24,8 @@ program test do i = 1, n do j = 1, n - if (a(j,i) .ne. 3.0) call abort - if (b(j,i) .ne. 3.0) call abort + if (a(j,i) .ne. 3.0) STOP 1 + if (b(j,i) .ne. 3.0) STOP 2 end do end do end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-3.f90 index 9868cb0..19eb4bd 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/data-3.f90 @@ -27,8 +27,8 @@ program asyncwait !$acc exit data copyout (a(1:N)) copyout (b(1:N)) do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 + if (b(i) .ne. 3.0) STOP 2 end do a(:) = 2.0 @@ -46,8 +46,8 @@ program asyncwait !$acc exit data copyout (a(1:N)) copyout (b(1:N)) do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 2.0) call abort + if (a(i) .ne. 2.0) STOP 3 + if (b(i) .ne. 2.0) STOP 4 end do a(:) = 3.0 @@ -79,10 +79,10 @@ program asyncwait !$acc exit data copyout (a(1:N)) copyout (b(1:N)) copyout (c(1:N)) copyout (d(1:N)) do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 9.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort + if (a(i) .ne. 3.0) STOP 5 + if (b(i) .ne. 9.0) STOP 6 + if (c(i) .ne. 4.0) STOP 7 + if (d(i) .ne. 1.0) STOP 8 end do a(:) = 2.0 @@ -122,10 +122,10 @@ program asyncwait !$acc exit data delete (N) do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 4.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort - if (e(i) .ne. 11.0) call abort + if (a(i) .ne. 2.0) STOP 9 + if (b(i) .ne. 4.0) STOP 10 + if (c(i) .ne. 4.0) STOP 11 + if (d(i) .ne. 1.0) STOP 12 + if (e(i) .ne. 11.0) STOP 13 end do end program asyncwait diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-4-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-4-2.f90 index df4aca0..6c6a24e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-4-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/data-4-2.f90 @@ -31,8 +31,8 @@ program asyncwait !$acc wait do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 + if (b(i) .ne. 3.0) STOP 2 end do a(:) = 2.0 @@ -51,8 +51,8 @@ program asyncwait !$acc wait (1) do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 2.0) call abort + if (a(i) .ne. 2.0) STOP 3 + if (b(i) .ne. 2.0) STOP 4 end do a(:) = 3.0 @@ -86,10 +86,10 @@ program asyncwait !$acc wait (1) do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 9.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort + if (a(i) .ne. 3.0) STOP 5 + if (b(i) .ne. 9.0) STOP 6 + if (c(i) .ne. 4.0) STOP 7 + if (d(i) .ne. 1.0) STOP 8 end do a(:) = 2.0 @@ -130,10 +130,10 @@ program asyncwait !$acc exit data delete (N, a(1:N), b(1:N), c(1:N), d(1:N), e(1:N)) do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 4.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort - if (e(i) .ne. 11.0) call abort + if (a(i) .ne. 2.0) STOP 9 + if (b(i) .ne. 4.0) STOP 10 + if (c(i) .ne. 4.0) STOP 11 + if (d(i) .ne. 1.0) STOP 12 + if (e(i) .ne. 11.0) STOP 13 end do end program asyncwait diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/data-4.f90 index f6886b0..a444395 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/data-4.f90 @@ -28,8 +28,8 @@ program asyncwait !$acc wait do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 + if (b(i) .ne. 3.0) STOP 2 end do a(:) = 2.0 @@ -48,8 +48,8 @@ program asyncwait !$acc wait (1) do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 2.0) call abort + if (a(i) .ne. 2.0) STOP 3 + if (b(i) .ne. 2.0) STOP 4 end do a(:) = 3.0 @@ -83,10 +83,10 @@ program asyncwait !$acc wait (1) do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 9.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort + if (a(i) .ne. 3.0) STOP 5 + if (b(i) .ne. 9.0) STOP 6 + if (c(i) .ne. 4.0) STOP 7 + if (d(i) .ne. 1.0) STOP 8 end do a(:) = 2.0 @@ -127,10 +127,10 @@ program asyncwait !$acc exit data delete (N, a(1:N), b(1:N), c(1:N), d(1:N), e(1:N)) do i = 1, N - if (a(i) .ne. 2.0) call abort - if (b(i) .ne. 4.0) call abort - if (c(i) .ne. 4.0) call abort - if (d(i) .ne. 1.0) call abort - if (e(i) .ne. 11.0) call abort + if (a(i) .ne. 2.0) STOP 9 + if (b(i) .ne. 4.0) STOP 10 + if (c(i) .ne. 4.0) STOP 11 + if (d(i) .ne. 1.0) STOP 12 + if (e(i) .ne. 11.0) STOP 13 end do end program asyncwait diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 index b502df4..084f336 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 @@ -128,7 +128,7 @@ subroutine test (a, e) integer, parameter :: N = 8 integer :: a(N) - if (acc_is_present (a) .neqv. e) call abort + if (acc_is_present (a) .neqv. e) STOP 1 end subroutine @@ -159,7 +159,7 @@ subroutine subr0 (a, b, c, d) call test (c, .false.) do i = 1, N - if (c(i) .ne. 8) call abort + if (c(i) .ne. 8) STOP 2 end do call subr3 (a, c) @@ -169,8 +169,8 @@ subroutine subr0 (a, b, c, d) call test (c, .false.) do i = 1, N - if (a(i) .ne. 2) call abort - if (c(i) .ne. 8) call abort + if (a(i) .ne. 2) STOP 3 + if (c(i) .ne. 8) STOP 4 end do call subr4 (a, b) @@ -180,7 +180,7 @@ subroutine subr0 (a, b, c, d) call test (c, .false.) do i = 1, N - if (b(i) .ne. 8) call abort + if (b(i) .ne. 8) STOP 5 end do call subr5 (a, b, c, d) @@ -191,8 +191,8 @@ subroutine subr0 (a, b, c, d) call test (d, .false.) do i = 1, N - if (c(i) .ne. 8) call abort - if (d(i) .ne. 13) call abort + if (c(i) .ne. 8) STOP 6 + if (d(i) .ne. 13) STOP 7 end do end subroutine @@ -213,7 +213,7 @@ program main c(:) = 4 d(:) = 5 - if (acc_is_present (z) .neqv. .true.) call abort + if (acc_is_present (z) .neqv. .true.) STOP 8 call subr0 (a, b, c, d) @@ -223,10 +223,10 @@ program main call test (d, .false.) do i = 1, N - if (a(i) .ne. 8) call abort - if (b(i) .ne. 8) call abort - if (c(i) .ne. 8) call abort - if (d(i) .ne. 13) call abort + if (a(i) .ne. 8) STOP 9 + if (b(i) .ne. 8) STOP 10 + if (c(i) .ne. 8) STOP 11 + if (d(i) .ne. 13) STOP 12 end do end program diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 index 0e759dd..de9c52e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 @@ -11,6 +11,6 @@ program test use openacc implicit none - if (acc_is_present (a) .neqv. .true.) call abort + if (acc_is_present (a) .neqv. .true.) STOP 1 end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 index 16164cd..e1cb943 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 @@ -16,8 +16,8 @@ program test real c !$acc declare link (c) - if (acc_is_present (b) .neqv. .false.) call abort - if (acc_is_present (c) .neqv. .false.) call abort + if (acc_is_present (b) .neqv. .false.) STOP 1 + if (acc_is_present (c) .neqv. .false.) STOP 2 a = 0.0 b = 1.0 @@ -27,9 +27,9 @@ program test a = b !$acc end parallel - if (a .ne. 5.0) call abort + if (a .ne. 5.0) STOP 3 - if (acc_is_present (b) .neqv. .false.) call abort + if (acc_is_present (b) .neqv. .false.) STOP 4 a = 0.0 @@ -38,9 +38,9 @@ program test a = b !$acc end parallel - if (a .ne. 4.0) call abort + if (a .ne. 4.0) STOP 5 - if (acc_is_present (b) .neqv. .false.) call abort + if (acc_is_present (b) .neqv. .false.) STOP 6 a = 0.0 @@ -49,10 +49,10 @@ program test a = b !$acc end parallel - if (a .ne. 4.0) call abort - if (b .ne. 4.0) call abort + if (a .ne. 4.0) STOP 7 + if (b .ne. 4.0) STOP 8 - if (acc_is_present (b) .neqv. .false.) call abort + if (acc_is_present (b) .neqv. .false.) STOP 9 a = 0.0 @@ -62,8 +62,8 @@ program test a = c !$acc end parallel - if (a .ne. 4.0) call abort + if (a .ne. 4.0) STOP 10 - if (acc_is_present (b) .neqv. .false.) call abort + if (acc_is_present (b) .neqv. .false.) STOP 11 end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 index 6c4e7c5..7cdd883 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 @@ -12,7 +12,7 @@ program test implicit none real a - if (acc_is_present (b) .neqv. .true.) call abort + if (acc_is_present (b) .neqv. .true.) STOP 1 a = 2.0 @@ -22,8 +22,8 @@ program test a = a + b !$acc end parallel - if (acc_is_present (b) .neqv. .true.) call abort + if (acc_is_present (b) .neqv. .true.) STOP 2 - if (a .ne. 3.0) call abort + if (a .ne. 3.0) STOP 3 end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 index 4f5c8f0..3ab9114 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 @@ -12,7 +12,7 @@ program test implicit none real a - if (acc_is_present (b) .neqv. .true.) call abort + if (acc_is_present (b) .neqv. .true.) STOP 1 a = 2.0 @@ -22,8 +22,8 @@ program test a = a + b !$acc end parallel - if (acc_is_present (b) .neqv. .true.) call abort + if (acc_is_present (b) .neqv. .true.) STOP 2 - if (a .ne. 3.0) call abort + if (a .ne. 3.0) STOP 3 end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/default-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/default-1.f90 index d8ceb60..6177de2 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/default-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/default-1.f90 @@ -15,7 +15,7 @@ program main a = a + b !$acc end parallel - if (a .ne. 3.0) call abort + if (a .ne. 3.0) STOP 1 !$acc kernels copy (a) create (b) default (none) b = a @@ -23,7 +23,7 @@ program main a = a + b !$acc end kernels - if (a .ne. 4.0) call abort + if (a .ne. 4.0) STOP 2 !$acc parallel default (none) copy (a) create (b) b = a @@ -31,7 +31,7 @@ program main a = a + b !$acc end parallel - if (a .ne. 5.0) call abort + if (a .ne. 5.0) STOP 3 !$acc parallel default (none) copy (a) c = a @@ -39,7 +39,7 @@ program main a = a + c !$acc end parallel - if (a .ne. 6.0) call abort + if (a .ne. 6.0) STOP 4 !$acc data copy (a) !$acc parallel default (none) @@ -49,7 +49,7 @@ program main !$acc end parallel !$acc end data - if (a .ne. 7.0) call abort + if (a .ne. 7.0) STOP 5 ! The default (present) clause doesn't affect scalar variables; these will ! still get an implicit copy clause added. @@ -59,6 +59,6 @@ program main a = a + c !$acc end kernels - if (a .ne. 8.0) call abort + if (a .ne. 8.0) STOP 6 end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 index 3866096..054d5dd 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 @@ -23,7 +23,7 @@ program firstprivate !$acc end parallel do i = 1, n - if (b(i) .ne. i + a) call abort () + if (b(i) .ne. i + a) STOP 1 end do !$acc data copy (a) @@ -37,6 +37,6 @@ program firstprivate !$acc end parallel !$acc end data - if (c .ne. 10) call abort () - if (d .ne. 5) call abort () + if (c .ne. 10) STOP 2 + if (d .ne. 5) STOP 3 end program firstprivate diff --git a/libgomp/testsuite/libgomp.oacc-fortran/gang-static-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/gang-static-1.f90 index 7d56060..848d8e9 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/gang-static-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/gang-static-1.f90 @@ -74,6 +74,6 @@ subroutine test (a, b, sarg, n) integer i do i = 1, n - if (a(i) .ne. b(i) + sarg) call abort () + if (a(i) .ne. b(i) + sarg) STOP 1 end do end subroutine test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/host_data-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/host_data-1.f90 index 69a491d..45d3ee8 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/host_data-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/host_data-1.f90 @@ -19,11 +19,11 @@ program test ! Test how the pointers compare inside a host_data construct #if ACC_MEM_SHARED - if (.not. associated(ip, iph)) call abort - if (.not. associated(parr, parrh)) call abort + if (.not. associated(ip, iph)) STOP 1 + if (.not. associated(parr, parrh)) STOP 2 #else - if (associated(ip, iph)) call abort - if (associated(parr, parrh)) call abort + if (associated(ip, iph)) STOP 3 + if (associated(parr, parrh)) STOP 4 #endif !$acc end host_data diff --git a/libgomp/testsuite/libgomp.oacc-fortran/if-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/if-1.f90 index 44055e1..f3bf1ee 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/if-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/if-1.f90 @@ -36,7 +36,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 1 end do a(:) = 16.0 @@ -52,7 +52,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 17.0) call abort + if (b(i) .ne. 17.0) STOP 2 end do a(:) = 8.0 @@ -74,7 +74,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 3 end do a(:) = 22.0 @@ -90,7 +90,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 23.0) call abort + if (b(i) .ne. 23.0) STOP 4 end do a(:) = 16.0 @@ -112,7 +112,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 5 end do a(:) = 76.0 @@ -128,7 +128,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 77.0) call abort + if (b(i) .ne. 77.0) STOP 6 end do a(:) = 22.0 @@ -152,7 +152,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 7 end do a(:) = 18.0 @@ -170,7 +170,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 19.0) call abort + if (b(i) .ne. 19.0) STOP 8 end do a(:) = 49.0 @@ -194,7 +194,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 9 end do a(:) = 38.0 @@ -212,7 +212,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 39.0) call abort + if (b(i) .ne. 39.0) STOP 10 end do a(:) = 91.0 @@ -228,7 +228,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 92.0) call abort + if (b(i) .ne. 92.0) STOP 11 end do a(:) = 43.0 @@ -250,7 +250,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 12 end do a(:) = 87.0 @@ -266,7 +266,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. 88.0) call abort + if (b(i) .ne. 88.0) STOP 13 end do a(:) = 3.0 @@ -290,8 +290,8 @@ program main !$acc update host (a(1:N), b(1:N)) if (1 == 1) do i = 1, N - if (a(i) .ne. exp) call abort - if (b(i) .ne. exp2) call abort + if (a(i) .ne. exp) STOP 14 + if (b(i) .ne. exp2) STOP 15 end do a(:) = 6.0 @@ -305,8 +305,8 @@ program main !$acc update host (a(1:N), b(1:N)) if (1 == 1) do i = 1, N - if (a(i) .ne. exp) call abort - if (b(i) .ne. exp2) call abort + if (a(i) .ne. exp) STOP 16 + if (b(i) .ne. exp2) STOP 17 end do a(:) = 26.0 @@ -320,8 +320,8 @@ program main !$acc update host (a(1:N), b(1:N)) if (0 == 1) do i = 1, N - if (a(i) .ne. 0.0) call abort - if (b(i) .ne. 0.0) call abort + if (a(i) .ne. 0.0) STOP 18 + if (b(i) .ne. 0.0) STOP 19 end do #if !ACC_MEM_SHARED @@ -342,7 +342,7 @@ program main !$acc end data do i = 1, N - if (b(i) .ne. 4.0) call abort + if (b(i) .ne. 4.0) STOP 20 end do a(:) = 8.0 @@ -351,8 +351,8 @@ program main !$acc data copyin (a(1:N)) copyout (b(1:N)) if (0 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 21 + if (acc_is_present (b) .eqv. .TRUE.) STOP 22 #endif !$acc end data @@ -363,12 +363,12 @@ program main !$acc data copyin (a(1:N)) if (1 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (a) .eqv. .FALSE.) call abort + if (acc_is_present (a) .eqv. .FALSE.) STOP 23 #endif !$acc data copyout (b(1:N)) if (0 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 24 #endif !$acc data copyout (b(1:N)) if (1 == 1) @@ -381,19 +381,19 @@ program main !$acc end data #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 25 #endif !$acc end data !$acc end data do i = 1, N - if (b(1) .ne. 18.0) call abort + if (b(1) .ne. 18.0) STOP 26 end do !$acc enter data copyin (b(1:N)) if (0 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 27 #endif !$acc exit data delete (b(1:N)) if (0 == 1) @@ -401,19 +401,19 @@ program main !$acc enter data copyin (b(1:N)) if (1 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .FALSE.) call abort + if (acc_is_present (b) .eqv. .FALSE.) STOP 28 #endif !$acc exit data delete (b(1:N)) if (1 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 29 #endif !$acc enter data copyin (b(1:N)) if (zero == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 30 #endif !$acc exit data delete (b(1:N)) if (zero == 1) @@ -421,19 +421,19 @@ program main !$acc enter data copyin (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .FALSE.) call abort + if (acc_is_present (b) .eqv. .FALSE.) STOP 31 #endif !$acc exit data delete (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 32 #endif !$acc enter data copyin (b(1:N)) if (one == 0) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 33 #endif !$acc exit data delete (b(1:N)) if (one == 0) @@ -441,13 +441,13 @@ program main !$acc enter data copyin (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .FALSE.) call abort + if (acc_is_present (b) .eqv. .FALSE.) STOP 34 #endif !$acc exit data delete (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 35 #endif a(:) = 4.0 @@ -469,7 +469,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 36 end do a(:) = 16.0 @@ -485,7 +485,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 17.0) call abort + if (b(i) .ne. 17.0) STOP 37 end do a(:) = 8.0 @@ -507,7 +507,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 38 end do a(:) = 22.0 @@ -523,7 +523,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 23.0) call abort + if (b(i) .ne. 23.0) STOP 39 end do a(:) = 16.0 @@ -545,7 +545,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 40 end do a(:) = 76.0 @@ -561,7 +561,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 77.0) call abort + if (b(i) .ne. 77.0) STOP 41 end do a(:) = 22.0 @@ -585,7 +585,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 42 end do a(:) = 18.0 @@ -603,7 +603,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 19.0) call abort + if (b(i) .ne. 19.0) STOP 43 end do a(:) = 49.0 @@ -627,7 +627,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 44 end do a(:) = 38.0 @@ -645,7 +645,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 39.0) call abort + if (b(i) .ne. 39.0) STOP 45 end do a(:) = 91.0 @@ -661,7 +661,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 92.0) call abort + if (b(i) .ne. 92.0) STOP 46 end do a(:) = 43.0 @@ -683,7 +683,7 @@ program main #endif do i = 1, N - if (b(i) .ne. exp) call abort + if (b(i) .ne. exp) STOP 47 end do a(:) = 87.0 @@ -699,7 +699,7 @@ program main !$acc end kernels do i = 1, N - if (b(i) .ne. 88.0) call abort + if (b(i) .ne. 88.0) STOP 48 end do a(:) = 3.0 @@ -723,8 +723,8 @@ program main !$acc update host (a(1:N), b(1:N)) if (1 == 1) do i = 1, N - if (a(i) .ne. exp) call abort - if (b(i) .ne. exp2) call abort + if (a(i) .ne. exp) STOP 49 + if (b(i) .ne. exp2) STOP 50 end do a(:) = 6.0 @@ -738,8 +738,8 @@ program main !$acc update host (a(1:N), b(1:N)) if (1 == 1) do i = 1, N - if (a(i) .ne. exp) call abort - if (b(i) .ne. exp2) call abort + if (a(i) .ne. exp) STOP 51 + if (b(i) .ne. exp2) STOP 52 end do a(:) = 26.0 @@ -753,8 +753,8 @@ program main !$acc update host (a(1:N), b(1:N)) if (0 == 1) do i = 1, N - if (a(i) .ne. 0.0) call abort - if (b(i) .ne. 0.0) call abort + if (a(i) .ne. 0.0) STOP 53 + if (b(i) .ne. 0.0) STOP 54 end do #if !ACC_MEM_SHARED @@ -775,7 +775,7 @@ program main !$acc end data do i = 1, N - if (b(i) .ne. 4.0) call abort + if (b(i) .ne. 4.0) STOP 55 end do a(:) = 8.0 @@ -784,8 +784,8 @@ program main !$acc data copyin (a(1:N)) copyout (b(1:N)) if (0 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (a) .eqv. .TRUE.) call abort - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (a) .eqv. .TRUE.) STOP 56 + if (acc_is_present (b) .eqv. .TRUE.) STOP 57 #endif !$acc end data @@ -796,12 +796,12 @@ program main !$acc data copyin (a(1:N)) if (1 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (a) .eqv. .FALSE.) call abort + if (acc_is_present (a) .eqv. .FALSE.) STOP 58 #endif !$acc data copyout (b(1:N)) if (0 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 59 #endif !$acc data copyout (b(1:N)) if (1 == 1) @@ -814,19 +814,19 @@ program main !$acc end data #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 60 #endif !$acc end data !$acc end data do i = 1, N - if (b(1) .ne. 18.0) call abort + if (b(1) .ne. 18.0) STOP 61 end do !$acc enter data copyin (b(1:N)) if (0 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 62 #endif !$acc exit data delete (b(1:N)) if (0 == 1) @@ -834,19 +834,19 @@ program main !$acc enter data copyin (b(1:N)) if (1 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .FALSE.) call abort + if (acc_is_present (b) .eqv. .FALSE.) STOP 63 #endif !$acc exit data delete (b(1:N)) if (1 == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 64 #endif !$acc enter data copyin (b(1:N)) if (zero == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 65 #endif !$acc exit data delete (b(1:N)) if (zero == 1) @@ -854,19 +854,19 @@ program main !$acc enter data copyin (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .FALSE.) call abort + if (acc_is_present (b) .eqv. .FALSE.) STOP 66 #endif !$acc exit data delete (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 67 #endif !$acc enter data copyin (b(1:N)) if (one == 0) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 68 #endif !$acc exit data delete (b(1:N)) if (one == 0) @@ -874,13 +874,13 @@ program main !$acc enter data copyin (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .FALSE.) call abort + if (acc_is_present (b) .eqv. .FALSE.) STOP 69 #endif !$acc exit data delete (b(1:N)) if (one == 1) #if !ACC_MEM_SHARED - if (acc_is_present (b) .eqv. .TRUE.) call abort + if (acc_is_present (b) .eqv. .TRUE.) STOP 70 #endif end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/implicit-firstprivate-ref.f90 b/libgomp/testsuite/libgomp.oacc-fortran/implicit-firstprivate-ref.f90 index a5f3840..d00ad27 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/implicit-firstprivate-ref.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/implicit-firstprivate-ref.f90 @@ -38,5 +38,5 @@ program t CALL test(x_min) - if (x_min .ne. -1) call abort + if (x_min .ne. -1) STOP 1 end program t diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 index b88ca67..4b69e81 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 @@ -32,9 +32,9 @@ program main !$acc end kernels do i = 0, n - 1 - if (a(i) .ne. i * 2) call abort - if (b(i) .ne. i * 4) call abort - if (c(i) .ne. a(i) + b(i)) call abort + if (a(i) .ne. i * 2) STOP 1 + if (b(i) .ne. i * 4) STOP 2 + if (c(i) .ne. a(i) + b(i)) STOP 3 end do end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95 index 4c73606..4008743 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95 @@ -31,7 +31,7 @@ program main !$acc end data 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-loop-data-enter-exit-2.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95 index da11aafa..11ae17c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95 @@ -31,7 +31,7 @@ program main !$acc exit data copyout (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-loop-data-enter-exit.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95 index f4b4eb3..4fdb862 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95 @@ -29,7 +29,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-loop-data-update.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95 index d2083e2..4bee0e1 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95 @@ -29,7 +29,7 @@ program main !$acc exit data copyout (a(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-loop-data.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95 index a908f54..307e433 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95 @@ -29,7 +29,7 @@ program main !$acc end data 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-loop.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95 index 6fb5ba3..0090f43 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95 +++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95 @@ -21,7 +21,7 @@ program main !$acc end kernels 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/lib-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90 index 51dc452..901169a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-1.f90 @@ -1,10 +1,10 @@ use openacc -if (acc_get_num_devices (acc_device_host) .ne. 1) call abort +if (acc_get_num_devices (acc_device_host) .ne. 1) STOP 1 call acc_set_device_type (acc_device_host) -if (acc_get_device_type () .ne. acc_device_host) call abort +if (acc_get_device_type () .ne. acc_device_host) STOP 2 call acc_set_device_num (0, acc_device_host) -if (acc_get_device_num (acc_device_host) .ne. 0) call abort +if (acc_get_device_num (acc_device_host) .ne. 0) STOP 3 call acc_shutdown (acc_device_host) call acc_init (acc_device_host) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-10.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-10.f90 index a54d6a7..2875f16 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-10.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-10.f90 @@ -25,16 +25,16 @@ program main call acc_copyin (a_3d_c) call acc_copyin (a_3d_r) - if (acc_is_present (a_3d_i) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_c) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_r) .neqv. .TRUE.) call abort + if (acc_is_present (a_3d_i) .neqv. .TRUE.) STOP 1 + if (acc_is_present (a_3d_c) .neqv. .TRUE.) STOP 2 + if (acc_is_present (a_3d_r) .neqv. .TRUE.) STOP 3 do i = 1, 10 do j = 1, 10 do k = 1, 10 - if (acc_is_present (a_3d_i(i, j, k), i_size) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_c(i, j, k), i_size) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_r(i, j, k), i_size) .neqv. .TRUE.) call abort + if (acc_is_present (a_3d_i(i, j, k), i_size) .neqv. .TRUE.) STOP 4 + if (acc_is_present (a_3d_c(i, j, k), i_size) .neqv. .TRUE.) STOP 5 + if (acc_is_present (a_3d_r(i, j, k), i_size) .neqv. .TRUE.) STOP 6 end do end do end do diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f b/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f index a9d70b2..069e07e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-2.f @@ -1,10 +1,10 @@ USE OPENACC - IF (ACC_GET_NUM_DEVICES (ACC_DEVICE_HOST) .NE. 1) CALL ABORT + IF (ACC_GET_NUM_DEVICES (ACC_DEVICE_HOST) .NE. 1) STOP 1 CALL ACC_SET_DEVICE_TYPE (ACC_DEVICE_HOST) - IF (ACC_GET_DEVICE_TYPE () .NE. ACC_DEVICE_HOST) CALL ABORT + IF (ACC_GET_DEVICE_TYPE () .NE. ACC_DEVICE_HOST) STOP 2 CALL ACC_SET_DEVICE_NUM (0, ACC_DEVICE_HOST) - IF (ACC_GET_DEVICE_NUM (ACC_DEVICE_HOST) .NE. 0) CALL ABORT + IF (ACC_GET_DEVICE_NUM (ACC_DEVICE_HOST) .NE. 0) STOP 3 CALL ACC_SHUTDOWN (ACC_DEVICE_HOST) CALL ACC_INIT (ACC_DEVICE_HOST) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f b/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f index 56d2cd2..47424f1 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-3.f @@ -1,10 +1,10 @@ INCLUDE "openacc_lib.h" - IF (ACC_GET_NUM_DEVICES (ACC_DEVICE_HOST) .NE. 1) CALL ABORT + IF (ACC_GET_NUM_DEVICES (ACC_DEVICE_HOST) .NE. 1) STOP 1 CALL ACC_SET_DEVICE_TYPE (ACC_DEVICE_HOST) - IF (ACC_GET_DEVICE_TYPE () .NE. ACC_DEVICE_HOST) CALL ABORT + IF (ACC_GET_DEVICE_TYPE () .NE. ACC_DEVICE_HOST) STOP 2 CALL ACC_SET_DEVICE_NUM (0, ACC_DEVICE_HOST) - IF (ACC_GET_DEVICE_NUM (ACC_DEVICE_HOST) .NE. 0) CALL ABORT + IF (ACC_GET_DEVICE_NUM (ACC_DEVICE_HOST) .NE. 0) STOP 3 CALL ACC_SHUTDOWN (ACC_DEVICE_HOST) CALL ACC_INIT (ACC_DEVICE_HOST) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f b/libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f index 177e4fb..99e8f35 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f @@ -21,7 +21,7 @@ SHARED_MEM = ACC_IS_PRESENT (H) CALL ACC_PRESENT_OR_CREATE (H, INT (SIZEOF (H), 4)) - IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) CALL ABORT + IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 1 !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N @@ -30,7 +30,7 @@ !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (1, 0, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (1, 0, SHARED_MEM)) STOP 2 H(I) = I + 2 END DO @@ -38,13 +38,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (2, 1, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (2, 1, SHARED_MEM)) STOP 3 H(I) = I + 3 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (3, 2, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (3, 2, SHARED_MEM)) STOP 4 H(I) = I + 4 END DO @@ -52,13 +52,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (4, 3, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (4, 3, SHARED_MEM)) STOP 5 H(I) = I + 5 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (5, 4, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (5, 4, SHARED_MEM)) STOP 6 H(I) = I + 6 END DO @@ -66,13 +66,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (6, 5, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (6, 5, SHARED_MEM)) STOP 7 H(I) = I + 7 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (7, 6, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (7, 6, SHARED_MEM)) STOP 8 H(I) = I + 8 END DO @@ -80,37 +80,37 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (8, 7, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (8, 7, SHARED_MEM)) STOP 9 H(I) = I + 9 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (9, 8, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (9, 8, SHARED_MEM)) STOP 10 H(I) = I + 10 END DO CALL ACC_COPYOUT (H, INT (SIZEOF (H), 4)) IF (.NOT. SHARED_MEM) THEN - IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) CALL ABORT + IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 11 ENDIF DO I = 1, N - IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) STOP 12 END DO CALL ACC_PCOPYIN (H) - IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) CALL ABORT + IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) STOP 13 !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) STOP 14 H(I) = I + 11 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (11, 9, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (11, 9, SHARED_MEM)) STOP 15 H(I) = I + 12 END DO @@ -118,13 +118,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (12, 11, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (12, 11, SHARED_MEM)) STOP 16 H(I) = I + 13 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (13, 12, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (13, 12, SHARED_MEM)) STOP 17 H(I) = I + 14 END DO @@ -132,13 +132,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (14, 13, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (14, 13, SHARED_MEM)) STOP 18 H(I) = I + 15 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (15, 14, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (15, 14, SHARED_MEM)) STOP 19 H(I) = I + 16 END DO @@ -146,26 +146,26 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (16, 15, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (16, 15, SHARED_MEM)) STOP 20 H(I) = I + 17 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (17, 16, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (17, 16, SHARED_MEM)) STOP 21 H(I) = I + 18 END DO CALL ACC_UPDATE_SELF (H, INT (SIZEOF (H), 4)) - IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) CALL ABORT + IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 22 DO I = 1, N - IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) STOP 23 END DO CALL ACC_DELETE (H) IF (.NOT. SHARED_MEM) THEN - IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) CALL ABORT + IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) STOP 24 ENDIF DEALLOCATE (H) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f b/libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f index a08eb84..514c04e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f @@ -21,7 +21,7 @@ SHARED_MEM = ACC_IS_PRESENT (H) CALL ACC_PRESENT_OR_CREATE (H, INT (SIZEOF (H), 4)) - IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) CALL ABORT + IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 1 !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N @@ -30,7 +30,7 @@ !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (1, 0, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (1, 0, SHARED_MEM)) STOP 2 H(I) = I + 2 END DO @@ -38,13 +38,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (2, 1, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (2, 1, SHARED_MEM)) STOP 3 H(I) = I + 3 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (3, 2, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (3, 2, SHARED_MEM)) STOP 4 H(I) = I + 4 END DO @@ -52,13 +52,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (4, 3, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (4, 3, SHARED_MEM)) STOP 5 H(I) = I + 5 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (5, 4, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (5, 4, SHARED_MEM)) STOP 6 H(I) = I + 6 END DO @@ -66,13 +66,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (6, 5, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (6, 5, SHARED_MEM)) STOP 7 H(I) = I + 7 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (7, 6, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (7, 6, SHARED_MEM)) STOP 8 H(I) = I + 8 END DO @@ -80,37 +80,37 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (8, 7, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (8, 7, SHARED_MEM)) STOP 9 H(I) = I + 9 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (9, 8, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (9, 8, SHARED_MEM)) STOP 10 H(I) = I + 10 END DO CALL ACC_COPYOUT (H, INT (SIZEOF (H), 4)) IF (.NOT. SHARED_MEM) THEN - IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) CALL ABORT + IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 11 ENDIF DO I = 1, N - IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) STOP 12 END DO CALL ACC_PCOPYIN (H) - IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) CALL ABORT + IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) STOP 13 !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) STOP 14 H(I) = I + 11 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (11, 9, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (11, 9, SHARED_MEM)) STOP 15 H(I) = I + 12 END DO @@ -118,13 +118,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (12, 11, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (12, 11, SHARED_MEM)) STOP 16 H(I) = I + 13 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (13, 12, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (13, 12, SHARED_MEM)) STOP 17 H(I) = I + 14 END DO @@ -132,13 +132,13 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (14, 13, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (14, 13, SHARED_MEM)) STOP 18 H(I) = I + 15 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (15, 14, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (15, 14, SHARED_MEM)) STOP 19 H(I) = I + 16 END DO @@ -146,26 +146,26 @@ !$ACC PARALLEL LOOP DEFAULT (PRESENT) DO I = 1, N - IF (H(I) .NE. I + MERGE (16, 15, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (16, 15, SHARED_MEM)) STOP 20 H(I) = I + 17 END DO !$ACC END PARALLEL LOOP DO I = 1, N - IF (H(I) .NE. I + MERGE (17, 16, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (17, 16, SHARED_MEM)) STOP 21 H(I) = I + 18 END DO CALL ACC_UPDATE_SELF (H, INT (SIZEOF (H), 4)) - IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) CALL ABORT + IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 22 DO I = 1, N - IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) CALL ABORT + IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) STOP 23 END DO CALL ACC_DELETE (H) IF (.NOT. SHARED_MEM) THEN - IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) CALL ABORT + IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) STOP 24 ENDIF DEALLOCATE (H) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-4.f90 index 3a2b661..d03f4ac 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-4.f90 @@ -6,25 +6,25 @@ program main integer n - if (acc_get_num_devices (acc_device_host) .ne. 1) call abort + if (acc_get_num_devices (acc_device_host) .ne. 1) STOP 1 - if (acc_get_num_devices (acc_device_none) .ne. 0) call abort + if (acc_get_num_devices (acc_device_none) .ne. 0) STOP 2 call acc_init (acc_device_host) - if (acc_get_device_type () .ne. acc_device_host) call abort + if (acc_get_device_type () .ne. acc_device_host) STOP 3 call acc_set_device_type (acc_device_host) - if (acc_get_device_type () .ne. acc_device_host) call abort + if (acc_get_device_type () .ne. acc_device_host) STOP 4 n = 0 call acc_set_device_num (n, acc_device_host) - if (acc_get_device_num (acc_device_host) .ne. 0) call abort + if (acc_get_device_num (acc_device_host) .ne. 0) STOP 5 - if (.NOT. acc_async_test (n) ) call abort + if (.NOT. acc_async_test (n) ) STOP 6 call acc_wait (n) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-5.f90 index e68eb89..505b2c6 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-5.f90 @@ -14,7 +14,7 @@ program main call acc_set_device_num (n, acc_device_nvidia) - if (acc_get_device_num (acc_device_nvidia) .ne. 0) call abort + if (acc_get_device_num (acc_device_nvidia) .ne. 0) STOP 1 if (acc_get_num_devices (acc_device_nvidia) .gt. 1) then @@ -22,7 +22,7 @@ program main call acc_set_device_num (n, acc_device_nvidia) - if (acc_get_device_num (acc_device_nvidia) .ne. 1) call abort + if (acc_get_device_num (acc_device_nvidia) .ne. 1) STOP 2 end if diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-6.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-6.f90 index 401ad66..0364a7b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-6.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-6.f90 @@ -6,25 +6,25 @@ program main integer n - if (acc_get_num_devices (acc_device_host) .ne. 1) call abort + if (acc_get_num_devices (acc_device_host) .ne. 1) STOP 1 - if (acc_get_num_devices (acc_device_none) .ne. 0) call abort + if (acc_get_num_devices (acc_device_none) .ne. 0) STOP 2 call acc_init (acc_device_host) - if (acc_get_device_type () .ne. acc_device_host) call abort + if (acc_get_device_type () .ne. acc_device_host) STOP 3 call acc_set_device_type (acc_device_host) - if (acc_get_device_type () .ne. acc_device_host) call abort + if (acc_get_device_type () .ne. acc_device_host) STOP 4 n = 0 call acc_set_device_num (n, acc_device_host) - if (acc_get_device_num (acc_device_host) .ne. 0) call abort + if (acc_get_device_num (acc_device_host) .ne. 0) STOP 5 - if (.NOT. acc_async_test (n) ) call abort + if (.NOT. acc_async_test (n) ) STOP 6 call acc_wait (n) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-7.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-7.f90 index 422df53..2ce93c3 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-7.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-7.f90 @@ -14,7 +14,7 @@ program main call acc_set_device_num (n, acc_device_nvidia) - if (acc_get_device_num (acc_device_nvidia) .ne. 0) call abort + if (acc_get_device_num (acc_device_nvidia) .ne. 0) STOP 1 if (acc_get_num_devices (acc_device_nvidia) .gt. 1) then @@ -22,7 +22,7 @@ program main call acc_set_device_num (n, acc_device_nvidia) - if (acc_get_device_num (acc_device_nvidia) .ne. 1) call abort + if (acc_get_device_num (acc_device_nvidia) .ne. 1) STOP 2 end if diff --git a/libgomp/testsuite/libgomp.oacc-fortran/lib-8.f90 b/libgomp/testsuite/libgomp.oacc-fortran/lib-8.f90 index ad758b2..263cedb 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/lib-8.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/lib-8.f90 @@ -26,16 +26,16 @@ program main call acc_copyin (a_3d_c) call acc_copyin (a_3d_r) - if (acc_is_present (a_3d_i) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_c) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_r) .neqv. .TRUE.) call abort + if (acc_is_present (a_3d_i) .neqv. .TRUE.) STOP 1 + if (acc_is_present (a_3d_c) .neqv. .TRUE.) STOP 2 + if (acc_is_present (a_3d_r) .neqv. .TRUE.) STOP 3 do i = 1, 10 do j = 1, 10 do k = 1, 10 - if (acc_is_present (a_3d_i(i, j, k), i_size) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_c(i, j, k), i_size) .neqv. .TRUE.) call abort - if (acc_is_present (a_3d_r(i, j, k), i_size) .neqv. .TRUE.) call abort + if (acc_is_present (a_3d_i(i, j, k), i_size) .neqv. .TRUE.) STOP 4 + if (acc_is_present (a_3d_c(i, j, k), i_size) .neqv. .TRUE.) STOP 5 + if (acc_is_present (a_3d_r(i, j, k), i_size) .neqv. .TRUE.) STOP 6 end do end do end do diff --git a/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90 index 082dd8a..4785950 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/map-1.f90 @@ -32,7 +32,7 @@ program map !$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) @@ -92,6 +92,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/nested-function-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 index c4af199..c95891d 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 @@ -27,7 +27,7 @@ firstdo: do i = 1, 3 end do end do firstdo !$acc end parallel - if (l) call abort + if (l) STOP 1 end subroutine test1 subroutine test2 @@ -47,7 +47,7 @@ firstdo: do i = 1, 3 115 continue !$acc loop gang(static:1) collapse(1) do k=1,3 - if (any(a(k,1:3,1:3).ne.1)) call abort + if (any(a(k,1:3,1:3).ne.1)) STOP 2 enddo ! Use "gang(static:1)" here and below to effectively turn gang-redundant ! execution mode into something like gang-single. @@ -62,7 +62,7 @@ firstdo: do i = 1, 3 120 end do dol !$acc loop gang(static:1) collapse(1) do l=1,3 - if (any(a(l,1:3,1:3).ne.2)) call abort + if (any(a(l,1:3,1:3).ne.2)) STOP 3 enddo !$acc end parallel end subroutine test2 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-2.f90 index 4e28196..4f4148b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-2.f90 @@ -30,7 +30,7 @@ dokk: do kk=1,3 enddo dokk 115 continue !$acc end parallel - 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 parallel !$acc loop collapse(3) dol: do 120 l=1,3 @@ -41,7 +41,7 @@ doll: do ll=1,3 enddo doll 120 end do dol !$acc end parallel - 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 subroutine test1 subroutine test2(v1, v2, v3, v4, v5, v6) @@ -73,11 +73,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 3 do i = v1, v2 do j = v3, v4 do k = v5, v6 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 4 end do end do end do @@ -112,11 +112,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 5 do i = v1, v2, v7 do j = v3, v4, v8 do k = v5, v6, v9 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 6 end do end do end do @@ -160,11 +160,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 7 do i = v1, v2, v7 do j = v3, v4, v8 do k = v5, v6, v9 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 8 end do end do end do diff --git a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-3.f90 index 2f6485e..8a5ca42 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-3.f90 @@ -22,7 +22,7 @@ dokk: do kk=1,3 enddo dokk 115 continue !$acc end parallel - 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 parallel !$acc loop collapse(3) dol: do 120 l=1,3 @@ -33,7 +33,7 @@ doll: do ll=1,3 enddo doll 120 end do dol !$acc end parallel - 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 subroutine test1 subroutine test2(v1, v2, v3, v4, v5, v6) @@ -65,11 +65,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 3 do i = v1, v2 do j = v3, v4 do k = v5, v6 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 4 end do end do end do @@ -104,11 +104,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 5 do i = v1, v2, v7 do j = v3, v4, v8 do k = v5, v6, v9 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 6 end do end do end do @@ -152,11 +152,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 7 do i = v1, v2, v7 do j = v3, v4, v8 do k = v5, v6, v9 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 8 end do end do end do @@ -191,11 +191,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 9 do i = v1, v2 do j = v3, v4 do k = v5, v6 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 10 end do end do end do @@ -231,11 +231,11 @@ doll: do ll=1,3 end do end do end do - if (l .neqv. r) call abort + if (l .neqv. r) STOP 11 do i = v1, v2, v7 do j = v3, v4, v8 do k = v5, v6, v9 - if (a(i, j, k) .ne. b(i, j, k)) call abort + if (a(i, j, k) .ne. b(i, j, k)) STOP 12 end do end do end do diff --git a/libgomp/testsuite/libgomp.oacc-fortran/non-scalar-data.f90 b/libgomp/testsuite/libgomp.oacc-fortran/non-scalar-data.f90 index 53b2cd0..88fe516 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/non-scalar-data.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/non-scalar-data.f90 @@ -19,7 +19,7 @@ program main !$acc update host(array) do i = 1, n - if (array(i) .ne. i) call abort + if (array(i) .ne. i) STOP 1 end do call kernels_default_present(array, n) @@ -27,7 +27,7 @@ program main !$acc update host(array) do i = 1, n - if (array(i) .ne. i+1) call abort + if (array(i) .ne. i+1) STOP 2 end do call parallel(array, n) @@ -35,7 +35,7 @@ program main !$acc update host(array) do i = 1, n - if (array(i) .ne. i+i) call abort + if (array(i) .ne. i+i) STOP 3 end do call parallel_default_present(array, n) @@ -43,7 +43,7 @@ program main !$acc end data do i = 1, n - if (array(i) .ne. i+i+1) call abort + if (array(i) .ne. i+i+1) STOP 4 end do end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f index db3c6b1..537212e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-1.f @@ -4,6 +4,6 @@ implicit none include "openacc_lib.h" - if (openacc_version .ne. 201306) call abort; + if (openacc_version .ne. 201306) STOP 1 end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 index a14ecdd..54f301b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/openacc_version-2.f90 @@ -4,6 +4,6 @@ program main use openacc implicit none - if (openacc_version .ne. 201306) call abort; + if (openacc_version .ne. 201306) STOP 1 end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-1.f b/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-1.f index dcd6592..aa1bb63 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-1.f @@ -29,8 +29,8 @@ CALL ACC_ASYNC_WAIT (1) - IF (RES .NE. RES1) CALL ABORT - IF (RES .NE. RES2) CALL ABORT + IF (RES .NE. RES1) STOP 1 + IF (RES .NE. RES2) STOP 2 RES1 = 1 RES2 = 1 @@ -51,7 +51,7 @@ CALL ACC_ASYNC_WAIT_ALL - IF (RES .NE. RES1) CALL ABORT - IF (RES .NE. RES2) CALL ABORT + IF (RES .NE. RES1) STOP 3 + IF (RES .NE. RES2) STOP 4 END PROGRAM diff --git a/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-2.f b/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-2.f index bf72002..5694de1 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-2.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/par-reduction-2-2.f @@ -29,8 +29,8 @@ CALL ACC_ASYNC_WAIT (1) - IF (RES .NE. RES1) CALL ABORT - IF (RES .NE. RES2) CALL ABORT + IF (RES .NE. RES1) STOP 1 + IF (RES .NE. RES2) STOP 2 RES1 = 1 RES2 = 1 @@ -51,7 +51,7 @@ CALL ACC_ASYNC_WAIT_ALL - IF (RES .NE. RES1) CALL ABORT - IF (RES .NE. RES2) CALL ABORT + IF (RES .NE. RES1) STOP 3 + IF (RES .NE. RES2) STOP 4 END PROGRAM diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 index d0559a2..487cfc4 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 @@ -16,11 +16,11 @@ program reduction !$acc end parallel if (acc_get_device_type () .ne. acc_device_host) then - if (s1 .ne. n) call abort - if (s2 .ne. n) call abort + if (s1 .ne. n) STOP 1 + if (s2 .ne. n) STOP 2 else - if (s1 .ne. 1) call abort - if (s2 .ne. 1) call abort + if (s1 .ne. 1) STOP 3 + if (s2 .ne. 1) STOP 4 end if ! Test reductions inside subroutines @@ -30,9 +30,9 @@ program reduction call redsub (s1, s2, n) if (acc_get_device_type () .ne. acc_device_host) then - if (s1 .ne. n) call abort + if (s1 .ne. n) STOP 5 else - if (s2 .ne. 1) call abort + if (s2 .ne. 1) STOP 6 end if end program reduction diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90 index a5e1fcb..3f4b9fe 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/pointer-align-1.f90 @@ -13,9 +13,9 @@ program test a(4) = 54 !$acc end parallel - if (a(1) .ne. 10) call abort - if (a(2) .ne. 52) call abort - if (a(3) .ne. 53) call abort - if (a(4) .ne. 54) call abort + if (a(1) .ne. 10) STOP 1 + if (a(2) .ne. 52) STOP 2 + if (a(3) .ne. 53) STOP 3 + if (a(4) .ne. 54) STOP 4 end program test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90 index 7c2e5ee..c8a7922 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/pr70643.f90 @@ -47,5 +47,5 @@ program main !$acc end data - if (sum .ne. 4.0) call abort + if (sum .ne. 4.0) STOP 1 end program diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr81352.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr81352.f90 index f6969c8..a7f0252 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/pr81352.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/pr81352.f90 @@ -13,7 +13,7 @@ program foo enddo enddo - if (any(a(1:3,1:3).ne.2)) call abort + if (any(a(1:3,1:3).ne.2)) STOP 1 !$acc end parallel diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr83920.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr83920.f90 index 34ad001..79251d2 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/pr83920.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/pr83920.f90 @@ -24,5 +24,5 @@ program test_foo beta = 0.0 c(:,:) = 1.0 call foo (beta, c) - if (c(1,1) /= 0.0) call abort () + if (c(1,1) /= 0.0) STOP 1 end program test_foo diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr84028.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr84028.f90 index ed6e326..2b36122 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/pr84028.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/pr84028.f90 @@ -7,7 +7,7 @@ program foo !$acc parallel num_gangs(1) num_workers(2) - 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 do ll=1,3 @@ -18,7 +18,7 @@ program foo enddo - if (a(1,1,1).ne.2) call abort + if (a(1,1,1).ne.2) STOP 2 !$acc end parallel diff --git a/libgomp/testsuite/libgomp.oacc-fortran/private-variables.f90 b/libgomp/testsuite/libgomp.oacc-fortran/private-variables.f90 index 3c1940b..472a6a1 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/private-variables.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/private-variables.f90 @@ -21,7 +21,7 @@ subroutine t1() !$acc end parallel do i = 1, 32 - if (arr(i) .ne. i * 3) call abort + if (arr(i) .ne. i * 3) STOP 1 end do end subroutine t1 @@ -49,7 +49,7 @@ subroutine t2() !$acc end parallel 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 2 end do end subroutine t2 @@ -77,7 +77,7 @@ subroutine t3() !$acc end parallel 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 3 end do end subroutine t3 @@ -113,7 +113,7 @@ subroutine t4() !$acc end parallel 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 4 end do end subroutine t4 @@ -151,7 +151,7 @@ subroutine t5() 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 5 end if end do end do @@ -189,7 +189,7 @@ subroutine t6() 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 6 end if end do end do @@ -219,7 +219,7 @@ subroutine t7() !$acc end parallel 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 7 end do end subroutine t7 @@ -253,7 +253,7 @@ subroutine t8() 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 8 end do end do end do @@ -300,7 +300,7 @@ subroutine t9() 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 9 end if end do end do @@ -345,7 +345,7 @@ subroutine t10() 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 10 end if end do end do @@ -393,7 +393,7 @@ subroutine t11() 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 11 end if end do end do @@ -442,7 +442,7 @@ subroutine t12() 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 12 end if end do end do @@ -486,7 +486,7 @@ subroutine t13() 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 13 end if end do end do @@ -520,7 +520,7 @@ subroutine t14() !$acc end parallel do i = 1, n - if (arr(i) .ne. (3 + i * 2)) call abort + if (arr(i) .ne. (3 + i * 2)) STOP 14 end do end subroutine t14 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pset-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pset-1.f90 index 1a1d4c7..c3a8a9c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/pset-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/pset-1.f90 @@ -9,7 +9,7 @@ program test integer, allocatable :: c3(:,:,:) allocate (a1(5)) - if (.not.allocated (a1)) call abort() + if (.not.allocated (a1)) STOP 1 a1 = 10 @@ -21,16 +21,16 @@ program test a1(5) = 5 !$acc end parallel - if (a1(1) .ne. 1) call abort - if (a1(2) .ne. 2) call abort - if (a1(3) .ne. 3) call abort - if (a1(4) .ne. 4) call abort - if (a1(5) .ne. 5) call abort + if (a1(1) .ne. 1) STOP 1 + if (a1(2) .ne. 2) STOP 2 + if (a1(3) .ne. 3) STOP 3 + if (a1(4) .ne. 4) STOP 4 + if (a1(5) .ne. 5) STOP 5 deallocate(a1) allocate (a1(0:4)) - if (.not.allocated (a1)) call abort() + if (.not.allocated (a1)) STOP 2 a1 = 10 @@ -42,16 +42,16 @@ program test a1(4) = 5 !$acc end parallel - if (a1(0) .ne. 1) call abort - if (a1(1) .ne. 2) call abort - if (a1(2) .ne. 3) call abort - if (a1(3) .ne. 4) call abort - if (a1(4) .ne. 5) call abort + if (a1(0) .ne. 1) STOP 6 + if (a1(1) .ne. 2) STOP 7 + if (a1(2) .ne. 3) STOP 8 + if (a1(3) .ne. 4) STOP 9 + if (a1(4) .ne. 5) STOP 10 deallocate(a1) allocate (b2(5,5)) - if (.not.allocated (b2)) call abort() + if (.not.allocated (b2)) STOP 3 b2 = 11 @@ -63,16 +63,16 @@ program test b2(5,5) = 5 !$acc end parallel - if (b2(1,1) .ne. 1) call abort - if (b2(2,2) .ne. 2) call abort - if (b2(3,3) .ne. 3) call abort - if (b2(4,4) .ne. 4) call abort - if (b2(5,5) .ne. 5) call abort + if (b2(1,1) .ne. 1) STOP 11 + if (b2(2,2) .ne. 2) STOP 12 + if (b2(3,3) .ne. 3) STOP 13 + if (b2(4,4) .ne. 4) STOP 14 + if (b2(5,5) .ne. 5) STOP 15 deallocate(b2) allocate (b2(0:4,0:4)) - if (.not.allocated (b2)) call abort() + if (.not.allocated (b2)) STOP 4 b2 = 11 @@ -84,16 +84,16 @@ program test b2(4,4) = 5 !$acc end parallel - if (b2(0,0) .ne. 1) call abort - if (b2(1,1) .ne. 2) call abort - if (b2(2,2) .ne. 3) call abort - if (b2(3,3) .ne. 4) call abort - if (b2(4,4) .ne. 5) call abort + if (b2(0,0) .ne. 1) STOP 16 + if (b2(1,1) .ne. 2) STOP 17 + if (b2(2,2) .ne. 3) STOP 18 + if (b2(3,3) .ne. 4) STOP 19 + if (b2(4,4) .ne. 5) STOP 20 deallocate(b2) allocate (c3(5,5,5)) - if (.not.allocated (c3)) call abort() + if (.not.allocated (c3)) STOP 5 c3 = 12 @@ -105,16 +105,16 @@ program test c3(5,5,5) = 5 !$acc end parallel - if (c3(1,1,1) .ne. 1) call abort - if (c3(2,2,2) .ne. 2) call abort - if (c3(3,3,3) .ne. 3) call abort - if (c3(4,4,4) .ne. 4) call abort - if (c3(5,5,5) .ne. 5) call abort + if (c3(1,1,1) .ne. 1) STOP 21 + if (c3(2,2,2) .ne. 2) STOP 22 + if (c3(3,3,3) .ne. 3) STOP 23 + if (c3(4,4,4) .ne. 4) STOP 24 + if (c3(5,5,5) .ne. 5) STOP 25 deallocate(c3) allocate (c3(0:4,0:4,0:4)) - if (.not.allocated (c3)) call abort() + if (.not.allocated (c3)) STOP 6 c3 = 12 @@ -126,22 +126,22 @@ program test c3(4,4,4) = 5 !$acc end parallel - if (c3(0,0,0) .ne. 1) call abort - if (c3(1,1,1) .ne. 2) call abort - if (c3(2,2,2) .ne. 3) call abort - if (c3(3,3,3) .ne. 4) call abort - if (c3(4,4,4) .ne. 5) call abort + if (c3(0,0,0) .ne. 1) STOP 26 + if (c3(1,1,1) .ne. 2) STOP 27 + if (c3(2,2,2) .ne. 3) STOP 28 + if (c3(3,3,3) .ne. 4) STOP 29 + if (c3(4,4,4) .ne. 5) STOP 30 deallocate(c3) allocate (a1(5)) - if (.not.allocated (a1)) call abort() + if (.not.allocated (a1)) STOP 7 allocate (b1(5)) - if (.not.allocated (b1)) call abort() + if (.not.allocated (b1)) STOP 8 allocate (c1(5)) - if (.not.allocated (c1)) call abort() + if (.not.allocated (c1)) STOP 9 a1 = 10 b1 = 3 @@ -161,24 +161,24 @@ program test b1(5) = c1(5) !$acc end parallel - if (b1(1) .ne. 10) call abort - if (b1(2) .ne. 10) call abort - if (b1(3) .ne. 10) call abort - if (b1(4) .ne. 10) call abort - if (b1(5) .ne. 10) call abort + if (b1(1) .ne. 10) STOP 31 + if (b1(2) .ne. 10) STOP 32 + if (b1(3) .ne. 10) STOP 33 + if (b1(4) .ne. 10) STOP 34 + if (b1(5) .ne. 10) STOP 35 deallocate(a1) deallocate(b1) deallocate(c1) allocate (a1(0:4)) - if (.not.allocated (a1)) call abort() + if (.not.allocated (a1)) STOP 10 allocate (b1(0:4)) - if (.not.allocated (b1)) call abort() + if (.not.allocated (b1)) STOP 11 allocate (c1(0:4)) - if (.not.allocated (c1)) call abort() + if (.not.allocated (c1)) STOP 12 a1 = 10 b1 = 3 @@ -198,18 +198,18 @@ program test b1(4) = c1(4) !$acc end parallel - if (b1(0) .ne. 10) call abort - if (b1(1) .ne. 10) call abort - if (b1(2) .ne. 10) call abort - if (b1(3) .ne. 10) call abort - if (b1(4) .ne. 10) call abort + if (b1(0) .ne. 10) STOP 36 + if (b1(1) .ne. 10) STOP 37 + if (b1(2) .ne. 10) STOP 38 + if (b1(3) .ne. 10) STOP 39 + if (b1(4) .ne. 10) STOP 40 deallocate(a1) deallocate(b1) deallocate(c1) allocate (a1(5)) - if (.not.allocated (a1)) call abort() + if (.not.allocated (a1)) STOP 13 a1 = 10 @@ -218,11 +218,11 @@ program test a1(3) = 3 !$acc end parallel - if (a1(1) .ne. 10) call abort - if (a1(2) .ne. 2) call abort - if (a1(3) .ne. 3) call abort - if (a1(4) .ne. 10) call abort - if (a1(5) .ne. 10) call abort + if (a1(1) .ne. 10) STOP 41 + if (a1(2) .ne. 2) STOP 42 + if (a1(3) .ne. 3) STOP 43 + if (a1(4) .ne. 10) STOP 44 + if (a1(5) .ne. 10) STOP 45 deallocate(a1) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90 index e51509f..764affd 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90 @@ -58,10 +58,10 @@ program reduction_1 vresult = vresult + array(i) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 1 + if (rw .ne. vresult) STOP 2 + if (rv .ne. vresult) STOP 3 + if (rc .ne. vresult) STOP 4 ! ! '*' reductions @@ -106,10 +106,10 @@ program reduction_1 vresult = vresult * array(i) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 5 + if (rw .ne. vresult) STOP 6 + if (rv .ne. vresult) STOP 7 + if (rc .ne. vresult) STOP 8 ! ! 'max' reductions @@ -154,10 +154,10 @@ program reduction_1 vresult = max (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 9 + if (rw .ne. vresult) STOP 10 + if (rv .ne. vresult) STOP 11 + if (rc .ne. vresult) STOP 12 ! ! 'min' reductions @@ -202,10 +202,10 @@ program reduction_1 vresult = min (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 13 + if (rw .ne. vresult) STOP 14 + if (rv .ne. vresult) STOP 15 + if (rc .ne. vresult) STOP 16 ! ! 'iand' reductions @@ -250,10 +250,10 @@ program reduction_1 vresult = iand (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 17 + if (rw .ne. vresult) STOP 18 + if (rv .ne. vresult) STOP 19 + if (rc .ne. vresult) STOP 20 ! ! 'ior' reductions @@ -298,10 +298,10 @@ program reduction_1 vresult = ior (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 21 + if (rw .ne. vresult) STOP 22 + if (rv .ne. vresult) STOP 23 + if (rc .ne. vresult) STOP 24 ! ! 'ieor' reductions @@ -346,10 +346,10 @@ program reduction_1 vresult = ieor (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 25 + if (rw .ne. vresult) STOP 26 + if (rv .ne. vresult) STOP 27 + if (rc .ne. vresult) STOP 28 ! ! '.and.' reductions @@ -394,10 +394,10 @@ program reduction_1 lvresult = lvresult .and. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 29 + if (lrw .neqv. lvresult) STOP 30 + if (lrv .neqv. lvresult) STOP 31 + if (lrc .neqv. lvresult) STOP 32 ! ! '.or.' reductions @@ -442,10 +442,10 @@ program reduction_1 lvresult = lvresult .or. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 33 + if (lrw .neqv. lvresult) STOP 34 + if (lrv .neqv. lvresult) STOP 35 + if (lrc .neqv. lvresult) STOP 36 ! ! '.eqv.' reductions @@ -490,10 +490,10 @@ program reduction_1 lvresult = lvresult .eqv. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 37 + if (lrw .neqv. lvresult) STOP 38 + if (lrv .neqv. lvresult) STOP 39 + if (lrc .neqv. lvresult) STOP 40 ! ! '.neqv.' reductions @@ -538,8 +538,8 @@ program reduction_1 lvresult = lvresult .neqv. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 41 + if (lrw .neqv. lvresult) STOP 42 + if (lrv .neqv. lvresult) STOP 43 + if (lrc .neqv. lvresult) STOP 44 end program reduction_1 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-2.f90 index b828feb..d3401c8 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-2.f90 @@ -59,10 +59,10 @@ program reduction_2 vresult = vresult + array(i) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 1 + if (rw .ne. vresult) STOP 2 + if (rv .ne. vresult) STOP 3 + if (rc .ne. vresult) STOP 4 ! ! '*' reductions @@ -107,10 +107,10 @@ program reduction_2 vresult = vresult * array(i) end do - if (abs (rg - vresult) .ge. e) call abort - if (abs (rw - vresult) .ge. e) call abort - if (abs (rv - vresult) .ge. e) call abort - if (abs (rc - vresult) .ge. e) call abort + if (abs (rg - vresult) .ge. e) STOP 5 + if (abs (rw - vresult) .ge. e) STOP 6 + if (abs (rv - vresult) .ge. e) STOP 7 + if (abs (rc - vresult) .ge. e) STOP 8 ! ! 'max' reductions @@ -155,10 +155,10 @@ program reduction_2 vresult = max (vresult, array(i)) end do - if (abs (rg - vresult) .ge. e) call abort - if (abs (rw - vresult) .ge. e) call abort - if (abs (rg - vresult) .ge. e) call abort - if (abs (rc - vresult) .ge. e) call abort + if (abs (rg - vresult) .ge. e) STOP 9 + if (abs (rw - vresult) .ge. e) STOP 10 + if (abs (rg - vresult) .ge. e) STOP 11 + if (abs (rc - vresult) .ge. e) STOP 12 ! ! 'min' reductions @@ -203,10 +203,10 @@ program reduction_2 vresult = min (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 13 + if (rv .ne. vresult) STOP 14 + if (rw .ne. vresult) STOP 15 + if (rc .ne. vresult) STOP 16 ! ! '.and.' reductions @@ -251,10 +251,10 @@ program reduction_2 lvresult = lvresult .and. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 17 + if (lrw .neqv. lvresult) STOP 18 + if (lrv .neqv. lvresult) STOP 19 + if (lrc .neqv. lvresult) STOP 20 ! ! '.or.' reductions @@ -299,10 +299,10 @@ program reduction_2 lvresult = lvresult .or. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 21 + if (lrw .neqv. lvresult) STOP 22 + if (lrv .neqv. lvresult) STOP 23 + if (lrc .neqv. lvresult) STOP 24 ! ! '.eqv.' reductions @@ -347,10 +347,10 @@ program reduction_2 lvresult = lvresult .eqv. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 25 + if (lrw .neqv. lvresult) STOP 26 + if (lrv .neqv. lvresult) STOP 27 + if (lrc .neqv. lvresult) STOP 28 ! ! '.neqv.' reductions @@ -395,8 +395,8 @@ program reduction_2 lvresult = lvresult .neqv. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 29 + if (lrw .neqv. lvresult) STOP 30 + if (lrv .neqv. lvresult) STOP 31 + if (lrc .neqv. lvresult) STOP 32 end program reduction_2 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-3.f90 index 3d8d753..6f31044 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-3.f90 @@ -59,10 +59,10 @@ program reduction_3 vresult = vresult + array(i) end do - if (abs (rg - vresult) .ge. e) call abort - if (abs (rw - vresult) .ge. e) call abort - if (abs (rv - vresult) .ge. e) call abort - if (abs (rc - vresult) .ge. e) call abort + if (abs (rg - vresult) .ge. e) STOP 1 + if (abs (rw - vresult) .ge. e) STOP 2 + if (abs (rv - vresult) .ge. e) STOP 3 + if (abs (rc - vresult) .ge. e) STOP 4 ! ! '*' reductions @@ -107,10 +107,10 @@ program reduction_3 vresult = vresult * array(i) end do - if (abs (rg - vresult) .ge. e) call abort - if (abs (rw - vresult) .ge. e) call abort - if (abs (rv - vresult) .ge. e) call abort - if (abs (rc - vresult) .ge. e) call abort + if (abs (rg - vresult) .ge. e) STOP 5 + if (abs (rw - vresult) .ge. e) STOP 6 + if (abs (rv - vresult) .ge. e) STOP 7 + if (abs (rc - vresult) .ge. e) STOP 8 ! ! 'max' reductions @@ -155,10 +155,10 @@ program reduction_3 vresult = max (vresult, array(i)) end do - if (abs (rg - vresult) .ge. e) call abort - if (abs (rw - vresult) .ge. e) call abort - if (abs (rv - vresult) .ge. e) call abort - if (abs (rc - vresult) .ge. e) call abort + if (abs (rg - vresult) .ge. e) STOP 9 + if (abs (rw - vresult) .ge. e) STOP 10 + if (abs (rv - vresult) .ge. e) STOP 11 + if (abs (rc - vresult) .ge. e) STOP 12 ! ! 'min' reductions @@ -203,10 +203,10 @@ program reduction_3 vresult = min (vresult, array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 13 + if (rw .ne. vresult) STOP 14 + if (rv .ne. vresult) STOP 15 + if (rc .ne. vresult) STOP 16 ! ! '.and.' reductions @@ -251,10 +251,10 @@ program reduction_3 lvresult = lvresult .and. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 17 + if (lrw .neqv. lvresult) STOP 18 + if (lrv .neqv. lvresult) STOP 19 + if (lrc .neqv. lvresult) STOP 20 ! ! '.or.' reductions @@ -299,10 +299,10 @@ program reduction_3 lvresult = lvresult .or. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 21 + if (lrw .neqv. lvresult) STOP 22 + if (lrv .neqv. lvresult) STOP 23 + if (lrc .neqv. lvresult) STOP 24 ! ! '.eqv.' reductions @@ -347,10 +347,10 @@ program reduction_3 lvresult = lvresult .eqv. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 25 + if (lrw .neqv. lvresult) STOP 26 + if (lrv .neqv. lvresult) STOP 27 + if (lrc .neqv. lvresult) STOP 28 ! ! '.neqv.' reductions @@ -395,8 +395,8 @@ program reduction_3 lvresult = lvresult .neqv. (array(i) .ge. 5) end do - if (lrg .neqv. lvresult) call abort - if (lrw .neqv. lvresult) call abort - if (lrv .neqv. lvresult) call abort - if (lrc .neqv. lvresult) call abort + if (lrg .neqv. lvresult) STOP 29 + if (lrw .neqv. lvresult) STOP 30 + if (lrv .neqv. lvresult) STOP 31 + if (lrc .neqv. lvresult) STOP 32 end program reduction_3 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-4.f90 index c3bdaf6..c93c315 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-4.f90 @@ -57,10 +57,10 @@ program reduction_4 vresult = vresult + REAL(array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 1 + if (rw .ne. vresult) STOP 2 + if (rv .ne. vresult) STOP 3 + if (rc .ne. vresult) STOP 4 ! ! '*' reductions @@ -105,8 +105,8 @@ program reduction_4 vresult = vresult * REAL(array(i)) end do - if (rg .ne. vresult) call abort - if (rw .ne. vresult) call abort - if (rv .ne. vresult) call abort - if (rc .ne. vresult) call abort + if (rg .ne. vresult) STOP 5 + if (rw .ne. vresult) STOP 6 + if (rv .ne. vresult) STOP 7 + if (rc .ne. vresult) STOP 8 end program reduction_4 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90 index 4210648..833d0e4 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90 @@ -20,11 +20,11 @@ program reduction vsum = vsum + c end do - if (gs .ne. vsum) call abort () - if (ws .ne. vsum) call abort () - if (vs .ne. vsum) call abort () - if (cs .ne. vsum) call abort () - if (ns .ne. vsum) call abort () + if (gs .ne. vsum) STOP 1 + if (ws .ne. vsum) STOP 2 + if (vs .ne. vsum) STOP 3 + if (cs .ne. vsum) STOP 4 + if (ns .ne. vsum) STOP 5 end program reduction subroutine redsub_gang(sum, n, c) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90 index c10e3f9..e76867a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90 @@ -57,17 +57,17 @@ program reduction hs2 = hs2 + 2 end do - if (gs1 .ne. hs1) call abort () - if (gs2 .ne. hs2) call abort () + if (gs1 .ne. hs1) STOP 1 + if (gs2 .ne. hs2) STOP 2 - if (ws1 .ne. hs1) call abort () - if (ws2 .ne. hs2) call abort () + if (ws1 .ne. hs1) STOP 3 + if (ws2 .ne. hs2) STOP 4 - if (vs1 .ne. hs1) call abort () - if (vs2 .ne. hs2) call abort () + if (vs1 .ne. hs1) STOP 5 + if (vs2 .ne. hs2) STOP 6 - if (cs1 .ne. hs1) call abort () - if (cs2 .ne. hs2) call abort () + if (cs1 .ne. hs1) STOP 7 + if (cs2 .ne. hs2) STOP 8 ! Nested reductions. @@ -90,5 +90,5 @@ program reduction end do end do - if (red .ne. vred) call abort () + if (red .ne. vred) STOP 9 end program reduction diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90 index 1a7d69a..a7d6dd8 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90 @@ -19,7 +19,7 @@ program reduction do j = 1, n vsum = vsum + 1; end do - if (vsum .ne. arr(i)) call abort () + if (vsum .ne. arr(i)) STOP 1 end do end program reduction @@ -45,7 +45,7 @@ subroutine redsub_private(sum, n, arr) ! verify the results do i = 1, 10 - if (arr(i) .ne. 100+i) call abort () + if (arr(i) .ne. 100+i) STOP 2 end do end subroutine redsub_private diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-8.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-8.f90 index 5cf4681..0ba83a0 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-8.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-8.f90 @@ -30,12 +30,12 @@ program reduction end do !$acc end parallel loop - if (h1 .ne. s1) call abort () - if (h2 .ne. s2) call abort () + if (h1 .ne. s1) STOP 1 + if (h2 .ne. s2) STOP 2 !$acc wait(1) - if (h1 .ne. a1) call abort () - if (h2 .ne. a2) call abort () + if (h1 .ne. a1) STOP 3 + if (h2 .ne. a2) STOP 4 end program reduction diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-1.f90 index 3390515..6a57321 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-1.f90 @@ -17,7 +17,7 @@ end do !$acc end parallel do i = 1, n - if (a(i) .ne. fact(i)) call abort + if (a(i) .ne. fact(i)) STOP 1 end do end recursive function fact (x) result (res) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-2.f90 index 3d418b6..b697974 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-2.f90 @@ -24,6 +24,6 @@ end do !$acc end parallel do i = 1, n - if (a(i) .ne. fact(i)) call abort + if (a(i) .ne. fact(i)) STOP 1 end do end diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-3.f90 index d233a63..e7b9d8a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-3.f90 @@ -12,7 +12,7 @@ end do !$acc end parallel do i = 1, n - if (a(i) .ne. fact(i)) call abort + if (a(i) .ne. fact(i)) STOP 1 end do end recursive function fact (x) result (res) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-4.f90 index 3e5fb09..a96363b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-4.f90 @@ -13,7 +13,7 @@ end do !$acc end parallel do i = 1, n - if (a(i) .ne. (i + 1)) call abort + if (a(i) .ne. (i + 1)) STOP 1 end do end subroutine incr (x) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-5.f90 index 956da8e..a803ad9 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-5.f90 @@ -10,7 +10,7 @@ program main n = func (n) !$acc end parallel - if (n .ne. 6) call abort + if (n .ne. 6) STOP 1 contains diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-7.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-7.f90 index 200188e..f58a95f 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-7.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-7.f90 @@ -22,7 +22,7 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne.N) call abort + if (a(i) .ne.N) STOP 1 end do !$acc parallel copy (a) @@ -33,7 +33,7 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. (N + (N * (-1 * i)))) call abort + if (a(i) .ne. (N + (N * (-1 * i)))) STOP 2 end do do i = 1, N @@ -48,7 +48,7 @@ program main !$acc end parallel do i = 1, N - if (b(i) .ne. N + i) call abort + if (b(i) .ne. N + i) STOP 3 end do do i = 1, N @@ -63,7 +63,7 @@ program main !$acc end parallel do i = 1, N - if (a(i) .ne. 0) call abort + if (a(i) .ne. 0) STOP 4 end do contains diff --git a/libgomp/testsuite/libgomp.oacc-fortran/routine-9.f90 b/libgomp/testsuite/libgomp.oacc-fortran/routine-9.f90 index 95d1a13..b1a1338 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/routine-9.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/routine-9.f90 @@ -14,7 +14,7 @@ program main end do !$acc end parallel do i = 1, n - if (a(i) .ne. fact(i)) call abort + if (a(i) .ne. fact(i)) STOP 1 end do end program main diff --git a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90 index b39414f..8a2ec2c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-1.f90 @@ -32,7 +32,7 @@ program subarrays !$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) @@ -92,6 +92,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/subarrays-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90 index 81799f6..914da5b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/subarrays-2.f90 @@ -32,7 +32,7 @@ program subarrays !$acc end parallel do i = low, high - if (a(i) .ne. b(i)) call abort + if (a(i) .ne. b(i)) STOP 1 end do call check (a, b, n) @@ -95,6 +95,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/update-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/update-1.f90 index 4e1d2c0..2633d6c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/update-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/update-1.f90 @@ -25,12 +25,12 @@ program update !$acc update host (a, b) do i = 1, N - if (a(i) .ne. 3.0) call abort - if (b(i) .ne. 3.0) call abort + if (a(i) .ne. 3.0) STOP 1 + if (b(i) .ne. 3.0) STOP 2 end do - if (acc_is_present (a) .neqv. .TRUE.) call abort - if (acc_is_present (b) .neqv. .TRUE.) call abort + if (acc_is_present (a) .neqv. .TRUE.) STOP 3 + if (acc_is_present (b) .neqv. .TRUE.) STOP 4 do i = 1, N a(i) = 5.0 @@ -48,12 +48,12 @@ program update !$acc update host (a, b) do i = 1, N - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 5.0) call abort + if (a(i) .ne. 5.0) STOP 5 + if (b(i) .ne. 5.0) STOP 6 end do - if (acc_is_present (a) .neqv. .TRUE.) call abort - if (acc_is_present (b) .neqv. .TRUE.) call abort + if (acc_is_present (a) .neqv. .TRUE.) STOP 7 + if (acc_is_present (b) .neqv. .TRUE.) STOP 8 !$acc parallel present (a, b) do i = 1, N @@ -64,12 +64,12 @@ program update !$acc update host (a, b) do i = 1, N - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 5.0) call abort + if (a(i) .ne. 5.0) STOP 9 + if (b(i) .ne. 5.0) STOP 10 end do - if (acc_is_present (a) .neqv. .TRUE.) call abort - if (acc_is_present (b) .neqv. .TRUE.) call abort + if (acc_is_present (a) .neqv. .TRUE.) STOP 11 + if (acc_is_present (b) .neqv. .TRUE.) STOP 12 do i = 1, N a(i) = 6.0 @@ -91,12 +91,12 @@ program update !$acc update host (a, b) do i = 1, N - if (a(i) .ne. 6.0) call abort - if (b(i) .ne. 6.0) call abort + if (a(i) .ne. 6.0) STOP 13 + if (b(i) .ne. 6.0) STOP 14 end do - if (acc_is_present (a) .neqv. .TRUE.) call abort - if (acc_is_present (b) .neqv. .TRUE.) call abort + if (acc_is_present (a) .neqv. .TRUE.) STOP 15 + if (acc_is_present (b) .neqv. .TRUE.) STOP 16 do i = 1, N a(i) = 7.0 @@ -118,8 +118,8 @@ program update !$acc update host (a, b) do i = 1, N - if (a(i) .ne. 7.0) call abort - if (b(i) .ne. 7.0) call abort + if (a(i) .ne. 7.0) STOP 17 + if (b(i) .ne. 7.0) STOP 18 end do do i = 1, N @@ -137,12 +137,12 @@ program update !$acc update host (a, b) do i = 1, N - if (a(i) .ne. 9.0) call abort - if (b(i) .ne. 9.0) call abort + if (a(i) .ne. 9.0) STOP 19 + if (b(i) .ne. 9.0) STOP 20 end do - if (acc_is_present (a) .neqv. .TRUE.) call abort - if (acc_is_present (b) .neqv. .TRUE.) call abort + if (acc_is_present (a) .neqv. .TRUE.) STOP 21 + if (acc_is_present (b) .neqv. .TRUE.) STOP 22 do i = 1, N a(i) = 5.0 @@ -165,17 +165,17 @@ program update !$acc update host (a, b) do i = 1, NDIV2 - if (a(i) .ne. 6.0) call abort - if (b(i) .ne. 6.0) call abort + if (a(i) .ne. 6.0) STOP 23 + if (b(i) .ne. 6.0) STOP 24 end do do i = NDIV2 + 1, N - if (a(i) .ne. 5.0) call abort - if (b(i) .ne. 5.0) call abort + if (a(i) .ne. 5.0) STOP 25 + if (b(i) .ne. 5.0) STOP 26 end do - if (acc_is_present (a) .neqv. .TRUE.) call abort - if (acc_is_present (b) .neqv. .TRUE.) call abort + if (acc_is_present (a) .neqv. .TRUE.) STOP 27 + if (acc_is_present (b) .neqv. .TRUE.) STOP 28 do i = 1, N a(i) = 0.0 @@ -192,21 +192,21 @@ program update !$acc update host (a(5:N)) do i = 1, NDIV2 - if (a(i) .ne. 0.0) call abort + if (a(i) .ne. 0.0) STOP 29 end do do i = NDIV2 + 1, N - if (a(i) .ne. 6.0) call abort + if (a(i) .ne. 6.0) STOP 30 end do !$acc update host (a(1:4)) do i = 1, NDIV2 - if (a(i) .ne. 1.0) call abort + if (a(i) .ne. 1.0) STOP 31 end do do i = NDIV2 + 1, N - if (a(i) .ne. 6.0) call abort + if (a(i) .ne. 6.0) STOP 32 end do a(3) = 9 @@ -225,15 +225,15 @@ program update !$acc update host (a(3:6)) do i = 1, 2 - if (a(i) .ne. 1.0) call abort + if (a(i) .ne. 1.0) STOP 33 end do do i = 3, 6 - if (a(i) .ne. 10.0) call abort + if (a(i) .ne. 10.0) STOP 34 end do do i = 7, N - if (a(i) .ne. 6.0) call abort + if (a(i) .ne. 6.0) STOP 35 end do !$acc exit data delete (a, b) |