829c6349e9
gcc/c-family/
* c-pragma.h (enum pragma_omp_clause): Add
PRAGMA_OACC_CLAUSE_{FINALIZE,IF_PRESENT}. Remove
PRAGMA_OACC_CLAUSE_PRESENT_OR_{COPY,COPYIN,COPYOUT,CREATE}.
gcc/c/
* c-parser.c (c_parser_omp_clause_name): Add support for finalize
and if_present. Make present_or_{copy,copyin,copyout,create} aliases
to their non-present_or_* counterparts. Make 'self' an alias to
PRAGMA_OACC_CLAUSE_HOST.
(c_parser_oacc_data_clause): Update GOMP mappings for
PRAGMA_OACC_CLAUSE_{COPY,COPYIN,COPYOUT,CREATE,DELETE}. Remove
PRAGMA_OACC_CLAUSE_{SELF,PRESENT_OR_*}.
(c_parser_oacc_all_clauses): Handle finalize and if_present clauses.
Remove support for present_or_* clauses.
(OACC_KERNELS_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_PARALLEL_CLAUSE_MASK): Likewise.
(OACC_DECLARE_CLAUSE_MASK): Likewise.
(OACC_DATA_CLAUSE_MASK): Likewise.
(OACC_ENTER_DATA_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_EXIT_DATA_CLAUSE_MASK): Add FINALIZE clause.
(OACC_UPDATE_CLAUSE_MASK): Remove SELF, add IF_PRESENT.
(c_parser_oacc_declare): Remove PRESENT_OR_* clauses.
* c-typeck.c (c_finish_omp_clauses): Handle IF_PRESENT and FINALIZE.
gcc/cp/
* parser.c (cp_parser_omp_clause_name): Add support for finalize
and if_present. Make present_or_{copy,copyin,copyout,create} aliases
to their non-present_or_* counterparts. Make 'self' an alias to
PRAGMA_OACC_CLAUSE_HOST.
(cp_parser_oacc_data_clause): Update GOMP mappings for
PRAGMA_OACC_CLAUSE_{COPY,COPYIN,COPYOUT,CREATE,DELETE}. Remove
PRAGMA_OACC_CLAUSE_{SELF,PRESENT_OR_*}.
(cp_parser_oacc_all_clauses): Handle finalize and if_present clauses.
Remove support for present_or_* clauses.
(OACC_KERNELS_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_PARALLEL_CLAUSE_MASK): Likewise.
(OACC_DECLARE_CLAUSE_MASK): Likewise.
(OACC_DATA_CLAUSE_MASK): Likewise.
(OACC_ENTER_DATA_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_EXIT_DATA_CLAUSE_MASK): Add FINALIZE clause.
(OACC_UPDATE_CLAUSE_MASK): Remove SELF, add IF_PRESENT.
(cp_parser_oacc_declare): Remove PRESENT_OR_* clauses.
* pt.c (tsubst_omp_clauses): Handle IF_PRESENT and FINALIZE.
* semantics.c (finish_omp_clauses): Handle IF_PRESENT and FINALIZE.
gcc/fortran/
* gfortran.h (gfc_omp_clauses): Add unsigned if_present, finalize
bitfields.
* openmp.c (enum omp_mask2): Remove OMP_CLAUSE_PRESENT_OR_*. Add
OMP_CLAUSE_{IF_PRESENT,FINALIZE}.
(gfc_match_omp_clauses): Update handling of copy, copyin, copyout,
create, deviceptr, present_of_*. Add support for finalize and
if_present.
(OACC_PARALLEL_CLAUSES): Remove PRESENT_OR_* clauses.
(OACC_KERNELS_CLAUSES): Likewise.
(OACC_DATA_CLAUSES): Likewise.
(OACC_DECLARE_CLAUSES): Likewise.
(OACC_UPDATE_CLAUSES): Add IF_PRESENT clause.
(OACC_ENTER_DATA_CLAUSES): Remove PRESENT_OR_* clauses.
(OACC_EXIT_DATA_CLAUSES): Add FINALIZE clause.
(gfc_match_oacc_declare): Update to OpenACC 2.5 semantics.
* trans-openmp.c (gfc_trans_omp_clauses): Add support for IF_PRESENT
and FINALIZE.
gcc/
* gimplify.c (gimplify_scan_omp_clauses): Add support for
OMP_CLAUSE_{IF_PRESENT,FINALIZE}.
(gimplify_adjust_omp_clauses): Likewise.
(gimplify_oacc_declare_1): Add support for GOMP_MAP_RELEASE, remove
support for GOMP_MAP_FORCE_{ALLOC,TO,FROM,TOFROM}.
(gimplify_omp_target_update): Update handling of acc update and
enter/exit data.
* omp-low.c (install_var_field): Remove unused parameter
base_pointers_restrict.
(scan_sharing_clauses): Remove base_pointers_restrict parameter.
Update call to install_var_field. Handle OMP_CLAUSE_{IF_PRESENT,
FINALIZE}
(omp_target_base_pointers_restrict_p): Delete.
(scan_omp_target): Update call to scan_sharing_clauses.
* tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_{IF_PRESENT,
FINALIZE}.
* tree-nested.c (convert_nonlocal_omp_clauses): Handle
OMP_CLAUSE_{IF_PRESENT,FINALIZE}.
(convert_local_omp_clauses): Likewise.
* tree-pretty-print.c (dump_omp_clause): Likewise.
* tree.c (omp_clause_num_ops): Add entries for OMP_CLAUSE_{IF_PRESENT,
FINALIZE}.
(omp_clause_code_name): Likewise.
gcc/testsuite/
* c-c++-common/goacc/declare-1.c: Update test case to utilize OpenACC
2.5 data clause semantics.
* c-c++-common/goacc/declare-2.c: Likewise.
* c-c++-common/goacc/default-4.c: Likewise.
* c-c++-common/goacc/finalize-1.c: New test.
* c-c++-common/goacc/kernels-alias-2.c: Update test case to utilize
OpenACC 2.5 data clause semantics.
* c-c++-common/goacc/kernels-alias.c: Likewise.
* c-c++-common/goacc/routine-5.c: Likewise.
* c-c++-common/goacc/update-if_present-1.c: New test.
* c-c++-common/goacc/update-if_present-2.c: New test.
* g++.dg/goacc/template.C: Update test case to utilize OpenACC
2.5 data clause semantics.
* gfortran.dg/goacc/combined-directives.f90: Likewise.
* gfortran.dg/goacc/data-tree.f95: Likewise.
* gfortran.dg/goacc/declare-2.f95: Likewise.
* gfortran.dg/goacc/default-4.f: Likewise.
* gfortran.dg/goacc/enter-exit-data.f95: Likewise.
* gfortran.dg/goacc/finalize-1.f: New test.
* gfortran.dg/goacc/kernels-alias-2.f95: Update test case to utilize
OpenACC 2.5 data clause semantics.
* gfortran.dg/goacc/kernels-alias.f95: Likewise.
* gfortran.dg/goacc/kernels-tree.f95: Likewise.
* gfortran.dg/goacc/nested-function-1.f90: Likewise.
* gfortran.dg/goacc/parallel-tree.f95: Likewise.
* gfortran.dg/goacc/reduction-promotions.f90: Likewise.
* gfortran.dg/goacc/update-if_present-1.f90: New test.
* gfortran.dg/goacc/update-if_present-2.f90: New test.
libgomp/
* libgomp.h (struct splay_tree_key_s): Add dynamic_refcount member.
(gomp_acc_remove_pointer): Update declaration.
(gomp_acc_declare_allocate): Declare.
(gomp_remove_var): Declare.
* libgomp.map (OACC_2.5): Define.
* oacc-mem.c (acc_map_data): Update refcount.
(acc_unmap_data): Likewise.
(present_create_copy): Likewise.
(acc_create): Add FLAG_PRESENT when calling present_create_copy.
(acc_copyin): Likewise.
(FLAG_FINALIZE): Define.
(delete_copyout): Update dynamic refcounts, add support for FINALIZE.
(acc_delete_finalize): New function.
(acc_delete_finalize_async): New function.
(acc_copyout_finalize): New function.
(acc_copyout_finalize_async): New function.
(gomp_acc_insert_pointer): Update refcounts.
(gomp_acc_remove_pointer): Return if data is not present on the
accelerator.
* oacc-parallel.c (find_pset): Rename to find_pointer.
(find_pointer): Add support for GOMP_MAP_POINTER.
(handle_ftn_pointers): New function.
(GOACC_parallel_keyed): Update refcounts of variables.
(GOACC_enter_exit_data): Add support for finalized data mappings.
Add support for GOMP_MAP_{TO,ALLOC,RELESE,FROM}. Update handling
of fortran arrays.
(GOACC_update): Add support for GOMP_MAP_{ALWAYS_POINTER,TO,FROM}.
(GOACC_declare): Add support for GOMP_MAP_RELEASE, remove support
for GOMP_MAP_FORCE_FROM.
* openacc.f90 (module openacc_internal): Add
acc_copyout_finalize_{32_h,64_h,array_h,_l}, and
acc_delete_finalize_{32_h,64_h,array_h,_l}. Add interfaces for
acc_copyout_finalize and acc_delete_finalize.
(acc_copyout_finalize_32_h): New subroutine.
(acc_copyout_finalize_64_h): New subroutine.
(acc_copyout_finalize_array_h): New subroutine.
(acc_delete_finalize_32_h): New subroutine.
(acc_delete_finalize_64_h): New subroutine.
(acc_delete_finalize_array_h): New subroutine.
* openacc.h (acc_copyout_finalize): Declare.
(acc_copyout_finalize_async): Declare.
(acc_delete_finalize): Declare.
(acc_delete_finalize_async): Declare.
* openacc_lib.h (acc_copyout_finalize): New interface.
(acc_delete_finalize): New interface.
* target.c (gomp_map_vars): Update dynamic_refcount.
(gomp_remove_var): New function.
(gomp_unmap_vars): Use it.
(gomp_unload_image_from_device): Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-1.c: Update test
case to utilize OpenACC 2.5 data clause semantics.
* testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-3.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-4.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-5.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-6.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-7.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-16.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-25.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-32.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-83.c: Likewise.
* testsuite/libgomp.oacc-fortran/data-5.f90: New test.
* testsuite/libgomp.oacc-fortran/data-already-1.f: Update test case to
utilize OpenACC 2.5 data clause semantics.
* testsuite/libgomp.oacc-fortran/data-already-2.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-3.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-4.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-5.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-6.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-7.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise.
* testsuite/libgomp.oacc-fortran/lib-32-1.f: Likewise.
* testsuite/libgomp.oacc-fortran/lib-32-2.f: Likewise.
Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com>
Co-Authored-By: Thomas Schwinge <thomas@codesourcery.com>
From-SVN: r261813
174 lines
4.2 KiB
Fortran
174 lines
4.2 KiB
Fortran
! 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, INT (SIZEOF (H), 4))
|
|
IF (.NOT. ACC_IS_PRESENT (H, INT (SIZEOF (H), 8))) STOP 1
|
|
|
|
!$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)) STOP 2
|
|
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)) 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)) STOP 4
|
|
H(I) = I + 4
|
|
END DO
|
|
|
|
CALL ACC_PCREATE (H, INT (SIZEOF (H), 4))
|
|
|
|
!$ACC PARALLEL LOOP DEFAULT (PRESENT)
|
|
DO I = 1, N
|
|
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)) STOP 6
|
|
H(I) = I + 6
|
|
END DO
|
|
|
|
CALL ACC_PRESENT_OR_COPYIN (H, INT (SIZEOF (H), 8))
|
|
|
|
!$ACC PARALLEL LOOP DEFAULT (PRESENT)
|
|
DO I = 1, N
|
|
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)) STOP 8
|
|
H(I) = I + 8
|
|
END DO
|
|
|
|
CALL ACC_PCOPYIN (H, INT (SIZEOF (H), 4))
|
|
|
|
!$ACC PARALLEL LOOP DEFAULT (PRESENT)
|
|
DO I = 1, N
|
|
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)) STOP 10
|
|
H(I) = I + 10
|
|
END DO
|
|
|
|
CALL ACC_COPYOUT_FINALIZE (H, INT (SIZEOF (H), 4))
|
|
IF (.NOT. SHARED_MEM) THEN
|
|
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)) STOP 12
|
|
END DO
|
|
|
|
CALL ACC_PCOPYIN (H)
|
|
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)) 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)) STOP 15
|
|
H(I) = I + 12
|
|
END DO
|
|
|
|
CALL ACC_PCOPYIN (H, INT (SIZEOF (H), 8))
|
|
|
|
!$ACC PARALLEL LOOP DEFAULT (PRESENT)
|
|
DO I = 1, N
|
|
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)) STOP 17
|
|
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)) 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)) STOP 19
|
|
H(I) = I + 16
|
|
END DO
|
|
|
|
CALL ACC_PCREATE (H, INT (SIZEOF (H), 8))
|
|
|
|
!$ACC PARALLEL LOOP DEFAULT (PRESENT)
|
|
DO I = 1, N
|
|
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)) 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))) STOP 22
|
|
|
|
DO I = 1, N
|
|
IF (H(I) .NE. I + MERGE (18, 17, SHARED_MEM)) STOP 23
|
|
END DO
|
|
|
|
CALL ACC_DELETE_FINALIZE (H)
|
|
IF (.NOT. SHARED_MEM) THEN
|
|
IF (ACC_IS_PRESENT (H, INT (SIZEOF (H), 4))) STOP 24
|
|
ENDIF
|
|
|
|
DEALLOCATE (H)
|
|
|
|
END PROGRAM MAIN
|