Cleanup includes 22

Cleaned up files:
opencl/source/built_ins/builtins_dispatch_builder.h
opencl/source/context/context.h
opencl/source/gtpin/gtpin_notify.h
opencl/source/kernel/kernel.h
opencl/source/kernel/multi_device_kernel.h
opencl/source/mem_obj/buffer.h
opencl/source/mem_obj/mem_obj.h
shared/source/built_ins/registry/built_ins_registry.h
shared/source/page_fault_manager/cpu_page_fault_manager.h

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

opencl/source/built_ins/builtins_dispatch_builder.h

@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/built_ins/built_ins.h"
+#include "shared/source/built_ins/built_in_ops_base.h"
-#include "shared/source/built_ins/builtinops/built_in_ops.h"
 #include "shared/source/helpers/vec.h"
 
 #include "opencl/source/kernel/multi_device_kernel.h"
+#include "opencl/source/program/program.h"
 
 #include "CL/cl.h"
 
@@ -19,6 +19,7 @@
 #include <vector>
 
 namespace NEO {
+struct BuiltinCode;
 typedef std::vector<char> BuiltinResourceT;
 
 class ClDeviceVector;

opencl/source/context/context.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,6 +17,7 @@
 #include "shared/source/memory_manager/deferred_deleter.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/source/utilities/heap_allocator.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"

opencl/source/context/context.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,22 +8,24 @@
 #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"
-#include "shared/source/unified_memory/unified_memory.h"
-#include "shared/source/utilities/heap_allocator.h"
 
+#include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/cl_device/cl_device_vector.h"
 #include "opencl/source/context/context_type.h"
 #include "opencl/source/context/driver_diagnostics.h"
-#include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/helpers/base_object.h"
 #include "opencl/source/helpers/destructor_callbacks.h"
-#include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/map_operations_handler.h"
 
 #include <map>
 
+enum InternalMemoryType : uint32_t;
+
 namespace NEO {
+struct MemoryProperties;
+class HeapAllocator;
 
 class AsyncEventsHandler;
 class CommandQueue;

opencl/source/execution_environment/cl_execution_environment.cpp

@@ -7,9 +7,6 @@
 
 #include "opencl/source/execution_environment/cl_execution_environment.h"
 
-#include "shared/source/compiler_interface/compiler_cache.h"
-#include "shared/source/kernel/implicit_args.h"
-
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/event/async_events_handler.h"
 

opencl/source/gtpin/gtpin_notify.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@
 
 #include "CL/cl.h"
 
-#include <cstdint>
-
 namespace NEO {
 extern bool isGTPinInitialized;
 

opencl/source/helpers/dispatch_info.h

@@ -6,7 +6,6 @@
  */
 
 #pragma once
-
 #include "shared/source/helpers/registered_method_dispatcher.h"
 #include "shared/source/helpers/vec.h"
 #include "shared/source/utilities/stackvec.h"

opencl/source/kernel/kernel.cpp

@@ -51,6 +51,7 @@
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/mem_obj/pipe.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"
+#include "opencl/source/program/program.h"
 #include "opencl/source/sampler/sampler.h"
 
 #include "patch_list.h"
@@ -772,9 +773,15 @@ void Kernel::setKernelId(uint64_t newKernelId) {
     KernelInfo *pKernelInfo = const_cast<KernelInfo *>(&kernelInfo);
     pKernelInfo->kernelId = newKernelId;
 }
+
 uint32_t Kernel::getStartOffset() const {
     return this->startOffset;
 }
+
+Context &Kernel::getContext() const {
+    return program->getContext();
+}
+
 void Kernel::setStartOffset(uint32_t offset) {
     this->startOffset = offset;
 }
@@ -1000,6 +1007,10 @@ const Kernel::SimpleKernelArgInfo &Kernel::getKernelArgInfo(uint32_t argIndex) c
     return kernelArguments[argIndex];
 }
 
+bool Kernel::getAllowNonUniform() const {
+    return program->getAllowNonUniform();
+}
+
 void Kernel::setSvmKernelExecInfo(GraphicsAllocation *argValue) {
     kernelSvmGfxAllocations.push_back(argValue);
     if (allocationForCacheFlush(argValue)) {

opencl/source/kernel/kernel.h

@@ -11,20 +11,23 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/aux_translation.h"
 #include "shared/source/helpers/vec.h"
+#include "shared/source/kernel/implicit_args.h"
 #include "shared/source/kernel/kernel_execution_type.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/unified_memory/unified_memory.h"
 
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/cl_device/cl_device.h"
-#include "opencl/source/helpers/base_object.h"
-#include "opencl/source/helpers/properties_helper.h"
 #include "opencl/source/kernel/kernel_objects_for_aux_translation.h"
-#include "opencl/source/program/program.h"
 
+#include <map>
 #include <vector>
 
 namespace NEO {
+class MemObj;
+class TimestampPacketContainer;
+class Context;
+class Program;
 struct ImplicitArgs;
 enum class AllocationType;
 struct PatchInfoData;
@@ -216,9 +219,7 @@ class Kernel : public ReferenceTrackedObject<Kernel> {
         return kernelInfo;
     }
 
-    Context &getContext() const {
+    Context &getContext() const;
-        return program->getContext();
-    }
 
     Program *getProgram() const { return program; }
 
@@ -289,7 +290,7 @@ class Kernel : public ReferenceTrackedObject<Kernel> {
     const void *getKernelArg(uint32_t argIndex) const;
     const SimpleKernelArgInfo &getKernelArgInfo(uint32_t argIndex) const;
 
-    bool getAllowNonUniform() const { return program->getAllowNonUniform(); }
+    bool getAllowNonUniform() const;
     bool isVmeKernel() const { return kernelInfo.kernelDescriptor.kernelAttributes.flags.usesVme; }
     bool requiresSystolicPipelineSelectMode() const { return systolicPipelineSelectMode; }
 

opencl/source/kernel/multi_device_kernel.cpp

@@ -7,10 +7,10 @@
 
 #include "opencl/source/kernel/multi_device_kernel.h"
 
-#include "shared/source/compiler_interface/compiler_cache.h"
-#include "shared/source/kernel/implicit_args.h"
 #include "shared/source/memory_manager/multi_graphics_allocation.h"
 
+#include "opencl/source/program/program.h"
+
 namespace NEO {
 
 MultiDeviceKernel::~MultiDeviceKernel() {

opencl/source/kernel/multi_device_kernel.h

@@ -8,11 +8,12 @@
 #pragma once
 #include "shared/source/compiler_interface/compiler_cache.h"
 #include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/kernel/implicit_args.h"
 
+#include "opencl/source/helpers/base_object.h"
 #include "opencl/source/kernel/kernel.h"
 
 namespace NEO {
+class ClDeviceVector;
 class MultiGraphicsAllocation;
 
 template <>

opencl/source/mem_obj/buffer.cpp

@@ -17,6 +17,7 @@
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/mem_obj_helper.h"
+#include "opencl/source/sharings/unified/unified_buffer.h"
 
 namespace NEO {
 

opencl/source/mem_obj/buffer.h

@@ -1,18 +1,15 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/constants.h"
 
 #include "opencl/extensions/public/cl_ext_private.h"
-#include "opencl/source/context/context_type.h"
 #include "opencl/source/mem_obj/mem_obj.h"
-#include "opencl/source/sharings/unified/unified_buffer.h"
 
 #include "igfxfmid.h"
 #include "memory_properties_flags.h"
@@ -20,6 +17,7 @@
 #include <functional>
 
 namespace NEO {
+struct UnifiedSharingMemoryDescription;
 class Buffer;
 class ClDevice;
 class Device;

opencl/source/mem_obj/buffer_linux.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/sharings/unified/unified_sharing_types.h"
 
 namespace NEO {
 bool Buffer::validateHandleType(const MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem) {

opencl/source/mem_obj/buffer_windows.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/sharings/unified/unified_sharing_types.h"
 
 namespace NEO {
 bool Buffer::validateHandleType(const MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem) {

opencl/source/mem_obj/mem_obj.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 #include "opencl/source/api/cl_types.h"
 #include "opencl/source/helpers/base_object.h"
 #include "opencl/source/helpers/destructor_callbacks.h"
-#include "opencl/source/mem_obj/map_operations_handler.h"
+#include "opencl/source/helpers/properties_helper.h"
 #include "opencl/source/sharings/sharing.h"
 
 #include "memory_properties_flags.h"
@@ -22,6 +22,8 @@
 #include <vector>
 
 namespace NEO {
+struct MapInfo;
+class MapOperationsHandler;
 class ExecutionEnvironment;
 class GraphicsAllocation;
 struct KernelInfo;

opencl/source/os_interface/windows/d3d_sharing_functions.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 
 #include "opencl/source/api/dispatch.h"
+#include "opencl/source/sharings/sharing.h"
 
 #include <map>
 #include <vector>

opencl/test/unit_test/context/context_negative_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/context/context.h"
+#include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"

opencl/test/unit_test/fixtures/context_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "opencl/test/unit_test/fixtures/context_fixture.h"
 
+#include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/fixtures/program_fixture.cpp

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

opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,6 +28,7 @@
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/mem_obj/mem_obj_helper.h"
+#include "opencl/source/sharings/unified/unified_sharing_types.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"

opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -27,6 +27,7 @@
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/mem_obj/mem_obj_helper.h"
+#include "opencl/source/sharings/unified/unified_sharing_types.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"

opencl/test/unit_test/mocks/mock_cl_execution_environment.h

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

opencl/test/unit_test/mocks/mock_context.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 
 #include "opencl/source/context/context.h"
+#include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/sharings/sharing_factory.h"
 #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"
 

opencl/test/unit_test/mocks/mock_kernel.cpp

@@ -7,8 +7,6 @@
 
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
-#include "shared/source/compiler_interface/external_functions.h"
-
 #include "opencl/source/program/printf_handler.h"
 
 namespace NEO {

opencl/test/unit_test/program/kernel_data_OCL2_0.cpp

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

shared/source/built_ins/registry/built_ins_registry.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,7 +10,6 @@
 #include "shared/source/built_ins/built_ins.h"
 
 #include <string>
-#include <unordered_map>
 
 namespace NEO {
 

shared/source/memory_manager/CMakeLists.txt

@@ -36,6 +36,7 @@ set(NEO_CORE_MEMORY_MANAGER
     ${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/memory_allocation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_allocation.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_banks.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.cpp

shared/source/memory_manager/memory_allocation.cpp

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/memory_manager/memory_allocation.h"
+
+#include "shared/source/debug_settings/debug_settings_manager.h"
+
+namespace NEO {
+
+void MemoryAllocation::overrideMemoryPool(MemoryPool pool) {
+    if (DebugManager.flags.AUBDumpForceAllToLocalMemory.get()) {
+        this->memoryPool = MemoryPool::LocalMemory;
+        return;
+    }
+    this->memoryPool = pool;
+}
+
+} // namespace NEO

shared/source/memory_manager/os_agnostic_memory_manager.cpp

@@ -576,12 +576,4 @@ double OsAgnosticMemoryManager::getPercentOfGlobalMemoryAvailable(uint32_t rootD
     return 0.8;
 }
 
-void MemoryAllocation::overrideMemoryPool(MemoryPool pool) {
-    if (DebugManager.flags.AUBDumpForceAllToLocalMemory.get()) {
-        this->memoryPool = MemoryPool::LocalMemory;
-        return;
-    }
-    this->memoryPool = pool;
-}
-
 } // namespace NEO

shared/source/page_fault_manager/cpu_page_fault_manager.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,12 +10,11 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/utilities/spinlock.h"
 
-#include "memory_properties_flags.h"
-
 #include <memory>
 #include <unordered_map>
 
 namespace NEO {
+struct MemoryProperties;
 class GraphicsAllocation;
 class Device;
 class SVMAllocsManager;