Cleanup includes 52

Cleaned up files:
level_zero/core/source/driver/driver.h
level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
level_zero/tools/source/sysman/pci/os_pci.h
shared/source/debug_settings/debug_settings_manager.h
shared/source/gmm_helper/page_table_mngr.h
shared/source/gmm_helper/windows/gmm_memory_base.h
shared/source/kernel/kernel_arg_metadata.h
shared/test/common/libult/linux/drm_mock.h
shared/test/unit_test/fixtures/command_container_fixture.h
shared/test/unit_test/fixtures/product_config_fixture.h
shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl
shared/test/unit_test/os_interface/hw_info_config_tests.h

Related-To: NEO-5548

Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>

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;

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;

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"

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"

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"

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"

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;

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;

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;

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;

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;

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;

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"
 

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"

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) {

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) {

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) {

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 {
 

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;

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 {

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 {

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 {

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;

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"

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;

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"

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;

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"

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"

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;

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;

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;

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"

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"

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;

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;

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 {

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 {

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 {

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 {

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 {

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 {

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"
 

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;

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 {
 

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"
 

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;

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"

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 <array>

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 <cstring>
 

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"
 

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"

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"
 

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"

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;

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"

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"

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;

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;

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;

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"
 

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;

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"