Update OpenACC data clause semantics to the 2.5 behavior

Programming / Compilers / GCC - cesar [138bc75d-0d04-0410-961f-82ee72b054a4] - 20 June 2018 16:35 EDT

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.

737cc9783f8 Update OpenACC data clause semantics to the 2.5 behavior
gcc/ChangeLog | 28 +++
gcc/c-family/ChangeLog | 8 +
gcc/c-family/c-pragma.h | 6 +-
gcc/c/ChangeLog | 23 +++
gcc/c/c-parser.c | 115 ++++--------
gcc/c/c-typeck.c | 2 +
gcc/cp/ChangeLog | 24 +++
gcc/cp/parser.c | 114 ++++--------
gcc/cp/pt.c | 2 +
gcc/cp/semantics.c | 2 +
gcc/fortran/ChangeLog | 22 +++
gcc/fortran/gfortran.h | 1 +
gcc/fortran/openmp.c | 105 ++++++-----
gcc/fortran/trans-openmp.c | 10 ++
gcc/gimplify.c | 67 +++++--
gcc/omp-low.c | 93 ++--------
gcc/testsuite/ChangeLog | 33 ++++
gcc/testsuite/c-c++-common/goacc/declare-1.c | 12 ++
gcc/testsuite/c-c++-common/goacc/declare-2.c | 18 +-
gcc/testsuite/c-c++-common/goacc/default-4.c | 6 +-
gcc/testsuite/c-c++-common/goacc/finalize-1.c | 28 +++
gcc/testsuite/c-c++-common/goacc/kernels-alias-2.c | 10 +-
gcc/testsuite/c-c++-common/goacc/kernels-alias.c | 10 +-
gcc/testsuite/c-c++-common/goacc/routine-5.c | 150 ++++++----------
.../c-c++-common/goacc/update-if_present-1.c | 28 +++
.../c-c++-common/goacc/update-if_present-2.c | 42 +++++
gcc/testsuite/g++.dg/goacc/template.C | 13 +-
.../gfortran.dg/goacc/combined-directives.f90 | 2 +-
gcc/testsuite/gfortran.dg/goacc/data-tree.f95 | 8 +-
gcc/testsuite/gfortran.dg/goacc/declare-2.f95 | 6 +-
gcc/testsuite/gfortran.dg/goacc/default-4.f | 6 +-
.../gfortran.dg/goacc/enter-exit-data.f95 | 3 +
gcc/testsuite/gfortran.dg/goacc/finalize-1.f | 27 +++
.../gfortran.dg/goacc/kernels-alias-2.f95 | 10 +-
gcc/testsuite/gfortran.dg/goacc/kernels-alias.f95 | 10 +-
gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95 | 8 +-
.../gfortran.dg/goacc/nested-function-1.f90 | 8 +
gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95 | 12 +-
.../gfortran.dg/goacc/reduction-promotions.f90 | 6 +-
.../gfortran.dg/goacc/update-if_present-1.f90 | 27 +++
.../gfortran.dg/goacc/update-if_present-2.f90 | 52 ++++++
gcc/tree-core.h | 8 +-
gcc/tree-nested.c | 4 +
gcc/tree-pretty-print.c | 6 +
gcc/tree.c | 8 +-
libgomp/ChangeLog | 79 ++++++++
libgomp/libgomp.h | 7 +-
libgomp/libgomp.map | 12 ++
libgomp/oacc-mem.c | 196 ++++++++++++++++----
libgomp/oacc-parallel.c | 198 ++++++++++++++++++---
libgomp/openacc.f90 | 112 ++++++++++++
libgomp/openacc.h | 6 +
libgomp/openacc_lib.h | 40 +++++
libgomp/target.c | 41 +++--
.../libgomp.oacc-c-c++-common/data-already-1.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-2.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-3.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-4.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-5.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-6.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-7.c | 2 -
.../libgomp.oacc-c-c++-common/data-already-8.c | 2 -
.../testsuite/libgomp.oacc-c-c++-common/lib-16.c | 23 +--
.../testsuite/libgomp.oacc-c-c++-common/lib-25.c | 20 ++-
.../testsuite/libgomp.oacc-c-c++-common/lib-32.c | 4 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-83.c | 22 ++-
libgomp/testsuite/libgomp.oacc-fortran/data-5.f90 | 56 ++++++
.../libgomp.oacc-fortran/data-already-1.f | 2 -
.../libgomp.oacc-fortran/data-already-2.f | 2 -
.../libgomp.oacc-fortran/data-already-3.f | 2 -
.../libgomp.oacc-fortran/data-already-4.f | 2 -
.../libgomp.oacc-fortran/data-already-5.f | 2 -
.../libgomp.oacc-fortran/data-already-6.f | 2 -
.../libgomp.oacc-fortran/data-already-7.f | 2 -
.../libgomp.oacc-fortran/data-already-8.f | 2 -
libgomp/testsuite/libgomp.oacc-fortran/lib-32-1.f | 4 +-
libgomp/testsuite/libgomp.oacc-fortran/lib-32-2.f | 4 +-
77 files changed, 1420 insertions(+), 619 deletions(-)

Upstream: gcc.gnu.org


  • Share