]> gcc.gnu.org Git - gcc.git/commit
openmp: Relax handling of implicit map vs. existing device mappings
authorChung-Lin Tang <cltang@codesourcery.com>
Fri, 12 Nov 2021 12:29:00 +0000 (20:29 +0800)
committerChung-Lin Tang <cltang@codesourcery.com>
Fri, 12 Nov 2021 12:29:48 +0000 (20:29 +0800)
commitb7e20480630e3eeb9eed8b3941da3b3f0c22c969
tree22c172a9847cc76055eca0ecbd31d75fc9979273
parenta54ce8865a885bca5ab9c4aa6ec725cd13c09901
openmp: Relax handling of implicit map vs. existing device mappings

This patch implements relaxing the requirements when a map with the implicit
attribute encounters an overlapping existing map. As the OpenMP 5.0 spec
describes on page 320, lines 18-27 (and 5.1 spec, page 352, lines 13-22):

"If a single contiguous part of the original storage of a list item with an
 implicit data-mapping attribute has corresponding storage in the device data
 environment prior to a task encountering the construct that is associated with
 the map clause, only that part of the original storage will have corresponding
 storage in the device data environment as a result of the map clause."

2021-11-12  Chung-Lin Tang  <cltang@codesourcery.com>

include/ChangeLog:

* gomp-constants.h (GOMP_MAP_FLAG_SPECIAL_3): Define special bit macro.
(GOMP_MAP_IMPLICIT): New special map kind bits value.
(GOMP_MAP_FLAG_SPECIAL_BITS): Define helper mask for whole set of
special map kind bits.
(GOMP_MAP_IMPLICIT_P): New predicate macro for implicit map kinds.

gcc/ChangeLog:

* tree.h (OMP_CLAUSE_MAP_RUNTIME_IMPLICIT_P): New access macro for
'implicit' bit, using 'base.deprecated_flag' field of tree_node.
* tree-pretty-print.c (dump_omp_clause): Add support for printing
implicit attribute in tree dumping.
* gimplify.c (gimplify_adjust_omp_clauses_1):
Set OMP_CLAUSE_MAP_RUNTIME_IMPLICIT_P to 1 if map clause is implicitly
created.
(gimplify_adjust_omp_clauses): Adjust place of adding implicitly created
clauses, from simple append, to starting of list, after non-map clauses.
* omp-low.c (lower_omp_target): Add GOMP_MAP_IMPLICIT bits into kind
values passed to libgomp for implicit maps.

gcc/testsuite/ChangeLog:

* c-c++-common/gomp/target-implicit-map-1.c: New test.
* c-c++-common/goacc/combined-reduction.c: Adjust scan test pattern.
* c-c++-common/goacc/firstprivate-mappings-1.c: Likewise.
* c-c++-common/goacc/mdc-1.c: Likewise.
* g++.dg/goacc/firstprivate-mappings-1.C: Likewise.

libgomp/ChangeLog:

* target.c (gomp_map_vars_existing): Add 'bool implicit' parameter, add
implicit map handling to allow a "superset" existing map as valid case.
(get_kind): Adjust to filter out GOMP_MAP_IMPLICIT bits in return value.
(get_implicit): New function to extract implicit status.
(gomp_map_fields_existing): Adjust arguments in calls to
gomp_map_vars_existing, and add uses of get_implicit.
(gomp_map_vars_internal): Likewise.
* testsuite/libgomp.c-c++-common/target-implicit-map-1.c: New test.
12 files changed:
gcc/gimplify.c
gcc/omp-low.c
gcc/testsuite/c-c++-common/goacc/combined-reduction.c
gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c
gcc/testsuite/c-c++-common/goacc/mdc-1.c
gcc/testsuite/c-c++-common/gomp/target-implicit-map-1.c [new file with mode: 0644]
gcc/testsuite/g++.dg/goacc/firstprivate-mappings-1.C
gcc/tree-pretty-print.c
gcc/tree.h
include/gomp-constants.h
libgomp/target.c
libgomp/testsuite/libgomp.c-c++-common/target-implicit-map-1.c [new file with mode: 0644]
This page took 0.06422 seconds and 5 git commands to generate.