Skip to content

Commit d01e258

Browse files
committed
[L0 provider] log each call to L0
using a special format that SYCL tests rely on
1 parent 05c54ce commit d01e258

File tree

1 file changed

+35
-26
lines changed

1 file changed

+35
-26
lines changed

src/provider/provider_level_zero.c

+35-26
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ static umf_result_t ze2umf_result(ze_result_t result) {
201201
}
202202
}
203203

204+
#define ZE_CALL(ZeName, ZeArgs) \
205+
(LOG_INFO("ZE ---> %s%s", #ZeName, #ZeArgs), g_ze_ops.ZeName ZeArgs)
206+
204207
static void init_ze_global_state(void) {
205208
#ifdef _WIN32
206209
const char *lib_name = "ze_loader.dll";
@@ -409,8 +412,9 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
409412
.stype = ZE_STRUCTURE_TYPE_HOST_MEM_ALLOC_DESC,
410413
.pNext = NULL,
411414
.flags = 0};
412-
ze_result = g_ze_ops.zeMemAllocHost(ze_provider->context, &host_desc,
413-
size, alignment, resultPtr);
415+
416+
ze_result = ZE_CALL(zeMemAllocHost, (ze_provider->context, &host_desc,
417+
size, alignment, resultPtr));
414418
break;
415419
}
416420
case UMF_MEMORY_TYPE_DEVICE: {
@@ -421,9 +425,9 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
421425
: NULL,
422426
.flags = 0,
423427
.ordinal = ze_provider->device_ordinal};
424-
ze_result = g_ze_ops.zeMemAllocDevice(ze_provider->context, &dev_desc,
425-
size, alignment,
426-
ze_provider->device, resultPtr);
428+
ze_result = ZE_CALL(zeMemAllocDevice,
429+
(ze_provider->context, &dev_desc, size, alignment,
430+
ze_provider->device, resultPtr));
427431
break;
428432
}
429433
case UMF_MEMORY_TYPE_SHARED: {
@@ -438,9 +442,9 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
438442
: NULL,
439443
.flags = 0,
440444
.ordinal = ze_provider->device_ordinal};
441-
ze_result = g_ze_ops.zeMemAllocShared(ze_provider->context, &dev_desc,
442-
&host_desc, size, alignment,
443-
ze_provider->device, resultPtr);
445+
ze_result = ZE_CALL(zeMemAllocShared,
446+
(ze_provider->context, &dev_desc, &host_desc, size,
447+
alignment, ze_provider->device, resultPtr));
444448
break;
445449
}
446450
default:
@@ -455,9 +459,10 @@ static umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
455459
}
456460

