From c58b28cb650995a41e1ab0166169799f3991bdd6 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Wed, 15 Mar 2023 14:32:12 +0100
Subject: [PATCH] OpenACC: Pass pre-allocated 'ptrblock' to
'goacc_noncontig_array_create_ptrblock' [PR76739]
... to simplify later changes. No functional change.
Follow-up for og12 commit 15d0f61a7fecdc8fd12857c40879ea3730f6d99f
"Merge non-contiguous array support patches".
PR other/76739
libgomp/
* target.c (gomp_map_vars_internal): Pass pre-allocated 'ptrblock'
to 'goacc_noncontig_array_create_ptrblock'.
* oacc-parallel.c (goacc_noncontig_array_create_ptrblock): Adjust.
* oacc-int.h (goacc_noncontig_array_create_ptrblock): Adjust.
---
libgomp/ChangeLog.omp | 6 ++++++
libgomp/oacc-int.h | 3 ++-
libgomp/oacc-parallel.c | 5 ++---
libgomp/target.c | 5 +++--
4 files changed, 13 insertions(+), 6 deletions(-)
@@ -1,5 +1,11 @@
2023-04-03 Thomas Schwinge <thomas@codesourcery.com>
+ PR other/76739
+ * target.c (gomp_map_vars_internal): Pass pre-allocated 'ptrblock'
+ to 'goacc_noncontig_array_create_ptrblock'.
+ * oacc-parallel.c (goacc_noncontig_array_create_ptrblock): Adjust.
+ * oacc-int.h (goacc_noncontig_array_create_ptrblock): Adjust.
+
* libgomp.texi (AMD Radeon, nvptx): Document OpenMP 'pinned'
memory.
@@ -213,7 +213,8 @@ struct goacc_ncarray_info
struct goacc_ncarray ncarray[];
};
-extern void *goacc_noncontig_array_create_ptrblock (struct goacc_ncarray *, void *);
+extern void goacc_noncontig_array_create_ptrblock (struct goacc_ncarray *,
+ void *, void *);
#ifdef HAVE_ATTRIBUTE_VISIBILITY
@@ -165,13 +165,13 @@ goacc_process_noncontiguous_arrays (size_t mapnum, void **hostaddrs,
return nca_info;
}
-void *
+void
goacc_noncontig_array_create_ptrblock (struct goacc_ncarray *nca,
+ void *ptrblock,
void *tgt_ptrblock_addr)
{
struct goacc_ncarray_descr_type *descr = nca->descr;
void **tgt_data_rows = nca->tgt_data_rows;
- void *ptrblock = gomp_malloc (nca->ptrblock_size);
void **curr_dim_ptrblock = (void **) ptrblock;
size_t n = 1;
@@ -210,7 +210,6 @@ goacc_noncontig_array_create_ptrblock (struct goacc_ncarray *nca,
curr_dim_ptrblock = next_dim_ptrblock;
}
assert (n == nca->data_row_num);
- return ptrblock;
}
/* Handle the mapping pair that are presented when a
@@ -1939,8 +1939,9 @@ gomp_map_vars_internal (struct gomp_device_descr *devicep,
accelerator side ptrblock and copy it in. */
if (nca->ptrblock_size)
{
- void *ptrblock = goacc_noncontig_array_create_ptrblock
- (nca, target_ptrblock);
+ void *ptrblock = gomp_malloc (nca->ptrblock_size);
+ goacc_noncontig_array_create_ptrblock
+ (nca, ptrblock, target_ptrblock);
gomp_copy_host2dev (devicep, aq, target_ptrblock, ptrblock,
nca->ptrblock_size, false, cbufp);
if (aq)
--
2.25.1