Skip to content

Commit ae610ea

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Remove compute_runtime_mockable_extra lib
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 32ae955 commit ae610ea

File tree

17 files changed

+96
-187
lines changed

17 files changed

+96
-187
lines changed

‎level_zero/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ include(cmake/verify_l0_support.cmake)
88

99
if(BUILD_WITH_L0)
1010
set(TARGET_NAME_L0 ze_intel_gpu)
11-
if(NOT SKIP_UNIT_TESTS)
12-
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/l0_tests.cmake)
13-
endif()
1411

1512
# Level Zero third party detection
1613
if(DEFINED LEVEL_ZERO_ROOT)

‎level_zero/cmake/l0_tests.cmake‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎level_zero/core/test/aub_tests/CMakeLists.txt‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
99
set(TARGET_NAME ${TARGET_NAME_L0}_aub_tests)
1010
set(L0_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
1111

12-
get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations)
13-
1412
list(APPEND L0_AUB_TESTS__TARGET_OBJECTS
1513
${CMAKE_CURRENT_SOURCE_DIR}/aub_hello_world_test.cpp
1614
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp
17-
${NEO_SHARED_aub_tests_configurations}
1815
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
1916
)
2017

@@ -47,50 +44,24 @@ target_sources(${TARGET_NAME} PRIVATE
4744
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
4845
)
4946

50-
target_sources(${TARGET_NAME} PRIVATE
51-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.cpp
52-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.h
53-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
54-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
55-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
56-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp
57-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.h
58-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.cpp
59-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_deferred_deleter.cpp
60-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_device.cpp
61-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context_base.cpp
62-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_resource_info_common.cpp
63-
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
64-
${NEO_SHARED_DIRECTORY}/debug_settings/debug_settings_manager.cpp
65-
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
66-
)
67-
6847
target_sources(${TARGET_NAME} PRIVATE
6948
$<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
7049
$<TARGET_OBJECTS:${TARGET_NAME_L0}_fixtures>
7150
$<TARGET_OBJECTS:${TARGET_NAME_L0}_mocks>
7251
$<TARGET_OBJECTS:neo_libult_common>
7352
$<TARGET_OBJECTS:neo_libult_cs>
7453
$<TARGET_OBJECTS:neo_libult>
54+
$<TARGET_OBJECTS:neo_shared_mocks>
7555
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
7656
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDLESS_LIB_NAME}>
57+
$<TARGET_OBJECTS:neo_aub_tests_config>
7758
)
7859
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
7960
target_sources(${TARGET_NAME} PRIVATE
8061
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
8162
)
8263
endif()
8364

84-
if(UNIX)
85-
target_sources(${TARGET_NAME} PRIVATE
86-
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
87-
)
88-
else()
89-
target_sources(${TARGET_NAME} PRIVATE
90-
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
91-
)
92-
endif()
93-
9465
copy_gmm_dll_for(${TARGET_NAME})
9566
add_subdirectories()
9667

‎level_zero/core/test/unit_tests/CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
2020

2121
add_executable(${TARGET_NAME}
2222
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
23-
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp
24-
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h
2523
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
2624
)
2725

@@ -31,8 +29,6 @@ target_sources(${TARGET_NAME} PRIVATE
3129
${CMAKE_CURRENT_SOURCE_DIR}/mock.h
3230
${CMAKE_CURRENT_SOURCE_DIR}/white_box.h
3331
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
34-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
35-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
3632
${NEO_SOURCE_DIR}/level_zero/core/test/common/gen_kernel.cmake
3733
)
3834

@@ -41,6 +37,8 @@ target_sources(${TARGET_NAME} PRIVATE
4137
$<TARGET_OBJECTS:neo_libult_common>
4238
$<TARGET_OBJECTS:neo_libult_cs>
4339
$<TARGET_OBJECTS:neo_libult>
40+
$<TARGET_OBJECTS:neo_shared_mocks>
41+
$<TARGET_OBJECTS:neo_unit_tests_config>
4442
)
4543

