refactor: cleanup headers

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

level_zero/core/source/cmdlist/cmdlist_hw.h

@@ -7,20 +7,17 @@
 
 #pragma once
 
-#include "shared/source/command_stream/transfer_direction.h"
-#include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/hw_mapper.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/vec.h"
-#include "shared/source/kernel/kernel_arg_descriptor.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 
-#include "neo_igfxfmid.h"
-
 namespace NEO {
-enum class MemoryPool;
 enum class ImageType;
+enum class MemoryPool;
+enum class TransferDirection;
+struct BlitProperties;
 struct EncodeDispatchKernelArgs;
 struct KernelDescriptor;
 

level_zero/core/source/cmdlist/cmdlist_imp.cpp

@@ -9,30 +9,25 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
-#include "shared/source/command_stream/wait_status.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
-#include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/os_time.h"
-#include "shared/source/os_interface/sys_calls_common.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/core/source/helpers/properties_parser.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include "log_manager.h"
 #include "neo_igfxfmid.h"
 
-#include <algorithm>
-
 namespace L0 {
 
 CommandList::CommandList(uint32_t numIddsPerBlock) : commandContainer(numIddsPerBlock) {

level_zero/core/source/fabric/fabric.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #include "level_zero/core/source/fabric/fabric.h"
 
-#include "shared/source/helpers/string.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/fabric/fabric_device_interface.h"

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

@@ -5,19 +5,16 @@
  *
  */
 
+#include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-#include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_gmm.h"
-#include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/mocks/mock_gmm_resource_info.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/builtin/builtin_functions_lib_impl.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/image/image_hw.h"
-#include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"

shared/source/direct_submission/windows/direct_submission_controller_windows.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/os_interface/windows/sys_calls_winmm.h"
 
 #include <chrono>
+
 namespace NEO {
 bool DirectSubmissionController::sleep(std::unique_lock<std::mutex> &lock) {
     SysCalls::timeBeginPeriod(1u);
@@ -20,7 +21,11 @@ bool DirectSubmissionController::sleep(std::unique_lock<std::mutex> &lock) {
 }
 
 void DirectSubmissionController::overrideDirectSubmissionTimeouts(const ProductHelper &productHelper) {
-    productHelper.overrideDirectSubmissionTimeouts(this->timeout, this->maxTimeout);
+    uint64_t timeoutUs = this->timeout.count();
+    uint64_t maxTimeoutUs = this->maxTimeout.count();
+    productHelper.overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
+    this->timeout = std::chrono::microseconds(timeoutUs);
+    this->maxTimeout = std::chrono::microseconds(maxTimeoutUs);
 }
 
 } // namespace NEO

shared/source/os_interface/linux/drm_neo.cpp

@@ -66,6 +66,7 @@ Drm::Drm(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceIdIn, RootDeviceEnvironment &r
       hwDeviceId(std::move(hwDeviceIdIn)), rootDeviceEnvironment(rootDeviceEnvironment) {
     pagingFence.fill(0u);
     fenceVal.fill(0u);
+    minimalChunkingSize = MemoryConstants::pageSize2M;
 }
 
 SubmissionStatus Drm::getSubmissionStatusFromReturnCode(int32_t retCode) {

shared/source/os_interface/linux/drm_neo.h

@@ -7,16 +7,12 @@
 
 #pragma once
 #include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/memory_manager/definitions/engine_limits.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/linux/hw_device_id.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/utilities/stackvec.h"
-
-#include "neo_igfxfmid.h"
 
 #include <array>
 #include <atomic>
@@ -275,6 +271,7 @@ class Drm : public DriverModel {
     uint32_t getVmIdForContext(OsContext &osContext, uint32_t vmHandleId) const;
 
   protected:
+    Drm() = delete;
     Drm(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceIdIn, RootDeviceEnvironment &rootDeviceEnvironment);
 
     int waitOnUserFencesImpl(const OsContextLinux &osContext, uint64_t address, uint64_t value, uint32_t numActiveTiles, int64_t timeout, uint32_t postSyncOffset, bool userInterrupt,
@@ -358,7 +355,7 @@ class Drm : public DriverModel {
     bool setPairAvailable = false;
     bool chunkingAvailable = false;
     uint32_t chunkingMode = 0;
-    uint32_t minimalChunkingSize = MemoryConstants::pageSize2M;
+    uint32_t minimalChunkingSize;
     bool contextDebugSupported = false;
     bool pageFaultSupported = false;
     bool completionFenceSupported = false;

shared/source/os_interface/product_helper.h

@@ -6,12 +6,10 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/queue_throttle.h"
 #include "shared/source/command_stream/task_count_helper.h"
 
 #include "aubstream/engine_node.h"
 
-#include <chrono>
 #include <igfxfmid.h>
 #include <memory>
 #include <optional>
@@ -260,7 +258,7 @@ class ProductHelper {
     virtual uint32_t getGmmResourceUsageOverride(uint32_t usageType) const = 0;
     virtual bool isSharingWith3dOrMediaAllowed() const = 0;
     virtual bool isL3FlushAfterPostSyncRequired(bool heaplessEnabled) const = 0;
-    virtual void overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const = 0;
+    virtual void overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const = 0;
     virtual bool isMisalignedUserPtr2WayCoherent() const = 0;
     virtual bool isSvmHeapReservationSupported() const = 0;
     virtual void setRenderCompressedFlags(HardwareInfo &hwInfo) const = 0;

shared/source/os_interface/product_helper_before_xe2.inl

@@ -67,7 +67,7 @@ bool ProductHelperHw<gfxProduct>::isPidFdOrSocketForIpcSupported() const {
 }
 
 template <PRODUCT_FAMILY gfxProduct>
-void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const {
+void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const {
 }
 
 } // namespace NEO

shared/source/os_interface/product_helper_hw.h

@@ -198,7 +198,7 @@ class ProductHelperHw : public ProductHelper {
     uint32_t getGmmResourceUsageOverride(uint32_t usageType) const override;
     bool isSharingWith3dOrMediaAllowed() const override;
     bool isL3FlushAfterPostSyncRequired(bool heaplessEnabled) const override;
-    void overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const override;
+    void overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const override;
     bool isMisalignedUserPtr2WayCoherent() const override;
     bool isSvmHeapReservationSupported() const override;
     void setRenderCompressedFlags(HardwareInfo &hwInfo) const override;

shared/source/os_interface/product_helper_xe2_and_later.inl

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/os_interface/product_helper_hw.h"
+
 namespace NEO {
 
 template <PRODUCT_FAMILY gfxProduct>
@@ -70,14 +71,14 @@ bool ProductHelperHw<gfxProduct>::isPidFdOrSocketForIpcSupported() const {
 }
 
 template <PRODUCT_FAMILY gfxProduct>
-void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const {
+void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const {
-    timeout = std::chrono::microseconds{1'000};
+    timeoutUs = 1'000;
-    maxTimeout = std::chrono::microseconds{1'000};
+    maxTimeoutUs = 1'000;
     if (debugManager.flags.DirectSubmissionControllerTimeout.get() != -1) {
-        timeout = std::chrono::microseconds{debugManager.flags.DirectSubmissionControllerTimeout.get()};
+        timeoutUs = debugManager.flags.DirectSubmissionControllerTimeout.get();
     }
     if (debugManager.flags.DirectSubmissionControllerMaxTimeout.get() != -1) {
-        maxTimeout = std::chrono::microseconds{debugManager.flags.DirectSubmissionControllerMaxTimeout.get()};
+        maxTimeoutUs = debugManager.flags.DirectSubmissionControllerMaxTimeout.get();
     }
 }
 

shared/source/os_interface/windows/wddm_allocation.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,8 @@
 #include "shared/source/os_interface/windows/d3dkmthk_wrapper.h"
 #include "shared/source/os_interface/windows/windows_wrapper.h"
 
+#include <sstream>
+
 namespace NEO {
 
 struct OsHandleWin : OsHandle {

shared/source/utilities/bitcontainers.h

@@ -14,6 +14,7 @@
 #include <algorithm>
 #include <bit>
 #include <bitset>
+#include <functional>
 #include <vector>
 
 // Variable-length bitarray with support for ffz (find first zero)

shared/test/common/mocks/mock_gmm_resource_info_common.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/constants.h"
 #include "shared/test/common/mocks/mock_gmm_resource_info.h"
 
 namespace NEO {

shared/test/common/mocks/mock_product_helper.cpp

@@ -489,7 +489,7 @@ bool ProductHelperHw<IGFX_UNKNOWN>::isPidFdOrSocketForIpcSupported() const {
 }
 
 template <>
-void ProductHelperHw<IGFX_UNKNOWN>::overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const {
+void ProductHelperHw<IGFX_UNKNOWN>::overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const {
 }
 
 } // namespace NEO

shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp

@@ -12,13 +12,12 @@
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/memory_manager/allocation_properties.h"
-#include "shared/source/os_interface/windows/sys_calls.h"
 #include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
 #include "shared/source/os_interface/windows/wddm_residency_controller.h"
+#include "shared/source/os_interface/windows/windows_wrapper.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/memory_management.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
@@ -1338,11 +1337,11 @@ HWTEST_F(WddmDirectSubmissionTest, givenDirectSubmissionControllerWhenRegisterCs
     auto csr = device->getDefaultEngine().commandStreamReceiver;
 
     DirectSubmissionControllerMock controller;
-    auto timeout = std::chrono::microseconds{5'000};
+    uint64_t timeoutUs{5'000};
-    EXPECT_EQ(controller.timeout, timeout);
+    EXPECT_EQ(static_cast<uint64_t>(controller.timeout.count()), timeoutUs);
     controller.registerDirectSubmission(csr);
-    csr->getProductHelper().overrideDirectSubmissionTimeouts(timeout, timeout);
+    csr->getProductHelper().overrideDirectSubmissionTimeouts(timeoutUs, timeoutUs);
-    EXPECT_EQ(controller.timeout, timeout);
+    EXPECT_EQ(static_cast<uint64_t>(controller.timeout.count()), timeoutUs);
 
     controller.unregisterDirectSubmission(csr);
 }

shared/test/unit_test/os_interface/product_helper_tests.cpp

@@ -1152,27 +1152,27 @@ HWTEST2_F(ProductHelperTest, givenProductHelperThenCompressionIsNotForbidden, Is
 HWTEST2_F(ProductHelperTest, givenProductHelperBeforeXe2WhenOverrideDirectSubmissionTimeoutsThenTimeoutsNotAdjusted, IsAtMostXeCore) {
     DebugManagerStateRestore restorer;
 
-    std::chrono::microseconds timeout{5000};
+    uint64_t timeoutUs{5000};
-    std::chrono::microseconds maxTimeout{5000};
+    uint64_t maxTimeoutUs{5000};
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(std::chrono::microseconds{5000}, timeout);
+    EXPECT_EQ(5000ull, timeoutUs);
-    EXPECT_EQ(std::chrono::microseconds{5000}, maxTimeout);
+    EXPECT_EQ(5000ull, maxTimeoutUs);
 }
 
 HWTEST2_F(ProductHelperTest, givenProductHelperWhenOverrideDirectSubmissionTimeoutsThenTimeoutsAdjusted, IsAtLeastXe2HpgCore) {
     DebugManagerStateRestore restorer;
 
-    std::chrono::microseconds timeout{5000};
+    uint64_t timeoutUs{5000};
-    std::chrono::microseconds maxTimeout{5000};
+    uint64_t maxTimeoutUs{5000};
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(std::chrono::microseconds{1000}, timeout);
+    EXPECT_EQ(1000ull, timeoutUs);
-    EXPECT_EQ(std::chrono::microseconds{1000}, maxTimeout);
+    EXPECT_EQ(1000ull, maxTimeoutUs);
 
     debugManager.flags.DirectSubmissionControllerTimeout.set(10000);
     debugManager.flags.DirectSubmissionControllerMaxTimeout.set(10000);
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(std::chrono::microseconds{10000}, timeout);
+    EXPECT_EQ(10000ull, timeoutUs);
-    EXPECT_EQ(std::chrono::microseconds{10000}, maxTimeout);
+    EXPECT_EQ(10000ull, maxTimeoutUs);
 }
 
 HWTEST_F(ProductHelperTest, givenProductHelperWhenIsExposingSubdevicesAllowedThenTrueIsReturned) {

shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp

@@ -5,12 +5,9 @@
  *
  */
 
-#include "shared/source/memory_manager/allocation_type.h"
 #include "shared/source/os_interface/product_helper.h"
-#include "shared/source/xe2_hpg_core/hw_cmds_lnl.h"
 #include "shared/source/xe2_hpg_core/hw_info_xe2_hpg_core.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
 
 #include "per_product_test_definitions.h"
@@ -24,19 +21,19 @@ LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenCheckIsCopyBufferRectSp
 }
 
 LNLTEST_F(LnlProductHelperWindows, givenOverrideDirectSubmissionTimeoutsCalledThenTimeoutsAreOverridden) {
-    auto timeout = std::chrono::microseconds{5'000};
+    uint64_t timeoutUs{5'000};
-    auto maxTimeout = timeout;
+    uint64_t maxTimeoutUs = timeoutUs;
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(timeout.count(), 1'000);
+    EXPECT_EQ(timeoutUs, 1'000ull);
-    EXPECT_EQ(maxTimeout.count(), 1'000);
+    EXPECT_EQ(maxTimeoutUs, 1'000ull);
 
     DebugManagerStateRestore restorer{};
     debugManager.flags.DirectSubmissionControllerTimeout.set(2'000);
     debugManager.flags.DirectSubmissionControllerMaxTimeout.set(3'000);
 
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(timeout.count(), 2'000);
+    EXPECT_EQ(timeoutUs, 2'000ull);
-    EXPECT_EQ(maxTimeout.count(), 3'000);
+    EXPECT_EQ(maxTimeoutUs, 3'000ull);
 }
 
 LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenCallDeferMOCSToPatOnWSLThenTrueIsReturned) {

shared/test/unit_test/xe3_core/ptl/windows/product_helper_tests_ptl_windows.cpp

@@ -8,7 +8,6 @@
 #include "shared/source/os_interface/product_helper.h"
 #include "shared/source/xe3_core/hw_info_xe3_core.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/unit_test/os_interface/product_helper_tests.h"
@@ -21,17 +20,17 @@ PTLTEST_F(PtlProductHelperWindows, givenOverrideDirectSubmissionTimeoutsCalledTh
     auto mockDevice = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
     auto productHelper = &mockDevice->getProductHelper();
 
-    auto timeout = std::chrono::microseconds{5'000};
+    uint64_t timeoutUs{5'000};
-    auto maxTimeout = timeout;
+    uint64_t maxTimeoutUs = timeoutUs;
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(timeout.count(), 1'000);
+    EXPECT_EQ(timeoutUs, 1'000ull);
-    EXPECT_EQ(maxTimeout.count(), 1'000);
+    EXPECT_EQ(maxTimeoutUs, 1'000ull);
 
     DebugManagerStateRestore restorer{};
     debugManager.flags.DirectSubmissionControllerTimeout.set(2'000);
     debugManager.flags.DirectSubmissionControllerMaxTimeout.set(3'000);
 
-    productHelper->overrideDirectSubmissionTimeouts(timeout, maxTimeout);
+    productHelper->overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
-    EXPECT_EQ(timeout.count(), 2'000);
+    EXPECT_EQ(timeoutUs, 2'000ull);
-    EXPECT_EQ(maxTimeout.count(), 3'000);
+    EXPECT_EQ(maxTimeoutUs, 3'000ull);
 }