applied Lukasz S. comments

Author: lslusarczyk

src/provider/provider_level_zero.c

@@ -1001,12 +1001,7 @@ static int ze_memory_provider_resident_device_change_helper(uintptr_t key,
         return 0;
     }
 
-    // TODO: add assertions to UMF and change it to be an assertion
-    if (info->props.base != (void *)key) {
-        LOG_FATAL("key:%p is different than base:%p", (void *)key,
-                  info->props.base);
-        abort();
-    }
+    assert(info->props.base == (void *)key);
 
     ze_result_t result;
     if (change_data->is_adding) {
@@ -1258,9 +1253,10 @@ const umf_memory_provider_ops_t *umfLevelZeroMemoryProviderOps(void) {
 umf_result_t umfLevelZeroMemoryProviderResidentDeviceChange(
     umf_memory_provider_handle_t provider, ze_device_handle_t device,
     bool is_adding) {
-    (void)provider(void) device,
-        (void)is_adding LOG_ERR(
-            "L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
+    (void)provider;
+    (void)device;
+    (void)is_adding;
+    LOG_ERR("L0 memory provider is disabled! (UMF_BUILD_LEVEL_ZERO_PROVIDER is "
             "OFF)");
     return UMF_RESULT_ERROR_NOT_SUPPORTED;
 }

test/common/level_zero_mocks.cpp

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2023-2025 Intel Corporation
+ * Copyright (C) 2025 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

test/common/level_zero_mocks.h

@@ -1,14 +1,14 @@
 /*
  *
- * Copyright (C) 2023-2025 Intel Corporation
+ * Copyright (C) 2025 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  */
 
-#ifndef UMF_PROVIDER_LEVEL_ZERO_MOCKS_H
-#define UMF_PROVIDER_LEVEL_ZERO_MOCKS_H
+#ifndef UMF_TEST_PROVIDER_LEVEL_ZERO_MOCKS_H
+#define UMF_TEST_PROVIDER_LEVEL_ZERO_MOCKS_H
 
 #include "utils/utils_log.h"
 #include "ze_loopback.h"
@@ -66,7 +66,8 @@ class LevelZeroMock : public LevelZero {
     MOCK_METHOD2(zeMemFree,
                  ze_result_t(ze_context_handle_t hContext, void *ptr));
 
-    // helper setting all expects related to successful l0 provider creation & initialization and calling its creation & initialization
+    // helper setting all expects related to successful l0 provider creation
+    // and initialization and calling its creation and initialization
     umf_memory_provider_handle_t initializeMemoryProviderWithResidentDevices(
         ze_device_handle_t device,
         std::vector<ze_device_handle_t> residentDevices,
@@ -83,4 +84,4 @@ class MockedLevelZeroTestEnvironment : public ::testing::Environment {
     void TearDown() override;
 };
 
-#endif //UMF_PROVIDER_LEVEL_ZERO_MOCKS_H
+#endif //UMF_TEST_PROVIDER_LEVEL_ZERO_MOCKS_H

test/common/ze_loopback.cpp

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2023-2025 Intel Corporation
+ * Copyright (C) 2025 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -288,7 +288,3 @@ zeMemFreeExt(ze_context_handle_t hContext,
     LOG_FATAL("not implemented, call in ze_loader_mock not passed to gmock");
     abort();
 }
-
-// defined in both libze_ops from src/utils/utils_level_zero.cpp and
-// ze_ops_t operations from src/provider/provider_level_zero.c
-// zeDeviceGetProperties, zeMemFree, zeMemGetAllocProperties, zeMemFree, zeMemAllocDevice, find them in the former ones

test/common/ze_loopback.h

@@ -1,9 +1,9 @@
-// Copyright (C) 2024-2025 Intel Corporation
+// Copyright (C) 2025 Intel Corporation
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef UMF_ZE_LOOPBACK_H
-#define UMF_ZE_LOOPBACK_H
+#ifndef UMF_TEST_ZE_LOOPBACK_H
+#define UMF_TEST_ZE_LOOPBACK_H
 
 #include <level_zero/ze_api.h>
 
@@ -32,4 +32,4 @@ class LevelZero {
 
 extern LevelZero *level_zero_mock;
 
-#endif //UMF_ZE_LOOPBACK_H
+#endif //UMF_TEST_ZE_LOOPBACK_H

test/pools/pool_residency.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2024-2025 Intel Corporation
+// Copyright (C) 2025 Intel Corporation
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
@@ -151,4 +151,4 @@ int main(int argc, char **argv) {
     InitGoogleTest(&argc, argv);
     AddGlobalTestEnvironment(new MockedLevelZeroTestEnvironment);
     return RUN_ALL_TESTS();
-}
+}

test/providers/provider_level_zero_residency.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2024-2025 Intel Corporation
+// Copyright (C) 2025 Intel Corporation
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception