Hi! On Mon, 22 May 2017 16:26:48 +0200, I wrote: > C/C++ OpenACC: acc_pcopyin, acc_pcreate
> libgomp/ > [...] > * testsuite/libgomp.oacc-c-c++-common/lib-38.c: Remove, merging > its content into... > * testsuite/libgomp.oacc-c-c++-common/lib-32.c: ... this file. > Extend testing. ... which I then translated into two Fortran variants; OK for trunk? commit 04ee44504e6256ee95ae3c6ba91a5960265b3261 Author: Thomas Schwinge <tho...@codesourcery.com> Date: Wed Apr 19 15:38:51 2017 +0200 Translate libgomp.oacc-c-c++-common/lib-32.c into Fortran libgomp/ * testsuite/libgomp.oacc-fortran/lib-32-1.f: New file. * testsuite/libgomp.oacc-fortran/lib-32-2.f: Likewise. --- .../testsuite/libgomp.oacc-c-c++-common/lib-32.c | 1 + libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f | 179 +++++++++++++++++++++ libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f | 173 ++++++++++++++++++++ 3 files changed, 353 insertions(+) diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-32.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-32.c index 6a9e995..1696fb6 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-32.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-32.c @@ -1,4 +1,5 @@ /* acc_present_or_create, acc_present_or_copyin, etc. */ +/* See also Fortran variants in "../libgomp.oacc-fortran/lib-32*". */ #include <stdbool.h> #include <stdlib.h> diff --git libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f new file mode 100644 index 0000000..4606d77 --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f @@ -0,0 +1,179 @@ +! ACC_PRESENT_OR_CREATE, ACC_PRESENT_OR_COPYIN, etc. +! Variant of "../libgomp.oacc-c-c++-common/lib-32.c". +! Variant using "openacc_lib.h". + +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + INCLUDE "openacc_lib.h" + + INTEGER, PARAMETER :: N = 10000 + INTEGER, ALLOCATABLE :: H(:) + INTEGER :: I + LOGICAL :: SHARED_MEM + + ALLOCATE (H(N)) + DO I = 1, N + H(I) = I + 0 + END DO + + SHARED_MEM = ACC_IS_PRESENT (H) + + CALL ACC_PRESENT_OR_CREATE (H) + IF (.NOT. ACC_IS_PRESENT (H)) CALL ABORT + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + H(I) = I + 1 + END DO +!$ACC END PARALLEL LOOP + + DO I = 1, N + IF (H(I) .NE. I + MERGE (1, 0, SHARED_MEM)) CALL ABORT + H(I) = I + 2 + END DO + + CALL ACC_PRESENT_OR_CREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (2, 1, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 4 + END DO + +! CALL ACC_PCREATE (H) + CALL ACC_PRESENT_OR_CREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (4, 3, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 6 + END DO + + CALL ACC_PRESENT_OR_COPYIN (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (6, 5, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 8 + END DO + +! CALL ACC_PCOPYIN (H) + CALL ACC_PRESENT_OR_COPYIN (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (8, 7, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 10 + END DO + + CALL ACC_COPYOUT (H) + IF (.NOT. SHARED_MEM) THEN + IF (ACC_IS_PRESENT (H)) CALL ABORT + ENDIF + + DO I = 1, N + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + END DO + +! CALL ACC_PCOPYIN (H) + CALL ACC_PRESENT_OR_COPYIN (H) + IF (.NOT. ACC_IS_PRESENT (H)) CALL ABORT + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 12 + END DO + +! CALL ACC_PCOPYIN (H) + CALL ACC_PRESENT_OR_COPYIN (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (12, 11, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 14 + END DO + +! CALL ACC_PCREATE (H) + CALL ACC_PRESENT_OR_CREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (14, 13, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 16 + END DO + +! CALL ACC_PCREATE (H) + CALL ACC_PRESENT_OR_CREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (16, 15, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 18 + END DO + + CALL ACC_UPDATE_SELF (H) + IF (.NOT. ACC_IS_PRESENT (H)) CALL ABORT + + DO I = 1, N + IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) CALL ABORT + END DO + + CALL ACC_DELETE (H) + IF (.NOT. SHARED_MEM) THEN + IF (ACC_IS_PRESENT (H)) CALL ABORT + ENDIF + + DEALLOCATE (H) + + END PROGRAM MAIN diff --git libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f new file mode 100644 index 0000000..88f5566 --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f @@ -0,0 +1,173 @@ +! ACC_PRESENT_OR_CREATE, ACC_PRESENT_OR_COPYIN, etc. +! Variant of "../libgomp.oacc-c-c++-common/lib-32.c". +! Variant using the "openacc" module. + +! { dg-do run } + + PROGRAM MAIN + USE OPENACC + IMPLICIT NONE + + INTEGER, PARAMETER :: N = 10000 + INTEGER, ALLOCATABLE :: H(:) + INTEGER :: I + LOGICAL :: SHARED_MEM + + ALLOCATE (H(N)) + DO I = 1, N + H(I) = I + 0 + END DO + + SHARED_MEM = ACC_IS_PRESENT (H) + + CALL ACC_PRESENT_OR_CREATE (H) + IF (.NOT. ACC_IS_PRESENT (H)) CALL ABORT + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + H(I) = I + 1 + END DO +!$ACC END PARALLEL LOOP + + DO I = 1, N + IF (H(I) .NE. I + MERGE (1, 0, SHARED_MEM)) CALL ABORT + H(I) = I + 2 + END DO + + CALL ACC_PRESENT_OR_CREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (2, 1, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 4 + END DO + + CALL ACC_PCREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (4, 3, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 6 + END DO + + CALL ACC_PRESENT_OR_COPYIN (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (6, 5, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 8 + END DO + + CALL ACC_PCOPYIN (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (8, 7, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 10 + END DO + + CALL ACC_COPYOUT (H) + IF (.NOT. SHARED_MEM) THEN + IF (ACC_IS_PRESENT (H)) CALL ABORT + ENDIF + + DO I = 1, N + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + END DO + + CALL ACC_PCOPYIN (H) + IF (.NOT. ACC_IS_PRESENT (H)) CALL ABORT + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (10, 9, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 12 + END DO + + CALL ACC_PCOPYIN (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (12, 11, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 14 + END DO + + CALL ACC_PCREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (14, 13, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 16 + END DO + + CALL ACC_PCREATE (H) + +!$ACC PARALLEL LOOP DEFAULT (PRESENT) + DO I = 1, N + IF (H(I) .NE. I + MERGE (16, 15, SHARED_MEM)) CALL ABORT + 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 + H(I) = I + 18 + END DO + + CALL ACC_UPDATE_SELF (H) + IF (.NOT. ACC_IS_PRESENT (H)) CALL ABORT + + DO I = 1, N + IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) CALL ABORT + END DO + + CALL ACC_DELETE (H) + IF (.NOT. SHARED_MEM) THEN + IF (ACC_IS_PRESENT (H)) CALL ABORT + ENDIF + + DEALLOCATE (H) + + END PROGRAM MAIN Grüße Thomas