From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B93003858C50; Fri, 24 Mar 2023 15:12:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B93003858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679670776; bh=5mge5Y6IW5fBgk8RbQgS1aRHlNN2IjNOC384FfbWAGU=; h=From:To:Subject:Date:From; b=nr3NS7fyfXwl1c2mPYu0R7VetlgdWD/N1b+pcpAv8RzHcs+K0q5T/jGr+/ORWv/Cv mhk18JGaYN8rpsVE8rmdbUXfxsMFlkg9mxjwwqHIRAIdvim3rkvGfqRlrQ0CiFooxD AXSJlbZKQ431ii46y8k1Fba6HxkhtQrrfmEOlY+c= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Given OpenACC 'async', defer 'free' of non-contiguous array support data structures [PR76739] X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: a63735b8034db65a33c359633462accd9d71d3b5 X-Git-Newrev: a1f6758ae08fa748b291954371859e0158d4d667 Message-Id: <20230324151256.B93003858C50@sourceware.org> Date: Fri, 24 Mar 2023 15:12:56 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a1f6758ae08fa748b291954371859e0158d4d667 commit a1f6758ae08fa748b291954371859e0158d4d667 Author: Thomas Schwinge 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 ace54f2f82f..85ebab14ba8 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,10 @@ +2023-03-24 Thomas Schwinge + + 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 * testsuite/libgomp.fortran/map-alloc-comp-8.f90: New test. diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c index 9cd99b4a0b4..136702d6e61 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 96ece0b31fd..aaa597f6610 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); } } }