4644
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
@@ -78,18 +76,16 @@ else()
7876
)
7977
endif()
8078

81-
if(UNIX)
82-
target_link_libraries(${TARGET_NAME} pthread rt)
83-
else()
79+
if(WIN32)
8480
target_link_libraries(${TARGET_NAME} dbghelp)
8581
add_dependencies(${TARGET_NAME} mock_gdi)
8682
endif()
8783

8884
target_link_libraries(${TARGET_NAME}
8985
${NEO_SHARED_MOCKABLE_LIB_NAME}
90-
compute_runtime_mockable_extra
9186
${HW_LIBS_ULT}
9287
gmock-gtest
88+
${NEO_EXTRA_LIBS}
9389
)
9490

9591
target_sources(${TARGET_NAME} PRIVATE

‎level_zero/experimental/test/unit_tests/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ add_supported_test_product_families_definition()
2525
add_executable(
2626
${TARGET_NAME}
2727
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
28-
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp
29-
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h
3028
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp
3129
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
3230
)
@@ -39,8 +37,6 @@ target_sources(
3937
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h
4038
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h
4139
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
42-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
43-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
4440
)
4541

4642
target_sources(
@@ -50,6 +46,8 @@ target_sources(
5046
$<TARGET_OBJECTS:neo_libult_common>
5147
$<TARGET_OBJECTS:neo_libult_cs>
5248
$<TARGET_OBJECTS:neo_libult>
49+
$<TARGET_OBJECTS:neo_shared_mocks>
50+
$<TARGET_OBJECTS:neo_unit_tests_config>
5351
)
5452

5553
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0})
@@ -77,7 +75,7 @@ endif()
7775

7876
target_link_libraries(
7977
${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}
80-
compute_runtime_mockable_extra ${HW_LIBS_ULT} gmock-gtest
78+
${HW_LIBS_ULT} gmock-gtest ${NEO_EXTRA_LIBS}
8179
)
8280

8381
target_sources(${TARGET_NAME} PRIVATE $<TARGET_OBJECTS:mock_gmm>

‎level_zero/tools/test/unit_tests/CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
2020

2121
add_executable(${TARGET_NAME}
2222
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
23-
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp
24-
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h
2523
)
2624

2725
target_sources(${TARGET_NAME} PRIVATE
@@ -32,15 +30,15 @@ target_sources(${TARGET_NAME} PRIVATE
3230
${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp
3331
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
3432
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
35-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
36-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
3733
)
3834

3935
target_sources(${TARGET_NAME} PRIVATE
4036
$<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
4137
$<TARGET_OBJECTS:neo_libult_common>
4238
$<TARGET_OBJECTS:neo_libult_cs>
4339
$<TARGET_OBJECTS:neo_libult>
40+
$<TARGET_OBJECTS:neo_shared_mocks>
41+
$<TARGET_OBJECTS:neo_unit_tests_config>
4442
)
4543

4644
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0})
@@ -58,18 +56,16 @@ target_include_directories(${TARGET_NAME}
5856
${IGC_COMMON_PARENT_DIR}
5957
)
6058

61-
if(UNIX)
62-
target_link_libraries(${TARGET_NAME} pthread rt)
63-
else()
59+
if(WIN32)
6460
target_link_libraries(${TARGET_NAME} dbghelp)
6561
add_dependencies(${TARGET_NAME} mock_gdi)
6662
endif()
6763

6864
target_link_libraries(${TARGET_NAME}
6965
${NEO_SHARED_MOCKABLE_LIB_NAME}
70-
compute_runtime_mockable_extra
7166
${HW_LIBS_ULT}
7267
gmock-gtest
68+
${NEO_EXTRA_LIBS}
7369
)
7470

7571
target_sources(${TARGET_NAME} PRIVATE

‎opencl/test/unit_test/CMakeLists.txt‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ add_dependencies(unit_tests copy_test_files_per_product)
2828

2929
set(IGDRCL_SRCS_tests_local
3030
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
31-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
32-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
3331
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
3432
)
3533

@@ -60,25 +58,15 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
6058
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
6159
$<TARGET_OBJECTS:${BUILTINS_VME_LIB_NAME}>
6260
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
61+
$<TARGET_OBJECTS:neo_shared_mocks>
62+
$<TARGET_OBJECTS:neo_unit_tests_config>
6363
)
6464
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
6565
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
6666
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
6767
)
6868
endif()
6969

