[PATCH 3/3] OpenACC 2.6 manual deep copy support (attach/detach)
Julian Brown
julian@codesourcery.com
Sat Nov 10 17:12:00 GMT 2018
This patch implements the bulk of support for OpenACC 2.6 manual deep
copy for the C, C++ and Fortran front-ends, the middle end and the
libgomp runtime. I've incorporated parts of the patches previously
posted by Cesar:
https://gcc.gnu.org/ml/gcc-patches/2018-10/msg01941.html
https://gcc.gnu.org/ml/gcc-patches/2018-10/msg01942.html
https://gcc.gnu.org/ml/gcc-patches/2018-10/msg01943.html
https://gcc.gnu.org/ml/gcc-patches/2018-10/msg01946.html
The patch also supersedes the patch posted earlier to support OpenACC 2.5
"update" directives with Fortran derived types:
https://gcc.gnu.org/ml/gcc-patches/2018-09/msg00153.html
Some brief notes:
* Struct members mapped with a tuple of map(to/from), optional pset and
an always_pointer are rewritten in gimplify_scan_omp_clauses to use
a new GOMP_MAP_ATTACH mapping type instead of the final
GOMP_MAP_ALWAYS_POINTER. Explicit "attach" clauses also use the
GOMP_MAP_ATTACH mapping, and explicit "detach" uses GOMP_MAP_DETACH.
This means that the new "attach operation" takes place when, and only
when, the GOMP_MAP_ATTACH appears explicitly in the list of clauses
(as rewritten by gimplify.c). Similarly for GOMP_MAP_DETACH.
* The runtime needs to keep track of potentially multiple "attachment
counters" for each mapped struct/derived type. The way I've
implemented this is as a simple array of shorts, where each element
maps 1-to-1 onto logical "slots" in the mapped struct. The attachment
counters are associated with the block of memory containing the
structure in the host's address space, hence the array is allocated
on-demand in the splay_tree_key_s structure. This does unfortunately
grow that structure a little in all cases.
Tested alongside the other patches in the series and bootstrapped. OK?
Julian
ChangeLog
gcc/c-family/
* c-pragma.h (pragma_omp_clause): Add PRAGMA_OACC_CLAUSE_ATTACH,
PRAGMA_OACC_CLAUSE_DETACH.
gcc/c/
* c-parser.c (c_parser_omp_clause_name): Add parsing of attach and
detach clauses.
(c_parser_omp_variable_list): Allow deref (->) in variable lists.
(c_parser_oacc_data_clause): Support attach and detach clauses.
(c_parser_oacc_all_clauses): Likewise.
(OACC_DATA_CLAUSE_MASK, OACC_ENTER_DATA_CLAUSE_MASK)
(OACC_KERNELS_CLAUSE_MASK, OACC_PARALLEL_CLAUSE_MASK): Add
PRAGMA_OACC_CLAUSE_ATTACH.
(OACC_EXIT_DATA_CLAUSE_MASK): Add PRAGMA_OACC_CLAUSE_DETACH.
* c-typeck.c (handle_omp_array_sections_1): Reject subarrays for attach
and detach. Support deref.
(c_oacc_check_attachments): New function.
(c_finish_omp_clauses): Check attach/detach arguments for being
pointers using above. Support deref.
gcc/cp/
* parser.c (cp_parser_omp_clause_name): Support attach and detach
clauses.
(cp_parser_omp_var_list_no_open): Support deref.
(cp_parser_oacc_data_clause): Support attach and detach clauses.
(cp_parser_oacc_all_clauses): Likewise.
(OACC_DATA_CLAUSE_MASK, OACC_ENTER_DATA_CLAUSE_MASK)
(OACC_KERNELS_CLAUSE_MASK, OACC_PARALLEL_CLAUSE_MASK): Add
PRAGMA_OACC_CLAUSE_ATTACH.
(OACC_EXIT_DATA_CLAUSE_MASK): Add PRAGMA_OACC_CLAUSE_DETACH.
* semantics.c (handle_omp_array_sections_1): Reject subarrays for
attach and detach.
(cp_oacc_check_attachments): New function.
(finish_omp_clauses): Use above function. Allow structure fields and
class members to appear in OpenACC data clauses. Support deref.
gcc/fortran/
* gfortran.h (gfc_omp_map_op): Add OMP_MAP_ATTACH, OMP_MAP_DETACH.
* openmp.c (gfc_match_omp_variable_list): Add allow_derived parameter.
Parse derived-type member accesses if true.
(omp_mask2): Add OMP_CLAUSE_ATTACH, OMP_CLAUSE_DETACH.
(gfc_match_omp_map_clause): Add allow_derived parameter. Pass to
gfc_match_omp_variable_list.
(gfc_match_omp_clauses): Support attach and detach. Support derived
types for appropriate OpenACC directives.
(OACC_PARALLEL_CLAUSES, OACC_KERNELS_CLAUSES, OACC_DATA_CLAUSES)
(OACC_ENTER_DATA_CLAUSES): Add OMP_CLAUSE_ATTACH.
(OACC_EXIT_DATA_CLAUSES): Add OMP_CLAUSE_DETACH.
(check_symbol_not_pointer): Don't disallow pointer objects of derived
type.
(resolve_oacc_data_clauses): Don't disallow allocatable derived types.
(resolve_omp_clauses): Perform duplicate checking only for non-derived
type component accesses (plain variables and arrays or array sections).
Support component refs.
* trans-openmp.c (gfc_omp_privatize_by_reference): Support component
refs.
(gfc_trans_omp_clauses): Support component refs, attach and detach
clauses.
gcc/
* gimplify.c (gimplify_omp_var_data): Add GOVD_MAP_HAS_ATTACHMENTS.
(insert_struct_component_mapping): Support derived-type member mappings
for arrays with descriptors which use GOMP_MAP_TO_PSET.
(gimplify_scan_omp_clauses): Rewrite GOMP_MAP_ALWAYS_POINTER to
GOMP_MAP_ATTACH for OpenACC struct/derived-type component pointers.
Handle pointer mappings that use GOMP_MAP_TO_PSET. Handle attach/detach
clauses.
(gimplify_adjust_omp_clauses_1): Skip adjustments for explicit
attach/detach clauses.
(gimplify_omp_target_update): Handle finalize for detach.
* omp-low.c (lower_omp_target): Support GOMP_MAP_ATTACH,
GOMP_MAP_DETACH, GOMP_MAP_FORCE_DETACH.
* tree-pretty-print.c (dump_omp_clause): Likewise.
gcc/include/
* gomp-constants.h (GOMP_MAP_DEEP_COPY): Define.
(gomp_map_kind): Add GOMP_MAP_ATTACH, GOMP_MAP_DETACH,
GOMP_MAP_FORCE_DETACH.
gcc/testsuite/
* c-c++-common/goacc/mdc-1.c: New test.
* c-c++-common/goacc/mdc-2.c: New test.
* gcc.dg/goacc/mdc.C: New test.
* gfortran.dg/goacc/data-clauses.f95: New test.
* gfortran.dg/goacc/derived-types.f90: New test.
* gfortran.dg/goacc/enter-exit-data.f95: New test.
libgomp/
* libgomp.h (struct target_var_desc): Add do_detach flag.
(struct splay_tree_key_s): Add attach_count field.
(struct gomp_coalesce_buf): Add forward declaration.
(gomp_map_val, gomp_attach_pointer, gomp_detach_pointer): Add
prototypes.
(gomp_unmap_vars): Add finalize parameter.
* libgomp.map (OACC_2.6): New section. Add acc_attach, acc_attach_async,
acc_detach, acc_detach_async, acc_detach_finalize,
acc_detach_finalize_async.
* oacc-async.c (goacc_async_copyout_unmap_vars): Add finalize parameter.
Pass to gomp_unmap_vars_async.
* oacc-int.h (goacc_async_copyout_unmap_vars): Add finalize parameter.
* oacc-mem.c (acc_unmap_data): Update call to gomp_unmap_vars.
(present_create_copy): Initialise attach_count.
(delete_copyout): Likewise.
(gomp_acc_insert_pointer): Likewise.
(gomp_acc_remove_pointer): Update calls to gomp_unmap_vars,
goacc_async_copyout_unmap_vars.
(acc_attach_async, acc_attach, goacc_detach_internal, acc_detach)
(acc_detach_async, acc_detach_finalize, acc_detach_finalize_async): New
functions.
* oacc-parallel.c (find_pointer): Support attach/detach. Make a little
more strict.
(GOACC_parallel_keyed): Use gomp_map_val to calculate device addresses.
Update calls to gomp_unmap_vars, goacc_async_copyout_unmap_vars.
(GOACC_data_end): Update call to gomp_unmap_vars.
(GOACC_enter_exit_data): Support attach/detach and GOMP_MAP_STRUCT.
* openacc.h (acc_attach, acc_attach_async, acc_detach)
(acc_detach_async, acc_detach_finalize, acc_detach_finalize_async): Add
prototypes.
* target.c (limits.h): Include.
(gomp_map_vars_existing): Initialise do_detach field of tgt_var_desc.
(gomp_attach_pointer, gomp_detach_pointer): New functions.
(gomp_map_val): Make global.
(gomp_map_vars_async): Support attach and detach.
(gomp_remove_var): Free attach count array if present.
(gomp_unmap_vars): Add finalize parameter. Update call to
gomp_unmap_vars_async.
(gomp_unmap_vars_async): Add finalize parameter. Add pointer detaching
support.
(GOMP_target): Update call to gomp_unmap_vars.
(GOMP_target_ext): Likewise.
(gomp_exit_data): Free attach count array if present.
(gomp_target_task_fn): Update call to gomp_unmap_vars.
* testsuite/libgomp.oacc-c-c++-common/deep-copy-1.c: New test.
* testsuite/libgomp.oacc-c-c++-common/deep-copy-2.c: New test.
* testsuite/libgomp.oacc-c-c++-common/deep-copy-3.c: New test.
* testsuite/libgomp.oacc-c-c++-common/deep-copy-4.c: New test.
* testsuite/libgomp.oacc-c-c++-common/deep-copy-5.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-1.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-2.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-3.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-4.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-5.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-6.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-7.c: New test.
* testsuite/libgomp.oacc-fortran/deep-copy-8.c: New test.
* testsuite/libgomp.oacc-fortran/derived-type-1.f90: New test.
* testsuite/libgomp.oacc-fortran/update-2.f90: New test.
---
gcc/c-family/c-pragma.h | 2 +
gcc/c/c-parser.c | 34 ++-
gcc/c/c-typeck.c | 59 ++++-
gcc/cp/parser.c | 38 ++-
gcc/cp/semantics.c | 75 +++++-
gcc/fortran/gfortran.h | 2 +
gcc/fortran/openmp.c | 145 +++++++----
gcc/fortran/trans-openmp.c | 78 ++++--
gcc/gimplify.c | 85 ++++--
gcc/omp-low.c | 3 +
gcc/testsuite/c-c++-common/goacc/mdc-1.c | 54 ++++
gcc/testsuite/c-c++-common/goacc/mdc-2.c | 62 +++++
gcc/testsuite/g++.dg/goacc/mdc.C | 68 +++++
gcc/testsuite/gfortran.dg/goacc/data-clauses.f95 | 38 +--
gcc/testsuite/gfortran.dg/goacc/derived-types.f90 | 77 ++++++
.../gfortran.dg/goacc/enter-exit-data.f95 | 24 +-
gcc/tree-pretty-print.c | 9 +
include/gomp-constants.h | 8 +
libgomp/libgomp.h | 18 +-
libgomp/libgomp.map | 10 +
libgomp/oacc-async.c | 4 +-
libgomp/oacc-int.h | 2 +-
libgomp/oacc-mem.c | 86 ++++++-
libgomp/oacc-parallel.c | 220 ++++++++++++----
libgomp/openacc.h | 6 +
libgomp/target.c | 191 +++++++++++++-
.../libgomp.oacc-c-c++-common/deep-copy-1.c | 24 ++
.../libgomp.oacc-c-c++-common/deep-copy-2.c | 29 +++
.../libgomp.oacc-c-c++-common/deep-copy-3.c | 34 +++
.../libgomp.oacc-c-c++-common/deep-copy-4.c | 87 +++++++
.../libgomp.oacc-c-c++-common/deep-copy-5.c | 81 ++++++
.../testsuite/libgomp.oacc-fortran/deep-copy-1.f90 | 35 +++
.../testsuite/libgomp.oacc-fortran/deep-copy-2.f90 | 33 +++
.../testsuite/libgomp.oacc-fortran/deep-copy-3.f90 | 34 +++
.../testsuite/libgomp.oacc-fortran/deep-copy-4.f90 | 49 ++++
.../testsuite/libgomp.oacc-fortran/deep-copy-5.f90 | 57 +++++
.../testsuite/libgomp.oacc-fortran/deep-copy-6.f90 | 61 +++++
.../testsuite/libgomp.oacc-fortran/deep-copy-7.f90 | 89 +++++++
.../testsuite/libgomp.oacc-fortran/deep-copy-8.f90 | 41 +++
.../libgomp.oacc-fortran/derived-type-1.f90 | 28 ++
.../testsuite/libgomp.oacc-fortran/update-2.f90 | 284 +++++++++++++++++++++
41 files changed, 2168 insertions(+), 196 deletions(-)
create mode 100644 gcc/testsuite/c-c++-common/goacc/mdc-1.c
create mode 100644 gcc/testsuite/c-c++-common/goacc/mdc-2.c
create mode 100644 gcc/testsuite/g++.dg/goacc/mdc.C
create mode 100644 gcc/testsuite/gfortran.dg/goacc/derived-types.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/deep-copy-1.c
create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/deep-copy-2.c
create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/deep-copy-3.c
create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/deep-copy-4.c
create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/deep-copy-5.c
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-1.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-2.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-3.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-4.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-5.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-6.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-7.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/deep-copy-8.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/derived-type-1.f90
create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/update-2.f90
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-OpenACC-2.6-manual-deep-copy-support-attach-detach.patch
Type: text/x-patch
Size: 117704 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20181110/9719f14e/attachment.bin>
More information about the Gcc-patches
mailing list