diff mbox series

[og12] OpenACC: Pass pre-allocated 'ptrblock' to 'goacc_noncontig_array_create_ptrblock' [PR76739] (was: [PATCH, OpenACC, v3] Non-contiguous array support for OpenACC data clauses)

Message ID 87cz4lxc5z.fsf@euler.schwinge.homeip.net
State New
Headers show
Series [og12] OpenACC: Pass pre-allocated 'ptrblock' to 'goacc_noncontig_array_create_ptrblock' [PR76739] (was: [PATCH, OpenACC, v3] Non-contiguous array support for OpenACC data clauses) | expand

Commit Message

Thomas Schwinge April 3, 2023, 2:39 p.m. UTC 
Hi!

On 2019-11-26T22:49:21+0800, Chung-Lin Tang <chunglin_tang@mentor.com> wrote:
> this is a reorg of the last non-contiguous arrays patch.

(Sorry, this is still not the master branch integration email...)


Just a small clean-up, to simplify other changes that I'm working on:

On 2019-11-26T22:49:21+0800, Chung-Lin Tang <chunglin_tang@mentor.com> wrote:
> --- libgomp/oacc-parallel.c   (revision 278656)
> +++ libgomp/oacc-parallel.c   (working copy)

> +void *
> +goacc_noncontig_array_create_ptrblock (struct goacc_ncarray *nca,
> +                                    void *tgt_ptrblock_addr)
> +{
> +  [...]
> +  void *ptrblock = gomp_malloc (nca->ptrblock_size);

> --- libgomp/target.c  (revision 278656)
> +++ libgomp/target.c  (working copy)

> @@ -1044,6 +1114,98 @@ gomp_map_vars_internal (struct gomp_device_descr *

> +           /* Now we have the target memory allocated, and target offsets of all
> +              row blocks assigned and calculated, we can construct the
> +              accelerator side ptrblock and copy it in.  */
> +           if (nca->ptrblock_size)
> +             {
> +               void *ptrblock = goacc_noncontig_array_create_ptrblock
> +                 (nca, target_ptrblock);
> +               gomp_copy_host2dev (devicep, aq, target_ptrblock, ptrblock,
> +                                   nca->ptrblock_size, cbufp);
> +               free (ptrblock);
> +             }

Pushed to devel/omp/gcc-12 branch
commit c58b28cb650995a41e1ab0166169799f3991bdd6
"OpenACC: Pass pre-allocated 'ptrblock' to 'goacc_noncontig_array_create_ptrblock' [PR76739]",
see attached.


Grüße
 Thomas


-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
diff mbox series

Patch

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(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index d8a7e476090..7afb5f43c04 100644
--- 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 d86aeb82dfa..28a6118873a 100644
--- 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 136702d6e61..8d1c2cce836 100644
--- 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 de3facb6428..b88b1ebaa13 100644
--- 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)
-- 
2.25.1