Skip to content

Commit 1d03950

Browse files
ldorauldorau
committed
Add utils_ze_ prefix to all L0 helper functions
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 111f0be commit 1d03950

File tree

7 files changed

+71
-61
lines changed

7 files changed

+71
-61
lines changed

‎benchmark/ubench.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,22 +456,22 @@ int create_level_zero_params(ze_context_handle_t *context,
456456
return ret;
457457
}
458458

459-
ret = find_driver_with_gpu(&driver_idx, &driver);
459+
ret = utils_ze_find_driver_with_gpu(&driver_idx, &driver);
460460
if (ret || driver == NULL) {
461461
fprintf(stderr, "Cannot find L0 driver with GPU device!\n");
462462
return ret;
463463
}
464464

465-
ret = create_context(driver, context);
465+
ret = utils_ze_create_context(driver, context);
466466
if (ret != 0) {
467467
fprintf(stderr, "Failed to create L0 context!\n");
468468
return ret;
469469
}
470470

471-
ret = find_gpu_device(driver, device);
471+
ret = utils_ze_find_gpu_device(driver, device);
472472
if (ret) {
473473
fprintf(stderr, "Cannot find GPU device!\n");
474-
destroy_context(*context);
474+
utils_ze_destroy_context(*context);
475475
return ret;
476476
}
477477

@@ -628,7 +628,7 @@ UBENCH_EX(ipc, disjoint_pool_with_level_zero_provider) {
628628
umfLevelZeroMemoryProviderParamsDestroy(level_zero_params);
629629

630630
err_destroy_context:
631-
destroy_context(context);
631+
utils_ze_destroy_context(context);
632632
}
633633
#endif /* (defined UMF_BUILD_LIBUMF_POOL_DISJOINT && defined UMF_BUILD_LEVEL_ZERO_PROVIDER && defined UMF_BUILD_GPU_TESTS) */
634634

‎test/providers/ipc_level_zero_prov_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
void memcopy(void *dst, const void *src, size_t size, void *context) {
1616
level_zero_copy_ctx_t *l0_params = (level_zero_copy_ctx_t *)context;
17-
int ret =
18-
level_zero_copy(l0_params->context, l0_params->device, dst, src, size);
17+
int ret = utils_ze_level_zero_copy(l0_params->context, l0_params->device,
18+
dst, src, size);
1919
if (ret != 0) {
2020
fprintf(stderr, "level_zero_copy failed with error %d\n", ret);
2121
}

‎test/providers/ipc_level_zero_prov_consumer.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ int main(int argc, char *argv[]) {
2727
ze_device_handle_t hDevice = NULL;
2828
ze_context_handle_t hContext = NULL;
2929

30-
int ret = find_driver_with_gpu(&driver_idx, &hDriver);
30+
int ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver);
3131
if (ret != 0 || hDriver == NULL) {
32-
fprintf(stderr, "find_driver_with_gpu() failed!\n");
32+
fprintf(stderr, "utils_ze_find_driver_with_gpu() failed!\n");
3333
return -1;
3434
}
3535

36-
ret = find_gpu_device(hDriver, &hDevice);
36+
ret = utils_ze_find_gpu_device(hDriver, &hDevice);
3737
if (ret != 0 || hDevice == NULL) {
38-
fprintf(stderr, "find_gpu_device() failed!\n");
38+
fprintf(stderr, "utils_ze_find_gpu_device() failed!\n");
3939
return -1;
4040
}
4141

42-
ret = create_context(hDriver, &hContext);
42+
ret = utils_ze_create_context(hDriver, &hContext);
4343
if (ret != 0) {
44-
fprintf(stderr, "create_context() failed!\n");
44+
fprintf(stderr, "utils_ze_create_context() failed!\n");
4545
return -1;
4646
}
4747

@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
103103
umfLevelZeroMemoryProviderParamsDestroy(l0_params);
104104

105105
destroy_context:
106-
destroy_context(hContext);
106+
utils_ze_destroy_context(hContext);
107107

108108
return ret;
109109
}

