Skip to content

Commit a3f7c31

Browse files
ldorauldorau
committed
Move level_zero_helpers to utils and use it in benchmarks
1) Move level_zero_helpers to utils and rename it to utils_level_zero. 2) Use new utils_level_zero in benchmarks. Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 1d03950 commit a3f7c31

File tree

9 files changed

+29
-26
lines changed

9 files changed

+29
-26
lines changed

‎benchmark/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ function(add_umf_benchmark)
4545
${BENCH_NAME}
4646
PRIVATE ${UMF_CMAKE_SOURCE_DIR}/include
4747
${UMF_CMAKE_SOURCE_DIR}/src/utils
48-
${UMF_CMAKE_SOURCE_DIR}/test/common
49-
${UMF_CMAKE_SOURCE_DIR}/examples/common)
48+
${UMF_CMAKE_SOURCE_DIR}/test/common ${LEVEL_ZERO_INCLUDE_DIRS})
5049

5150
target_link_directories(${BENCH_NAME} PRIVATE ${ARG_LIBDIRS})
5251

@@ -108,6 +107,7 @@ if(LINUX)
108107
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} m)
109108
endif()
110109
if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
110+
set(SRCS_OPTIONAL ${SRCS_OPTIONAL} ../src/utils/utils_level_zero.cpp)
111111
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} ze_loader)
112112
# TODO add CUDA
113113
endif()
@@ -116,7 +116,7 @@ endif()
116116

117117
add_umf_benchmark(
118118
NAME ubench
119-
SRCS ubench.c
119+
SRCS ubench.c ${SRCS_OPTIONAL}
120120
LIBS ${LIBS_OPTIONAL}
121121
LIBDIRS ${LIB_DIRS})
122122

‎benchmark/ubench.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#if (defined UMF_BUILD_LIBUMF_POOL_DISJOINT && \
3434
defined UMF_BUILD_LEVEL_ZERO_PROVIDER && defined UMF_BUILD_GPU_TESTS)
35-
#include "examples_level_zero.h"
35+
#include "utils_level_zero.h"
3636
#endif
3737

