From 49d1a2f91325fa8cc011149e27e5093a988b3a49 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 23 May 2022 10:54:32 +0200 Subject: OpenMP: Handle descriptors in target's firstprivate [PR104949] For allocatable/pointer arrays, a firstprivate to a device not only needs to privatize the descriptor but also the actual data. This is implemented as: firstprivate(x) firstprivate(x.data) attach(x [bias: &x.data-&x) where the address of x in device memory is saved in hostaddrs[i] by libgomp and the middle end actually passes hostaddrs[i]' to attach. As side effect, has_device_addr(array_desc) had to be changed: before, it was converted to firstprivate in the front end; now it is handled in omp-low.cc as has_device_addr requires a shallow firstprivate (not touching the data pointer) while the normal firstprivate requires (now) a deep firstprivate. gcc/fortran/ChangeLog: PR fortran/104949 * f95-lang.cc (LANG_HOOKS_OMP_ARRAY_SIZE): Redefine. * trans-openmp.cc (gfc_omp_array_size): New. (gfc_trans_omp_variable_list): Never turn has_device_addr to firstprivate. * trans.h (gfc_omp_array_size): New. gcc/ChangeLog: PR fortran/104949 * langhooks-def.h (lhd_omp_array_size): New. (LANG_HOOKS_OMP_ARRAY_SIZE): Define. (LANG_HOOKS_DECLS): Add it. * langhooks.cc (lhd_omp_array_size): New. * langhooks.h (struct lang_hooks_for_decls): Add hook. * omp-low.cc (scan_sharing_clauses, lower_omp_target): Handle GOMP_MAP_FIRSTPRIVATE for array descriptors. libgomp/ChangeLog: PR fortran/104949 * target.c (gomp_map_vars_internal, copy_firstprivate_data): Support attach for GOMP_MAP_FIRSTPRIVATE. * testsuite/libgomp.fortran/target-firstprivate-1.f90: New test. * testsuite/libgomp.fortran/target-firstprivate-2.f90: New test. * testsuite/libgomp.fortran/target-firstprivate-3.f90: New test. --- libgomp/target.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'libgomp/target.c') diff --git a/libgomp/target.c b/libgomp/target.c index ab2191b..4740f8a 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -1352,7 +1352,24 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, gomp_copy_host2dev (devicep, aq, (void *) (tgt->tgt_start + tgt_size), (void *) hostaddrs[i], len, false, cbufp); + /* Save device address in hostaddr to permit latter availablity + when doing a deep-firstprivate with pointer attach. */ + hostaddrs[i] = (void *) (tgt->tgt_start + tgt_size); tgt_size += len; + + /* If followed by GOMP_MAP_ATTACH, pointer assign this + firstprivate to hostaddrs[i+1], which is assumed to contain a + device address. */ + if (i + 1 < mapnum + && (GOMP_MAP_ATTACH + == (typemask & get_kind (short_mapkind, kinds, i+1)))) + { + uintptr_t target = (uintptr_t) hostaddrs[i]; + void *devptr = *(void**) hostaddrs[i+1] + sizes[i+1]; + gomp_copy_host2dev (devicep, aq, devptr, &target, + sizeof (void *), false, cbufp); + ++i; + } continue; case GOMP_MAP_FIRSTPRIVATE_INT: case GOMP_MAP_ZERO_LEN_ARRAY_SECTION: @@ -2519,6 +2536,11 @@ copy_firstprivate_data (char *tgt, size_t mapnum, void **hostaddrs, memcpy (tgt + tgt_size, hostaddrs[i], sizes[i]); hostaddrs[i] = tgt + tgt_size; tgt_size = tgt_size + sizes[i]; + if (i + 1 < mapnum && (kinds[i+1] & 0xff) == GOMP_MAP_ATTACH) + { + *(*(uintptr_t**) hostaddrs[i+1] + sizes[i+1]) = (uintptr_t) hostaddrs[i]; + ++i; + } } } -- cgit v1.1