Move level_zero_helpers to utils and use it in benchmarks

1) Move level_zero_helpers to utils
   and rename it to utils_level_zero.
2) Use new utils_level_zero in benchmarks.

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

benchmark/CMakeLists.txt

@@ -45,8 +45,7 @@ function(add_umf_benchmark)
         ${BENCH_NAME}
         PRIVATE ${UMF_CMAKE_SOURCE_DIR}/include
                 ${UMF_CMAKE_SOURCE_DIR}/src/utils
-                ${UMF_CMAKE_SOURCE_DIR}/test/common
-                ${UMF_CMAKE_SOURCE_DIR}/examples/common)
+                ${UMF_CMAKE_SOURCE_DIR}/test/common ${LEVEL_ZERO_INCLUDE_DIRS})
 
     target_link_directories(${BENCH_NAME} PRIVATE ${ARG_LIBDIRS})
 
@@ -108,6 +107,7 @@ if(LINUX)
     set(LIBS_OPTIONAL ${LIBS_OPTIONAL} m)
 endif()
 if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
+    set(SRCS_OPTIONAL ${SRCS_OPTIONAL} ../src/utils/utils_level_zero.cpp)
     set(LIBS_OPTIONAL ${LIBS_OPTIONAL} ze_loader)
     # TODO add CUDA
 endif()
@@ -116,7 +116,7 @@ endif()
 
 add_umf_benchmark(
     NAME ubench
-    SRCS ubench.c
+    SRCS ubench.c ${SRCS_OPTIONAL}
     LIBS ${LIBS_OPTIONAL}
     LIBDIRS ${LIB_DIRS})
 

benchmark/ubench.c

@@ -32,7 +32,7 @@
 
 #if (defined UMF_BUILD_LIBUMF_POOL_DISJOINT &&                                 \
      defined UMF_BUILD_LEVEL_ZERO_PROVIDER && defined UMF_BUILD_GPU_TESTS)
-#include "examples_level_zero.h"
+#include "utils_level_zero.h"
 #endif
 
 // NOTE: with strict compilation flags, ubench compilation throws some
