diff --git a/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp b/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp deleted file mode 100644 index 8be23e74da..0000000000 --- a/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2020-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/unit_test/mocks/mock_l0_debugger.h" - -namespace NEO { - -struct Gen11Family; -using GfxFamily = Gen11Family; -} // namespace NEO - -namespace L0 { -namespace ult { -static MockDebuggerL0HwPopulateFactory mockDebuggerGen11; -} -} // namespace L0 diff --git a/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp deleted file mode 100644 index acc2fcd4a4..0000000000 --- a/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2020-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/unit_test/mocks/mock_l0_debugger.h" - -namespace NEO { - -struct Gen12LpFamily; -using GfxFamily = Gen12LpFamily; - -} // namespace NEO - -namespace L0 { -namespace ult { -static MockDebuggerL0HwPopulateFactory mockDebuggerGen12lp; -} -} // namespace L0 \ No newline at end of file diff --git a/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp b/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp deleted file mode 100644 index 2d519f0cb6..0000000000 --- a/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2020-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/unit_test/mocks/mock_l0_debugger.h" - -namespace NEO { -struct Gen9Family; -using GfxFamily = Gen9Family; -} // namespace NEO - -namespace L0 { -namespace ult { -static MockDebuggerL0HwPopulateFactory mockDebuggerGen9; -} -} // namespace L0 \ No newline at end of file diff --git a/level_zero/core/test/unit_tests/xe_hp_core/enable_l0_mocks_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/enable_l0_mocks_xe_hp_core.cpp deleted file mode 100644 index f9c90f2acd..0000000000 --- a/level_zero/core/test/unit_tests/xe_hp_core/enable_l0_mocks_xe_hp_core.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/unit_test/mocks/mock_l0_debugger.h" - -namespace NEO { -struct XeHpFamily; -using GfxFamily = XeHpFamily; -} // namespace NEO - -namespace L0 { -namespace ult { -static MockDebuggerL0HwPopulateFactory mockDebuggerXE_HP_CORE; -} -} // namespace L0 diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp deleted file mode 100644 index 9c0e60dcd4..0000000000 --- a/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/unit_test/mocks/mock_l0_debugger.h" - -namespace NEO { -struct XeHpcCoreFamily; -using GfxFamily = XeHpcCoreFamily; -} // namespace NEO - -namespace L0 { -namespace ult { -static MockDebuggerL0HwPopulateFactory mockDebuggerXeHpcCore; -} -} // namespace L0 diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp deleted file mode 100644 index a2aaa338ce..0000000000 --- a/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/unit_test/mocks/mock_l0_debugger.h" - -namespace NEO { -struct XeHpgCoreFamily; -using GfxFamily = XeHpgCoreFamily; -} // namespace NEO - -namespace L0 { -namespace ult { -static MockDebuggerL0HwPopulateFactory mockDebuggerXeHpgCore; -} -} // namespace L0 diff --git a/opencl/test/unit_test/gen11/CMakeLists.txt b/opencl/test/unit_test/gen11/CMakeLists.txt index 61509ea248..262e792dde 100644 --- a/opencl/test/unit_test/gen11/CMakeLists.txt +++ b/opencl/test/unit_test/gen11/CMakeLists.txt @@ -7,10 +7,10 @@ if(TESTS_GEN11) set(IGDRCL_SRCS_tests_gen11 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen11.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen11.cpp diff --git a/opencl/test/unit_test/gen11/cl_hw_helper_tests_gen11.cpp b/opencl/test/unit_test/gen11/cl_hw_helper_tests_gen11.cpp new file mode 100644 index 0000000000..3066a215f4 --- /dev/null +++ b/opencl/test/unit_test/gen11/cl_hw_helper_tests_gen11.cpp @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2019-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/source/gen11/hw_cmds.h" +#include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" + +#include "opencl/source/helpers/cl_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" + +using HwHelperTestGen11 = HwHelperTest; + +GEN11TEST_F(HwHelperTestGen11, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { + EXPECT_EQ(ClHwHelperMock::makeDeviceIpVersion(11, 0, 0), ClHwHelper::get(renderCoreFamily).getDeviceIpVersion(*defaultHwInfo)); +} + +GEN11TEST_F(HwHelperTestGen11, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { + EXPECT_EQ(0u, ClHwHelper::get(renderCoreFamily).getSupportedDeviceFeatureCapabilities(hardwareInfo)); +} diff --git a/opencl/test/unit_test/gen9/CMakeLists.txt b/opencl/test/unit_test/gen9/CMakeLists.txt index ebb3c53f31..97708d2c03 100644 --- a/opencl/test/unit_test/gen9/CMakeLists.txt +++ b/opencl/test/unit_test/gen9/CMakeLists.txt @@ -8,11 +8,11 @@ if(TESTS_GEN9) set(IGDRCL_SRCS_tests_gen9 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests_gen9.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen9.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen9.cpp diff --git a/opencl/test/unit_test/gen9/cl_hw_helper_tests_gen9.cpp b/opencl/test/unit_test/gen9/cl_hw_helper_tests_gen9.cpp new file mode 100644 index 0000000000..8491b6d2a9 --- /dev/null +++ b/opencl/test/unit_test/gen9/cl_hw_helper_tests_gen9.cpp @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2018-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/source/gen9/hw_cmds.h" +#include "shared/test/common/helpers/hw_helper_tests.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" + +#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" + +using HwHelperTestGen9 = HwHelperTest; + +GEN9TEST_F(HwHelperTestGen9, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { + EXPECT_EQ(ClHwHelperMock::makeDeviceIpVersion(9, 0, 0), ClHwHelper::get(renderCoreFamily).getDeviceIpVersion(*defaultHwInfo)); +} + +GEN9TEST_F(HwHelperTestGen9, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { + EXPECT_EQ(0u, ClHwHelper::get(renderCoreFamily).getSupportedDeviceFeatureCapabilities(*defaultHwInfo)); +} diff --git a/opencl/test/unit_test/program/process_elf_binary_tests.cpp b/opencl/test/unit_test/program/process_elf_binary_tests.cpp index f29966b6f6..f9b203f2b5 100644 --- a/opencl/test/unit_test/program/process_elf_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_elf_binary_tests.cpp @@ -12,12 +12,12 @@ #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/string.h" +#include "shared/test/common/device_binary_format/elf/elf_tests_data.h" #include "shared/test/common/device_binary_format/patchtokens_tests.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_elf.h" -#include "shared/test/unit_test/device_binary_format/elf/elf_tests_data.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp index 4d65a83bf9..f0268bb223 100644 --- a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp +++ b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/device_binary_format/patchtokens_decoder.h" +#include "shared/test/common/device_binary_format/elf/elf_tests_data.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/helpers/kernel_binary_helper.h" @@ -13,7 +14,6 @@ #include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" #include "shared/test/common/test_macros/test.h" -#include "shared/test/unit_test/device_binary_format/elf/elf_tests_data.h" #include "opencl/test/unit_test/fixtures/program_fixture.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/shared/CMakeLists.txt b/shared/CMakeLists.txt index e47193c36b..08674bfc44 100644 --- a/shared/CMakeLists.txt +++ b/shared/CMakeLists.txt @@ -1,14 +1,24 @@ # -# Copyright (C) 2021 Intel Corporation +# Copyright (C) 2021-2022 Intel Corporation # # SPDX-License-Identifier: MIT # add_subdirectory(source) add_subdirectory(generate_cpp_array) -add_subdirectory(test/unit_test) + +set(SHARED_TEST_PROJECTS_FOLDER "neo shared") +include(${NEO_SOURCE_DIR}/cmake/setup_ult_global_flags.cmake) + +if(NOT NEO_SKIP_UNIT_TESTS) + add_custom_target(unit_tests) + add_subdirectory(test/common "${NEO_BUILD_DIR}/shared/test/common") + if(NOT NEO_SKIP_SHARED_UNIT_TESTS) + add_subdirectory(test/unit_test) + endif() +endif() + set(TOOLS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tools${BRANCH_DIR_SUFFIX}") if(EXISTS ${TOOLS_DIR} AND EXISTS ${TOOLS_DIR}/CMakeLists.txt) add_subdirectory(${TOOLS_DIR}) endif() - diff --git a/shared/test/common/debug_settings/CMakeLists.txt b/shared/test/common/debug_settings/CMakeLists.txt index 8eb5b76ebc..cbdd30ba07 100644 --- a/shared/test/common/debug_settings/CMakeLists.txt +++ b/shared/test/common/debug_settings/CMakeLists.txt @@ -4,8 +4,7 @@ # SPDX-License-Identifier: MIT # -target_sources(${TARGET_NAME} PRIVATE +target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_fixture.h -) +) \ No newline at end of file diff --git a/shared/test/common/device_binary_format/CMakeLists.txt b/shared/test/common/device_binary_format/CMakeLists.txt index 85e2bccccb..423a7e4969 100644 --- a/shared/test/common/device_binary_format/CMakeLists.txt +++ b/shared/test/common/device_binary_format/CMakeLists.txt @@ -6,5 +6,6 @@ target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/elf/elf_tests_data.h ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_tests.h -) \ No newline at end of file +) diff --git a/shared/test/unit_test/device_binary_format/elf/elf_tests_data.h b/shared/test/common/device_binary_format/elf/elf_tests_data.h similarity index 98% rename from shared/test/unit_test/device_binary_format/elf/elf_tests_data.h rename to shared/test/common/device_binary_format/elf/elf_tests_data.h index e71c46241e..3f6be50459 100644 --- a/shared/test/unit_test/device_binary_format/elf/elf_tests_data.h +++ b/shared/test/common/device_binary_format/elf/elf_tests_data.h @@ -11,6 +11,7 @@ #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/string.h" #include "patch_list.h" diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index 8875ceb426..38363c5a6b 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -4,91 +4,77 @@ # SPDX-License-Identifier: MIT # -set(SHARED_TEST_PROJECTS_FOLDER "neo shared") -if(NOT NEO_SKIP_UNIT_TESTS) +function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION) + set(NEO_SUPPORTED_PRODUCT_FAMILIES ${ALL_TESTED_PRODUCT_FAMILY}) + string(REPLACE ";" "," NEO_SUPPORTED_PRODUCT_FAMILIES "${NEO_SUPPORTED_PRODUCT_FAMILIES}") + add_definitions(-DSUPPORTED_TEST_PRODUCT_FAMILIES=${NEO_SUPPORTED_PRODUCT_FAMILIES}) +endfunction() - add_custom_target(unit_tests) +ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION() +link_libraries(${ASAN_LIBS} ${TSAN_LIBS}) - set(TARGET_NAME neo_shared_tests) +add_executable(neo_shared_tests + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp + ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp + $ + $ + $ + $ + $ +) - include(${NEO_SOURCE_DIR}/cmake/setup_ult_global_flags.cmake) +add_dependencies(neo_shared_tests test_dynamic_lib) - function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION) - set(NEO_SUPPORTED_PRODUCT_FAMILIES ${ALL_TESTED_PRODUCT_FAMILY}) - string(REPLACE ";" "," NEO_SUPPORTED_PRODUCT_FAMILIES "${NEO_SUPPORTED_PRODUCT_FAMILIES}") - add_definitions(-DSUPPORTED_TEST_PRODUCT_FAMILIES=${NEO_SUPPORTED_PRODUCT_FAMILIES}) - endfunction() +set_property(TARGET neo_shared_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) +set_target_properties(neo_shared_tests PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}") - ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION() - link_libraries(${ASAN_LIBS} ${TSAN_LIBS}) +target_include_directories(neo_shared_tests PRIVATE + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests + ${ENGINE_NODE_DIR} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX} +) - add_executable(neo_shared_tests - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp - ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp - $ - $ - $ - $ - $ - ) - - add_dependencies(neo_shared_tests test_dynamic_lib) - - set_property(TARGET neo_shared_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) - set_target_properties(neo_shared_tests PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}") - - target_include_directories(neo_shared_tests PRIVATE - ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests - ${ENGINE_NODE_DIR} - ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX} - ) - - if(UNIX AND NOT DISABLE_WDDM_LINUX) - target_include_directories(neo_shared_tests PUBLIC ${WDK_INCLUDE_PATHS}) - endif() - - if(WIN32) - target_link_libraries(neo_shared_tests dbghelp) - endif() - - target_link_libraries(neo_shared_tests - gmock-gtest - ${NEO_SHARED_MOCKABLE_LIB_NAME} - ${NEO_EXTRA_LIBS} - ) - - if(MSVC) - set_target_properties(neo_shared_tests PROPERTIES - VS_DEBUGGER_COMMAND_ARGUMENTS "--gtest_filter=* --gtest_catch_exceptions=0 --enable_default_listener --disable_pagefaulting_tests" - VS_DEBUGGER_WORKING_DIRECTORY "$(OutDir)" - ) - endif() - - if(COMPILER_SUPPORTS_SSE42) - set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2) - endif() - - add_subdirectory(${NEO_SHARED_TEST_DIRECTORY}/common "${NEO_BUILD_DIR}/shared/test/common") - add_subdirectory_unique(mocks) - - if(NOT NEO_SKIP_SHARED_UNIT_TESTS) - add_subdirectories() - endif() - - target_sources(neo_shared_tests PRIVATE - $ - $ - $ - $ - ) - add_dependencies(unit_tests prepare_test_kernels_for_shared) - add_dependencies(unit_tests neo_shared_tests) - - create_project_source_tree(neo_shared_tests) +if(UNIX AND NOT DISABLE_WDDM_LINUX) + target_include_directories(neo_shared_tests PUBLIC ${WDK_INCLUDE_PATHS}) endif() + +if(WIN32) + target_link_libraries(neo_shared_tests dbghelp) +endif() + +target_link_libraries(neo_shared_tests + gmock-gtest + ${NEO_SHARED_MOCKABLE_LIB_NAME} + ${NEO_EXTRA_LIBS} +) + +if(MSVC) + set_target_properties(neo_shared_tests PROPERTIES + VS_DEBUGGER_COMMAND_ARGUMENTS "--gtest_filter=* --gtest_catch_exceptions=0 --enable_default_listener --disable_pagefaulting_tests" + VS_DEBUGGER_WORKING_DIRECTORY "$(OutDir)" + ) +endif() + +if(COMPILER_SUPPORTS_SSE42) + set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2) +endif() + +add_subdirectory_unique(mocks) +add_subdirectories() + +target_sources(neo_shared_tests PRIVATE + $ + $ + $ + $ +) +add_dependencies(unit_tests prepare_test_kernels_for_shared) +add_dependencies(unit_tests neo_shared_tests) + +create_project_source_tree(neo_shared_tests) diff --git a/shared/test/unit_test/debug_settings/CMakeLists.txt b/shared/test/unit_test/debug_settings/CMakeLists.txt index 6a6f050f41..5eb9e41e0e 100644 --- a/shared/test/unit_test/debug_settings/CMakeLists.txt +++ b/shared/test/unit_test/debug_settings/CMakeLists.txt @@ -6,6 +6,7 @@ target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_tests.cpp ) diff --git a/shared/test/common/debug_settings/debug_manager.cpp b/shared/test/unit_test/debug_settings/debug_manager.cpp similarity index 81% rename from shared/test/common/debug_settings/debug_manager.cpp rename to shared/test/unit_test/debug_settings/debug_manager.cpp index 9eee15ee35..27ae43c704 100644 --- a/shared/test/common/debug_settings/debug_manager.cpp +++ b/shared/test/unit_test/debug_settings/debug_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/shared/test/unit_test/device_binary_format/CMakeLists.txt b/shared/test/unit_test/device_binary_format/CMakeLists.txt index 5aef31a430..72092c490c 100644 --- a/shared/test/unit_test/device_binary_format/CMakeLists.txt +++ b/shared/test/unit_test/device_binary_format/CMakeLists.txt @@ -16,7 +16,6 @@ target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/elf/elf_decoder_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/elf/elf_encoder_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/elf/elf_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/elf/elf_tests_data.h ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_validator_tests.cpp diff --git a/shared/test/unit_test/gen11/CMakeLists.txt b/shared/test/unit_test/gen11/CMakeLists.txt index edd193cf04..d817d13a38 100644 --- a/shared/test/unit_test/gen11/CMakeLists.txt +++ b/shared/test/unit_test/gen11/CMakeLists.txt @@ -10,6 +10,7 @@ if(TESTS_GEN11) ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_gen11_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_gen11.cpp diff --git a/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp b/shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp similarity index 80% rename from opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp rename to shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp index 26a35fcf74..ccc04fe0f6 100644 --- a/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp @@ -11,9 +11,6 @@ #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl" -#include "opencl/source/helpers/cl_hw_helper.h" -#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" - using HwHelperTestGen11 = HwHelperTest; GEN11TEST_F(HwHelperTestGen11, WhenGettingMaxBarriersPerSliceThenCorrectSizeIsReturned) { @@ -38,14 +35,6 @@ GEN11TEST_F(HwHelperTestGen11, whenGetGpgpuEnginesThenReturnThreeRcsEngines) { EXPECT_EQ(3u, pDevice->allEngines.size()); } -GEN11TEST_F(HwHelperTestGen11, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - EXPECT_EQ(ClHwHelperMock::makeDeviceIpVersion(11, 0, 0), ClHwHelper::get(renderCoreFamily).getDeviceIpVersion(*defaultHwInfo)); -} - -GEN11TEST_F(HwHelperTestGen11, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { - EXPECT_EQ(0u, ClHwHelper::get(renderCoreFamily).getSupportedDeviceFeatureCapabilities(hardwareInfo)); -} - using MemorySynchronizatiopCommandsTestsGen11 = ::testing::Test; GEN11TEST_F(MemorySynchronizatiopCommandsTestsGen11, WhenProgrammingCacheFlushThenExpectConstantCacheFieldSet) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; diff --git a/shared/test/unit_test/gen9/CMakeLists.txt b/shared/test/unit_test/gen9/CMakeLists.txt index df847b7ad5..f482d58776 100644 --- a/shared/test/unit_test/gen9/CMakeLists.txt +++ b/shared/test/unit_test/gen9/CMakeLists.txt @@ -9,6 +9,7 @@ if(TESTS_GEN9) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_gen9_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_gen9.cpp diff --git a/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp b/shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp similarity index 81% rename from opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp rename to shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp index 2597f55ab2..15edf46365 100644 --- a/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp @@ -11,9 +11,6 @@ #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl" -#include "opencl/source/helpers/cl_hw_helper.h" -#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h" - using HwHelperTestGen9 = HwHelperTest; GEN9TEST_F(HwHelperTestGen9, WhenGettingMaxBarriersPerSliceThenCorrectSizeIsReturned) { @@ -50,14 +47,6 @@ GEN9TEST_F(HwHelperTestGen9, whenGetGpgpuEnginesThenReturnThreeRcsEngines) { EXPECT_EQ(3u, pDevice->allEngines.size()); } -GEN9TEST_F(HwHelperTestGen9, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - EXPECT_EQ(ClHwHelperMock::makeDeviceIpVersion(9, 0, 0), ClHwHelper::get(renderCoreFamily).getDeviceIpVersion(*defaultHwInfo)); -} - -GEN9TEST_F(HwHelperTestGen9, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { - EXPECT_EQ(0u, ClHwHelper::get(renderCoreFamily).getSupportedDeviceFeatureCapabilities(*defaultHwInfo)); -} - using MemorySynchronizatiopCommandsTestsGen9 = ::testing::Test; GEN9TEST_F(MemorySynchronizatiopCommandsTestsGen9, WhenProgrammingCacheFlushThenExpectConstantCacheFieldSet) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;