From c3d40c210f355a2de656c636d82a7fd48a4bf612 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 9 Aug 2022 10:15:50 +0000 Subject: [PATCH] ULT refactor: remove i915 header dependency from drm_mock.h/drm_query_mock.h Related-To: NEO-6999 Signed-off-by: Mateusz Jablonski --- .../metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp | 1 + .../test/unit_tests/sources/sysman/engine/linux/mock_engine.h | 1 + .../unit_test/os_interface/linux/drm_command_stream_tests_1.cpp | 1 + shared/test/common/libult/linux/drm_mock.cpp | 1 + shared/test/common/libult/linux/drm_mock.h | 1 - shared/test/common/libult/linux/drm_query_mock.cpp | 1 + shared/test/common/libult/linux/drm_query_mock.h | 1 - .../os_interface/linux/drm_engine_info_prelim_tests.cpp | 1 + .../test/unit_test/os_interface/linux/drm_engine_info_tests.cpp | 1 + .../os_interface/linux/drm_memory_info_prelim_tests.cpp | 1 + shared/test/unit_test/os_interface/linux/drm_mock_impl.h | 1 + .../test/unit_test/os_interface/linux/drm_query_prelim_tests.cpp | 1 + shared/test/unit_test/os_interface/linux/drm_tests.cpp | 1 + .../test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp | 1 + .../unit_test/os_interface/linux/hw_info_config_linux_tests.cpp | 1 + 15 files changed, 13 insertions(+), 2 deletions(-) diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp index d973f0ff11..9c4b4c6188 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/test/common/libult/linux/drm_mock.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 4b9b88fca6..15d1768623 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,6 +7,7 @@ #pragma once #include "shared/source/os_interface/linux/engine_info.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp index d8e9012cae..5077c4f056 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp @@ -18,6 +18,7 @@ #include "shared/source/os_interface/linux/drm_buffer_object.h" #include "shared/source/os_interface/linux/drm_command_stream.h" #include "shared/source/os_interface/linux/drm_memory_operations_handler_default.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/test/common/libult/linux/drm_mock.cpp b/shared/test/common/libult/linux/drm_mock.cpp index 4aa494a9b0..8e6d3aab2e 100644 --- a/shared/test/common/libult/linux/drm_mock.cpp +++ b/shared/test/common/libult/linux/drm_mock.cpp @@ -9,6 +9,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/os_interface/linux/i915.h" #include "gtest/gtest.h" diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h index 0980440032..ed9a148ba0 100644 --- a/shared/test/common/libult/linux/drm_mock.h +++ b/shared/test/common/libult/linux/drm_mock.h @@ -11,7 +11,6 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/string.h" #include "shared/source/os_interface/linux/drm_neo.h" -#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/linux/mock_drm_wrappers.h" #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" diff --git a/shared/test/common/libult/linux/drm_query_mock.cpp b/shared/test/common/libult/linux/drm_query_mock.cpp index 7f8f7b5240..f2c55ff4eb 100644 --- a/shared/test/common/libult/linux/drm_query_mock.cpp +++ b/shared/test/common/libult/linux/drm_query_mock.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/libult/linux/drm_query_mock.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/os_interface/linux/i915.h" #include "gtest/gtest.h" diff --git a/shared/test/common/libult/linux/drm_query_mock.h b/shared/test/common/libult/linux/drm_query_mock.h index a177c7b59d..f44dc76019 100644 --- a/shared/test/common/libult/linux/drm_query_mock.h +++ b/shared/test/common/libult/linux/drm_query_mock.h @@ -7,7 +7,6 @@ #pragma once -#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/libult/linux/drm_mock_prelim_context.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp index 22df18666a..c07a5a5902 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/linux/engine_info.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp index 811d606710..ab2551e57a 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/os_interface/linux/engine_info.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp index 5c2ff6e6ee..d71b1d0693 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/memory_manager/memory_banks.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/linux/drm_mock_helper.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_mock_impl.h b/shared/test/unit_test/os_interface/linux/drm_mock_impl.h index dcccc3f8df..4952d7e913 100644 --- a/shared/test/unit_test/os_interface/linux/drm_mock_impl.h +++ b/shared/test/unit_test/os_interface/linux/drm_mock_impl.h @@ -7,6 +7,7 @@ #pragma once +#include "shared/source/os_interface/linux/i915.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/libult/linux/drm_mock.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_query_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_query_prelim_tests.cpp index 8c6b04a7c7..8f7b5e0d3a 100644 --- a/shared/test/unit_test/os_interface/linux/drm_query_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_query_prelim_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/os_interface/linux/drm_buffer_object.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_tests.cpp index 2c52a17108..40c4a3da79 100644 --- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/linux/os_inc.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp index a3e9a4ce93..e9ba1e6ccc 100644 --- a/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp index 97cedc710b..4d846c9560 100644 --- a/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" #include "shared/source/helpers/hw_helper.h" +#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h"