diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2023-03-15 13:34:02 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-03-24 16:11:56 +0100 |
| commit | a1f6758ae08fa748b291954371859e0158d4d667 (patch) | |
| tree | cd775880e5a852cb6daf649edba1f38c4b3d494f | |
| parent | a63735b8034db65a33c359633462accd9d71d3b5 (diff) | |
| download | gcc-a1f6758ae08fa748b291954371859e0158d4d667.zip gcc-a1f6758ae08fa748b291954371859e0158d4d667.tar.gz gcc-a1f6758ae08fa748b291954371859e0158d4d667.tar.bz2 | |
Given OpenACC 'async', defer 'free' of non-contiguous array support data structures [PR76739]
Fix-up for og12 commit 15d0f61a7fecdc8fd12857c40879ea3730f6d99f
"Merge non-contiguous array support patches".
PR other/76739
libgomp/
* oacc-parallel.c (GOACC_parallel_keyed): Given OpenACC 'async',
defer 'free' of non-contiguous array support data structures.
* target.c (gomp_map_vars_internal): Likewise.
| -rw-r--r-- | libgomp/ChangeLog.omp | 7 | ||||
| -rw-r--r-- | libgomp/oacc-parallel.c | 5 | ||||
| -rw-r--r-- | libgomp/target.c | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index ace54f2..85ebab1 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,10 @@ +2023-03-24 Thomas Schwinge <thomas@codesourcery.com> + + PR other/76739 + * oacc-parallel.c (GOACC_parallel_keyed): Given OpenACC 'async', + defer 'free' of non-contiguous array support data structures. + * target.c (gomp_map_vars_internal): Likewise. + 2023-03-23 Tobias Burnus <tobias@codesourcery.com> * testsuite/libgomp.fortran/map-alloc-comp-8.f90: New test. diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c index 9cd99b4..136702d 100644 --- a/libgomp/oacc-parallel.c +++ b/libgomp/oacc-parallel.c @@ -470,7 +470,10 @@ GOACC_parallel_keyed (int flags_m, void (*fn) (void *), = goacc_map_vars (acc_dev, aq, mapnum, hostaddrs, NULL, sizes, kinds, nca_info, true, GOMP_MAP_VARS_TARGET); - free (nca_info); + if (aq == NULL) + free (nca_info); + else + acc_dev->openacc.async.queue_callback_func (aq, free, nca_info); if (profiling_p) { diff --git a/libgomp/target.c b/libgomp/target.c index 96ece0b..aaa597f 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -1938,7 +1938,11 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep, (nca, target_ptrblock); gomp_copy_host2dev (devicep, aq, target_ptrblock, ptrblock, nca->ptrblock_size, false, cbufp); - free (ptrblock); + if (aq) + /* Free once the transfer has completed. */ + devicep->openacc.async.queue_callback_func (aq, free, ptrblock); + else + free (ptrblock); } } } |