diff --git a/src/provider/provider_file_memory.c b/src/provider/provider_file_memory.c index ea69dc7b6..528ec6365 100644 --- a/src/provider/provider_file_memory.c +++ b/src/provider/provider_file_memory.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Intel Corporation + * Copyright (C) 2024-2025 Intel Corporation * * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT. * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception @@ -711,7 +711,7 @@ typedef struct file_ipc_data_t { static umf_result_t file_get_ipc_handle_size(void *provider, size_t *size) { file_memory_provider_t *file_provider = (file_memory_provider_t *)provider; if (!file_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -724,7 +724,7 @@ static umf_result_t file_get_ipc_handle(void *provider, const void *ptr, size_t size, void *providerIpcData) { file_memory_provider_t *file_provider = (file_memory_provider_t *)provider; if (!file_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -748,7 +748,7 @@ static umf_result_t file_get_ipc_handle(void *provider, const void *ptr, static umf_result_t file_put_ipc_handle(void *provider, void *providerIpcData) { file_memory_provider_t *file_provider = (file_memory_provider_t *)provider; if (!file_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -765,7 +765,7 @@ static umf_result_t file_open_ipc_handle(void *provider, void *providerIpcData, void **ptr) { file_memory_provider_t *file_provider = (file_memory_provider_t *)provider; if (!file_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -818,7 +818,7 @@ static umf_result_t file_close_ipc_handle(void *provider, void *ptr, size_t size) { file_memory_provider_t *file_provider = (file_memory_provider_t *)provider; if (!file_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } diff --git a/src/provider/provider_level_zero.c b/src/provider/provider_level_zero.c index 8c8beda31..3004a243f 100644 --- a/src/provider/provider_level_zero.c +++ b/src/provider/provider_level_zero.c @@ -201,6 +201,9 @@ static umf_result_t ze2umf_result(ze_result_t result) { } } +#define ZE_CALL(ZeName, ZeArgs) \ + (LOG_INFO("ZE ---> %s%s", #ZeName, #ZeArgs), g_ze_ops.ZeName ZeArgs) + static void init_ze_global_state(void) { #ifdef _WIN32 const char *lib_name = "ze_loader.dll"; @@ -409,8 +412,9 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size, .stype = ZE_STRUCTURE_TYPE_HOST_MEM_ALLOC_DESC, .pNext = NULL, .flags = 0}; - ze_result = g_ze_ops.zeMemAllocHost(ze_provider->context, &host_desc, - size, alignment, resultPtr); + + ze_result = ZE_CALL(zeMemAllocHost, (ze_provider->context, &host_desc, + size, alignment, resultPtr)); break; } case UMF_MEMORY_TYPE_DEVICE: { @@ -421,9 +425,9 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size, : NULL, .flags = 0, .ordinal = ze_provider->device_ordinal}; - ze_result = g_ze_ops.zeMemAllocDevice(ze_provider->context, &dev_desc, - size, alignment, - ze_provider->device, resultPtr); + ze_result = ZE_CALL(zeMemAllocDevice, + (ze_provider->context, &dev_desc, size, alignment, + ze_provider->device, resultPtr)); break; } case UMF_MEMORY_TYPE_SHARED: { @@ -438,9 +442,9 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size, : NULL, .flags = 0, .ordinal = ze_provider->device_ordinal}; - ze_result = g_ze_ops.zeMemAllocShared(ze_provider->context, &dev_desc, - &host_desc, size, alignment, - ze_provider->device, resultPtr); + ze_result = ZE_CALL(zeMemAllocShared, + (ze_provider->context, &dev_desc, &host_desc, size, + alignment, ze_provider->device, resultPtr)); break; } default: @@ -455,9 +459,10 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size, } for (uint32_t i = 0; i < ze_provider->resident_device_count; i++) { - ze_result = g_ze_ops.zeContextMakeMemoryResident( - ze_provider->context, ze_provider->resident_device_handles[i], - *resultPtr, size); + ze_result = ZE_CALL(zeContextMakeMemoryResident, + (ze_provider->context, + ze_provider->resident_device_handles[i], + *resultPtr, size)); if (ze_result != ZE_RESULT_SUCCESS) { return ze2umf_result(ze_result); } @@ -477,7 +482,7 @@ static umf_result_t ze_memory_provider_free(void *provider, void *ptr, ze_memory_provider_t *ze_provider = (ze_memory_provider_t *)provider; if (ze_provider->freePolicyFlags == 0) { - return ze2umf_result(g_ze_ops.zeMemFree(ze_provider->context, ptr)); + return ze2umf_result(ZE_CALL(zeMemFree, (ze_provider->context, ptr))); } ze_memory_free_ext_desc_t desc = { @@ -486,7 +491,7 @@ static umf_result_t ze_memory_provider_free(void *provider, void *ptr, .freePolicy = ze_provider->freePolicyFlags}; return ze2umf_result( - g_ze_ops.zeMemFreeExt(ze_provider->context, &desc, ptr)); + ZE_CALL(zeMemFreeExt, (ze_provider->context, &desc, ptr))); } static umf_result_t query_min_page_size(ze_memory_provider_t *ze_provider, @@ -503,8 +508,9 @@ static umf_result_t query_min_page_size(ze_memory_provider_t *ze_provider, ze_memory_allocation_properties_t properties = { .stype = ZE_STRUCTURE_TYPE_MEMORY_ALLOCATION_PROPERTIES}; - ze_result_t ze_result = g_ze_ops.zeMemGetAllocProperties( - ze_provider->context, ptr, &properties, NULL); + ze_result_t ze_result = + ZE_CALL(zeMemGetAllocProperties, + (ze_provider->context, ptr, &properties, NULL)); *min_page_size = properties.pageSize; @@ -574,8 +580,9 @@ static umf_result_t ze_memory_provider_initialize(void *params, ze_provider->device_properties.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES; if (ze_provider->device) { - umf_result_t ret = ze2umf_result(g_ze_ops.zeDeviceGetProperties( - ze_provider->device, &ze_provider->device_properties)); + umf_result_t ret = ze2umf_result( + ZE_CALL(zeDeviceGetProperties, + (ze_provider->device, &ze_provider->device_properties))); if (ret != UMF_RESULT_SUCCESS) { LOG_ERR("Cannot get device properties"); @@ -641,8 +648,9 @@ static umf_result_t ze_memory_provider_get_min_page_size(void *provider, ze_memory_allocation_properties_t properties = { .stype = ZE_STRUCTURE_TYPE_MEMORY_ALLOCATION_PROPERTIES}; - ze_result_t ze_result = g_ze_ops.zeMemGetAllocProperties( - ze_provider->context, ptr, &properties, NULL); + ze_result_t ze_result = + ZE_CALL(zeMemGetAllocProperties, + (ze_provider->context, ptr, &properties, NULL)); if (ze_result != ZE_RESULT_SUCCESS) { return ze2umf_result(ze_result); } @@ -734,8 +742,8 @@ static umf_result_t ze_memory_provider_get_ipc_handle(void *provider, struct ze_memory_provider_t *ze_provider = (struct ze_memory_provider_t *)provider; - ze_result = g_ze_ops.zeMemGetIpcHandle(ze_provider->context, ptr, - &ze_ipc_data->ze_handle); + ze_result = ZE_CALL(zeMemGetIpcHandle, + (ze_provider->context, ptr, &ze_ipc_data->ze_handle)); if (ze_result != ZE_RESULT_SUCCESS) { LOG_ERR("zeMemGetIpcHandle() failed."); return ze2umf_result(ze_result); @@ -760,8 +768,8 @@ static umf_result_t ze_memory_provider_put_ipc_handle(void *provider, return UMF_RESULT_SUCCESS; } - ze_result = g_ze_ops.zeMemPutIpcHandle(ze_provider->context, - ze_ipc_data->ze_handle); + ze_result = ZE_CALL(zeMemPutIpcHandle, + (ze_provider->context, ze_ipc_data->ze_handle)); if (ze_result != ZE_RESULT_SUCCESS) { LOG_ERR("zeMemPutIpcHandle() failed."); return ze2umf_result(ze_result); @@ -791,8 +799,9 @@ static umf_result_t ze_memory_provider_open_ipc_handle(void *provider, memcpy(&ze_ipc_handle, &fd_local, sizeof(fd_local)); } - ze_result = g_ze_ops.zeMemOpenIpcHandle( - ze_provider->context, ze_provider->device, ze_ipc_handle, 0, ptr); + ze_result = + ZE_CALL(zeMemOpenIpcHandle, (ze_provider->context, ze_provider->device, + ze_ipc_handle, 0, ptr)); if (fd_local != -1) { (void)utils_close_fd(fd_local); } @@ -812,7 +821,7 @@ ze_memory_provider_close_ipc_handle(void *provider, void *ptr, size_t size) { struct ze_memory_provider_t *ze_provider = (struct ze_memory_provider_t *)provider; - ze_result = g_ze_ops.zeMemCloseIpcHandle(ze_provider->context, ptr); + ze_result = ZE_CALL(zeMemCloseIpcHandle, (ze_provider->context, ptr)); if (ze_result != ZE_RESULT_SUCCESS) { LOG_ERR("zeMemCloseIpcHandle() failed."); return ze2umf_result(ze_result); diff --git a/src/provider/provider_os_memory.c b/src/provider/provider_os_memory.c index 1fe467942..6274bc672 100644 --- a/src/provider/provider_os_memory.c +++ b/src/provider/provider_os_memory.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT. * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception @@ -1266,7 +1266,7 @@ typedef struct os_ipc_data_t { static umf_result_t os_get_ipc_handle_size(void *provider, size_t *size) { os_memory_provider_t *os_provider = (os_memory_provider_t *)provider; if (!os_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -1280,7 +1280,7 @@ static umf_result_t os_get_ipc_handle(void *provider, const void *ptr, size_t size, void *providerIpcData) { os_memory_provider_t *os_provider = (os_memory_provider_t *)provider; if (!os_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -1311,7 +1311,7 @@ static umf_result_t os_get_ipc_handle(void *provider, const void *ptr, static umf_result_t os_put_ipc_handle(void *provider, void *providerIpcData) { os_memory_provider_t *os_provider = (os_memory_provider_t *)provider; if (!os_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -1342,7 +1342,7 @@ static umf_result_t os_open_ipc_handle(void *provider, void *providerIpcData, void **ptr) { os_memory_provider_t *os_provider = (os_memory_provider_t *)provider; if (!os_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } @@ -1384,7 +1384,7 @@ static umf_result_t os_close_ipc_handle(void *provider, void *ptr, size_t size) { os_memory_provider_t *os_provider = (os_memory_provider_t *)provider; if (!os_provider->IPC_enabled) { - LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED") + LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED"); return UMF_RESULT_ERROR_INVALID_ARGUMENT; } diff --git a/src/utils/utils_log.h b/src/utils/utils_log.h index ab40121ce..9f3cf749d 100644 --- a/src/utils/utils_log.h +++ b/src/utils/utils_log.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2024 Intel Corporation + * Copyright (C) 2024-2025 Intel Corporation * * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT. * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception @@ -22,17 +22,17 @@ typedef enum { LOG_FATAL } utils_log_level_t; -#define LOG_DEBUG(...) utils_log(LOG_DEBUG, __func__, __VA_ARGS__); -#define LOG_INFO(...) utils_log(LOG_INFO, __func__, __VA_ARGS__); -#define LOG_WARN(...) utils_log(LOG_WARNING, __func__, __VA_ARGS__); -#define LOG_ERR(...) utils_log(LOG_ERROR, __func__, __VA_ARGS__); -#define LOG_FATAL(...) utils_log(LOG_FATAL, __func__, __VA_ARGS__); - -#define LOG_PDEBUG(...) utils_plog(LOG_DEBUG, __func__, __VA_ARGS__); -#define LOG_PINFO(...) utils_plog(LOG_INFO, __func__, __VA_ARGS__); -#define LOG_PWARN(...) utils_plog(LOG_WARNING, __func__, __VA_ARGS__); -#define LOG_PERR(...) utils_plog(LOG_ERROR, __func__, __VA_ARGS__); -#define LOG_PFATAL(...) utils_plog(LOG_FATAL, __func__, __VA_ARGS__); +#define LOG_DEBUG(...) utils_log(LOG_DEBUG, __func__, __VA_ARGS__) +#define LOG_INFO(...) utils_log(LOG_INFO, __func__, __VA_ARGS__) +#define LOG_WARN(...) utils_log(LOG_WARNING, __func__, __VA_ARGS__) +#define LOG_ERR(...) utils_log(LOG_ERROR, __func__, __VA_ARGS__) +#define LOG_FATAL(...) utils_log(LOG_FATAL, __func__, __VA_ARGS__) + +#define LOG_PDEBUG(...) utils_plog(LOG_DEBUG, __func__, __VA_ARGS__) +#define LOG_PINFO(...) utils_plog(LOG_INFO, __func__, __VA_ARGS__) +#define LOG_PWARN(...) utils_plog(LOG_WARNING, __func__, __VA_ARGS__) +#define LOG_PERR(...) utils_plog(LOG_ERROR, __func__, __VA_ARGS__) +#define LOG_PFATAL(...) utils_plog(LOG_FATAL, __func__, __VA_ARGS__) void utils_log_init(void); #ifdef _WIN32