Skip to content

Commit 3f68ad8

Browse files
ldorauldorau
committed
Add DEBUG prints
1 parent 1b363c4 commit 3f68ad8

File tree

5 files changed

+56
-16
lines changed

5 files changed

+56
-16
lines changed

‎.github/workflows/reusable_gpu.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ on:
1212
os:
1313
description: A list of OSes
1414
type: string
15-
default: "['Ubuntu', 'Windows']"
15+
default: "['Ubuntu']"
1616
build_type:
1717
description: A list of build types
1818
type: string
19-
default: "['Debug', 'Release']"
19+
default: "['Debug']"
2020
shared_lib:
2121
description: A list of options for building shared library
2222
type: string
@@ -100,17 +100,9 @@ jobs:
100100
- name: Build UMF
101101
run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j ${{matrix.number_of_processors}}
102102

103-
- name: Run tests
104-
working-directory: ${{env.BUILD_DIR}}
105-
run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
106-
107-
- name: Run examples
108-
working-directory: ${{env.BUILD_DIR}}
109-
run: ctest --output-on-failure --test-dir examples -C ${{matrix.build_type}}
110-
111103
- name: Run benchmarks DEBUG
112104
working-directory: ${{env.BUILD_DIR}}
113-
run: UMF_LOG="level:debug;flush:debug;output:stderr;pid:yes" ./benchmark/umf-bench-ubench
105+
run: UMF_LOG="level:info;flush:info;output:stderr;pid:yes" ./benchmark/umf-bench-ubench
114106

115107
- name: Run benchmarks
116108
working-directory: ${{env.BUILD_DIR}}

‎benchmark/ubench.c‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,9 @@ UBENCH_EX(simple, proxy_pool_with_os_memory_provider) {
239239
proxy_pool);
240240
}
241241

242+
fprintf(stderr, ">>> DEBUG 1-A umfPoolDestroy(proxy_pool)\n");
242243
umfPoolDestroy(proxy_pool);
244+
fprintf(stderr, ">>> DEBUG 1-B umfPoolDestroy(proxy_pool)\n");
243245
umfMemoryProviderDestroy(os_memory_provider);
244246
free(array);
245247
}
@@ -322,7 +324,9 @@ UBENCH_EX(simple, disjoint_pool_with_os_memory_provider) {
322324
disjoint_pool);
323325
}
324326

327+
fprintf(stderr, ">>> DEBUG 2-A umfPoolDestroy(disjoint_pool)\n");
325328
umfPoolDestroy(disjoint_pool);
329+
fprintf(stderr, ">>> DEBUG 2-B umfPoolDestroy(disjoint_pool)\n");
326330
umfDisjointPoolParamsDestroy(disjoint_memory_pool_params);
327331
umfMemoryProviderDestroy(os_memory_provider);
328332
free(array);
@@ -369,7 +373,9 @@ UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
369373
jemalloc_pool);
370374
}
371375

376+
fprintf(stderr, ">>> DEBUG 3-A umfPoolDestroy(jemalloc_pool)\n");
372377
umfPoolDestroy(jemalloc_pool);
378+
fprintf(stderr, ">>> DEBUG 3-B umfPoolDestroy(jemalloc_pool)\n");
373379
umfMemoryProviderDestroy(os_memory_provider);
374380
free(array);
375381
}
@@ -415,9 +421,16 @@ UBENCH_EX(simple, scalable_pool_with_os_memory_provider) {
415421
scalable_pool);
416422
}
417423

424+
fprintf(stderr, ">>> DEBUG 4-A umfPoolDestroy(scalable_pool)\n");
418425
umfPoolDestroy(scalable_pool);
426+
fprintf(stderr, ">>> DEBUG 4-B umfPoolDestroy(scalable_pool)\n");
427+
fprintf(stderr,
428+
">>> DEBUG 4-C umfMemoryProviderDestroy(os_memory_provider)\n");
419429
umfMemoryProviderDestroy(os_memory_provider);
430+
fprintf(stderr,
431+
">>> DEBUG 4-D umfMemoryProviderDestroy(os_memory_provider)\n");
420432
free(array);
433+
fprintf(stderr, ">>> DEBUG 4-E free()\n");
421434
}
422435
#endif /* (defined UMF_POOL_SCALABLE_ENABLED) */
423436

@@ -445,36 +458,46 @@ static void do_ipc_get_put_benchmark(alloc_t *allocs, size_t num_allocs,
445458
}
446459
}
447460