70-
if(DEFINED AUB_STREAM_PROJECT_NAME)
71-
add_library(aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
72-
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
73-
)
74-
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
75-
$<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>
76-
$<TARGET_OBJECTS:aub_stream_mock_lib>
77-
)
78-
else()
79-
list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp)
80-
endif()
81-
8270
add_executable(igdrcl_tests
8371
${NEO_IGDRCL_TESTS__TARGET_OBJECTS}
8472
${IGDRCL_SRCS_tests_local}

‎opencl/test/unit_test/aub_tests/CMakeLists.txt‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@ project(igdrcl_aub_tests)
88

99
set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
1010

11-
get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations)
12-
1311
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
1412
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
15-
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
1613
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
17-
${NEO_SHARED_aub_tests_configurations}
1814
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
1915
$<TARGET_OBJECTS:igdrcl_libult>
2016
$<TARGET_OBJECTS:neo_libult_common>
2117
$<TARGET_OBJECTS:neo_libult_cs>
2218
$<TARGET_OBJECTS:neo_libult>
2319
$<TARGET_OBJECTS:igdrcl_libult_env>
20+
$<TARGET_OBJECTS:neo_shared_mocks>
21+
$<TARGET_OBJECTS:neo_aub_tests_config>
2422
)
2523
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
2624
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
@@ -58,33 +56,17 @@ target_include_directories(igdrcl_aub_tests PRIVATE
5856

5957
target_sources(igdrcl_aub_tests PRIVATE
6058
${NEO_SHARED_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
61-
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
6259
)
63-
64-
if(WIN32)
65-
target_sources(igdrcl_aub_tests PRIVATE
66-
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
67-
)
68-
else()
69-
target_sources(igdrcl_aub_tests PRIVATE
70-
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
71-
)
72-
endif()
73-
7460
copy_gmm_dll_for(igdrcl_aub_tests)
7561
add_subdirectories()
7662

77-
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
7863
target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
7964
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
8065
target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS})
8166
if(UNIX)
8267
target_link_libraries(igdrcl_aub_tests ${GMM_LINK_NAME})
8368
else()
8469
add_dependencies(igdrcl_aub_tests ${GMM_TARGET_NAME})
85-
target_sources(igdrcl_aub_tests PRIVATE
86-
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
87-
)
8870
endif()
8971
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX})
9072

‎opencl/test/unit_test/linux/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ add_executable(igdrcl_${target_name}
1212
$<TARGET_OBJECTS:igdrcl_libult>
1313
$<TARGET_OBJECTS:neo_libult_common>
1414
$<TARGET_OBJECTS:neo_libult_cs>
15+
$<TARGET_OBJECTS:neo_shared_mocks>
16+
$<TARGET_OBJECTS:neo_unit_tests_config>
1517
$<TARGET_OBJECTS:mock_gmm>
1618
${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp
1719
${CMAKE_CURRENT_SOURCE_DIR}/drm_wrap.h
18-
${CMAKE_CURRENT_SOURCE_DIR}/linux_tests_configuration.cpp
1920
${CMAKE_CURRENT_SOURCE_DIR}/main_linux_dll.cpp
2021
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp
2122
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
@@ -28,8 +29,6 @@ add_executable(igdrcl_${target_name}
2829
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
2930
${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
3031
${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}drm_other_requests.cpp
31-
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
32-
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
3332
)
3433
if(NEO__LIBVA_FOUND)
3534
target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp)

‎opencl/test/unit_test/linux/linux_tests_configuration.cpp‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)