Skip to content

Commit 058bf8d

Browse files
committed
some logs upon free and add closing library
1 parent 5adb37c commit 058bf8d

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/provider/provider_level_zero.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,19 +425,22 @@ static umf_result_t ze_memory_provider_free_helper(void *provider, void *ptr,
425425
size_t bytes,
426426
int update_stats) {
427427
if (ptr == NULL) {
428+
LOG_DEBUG("Free skipped as ptr is NULL");
428429
return UMF_RESULT_SUCCESS;
429430
}
430431

431-
ze_memory_provider_t *ze_provider = (ze_memory_provider_t *)provider;
432+
ze_memory_provider_t *ze_provider = provider;
432433
umf_result_t ret;
433434
if (ze_provider->freePolicyFlags == 0) {
435+
LOG_DEBUG("No free policy set, caling zeMemFree with %p", ptr);
434436
ret = ze2umf_result(g_ze_ops.zeMemFree(ze_provider->context, ptr));
435437
} else {
436438
ze_memory_free_ext_desc_t desc = {
437439
.stype = ZE_STRUCTURE_TYPE_MEMORY_FREE_EXT_DESC,
438440
.pNext = NULL,
439441
.freePolicy = ze_provider->freePolicyFlags};
440442

443+
LOG_DEBUG("Free policy was set, caling zeMemFreeExt with %p", ptr);
441444
ret = ze2umf_result(
442445
g_ze_ops.zeMemFreeExt(ze_provider->context, &desc, ptr));
443446
}
@@ -559,8 +562,6 @@ static umf_result_t query_min_page_size(ze_memory_provider_t *ze_provider,
559562
size_t *min_page_size) {
560563
assert(min_page_size);
561564

562-
LOG_DEBUG("Querying minimum page size");
563-
564565
void *ptr;
565566
umf_result_t result =
566567
ze_memory_provider_alloc_helper(ze_provider, 1, 0, 0, &ptr);
@@ -574,6 +575,7 @@ static umf_result_t query_min_page_size(ze_memory_provider_t *ze_provider,
574575
ze_provider->context, ptr, &properties, NULL);
575576

576577
*min_page_size = properties.pageSize;
578+
LOG_DEBUG("Querying minimum page size, got:%lu", properties.pageSize);
577579

578580
ze_memory_provider_free_helper(ze_provider, ptr, 1, 0);
579581

test/common/level_zero_mocks.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void MockedLevelZeroTestEnvironment::SetUp() {
101101
setenv("UMF_ZE_LOADER_LIB_NAME", lib_name, 1);
102102
#endif
103103

104-
void *lib_handle = utils_open_library(lib_name, 0);
104+
lib_handle = utils_open_library(lib_name, 0);
105105
ASSERT_NE(lib_handle, nullptr);
106106

107107
void *l0interface_sym =
@@ -113,6 +113,8 @@ void MockedLevelZeroTestEnvironment::SetUp() {
113113

114114
ASSERT_EQ(*l0interface, nullptr);
115115
}
116-
void MockedLevelZeroTestEnvironment::TearDown() {}
116+
void MockedLevelZeroTestEnvironment::TearDown() {
117+
utils_close_library(lib_handle);
118+
}
117119

118120
LevelZero **MockedLevelZeroTestEnvironment::l0interface;

test/common/level_zero_mocks.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ class LevelZeroMock : public LevelZero {
7979

8080
// important, makes UMF load ze_loopback instead of regular l0
8181
class MockedLevelZeroTestEnvironment : public ::testing::Environment {
82+
83+
void *lib_handle;
84+
8285
public:
8386
static LevelZero **l0interface;
8487

0 commit comments

Comments
 (0)