Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-11-15 10:14:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove compute_runtime_mockable_extra lib

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
level_zero/CMakeLists.txt
View File

@@ -8,9 +8,6 @@ include(cmake/verify_l0_support.cmake)
if(BUILD_WITH_L0)
set(TARGET_NAME_L0 ze_intel_gpu)
if(NOT SKIP_UNIT_TESTS)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/l0_tests.cmake)
endif()
# Level Zero third party detection
if(DEFINED LEVEL_ZERO_ROOT)

60
level_zero/cmake/l0_tests.cmake
View File

@@ -1,60 +0,0 @@
#
# Copyright (C) 2020-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
#Extract compute runtime COMPILE_DEFINITIONS
get_property(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS
TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS
)
#Extract compute runtime INCLUDE_DIRECTORIES
get_property(COMPUTE_RUNTIME_MOCKABLE_INCLUDES
TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}
PROPERTY INCLUDE_DIRECTORIES
)
# Create a library that has the missing ingredients to link
add_library(compute_runtime_mockable_extra
STATIC
EXCLUDE_FROM_ALL
${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
${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
)
set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
# These need to be added to a project to enable platform support in ULTs
#Additional includes for ULT builds
target_include_directories(compute_runtime_mockable_extra
PUBLIC
${COMPUTE_RUNTIME_MOCKABLE_INCLUDES}
)
#Additional compile definitions for ULT builds
target_compile_definitions(compute_runtime_mockable_extra
PUBLIC
${COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS}
)
target_link_libraries(compute_runtime_mockable_extra
gmock-gtest
${NEO_EXTRA_LIBS}
)
set_target_properties(compute_runtime_mockable_extra PROPERTIES
POSITION_INDEPENDENT_CODE ON
FOLDER ${TARGET_NAME_L0}
)

33
level_zero/core/test/aub_tests/CMakeLists.txt
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()

12
level_zero/core/test/unit_tests/CMakeLists.txt
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

8
level_zero/experimental/test/unit_tests/CMakeLists.txt
View File

@@ -25,8 +25,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/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
)
@@ -39,8 +37,6 @@ target_sources(
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/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
)
target_sources(
@@ -50,6 +46,8 @@ target_sources(
$<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_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0})
@@ -77,7 +75,7 @@ endif()
target_link_libraries(
${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}
compute_runtime_mockable_extra ${HW_LIBS_ULT} gmock-gtest
${HW_LIBS_ULT} gmock-gtest ${NEO_EXTRA_LIBS}
)
target_sources(${TARGET_NAME} PRIVATE $<TARGET_OBJECTS:mock_gmm>

12
level_zero/tools/test/unit_tests/CMakeLists.txt
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
)
target_sources(${TARGET_NAME} PRIVATE
@@ -32,8 +30,6 @@ target_sources(${TARGET_NAME} PRIVATE
${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp
${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
)
target_sources(${TARGET_NAME} PRIVATE
@@ -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_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0})
@@ -58,18 +56,16 @@ target_include_directories(${TARGET_NAME}
${IGC_COMMON_PARENT_DIR}
)
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

16
opencl/test/unit_test/CMakeLists.txt
View File

@@ -28,8 +28,6 @@ add_dependencies(unit_tests copy_test_files_per_product)
set(IGDRCL_SRCS_tests_local
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${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_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
)
@@ -60,6 +58,8 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_VME_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_unit_tests_config>
)
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
@@ -67,18 +67,6 @@ if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
)
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME)
add_library(aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
)
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
$<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>
$<TARGET_OBJECTS:aub_stream_mock_lib>
)
else()
list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp)
endif()
add_executable(igdrcl_tests
${NEO_IGDRCL_TESTS__TARGET_OBJECTS}
${IGDRCL_SRCS_tests_local}

22
opencl/test/unit_test/aub_tests/CMakeLists.txt
View File

@@ -8,19 +8,17 @@ project(igdrcl_aub_tests)
set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations)
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
${NEO_SHARED_aub_tests_configurations}
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_libult>
$<TARGET_OBJECTS:igdrcl_libult_env>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_aub_tests_config>
)
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
@@ -58,23 +56,10 @@ target_include_directories(igdrcl_aub_tests PRIVATE
target_sources(igdrcl_aub_tests PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
)
if(WIN32)
target_sources(igdrcl_aub_tests PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
else()
target_sources(igdrcl_aub_tests PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
)
endif()
copy_gmm_dll_for(igdrcl_aub_tests)
add_subdirectories()
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS})
@@ -82,9 +67,6 @@ if(UNIX)
target_link_libraries(igdrcl_aub_tests ${GMM_LINK_NAME})
else()
add_dependencies(igdrcl_aub_tests ${GMM_TARGET_NAME})
target_sources(igdrcl_aub_tests PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
endif()
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX})

5
opencl/test/unit_test/linux/CMakeLists.txt
View File

@@ -12,10 +12,11 @@ add_executable(igdrcl_${target_name}
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_unit_tests_config>
$<TARGET_OBJECTS:mock_gmm>
${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/drm_wrap.h
${CMAKE_CURRENT_SOURCE_DIR}/linux_tests_configuration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/main_linux_dll.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
@@ -28,8 +29,6 @@ add_executable(igdrcl_${target_name}
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}drm_other_requests.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
)
if(NEO__LIBVA_FOUND)
target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp)

13
opencl/test/unit_test/linux/linux_tests_configuration.cpp
View File

