fixes

Author: bratpiorka

benchmark/ubench.c

@@ -854,7 +854,7 @@ UBENCH_EX(mem_props, disjoint_pool_with_level_zero_provider_use_umf) {
     umfLevelZeroMemoryProviderParamsDestroy(level_zero_params);
 
 err_destroy_context:
-    //utils_ze_destroy_context(context);
+    utils_ze_destroy_context(context);
 }
 
 #endif /* (defined UMF_BUILD_LEVEL_ZERO_PROVIDER && defined UMF_BUILD_GPU_TESTS) */

include/umf/base.h

@@ -59,8 +59,8 @@ typedef enum umf_memory_property_id_t {
     UMF_MEMORY_PROPERTY_INVALID = -1, ///< Invalid property
 
     // UMF specific
-    UMF_MEMORY_PROVIDER_HANDLE = 0, ///< Handle to the memory provider
-    UMF_MEMORY_POOL_HANDLE = 1,     ///< Handle to the memory pool
+    UMF_MEMORY_PROPERTY_PROVIDER_HANDLE = 0, ///< Handle to the memory provider
+    UMF_MEMORY_PROPERTY_POOL_HANDLE = 1,     ///< Handle to the memory pool
 
     // generic pointer properties
     UMF_MEMORY_PROPERTY_POINTER_TYPE =

src/memory_props.c

@@ -47,11 +47,11 @@ umf_result_t umfGetMemoryProperty(umf_memory_properties_handle_t props_handle,
     case UMF_MEMORY_PROPERTY_INVALID:
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
 
-    case UMF_MEMORY_POOL_HANDLE:
+    case UMF_MEMORY_PROPERTY_POOL_HANDLE:
         *(umf_memory_pool_handle_t *)value = props_handle->pool;
         return UMF_RESULT_SUCCESS;
 
-    case UMF_MEMORY_PROVIDER_HANDLE:
+    case UMF_MEMORY_PROPERTY_PROVIDER_HANDLE:
         *(umf_memory_provider_handle_t *)value = provider;
         return UMF_RESULT_SUCCESS;
 
@@ -72,7 +72,8 @@ umf_result_t umfGetMemoryProperty(umf_memory_properties_handle_t props_handle,
     case UMF_MEMORY_PROPERTY_CONTEXT:
     case UMF_MEMORY_PROPERTY_DEVICE:
         return provider->ops.ext_get_allocation_properties(
-            provider->provider_priv, props_handle, memory_property_id, value);
+            provider->provider_priv, props_handle->ptr, memory_property_id,
+            value);
 
     default:
         break;

test/CMakeLists.txt

@@ -54,11 +54,13 @@ function(build_umf_test)
     if(UMF_CUDA_ENABLED)
         set(INC_DIRS ${INC_DIRS} ${CUDA_INCLUDE_DIRS})
         set(LIB_DIRS ${LIB_DIRS} ${CUDA_LIBRARY_DIRS})
+        set(CPL_DEFS ${CPL_DEFS} UMF_CUDA_ENABLED=1)
     endif()
 
     if(UMF_LEVEL_ZERO_ENABLED)
         set(INC_DIRS ${INC_DIRS} ${LEVEL_ZERO_INCLUDE_DIRS})
         set(LIB_DIRS ${LIB_DIRS} ${ZE_LOADER_LIBRARY_DIRS})
+        set(CPL_DEFS ${CPL_DEFS} UMF_LEVEL_ZERO_ENABLED=1)
     endif()
 
     if(NOT UMF_DISABLE_HWLOC)
@@ -350,6 +352,10 @@ if(LINUX AND (NOT UMF_DISABLE_HWLOC)) # OS-specific functions are implemented
         NAME provider_fixed_memory
         SRCS provider_fixed_memory.cpp
         LIBS ${UMF_UTILS_FOR_TEST} ${UMF_BA_FOR_TEST})
+    add_umf_test(
+        NAME provider_props
+        SRCS provider_props.cpp
+        LIBS ${UMF_UTILS_FOR_TEST} ${UMF_BA_FOR_TEST})
     add_umf_test(
         NAME provider_tracking
         SRCS provider_tracking.cpp

test/common/provider_null.c

@@ -133,6 +133,16 @@ static umf_result_t nullCloseIpcHandle(void *provider, void *ptr, size_t size) {
     return UMF_RESULT_SUCCESS;
 }
 
+static umf_result_t
+nullGetAllocationProperties(void *provider, const void *ptr,
+                            umf_memory_property_id_t propertyId, void *value) {
+    (void)provider;
+    (void)ptr;
+    (void)propertyId;
+    (void)value;
+    return UMF_RESULT_SUCCESS;
+}
+
 umf_memory_provider_ops_t UMF_NULL_PROVIDER_OPS = {
     .version = UMF_PROVIDER_OPS_VERSION_CURRENT,
     .initialize = nullInitialize,
@@ -152,4 +162,5 @@ umf_memory_provider_ops_t UMF_NULL_PROVIDER_OPS = {
     .ext_put_ipc_handle = nullPutIpcHandle,
     .ext_open_ipc_handle = nullOpenIpcHandle,
     .ext_close_ipc_handle = nullCloseIpcHandle,
+    .ext_get_allocation_properties = nullGetAllocationProperties,
 };

test/common/test_helpers.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2023-2024 Intel Corporation
+// Copyright (C) 2023-2025 Intel Corporation
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // This file contains helpers for tests for UMF pool API
@@ -9,8 +9,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <umf/base.h>
 #include <umf/memory_pool.h>
+#include <umf/memory_props.h>
 #include <umf/memory_provider_ops.h>
 
 #include "provider_trace.h"

test/memoryProviderAPI.cpp

@@ -332,7 +332,7 @@ TEST_F(test, memoryProviderOpsNullGetAllocationProperties) {
     ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
 
     ret = umfMemoryProviderGetAllocationProperties(
-        hProvider, nullptr, UMF_MEMORY_PROPERTY_INVALID, nullptr);
+        hProvider, nullptr, UMF_MEMORY_PROPERTY_PROVIDER_HANDLE, nullptr);
     ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
 
     umfMemoryProviderDestroy(hProvider);