Cleanup includes 42

Cleaned up files:
level_zero/core/source/kernel/kernel_hw.h
shared/source/helpers/common_types.h
shared/test/common/libult/linux/drm_mock.h
shared/test/common/libult/ult_command_stream_receiver.h

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

level_zero/core/source/context/context_imp.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/utilities/stackvec.h"
 

level_zero/core/source/device/device_imp.cpp

@@ -17,7 +17,6 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/hw_helper.h"

level_zero/core/source/driver/host_pointer_manager.h

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/memory_manager/multi_graphics_allocation.h"
 #include "shared/source/utilities/spinlock.h"
 

level_zero/core/source/kernel/kernel_hw.h

@@ -12,7 +12,6 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/cache_policy.h"
-#include "shared/source/kernel/implicit_args.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
 #include "level_zero/core/source/device/device.h"

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/kernel/implicit_args.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/test_macros/hw_test.h"
 

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/local_id_gen.h"
 #include "shared/source/helpers/per_thread_data.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
+#include "shared/source/kernel/implicit_args.h"
 #include "shared/source/utilities/software_tags_manager.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/unit_test_helper.h"

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
+#include "shared/source/kernel/implicit_args.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"

level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/helpers/ray_tracing_helper.h"
+#include "shared/source/kernel/implicit_args.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/program/kernel_info_from_patchtokens.h"

level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/os_interface/linux/memory_info.h"
+
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
 
 #include "mock_engine.h"

opencl/source/cl_device/cl_device.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/utilities/reference_tracked_object.h"
 
 #include "opencl/source/api/cl_types.h"

opencl/source/context/context.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/string.h"
 

opencl/test/unit_test/sharings/va/va_sharing_tests.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/device/device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/memory_manager/graphics_allocation.h"

shared/source/command_container/implicit_scaling.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/helpers/vec.h"
 
 namespace WalkerPartition {

shared/source/command_container/walker_partition_xehp_and_later.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/ptr_math.h"

shared/source/command_stream/aub_command_stream_receiver.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 
 #include <string>
 

shared/source/command_stream/command_stream_receiver.h

@@ -9,7 +9,6 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/helpers/blit_properties_container.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/options.h"
 #include "shared/source/utilities/spinlock.h"
@@ -20,6 +19,7 @@
 #include <functional>
 
 namespace NEO {
+enum class DebugPauseState : uint32_t;
 struct BatchBuffer;
 struct WaitParams;
 class SubmissionAggregator;

shared/source/command_stream/tbx_command_stream_receiver.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 
 namespace NEO {
 class CommandStreamReceiver;

shared/source/direct_submission/direct_submission_controller.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "shared/source/command_stream/task_count_helper.h"
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 
 #include <array>
 #include <atomic>

shared/source/helpers/CMakeLists.txt

@@ -51,6 +51,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/constants.h
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/device_bitfield.h
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_model_type.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.h

shared/source/helpers/affinity_mask.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 
 #include <bitset>
 #include <limits>

shared/source/helpers/blit_helper.h

@@ -6,13 +6,14 @@
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/helpers/vec.h"
 
 #include <functional>
 
 namespace NEO {
 
+class Device;
 class GraphicsAllocation;
 
 enum class BlitOperationResult {

shared/source/helpers/common_types.h

@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include <bitset>
 #include <cstdint>
 #include <memory>
 #include <vector>
@@ -14,7 +13,6 @@
 namespace NEO {
 struct EngineControl;
 using EngineControlContainer = std::vector<EngineControl>;
-using DeviceBitfield = std::bitset<4>;
 class Device;
 using DeviceVector = std::vector<std::unique_ptr<Device>>;
 

shared/source/helpers/constants.h

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/definitions/engine_group_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 
 #include <cstdint>
 #include <limits>

shared/source/helpers/device_bitfield.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include <bitset>
+
+namespace NEO {
+
+using DeviceBitfield = std::bitset<4>;
+
+} // namespace NEO

shared/source/helpers/engine_node_helper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/utilities/stackvec.h"
 
 #include "aubstream/engine_node.h"

shared/source/helpers/flat_batch_buffer_helper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "shared/source/helpers/address_patch.h"
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 
 #include <map>
 #include <vector>

shared/source/memory_manager/internal_allocation_storage.h

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/memory_manager/allocations_list.h"
 
 #include <array>

shared/source/memory_manager/local_memory_usage.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "shared/source/memory_manager/local_memory_usage.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/common_types.h"
 
 #include <algorithm>
 #include <bitset>

shared/source/memory_manager/local_memory_usage.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include <atomic>

shared/source/memory_manager/unified_memory_manager.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "shared/source/command_stream/task_count_helper.h"
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/memory_manager/multi_graphics_allocation.h"
 #include "shared/source/memory_manager/residency_container.h"
 #include "shared/source/unified_memory/unified_memory.h"

shared/source/os_interface/linux/drm_memory_operations_handler_bind.h

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 
 namespace NEO {

shared/source/os_interface/linux/ioctl_helper_prelim.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"

shared/source/utilities/tag_allocator.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/memory_manager/multi_graphics_allocation.h"
 #include "shared/source/utilities/idlist.h"

shared/test/common/libult/linux/drm_mock.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
@@ -321,9 +320,7 @@ class DrmMockEngine : public DrmMock {
     uint32_t i915QuerySuccessCount = std::numeric_limits<uint32_t>::max();
     uint32_t queryEngineInfoSuccessCount = std::numeric_limits<uint32_t>::max();
 
-    DrmMockEngine(RootDeviceEnvironment &rootDeviceEnvironment) : DrmMock(rootDeviceEnvironment) {
-        rootDeviceEnvironment.setHwInfoAndInitHelpers(defaultHwInfo.get());
-    }
+    DrmMockEngine(RootDeviceEnvironment &rootDeviceEnvironment);
 
     int handleRemainingRequests(DrmIoctl request, void *arg) override;
 

shared/test/common/libult/linux/drm_mock_engine.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
@@ -12,6 +13,10 @@
 
 #include "gtest/gtest.h"
 
+DrmMockEngine::DrmMockEngine(RootDeviceEnvironment &rootDeviceEnvironment) : DrmMock(rootDeviceEnvironment) {
+    rootDeviceEnvironment.setHwInfoAndInitHelpers(defaultHwInfo.get());
+}
+
 void DrmMockEngine::handleQueryItem(QueryItem *queryItem) {
     if (queryItem->queryId == static_cast<uint64_t>(ioctlHelper->getDrmParamValue(DrmParam::QueryEngineInfo))) {
         if (queryEngineInfoSuccessCount == 0) {

shared/test/common/libult/ult_command_stream_receiver.h

@@ -8,18 +8,15 @@
 #pragma once
 #include "shared/source/command_stream/aub_subcapture_status.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/device/device.h"
 #include "shared/source/direct_submission/direct_submission_hw.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/blit_properties.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/os_interface/os_context.h"
-#include "shared/test/common/helpers/batch_buffer_helper.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
-#include "shared/test/common/mocks/mock_experimental_command_buffer.h"
 
 #include <map>
 #include <optional>

shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp

@@ -35,6 +35,7 @@
 #include "gtest/gtest.h"
 
 #include <array>
+#include <fcntl.h>
 #include <memory>
 #include <vector>
 

shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/utilities/cpu_info.h"

shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp

@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"