From ca4068aafc7222b9cf9ea0a2395374a35c597cfe Mon Sep 17 00:00:00 2001 From: Kacper Nowak Date: Mon, 7 Jun 2021 11:15:00 +0200 Subject: [PATCH] Create shared libult_common object library Signed-off-by: Kacper Nowak --- level_zero/cmake/l0_tests.cmake | 41 ---------- .../core/test/unit_tests/CMakeLists.txt | 6 +- .../core/test/unit_tests/gen11/CMakeLists.txt | 1 - .../test/unit_tests/gen12lp/CMakeLists.txt | 1 - .../core/test/unit_tests/gen8/CMakeLists.txt | 12 --- .../core/test/unit_tests/gen9/CMakeLists.txt | 1 - .../test/unit_tests/CMakeLists.txt | 6 +- .../tools/test/unit_tests/CMakeLists.txt | 6 +- .../tools/test/unit_tests/gens/CMakeLists.txt | 29 ------- opencl/test/unit_test/CMakeLists.txt | 1 + .../test/unit_test/aub_tests/CMakeLists.txt | 1 + .../gen12lp/cmd_parse/cmd_parse_gen12lp.inl | 14 ---- opencl/test/unit_test/libult/CMakeLists.txt | 74 ++---------------- opencl/test/unit_test/linux/CMakeLists.txt | 1 + opencl/test/unit_test/mt_tests/CMakeLists.txt | 1 + opencl/test/unit_test/windows/CMakeLists.txt | 1 + shared/test/common/gen11/CMakeLists.txt | 1 - shared/test/common/gen12lp/CMakeLists.txt | 1 - .../gen12lp/cmd_parse/cmd_parse_gen12lp.inl | 38 --------- .../test/common/gen12lp/cmd_parse_gen12lp.cpp | 31 +++++++- shared/test/common/gen8/CMakeLists.txt | 1 - shared/test/common/gen9/CMakeLists.txt | 1 - shared/test/common/helpers/CMakeLists.txt | 1 - shared/test/common/libult/CMakeLists.txt | 77 +++++++++++++++++++ shared/test/unit_test/CMakeLists.txt | 5 +- 25 files changed, 122 insertions(+), 230 deletions(-) delete mode 100644 level_zero/core/test/unit_tests/gen8/CMakeLists.txt delete mode 100644 level_zero/tools/test/unit_tests/gens/CMakeLists.txt delete mode 100644 opencl/test/unit_test/gen12lp/cmd_parse/cmd_parse_gen12lp.inl delete mode 100644 shared/test/common/gen12lp/cmd_parse/cmd_parse_gen12lp.inl create mode 100644 shared/test/common/libult/CMakeLists.txt diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake index 74cbcd7b5d..9f3622e527 100644 --- a/level_zero/cmake/l0_tests.cmake +++ b/level_zero/cmake/l0_tests.cmake @@ -4,42 +4,6 @@ # SPDX-License-Identifier: MIT # -## -## L0 tests settings -## - -# These need to be added to a project to enable platform support in ULTs -if(TESTS_GEN8) - set(COMPUTE_RUNTIME_ULT_GEN8 - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen8.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/gen8/cmd_parse_gen8.cpp - ) -endif() - -if(TESTS_GEN9) - set(COMPUTE_RUNTIME_ULT_GEN9 - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen9.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/gen9/cmd_parse_gen9.cpp - ) -endif() - -if(TESTS_GEN11) - set(COMPUTE_RUNTIME_ULT_GEN11 - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen11.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/gen11/cmd_parse_gen11.cpp - ) -endif() - -if(TESTS_GEN12LP) - set(COMPUTE_RUNTIME_ULT_GEN12LP - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen12lp.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/gen12lp/cmd_parse_gen12lp.cpp - ) - include_directories(${NEO_SHARED_TEST_DIRECTORY}/common/gen12lp/cmd_parse${BRANCH_DIR_SUFFIX}/) -endif() - -## ULT related settings - #Extract compute runtime COMPILE_DEFINITIONS get_property(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS TARGET ${NEO_MOCKABLE_LIB_NAME} @@ -66,12 +30,7 @@ add_library(compute_runtime_mockable_extra 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/helpers/sip_init.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_SUFIX_DIR}/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 diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index 7d79635601..749c6696d3 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -22,11 +22,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/unit_test/base_ult_config_listener.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.h - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.h - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h ${L0_CORE_ENABLERS} @@ -51,6 +46,7 @@ target_sources(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp $ + $ ) if(UNIX) diff --git a/level_zero/core/test/unit_tests/gen11/CMakeLists.txt b/level_zero/core/test/unit_tests/gen11/CMakeLists.txt index f3686c8997..0800799076 100644 --- a/level_zero/core/test/unit_tests/gen11/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/gen11/CMakeLists.txt @@ -6,7 +6,6 @@ if(TESTS_GEN11) target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN11} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue_thread_arbitration_policy_gen11.cpp diff --git a/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt b/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt index b4206d2390..2acd4cf9f6 100644 --- a/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/gen12lp/CMakeLists.txt @@ -6,7 +6,6 @@ if(TESTS_GEN12LP) target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN12LP} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cache_flush.cpp diff --git a/level_zero/core/test/unit_tests/gen8/CMakeLists.txt b/level_zero/core/test/unit_tests/gen8/CMakeLists.txt deleted file mode 100644 index 13ae3bf31d..0000000000 --- a/level_zero/core/test/unit_tests/gen8/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -if(TESTS_GEN8) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN8} - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ) -endif() diff --git a/level_zero/core/test/unit_tests/gen9/CMakeLists.txt b/level_zero/core/test/unit_tests/gen9/CMakeLists.txt index 08d9253a2e..3c75661b9c 100644 --- a/level_zero/core/test/unit_tests/gen9/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/gen9/CMakeLists.txt @@ -6,7 +6,6 @@ if(TESTS_GEN9) target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN9} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_gen9.cpp diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index cefc97ca95..ae6521dbcc 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -25,11 +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/unit_test/base_ult_config_listener.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.h - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.h - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h ${L0_CORE_ENABLERS} @@ -58,6 +53,7 @@ target_sources( ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp $ + $ ) if(UNIX) diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index 5890a893c8..14ee37b7c3 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -20,11 +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/unit_test/base_ult_config_listener.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.h - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.h - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h ${L0_CORE_ENABLERS} @@ -48,6 +43,7 @@ target_sources(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp $ + $ ) if(UNIX) diff --git a/level_zero/tools/test/unit_tests/gens/CMakeLists.txt b/level_zero/tools/test/unit_tests/gens/CMakeLists.txt deleted file mode 100644 index aff6136464..0000000000 --- a/level_zero/tools/test/unit_tests/gens/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -if(TESTS_GEN8) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN8} - ) -endif() -if(TESTS_GEN9) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN9} - ) -endif() -if(TESTS_GEN11) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN11} - ) -endif() -if(TESTS_GEN12LP) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_ULT_GEN12LP} - ) - target_include_directories(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/level_zero/core/source/gen12lp/definitions${BRANCH_DIR_SUFFIX}/) -endif() - -add_subdirectories() diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 26942a1e00..35703ec69f 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -79,6 +79,7 @@ if(UNIX) endif() set(NEO_IGDRCL_TESTS__TARGET_OBJECTS + $ $ $ $ diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index 87336960aa..ff7482b2ee 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -19,6 +19,7 @@ list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS $ $ $ + $ $ $ ) diff --git a/opencl/test/unit_test/gen12lp/cmd_parse/cmd_parse_gen12lp.inl b/opencl/test/unit_test/gen12lp/cmd_parse/cmd_parse_gen12lp.inl deleted file mode 100644 index 3d40f64e28..0000000000 --- a/opencl/test/unit_test/gen12lp/cmd_parse/cmd_parse_gen12lp.inl +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2019-2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -size_t getAdditionalCommandLengthHwSpecific(void *cmd) { - return 0; -} - -const char *getAdditionalCommandNameHwSpecific(void *cmd) { - return "UNKNOWN"; -} diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 51c49cf579..5f8c2204fb 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -6,64 +6,17 @@ macro(macro_for_each_gen) foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) - foreach(BRANCH ${BRANCH_DIR_LIST}) - if(EXISTS ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp) - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW - ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp - ) - endif() - set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp) - if(EXISTS ${SRC_FILE}) - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) - endif() - set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp) - if(EXISTS ${SRC_FILE}) - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) - endif() - - string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}") - string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}") - foreach(SRC_IT "enable_hw_info_config_" "enable_" "enable_family_full_core_") - set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) - if(EXISTS ${SRC_FILE}) - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) - endif() - set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) - if(EXISTS ${SRC_FILE}) - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) - endif() - set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) - if(EXISTS ${SRC_FILE}) - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) - endif() - endforeach() - endforeach() + if(EXISTS ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp) + list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW + ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp + ) + endif() endforeach() - if(EXISTS "${NEO_SHARED_TEST_DIRECTORY}/common/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl") - list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_SHARED_TEST_DIRECTORY}/common/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl") - include_directories(${NEO_SHARED_TEST_DIRECTORY}/common/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/) - endif() endmacro() apply_macro_for_each_gen("TESTED") set(IGDRCL_SRCS_LIB_ULT - ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.h - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.h - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.h - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h - ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp - ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp - ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.h - ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp - ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.cpp @@ -73,12 +26,7 @@ set(IGDRCL_SRCS_LIB_ULT ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp -) - -get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE) - -list(APPEND IGDRCL_SRCS_LIB_ULT - ${NEO_SHARED_TESTS_CMD_PARSE} + ${NEO_SOURCE_DIR}/shared/source/helpers/allow_deferred_deleter.cpp ) set(IGDRCL_SRCS_LIB_ULT_WINDOWS @@ -89,9 +37,6 @@ add_library(igdrcl_libult OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT} ${IGDRCL_SRCS_ENABLE_TESTED_HW} ) -if(UNIX) - target_sources(igdrcl_libult PRIVATE ${IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX}) -endif() set(IGDRCL_SRCS_LIB_ULT_CS ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp @@ -100,9 +45,6 @@ set(IGDRCL_SRCS_LIB_ULT_CS add_library(igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT_CS} ) -target_include_directories(igdrcl_libult PRIVATE - $ -) set(IGDRCL_SRCS_LIB_ULT_ENV ${NEO_SOURCE_DIR}/opencl/test/unit_test/custom_event_listener.h @@ -160,10 +102,6 @@ else() target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX}) endif() -target_include_directories(igdrcl_libult PRIVATE - ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} -) - target_include_directories(igdrcl_libult_env PRIVATE $ ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX} diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt index 40ae634ff0..4edca3187a 100644 --- a/opencl/test/unit_test/linux/CMakeLists.txt +++ b/opencl/test/unit_test/linux/CMakeLists.txt @@ -10,6 +10,7 @@ set(IGDRCL_SRCS_linux_dll_tests set(target_name linux_dll_tests) add_executable(igdrcl_${target_name} $ + $ $ $ ${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index 9b6876d6c7..be83c671ef 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -25,6 +25,7 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp $ + $ $ $ $ diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index ad8ff17a98..5e2b3a8017 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -8,6 +8,7 @@ if(WIN32) project(igdrcl_windows_dll_tests) set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS + $ $ $ $ diff --git a/shared/test/common/gen11/CMakeLists.txt b/shared/test/common/gen11/CMakeLists.txt index 016cc97e05..5d1d79db91 100644 --- a/shared/test/common/gen11/CMakeLists.txt +++ b/shared/test/common/gen11/CMakeLists.txt @@ -22,7 +22,6 @@ if(TESTS_GEN11) ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen11.cpp - ${COMPUTE_RUNTIME_ULT_GEN11} ) endif() diff --git a/shared/test/common/gen12lp/CMakeLists.txt b/shared/test/common/gen12lp/CMakeLists.txt index 5be19c3b18..6f1c270b05 100644 --- a/shared/test/common/gen12lp/CMakeLists.txt +++ b/shared/test/common/gen12lp/CMakeLists.txt @@ -24,7 +24,6 @@ if(TESTS_GEN12LP) ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen12lp.cpp - ${COMPUTE_RUNTIME_ULT_GEN12LP} ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp ) diff --git a/shared/test/common/gen12lp/cmd_parse/cmd_parse_gen12lp.inl b/shared/test/common/gen12lp/cmd_parse/cmd_parse_gen12lp.inl deleted file mode 100644 index e7c9ec083d..0000000000 --- a/shared/test/common/gen12lp/cmd_parse/cmd_parse_gen12lp.inl +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2021 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/test/common/cmd_parse/cmd_parse_l3_control.inl" - -size_t getAdditionalCommandLengthHwSpecific(void *cmd) { - using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL; - using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL; - - auto pCmdWithPostSync = genCmdCast(cmd); - if (pCmdWithPostSync) - return pCmdWithPostSync->getBase().TheStructure.Common.Length + 2; - - auto pCmdWithoutPostSync = genCmdCast(cmd); - if (pCmdWithoutPostSync) - return pCmdWithoutPostSync->getBase().TheStructure.Common.Length + 2; - - return 0; -} - -const char *getAdditionalCommandNameHwSpecific(void *cmd) { - using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL; - using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL; - - if (nullptr != genCmdCast(cmd)) { - return "L3_CONTROL(POST_SYNC)"; - } - - if (nullptr != genCmdCast(cmd)) { - return "L3_CONTROL(NO_POST_SYNC)"; - } - - return "UNKNOWN"; -} diff --git a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp b/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp index a49098f63a..ce8e0c9ebc 100644 --- a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp +++ b/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp @@ -13,12 +13,41 @@ using GenGfxFamily = NEO::TGLLPFamily; #include "shared/test/common/cmd_parse/cmd_parse_base.inl" #include "shared/test/common/cmd_parse/cmd_parse_compute_mode.inl" #include "shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl" +#include "shared/test/common/cmd_parse/cmd_parse_l3_control.inl" #include "shared/test/common/cmd_parse/cmd_parse_mi_arb.inl" #include "shared/test/common/cmd_parse/cmd_parse_sip.inl" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/cmd_parse/hw_parse.inl" -#include "cmd_parse_gen12lp.inl" +size_t getAdditionalCommandLengthHwSpecific(void *cmd) { + using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL; + using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL; + + auto pCmdWithPostSync = genCmdCast(cmd); + if (pCmdWithPostSync) + return pCmdWithPostSync->getBase().TheStructure.Common.Length + 2; + + auto pCmdWithoutPostSync = genCmdCast(cmd); + if (pCmdWithoutPostSync) + return pCmdWithoutPostSync->getBase().TheStructure.Common.Length + 2; + + return 0; +} + +const char *getAdditionalCommandNameHwSpecific(void *cmd) { + using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL; + using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL; + + if (nullptr != genCmdCast(cmd)) { + return "L3_CONTROL(POST_SYNC)"; + } + + if (nullptr != genCmdCast(cmd)) { + return "L3_CONTROL(NO_POST_SYNC)"; + } + + return "UNKNOWN"; +} template <> size_t CmdParse::getCommandLengthHwSpecific(void *cmd) { diff --git a/shared/test/common/gen8/CMakeLists.txt b/shared/test/common/gen8/CMakeLists.txt index 65fdf7053f..6ee0dc0960 100644 --- a/shared/test/common/gen8/CMakeLists.txt +++ b/shared/test/common/gen8/CMakeLists.txt @@ -23,7 +23,6 @@ if(TESTS_GEN8) ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen8.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen8.cpp - ${COMPUTE_RUNTIME_ULT_GEN8} ) endif() diff --git a/shared/test/common/gen9/CMakeLists.txt b/shared/test/common/gen9/CMakeLists.txt index ca0dd4a0ec..d1c2042e4c 100644 --- a/shared/test/common/gen9/CMakeLists.txt +++ b/shared/test/common/gen9/CMakeLists.txt @@ -23,7 +23,6 @@ if(TESTS_GEN9) ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen9.cpp - ${COMPUTE_RUNTIME_ULT_GEN9} ) endif() diff --git a/shared/test/common/helpers/CMakeLists.txt b/shared/test/common/helpers/CMakeLists.txt index e912ac01ba..3fb5b06db7 100644 --- a/shared/test/common/helpers/CMakeLists.txt +++ b/shared/test/common/helpers/CMakeLists.txt @@ -23,7 +23,6 @@ set(NEO_CORE_HELPERS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_management.h ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/sip_init.cpp ${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_traits.h diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt new file mode 100644 index 0000000000..04d17db1e3 --- /dev/null +++ b/shared/test/common/libult/CMakeLists.txt @@ -0,0 +1,77 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +macro(macro_for_each_gen) + foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) + foreach(BRANCH ${BRANCH_DIR_LIST}) + set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + endif() + set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + endif() + string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}") + string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}") + foreach(SRC_IT "enable_hw_info_config_" "enable_" "enable_family_full_core_") + set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + endif() + set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + endif() + endforeach() + endforeach() + endforeach() +endmacro() + +apply_macro_for_each_gen("TESTED") + +set(igdrcl_libult_common_SRCS_LIB_ULT + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.h + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.h + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.h + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp + ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp + ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.h + ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp + ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp +) + +get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE) + +list(APPEND igdrcl_libult_common_SRCS_LIB_ULT + ${NEO_SHARED_TESTS_CMD_PARSE} +) + +add_library(igdrcl_libult_common OBJECT EXCLUDE_FROM_ALL + ${igdrcl_libult_common_SRCS_LIB_ULT} + ${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW} +) + +target_include_directories(igdrcl_libult_common PRIVATE + $ + ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} +) + +set_target_properties(igdrcl_libult_common PROPERTIES POSITION_INDEPENDENT_CODE ON) +set_target_properties(igdrcl_libult_common PROPERTIES FOLDER ${NEO_SHARED_TEST_DIRECTORY}) +set_property(TARGET igdrcl_libult_common APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) +target_include_directories(igdrcl_libult_common PRIVATE $) +target_compile_definitions(igdrcl_libult_common PRIVATE $) + +create_project_source_tree(igdrcl_libult_common) +add_subdirectories() diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index e0885fc205..78f255b735 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -44,8 +44,6 @@ if(NOT SKIP_UNIT_TESTS) add_executable(${TARGET_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/base_ult_config_listener.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/base_ult_config_listener.h ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h @@ -61,11 +59,10 @@ if(NOT SKIP_UNIT_TESTS) ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.cpp ${NEO_SOURCE_DIR}/shared/source/helpers/allow_deferred_deleter.cpp ${NEO_SOURCE_DIR}/shared/test/common/helpers/api_specific_config_shared_tests.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.cpp - ${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.cpp ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp $ + $ ) if(UNIX)