448-
int create_level_zero_params(ze_context_handle_t *context,
461+
static int create_level_zero_params(ze_context_handle_t *context,
449462
ze_device_handle_t *device) {
450463
uint32_t driver_idx = 0;
451464
ze_driver_handle_t driver = NULL;
452465

466+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
453467
int ret = init_level_zero();
468+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
454469
if (ret != 0) {
455470
fprintf(stderr, "Failed to init Level 0!\n");
456471
return ret;
457472
}
458473

474+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
459475
ret = find_driver_with_gpu(&driver_idx, &driver);
476+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
460477
if (ret || driver == NULL) {
461478
fprintf(stderr, "Cannot find L0 driver with GPU device!\n");
462479
return ret;
463480
}
464481

482+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
465483
ret = create_context(driver, context);
484+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
466485
if (ret != 0) {
467486
fprintf(stderr, "Failed to create L0 context!\n");
468487
return ret;
469488
}
470489

490+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
471491
ret = find_gpu_device(driver, device);
492+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
472493
if (ret) {
473494
fprintf(stderr, "Cannot find GPU device!\n");
474495
destroy_context(*context);
475496
return ret;
476497
}
477498

499+
fprintf(stderr, ">>> DEBUG L0 %s:%i\n", __FILE__, __LINE__);
500+
478501
return ret;
479502
}
480503

@@ -486,13 +509,17 @@ UBENCH_EX(ipc, disjoint_pool_with_level_zero_provider) {
486509
ze_device_handle_t device = NULL;
487510
umf_level_zero_memory_provider_params_handle_t level_zero_params = NULL;
488511

512+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
489513
int ret = create_level_zero_params(&context, &device);
514+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
490515
if (ret != 0) {
491516
fprintf(stderr, "error: create_level_zero_params() failed\n");
492517
exit(-1);
493518
}
494519

520+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
495521
umf_result = umfLevelZeroMemoryProviderParamsCreate(&level_zero_params);
522+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
496523
if (umf_result != UMF_RESULT_SUCCESS) {
497524
fprintf(stderr,
498525
"error: umfLevelZeroMemoryProviderParamsCreate() failed\n");
@@ -610,7 +637,9 @@ UBENCH_EX(ipc, disjoint_pool_with_level_zero_provider) {
610637
umfPoolFree(pool, allocs[i].ptr);
611638
}
612639

640+
fprintf(stderr, ">>> DEBUG 5-A umfPoolDestroy(pool)\n");
613641
umfPoolDestroy(pool);
642+
fprintf(stderr, ">>> DEBUG 5-B umfPoolDestroy(pool)\n");
614643

615644
err_params_destroy:
616645
umfDisjointPoolParamsDestroy(disjoint_params);

‎src/provider/provider_os_memory.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,21 +668,28 @@ static void os_finalize(void *provider) {
668668
os_memory_provider_t *os_provider = provider;
669669

670670
if (os_provider->fd > 0) {
671+
fprintf(stderr, ">>> DEBUG 44-A %i\n", __LINE__);
671672
utils_mutex_destroy_not_free(&os_provider->lock_fd);
672673
}
673674

675+
fprintf(stderr, ">>> DEBUG 44-B %i\n", __LINE__);
674676
critnib_delete(os_provider->fd_offset_map);
675677

678+
fprintf(stderr, ">>> DEBUG 44-C %i\n", __LINE__);
676679
free_bitmaps(os_provider);
677680

678681
if (os_provider->partitions) {
682+
fprintf(stderr, ">>> DEBUG 44-D %i\n", __LINE__);
679683
umf_ba_global_free(os_provider->partitions);
680684
}
681685

682686
if (os_provider->nodeset_str_buf) {
687+
fprintf(stderr, ">>> DEBUG 44-E %i\n", __LINE__);
683688
umf_ba_global_free(os_provider->nodeset_str_buf);
684689
}
690+
fprintf(stderr, ">>> DEBUG 44-F %i\n", __LINE__);
685691
hwloc_topology_destroy(os_provider->topo);
692+
fprintf(stderr, ">>> DEBUG 44-G %i\n", __LINE__);
686693
umf_ba_global_free(os_provider);
687694
}
688695

‎test/providers/level_zero_helpers.cpp‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,26 +298,36 @@ int InitLevelZeroOps() {
298298
#endif // USE_DLOPEN
299299

300300
static int init_level_zero_lib(void) {
301+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
301302
ze_init_flag_t flags = ZE_INIT_FLAG_GPU_ONLY;
303+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
302304
ze_result_t result = libze_ops.zeInit(flags);
305+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
303306
if (result != ZE_RESULT_SUCCESS) {
304307
return -1;
305308
}
306309
return 0;
307310
}
308311

309-
UTIL_ONCE_FLAG level_zero_init_flag;
310-
int InitResult;
311-
void init_level_zero_once() {
312+
static UTIL_ONCE_FLAG level_zero_init_flag = UTIL_ONCE_FLAG_INIT;
313+
static int InitResult;
314+
315+
static void init_level_zero_once(void) {
316+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
312317
InitResult = InitLevelZeroOps();
318+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
313319
if (InitResult != 0) {
314320
return;
315321
}
322+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
316323
InitResult = init_level_zero_lib();
324+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
317325
}
318326

319-
int init_level_zero() {
327+
int init_level_zero(void) {
328+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
320329
utils_init_once(&level_zero_init_flag, init_level_zero_once);
330+
fprintf(stderr, ">>> DEBUG L0 %s:%i (%s)\n", __FILE__, __LINE__, __func__);
321331

322332
return InitResult;
323333
}

‎test/providers/level_zero_helpers.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
extern "C" {
1717
#endif
1818

19+
int init_level_zero(void);
20+
1921
int get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_);
2022

2123
int get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,

0 commit comments

Comments
 (0)