https://gcc.gnu.org/g:876d5805ad7aedef891471f2071ac0c56d2702fb
commit 876d5805ad7aedef891471f2071ac0c56d2702fb
Author: Thomas Schwinge <tho...@codesourcery.com>
Date: Wed Mar 15 13:34:02 2023 +0100
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.
Diff:
---
libgomp/ChangeLog.omp | 7 +++++++
libgomp/oacc-parallel.c | 5 ++++-
libgomp/target.c | 6 +++++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index b3e29fdd39f..4110df8790d 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,10 @@
+2023-03-24 Thomas Schwinge <tho...@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 <tob...@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 b2a2ec9b120..4194a9cd1ac 100644
--- a/libgomp/oacc-parallel.c
+++ b/libgomp/oacc-parallel.c
@@ -472,7 +472,10 @@ GOACC_parallel_keyed (int flags_m, void (*fn) (void *),
struct target_mem_desc *tgt
= 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 fba76ec51ea..635c1d006a2 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -1992,7 +1992,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);
}
}
}
