diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake index 541315b66b..9c4ee1f56d 100644 --- a/level_zero/cmake/l0_tests.cmake +++ b/level_zero/cmake/l0_tests.cmake @@ -90,7 +90,6 @@ if(UNIX) target_sources(compute_runtime_mockable_extra PRIVATE ${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp ${NEO_SHARED_DIRECTORY}/tbx/tbx_sockets_imp.cpp ) target_link_libraries(compute_runtime_mockable_extra diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index 2e633fe032..9fa60824a1 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -102,7 +102,6 @@ if(UNIX) ${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_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp ${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp ) diff --git a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp index 2cc25d6e9d..0ff1652ca5 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp @@ -8,9 +8,9 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/kernel/debug_data.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_allocation.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include "level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp index 91c930abe5..2462ebe134 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_query_pool_linux.cpp @@ -8,8 +8,8 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h index 4f50b16765..f3b54c2933 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h @@ -7,8 +7,7 @@ #pragma once #include "shared/source/os_interface/linux/engine_info_impl.h" - -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "level_zero/core/test/unit_tests/mock.h" #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp index 963eeb91f4..38dcf14680 100644 --- a/opencl/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp @@ -7,9 +7,9 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp b/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp index 88d3671034..4e6e413d09 100644 --- a/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp index b810ae6c2d..5b28207d2f 100644 --- a/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp index 40580ec29e..46bfc9894b 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp @@ -8,10 +8,10 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/linux/os_interface_linux_tests.cpp b/opencl/test/unit_test/linux/os_interface_linux_tests.cpp index 9d8402d777..ba8f9b955c 100644 --- a/opencl/test/unit_test/linux/os_interface_linux_tests.cpp +++ b/opencl/test/unit_test/linux/os_interface_linux_tests.cpp @@ -9,9 +9,10 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "opencl/test/unit_test/linux/mock_os_layer.h" #include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/linux/va_tests.cpp b/opencl/test/unit_test/linux/va_tests.cpp index 73cb82fc49..5ea2b7291f 100644 --- a/opencl/test/unit_test/linux/va_tests.cpp +++ b/opencl/test/unit_test/linux/va_tests.cpp @@ -64,4 +64,4 @@ TEST(VaTests, givenVADeviceWhenGetDeviceFromVAIsCalledThenProperSyscallsAreUsed) EXPECT_EQ(accessCalledTimes, 1); EXPECT_EQ(readLinkCalledTimes, 1); EXPECT_EQ(fstatCalledTimes, 1); -} \ No newline at end of file +} diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index bf4ab37c7f..9de3b3693a 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -85,8 +85,6 @@ else() ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_command_stream_receiver.h ${NEO_SHARED_DIRECTORY}/os_interface/linux/page_table_manager_functions.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.h ) endif() diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h index a3b279ad20..9fce624d89 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h +++ b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h @@ -11,9 +11,9 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/device_factory.h" #include "shared/test/common/helpers/variable_backup.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index 3eac46448f..0f9edb19d3 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp @@ -11,11 +11,11 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_allocation.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_debug_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_debug_tests.cpp index 80afcba507..9337da90c3 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_debug_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_debug_tests.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/os_interface/linux/drm_neo.h" - -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp index 1d8ef442f9..6e60ec713c 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp @@ -1,13 +1,12 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/linux/engine_info_impl.h" - -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp index e16347a2a8..7b2dfc7067 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/os_interface/linux/memory_info.h" - -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index ef53408897..ec67504539 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -29,6 +29,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_gfx_partition.h" #include "shared/test/common/test_macros/matchers.h" @@ -41,7 +42,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock_cache_info.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock_dg1.h b/opencl/test/unit_test/os_interface/linux/drm_mock_dg1.h index 6fb7f8107a..030fe9f130 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mock_dg1.h +++ b/opencl/test/unit_test/os_interface/linux/drm_mock_dg1.h @@ -8,8 +8,7 @@ #pragma once #include "shared/test/common/helpers/default_hw_info.h" - -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp b/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp index 9b3df94c59..a4c014e72f 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp @@ -9,8 +9,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_system_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_system_info_tests.cpp index 036643dfb2..50f9a065a2 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_system_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_system_info_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/os_interface/linux/system_info_impl.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp index 6ff5c7a15e..6b6de9964e 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp @@ -13,10 +13,10 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_uuid_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_uuid_tests.cpp index dd91d75614..40c1f6b3ab 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_uuid_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_uuid_tests.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp index 45087080dc..7b5c848d25 100644 --- a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_allocation.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/utilities/file_logger_tests.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h index bc46c4b697..1604a843cf 100644 --- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h +++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h @@ -12,9 +12,9 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/source/utilities/cpu_info.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp index a7f4d5bca4..29309bf121 100644 --- a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp @@ -7,13 +7,13 @@ #include "shared/source/os_interface/linux/drm_memory_operations_handler.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp index 762efabb3d..7c3504ecd9 100644 --- a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp +++ b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp @@ -7,7 +7,8 @@ #include "mock_performance_counters_linux.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" + #include "opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h" #include "opencl/test/unit_test/os_interface/mock_performance_counters.h" diff --git a/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp index e6ee5ae2aa..ace72b27ce 100644 --- a/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp @@ -10,10 +10,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" - #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index bd083eeb45..877d4f38cd 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/create_command_stream.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "opencl/source/api/api.h" #include "opencl/source/cl_device/cl_device.h" @@ -28,7 +29,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" #include "test.h" diff --git a/shared/test/common/libult/linux/CMakeLists.txt b/shared/test/common/libult/linux/CMakeLists.txt new file mode 100644 index 0000000000..e65a1fbbc6 --- /dev/null +++ b/shared/test/common/libult/linux/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(UNIX) + target_sources(igdrcl_libult_common PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock.h + ) + + add_subdirectories() +endif() diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock.cpp b/shared/test/common/libult/linux/drm_mock.cpp similarity index 99% rename from opencl/test/unit_test/os_interface/linux/drm_mock.cpp rename to shared/test/common/libult/linux/drm_mock.cpp index 8a345e210b..dd05d150ee 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mock.cpp +++ b/shared/test/common/libult/linux/drm_mock.cpp @@ -5,11 +5,14 @@ * */ -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_info.h" +#include "drm/i915_drm.h" +#include "gtest/gtest.h" + #include const int DrmMock::mockFd; diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h similarity index 96% rename from opencl/test/unit_test/os_interface/linux/drm_mock.h rename to shared/test/common/libult/linux/drm_mock.h index c260dc35b6..5b67f9f7d8 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mock.h +++ b/shared/test/common/libult/linux/drm_mock.h @@ -7,19 +7,11 @@ #pragma once -#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/constants.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/string.h" #include "shared/source/os_interface/linux/drm_neo.h" -#include "opencl/source/platform/platform.h" -#include "opencl/test/unit_test/linux/mock_os_layer.h" - -#include "drm/i915_drm.h" -#include "gtest/gtest.h" - #include #include #include diff --git a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp index 1d1ba49f23..8121b999a8 100644 --- a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp @@ -12,10 +12,10 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/ult_hw_config.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_device.h" #include "opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include diff --git a/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp index a47b92e06c..2f02e9f3f6 100644 --- a/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_query_tests.cpp @@ -10,8 +10,8 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/libult/linux/drm_mock.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp b/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp index 0e55b6be06..3abb481313 100644 --- a/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp @@ -9,9 +9,9 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" -#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" namespace NEO {