@@ -450,7 +450,7 @@ int create_level_zero_params(ze_context_handle_t *context,
     uint32_t driver_idx = 0;
     ze_driver_handle_t driver = NULL;
 
-    int ret = init_level_zero();
+    int ret = utils_ze_init_level_zero();
     if (ret != 0) {
         fprintf(stderr, "Failed to init Level 0!\n");
         return ret;

test/providers/level_zero_helpers.cpp renamed to src/utils/utils_level_zero.cpp

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#include "level_zero_helpers.h"
+#include "utils_level_zero.h"
 
 #include <memory>
 #include <stdlib.h>
@@ -297,7 +297,7 @@ int InitLevelZeroOps() {
 }
 #endif // USE_DLOPEN
 
-static int init_level_zero_lib(void) {
+static int utils_ze_init_level_zero_lib(void) {
     ze_init_flag_t flags = ZE_INIT_FLAG_GPU_ONLY;
     ze_result_t result = libze_ops.zeInit(flags);
     if (result != ZE_RESULT_SUCCESS) {
@@ -309,16 +309,16 @@ static int init_level_zero_lib(void) {
 static UTIL_ONCE_FLAG level_zero_init_flag = UTIL_ONCE_FLAG_INIT;
 static int InitResult;
 
-static void init_level_zero_once(void) {
+static void utils_ze_init_level_zero_once(void) {
     InitResult = InitLevelZeroOps();
     if (InitResult != 0) {
         return;
     }
-    InitResult = init_level_zero_lib();
+    InitResult = utils_ze_init_level_zero_lib();
 }
 
-static int init_level_zero(void) {
-    utils_init_once(&level_zero_init_flag, init_level_zero_once);
+int utils_ze_init_level_zero(void) {
+    utils_init_once(&level_zero_init_flag, utils_ze_init_level_zero_once);
 
     return InitResult;
 }
@@ -330,9 +330,9 @@ int utils_ze_get_drivers(uint32_t *drivers_num_,
     ze_driver_handle_t *drivers = NULL;
     uint32_t drivers_num = 0;
 
-    ret = init_level_zero();
+    ret = utils_ze_init_level_zero();
     if (ret != 0) {
-        fprintf(stderr, "init_level_zero() failed!\n");
+        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
         goto init_fail;
     }
 
@@ -383,9 +383,9 @@ int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
     uint32_t devices_num = 0;
     ze_device_handle_t *devices = NULL;
 
-    ret = init_level_zero();
+    ret = utils_ze_init_level_zero();
     if (ret != 0) {
-        fprintf(stderr, "init_level_zero() failed!\n");
+        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
         goto init_fail;
     }
 

test/providers/level_zero_helpers.h renamed to src/utils/utils_level_zero.h

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#ifndef UMF_TEST_LEVEL_ZERO_HELPERS_H
-#define UMF_TEST_LEVEL_ZERO_HELPERS_H
+#ifndef UMF_UTILS_LEVEL_ZERO_H
+#define UMF_UTILS_LEVEL_ZERO_H
 
 #include <umf/providers/provider_level_zero.h>
 
@@ -16,6 +16,9 @@
 extern "C" {
 #endif
 
+int utils_ze_init_level_zero(void);
+int utils_ze_init_level_zero(void);
+
 int utils_ze_get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_);
 
 int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
@@ -46,4 +49,4 @@ ze_memory_type_t utils_ze_get_mem_type(ze_context_handle_t context, void *ptr);
 }
 #endif
 
-#endif // UMF_TEST_LEVEL_ZERO_HELPERS_H
+#endif // UMF_UTILS_LEVEL_ZERO_H

test/CMakeLists.txt

@@ -358,15 +358,15 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
     # dlopen)
     add_umf_test(
         NAME provider_level_zero
-        SRCS providers/provider_level_zero.cpp providers/level_zero_helpers.cpp
+        SRCS providers/provider_level_zero.cpp ../src/utils/utils_level_zero.cpp
              ${BA_SOURCES_FOR_TEST}
         LIBS ${UMF_UTILS_FOR_TEST} ze_loader)
     target_include_directories(umf_test-provider_level_zero
                                PRIVATE ${LEVEL_ZERO_INCLUDE_DIRS})
 
     add_umf_test(
         NAME provider_level_zero_dlopen
-        SRCS providers/provider_level_zero.cpp providers/level_zero_helpers.cpp
+        SRCS providers/provider_level_zero.cpp ../src/utils/utils_level_zero.cpp
              ${BA_SOURCES_FOR_TEST}
         LIBS ${UMF_UTILS_FOR_TEST})
     target_compile_definitions(umf_test-provider_level_zero_dlopen
@@ -580,7 +580,7 @@ if(LINUX)
             providers/ipc_level_zero_prov_consumer.c
             common/ipc_common.c
             providers/ipc_level_zero_prov_common.c
-            providers/level_zero_helpers.cpp
+            ../src/utils/utils_level_zero.cpp
             LIBS
             ze_loader
             disjoint_pool
@@ -592,7 +592,7 @@ if(LINUX)
             providers/ipc_level_zero_prov_producer.c
             common/ipc_common.c
             providers/ipc_level_zero_prov_common.c
-            providers/level_zero_helpers.cpp
+            ../src/utils/utils_level_zero.cpp
             LIBS
             ze_loader
             disjoint_pool

test/providers/ipc_level_zero_prov_common.c

@@ -6,7 +6,7 @@
  */
 
 #include "ipc_level_zero_prov_common.h"
-#include "level_zero_helpers.h"
+#include "utils_level_zero.h"
 
 #include <umf/providers/provider_level_zero.h>
 

test/providers/ipc_level_zero_prov_consumer.c

@@ -13,7 +13,7 @@
 
 #include "ipc_common.h"
 #include "ipc_level_zero_prov_common.h"
-#include "level_zero_helpers.h"
+#include "utils_level_zero.h"
 
 int main(int argc, char *argv[]) {
     if (argc < 2) {

test/providers/ipc_level_zero_prov_producer.c

@@ -13,7 +13,7 @@
 
 #include "ipc_common.h"
 #include "ipc_level_zero_prov_common.h"
-#include "level_zero_helpers.h"
+#include "utils_level_zero.h"
 
 int main(int argc, char *argv[]) {
     if (argc < 2) {

test/providers/provider_level_zero.cpp

@@ -12,8 +12,8 @@
 #include <umf/providers/provider_level_zero.h>
 
 #include "ipcFixtures.hpp"
-#include "level_zero_helpers.h"
 #include "pool.hpp"
+#include "utils_level_zero.h"
 #include "utils_load_library.h"
 
 using umf_test::test;