Skip to content

Commit d3e7387

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

15 files changed

+123
-109
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

‎examples/common/utils_level_zero.h

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ static int init_level_zero(void) {
3030
return 0;
3131
}
3232

33-
static inline int get_drivers(uint32_t *drivers_num_,
34-
ze_driver_handle_t **drivers_) {
33+
static inline int utils_ze_get_drivers(uint32_t *drivers_num_,
34+
ze_driver_handle_t **drivers_) {
3535
int ret = 0;
3636
ze_result_t ze_result;
3737
ze_driver_handle_t *drivers = NULL;
@@ -74,8 +74,9 @@ static inline int get_drivers(uint32_t *drivers_num_,
7474
return ret;
7575
}
7676

77-
static inline int get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
78-
ze_device_handle_t **devices_) {
77+
static inline int utils_ze_get_devices(ze_driver_handle_t driver,
78+
uint32_t *devices_num_,
79+
ze_device_handle_t **devices_) {
7980
ze_result_t ze_result;
8081
int ret = 0;
8182
uint32_t devices_num = 0;
@@ -118,16 +119,16 @@ static inline int get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
118119
return ret;
119120
}
120121

121-
static inline int find_driver_with_gpu(uint32_t *driver_idx,
122-
ze_driver_handle_t *driver_) {
122+
static inline int utils_ze_find_driver_with_gpu(uint32_t *driver_idx,
123+
ze_driver_handle_t *driver_) {
123124
int ret = 0;
124125
ze_result_t ze_result;
125126
uint32_t drivers_num = 0;
126127
ze_device_handle_t *devices = NULL;
127128
ze_driver_handle_t *drivers = NULL;
128129
ze_driver_handle_t driver_with_gpus = NULL;
129130

130-
ret = get_drivers(&drivers_num, &drivers);
131+
ret = utils_ze_get_drivers(&drivers_num, &drivers);
131132
if (ret) {
132133
goto fn_fail;
133134
}
@@ -137,7 +138,7 @@ static inline int find_driver_with_gpu(uint32_t *driver_idx,
137138
uint32_t devices_num = 0;
138139
ze_driver_handle_t driver = drivers[i];
139140

140-
ret = get_devices(driver, &devices_num, &devices);
141+
ret = utils_ze_get_devices(driver, &devices_num, &devices);
141142
if (ret) {
142143
goto fn_fail;
143144
}
@@ -184,14 +185,14 @@ static inline int find_driver_with_gpu(uint32_t *driver_idx,
184185
return ret;
185186
}
186187

187-
static inline int find_gpu_device(ze_driver_handle_t driver,
188-
ze_device_handle_t *device_) {
188+
static inline int utils_ze_find_gpu_device(ze_driver_handle_t driver,
189+
ze_device_handle_t *device_) {
189190
int ret = -1;
190191
uint32_t devices_num = 0;
191192
ze_device_handle_t *devices = NULL;
192193
ze_device_handle_t device;
193194

194-
ret = get_devices(driver, &devices_num, &devices);
195+
ret = utils_ze_get_devices(driver, &devices_num, &devices);
195196
if (ret) {
196197
return ret;
197198
}
@@ -222,9 +223,9 @@ static inline int find_gpu_device(ze_driver_handle_t driver,
222223
return ret;
223224
}
224225

225-
int level_zero_fill(ze_context_handle_t context, ze_device_handle_t device,
226-
void *ptr, size_t size, const void *pattern,
227-
size_t pattern_size) {
226+
int utils_ze_level_zero_fill(ze_context_handle_t context,
227+
ze_device_handle_t device, void *ptr, size_t size,
228+
const void *pattern, size_t pattern_size) {
228229
int ret = 0;
229230

230231
ze_command_queue_desc_t commandQueueDesc = {
@@ -308,8 +309,9 @@ int level_zero_fill(ze_context_handle_t context, ze_device_handle_t device,
308309
return ret;
309310
}
310311

311-
int level_zero_copy(ze_context_handle_t context, ze_device_handle_t device,
312-
void *dst_ptr, void *src_ptr, size_t size) {
312+
int utils_ze_level_zero_copy(ze_context_handle_t context,
313+
ze_device_handle_t device, void *dst_ptr,
314+
void *src_ptr, size_t size) {
313315
int ret = 0;
314316
ze_command_queue_desc_t commandQueueDesc = {
315317
ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC,
@@ -391,7 +393,8 @@ int level_zero_copy(ze_context_handle_t context, ze_device_handle_t device,
391393
return ret;
392394
}
393395

394-
int create_context(ze_driver_handle_t driver, ze_context_handle_t *context) {
396+
int utils_ze_create_context(ze_driver_handle_t driver,
397+
ze_context_handle_t *context) {
395398
ze_result_t ze_result;
396399
ze_context_desc_t ctxtDesc = {
397400
.stype = ZE_STRUCTURE_TYPE_CONTEXT_DESC, .pNext = NULL, .flags = 0};
@@ -405,7 +408,7 @@ int create_context(ze_driver_handle_t driver, ze_context_handle_t *context) {
405408
return 0;
406409
}
407410

408-
int destroy_context(ze_context_handle_t context) {
411+
int utils_ze_destroy_context(ze_context_handle_t context) {
409412
ze_result_t ze_result;
410413
ze_result = zeContextDestroy(context);
411414
if (ze_result != ZE_RESULT_SUCCESS) {

‎examples/ipc_level_zero/ipc_level_zero.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,25 +107,25 @@ int main(void) {
107107
return ret;
108108
}
109109

110-
ret = find_driver_with_gpu(&driver_idx, &driver);
110+
ret = utils_ze_find_driver_with_gpu(&driver_idx, &driver);
111111
if (ret || driver == NULL) {
112112
fprintf(stderr, "ERROR: Cannot find L0 driver with GPU device!\n");
113113
return ret;
114114
}
115115

116-
ret = create_context(driver, &producer_context);
116+
ret = utils_ze_create_context(driver, &producer_context);
117117
if (ret != 0) {
118118
fprintf(stderr, "ERROR: Failed to create L0 context!\n");
119119
return ret;
120120
}
121121

122-
ret = create_context(driver, &consumer_context);
122+
ret = utils_ze_create_context(driver, &consumer_context);
123123
if (ret != 0) {
124124
fprintf(stderr, "ERROR: Failed to create L0 context!\n");
125125
return ret;
126126
}
127127

128-
ret = find_gpu_device(driver, &device);
128+
ret = utils_ze_find_gpu_device(driver, &device);
129129
if (ret || device == NULL) {
130130
fprintf(stderr, "ERROR: Cannot find GPU device!\n");
131131
return ret;
@@ -149,8 +149,9 @@ int main(void) {
149149

150150
fprintf(stdout, "Buffer allocated from the producer pool.\n");
151151

152-
ret = level_zero_fill(producer_context, device, initial_buf, BUFFER_SIZE,
153-
&BUFFER_PATTERN, sizeof(BUFFER_PATTERN));
152+
ret = utils_ze_level_zero_fill(producer_context, device, initial_buf,
153+
BUFFER_SIZE, &BUFFER_PATTERN,
154+
sizeof(BUFFER_PATTERN));
154155
if (ret != 0) {
155156
fprintf(stderr, "ERROR: Failed to fill the buffer with pattern!\n");
156157
return ret;
@@ -189,8 +190,8 @@ int main(void) {
189190
fprintf(stdout, "IPC handle opened in the consumer pool.\n");
190191

191192
size_t *tmp_buf = malloc(BUFFER_SIZE);
192-
ret = level_zero_copy(consumer_context, device, tmp_buf, mapped_buf,
193-
BUFFER_SIZE);
193+
ret = utils_ze_level_zero_copy(consumer_context, device, tmp_buf,
194+
mapped_buf, BUFFER_SIZE);
194195
if (ret != 0) {
195196
fprintf(stderr, "ERROR: Failed to copy mapped_buf to host!\n");
196197
return ret;
@@ -227,13 +228,13 @@ int main(void) {
227228
umfPoolDestroy(producer_pool);
228229
umfPoolDestroy(consumer_pool);
229230

230-
ret = destroy_context(producer_context);
231+
ret = utils_ze_destroy_context(producer_context);
231232
if (ret != 0) {
232233
fprintf(stderr, "ERROR: Failed to destroy L0 context!\n");
233234
return ret;
234235
}
235236

236-
ret = destroy_context(consumer_context);
237+
ret = utils_ze_destroy_context(consumer_context);
237238
if (ret != 0) {
238239
fprintf(stderr, "ERROR: Failed to destroy L0 context!\n");
239240
return ret;

‎examples/level_zero_shared_memory/level_zero_shared_memory.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ int main(void) {
2929
return ret;
3030
}
3131

32-
ret = find_driver_with_gpu(&driverId, &hDriver);
32+
ret = utils_ze_find_driver_with_gpu(&driverId, &hDriver);
3333
if (ret || hDriver == NULL) {
3434
fprintf(stderr, "Cannot find L0 driver with GPU device!\n");
3535
return ret;
3636
}
3737

38-
ret = find_gpu_device(hDriver, &hDevice);
38+
ret = utils_ze_find_gpu_device(hDriver, &hDevice);
3939
if (ret || hDevice == NULL) {
4040
fprintf(stderr, "Cannot find GPU device!\n");
4141
return ret;
4242
}
4343

44-
ret = create_context(hDriver, &hContext);
44+
ret = utils_ze_create_context(hDriver, &hContext);
4545
if (ret != 0) {
4646
fprintf(stderr, "Failed to create L0 context!\n");
4747
return ret;
@@ -187,6 +187,6 @@ int main(void) {
187187
umfLevelZeroMemoryProviderParamsDestroy(ze_memory_provider_params);
188188

189189
level_zero_destroy:
190-
ret = destroy_context(hContext);
190+
ret = utils_ze_destroy_context(hContext);
191191
return ret;
192192
}

‎test/providers/cuda_helpers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ int cuda_copy(CUcontext context, CUdevice device, void *dst_ptr,
342342
return ret;
343343
}
344344

345-
umf_usm_memory_type_t get_mem_type(CUcontext context, void *ptr) {
345+
umf_usm_memory_type_t utils_ze_get_mem_type(CUcontext context, void *ptr) {
346346

347347
(void)context;
348348

@@ -427,7 +427,7 @@ int get_cuda_device(CUdevice *device) {
427427
return 0;
428428
}
429429

430-
int create_context(CUdevice device, CUcontext *context) {
430+
int utils_ze_create_context(CUdevice device, CUcontext *context) {
431431
CUcontext cuContext = nullptr;
432432

433433
int ret = init_cuda();
@@ -445,7 +445,7 @@ int create_context(CUdevice device, CUcontext *context) {
445445
return 0;
446446
}
447447

448-
int destroy_context(CUcontext context) {
448+
int utils_ze_destroy_context(CUcontext context) {
449449
CUresult res = libcu_ops.cuCtxDestroy(context);
450450
if (res != CUDA_SUCCESS) {
451451
fprintf(stderr, "cuCtxDestroy() failed!\n");

‎test/providers/cuda_helpers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ extern "C" {
2828

2929
int get_cuda_device(CUdevice *device);
3030

31-
int create_context(CUdevice device, CUcontext *context);
31+
int utils_ze_create_context(CUdevice device, CUcontext *context);
3232

33-
int destroy_context(CUcontext context);
33+
int utils_ze_destroy_context(CUcontext context);
3434

3535
int cuda_fill(CUcontext context, CUdevice device, void *ptr, size_t size,
3636
const void *pattern, size_t pattern_size);
3737

3838
int cuda_copy(CUcontext context, CUdevice device, void *dst_ptr,
3939
const void *src_ptr, size_t size);
4040

41-
umf_usm_memory_type_t get_mem_type(CUcontext context, void *ptr);
41+
umf_usm_memory_type_t utils_ze_get_mem_type(CUcontext context, void *ptr);
4242

4343
CUcontext get_mem_context(void *ptr);
4444

‎test/providers/ipc_cuda_prov_consumer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ int main(int argc, char *argv[]) {
3131
return -1;
3232
}
3333

34-
ret = create_context(hDevice, &hContext);
34+
ret = utils_ze_create_context(hDevice, &hContext);
3535
if (ret != 0) {
36-
fprintf(stderr, "create_context() failed!\n");
36+
fprintf(stderr, "utils_ze_create_context() failed!\n");
3737
return -1;
3838
}
3939

@@ -91,7 +91,7 @@ int main(int argc, char *argv[]) {
9191
umfCUDAMemoryProviderParamsDestroy(cu_params);
9292

9393
destroy_context:
94-
destroy_context(hContext);
94+
utils_ze_destroy_context(hContext);
9595

9696
return ret;
9797
}

‎test/providers/ipc_cuda_prov_producer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ int main(int argc, char *argv[]) {
3131
return -1;
3232
}
3333

34-
ret = create_context(hDevice, &hContext);
34+
ret = utils_ze_create_context(hDevice, &hContext);
3535
if (ret != 0) {
36-
fprintf(stderr, "create_context() failed!\n");
36+
fprintf(stderr, "utils_ze_create_context() failed!\n");
3737
return -1;
3838
}
3939

@@ -91,7 +91,7 @@ int main(int argc, char *argv[]) {
9191
umfCUDAMemoryProviderParamsDestroy(cu_params);
9292

9393
destroy_context:
94-
destroy_context(hContext);
94+
utils_ze_destroy_context(hContext);
9595

9696
return ret;
9797
}

‎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
}

0 commit comments

Comments
 (0)