‎test/providers/ipc_level_zero_prov_producer.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ int main(int argc, char *argv[]) {
2727
ze_device_handle_t hDevice = NULL;
2828
ze_context_handle_t hContext = NULL;
2929

30-
int ret = find_driver_with_gpu(&driver_idx, &hDriver);
30+
int ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver);
3131
if (ret != 0 || hDriver == NULL) {
32-
fprintf(stderr, "find_driver_with_gpu() failed!\n");
32+
fprintf(stderr, "utils_ze_find_driver_with_gpu() failed!\n");
3333
return -1;
3434
}
3535

36-
ret = find_gpu_device(hDriver, &hDevice);
36+
ret = utils_ze_find_gpu_device(hDriver, &hDevice);
3737
if (ret != 0 || hDevice == NULL) {
38-
fprintf(stderr, "find_gpu_device() failed!\n");
38+
fprintf(stderr, "utils_ze_find_gpu_device() failed!\n");
3939
return -1;
4040
}
4141

42-
ret = create_context(hDriver, &hContext);
42+
ret = utils_ze_create_context(hDriver, &hContext);
4343
if (ret != 0) {
44-
fprintf(stderr, "create_context() failed!\n");
44+
fprintf(stderr, "utils_ze_create_context() failed!\n");
4545
return -1;
4646
}
4747

@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
103103
umfLevelZeroMemoryProviderParamsDestroy(l0_params);
104104

105105
destroy_context:
106-
destroy_context(hContext);
106+
utils_ze_destroy_context(hContext);
107107

108108
return ret;
109109
}

‎test/providers/level_zero_helpers.cpp

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ static int init_level_zero(void) {
323323
return InitResult;
324324
}
325325

326-
int get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_) {
326+
int utils_ze_get_drivers(uint32_t *drivers_num_,
327+
ze_driver_handle_t **drivers_) {
327328
int ret = 0;
328329
ze_result_t ze_result;
329330
ze_driver_handle_t *drivers = NULL;
@@ -375,8 +376,8 @@ int get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_) {
375376
return ret;
376377
}
377378

378-
int get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
379-
ze_device_handle_t **devices_) {
379+
int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
380+
ze_device_handle_t **devices_) {
380381
ze_result_t ze_result;
381382
int ret = 0;
382383
uint32_t devices_num = 0;
@@ -427,15 +428,16 @@ int get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
427428
return ret;
428429
}
429430

