Cleanup includes 25

Cleaned up files:
level_zero/core/source/device/device.h
opencl/source/helpers/dispatch_info.h
shared/source/os_interface/os_interface.h

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

level_zero/core/source/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -36,6 +36,7 @@ set(L0_RUNTIME_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/device${BRANCH_DIR_SUFFIX}device_imp_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device/bcs_split.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device/bcs_split.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/device/device.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device/device.h
     ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp_${DRIVER_MODEL}/device_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp

level_zero/core/source/context/context_imp_drm_or_wddm.cpp

@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-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/helpers/driver_model_type.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_interface.h"
 

level_zero/core/source/device/device.cpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "level_zero/core/source/device/device.h"
+
+#include "shared/source/device/device.h"
+
+namespace L0 {
+
+uint32_t Device::getRootDeviceIndex() const {
+    return neoDevice->getRootDeviceIndex();
+}
+
+NEO::SourceLevelDebugger *Device::getSourceLevelDebugger() {
+    return getNEODevice()->getSourceLevelDebugger();
+}
+
+NEO::DebuggerL0 *Device::getL0Debugger() {
+    return getNEODevice()->getL0Debugger();
+}
+
+} // namespace L0

level_zero/core/source/device/device.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
-#include "shared/source/device/device.h"
-#include "shared/source/memory_manager/allocation_type.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 
+#include <memory>
+
 static_assert(NEO::ProductHelper::uuidSize == ZE_MAX_DEVICE_UUID_SIZE);
 
 struct _ze_device_handle_t {};
@@ -39,9 +39,8 @@ class L0GfxCoreHelper;
 enum class ModuleType;
 
 struct Device : _ze_device_handle_t {
-    uint32_t getRootDeviceIndex() const {
-        return neoDevice->getRootDeviceIndex();
-    }
+    uint32_t getRootDeviceIndex() const;
+
     NEO::Device *getNEODevice() const {
         return this->neoDevice;
     }
@@ -123,8 +122,8 @@ struct Device : _ze_device_handle_t {
 
     virtual NEO::PreemptionMode getDevicePreemptionMode() const = 0;
     virtual const NEO::DeviceInfo &getDeviceInfo() const = 0;
-    NEO::SourceLevelDebugger *getSourceLevelDebugger() { return getNEODevice()->getSourceLevelDebugger(); }
-    NEO::DebuggerL0 *getL0Debugger() { return getNEODevice()->getL0Debugger(); }
+    NEO::SourceLevelDebugger *getSourceLevelDebugger();
+    NEO::DebuggerL0 *getL0Debugger();
 
     virtual NEO::GraphicsAllocation *getDebugSurface() const = 0;
 

level_zero/core/source/device/device_imp.cpp

@@ -28,6 +28,7 @@
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/os_time.h"

level_zero/core/source/device/device_imp.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/device/device.h"
 #include "shared/source/helpers/topology_map.h"
 #include "shared/source/memory_manager/memadvise_flags.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"

level_zero/core/source/image/image_hw.inl

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/command_container/command_encoder.h"
+#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/basic_math.h"

level_zero/core/source/image/image_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "level_zero/core/source/image/image_imp.h"
 
+#include "shared/source/device/device.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
 #include "level_zero/core/source/device/device.h"

level_zero/core/source/sampler/sampler_hw.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"

level_zero/core/test/unit_tests/sources/device/windows/test_device_pci_speed_info_windows.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/os_interface/driver_info.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"

level_zero/tools/source/debug/windows/debug_session.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "level_zero/tools/source/debug/windows/debug_session.h"
 
+#include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/register_offsets.h"

level_zero/tools/source/sysman/firmware_util/firmware_util_imp.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 "level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/utilities/directory.h"
 
 namespace L0 {

level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"

level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/device/device.h"
 
 #include "igfxfmid.h"
 #include "sysman/linux/os_sysman_imp.h"

level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 #include "shared/source/utilities/directory.h"
 
 #include <fcntl.h>
+#include <limits>
 #include <netlink/attr.h>
 #include <netlink/genl/ctrl.h>
 #include <netlink/genl/family.h>

level_zero/tools/source/sysman/linux/nl_api/nl_api.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,9 @@
 
 #include "nl_api.h"
 
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/os_interface/os_library.h"
+
 namespace L0 {
 
 static constexpr std::string_view libgenlFile = "libnl-genl-3.so.200";
@@ -250,4 +253,6 @@ NlApi::NlApi() {
     genlLibraryHandle.reset(NEO::OsLibrary::load(std::string(libgenlFile)));
 }
 
+NlApi::~NlApi() = default;
+
 } // namespace L0

level_zero/tools/source/sysman/linux/nl_api/nl_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,6 +19,10 @@
 #include <string>
 #include <sys/socket.h>
 
+namespace NEO {
+class OsLibrary;
+} // namespace NEO
+
 namespace L0 {
 
 typedef int (*pGenlConnect)(struct nl_sock *);
@@ -92,7 +96,7 @@ class NlApi : public NEO::NonCopyableOrMovableClass {
     MOCKABLE_VIRTUAL bool loadEntryPoints();
 
     NlApi();
-    MOCKABLE_VIRTUAL ~NlApi() = default;
+    MOCKABLE_VIRTUAL ~NlApi();
 
   protected:
     template <class T>

level_zero/tools/source/sysman/linux/pmt/pmt.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/debug_helpers.h"
 
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 

level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.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 "level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/device/device.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/system_info.h"

level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h"
 
+#include "shared/source/device/device.h"
+
 #include <cmath>
 
 namespace L0 {

level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/os_interface/driver_info.h"
+
 #include "level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/mock_ecc.h"
 
 extern bool sysmanUltsEnable;

level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *