diff options
author | Tobias Burnus <burnus@gcc.gnu.org> | 2020-01-10 16:08:41 +0100 |
---|---|---|
committer | Tobias Burnus <burnus@gcc.gnu.org> | 2020-01-10 16:08:41 +0100 |
commit | d5c23c6ceacf666f218676b648801379044e326a (patch) | |
tree | 27ff72e6195bc05973f17caeee04c66ed8f1db57 /libgomp/target.c | |
parent | 7cee96370cf624dbda81fcd3cd32ddb48a2fc3d3 (diff) | |
download | gcc-d5c23c6ceacf666f218676b648801379044e326a.zip gcc-d5c23c6ceacf666f218676b648801379044e326a.tar.gz gcc-d5c23c6ceacf666f218676b648801379044e326a.tar.bz2 |
OpenACC – support "if" + "if_present" clauses with "host_data"
2020-01-10 Gergö Barany <gergo@codesourcery.com>
Thomas Schwinge <thomas@codesourcery.com>
Julian Brown <julian@codesourcery.com>
Tobias Burnus <tobias@codesourcery.com>
gcc/c/
* c-parser.c (OACC_HOST_DATA_CLAUSE_MASK): Add PRAGMA_OACC_CLAUSE_IF
and PRAGMA_OACC_CLAUSE_IF_PRESENT.
gcc/cp/
* parser.c (OACC_HOST_DATA_CLAUSE_MASK): Add PRAGMA_OACC_CLAUSE_IF
and PRAGMA_OACC_CLAUSE_IF_PRESENT.
gcc/fortran/
* openmp.c (OACC_HOST_DATA_CLAUSES): Add PRAGMA_OACC_CLAUSE_IF
and PRAGMA_OACC_CLAUSE_IF_PRESENT.
gcc/
* omp-low.c (lower_omp_target): Use GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT
if PRAGMA_OACC_CLAUSE_IF_PRESENT exist.
gcc/testsuite/
* c-c++-common/goacc/host_data-1.c: Added tests of if and if_present
clauses on host_data.
* gfortran.dg/goacc/host_data-tree.f95: Likewise.
include/
* gomp-constants.h (enum gomp_map_kind): New enumeration constant
GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT.
libgomp/
* oacc-parallel.c (GOACC_data_start): Handle
GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT.
* target.c (gomp_map_vars_async): Likewise.
* testsuite/libgomp.oacc-c-c++-common/host_data-7.c: New.
* testsuite/libgomp.oacc-fortran/host_data-5.F90: New.
From-SVN: r280115
Diffstat (limited to 'libgomp/target.c')
-rw-r--r-- | libgomp/target.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libgomp/target.c b/libgomp/target.c index 617baec..522b69e 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -720,7 +720,8 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, tgt->list[i].offset = OFFSET_INLINED; continue; } - else if ((kind & typemask) == GOMP_MAP_USE_DEVICE_PTR) + else if ((kind & typemask) == GOMP_MAP_USE_DEVICE_PTR + || (kind & typemask) == GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT) { tgt->list[i].key = NULL; if (!not_found_cnt) @@ -741,6 +742,12 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, splay_tree_key n = gomp_map_lookup (mem_map, &cur_node); if (n == NULL) { + if ((kind & typemask) == GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT) + { + /* If not present, continue using the host address. */ + tgt->list[i].offset = 0; + continue; + } gomp_mutex_unlock (&devicep->lock); gomp_fatal ("use_device_ptr pointer wasn't mapped"); } @@ -974,6 +981,7 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, case GOMP_MAP_ZERO_LEN_ARRAY_SECTION: continue; case GOMP_MAP_USE_DEVICE_PTR: + case GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT: if (tgt->list[i].offset == 0) { cur_node.host_start = (uintptr_t) hostaddrs[i]; @@ -981,6 +989,10 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, n = gomp_map_lookup (mem_map, &cur_node); if (n == NULL) { + if ((kind & typemask) + == GOMP_MAP_USE_DEVICE_PTR_IF_PRESENT) + /* If not present, continue using the host address. */ + continue; gomp_mutex_unlock (&devicep->lock); gomp_fatal ("use_device_ptr pointer wasn't mapped"); } |