Move common test files to shared libult

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

level_zero/cmake/l0_tests.cmake

@@ -43,11 +43,9 @@ add_library(compute_runtime_mockable_extra
             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
             ${NEO_SHARED_DIRECTORY}/debug_settings/debug_settings_manager.cpp
 )
 

level_zero/core/test/aub_tests/CMakeLists.txt

@@ -82,10 +82,7 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
 endif()
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
 )
 
 if(UNIX)

level_zero/core/test/unit_tests/CMakeLists.txt

@@ -38,7 +38,6 @@ target_sources(${TARGET_NAME} PRIVATE
 )
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp
                $<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
                $<TARGET_OBJECTS:igdrcl_libult_common>
                $<TARGET_OBJECTS:neo_libult_cs>

level_zero/experimental/test/unit_tests/CMakeLists.txt

@@ -46,7 +46,6 @@ target_sources(
 target_sources(
                ${TARGET_NAME}
                PRIVATE
-               ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp
                $<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
                $<TARGET_OBJECTS:igdrcl_libult_common>
                $<TARGET_OBJECTS:neo_libult_cs>

level_zero/tools/test/unit_tests/CMakeLists.txt

@@ -37,7 +37,6 @@ target_sources(${TARGET_NAME} PRIVATE
 )
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp
                $<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
                $<TARGET_OBJECTS:igdrcl_libult_common>
                $<TARGET_OBJECTS:neo_libult_cs>

opencl/test/unit_test/libult/CMakeLists.txt

@@ -19,13 +19,10 @@ apply_macro_for_each_gen("TESTED")
 set(IGDRCL_SRCS_LIB_ULT
     ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
     ${NEO_SOURCE_DIR}/opencl/source/dll/debug_manager.cpp
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.h
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp
     ${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
     ${NEO_SOURCE_DIR}/shared/source/helpers/allow_deferred_deleter.cpp
 )
 

shared/test/common/libult/CMakeLists.txt

@@ -66,9 +66,12 @@ set(igdrcl_libult_common_SRCS_LIB_ULT
     ${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/abort.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/debug_settings_reader_creator.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/global_environment.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/global_environment.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/libult/io_functions.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/options_unit_tests.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h

opencl/test/unit_test/abort.cpp renamed to shared/test/common/libult/abort.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp renamed to shared/test/common/libult/debug_settings_reader_creator.cpp

@@ -28,7 +28,6 @@ if(NOT SKIP_UNIT_TESTS)
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
                  ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
-                 ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp
                  ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp