diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2020-03-18 16:28:08 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2020-03-18 16:28:08 +0100 |
| commit | 26cbcfe5fce57b090b0f2336aad27d84b725f760 (patch) | |
| tree | 7ccb797dfa77979eea4797176a72581d30d931f5 /libgomp | |
| parent | 884d914111228eed977d794f38e4cc88bf132a58 (diff) | |
Fix libgomp.oacc-fortran/atomic_capture-1.f90
2020-03-18 Julian Brown <julian@codesourcery.com>
Tobias Burnus <tobias@codesourcery.com>
* testsuite/libgomp.oacc-fortran/atomic_capture-1.f90: Really make
it work concurrently.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 | 30 |
2 files changed, 32 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 3dbe94bc982..9a1065fef4e 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2020-03-18 Julian Brown <julian@codesourcery.com> + Tobias Burnus <tobias@codesourcery.com> + + * testsuite/libgomp.oacc-fortran/atomic_capture-1.f90: Really make + it work concurrently. + 2020-03-18 Tobias Burnus <tobias@codesourcery.com> * testsuite/libgomp.oacc-c++/firstprivate-mappings-1.C: Add diff --git a/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 index 5a4a1e03f64..536b3f0030c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/atomic_capture-1.f90 @@ -275,8 +275,9 @@ program main if (ltmp .neqv. .not. lexp) STOP 33 if (lgot .neqv. lexp) STOP 34 - igot = 1 + igot = 0 iexp = N + iarr = -42 !$acc parallel loop copy (igot, itmp) do i = 1, N @@ -287,13 +288,24 @@ program main end do !$acc end parallel loop + if (igot /= N) stop 107 + itmp = 0 + do i = 1, N + if (iarr(i) == 0) then + itmp = i + exit + end if + end do + ! At most one iarr element can be 0. do i = 1, N - if (.not. (1 <= iarr(i) .and. iarr(i) < iexp)) STOP 35 + if ((iarr(i) == 0 .and. i /= itmp) & + .or. iarr(i) < 0 .or. iarr(i) >= N) STOP 35 end do if (igot /= iexp) STOP 36 - igot = N + igot = N + 1 iexp = 1 + iarr = -42 !$acc parallel loop copy (igot, itmp) do i = 1, N @@ -304,8 +316,18 @@ program main end do !$acc end parallel loop + if (igot /= 1) stop 108 + itmp = N + 1 + ! At most one iarr element can be N+1. + do i = 1, N + if (iarr(i) == N + 1) then + itmp = i + exit + end if + end do do i = 1, N - if (.not. (iarr(i) == 1 .or. iarr(i) == N)) STOP 37 + if ((iarr(i) == N + 1 .and. i /= itmp) & + .or. iarr(i) <= 0 .or. iarr(i) > N + 1) STOP 37 end do if (igot /= iexp) STOP 38 |