OpenACC: Pass pre-allocated 'ptrblock' to 'goacc_noncontig_array_create_ptrblock...

... 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.

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index d8a7e4760906e623f68dfb0a1eb923b7d7eee024..7afb5f43c042a8a2567e8afd53037fb1b3f95def 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -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.
 

diff --git a/libgomp/oacc-int.h b/libgomp/oacc-int.h
index d86aeb82dfac5c1bda3c339551d15d46eaf92bc5..28a6118873a50bd9e355d333666bdd3e5b651a62 100644 (file)
--- a/libgomp/oacc-int.h
+++ b/libgomp/oacc-int.h
@@ -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

diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c
index 136702d6e61e53db4310fdd2b4f6847f8b57334d..8d1c2cce836fe025a890089035992b0b625d7c95 100644 (file)
--- a/libgomp/oacc-parallel.c
+++ b/libgomp/oacc-parallel.c
@@ -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

diff --git a/libgomp/target.c b/libgomp/target.c
index de3facb6428f029d8af371b0a61529b2680ee326..b88b1ebaa139830248aef34ef93ead718355005b 100644 (file)
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -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)