Remove not needed inclusions of device.h

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

runtime/built_ins/built_ins_storage.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
+#include "runtime/device/device.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 #include "os_inc.h"

runtime/command_queue/local_work_size.cpp

@@ -8,6 +8,7 @@
 #include "core/helpers/basic_math.h"
 #include "core/helpers/debug_helpers.h"
 #include "runtime/context/context.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"

runtime/compiler_interface/compiler_interface.cpp

@@ -9,6 +9,7 @@
 
 #include "runtime/compiler_interface/binary_cache.h"
 #include "runtime/compiler_interface/compiler_interface.inl"
+#include "runtime/device/device.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"

runtime/device/device.h

@@ -11,8 +11,11 @@
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/engine_control.h"
+#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/performance_counters.h"
 
+#include "engine_node.h"
+
 namespace NEO {
 class OSTime;
 class DriverInfo;

runtime/execution_environment/execution_environment.cpp

@@ -128,4 +128,8 @@ EngineControl *ExecutionEnvironment::getEngineControlForSpecialCsr() {
     }
     return engine;
 }
+
+bool ExecutionEnvironment::isFullRangeSvm() const {
+    return hwInfo->capabilityTable.gpuAddressSpace >= maxNBitValue<47>;
+}
 } // namespace NEO

runtime/execution_environment/execution_environment.h

@@ -7,13 +7,10 @@
 
 #pragma once
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/utilities/reference_tracked_object.h"
 
-#include "engine_node.h"
-
 #include <mutex>
 #include <vector>
 
@@ -54,9 +51,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
     void setHwInfo(const HardwareInfo *hwInfo);
     const HardwareInfo *getHardwareInfo() const { return hwInfo.get(); }
     HardwareInfo *getMutableHardwareInfo() const { return hwInfo.get(); }
-    bool isFullRangeSvm() const {
-        return hwInfo->capabilityTable.gpuAddressSpace >= maxNBitValue<47>;
-    }
+    bool isFullRangeSvm() const;
 
     GmmHelper *getGmmHelper() const;
     MOCKABLE_VIRTUAL CompilerInterface *getCompilerInterface();

runtime/helpers/built_ins_helper.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/helpers/built_ins_helper.h"
 
-#include "runtime/execution_environment/execution_environment.h"
+#include "runtime/device/device.h"
 #include "runtime/program/program.h"
 
 namespace NEO {

runtime/helpers/hardware_commands_helper.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/built_ins/built_ins.h"
+#include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/helpers/per_thread_data.h"
 #include "runtime/indirect_heap/indirect_heap.h"

runtime/memory_manager/os_agnostic_memory_manager.cpp

@@ -16,6 +16,7 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
+#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/host_ptr_manager.h"

runtime/program/build.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/compiler_interface/compiler_options.h"
+#include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/os_interface/debug_settings_manager.h"

runtime/program/compile.cpp

@@ -8,6 +8,7 @@
 #include "elf/writer.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/compiler_interface/compiler_options.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"

runtime/program/create.inl

@@ -6,6 +6,7 @@
  */
 
 #include "runtime/context/context.h"
+#include "runtime/device/device.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/program/program.h"
 

runtime/program/get_info.cpp

@@ -8,6 +8,7 @@
 #include "runtime/helpers/get_info.h"
 
 #include "runtime/context/context.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/validators.h"
 

runtime/program/link.cpp

@@ -8,12 +8,12 @@
 #include "elf/writer.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/compiler_interface/compiler_options.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
+#include "runtime/program/program.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"
 
-#include "program.h"
-
 #include <cstring>
 
 namespace NEO {

runtime/program/printf_handler.cpp

@@ -9,6 +9,7 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"

runtime/program/process_gen_binary.cpp

@@ -10,14 +10,15 @@
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/context/context.h"
+#include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/unified_memory_manager.h"
+#include "runtime/program/program.h"
 
 #include "patch_list.h"
 #include "patch_shared.h"
-#include "program.h"
 #include "program_debug_data.h"
 
 #include <algorithm>

runtime/program/program.cpp

@@ -13,6 +13,7 @@
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/context/context.h"
+#include "runtime/device/device.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/unified_memory_manager.h"

runtime/program/program.h

@@ -10,15 +10,14 @@
 #include "elf/reader.h"
 #include "elf/writer.h"
 #include "runtime/api/cl_types.h"
-#include "runtime/device/device.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/stdio.h"
 #include "runtime/helpers/string_helpers.h"
+#include "runtime/program/block_kernel_manager.h"
+#include "runtime/program/kernel_info.h"
 
-#include "block_kernel_manager.h"
 #include "cif/builtins/memory/buffer/buffer.h"
 #include "igfxfmid.h"
-#include "kernel_info.h"
 #include "patch_list.h"
 
 #include <map>

runtime/scheduler/scheduler_kernel.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/scheduler/scheduler_kernel.h"
 
+#include "runtime/device/device.h"
 #include "runtime/helpers/hw_helper.h"
 
 #include <cinttypes>