457461
for (uint32_t i = 0; i < ze_provider->resident_device_count; i++) {
458-
ze_result = g_ze_ops.zeContextMakeMemoryResident(
459-
ze_provider->context, ze_provider->resident_device_handles[i],
460-
*resultPtr, size);
462+
ze_result = ZE_CALL(zeContextMakeMemoryResident,
463+
(ze_provider->context,
464+
ze_provider->resident_device_handles[i],
465+
*resultPtr, size));
461466
if (ze_result != ZE_RESULT_SUCCESS) {
462467
return ze2umf_result(ze_result);
463468
}
@@ -477,7 +482,7 @@ static umf_result_t ze_memory_provider_free(void *provider, void *ptr,
477482
ze_memory_provider_t *ze_provider = (ze_memory_provider_t *)provider;
478483

479484
if (ze_provider->freePolicyFlags == 0) {
480-
return ze2umf_result(g_ze_ops.zeMemFree(ze_provider->context, ptr));
485+
return ze2umf_result(ZE_CALL(zeMemFree, (ze_provider->context, ptr)));
481486
}
482487

483488
ze_memory_free_ext_desc_t desc = {
@@ -486,7 +491,7 @@ static umf_result_t ze_memory_provider_free(void *provider, void *ptr,
486491
.freePolicy = ze_provider->freePolicyFlags};
487492

488493
return ze2umf_result(
489-
g_ze_ops.zeMemFreeExt(ze_provider->context, &desc, ptr));
494+
ZE_CALL(zeMemFreeExt, (ze_provider->context, &desc, ptr)));
490495
}
491496

492497
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,
503508

504509
ze_memory_allocation_properties_t properties = {
505510
.stype = ZE_STRUCTURE_TYPE_MEMORY_ALLOCATION_PROPERTIES};
506-
ze_result_t ze_result = g_ze_ops.zeMemGetAllocProperties(
507-
ze_provider->context, ptr, &properties, NULL);
511+
ze_result_t ze_result =
512+
ZE_CALL(zeMemGetAllocProperties,
513+
(ze_provider->context, ptr, &properties, NULL));
508514

509515
*min_page_size = properties.pageSize;
510516

@@ -574,8 +580,9 @@ static umf_result_t ze_memory_provider_initialize(void *params,
574580
ze_provider->device_properties.stype = ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES;
575581

576582
if (ze_provider->device) {
577-
umf_result_t ret = ze2umf_result(g_ze_ops.zeDeviceGetProperties(
578-
ze_provider->device, &ze_provider->device_properties));
583+
umf_result_t ret = ze2umf_result(
584+
ZE_CALL(zeDeviceGetProperties,
585+
(ze_provider->device, &ze_provider->device_properties)));
579586

580587
if (ret != UMF_RESULT_SUCCESS) {
581588
LOG_ERR("Cannot get device properties");
@@ -641,8 +648,9 @@ static umf_result_t ze_memory_provider_get_min_page_size(void *provider,
641648

642649
ze_memory_allocation_properties_t properties = {
643650
.stype = ZE_STRUCTURE_TYPE_MEMORY_ALLOCATION_PROPERTIES};
644-
ze_result_t ze_result = g_ze_ops.zeMemGetAllocProperties(
645-
ze_provider->context, ptr, &properties, NULL);
651+
ze_result_t ze_result =
652+
ZE_CALL(zeMemGetAllocProperties,
653+
(ze_provider->context, ptr, &properties, NULL));
646654
if (ze_result != ZE_RESULT_SUCCESS) {
647655
return ze2umf_result(ze_result);
648656
}
@@ -734,8 +742,8 @@ static umf_result_t ze_memory_provider_get_ipc_handle(void *provider,
734742
struct ze_memory_provider_t *ze_provider =
735743
(struct ze_memory_provider_t *)provider;
736744

737-
ze_result = g_ze_ops.zeMemGetIpcHandle(ze_provider->context, ptr,
738-
&ze_ipc_data->ze_handle);
745+
ze_result = ZE_CALL(zeMemGetIpcHandle,
746+
(ze_provider->context, ptr, &ze_ipc_data->ze_handle));
739747
if (ze_result != ZE_RESULT_SUCCESS) {
740748
LOG_ERR("zeMemGetIpcHandle() failed.");
741749
return ze2umf_result(ze_result);
@@ -760,8 +768,8 @@ static umf_result_t ze_memory_provider_put_ipc_handle(void *provider,
760768
return UMF_RESULT_SUCCESS;
761769
}
762770

763-
ze_result = g_ze_ops.zeMemPutIpcHandle(ze_provider->context,
764-
ze_ipc_data->ze_handle);
771+
ze_result = ZE_CALL(zeMemPutIpcHandle,
772+
(ze_provider->context, ze_ipc_data->ze_handle));
765773
if (ze_result != ZE_RESULT_SUCCESS) {
766774
LOG_ERR("zeMemPutIpcHandle() failed.");
767775
return ze2umf_result(ze_result);
@@ -791,8 +799,9 @@ static umf_result_t ze_memory_provider_open_ipc_handle(void *provider,
791799
memcpy(&ze_ipc_handle, &fd_local, sizeof(fd_local));
792800
}
793801

794-
ze_result = g_ze_ops.zeMemOpenIpcHandle(
795-
ze_provider->context, ze_provider->device, ze_ipc_handle, 0, ptr);
802+
ze_result =
803+
ZE_CALL(zeMemOpenIpcHandle, (ze_provider->context, ze_provider->device,
804+
ze_ipc_handle, 0, ptr));
796805
if (fd_local != -1) {
797806
(void)utils_close_fd(fd_local);
798807
}
@@ -812,7 +821,7 @@ ze_memory_provider_close_ipc_handle(void *provider, void *ptr, size_t size) {
812821
struct ze_memory_provider_t *ze_provider =
813822
(struct ze_memory_provider_t *)provider;
814823

815-
ze_result = g_ze_ops.zeMemCloseIpcHandle(ze_provider->context, ptr);
824+
ze_result = ZE_CALL(zeMemCloseIpcHandle, (ze_provider->context, ptr));
816825
if (ze_result != ZE_RESULT_SUCCESS) {
817826
LOG_ERR("zeMemCloseIpcHandle() failed.");
818827
return ze2umf_result(ze_result);

0 commit comments

Comments
 (0)