Cleanup includes in cmdlist, cmdqueue, context, device, driver and module

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

level_zero/core/source/builtin/builtin_functions_lib_impl.cpp

@@ -9,6 +9,8 @@
 
 #include "shared/source/built_ins/built_ins.h"
 
+#include "level_zero/core/source/kernel/kernel.h"
+
 namespace NEO {
 const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) {
     return nullptr;
@@ -17,6 +19,15 @@ const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) {
 
 namespace L0 {
 
+BuiltinFunctionsLibImpl::BuiltinData::~BuiltinData() {
+    func.reset();
+    module.reset();
+}
+BuiltinFunctionsLibImpl::BuiltinData::BuiltinData() = default;
+BuiltinFunctionsLibImpl::BuiltinData::BuiltinData(std::unique_ptr<L0::Module> &&mod, std::unique_ptr<L0::Kernel> &&ker) {
+    module = std::move(mod);
+    func = std::move(ker);
+}
 std::unique_lock<BuiltinFunctionsLib::MutexType> BuiltinFunctionsLib::obtainUniqueOwnership() {
     return std::unique_lock<BuiltinFunctionsLib::MutexType>(this->ownershipMutex);
 }

level_zero/core/source/builtin/builtin_functions_lib_impl.h

@@ -42,15 +42,9 @@ struct BuiltinFunctionsLibImpl : BuiltinFunctionsLib {
     NEO::BuiltIns *builtInsLib;
 };
 struct BuiltinFunctionsLibImpl::BuiltinData {
-    MOCKABLE_VIRTUAL ~BuiltinData() {
-        func.reset();
-        module.reset();
-    }
-    BuiltinData() = default;
-    BuiltinData(std::unique_ptr<L0::Module> &&mod, std::unique_ptr<L0::Kernel> &&ker) {
-        module = std::move(mod);
-        func = std::move(ker);
-    }
+    MOCKABLE_VIRTUAL ~BuiltinData();
+    BuiltinData();
+    BuiltinData(std::unique_ptr<L0::Module> &&mod, std::unique_ptr<L0::Kernel> &&ker);
 
     std::unique_ptr<Module> module;
     std::unique_ptr<Kernel> func;

level_zero/core/source/cmdlist/cmdlist.cpp

@@ -14,9 +14,11 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue.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/event/event.h"
+#include "level_zero/core/source/kernel/kernel.h"
 
 namespace L0 {
 

level_zero/core/source/cmdlist/cmdlist.h

@@ -8,24 +8,23 @@
 #pragma once
 
 #include "shared/source/command_container/cmdcontainer.h"
-#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/command_stream/stream_properties.h"
-#include "shared/source/command_stream/thread_arbitration_policy.h"
+#include "shared/source/unified_memory/unified_memory.h"
 
-#include "level_zero/core/source/cmdqueue/cmdqueue.h"
-#include "level_zero/core/source/device/device.h"
-#include "level_zero/core/source/kernel/kernel.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 
+#include <map>
 #include <vector>
 
 struct _ze_command_list_handle_t {};
 
 namespace L0 {
+struct Device;
 struct EventPool;
 struct Event;
 struct Kernel;
+struct CommandQueue;
 
 struct CmdListKernelLaunchParams {
     bool isIndirect = false;

level_zero/core/source/cmdlist/cmdlist_hw.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
-#include "shared/source/command_stream/stream_properties.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/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"

level_zero/core/source/cmdlist/cmdlist_hw.inl

@@ -26,6 +26,7 @@
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memadvise_flags.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 #include "shared/source/program/sync_buffer_handler.h"
@@ -33,10 +34,13 @@
 #include "shared/source/utilities/software_tags_manager.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
+#include "level_zero/core/source/device/device.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/event/event.h"
 #include "level_zero/core/source/image/image.h"
+#include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module.h"
 
 #include <algorithm>

level_zero/core/source/cmdlist/cmdlist_imp.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/indirect_heap/indirect_heap.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/tools/source/metrics/metric.h"

level_zero/core/source/cmdlist/cmdlist_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,6 @@
 #pragma once
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
-#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
-#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 

level_zero/core/source/cmdqueue/cmdqueue.cpp

@@ -18,6 +18,7 @@
 #include "level_zero/core/source/device/device.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/kernel/kernel.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/cmdqueue/cmdqueue.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/device/device.h"
+#include "shared/source/command_stream/preemption_mode.h"
+
 #include <level_zero/ze_api.h>
 
 #include <atomic>
@@ -19,6 +20,7 @@ class CommandStreamReceiver;
 }
 
 namespace L0 {
+struct Device;
 
 struct CommandQueue : _ze_command_queue_handle_t {
     template <typename Type>

level_zero/core/source/cmdqueue/cmdqueue_hw.h

@@ -6,16 +6,12 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/command_stream/scratch_space_controller.h"
-#include "shared/source/command_stream/submissions_aggregator.h"
-#include "shared/source/helpers/constants.h"
-#include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/memory_manager/residency_container.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 
-#include "igfxfmid.h"
+namespace NEO {
+class ScratchSpaceController;
+}
 
 namespace L0 {
 

level_zero/core/source/cmdqueue/cmdqueue_hw.inl

@@ -14,6 +14,7 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/command_stream/submission_status.h"
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/command_stream/wait_status.h"

level_zero/core/source/cmdqueue/cmdqueue_imp.h

@@ -7,12 +7,9 @@
 
 #pragma once
 
-#include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/submission_status.h"
-#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/helpers/constants.h"
-#include "shared/source/indirect_heap/indirect_heap.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 

level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"

level_zero/core/source/context/context.h

@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/driver/driver_handle.h"
+#include "shared/source/unified_memory/unified_memory.h"
+
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 
@@ -15,6 +16,10 @@ struct _ze_context_handle_t {
     virtual ~_ze_context_handle_t() = default;
 };
 
+namespace NEO {
+class Device;
+}
+
 namespace L0 {
 struct DriverHandle;
 struct Image;

level_zero/core/source/context/context_imp.cpp

@@ -19,6 +19,7 @@
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/memory/memory_operations_helper.h"
+#include "level_zero/core/source/module/module.h"
 
 namespace L0 {
 

level_zero/core/source/context/context_imp.h

@@ -7,13 +7,17 @@
 
 #pragma once
 
-#include "shared/source/os_interface/os_interface.h"
+#include "shared/source/helpers/common_types.h"
+#include "shared/source/utilities/stackvec.h"
 
 #include "level_zero/core/source/context/context.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
+
+#include <map>
 
 namespace L0 {
 struct StructuresLookupTable;
+struct DriverHandleImp;
+struct Device;
 
 struct ContextImp : Context {
     ContextImp(DriverHandle *driverHandle);

level_zero/core/source/context/context_imp_drm/context_imp.cpp

@@ -7,6 +7,8 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+
 namespace L0 {
 
 bool ContextImp::isShareableMemory(const void *exportDesc, bool exportableMemory, NEO::Device *neoDevice) {
@@ -21,4 +23,4 @@ void *ContextImp::getMemHandlePtr(ze_device_handle_t hDevice, uint64_t handle, z
     return this->driverHandle->importFdHandle(hDevice, flags, handle, nullptr);
 }
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/context/context_imp_drm_or_wddm/context_imp.cpp

@@ -7,6 +7,9 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+
 namespace L0 {
 
 bool ContextImp::isShareableMemory(const void *exportDesc, bool exportableMemory, NEO::Device *neoDevice) {
@@ -40,4 +43,4 @@ void *ContextImp::getMemHandlePtr(ze_device_handle_t hDevice, uint64_t handle, z
     }
 }
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/context/context_imp_wddm/context_imp.cpp

@@ -7,6 +7,8 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+
 namespace L0 {
 
 bool ContextImp::isShareableMemory(const void *exportDesc, bool exportableMemory, NEO::Device *neoDevice) {
@@ -21,4 +23,4 @@ void *ContextImp::getMemHandlePtr(ze_device_handle_t hDevice, uint64_t handle, z
     return this->driverHandle->importNTHandle(hDevice, reinterpret_cast<void *>(handle));
 }
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/device/device.h

@@ -7,16 +7,7 @@
 
 #pragma once
 
-#include "shared/source/command_stream/preemption_mode.h"
-#include "shared/source/device/device.h"
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_interface.h"
-
 #include "level_zero/core/source/debugger/debugger_l0.h"
-#include "level_zero/core/source/driver/driver.h"
-#include "level_zero/core/source/driver/driver_handle.h"
-#include "level_zero/core/source/module/module.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 

level_zero/core/source/device/device_imp.cpp

@@ -41,6 +41,7 @@
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/module/module.h"
+#include "level_zero/core/source/module/module_build_log.h"
 #include "level_zero/core/source/printf_handler/printf_handler.h"
 #include "level_zero/core/source/sampler/sampler.h"
 #include "level_zero/tools/source/debug/debug_session.h"

level_zero/core/source/device/device_imp.h

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

level_zero/core/source/driver/driver_handle.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,17 +7,23 @@
 
 #pragma once
 
-#include "shared/source/memory_manager/unified_memory_manager.h"
-
-#include "level_zero/core/source/context/context.h"
-#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zes_api.h>
 
+#include <memory>
+#include <vector>
 struct _ze_driver_handle_t {
     virtual ~_ze_driver_handle_t() = default;
 };
 
+namespace NEO {
+class Device;
+class MemoryManager;
+class SVMAllocsManager;
+class GraphicsAllocation;
+struct SvmAllocationData;
+} // namespace NEO
+
 namespace L0 {
 struct Device;
 struct L0EnvVariables;

level_zero/core/source/driver/driver_handle_imp.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/core/source/context/context_imp.h"

level_zero/core/source/driver/driver_handle_imp.h

@@ -7,10 +7,14 @@
 
 #pragma once
 
+#include "shared/source/memory_manager/graphics_allocation.h"
+
 #include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/get_extension_function_lookup_map.h"
 
+#include <map>
+
 namespace L0 {
 class HostPointerManager;
 

level_zero/core/source/gen11/cmdlist_gen11.inl

@@ -8,6 +8,7 @@
 #include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 

level_zero/core/source/gen9/cmdlist_gen9.inl

@@ -12,6 +12,7 @@
 #include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 template <GFXCORE_FAMILY gfxCoreFamily>

level_zero/core/source/kernel/kernel_hw.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/device/device.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
@@ -15,7 +16,10 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/string.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"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/core/source/module/module.h"
 

level_zero/core/source/module/module.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "level_zero/core/source/context/context.h"
-#include "level_zero/core/source/kernel/kernel.h"
-#include "level_zero/core/source/module/module_build_log.h"
 #include <level_zero/ze_api.h>
 
 #include <set>
@@ -19,6 +16,8 @@ struct _ze_module_handle_t {};
 
 namespace L0 {
 struct Device;
+struct ModuleBuildLog;
+struct KernelImmutableData;
 
 enum class ModuleType {
     Builtin,

level_zero/core/source/module/module_build_log.cpp

@@ -1,16 +1,19 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "level_zero/core/source/module/module_build_log.h"
+
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 
 #include "level_zero/core/source/module/module.h"
 
 #include <memory>
+#include <string>
 
 namespace L0 {
 

level_zero/core/source/module/module_imp.cpp

@@ -30,6 +30,7 @@
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
 #include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module_build_log.h"
 
@@ -1102,6 +1103,15 @@ bool ModuleImp::populateHostGlobalSymbolsMap(std::unordered_map<std::string, std
     return retVal;
 }
 
+ze_result_t ModuleImp::destroy() {
+    auto tempHandle = debugModuleHandle;
+    auto tempDevice = device;
+    delete this;
+    if (tempDevice->getL0Debugger() && tempHandle != 0) {
+        tempDevice->getL0Debugger()->removeZebinModule(tempHandle);
+    }
+    return ZE_RESULT_SUCCESS;
+}
 void ModuleImp::registerElfInDebuggerL0() {
     if (device->getL0Debugger() == nullptr) {
         return;

level_zero/core/source/module/module_imp.h

@@ -10,13 +10,9 @@
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/linker.h"
 #include "shared/source/program/program_info.h"
-#include "shared/source/utilities/const_stringref.h"
 
-#include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/module/module.h"
 
-#include "igfxfmid.h"
-
 #include <list>
 #include <memory>
 #include <string>
@@ -85,15 +81,7 @@ struct ModuleImp : public Module {
 
     ~ModuleImp() override;
 
-    ze_result_t destroy() override {
-        auto tempHandle = debugModuleHandle;
-        auto tempDevice = device;
-        delete this;
-        if (tempDevice->getL0Debugger() && tempHandle != 0) {
-            tempDevice->getL0Debugger()->removeZebinModule(tempHandle);
-        }
-        return ZE_RESULT_SUCCESS;
-    }
+    ze_result_t destroy() override;
 
     ze_result_t createKernel(const ze_kernel_desc_t *desc,
                              ze_kernel_handle_t *phFunction) override;