3838
// NOTE: with strict compilation flags, ubench compilation throws some
@@ -450,7 +450,7 @@ int create_level_zero_params(ze_context_handle_t *context,
450450
uint32_t driver_idx = 0;
451451
ze_driver_handle_t driver = NULL;
452452

453-
int ret = init_level_zero();
453+
int ret = utils_ze_init_level_zero();
454454
if (ret != 0) {
455455
fprintf(stderr, "Failed to init Level 0!\n");
456456
return ret;

‎test/providers/level_zero_helpers.cpp‎ renamed to ‎src/utils/utils_level_zero.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
*/
77

8-
#include "level_zero_helpers.h"
8+
#include "utils_level_zero.h"
99

1010
#include <memory>
1111
#include <stdlib.h>
@@ -297,7 +297,7 @@ int InitLevelZeroOps() {
297297
}
298298
#endif // USE_DLOPEN
299299

300-
static int init_level_zero_lib(void) {
300+
static int utils_ze_init_level_zero_lib(void) {
301301
ze_init_flag_t flags = ZE_INIT_FLAG_GPU_ONLY;
302302
ze_result_t result = libze_ops.zeInit(flags);
303303
if (result != ZE_RESULT_SUCCESS) {
@@ -309,16 +309,16 @@ static int init_level_zero_lib(void) {
309309
static UTIL_ONCE_FLAG level_zero_init_flag = UTIL_ONCE_FLAG_INIT;
310310
static int InitResult;
311311

312-
static void init_level_zero_once(void) {
312+
static void utils_ze_init_level_zero_once(void) {
313313
InitResult = InitLevelZeroOps();
314314
if (InitResult != 0) {
315315
return;
316316
}
317-
InitResult = init_level_zero_lib();
317+
InitResult = utils_ze_init_level_zero_lib();
318318
}
319319

320-
static int init_level_zero(void) {
321-
utils_init_once(&level_zero_init_flag, init_level_zero_once);
320+
int utils_ze_init_level_zero(void) {
321+
utils_init_once(&level_zero_init_flag, utils_ze_init_level_zero_once);
322322

323323
return InitResult;
324324
}
@@ -330,9 +330,9 @@ int utils_ze_get_drivers(uint32_t *drivers_num_,
330330
ze_driver_handle_t *drivers = NULL;
331331
uint32_t drivers_num = 0;
332332

333-
ret = init_level_zero();
333+
ret = utils_ze_init_level_zero();
334334
if (ret != 0) {
335-
fprintf(stderr, "init_level_zero() failed!\n");
335+
fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
336336
goto init_fail;
337337
}
338338

@@ -383,9 +383,9 @@ int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
383383
uint32_t devices_num = 0;
384384
ze_device_handle_t *devices = NULL;
385385

386-
ret = init_level_zero();
386+
ret = utils_ze_init_level_zero();
387387
if (ret != 0) {
388-
fprintf(stderr, "init_level_zero() failed!\n");
388+
fprintf(stderr, "utils_ze_init_level_zero() failed!\n");
389389
goto init_fail;
390390
}
391391

‎test/providers/level_zero_helpers.h‎ renamed to ‎src/utils/utils_level_zero.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
*/
77

8-
#ifndef UMF_TEST_LEVEL_ZERO_HELPERS_H
9-
#define UMF_TEST_LEVEL_ZERO_HELPERS_H
8+
#ifndef UMF_UTILS_LEVEL_ZERO_H
9+
#define UMF_UTILS_LEVEL_ZERO_H
1010

1111
#include <umf/providers/provider_level_zero.h>
1212

@@ -16,6 +16,9 @@
1616
extern "C" {
1717
#endif
1818

19+
int utils_ze_init_level_zero(void);
20+
int utils_ze_init_level_zero(void);
21+
1922
int utils_ze_get_drivers(uint32_t *drivers_num_, ze_driver_handle_t **drivers_);
2023

2124
int utils_ze_get_devices(ze_driver_handle_t driver, uint32_t *devices_num_,
@@ -46,4 +49,4 @@ ze_memory_type_t utils_ze_get_mem_type(ze_context_handle_t context, void *ptr);
4649
}
4750
#endif
4851

49-
#endif // UMF_TEST_LEVEL_ZERO_HELPERS_H
52+
#endif // UMF_UTILS_LEVEL_ZERO_H

‎test/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,15 +358,15 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
358358
# dlopen)
359359
add_umf_test(
360360
NAME provider_level_zero
361-
SRCS providers/provider_level_zero.cpp providers/level_zero_helpers.cpp
361+
SRCS providers/provider_level_zero.cpp ../src/utils/utils_level_zero.cpp
362362
${BA_SOURCES_FOR_TEST}
363363
LIBS ${UMF_UTILS_FOR_TEST} ze_loader)
364364
target_include_directories(umf_test-provider_level_zero
365365
PRIVATE ${LEVEL_ZERO_INCLUDE_DIRS})
366366

367367
add_umf_test(
368368
NAME provider_level_zero_dlopen
369-
SRCS providers/provider_level_zero.cpp providers/level_zero_helpers.cpp
369+
SRCS providers/provider_level_zero.cpp ../src/utils/utils_level_zero.cpp
370370
${BA_SOURCES_FOR_TEST}
371371
LIBS ${UMF_UTILS_FOR_TEST})
372372
target_compile_definitions(umf_test-provider_level_zero_dlopen
@@ -580,7 +580,7 @@ if(LINUX)
580580
providers/ipc_level_zero_prov_consumer.c
581581
common/ipc_common.c
582582
providers/ipc_level_zero_prov_common.c
583-
providers/level_zero_helpers.cpp
583+
../src/utils/utils_level_zero.cpp
584584
LIBS
585585
ze_loader
586586
disjoint_pool
@@ -592,7 +592,7 @@ if(LINUX)
592592
providers/ipc_level_zero_prov_producer.c
593593
common/ipc_common.c
594594
providers/ipc_level_zero_prov_common.c
595-
providers/level_zero_helpers.cpp
595+
../src/utils/utils_level_zero.cpp
596596
LIBS
597597
ze_loader
598598
disjoint_pool

‎test/providers/ipc_level_zero_prov_common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "ipc_level_zero_prov_common.h"
9-
#include "level_zero_helpers.h"
9+
#include "utils_level_zero.h"
1010

1111
#include <umf/providers/provider_level_zero.h>
1212

‎test/providers/ipc_level_zero_prov_consumer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "ipc_common.h"
1515
#include "ipc_level_zero_prov_common.h"
16-
#include "level_zero_helpers.h"
16+
#include "utils_level_zero.h"
1717

1818
int main(int argc, char *argv[]) {
1919
if (argc < 2) {

‎test/providers/ipc_level_zero_prov_producer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "ipc_common.h"
1515
#include "ipc_level_zero_prov_common.h"
16-
#include "level_zero_helpers.h"
16+
#include "utils_level_zero.h"
1717

1818
int main(int argc, char *argv[]) {
1919
if (argc < 2) {

‎test/providers/provider_level_zero.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <umf/providers/provider_level_zero.h>
1313

1414
#include "ipcFixtures.hpp"
15-
#include "level_zero_helpers.h"
1615
#include "pool.hpp"
16+
#include "utils_level_zero.h"
1717
#include "utils_load_library.h"
1818

1919
using umf_test::test;

0 commit comments

Comments
 (0)