From c87ffbaa78cb8f2addb571a4272df902b40a0cbe Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Tue, 7 Dec 2021 00:23:00 +0100
Subject: [PATCH] [PATCH 88/90] rename pocl_basic_free() to pocl_driver_free()

Gbp-Pq: Name 0088-rename-pocl_basic_free-to-pocl_driver_free.patch
---
 lib/CL/devices/basic/basic.c   | 17 +----------------
 lib/CL/devices/common_driver.c | 13 +++++++++++++
 lib/CL/devices/common_driver.h |  3 +++
 lib/CL/devices/hsa/pocl-hsa.c  |  2 +-
 lib/CL/pocl_cl.h               |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/CL/devices/basic/basic.c b/lib/CL/devices/basic/basic.c
index 5a08950..539c8b8 100644
--- a/lib/CL/devices/basic/basic.c
+++ b/lib/CL/devices/basic/basic.c
@@ -78,7 +78,7 @@ pocl_basic_init_device_ops(struct pocl_device_ops *ops)
   ops->init = pocl_basic_init;
 
   ops->alloc_mem_obj = pocl_driver_alloc_mem_obj;
-  ops->free = pocl_basic_free;
+  ops->free = pocl_driver_free;
 
   ops->read = pocl_driver_read;
   ops->read_rect = pocl_driver_read_rect;
@@ -244,21 +244,6 @@ pocl_basic_init (unsigned j, cl_device_id device, const char* parameters)
   return ret;
 }
 
-
-POCL_EXPORT
-void
-pocl_basic_free (cl_device_id device, cl_mem mem)
-{
-  cl_device_id svm_dev = mem->context->svm_allocdev;
-  if (svm_dev && svm_dev->global_mem_id == 0 && svm_dev->ops->svm_unregister)
-    svm_dev->ops->svm_unregister (svm_dev, mem->mem_host_ptr, mem->size);
-
-  pocl_mem_identifier *p = &mem->device_ptrs[device->global_mem_id];
-  pocl_release_mem_host_ptr (mem);
-  p->mem_ptr = NULL;
-  p->version = 0;
-}
-
 void
 pocl_basic_run (void *data, _cl_command_node *cmd)
 {
diff --git a/lib/CL/devices/common_driver.c b/lib/CL/devices/common_driver.c
index c6f1d39..6033097 100644
--- a/lib/CL/devices/common_driver.c
+++ b/lib/CL/devices/common_driver.c
@@ -458,6 +458,19 @@ pocl_driver_alloc_mem_obj (cl_device_id device, cl_mem mem, void *host_ptr)
   return CL_SUCCESS;
 }
 
+void
+pocl_driver_free (cl_device_id device, cl_mem mem)
+{
+  cl_device_id svm_dev = mem->context->svm_allocdev;
+  if (svm_dev && svm_dev->global_mem_id == 0 && svm_dev->ops->svm_unregister)
+    svm_dev->ops->svm_unregister (svm_dev, mem->mem_host_ptr, mem->size);
+
+  pocl_mem_identifier *p = &mem->device_ptrs[device->global_mem_id];
+  pocl_release_mem_host_ptr (mem);
+  p->mem_ptr = NULL;
+  p->version = 0;
+}
+
 /* These are implementations of compilation callbacks for all devices
  * that support compilation via LLVM. They take care of compilation/linking
  * of source/binary/spir down to parallel.bc level.
diff --git a/lib/CL/devices/common_driver.h b/lib/CL/devices/common_driver.h
index 02605ec..777c02a 100644
--- a/lib/CL/devices/common_driver.h
+++ b/lib/CL/devices/common_driver.h
@@ -78,6 +78,9 @@ POCL_EXPORT
 cl_int pocl_driver_alloc_mem_obj (cl_device_id device, cl_mem mem,
                                   void *host_ptr);
 
+POCL_EXPORT
+void pocl_driver_free (cl_device_id device, cl_mem mem);
+
   POCL_EXPORT
   int pocl_driver_build_source (cl_program program, cl_uint device_i,
                                 cl_uint num_input_headers,
diff --git a/lib/CL/devices/hsa/pocl-hsa.c b/lib/CL/devices/hsa/pocl-hsa.c
index 1c27c2c..82d20ee 100644
--- a/lib/CL/devices/hsa/pocl-hsa.c
+++ b/lib/CL/devices/hsa/pocl-hsa.c
@@ -900,7 +900,7 @@ pocl_hsa_free (cl_device_id device, cl_mem memobj)
 {
   /* if we share global memory with CPU, let the CPU driver free it */
   if (device->global_mem_id == 0)
-    return pocl_basic_free (device, memobj);
+    return pocl_driver_free (device, memobj);
 
   /* ... otherwise free it via HSA. */
   cl_mem_flags flags = memobj->flags;
diff --git a/lib/CL/pocl_cl.h b/lib/CL/pocl_cl.h
index 27ef398..0fd6d05 100644
--- a/lib/CL/pocl_cl.h
+++ b/lib/CL/pocl_cl.h
@@ -509,7 +509,7 @@ struct pocl_device_ops {
   /* these are optional. If the driver needs to do anything to be able
    * to use host memory, it should do it (and undo it) in these callbacks.
    * Currently used by HSA.
-   * See pocl_basic_alloc and pocl_basic_free for details. */
+   * See pocl_driver_alloc_mem_obj and pocl_driver_free for details. */
   void (*svm_register) (cl_device_id dev, void *host_ptr, size_t size);
   void (*svm_unregister) (cl_device_id dev, void *host_ptr, size_t size);
 
-- 
2.30.2