430-
int find_driver_with_gpu(uint32_t *driver_idx, ze_driver_handle_t *driver_) {
431+
int utils_ze_find_driver_with_gpu(uint32_t *driver_idx,
432+
ze_driver_handle_t *driver_) {
431433
int ret = 0;
432434
ze_result_t ze_result;
433435
uint32_t drivers_num = 0;
434436
ze_device_handle_t *devices = NULL;
435437
ze_driver_handle_t *drivers = NULL;
436438
ze_driver_handle_t driver_with_gpus = NULL;
437439

438-
ret = get_drivers(&drivers_num, &drivers);
440+
ret = utils_ze_get_drivers(&drivers_num, &drivers);
439441
if (ret) {
440442
goto fn_fail;
441443
}
@@ -445,7 +447,7 @@ int find_driver_with_gpu(uint32_t *driver_idx, ze_driver_handle_t *driver_) {
445447
uint32_t devices_num = 0;
446448
ze_driver_handle_t driver = drivers[i];
447449

448-
ret = get_devices(driver, &devices_num, &devices);
450+
ret = utils_ze_get_devices(driver, &devices_num, &devices);
449451
if (ret) {
450452
goto fn_fail;
451453
}
@@ -494,13 +496,14 @@ int find_driver_with_gpu(uint32_t *driver_idx, ze_driver_handle_t *driver_) {
494496
return ret;
495497
}
496498

497-
int find_gpu_device(ze_driver_handle_t driver, ze_device_handle_t *device_) {
499+
int utils_ze_find_gpu_device(ze_driver_handle_t driver,
500+
ze_device_handle_t *device_) {
498501
int ret = -1;
499502
uint32_t devices_num = 0;
500503
ze_device_handle_t *devices = NULL;
501504
ze_device_handle_t device;
502505

503-
ret = get_devices(driver, &devices_num, &devices);
506+
ret = utils_ze_get_devices(driver, &devices_num, &devices);
504507
if (ret) {
505508
return ret;
506509
}
@@ -532,9 +535,9 @@ int find_gpu_device(ze_driver_handle_t driver, ze_device_handle_t *device_) {
532535
return ret;
533536
}
534537

535-
int level_zero_fill(ze_context_handle_t context, ze_device_handle_t device,
536-
void *ptr, size_t size, const void *pattern,
537-
size_t pattern_size) {
538+
int utils_ze_level_zero_fill(ze_context_handle_t context,
539+
ze_device_handle_t device, void *ptr, size_t size,
540+
const void *pattern, size_t pattern_size) {
538541
int ret = 0;
539542

540543
ze_command_queue_desc_t commandQueueDesc = {
@@ -618,8 +621,9 @@ int level_zero_fill(ze_context_handle_t context, ze_device_handle_t device,
618621
return ret;
619622
}
620623

621-
int level_zero_copy(ze_context_handle_t context, ze_device_handle_t device,
622-
void *dst_ptr, const void *src_ptr, size_t size) {
624+
int utils_ze_level_zero_copy(ze_context_handle_t context,
625+
ze_device_handle_t device, void *dst_ptr,
626+
const void *src_ptr, size_t size) {
623627
int ret = 0;
624628
ze_command_queue_desc_t commandQueueDesc = {
625629
ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC,
@@ -701,7 +705,8 @@ int level_zero_copy(ze_context_handle_t context, ze_device_handle_t device,
701705
return ret;
702706
}
703707

704-
int create_context(ze_driver_handle_t driver, ze_context_handle_t *context) {
708+
int utils_ze_create_context(ze_driver_handle_t driver,
709+
ze_context_handle_t *context) {
705710
ze_result_t ze_result;
706711
ze_context_desc_t ctxtDesc;
707712
ctxtDesc.stype = ZE_STRUCTURE_TYPE_CONTEXT_DESC;
@@ -717,7 +722,7 @@ int create_context(ze_driver_handle_t driver, ze_context_handle_t *context) {
717722
return 0;
718723
}
719724

720-
int destroy_context(ze_context_handle_t context) {
725+
int utils_ze_destroy_context(ze_context_handle_t context) {
721726
ze_result_t ze_result;
722727
ze_result = libze_ops.zeContextDestroy(context);
723728
if (ze_result != ZE_RESULT_SUCCESS) {
@@ -728,7 +733,7 @@ int destroy_context(ze_context_handle_t context) {
728733
return 0;
729734
}
730735

731-
ze_memory_type_t get_mem_type(ze_context_handle_t context, void *ptr) {
736+
ze_memory_type_t utils_ze_get_mem_type(ze_context_handle_t context, void *ptr) {
732737
ze_device_handle_t device = NULL;
733738
ze_memory_allocation_properties_t alloc_props;
734739
alloc_props.stype = ZE_STRUCTURE_TYPE_MEMORY_ALLOCATION_PROPERTIES;

‎test/providers/level_zero_helpers.h

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,31 @@
1616
extern "C" {
1717
#endif
1818

19-
int get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_);
19+
int utils_ze_get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_);
2020

21-
int get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
22-
ze_device_handle_t **devices_);
21+
int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
22+
ze_device_handle_t **devices_);
2323

24-
int find_driver_with_gpu(uint32_t *driver_idx, ze_driver_handle_t *driver_);
24+
int utils_ze_find_driver_with_gpu(uint32_t *driver_idx,
25+
ze_driver_handle_t *driver_);
2526

26-
int find_gpu_device(ze_driver_handle_t driver, ze_device_handle_t *device_);
27+
int utils_ze_find_gpu_device(ze_driver_handle_t driver,
28+
ze_device_handle_t *device_);
2729

28-
int level_zero_fill(ze_context_handle_t context, ze_device_handle_t device,
29-
void *ptr, size_t size, const void *pattern,
30-
size_t pattern_size);
30+
int utils_ze_level_zero_fill(ze_context_handle_t context,
31+
ze_device_handle_t device, void *ptr, size_t size,
32+
const void *pattern, size_t pattern_size);
3133

32-
int level_zero_copy(ze_context_handle_t context, ze_device_handle_t device,
33-
void *dst_ptr, const void *src_ptr, size_t size);
34+
int utils_ze_level_zero_copy(ze_context_handle_t context,
35+
ze_device_handle_t device, void *dst_ptr,
36+
const void *src_ptr, size_t size);
3437

35-
int create_context(ze_driver_handle_t driver, ze_context_handle_t *context);
38+
int utils_ze_create_context(ze_driver_handle_t driver,
39+
ze_context_handle_t *context);
3640

37-
int destroy_context(ze_context_handle_t context);
41+
int utils_ze_destroy_context(ze_context_handle_t context);
3842

39-
ze_memory_type_t get_mem_type(ze_context_handle_t context, void *ptr);
43+
ze_memory_type_t utils_ze_get_mem_type(ze_context_handle_t context, void *ptr);
4044

4145
#ifdef __cplusplus
4246
}

‎test/providers/provider_level_zero.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class LevelZeroTestHelper {
2525

2626
~LevelZeroTestHelper() {
2727
if (hContext_) {
28-
destroy_context(hContext_);
28+
utils_ze_destroy_context(hContext_);
2929
}
3030
}
3131

@@ -42,21 +42,21 @@ class LevelZeroTestHelper {
4242
LevelZeroTestHelper::LevelZeroTestHelper() {
4343
uint32_t driver_idx = 0;
4444

45-
int ret = find_driver_with_gpu(&driver_idx, &hDriver_);
45+
int ret = utils_ze_find_driver_with_gpu(&driver_idx, &hDriver_);
4646
if (ret != 0 || hDriver_ == NULL) {
47-
fprintf(stderr, "find_driver_with_gpu() failed!\n");
47+
fprintf(stderr, "utils_ze_find_driver_with_gpu() failed!\n");
4848
return;
4949
}
5050

51-
ret = find_gpu_device(hDriver_, &hDevice_);
51+
ret = utils_ze_find_gpu_device(hDriver_, &hDevice_);
5252
if (ret != 0 || hDevice_ == NULL) {
53-
fprintf(stderr, "find_gpu_device() failed!\n");
53+
fprintf(stderr, "utils_ze_find_gpu_device() failed!\n");
5454
return;
5555
}
5656

57-
ret = create_context(hDriver_, &hContext_);
57+
ret = utils_ze_create_context(hDriver_, &hContext_);
5858
if (ret != 0) {
59-
fprintf(stderr, "create_context() failed!\n");
59+
fprintf(stderr, "utils_ze_create_context() failed!\n");
6060
return;
6161
}
6262
}
@@ -218,16 +218,17 @@ class LevelZeroMemoryAccessor : public MemoryAccessor {
218218
size_t pattern_size) {
219219
ASSERT_NE(ptr, nullptr);
220220

221-
int ret = level_zero_fill(hContext_, hDevice_, ptr, size, pattern,
222-
pattern_size);
221+
int ret = utils_ze_level_zero_fill(hContext_, hDevice_, ptr, size,
222+
pattern, pattern_size);
223223
ASSERT_EQ(ret, 0);
224224
}
225225

226226
void copy(void *dst_ptr, void *src_ptr, size_t size) {
227227
ASSERT_NE(dst_ptr, nullptr);
228228
ASSERT_NE(src_ptr, nullptr);
229229

230-
int ret = level_zero_copy(hContext_, hDevice_, dst_ptr, src_ptr, size);
230+
int ret = utils_ze_level_zero_copy(hContext_, hDevice_, dst_ptr,
231+
src_ptr, size);
231232
ASSERT_EQ(ret, 0);
232233
}
233234

@@ -301,7 +302,7 @@ TEST_P(umfLevelZeroProviderTest, basic) {
301302
// use the allocated memory - fill it with a 0xAB pattern
302303
memAccessor->fill(ptr, size, &pattern, sizeof(pattern));
303304

304-
ze_memory_type_t zeMemoryTypeActual = get_mem_type(hContext, ptr);
305+
ze_memory_type_t zeMemoryTypeActual = utils_ze_get_mem_type(hContext, ptr);
305306
ASSERT_EQ(zeMemoryTypeActual, zeMemoryTypeExpected);
306307

307308
// check if the pattern was successfully applied

0 commit comments

Comments
 (0)