@@ -1,13 +0,0 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "test_mode.h"
namespace NEO {
const char *executionName = "ULT";
TestMode testMode = defaultTestMode;
} // namespace NEO

7
opencl/test/unit_test/mocks/CMakeLists.txt
View File

@@ -71,13 +71,6 @@ endif()
add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks})
add_subdirectories()
get_property(NEO_CORE_tests_mocks GLOBAL PROPERTY NEO_CORE_tests_mocks)
list(APPEND NEO_CORE_tests_mocks
${NEO_CORE_tests_mocks}
)
target_sources(igdrcl_mocks PRIVATE ${NEO_CORE_tests_mocks})
target_include_directories(igdrcl_mocks PRIVATE
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${NEO_STATIC_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>

5
opencl/test/unit_test/mt_tests/CMakeLists.txt
View File

@@ -11,15 +11,14 @@ set(OPENCL_MT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
add_custom_target(run_mt_unit_tests)
add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${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}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
$<TARGET_OBJECTS:igdrcl_libult>
$<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>
$<TARGET_OBJECTS:igdrcl_libult_env>
$<TARGET_OBJECTS:mock_gmm>
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>

5
opencl/test/unit_test/windows/CMakeLists.txt
View File

@@ -9,6 +9,8 @@ if(WIN32)
set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_unit_tests_config>
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:igdrcl_libult_env>
$<TARGET_OBJECTS:mock_gmm>
@@ -19,7 +21,6 @@ if(WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/direct_submission_controller_enabled.cpp
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
@@ -32,8 +33,6 @@ if(WIN32)
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/os_memory_virtual_alloc_ult.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/wddm_calls.cpp
${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_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
)

15
shared/test/common/mocks/CMakeLists.txt
View File

@@ -52,7 +52,6 @@ set(NEO_CORE_tests_mocks
${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info_common.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_host_ptr_manager.h
@@ -94,4 +93,16 @@ else()
)
endif()
set_property(GLOBAL PROPERTY NEO_CORE_tests_mocks ${NEO_CORE_tests_mocks})
add_library(neo_shared_mocks OBJECT EXCLUDE_FROM_ALL ${NEO_CORE_tests_mocks})
set_target_properties(neo_shared_mocks PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(neo_shared_mocks PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER})
set_property(TARGET neo_shared_mocks APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
target_include_directories(neo_shared_mocks PRIVATE
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
${IGC_COMMON_PARENT_DIR}
)
target_compile_definitions(neo_shared_mocks PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
create_project_source_tree(neo_shared_mocks)

26
shared/test/common/test_configuration/aub_tests/CMakeLists.txt
View File

@@ -10,7 +10,31 @@ set(NEO_SHARED_aub_tests_configurations
${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.h
${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
)
if(UNIX)
list(APPEND NEO_SHARED_aub_tests_configurations
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
)
else()
list(APPEND NEO_SHARED_aub_tests_configurations
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
endif()
add_subdirectories()
set_property(GLOBAL PROPERTY NEO_SHARED_aub_tests_configurations ${NEO_SHARED_aub_tests_configurations})
add_library(neo_aub_tests_config OBJECT EXCLUDE_FROM_ALL ${NEO_SHARED_aub_tests_configurations})
set_target_properties(neo_aub_tests_config PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(neo_aub_tests_config PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER})
set_property(TARGET neo_aub_tests_config APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
target_include_directories(neo_aub_tests_config PUBLIC
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
${CMAKE_CURRENT_SOURCE_DIR}
)
target_compile_definitions(neo_aub_tests_config PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
create_project_source_tree(neo_aub_tests_config)

32
shared/test/common/test_configuration/unit_tests/CMakeLists.txt Normal file
View File

@@ -0,0 +1,32 @@
#
# Copyright (C) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(NEO_SHARED_unit_tests_configurations
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_resource_info_common.cpp
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
list(APPEND NEO_SHARED_unit_tests_configurations
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
)
else()
list(APPEND NEO_SHARED_unit_tests_configurations
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
)
endif()
add_library(neo_unit_tests_config OBJECT EXCLUDE_FROM_ALL ${NEO_SHARED_unit_tests_configurations})
set_target_properties(neo_unit_tests_config PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(neo_unit_tests_config PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER})
set_property(TARGET neo_unit_tests_config APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
target_include_directories(neo_unit_tests_config PRIVATE
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
)
target_compile_definitions(neo_unit_tests_config PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
create_project_source_tree(neo_unit_tests_config)

9
shared/test/unit_test/CMakeLists.txt
View File

@@ -28,15 +28,13 @@ if(NOT SKIP_UNIT_TESTS)
${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp
${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
$<TARGET_OBJECTS:mock_gmm>
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_libult>
$<TARGET_OBJECTS:neo_shared_mocks>
)
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
@@ -74,9 +72,8 @@ if(NOT SKIP_UNIT_TESTS)
add_subdirectories()
endif()
get_property(NEO_CORE_tests_mocks GLOBAL PROPERTY NEO_CORE_tests_mocks)
target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_tests_mocks})
add_dependencies(${TARGET_NAME} prepare_test_kernel_for_shared)
target_sources(${TARGET_NAME} PRIVATE $<TARGET_OBJECTS:neo_unit_tests_config>)
add_dependencies(unit_tests prepare_test_kernel_for_shared)
add_dependencies(unit_tests ${TARGET_NAME})
create_project_source_tree(${TARGET_NAME})