Cleanup includes 55

Cleaned up files:
level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h
level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h
opencl/test/unit_test/fixtures/program_fixture.h
opencl/test/unit_test/offline_compiler/environment.h
opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h
shared/test/common/cmd_parse/cmd_parse_base.inl
shared/test/common/mocks/mock_aub_file_stream.h
shared/test/common/mocks/mock_deferrable_deletion.h
shared/test/common/mocks/windows/mock_gmm_memory_base.h
shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h
shared/test/unit_test/os_interface/windows/os_interface_win_tests.h

Related-To: NEO-5548

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

level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h

@@ -8,27 +8,15 @@
 #pragma once
 
 #include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/helpers/file_io.h"
-#include "shared/source/helpers/string.h"
-#include "shared/source/memory_manager/memory_operations_status.h"
-#include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
-#include "shared/test/common/mocks/ult_device_factory.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/core/source/driver/host_pointer_manager.h"
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/core/source/module/module.h"
-#include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 
 #include "gtest/gtest.h"

level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,8 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "gtest/gtest.h"
+
 namespace L0 {
 namespace ult {
 MultiTileCommandListAppendLaunchKernelFixture::MultiTileCommandListAppendLaunchKernelFixture() : backup({&NEO::ImplicitScaling::apiSupport, true}) {}

level_zero/core/test/unit_tests/sources/memory/linux/test_memory_linux.cpp

@@ -13,6 +13,7 @@
 #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_driver_model.h"
+#include "shared/test/common/mocks/ult_device_factory.h"
 
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h"

level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,19 +7,15 @@
 
 #pragma once
 #include "level_zero/core/source/device/device_imp.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/driver/host_pointer_manager.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 #include "level_zero/experimental/source/tracing/tracing.h"
 #include "level_zero/experimental/source/tracing/tracing_imp.h"
 #include <level_zero/zet_api.h>
 
-#include <array>
+#include <gtest/gtest.h>
+
 #include <iostream>
 
 namespace L0 {

level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "test/unit_tests/mocks/mock_cmdlist.h"
 #include "test_api_tracing_common.h"
 
 namespace L0 {

opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h

@@ -10,6 +10,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aux_translation.h"
 #include "shared/source/helpers/blit_properties.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
@@ -19,10 +20,11 @@
 
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/cl_device/cl_device.h"
-#include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h"
 
+#include "gtest/gtest.h"
+
 using namespace NEO;
 
 template <uint32_t numTiles, bool useLocalMemory = true>

opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/aub_command_stream_receiver.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_device.h"

opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #pragma once
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/tests_configuration.h"
 

opencl/test/unit_test/fixtures/program_fixture.cpp

@@ -7,10 +7,15 @@
 
 #include "opencl/test/unit_test/fixtures/program_fixture.h"
 
+#include "shared/source/helpers/file_io.h"
+#include "shared/test/common/helpers/test_files.h"
+
 #include "opencl/source/program/create.inl"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 
+#include "gtest/gtest.h"
+
 namespace NEO {
 void ProgramFixture::createProgramWithSource(Context *pContext,
                                              const std::string &sourceFileName) {

opencl/test/unit_test/fixtures/program_fixture.h

@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/file_io.h"
-#include "shared/test/common/helpers/test_files.h"
-
-#include "gtest/gtest.h"
-
 #include <memory>
 #include <string>
 

opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/offline_compiler/source/decoder/translate_platform_base.h"
 #include "shared/source/helpers/array_count.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/variable_backup.h"

opencl/test/unit_test/offline_compiler/environment.h

@@ -6,9 +6,6 @@
  */
 
 #pragma once
-
-#include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/mocks/mock_compilers.h"
 

opencl/test/unit_test/offline_compiler/main.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/os_library.h"
 #include "shared/test/common/helpers/custom_event_listener.h"
 #include "shared/test/common/helpers/test_files.h"
@@ -16,6 +18,9 @@
 #include "limits.h"
 #include "test_files_setup.h"
 
+#include <fstream>
+#include <igfxfmid.h>
+
 #ifdef WIN32
 const char *fSeparator = "\\";
 #elif defined(__linux__)

opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h

@@ -10,8 +10,6 @@
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/source/helpers/string.h"
 
-#include "gtest/gtest.h"
-
 #include <algorithm>
 #include <map>
 #include <optional>

opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/offline_compiler/source/decoder/helper.h"
 #include "shared/offline_compiler/source/ocloc_api.h"
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_concat.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/offline_compiler/source/queries.h"

opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h

@@ -10,6 +10,7 @@
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
 
+#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 
 #include <memory>

opencl/test/unit_test/offline_compiler/ocloc_fcl_facade_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "shared/source/helpers/hw_info.h"
 
+#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 
 namespace NEO {

opencl/test/unit_test/offline_compiler/ocloc_igc_facade_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "shared/source/helpers/hw_info.h"
 
+#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 
 namespace NEO {

opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,8 @@
 
 #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h"
 
+#include "gtest/gtest.h"
+
 namespace NEO {
 struct OclocProductConfigTests : public ::testing::TestWithParam<std::tuple<AOT::PRODUCT_CONFIG, PRODUCT_FAMILY>> {
     void SetUp() override {

opencl/test/unit_test/offline_compiler/offline_compiler_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,8 @@
 
 #include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
 
+#include "gtest/gtest.h"
+
 #include <cstdint>
 #include <memory>
 

opencl/test/unit_test/offline_compiler/offline_linker_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "gtest/gtest.h"
 #include "mock/mock_argument_helper.h"
 #include "mock/mock_ocloc_igc_facade.h"
 #include "mock/mock_offline_linker.h"

opencl/test/unit_test/program/program_tests.cpp

@@ -19,6 +19,7 @@
 #include "shared/source/helpers/addressing_mode_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/compiler_product_helper.h"
+#include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hash.h"
 #include "shared/source/helpers/ptr_math.h"
@@ -32,6 +33,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/kernel_binary_helper.h"
+#include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/libult/global_environment.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"

shared/source/xe_hp_core/enable_hw_info_config_xe_hp_sdv.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 namespace NEO {

shared/source/xe_hp_core/hw_cmds_base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,9 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/xe_hp_core/hw_info.h"
 
+#include <cstring>
+#include <type_traits>
+
 template <class T>
 struct CmdParse;
 

shared/source/xe_hp_core/hw_info_xe_hp_core.h

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/hw_mapper.h"
 
 namespace NEO {
 

shared/test/common/cmd_parse/cmd_parse_base.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 
-#include "gtest/gtest.h"
-
 // clang-format off
 using namespace NEO;
 using MI_ARB_CHECK                    = GenStruct::MI_ARB_CHECK;

shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "gtest/gtest.h"
 // clang-format off
 using namespace NEO;
 using GPGPU_WALKER                    = GenStruct::GPGPU_WALKER;

shared/test/common/mocks/mock_aub_file_stream.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,6 @@
 #pragma once
 
 #include "shared/source/command_stream/aub_command_stream_receiver.h"
-#include "shared/test/common/test_macros/mock_method_macros.h"
-
-#include "gtest/gtest.h"
 
 #include <vector>
 

shared/test/common/mocks/mock_deferrable_deletion.cpp

@@ -7,6 +7,8 @@
 
 #include "shared/test/common/mocks/mock_deferrable_deletion.h"
 
+#include "gtest/gtest.h"
+
 namespace NEO {
 bool MockDeferrableDeletion::apply() {
     applyCalled++;

shared/test/common/mocks/mock_deferrable_deletion.h

@@ -8,8 +8,6 @@
 #pragma once
 #include "shared/source/memory_manager/deferrable_deletion.h"
 
-#include "gtest/gtest.h"
-
 namespace NEO {
 class MockDeferrableDeletion : public DeferrableDeletion {
   public:

shared/test/common/mocks/mock_logical_state_helper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,9 +13,9 @@
 namespace NEO {
 
 template <typename GfxFamily>
-class LogicalStateHelperMock : public GfxFamily::LogicalStateHelperHw {
+class LogicalStateHelperMock : public LogicalStateHelper {
   public:
-    LogicalStateHelperMock() : GfxFamily::LogicalStateHelperHw() {
+    LogicalStateHelperMock() : LogicalStateHelper() {
     }
 
     void writeStreamInline(LinearStream &linearStream, bool pipelinedState) override {

shared/test/common/mocks/windows/mock_gmm_memory_base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,6 @@
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
 #include "gmm_memory.h"
-#include "gtest/gtest.h"
 
 namespace NEO {
 

shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h

@@ -9,9 +9,7 @@
 
 #include "shared/source/command_container/walker_partition_xehp_and_later.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/unit_test_helper.h"
 
 #include "gtest/gtest.h"
 

shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp

@@ -5,7 +5,9 @@
  *
  */
 
+#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/unit_test_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/encoders/walker_partition_fixture_xehp_and_later.h"

shared/test/unit_test/os_interface/windows/os_interface_win_tests.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/os_interface.h"
 
 #include "gtest/gtest.h"