simplify cmake and UMF_ZE_LOADER_LIB_NAME use

Author: lslusarczyk

src/provider/provider_level_zero.c

@@ -513,6 +513,9 @@ static umf_result_t ze_memory_provider_alloc_helper(void *provider, size_t size,
     }
 
     if (ze_result != ZE_RESULT_SUCCESS) {
+        LOG_ERR("failed to allocate memory, type:%d, size:%lu, alignment:%lu, "
+                "result:%d",
+                ze_provider->memory_type, size, alignment, ze_result);
         return ze2umf_result(ze_result);
     }
 

test/CMakeLists.txt

@@ -151,9 +151,7 @@ function(add_umf_test)
         set(DLL_PATH_LIST
             "${DLL_PATH_LIST};"
             "PATH=path_list_append:${CMAKE_BINARY_DIR}/bin/;"
-            "PATH=path_list_append:${CMAKE_BINARY_DIR}/bin/$<CONFIG>/;"
-            "PATH=path_list_append:${CMAKE_BINARY_DIR}/test/common/;"
-            "PATH=path_list_append:${CMAKE_BINARY_DIR}/test/common/$<CONFIG>/")
+            "PATH=path_list_append:${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
 
         # append PATH to DLLs NOTE: this would work only for the CMake ver >= #
         # 3.22. For the older versions, the PATH variable should be set in the
@@ -163,6 +161,22 @@ function(add_umf_test)
     endif()
 endfunction()
 
+function(add_umf_mocked_test test_name test_source_file)
+    add_umf_test(
+        NAME ${test_name}
+        SRCS ${test_source_file} ${UMF_UTILS_DIR}/utils_level_zero.cpp
+        LIBS ${UMF_UTILS_FOR_TEST} ${UMF_BA_FOR_TEST} umf_test_mocks
+             GTest::gmock)
+
+    set_tests_properties(
+        test_${test_name} PROPERTIES
+        ENVIRONMENT
+        "UMF_LOG=level:debug\\\\\\\\;flush:debug\\\\\\\\;output:stdout;UMF_ZE_LOADER_LIB_NAME=$<TARGET_FILE:umf_ze_loopback>"
+    )
+    target_compile_definitions(test_${test_name} PUBLIC USE_DLOPEN=1)
+    add_dependencies(test_${test_name} umf_ze_loopback)
+endfunction()
+
 add_subdirectory(common)
 
 if(UMF_BUILD_SHARED_LIBRARY)
@@ -435,21 +449,9 @@ else()
 endif()
 
 if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
-    add_umf_test(
-        NAME provider_level_zero_residency
-        SRCS providers/provider_level_zero_residency.cpp
-             ${UMF_UTILS_DIR}/utils_level_zero.cpp
-        LIBS ${UMF_UTILS_FOR_TEST} umf_ze_loopback umf_test_mocks GTest::gmock
-        ENVS "UMF_LOG=level:debug\\\\\\\\;flush:debug\\\\\\\\;output:stdout")
-    add_umf_test(
-        NAME pool_residency
-        SRCS pools/pool_residency.cpp ${UMF_UTILS_DIR}/utils_level_zero.cpp
-        LIBS ${UMF_UTILS_FOR_TEST}
-             ${UMF_BA_FOR_TEST}
-             umf_ze_loopback
-             umf_test_mocks
-             GTest::gmock
-        ENVS "UMF_LOG=level:debug\\\\\\\\;flush:debug\\\\\\\\;output:stdout")
+    add_umf_mocked_test(provider_level_zero_residency
+                        providers/provider_level_zero_residency.cpp)
+    add_umf_mocked_test(pool_residency pools/pool_residency.cpp)
 endif()
 
 if(UMF_BUILD_GPU_TESTS AND UMF_LEVEL_ZERO_ENABLED)

test/common/level_zero_mocks.cpp

@@ -96,13 +96,9 @@ TestCreateMemoryAllocationProperties(uint32_t modifier) {
 }
 
 void MockedLevelZeroTestEnvironment::SetUp() {
-#ifdef _WIN32
-    const char *lib_name = "umf_ze_loopback.dll";
-    _putenv_s("UMF_ZE_LOADER_LIB_NAME", lib_name);
-#else
-    const char *lib_name = "libumf_ze_loopback.so";
-    setenv("UMF_ZE_LOADER_LIB_NAME", lib_name, 1);
-#endif
+    const char *lib_name = getenv("UMF_ZE_LOADER_LIB_NAME");
+    ASSERT_NE(lib_name, nullptr);
+    ASSERT_NE(lib_name[0], '\0');
 
     lib_handle = utils_open_library(lib_name, 0);
     ASSERT_NE(lib_handle, nullptr);
@@ -116,6 +112,7 @@ void MockedLevelZeroTestEnvironment::SetUp() {
 
     ASSERT_EQ(*l0interface, nullptr);
 }
+
 void MockedLevelZeroTestEnvironment::TearDown() {
     utils_close_library(lib_handle);
 }