From 35bb2034d17f4013ba90f26e879d56ef3bf65cb6 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 1 Nov 2021 23:10:40 +0000 Subject: [PATCH] Move mock_gmm_memory and os_virtual_alloc from libult to neo_unit_tests_config Signed-off-by: Mateusz Jablonski --- opencl/test/unit_test/windows/CMakeLists.txt | 1 - shared/test/common/libult/CMakeLists.txt | 8 -------- .../test_configuration/aub_tests/CMakeLists.txt | 7 +++++++ .../unit_tests/CMakeLists.txt | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index db9d5ca1d6..7d2e6e5017 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -30,7 +30,6 @@ if(WIN32) ${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_macros/test_checks_shared.cpp diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index b4b52f2aac..ddd87d2740 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -111,9 +111,6 @@ add_library(neo_libult_common OBJECT EXCLUDE_FROM_ALL ) set(neo_libult_common_SRCS_LIB_ULT_WIN - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX}mock_gmm_memory.h - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/mock_gmm_memory_base.cpp - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/mock_gmm_memory_base.h ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxcore_factory.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxcore_factory.h ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxgi_factory.cpp @@ -128,15 +125,11 @@ set_property(GLOBAL PROPERTY neo_libult_common_SRCS_LIB_ULT_LINUX ${neo_libult_c if(UNIX AND NOT DISABLE_WDDM_LINUX) target_sources(neo_libult_common PRIVATE - ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp ) endif() if(WIN32) target_sources(neo_libult_common PRIVATE ${neo_libult_common_SRCS_LIB_ULT_WIN}) - target_include_directories(neo_libult_common PRIVATE - ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX} - ) elseif(UNIX) target_sources(neo_libult_common PRIVATE ${neo_libult_common_SRCS_LIB_ULT_LINUX}) endif() @@ -159,7 +152,6 @@ set(neo_libult_SRCS_WINDOWS ${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 diff --git a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt index 8d0c322238..7262feda83 100644 --- a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt +++ b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt @@ -21,6 +21,13 @@ if(UNIX) else() list(APPEND NEO_SHARED_aub_tests_configurations ${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp + ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp + ) +endif() + +if(WIN32 OR(UNIX AND NOT DISABLE_WDDM_LINUX)) + list(APPEND NEO_SHARED_aub_tests_configurations + ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp ) endif() diff --git a/shared/test/common/test_configuration/unit_tests/CMakeLists.txt b/shared/test/common/test_configuration/unit_tests/CMakeLists.txt index c7319e98d8..9b479fb49f 100644 --- a/shared/test/common/test_configuration/unit_tests/CMakeLists.txt +++ b/shared/test/common/test_configuration/unit_tests/CMakeLists.txt @@ -10,6 +10,18 @@ set(NEO_SHARED_unit_tests_configurations ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_resource_info_common.cpp ) +if(WIN32) + list(APPEND NEO_SHARED_unit_tests_configurations + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX}mock_gmm_memory.h + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/mock_gmm_memory_base.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/mock_gmm_memory_base.h + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/os_memory_virtual_alloc_ult.cpp + ) +elseif(UNIX AND NOT DISABLE_WDDM_LINUX) + list(APPEND NEO_SHARED_unit_tests_configurations + ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp + ) +endif() 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 @@ -28,5 +40,10 @@ target_include_directories(neo_unit_tests_config PRIVATE $ $ ) +if(WIN32) + target_include_directories(neo_unit_tests_config PRIVATE + ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX} + ) +endif() target_compile_definitions(neo_unit_tests_config PRIVATE $) create_project_source_tree(neo_unit_tests_config)