diff --git a/level_zero/core/source/driver/driver.h b/level_zero/core/source/driver/driver.h index 0945c96621..2a66613e47 100644 --- a/level_zero/core/source/driver/driver.h +++ b/level_zero/core/source/driver/driver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,8 +9,6 @@ #include -#include - namespace L0 { struct Driver { virtual ze_result_t driverInit(ze_init_flags_t flags) = 0; diff --git a/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h b/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h index 0e744f2bd5..8a0836cf52 100644 --- a/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h +++ b/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h @@ -11,8 +11,6 @@ #include "sysman/fabric_port/fabric_port_imp.h" #include "sysman/fabric_port/os_fabric_port.h" -#include - namespace L0 { class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClass { diff --git a/level_zero/tools/source/sysman/pci/os_pci.h b/level_zero/tools/source/sysman/pci/os_pci.h index 289eeec0dc..0aab81a7b4 100644 --- a/level_zero/tools/source/sysman/pci/os_pci.h +++ b/level_zero/tools/source/sysman/pci/os_pci.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,6 @@ #include "level_zero/tools/source/sysman/os_sysman.h" #include -#include #include namespace L0 { diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp index e0869e93f9..912b14ddde 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp @@ -37,6 +37,7 @@ #include "common/StateSaveAreaHeader.h" +#include #include #include diff --git a/shared/source/debug_settings/debug_settings_manager.h b/shared/source/debug_settings/debug_settings_manager.h index ce742e95f4..7354b6fd2e 100644 --- a/shared/source/debug_settings/debug_settings_manager.h +++ b/shared/source/debug_settings/debug_settings_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include #include -#include +#include enum class DebugFunctionalityLevel { None, // Debug functionality disabled diff --git a/shared/source/gmm_helper/page_table_mngr.h b/shared/source/gmm_helper/page_table_mngr.h index e5a0ad45c1..2e0fc539c4 100644 --- a/shared/source/gmm_helper/page_table_mngr.h +++ b/shared/source/gmm_helper/page_table_mngr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,6 @@ #include "External/Common/GmmPageTableMgr.h" #include -#include namespace NEO { class Gmm; diff --git a/shared/source/gmm_helper/windows/gmm_memory_base.h b/shared/source/gmm_helper/windows/gmm_memory_base.h index 188f96aa1b..50c6711990 100644 --- a/shared/source/gmm_helper/windows/gmm_memory_base.h +++ b/shared/source/gmm_helper/windows/gmm_memory_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,8 +8,6 @@ #pragma once #include "shared/source/gmm_helper/gmm_lib.h" -#include - namespace NEO { class GmmClientContext; class GmmMemoryBase { diff --git a/shared/source/kernel/kernel_arg_metadata.h b/shared/source/kernel/kernel_arg_metadata.h index b471b0d004..f2c73a409b 100644 --- a/shared/source/kernel/kernel_arg_metadata.h +++ b/shared/source/kernel/kernel_arg_metadata.h @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/shared/source/xe_hp_core/hw_cmds_xe_hp_sdv.h b/shared/source/xe_hp_core/hw_cmds_xe_hp_sdv.h index 3767fea87f..86db76fdc7 100644 --- a/shared/source/xe_hp_core/hw_cmds_xe_hp_sdv.h +++ b/shared/source/xe_hp_core/hw_cmds_xe_hp_sdv.h @@ -1,12 +1,14 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "shared/source/helpers/hw_info.h" #include "shared/source/xe_hp_core/hw_cmds_base.h" + namespace NEO { struct XE_HP_SDV : public XeHpFamily { static const PLATFORM platform; diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h index 6aeebcadb8..d9fb0aad23 100644 --- a/shared/test/common/libult/linux/drm_mock.h +++ b/shared/test/common/libult/linux/drm_mock.h @@ -6,7 +6,6 @@ */ #pragma once - #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/string.h" #include "shared/source/os_interface/linux/drm_neo.h" @@ -15,7 +14,6 @@ #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" #include -#include #include #include #include diff --git a/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp b/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp index 66e101b62f..057904ddaa 100644 --- a/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_atomic.cpp b/shared/test/unit_test/encoders/test_encode_atomic.cpp index 338e3d379a..8cd531c4ce 100644 --- a/shared/test/unit_test/encoders/test_encode_atomic.cpp +++ b/shared/test/unit_test/encoders/test_encode_atomic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp index 426e3f3429..0468049781 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp @@ -20,6 +20,7 @@ #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/fixtures/front_window_fixture.h" diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp index 89b239af59..edf43ea09f 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h" diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp index 0635a6a604..8c4d50be09 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp index e188a7a204..9c74ded1ce 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp @@ -21,6 +21,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h" diff --git a/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp b/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp index 01030aaa43..a1fc4f0b55 100644 --- a/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp +++ b/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp index e4e2dc4dde..6954a323d9 100644 --- a/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp index 2f21bbe467..9cda40f97a 100644 --- a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp +++ b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp index 3233eda27c..f4cfa7142c 100644 --- a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp index bd8ee687fa..3f1fbd0818 100644 --- a/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/definitions/mi_flush_args.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_semaphore.cpp b/shared/test/unit_test/encoders/test_encode_semaphore.cpp index 41540eb2e5..b227a8c990 100644 --- a/shared/test/unit_test/encoders/test_encode_semaphore.cpp +++ b/shared/test/unit_test/encoders/test_encode_semaphore.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/cmd_parse/hw_parse.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_states.cpp b/shared/test/unit_test/encoders/test_encode_states.cpp index 3ef46898a8..a83387d322 100644 --- a/shared/test/unit_test/encoders/test_encode_states.cpp +++ b/shared/test/unit_test/encoders/test_encode_states.cpp @@ -17,6 +17,7 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/fixtures/front_window_fixture.h" diff --git a/shared/test/unit_test/encoders/test_encode_states_dg2.cpp b/shared/test/unit_test/encoders/test_encode_states_dg2.cpp index ee97243f67..213ba3e24f 100644 --- a/shared/test/unit_test/encoders/test_encode_states_dg2.cpp +++ b/shared/test/unit_test/encoders/test_encode_states_dg2.cpp @@ -11,6 +11,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/mocks/mock_debugger.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "test_traits_common.h" diff --git a/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpc.cpp b/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpc.cpp index 99cc0a3c21..2e0dc103f6 100644 --- a/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpc.cpp +++ b/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpc.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/implicit_scaling_fixture.h" HWTEST2_F(ImplicitScalingTests, GivenXeHpcWhenCheckingPipeControlStallRequiredThenExpectTrue, IsXeHpcCore) { diff --git a/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpg.cpp b/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpg.cpp index 3580af7f4a..46fc6cfd2e 100644 --- a/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpg.cpp +++ b/shared/test/unit_test/encoders/test_implicit_scaling_xe_hpg.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/implicit_scaling_fixture.h" HWTEST2_F(ImplicitScalingTests, GivenXeHpgWhenCheckingPipeControlStallRequiredThenExpectTrue, IsXeHpgCore) { diff --git a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp index ccae83c60a..9522c27aae 100644 --- a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp @@ -13,6 +13,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/implicit_scaling_fixture.h" HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenGetSizeWhenDispatchingCmdBufferThenConsumedSizeMatchEstimatedAndCmdBufferHasCorrectCmds) { diff --git a/shared/test/unit_test/fixtures/command_container_fixture.h b/shared/test/unit_test/fixtures/command_container_fixture.h index e799cacd57..79432c82e8 100644 --- a/shared/test/unit_test/fixtures/command_container_fixture.h +++ b/shared/test/unit_test/fixtures/command_container_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "shared/source/kernel/kernel_descriptor.h" #include "shared/source/program/kernel_info.h" #include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test.h" namespace NEO { diff --git a/shared/test/unit_test/fixtures/product_config_fixture.h b/shared/test/unit_test/fixtures/product_config_fixture.h index e8a3793772..e56fe25cef 100644 --- a/shared/test/unit_test/fixtures/product_config_fixture.h +++ b/shared/test/unit_test/fixtures/product_config_fixture.h @@ -8,11 +8,13 @@ #pragma once #include "shared/source/helpers/constants.h" +#include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/product_config_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test_base.h" +#include "gtest/gtest.h" #include "platforms.h" using namespace NEO; diff --git a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp index 33aefd9bfd..d5bcb70366 100644 --- a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp +++ b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp @@ -6,8 +6,11 @@ */ #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct EhlProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp index fed4218bb4..3043f3fafd 100644 --- a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp @@ -7,8 +7,11 @@ #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct IcllpProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp index fcd5e79263..0b7dcd6c3d 100644 --- a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp +++ b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp @@ -6,8 +6,11 @@ */ #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct LkfProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp index 94ec666241..db4580a108 100644 --- a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp @@ -5,9 +5,12 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adln.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp index a3e8232908..3e015e0d89 100644 --- a/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/gen12lp/hw_cmds_adln.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp index 606cc8f35f..826110102e 100644 --- a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp @@ -5,10 +5,13 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adlp.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp index bafd912c89..cf79e9dcec 100644 --- a/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/gen12lp/hw_cmds_adlp.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp index 0c0fe7ee5b..9547db2c89 100644 --- a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp +++ b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp @@ -5,9 +5,12 @@ * */ +#include "shared/source/gen12lp/hw_cmds_adls.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp index c27ec23a0d..ec18b8c88b 100644 --- a/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp +++ b/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/gen12lp/hw_cmds_adls.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp index cc4fd7f59f..801b87c3a0 100644 --- a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption_mode.h" #include "shared/source/gen12lp/hw_cmds_dg1.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #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" diff --git a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp index 4e6e061ce8..731d9c4ce4 100644 --- a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp @@ -14,6 +14,7 @@ #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" #include "aubstream/product_family.h" +#include "hw_cmds.h" #include "platforms.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp index 7a5230be0f..6317bf72ca 100644 --- a/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp @@ -9,8 +9,11 @@ #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" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; using Gen12lpProductHelperLinux = ProductHelperTestLinux; diff --git a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp index 3507b5eba6..9ab7efc158 100644 --- a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp +++ b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp @@ -5,9 +5,12 @@ * */ +#include "shared/source/gen12lp/hw_cmds_rkl.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp index 83f747fc85..95c1daa34f 100644 --- a/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp +++ b/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/gen12lp/hw_cmds_rkl.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/os_interface/hw_info_config.h" diff --git a/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp index 6a96290ec2..4de42ca36e 100644 --- a/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp +++ b/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/gen12lp/hw_cmds_tgllp.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp index 9a63225bee..f5ea35d93f 100644 --- a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp +++ b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp @@ -7,11 +7,14 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption_mode.h" +#include "shared/source/gen12lp/hw_cmds_tgllp.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/gfx_core_helper_tests.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp index 7b692582eb..f51e97a1ec 100644 --- a/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp @@ -1,14 +1,16 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/gen12lp/hw_info_gen12lp.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp index 5427589f60..5f6fbf8174 100644 --- a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp +++ b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp @@ -6,8 +6,11 @@ */ #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct BdwProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp index 31d8f44831..bc7e9a6c6c 100644 --- a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp +++ b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests_bxt.cpp @@ -7,8 +7,11 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct BxtProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp index 6b01a53228..0f408f8805 100644 --- a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp +++ b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp @@ -7,8 +7,11 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct CflProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp index 5752570532..b585443572 100644 --- a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp +++ b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp @@ -6,8 +6,11 @@ */ #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct GlkProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp index 3c0d93eac3..3911d4b618 100644 --- a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp +++ b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp @@ -7,8 +7,11 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct KblProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp index 9d4b3a4a04..494f4d8205 100644 --- a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp +++ b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp @@ -6,8 +6,11 @@ */ #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" +#include "hw_cmds.h" + using namespace NEO; struct SklProductHelperLinux : ProductHelperTestLinux { diff --git a/shared/test/unit_test/helpers/cache_policy_tests.cpp b/shared/test/unit_test/helpers/cache_policy_tests.cpp index c44b30ad82..07da816acc 100644 --- a/shared/test/unit_test/helpers/cache_policy_tests.cpp +++ b/shared/test/unit_test/helpers/cache_policy_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/helpers/cache_policy.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" diff --git a/shared/test/unit_test/helpers/hw_aot_config_tests.cpp b/shared/test/unit_test/helpers/hw_aot_config_tests.cpp index 014dd2be45..ebd0732f4d 100644 --- a/shared/test/unit_test/helpers/hw_aot_config_tests.cpp +++ b/shared/test/unit_test/helpers/hw_aot_config_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/product_config_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl b/shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl index 40c1a090d5..c0d30c7b34 100644 --- a/shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl +++ b/shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl @@ -1,12 +1,11 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/simd_helper.h" -#include "shared/test/common/test_macros/hw_test.h" namespace NEO { diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp index 25a98f0a3e..edac66e6e3 100644 --- a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -20,6 +20,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/hw_test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.h b/shared/test/unit_test/os_interface/hw_info_config_tests.h index 1c7b45442f..d7e4fede7e 100644 --- a/shared/test/unit_test/os_interface/hw_info_config_tests.h +++ b/shared/test/unit_test/os_interface/hw_info_config_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,10 @@ #pragma once +#include "shared/source/helpers/hw_info.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/test_macros/hw_test.h" + +#include "gtest/gtest.h" namespace NEO { class ProductHelper; diff --git a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp index fe27932d4e..a9998abb39 100644 --- a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp @@ -1,12 +1,10 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/os_interface/os_interface.h" -#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/os_interface/linux/device_command_stream_fixture_prelim.h" #include "shared/test/common/os_interface/linux/drm_buffer_object_fixture.h" #include "shared/test/common/test_macros/test.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 89245c3e1d..9b1bf5d107 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -10,15 +10,12 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/surface_format_info.h" #include "shared/source/indirect_heap/indirect_heap.h" -#include "shared/source/memory_manager/host_ptr_manager.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/linux/drm_memory_operations_handler.h" -#include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/test/common/fixtures/memory_allocator_multi_device_fixture.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/gtest_helpers.h" -#include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/linux/mock_drm_allocation.h" #include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" @@ -32,6 +29,7 @@ #include "shared/test/common/os_interface/linux/drm_mock_cache_info.h" #include "shared/test/common/test_macros/hw_test.h" +#include "drm/i915_drm.h" #include "gtest/gtest.h" #include 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 9cfa61711f..c8169d625a 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 @@ -19,6 +19,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/hw_test.h" #include diff --git a/shared/test/unit_test/os_interface/linux/os_context_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/os_context_linux_tests.cpp index 9b6df7baf5..a168e12583 100644 --- a/shared/test/unit_test/os_interface/linux/os_context_linux_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/os_context_linux_tests.cpp @@ -1,23 +1,15 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/os_interface/linux/drm_buffer_object.h" -#include "shared/source/os_interface/linux/drm_memory_operations_handler_default.h" +#include "shared/source/os_interface/linux/drm_memory_operations_handler.h" #include "shared/source/os_interface/linux/os_context_linux.h" -#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/linux/mock_drm_allocation.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "shared/test/common/mocks/mock_gmm_helper.h" #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp index 1a0fee02ab..4e9f22b129 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp @@ -7,12 +7,14 @@ #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/xe_hpc_core/hw_info_xe_hpc_core.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/gtest_helpers.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h" #include "shared/test/unit_test/fixtures/product_config_fixture.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp index 2de946d4cf..e6b584659f 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/product_config_fixture.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp index 781fbf8e09..002e834107 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp @@ -11,6 +11,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h" diff --git a/shared/test/unit_test/xe_hpc_core/simd_helper_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/simd_helper_tests_xe_hpc_core.cpp index c65a22cf56..55f5809854 100644 --- a/shared/test/unit_test/xe_hpc_core/simd_helper_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/simd_helper_tests_xe_hpc_core.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp index 7dab8e29a2..6ecd28bb89 100644 --- a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp @@ -17,6 +17,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/helpers/state_base_address_tests.h" diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp index 8673bc22b5..e8eef1a62e 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp @@ -11,9 +11,11 @@ #include "shared/source/helpers/constants.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/xe_hpg_core/dg2/product_configs_dg2.h" #include "shared/test/unit_test/fixtures/product_config_fixture.h" diff --git a/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp index 5c0b977877..82549f2054 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp @@ -1,14 +1,16 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/os_interface.h" +#include "shared/source/xe_hpg_core/hw_info_xe_hpg_core.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp index c4ae4635f6..c0b256ccef 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp index 897b0cf76b..2183e0bdf4 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp index 775cdd7e00..cb2b4360e8 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp +++ b/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" diff --git a/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp index b157457bfe..792117a1b4 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp +++ b/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp @@ -6,9 +6,11 @@ */ #include "shared/source/os_interface/os_interface.h" +#include "shared/source/xe_hpg_core/hw_info_xe_hpg_core.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/libult/linux/drm_mock.h" +#include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/mtl/test_encode_dispatch_kernel_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/test_encode_dispatch_kernel_mtl.cpp index 228f3ff0bb..106f7c570d 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/test_encode_dispatch_kernel_mtl.cpp +++ b/shared/test/unit_test/xe_hpg_core/mtl/test_encode_dispatch_kernel_mtl.cpp @@ -10,6 +10,7 @@ #include "shared/source/helpers/gfx_core_helper.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h"