Refactor Level Zero utils in tests

Author: vinser52

src/utils/utils_level_zero.cpp

@@ -344,12 +344,6 @@ int utils_ze_get_drivers(uint32_t *drivers_num_,
     ze_driver_handle_t *drivers = NULL;
     uint32_t drivers_num = 0;
 
-    ret = utils_ze_init_level_zero();
-    if (ret != 0) {
-        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
-        goto init_fail;
-    }
-
     ze_result = libze_ops.zeDriverGet(&drivers_num, NULL);
     if (ze_result != ZE_RESULT_SUCCESS) {
         fprintf(stderr, "zeDriverGet() failed!\n");
@@ -386,7 +380,6 @@ int utils_ze_get_drivers(uint32_t *drivers_num_,
         *drivers_ = NULL;
     }
 
-init_fail:
     return ret;
 }
 
@@ -397,12 +390,6 @@ 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 = utils_ze_init_level_zero();
-    if (ret != 0) {
-        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
-        goto init_fail;
-    }
-
     ze_result = libze_ops.zeDeviceGet(driver, &devices_num, NULL);
     if (ze_result != ZE_RESULT_SUCCESS) {
         fprintf(stderr, "zeDeviceGet() failed!\n");
@@ -438,7 +425,7 @@ int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
         free(devices);
         devices = NULL;
     }
-init_fail:
+
     return ret;
 }
 

src/utils/utils_level_zero.h

@@ -16,7 +16,6 @@
 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_);

test/ipcFixtures.hpp

@@ -21,6 +21,7 @@
 
 class MemoryAccessor {
   public:
+    virtual ~MemoryAccessor() = default;
     virtual void fill(void *ptr, size_t size, const void *pattern,
                       size_t pattern_size) = 0;
     virtual void copy(void *dst_ptr, void *src_ptr, size_t size) = 0;

test/providers/ipc_level_zero_prov_consumer.c

@@ -27,7 +27,13 @@ int main(int argc, char *argv[]) {
     ze_device_handle_t hDevice = NULL;
     ze_context_handle_t hContext = NULL;
 
-    int ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver);
+    int ret = utils_ze_init_level_zero();
+    if (ret != 0) {
+        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
+        return -1;
+    }
+
+    ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver);
     if (ret != 0 || hDriver == NULL) {
         fprintf(stderr, "utils_ze_find_driver_with_gpu() failed!\n");
         return -1;

test/providers/ipc_level_zero_prov_producer.c

@@ -27,7 +27,13 @@ int main(int argc, char *argv[]) {
     ze_device_handle_t hDevice = NULL;
     ze_context_handle_t hContext = NULL;
 
-    int ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver);
+    int ret = utils_ze_init_level_zero();
+    if (ret != 0) {
+        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
+        return -1;
+    }
+
+    ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver);
     if (ret != 0 || hDriver == NULL) {
         fprintf(stderr, "utils_ze_find_driver_with_gpu() failed!\n");
         return -1;

test/providers/provider_level_zero.cpp

@@ -42,7 +42,13 @@ class LevelZeroTestHelper {
 LevelZeroTestHelper::LevelZeroTestHelper() {
     uint32_t driver_idx = 0;
 
-    int ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver_);
+    int ret = utils_ze_init_level_zero();
+    if (ret != 0) {
+        fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
+        return;
+    }
+
+    ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver_);
     if (ret != 0 || hDriver_ == NULL) {
         fprintf(stderr, "utils_ze_find_driver_with_gpu() failed!\n");
         return;