diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-10-09 07:33:02 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2019-10-09 07:33:02 +0000 |
| commit | d4db4dad6043cc1f320b42ff0105d6c48f237721 (patch) | |
| tree | e73989f3545bbec409f2070b12dbe538b8b1f407 /libgomp | |
| parent | 74aea31ad0a226d89db82a3e82872abf93cbc27f (diff) | |
PR libgomp/92028
* target.c (gomp_map_vars_internal): Readd the previous
GOMP_MAP_USE_DEVICE_PTR handling code in the first loop,
though do that just in the !not_found_cnt case.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@276753 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rw-r--r-- | libgomp/target.c | 24 |
2 files changed, 31 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 67d5737e5e8..dcd57cfd570 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2019-10-09 Jakub Jelinek <jakub@redhat.com> + + PR libgomp/92028 + * target.c (gomp_map_vars_internal): Readd the previous + GOMP_MAP_USE_DEVICE_PTR handling code in the first loop, + though do that just in the !not_found_cnt case. + 2019-10-08 Tobias Burnus <tobias@codesourcery.com> * gfortran.dg/gomp/target-simd.f90: New. diff --git a/libgomp/target.c b/libgomp/target.c index a83cb48108a..84d6daa76ca 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -593,6 +593,30 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, tgt->list[i].key = NULL; if (!not_found_cnt) { + /* In OpenMP < 5.0 and OpenACC the mapping has to be done + on a separate construct prior to using use_device_{addr,ptr}. + In OpenMP 5.0, map directives need to be ordered by the + middle-end before the use_device_* clauses. If + !not_found_cnt, all mappings requested (if any) are already + mapped, so use_device_{addr,ptr} can be resolved right away. + Otherwise, if not_found_cnt, gomp_map_lookup might fail + now but would succeed after performing the mappings in the + following loop. We can't defer this always to the second + loop, because it is not even invoked when !not_found_cnt + after the first loop. */ + cur_node.host_start = (uintptr_t) hostaddrs[i]; + cur_node.host_end = cur_node.host_start; + splay_tree_key n = gomp_map_lookup (mem_map, &cur_node); + if (n == NULL) + { + gomp_mutex_unlock (&devicep->lock); + gomp_fatal ("use_device_ptr pointer wasn't mapped"); + } + cur_node.host_start -= n->host_start; + hostaddrs[i] + = (void *) (n->tgt->tgt_start + n->tgt_offset + + cur_node.host_start); + tgt->list[i].offset = ~(uintptr_t) 0; } else tgt->list[i].offset = 0; |