From ef3f93a17833090d1d1d8c4d0bfeccf4403184c2 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Fri, 22 Oct 2021 12:21:11 +0000 Subject: [PATCH] Create neo_libult target Signed-off-by: Mateusz Jablonski --- level_zero/cmake/l0_tests.cmake | 7 --- level_zero/core/test/aub_tests/CMakeLists.txt | 13 +---- .../core/test/unit_tests/CMakeLists.txt | 19 +------ .../test/unit_tests/CMakeLists.txt | 23 +-------- .../tools/test/unit_tests/CMakeLists.txt | 19 +------ opencl/test/unit_test/CMakeLists.txt | 6 +-- .../test/unit_test/aub_tests/CMakeLists.txt | 4 +- opencl/test/unit_test/libult/CMakeLists.txt | 25 ---------- opencl/test/unit_test/mt_tests/CMakeLists.txt | 12 +---- .../os_interface/linux/CMakeLists.txt | 1 - .../os_interface/windows/CMakeLists.txt | 2 - .../gl/windows/gl_os_sharing_tests.cpp | 2 +- opencl/test/unit_test/windows/CMakeLists.txt | 10 +++- shared/test/common/libult/CMakeLists.txt | 50 +++++++++++++++---- shared/test/common/mocks/CMakeLists.txt | 2 - .../mocks/linux/mock_drm_memory_manager.cpp | 2 +- .../mocks/linux/mock_drm_memory_manager.h | 2 +- .../linux/create_drm_memory_manager.cpp | 0 .../os_interface/linux/drm_neo_create.cpp | 0 .../common}/os_interface/linux/options.cpp | 0 .../linux/sys_calls_linux_ult.cpp | 0 .../os_interface/windows/CMakeLists.txt | 1 + .../windows/create_wddm_memory_manager.cpp | 0 .../windows/mock_environment_variables.cpp | 4 +- .../windows/mock_environment_variables.h | 2 +- .../os_interface/windows/mock_sys_calls.h | 0 .../common}/os_interface/windows/options.cpp | 0 .../windows/os_memory_virtual_alloc_ult.cpp | 0 .../os_interface/windows/sys_calls.cpp | 2 +- .../os_interface/windows/wddm_calls.cpp | 0 .../os_interface/windows/wddm_create.cpp | 0 shared/test/unit_test/CMakeLists.txt | 16 +----- 32 files changed, 63 insertions(+), 161 deletions(-) rename {opencl/test/unit_test => shared/test/common}/os_interface/linux/create_drm_memory_manager.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/linux/drm_neo_create.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/linux/options.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/linux/sys_calls_linux_ult.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/create_wddm_memory_manager.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/mock_environment_variables.cpp (78%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/mock_environment_variables.h (79%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/mock_sys_calls.h (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/options.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/os_memory_virtual_alloc_ult.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/sys_calls.cpp (98%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/wddm_calls.cpp (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/wddm_create.cpp (100%) diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake index 36f10ce41f..d395d9a811 100644 --- a/level_zero/cmake/l0_tests.cmake +++ b/level_zero/cmake/l0_tests.cmake @@ -44,7 +44,6 @@ 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/mocks/mock_program.cpp ${NEO_SHARED_DIRECTORY}/debug_settings/debug_settings_manager.cpp ) @@ -69,12 +68,6 @@ target_link_libraries(compute_runtime_mockable_extra ) if(WIN32) - target_sources(compute_runtime_mockable_extra - PRIVATE - ${NEO_SOURCE_DIR}/shared/source/dll/windows/environment_variables.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp - ) - target_link_libraries(compute_runtime_mockable_extra ws2_32 ) diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index c9995ed3e2..8dd434b8f6 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -72,6 +72,7 @@ target_sources(${TARGET_NAME} PRIVATE $ $ $ + $ $ $ ) @@ -83,23 +84,11 @@ endif() if(UNIX) target_sources(${TARGET_NAME} PRIVATE - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp ${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 - ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp - ${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp ) endif() diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index 5a10d7705b..6f5639573c 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -40,26 +40,9 @@ target_sources(${TARGET_NAME} PRIVATE $ $ $ + $ ) -if(UNIX) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp - ) -else() - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp - ) -endif() - set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0}) diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index 1de5451684..742370423b 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -49,30 +49,9 @@ target_sources( $ $ $ + $ ) -if(UNIX) - target_sources( - ${TARGET_NAME} - PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp - ) -else() - target_sources( - ${TARGET_NAME} - PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp - ) -endif() - set_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0}) add_subdirectoriesl0(${CMAKE_CURRENT_SOURCE_DIR} "*") diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index 76ff7f7c76..54e197a927 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -40,26 +40,9 @@ target_sources(${TARGET_NAME} PRIVATE $ $ $ + $ ) -if(UNIX) - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp - ) -else() - target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp - ) -endif() - set_target_properties(${TARGET_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0}) add_subdirectoriesL0(${CMAKE_CURRENT_SOURCE_DIR} "*") diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 4c2dcc3669..135547bc74 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -35,11 +35,6 @@ set(IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp ) -if(WIN32) - list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp) - list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp) -endif() - add_subdirectory(libult) hide_subdir(libult) @@ -60,6 +55,7 @@ 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 abb1d8f8fb..2db296a52e 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -20,6 +20,7 @@ list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS $ $ $ + $ $ ) if(TARGET ${SCHEDULER_BINARY_LIB_NAME}) @@ -65,13 +66,10 @@ target_sources(igdrcl_aub_tests PRIVATE if(WIN32) target_sources(igdrcl_aub_tests PRIVATE ${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp - ${NEO_SOURCE_DIR}/shared/source/os_interface/windows/os_memory_virtual_alloc.cpp ) else() target_sources(igdrcl_aub_tests PRIVATE ${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp ) endif() diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 7aa462ecca..d012225fca 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -24,10 +24,6 @@ set(IGDRCL_SRCS_LIB_ULT ${NEO_SOURCE_DIR}/shared/source/helpers/allow_deferred_deleter.cpp ) -set(IGDRCL_SRCS_LIB_ULT_WINDOWS - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp -) - add_library(igdrcl_libult OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT} ${IGDRCL_SRCS_ENABLE_TESTED_HW} @@ -56,26 +52,6 @@ add_library(igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT_ENV} ) -set(IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp -) - -set(IGDRCL_SRCS_LIB_ULT_ENV_LINUX - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp -) - -if(WIN32) - target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS}) - target_sources(igdrcl_libult PRIVATE ${IGDRCL_SRCS_LIB_ULT_WINDOWS}) -else() - target_sources(igdrcl_libult_env PRIVATE ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX}) -endif() - target_include_directories(igdrcl_libult_env PRIVATE $ ) @@ -84,7 +60,6 @@ set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_T set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX ${IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX}) set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT ${IGDRCL_SRCS_LIB_ULT}) set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_ENV ${IGDRCL_SRCS_LIB_ULT_ENV}) -set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_ENV_LINUX ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX}) foreach(target_name igdrcl_libult igdrcl_libult_env) set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index 785f45a393..81a6dd69b6 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -21,6 +21,7 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL $ $ $ + $ $ $ $ @@ -40,17 +41,6 @@ target_link_libraries(igdrcl_mt_tests gmock-gtest) target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${IGDRCL_EXTRA_LIBS}) target_link_libraries(igdrcl_mt_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}) -if(WIN32) - target_sources(igdrcl_mt_tests PRIVATE - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp - ) -else() - target_sources(igdrcl_mt_tests PRIVATE - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp - ) -endif() - if(WIN32) add_dependencies(igdrcl_mt_tests mock_gdi igdrcl_tests) endif() diff --git a/opencl/test/unit_test/os_interface/linux/CMakeLists.txt b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt index 49e8692dbc..2adf339eab 100644 --- a/opencl/test/unit_test/os_interface/linux/CMakeLists.txt +++ b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt @@ -23,7 +23,6 @@ set(IGDRCL_SRCS_tests_os_interface_linux ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_mapper_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_engine_info_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo_create.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_os_memory_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_residency_handler_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_system_info_tests.cpp diff --git a/opencl/test/unit_test/os_interface/windows/CMakeLists.txt b/opencl/test/unit_test/os_interface/windows/CMakeLists.txt index 718859a5cc..b32462afbf 100644 --- a/opencl/test/unit_test/os_interface/windows/CMakeLists.txt +++ b/opencl/test/unit_test/os_interface/windows/CMakeLists.txt @@ -13,7 +13,6 @@ set(IGDRCL_SRCS_tests_os_interface_windows ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_environment_variables.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_kmdaf_listener.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_win.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp @@ -36,7 +35,6 @@ set(IGDRCL_SRCS_tests_os_interface_windows ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_allocate_in_device_pool_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_handler_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_sys_calls.h ) if(WIN32) diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp index 0382521a1f..71de6e91fc 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp @@ -13,6 +13,7 @@ #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/os_interface/windows/mock_sys_calls.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" #include "opencl/extensions/public/cl_gl_private_intel.h" @@ -20,7 +21,6 @@ #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/os_interface/windows/mock_sys_calls.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index b17f2bf152..5ca9ed4d27 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -23,13 +23,19 @@ if(WIN32) ${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/source/dll/create_command_stream.cpp - ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_devices_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/mock_environment_variables.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.cpp + ${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 ) target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS}) diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 2c1869fd1e..c40a9a8520 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -140,17 +140,45 @@ elseif(UNIX) target_sources(neo_libult_common PRIVATE ${neo_libult_common_SRCS_LIB_ULT_LINUX}) endif() -target_include_directories(neo_libult_common PRIVATE - $ - ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} - ${IGC_COMMON_PARENT_DIR} -) +set(neo_libult_SRCS) +if(UNIX) + list(APPEND neo_libult_SRCS + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.h + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/create_drm_memory_manager.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/drm_neo_create.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/options.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/sys_calls_linux_ult.cpp + ) +else() + list(APPEND neo_libult_SRCS + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.cpp + ${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/os_interface/windows/wddm_create.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/mock_environment_variables.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/mock_environment_variables.h + ) +endif() -set_target_properties(neo_libult_common PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(neo_libult_common PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER}) -set_property(TARGET neo_libult_common APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) -target_include_directories(neo_libult_common PRIVATE $) -target_compile_definitions(neo_libult_common PRIVATE $) +add_library(neo_libult OBJECT EXCLUDE_FROM_ALL ${neo_libult_SRCS}) + +foreach(target_name "neo_libult_common" "neo_libult") + set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON) + set_target_properties(${target_name} PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER}) + set_property(TARGET ${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) + target_include_directories(${target_name} PRIVATE + $ + $ + ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} + ${IGC_COMMON_PARENT_DIR} + ) + target_compile_definitions(${target_name} PRIVATE $) + + create_project_source_tree(${target_name}) +endforeach() -create_project_source_tree(neo_libult_common) add_subdirectories() diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt index 5a41641532..0d126e2f3a 100644 --- a/shared/test/common/mocks/CMakeLists.txt +++ b/shared/test/common/mocks/CMakeLists.txt @@ -79,7 +79,6 @@ set(NEO_CORE_tests_mocks if(WIN32) list(APPEND NEO_CORE_tests_mocks - ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface20.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_residency_allocations_container.h @@ -91,7 +90,6 @@ else() list(APPEND NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_command_stream_receiver.h - ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.h ) endif() diff --git a/shared/test/common/mocks/linux/mock_drm_memory_manager.cpp b/shared/test/common/mocks/linux/mock_drm_memory_manager.cpp index ef077c56e2..099a83771b 100644 --- a/shared/test/common/mocks/linux/mock_drm_memory_manager.cpp +++ b/shared/test/common/mocks/linux/mock_drm_memory_manager.cpp @@ -18,7 +18,7 @@ namespace NEO { off_t lseekReturn = 4096u; std::atomic lseekCalledCount(0); -int closeInputFd = 0; +std::atomic closeInputFd(0); std::atomic closeCalledCount(0); std::vector mmapVector(64); diff --git a/shared/test/common/mocks/linux/mock_drm_memory_manager.h b/shared/test/common/mocks/linux/mock_drm_memory_manager.h index 4f35373768..ea047a8798 100644 --- a/shared/test/common/mocks/linux/mock_drm_memory_manager.h +++ b/shared/test/common/mocks/linux/mock_drm_memory_manager.h @@ -14,7 +14,7 @@ namespace NEO { extern off_t lseekReturn; extern std::atomic lseekCalledCount; -extern int closeInputFd; +extern std::atomic closeInputFd; extern std::atomic closeCalledCount; extern std::vector mmapVector; diff --git a/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp b/shared/test/common/os_interface/linux/create_drm_memory_manager.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp rename to shared/test/common/os_interface/linux/create_drm_memory_manager.cpp diff --git a/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp b/shared/test/common/os_interface/linux/drm_neo_create.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp rename to shared/test/common/os_interface/linux/drm_neo_create.cpp diff --git a/opencl/test/unit_test/os_interface/linux/options.cpp b/shared/test/common/os_interface/linux/options.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/linux/options.cpp rename to shared/test/common/os_interface/linux/options.cpp diff --git a/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp b/shared/test/common/os_interface/linux/sys_calls_linux_ult.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp rename to shared/test/common/os_interface/linux/sys_calls_linux_ult.cpp diff --git a/shared/test/common/os_interface/windows/CMakeLists.txt b/shared/test/common/os_interface/windows/CMakeLists.txt index c3b3a2f388..22f58f47ce 100644 --- a/shared/test/common/os_interface/windows/CMakeLists.txt +++ b/shared/test/common/os_interface/windows/CMakeLists.txt @@ -7,6 +7,7 @@ target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/gdi_dll_fixture.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_sys_calls.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_fixture.h ) diff --git a/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp b/shared/test/common/os_interface/windows/create_wddm_memory_manager.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp rename to shared/test/common/os_interface/windows/create_wddm_memory_manager.cpp diff --git a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp b/shared/test/common/os_interface/windows/mock_environment_variables.cpp similarity index 78% rename from opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp rename to shared/test/common/os_interface/windows/mock_environment_variables.cpp index 76357599bc..059b7c1d71 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp +++ b/shared/test/common/os_interface/windows/mock_environment_variables.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "opencl/test/unit_test/os_interface/windows/mock_environment_variables.h" +#include "shared/test/common/os_interface/windows/mock_environment_variables.h" #include "shared/source/os_interface/windows/environment_variables.h" diff --git a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.h b/shared/test/common/os_interface/windows/mock_environment_variables.h similarity index 79% rename from opencl/test/unit_test/os_interface/windows/mock_environment_variables.h rename to shared/test/common/os_interface/windows/mock_environment_variables.h index 2c2ebf3b59..3c65e0226e 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.h +++ b/shared/test/common/os_interface/windows/mock_environment_variables.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/test/unit_test/os_interface/windows/mock_sys_calls.h b/shared/test/common/os_interface/windows/mock_sys_calls.h similarity index 100% rename from opencl/test/unit_test/os_interface/windows/mock_sys_calls.h rename to shared/test/common/os_interface/windows/mock_sys_calls.h diff --git a/opencl/test/unit_test/os_interface/windows/options.cpp b/shared/test/common/os_interface/windows/options.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/windows/options.cpp rename to shared/test/common/os_interface/windows/options.cpp diff --git a/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp b/shared/test/common/os_interface/windows/os_memory_virtual_alloc_ult.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp rename to shared/test/common/os_interface/windows/os_memory_virtual_alloc_ult.cpp diff --git a/opencl/test/unit_test/os_interface/windows/sys_calls.cpp b/shared/test/common/os_interface/windows/sys_calls.cpp similarity index 98% rename from opencl/test/unit_test/os_interface/windows/sys_calls.cpp rename to shared/test/common/os_interface/windows/sys_calls.cpp index 2850d2cf06..1e8e960958 100644 --- a/opencl/test/unit_test/os_interface/windows/sys_calls.cpp +++ b/shared/test/common/os_interface/windows/sys_calls.cpp @@ -7,7 +7,7 @@ #include "sys_calls.h" -#include "opencl/test/unit_test/os_interface/windows/mock_sys_calls.h" +#include "shared/test/common/os_interface/windows/mock_sys_calls.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp b/shared/test/common/os_interface/windows/wddm_calls.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/windows/wddm_calls.cpp rename to shared/test/common/os_interface/windows/wddm_calls.cpp diff --git a/opencl/test/unit_test/os_interface/windows/wddm_create.cpp b/shared/test/common/os_interface/windows/wddm_create.cpp similarity index 100% rename from opencl/test/unit_test/os_interface/windows/wddm_create.cpp rename to shared/test/common/os_interface/windows/wddm_create.cpp diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index aa9dd42756..cc35f0d896 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -36,26 +36,12 @@ if(NOT SKIP_UNIT_TESTS) $ $ $ + $ ) if(UNIX) target_sources(${TARGET_NAME} PRIVATE ${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.h - ) - else() - target_sources(${TARGET_NAME} PRIVATE - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) endif()