dbk: fix circular dependency

Author: RABijl

lib/CL/devices/CMakeLists.txt

@@ -223,8 +223,11 @@ if(HAVE_ONNXRT)
   target_link_libraries("pocl-devices" PRIVATE onnxruntime::onnxruntime)
 endif ()
 if(HAVE_OPENCV)
-  add_dependencies("pocl-devices" pocl_dbk_khr_dnn_utils)
-  target_link_libraries("pocl-devices" PRIVATE $<TARGET_OBJECTS:pocl_dbk_khr_dnn_utils> opencv_dnn)
+#  add_dependencies("pocl-devices" pocl_dbk_khr_dnn_utils)
+#  target_link_libraries("pocl-devices" PRIVATE
+#          $<TARGET_OBJECTS:pocl_dbk_khr_dnn_utils>
+#          opencv_dnn)
+  target_link_libraries("pocl-devices" PRIVATE opencv_dnn)
 endif ()
 
 set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}"

lib/CL/devices/common_utils.c

@@ -891,27 +891,6 @@ pocl_cpu_build_defined_builtin (cl_program program, cl_uint device_i)
     "The CPU driver has not been compiled with support for DBKs\n");
 }
 
-/**
- * Get the device memory pointer of the supplied pocl argument.
- *
- * \param global_mem_id [in] This is needed to get the device specific pointer.
- * \return NULL if arg->value is NULL and otherwise the requested pointer.
- */
-void *
-pocl_cpu_get_ptr (struct pocl_argument *arg, unsigned global_mem_id)
-{
-  if (arg->value == NULL)
-    return NULL;
-
-  if (arg->is_raw_ptr)
-    return *(void **)arg->value;
-
-  cl_mem mem = *(cl_mem *)(arg->value);
-  char *ptr = (char *)(mem->device_ptrs[global_mem_id].mem_ptr);
-  ptr += arg->offset;
-  return (void *)ptr;
-}
-
 #ifdef HAVE_LIBXSMM
 
 static cl_bool

lib/CL/devices/common_utils.h

@@ -128,8 +128,6 @@ POCL_EXPORT
 void pocl_free_kernel_arg_array_with_locals (void **arguments, void **arguments2,
                                         kernel_run_command *k);
 
-void *pocl_cpu_get_ptr (struct pocl_argument *arg, unsigned global_mem_id);
-
 POCL_EXPORT
 void pocl_cpu_save_rm_and_ftz (unsigned *rm, unsigned *ftz);
 

lib/CL/devices/cpu_dbk/CMakeLists.txt

@@ -16,12 +16,11 @@ list(APPEND POCL_DEVICES_SOURCES
 )
 
 if(HAVE_OPENCV)
-    add_library(pocl_dbk_khr_dnn_utils OBJECT
-            pocl_dbk_khr_dnn_utils.cpp
-            pocl_dbk_khr_dnn_utils.hh)
-    target_link_libraries(pocl_dbk_khr_dnn_utils PRIVATE opencv_dnn)
+    list(APPEND POCL_DEVICES_SOURCES
+            ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_dnn_utils.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_dnn_utils.hh)
 
-    list(APPEND POCL_DEVICES_LINK_LIST pocl_dbk_khr_dnn_utils)
+    list(APPEND POCL_DEVICES_LINK_LIST opencv_dnn)
 
 endif ()
 

lib/CL/devices/cpu_dbk/pocl_dbk_khr_dnn_utils.cpp

@@ -22,7 +22,7 @@
 */
 
 #include "pocl_dbk_khr_dnn_utils.hh"
-#include "common_utils.h"
+#include "pocl_mem_management.h"
 #include <opencv2/dnn.hpp>
 #include <string>
 

lib/CL/devices/cpu_dbk/pocl_dbk_khr_img_cpu.c

@@ -22,7 +22,7 @@
 */
 
 #include "pocl_dbk_khr_img_cpu.h"
-#include "common_utils.h"
+#include "pocl_mem_management.h"
 
 int
 pocl_cpu_execute_dbk_exp_img_yuv2rgb (cl_program program,

lib/CL/devices/cpu_dbk/pocl_dbk_khr_jpeg_cpu.c

@@ -23,7 +23,7 @@
 */
 
 #include "pocl_dbk_khr_jpeg_cpu.h"
-#include "common_utils.h"
+#include "pocl_mem_management.h"
 
 #ifdef HAVE_LIBJPEG_TURBO
 

lib/CL/pocl_mem_management.c

@@ -1090,3 +1090,24 @@ pocl_find_raw_ptr_with_dev_ptr (cl_context context, const void *dev_ptr)
   POCL_UNLOCK_OBJ (context);
   return item;
 }
+
+/**
+ * Get the device memory pointer of the supplied pocl argument.
+ *
+ * \param global_mem_id [in] This is needed to get the device specific pointer.
+ * \return NULL if arg->value is NULL and otherwise the requested pointer.
+ */
+void *
+pocl_cpu_get_ptr (struct pocl_argument *arg, unsigned global_mem_id)
+{
+  if (arg->value == NULL)
+    return NULL;
+
+  if (arg->is_raw_ptr)
+    return *(void **)arg->value;
+
+  cl_mem mem = *(cl_mem *)(arg->value);
+  char *ptr = (char *)(mem->device_ptrs[global_mem_id].mem_ptr);
+  ptr += arg->offset;
+  return (void *)ptr;
+}

lib/CL/pocl_mem_management.h

@@ -25,6 +25,11 @@
 #include "pocl_cl.h"
 #include "utlist.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifdef __GNUC__
 #pragma GCC visibility push(hidden)
 #endif
@@ -111,6 +116,13 @@ pocl_convert_to_subbuffer_migrations (pocl_buffer_migration_info *buffer_usage,
 
 #endif
 
+POCL_EXPORT
+void *pocl_cpu_get_ptr (struct pocl_argument *arg, unsigned global_mem_id);
+
 #ifdef __GNUC__
 #pragma GCC visibility pop
 #endif
+
+#ifdef __cplusplus
+}
+#endif