Remove compute_runtime_mockable_extra lib

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-10-26 19:35:34 +00:00
committed by Compute-Runtime-Automation
parent 32ae9555f1
commit ae610ea602
17 changed files with 96 additions and 187 deletions

View File

@@ -9,12 +9,9 @@ link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
set(TARGET_NAME ${TARGET_NAME_L0}_aub_tests)
set(L0_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations)
list(APPEND L0_AUB_TESTS__TARGET_OBJECTS
${CMAKE_CURRENT_SOURCE_DIR}/aub_hello_world_test.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp
${NEO_SHARED_aub_tests_configurations}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
)
@@ -47,24 +44,6 @@ target_sources(${TARGET_NAME} PRIVATE
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
)
target_sources(${TARGET_NAME} PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.h
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.h
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_deferred_deleter.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_device.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context_base.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_resource_info_common.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
${NEO_SHARED_DIRECTORY}/debug_settings/debug_settings_manager.cpp
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
)
target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_fixtures>
@@ -72,8 +51,10 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_libult>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDLESS_LIB_NAME}>
$<TARGET_OBJECTS:neo_aub_tests_config>
)
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
target_sources(${TARGET_NAME} PRIVATE
@@ -81,16 +62,6 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
)
endif()
if(UNIX)
target_sources(${TARGET_NAME} PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
)
else()
target_sources(${TARGET_NAME} PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
endif()
copy_gmm_dll_for(${TARGET_NAME})
add_subdirectories()

View File

@@ -20,8 +20,6 @@ ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
add_executable(${TARGET_NAME}
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp
${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
)
@@ -31,8 +29,6 @@ target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/mock.h
${CMAKE_CURRENT_SOURCE_DIR}/white_box.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/gen_kernel.cmake
)
@@ -41,6 +37,8 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_libult>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_unit_tests_config>
)
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
@@ -78,18 +76,16 @@ else()
)
endif()
if(UNIX)
target_link_libraries(${TARGET_NAME} pthread rt)
else()
if(WIN32)
target_link_libraries(${TARGET_NAME} dbghelp)
add_dependencies(${TARGET_NAME} mock_gdi)
endif()
target_link_libraries(${TARGET_NAME}
${NEO_SHARED_MOCKABLE_LIB_NAME}
compute_runtime_mockable_extra
${HW_LIBS_ULT}
gmock-gtest
${NEO_EXTRA_LIBS}
)
target_sources(${TARGET_NAME} PRIVATE