Move ClDevice to a separate file

Related-To: NEO-3938

Change-Id: I275b9285b70dac2c9bc52878f6e517e4f3e083b3
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

core/helpers/hw_helper_base.inl

@@ -19,6 +19,8 @@
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 
+#include "instrumentation.h"
+
 namespace NEO {
 
 template <typename Family>

runtime/api/api.cpp

@@ -26,7 +26,7 @@
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
 #include "runtime/context/driver_diagnostics.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"

runtime/built_ins/built_ins.cpp

@@ -14,6 +14,7 @@
 #include "runtime/built_ins/built_ins.inl"
 #include "runtime/built_ins/sip.h"
 #include "runtime/built_ins/vme_dispatch_builder.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/dispatch_info_builder.h"

runtime/command_queue/command_queue.cpp

@@ -22,7 +22,7 @@
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/event/event_builder.h"
 #include "runtime/event/user_event.h"

runtime/command_queue/command_queue_hw.h

@@ -13,6 +13,7 @@
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/queue_helpers.h"

runtime/command_queue/gpgpu_walker_bdw_plus.inl

@@ -8,6 +8,7 @@
 #pragma once
 #include "core/helpers/simd_helper.h"
 #include "runtime/command_queue/gpgpu_walker_base.inl"
+#include "runtime/device/cl_device.h"
 
 namespace NEO {
 

runtime/context/context.cpp

@@ -17,7 +17,7 @@
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/surface_formats.h"

runtime/device/CMakeLists.txt

@@ -1,11 +1,13 @@
 #
-# Copyright (C) 2018-2019 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(RUNTIME_SRCS_DEVICE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_device.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_device.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device_caps.cpp

runtime/device/cl_device.cpp

@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/device/cl_device.h"
+
+#include "core/program/sync_buffer_handler.h"
+#include "runtime/device/device.h"
+#include "runtime/platform/platform.h"
+
+namespace NEO {
+
+ClDevice::ClDevice(Device &device) : device(device), platformId(platform()) {
+    device.incRefInternal();
+    initializeCaps();
+
+    auto numAvailableDevices = device.getNumAvailableDevices();
+    if (numAvailableDevices > 1) {
+        for (uint32_t i = 0; i < numAvailableDevices; i++) {
+            subDevices.push_back(std::make_unique<ClDevice>(*device.getDeviceById(i)));
+            platform()->clDeviceMap.emplace(device.getDeviceById(i), subDevices[i].get());
+        }
+    }
+}
+
+ClDevice::~ClDevice() {
+    syncBufferHandler.reset();
+    for (auto &subDevice : subDevices) {
+        subDevice.reset();
+    }
+    device.decRefInternal();
+}
+
+void ClDevice::allocateSyncBufferHandler() {
+    TakeOwnershipWrapper<ClDevice> lock(*this);
+    if (syncBufferHandler.get() == nullptr) {
+        syncBufferHandler = std::make_unique<SyncBufferHandler>(this->getDevice());
+        UNRECOVERABLE_IF(syncBufferHandler.get() == nullptr);
+    }
+}
+
+unsigned int ClDevice::getEnabledClVersion() const { return device.getEnabledClVersion(); }
+unsigned int ClDevice::getSupportedClVersion() const { return device.getSupportedClVersion(); }
+
+void ClDevice::retainApi() {
+    if (device.isReleasable()) {
+        platform()->getClDevice(device.getRootDeviceIndex())->incRefInternal();
+        this->incRefApi();
+    }
+};
+unique_ptr_if_unused<ClDevice> ClDevice::releaseApi() {
+    if (!device.isReleasable()) {
+        return unique_ptr_if_unused<ClDevice>(this, false);
+    }
+    platform()->getClDevice(device.getRootDeviceIndex())->decRefInternal();
+    return this->decRefApi();
+}
+
+ClDevice *ClDevice::getDeviceById(uint32_t deviceId) {
+    UNRECOVERABLE_IF(deviceId >= getNumAvailableDevices());
+    if (subDevices.empty()) {
+        return this;
+    }
+    return subDevices[deviceId].get();
+}
+
+bool ClDevice::getDeviceAndHostTimer(uint64_t *deviceTimestamp, uint64_t *hostTimestamp) const { return device.getDeviceAndHostTimer(deviceTimestamp, hostTimestamp); }
+bool ClDevice::getHostTimer(uint64_t *hostTimestamp) const { return device.getHostTimer(hostTimestamp); }
+const HardwareInfo &ClDevice::getHardwareInfo() const { return device.getHardwareInfo(); }
+const DeviceInfo &ClDevice::getDeviceInfo() const { return device.getDeviceInfo(); }
+EngineControl &ClDevice::getEngine(aub_stream::EngineType engineType, bool lowPriority) { return device.getEngine(engineType, lowPriority); }
+EngineControl &ClDevice::getDefaultEngine() { return device.getDefaultEngine(); }
+MemoryManager *ClDevice::getMemoryManager() const { return device.getMemoryManager(); }
+GmmHelper *ClDevice::getGmmHelper() const { return device.getGmmHelper(); }
+double ClDevice::getProfilingTimerResolution() { return device.getProfilingTimerResolution(); }
+double ClDevice::getPlatformHostTimerResolution() const { return device.getPlatformHostTimerResolution(); }
+bool ClDevice::isSimulation() const { return device.isSimulation(); }
+GFXCORE_FAMILY ClDevice::getRenderCoreFamily() const { return device.getRenderCoreFamily(); }
+PerformanceCounters *ClDevice::getPerformanceCounters() { return device.getPerformanceCounters(); }
+PreemptionMode ClDevice::getPreemptionMode() const { return device.getPreemptionMode(); }
+bool ClDevice::isSourceLevelDebuggerActive() const { return device.isSourceLevelDebuggerActive(); }
+SourceLevelDebugger *ClDevice::getSourceLevelDebugger() { return device.getSourceLevelDebugger(); }
+ExecutionEnvironment *ClDevice::getExecutionEnvironment() const { return device.getExecutionEnvironment(); }
+const RootDeviceEnvironment &ClDevice::getRootDeviceEnvironment() const { return device.getRootDeviceEnvironment(); }
+const HardwareCapabilities &ClDevice::getHardwareCapabilities() const { return device.getHardwareCapabilities(); }
+bool ClDevice::isFullRangeSvm() const { return device.isFullRangeSvm(); }
+bool ClDevice::areSharedSystemAllocationsAllowed() const { return device.areSharedSystemAllocationsAllowed(); }
+uint32_t ClDevice::getRootDeviceIndex() const { return device.getRootDeviceIndex(); }
+uint32_t ClDevice::getNumAvailableDevices() const { return device.getNumAvailableDevices(); }
+
+ClDeviceVector::ClDeviceVector(const cl_device_id *devices,
+                               cl_uint numDevices) {
+    for (cl_uint i = 0; i < numDevices; i++) {
+        auto pClDevice = castToObject<ClDevice>(devices[i]);
+        this->push_back(pClDevice);
+    }
+}
+
+void ClDeviceVector::toDeviceIDs(std::vector<cl_device_id> &devIDs) {
+    int i = 0;
+    devIDs.resize(this->size());
+
+    for (auto &it : *this) {
+        devIDs[i] = it;
+        i++;
+    }
+}
+
+} // namespace NEO

runtime/device/cl_device.h

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "core/command_stream/preemption_mode.h"
+#include "core/utilities/reference_tracked_object.h"
+#include "runtime/api/cl_types.h"
+#include "runtime/device/device_info_map.h"
+#include "runtime/helpers/base_object.h"
+
+#include "engine_node.h"
+#include "igfxfmid.h"
+
+#include <vector>
+
+namespace NEO {
+class Device;
+class ExecutionEnvironment;
+class GmmHelper;
+class MemoryManager;
+class PerformanceCounters;
+class SourceLevelDebugger;
+class SyncBufferHandler;
+struct EngineControl;
+struct HardwareCapabilities;
+struct HardwareInfo;
+struct RootDeviceEnvironment;
+
+template <>
+struct OpenCLObjectMapper<_cl_device_id> {
+    typedef class ClDevice DerivedType;
+};
+
+class ClDevice : public BaseObject<_cl_device_id> {
+  public:
+    static const cl_ulong objectMagic = 0x8055832341AC8D08LL;
+
+    ClDevice &operator=(const ClDevice &) = delete;
+    ClDevice(const ClDevice &) = delete;
+
+    explicit ClDevice(Device &device);
+    ~ClDevice() override;
+
+    unsigned int getEnabledClVersion() const; //CL
+    unsigned int getSupportedClVersion() const;
+
+    void retainApi();
+    unique_ptr_if_unused<ClDevice> releaseApi();
+
+    bool getDeviceAndHostTimer(uint64_t *deviceTimestamp, uint64_t *hostTimestamp) const;
+    bool getHostTimer(uint64_t *hostTimestamp) const;
+    const HardwareInfo &getHardwareInfo() const;
+    const DeviceInfo &getDeviceInfo() const;
+    EngineControl &getEngine(aub_stream::EngineType engineType, bool lowPriority);
+    EngineControl &getDefaultEngine();
+    MemoryManager *getMemoryManager() const;
+    GmmHelper *getGmmHelper() const;
+    double getProfilingTimerResolution();
+    double getPlatformHostTimerResolution() const;
+    bool isSimulation() const;
+    GFXCORE_FAMILY getRenderCoreFamily() const;
+    void allocateSyncBufferHandler();
+    PerformanceCounters *getPerformanceCounters();
+    PreemptionMode getPreemptionMode() const;
+    bool isSourceLevelDebuggerActive() const;
+    SourceLevelDebugger *getSourceLevelDebugger();
+    ExecutionEnvironment *getExecutionEnvironment() const;
+    const RootDeviceEnvironment &getRootDeviceEnvironment() const;
+    const HardwareCapabilities &getHardwareCapabilities() const;
+    bool isFullRangeSvm() const;
+    bool areSharedSystemAllocationsAllowed() const;
+    uint32_t getRootDeviceIndex() const;
+    uint32_t getNumAvailableDevices() const;
+
+    // API entry points
+    cl_int getDeviceInfo(cl_device_info paramName,
+                         size_t paramValueSize,
+                         void *paramValue,
+                         size_t *paramValueSizeRet);
+
+    bool getDeviceInfoForImage(cl_device_info paramName,
+                               const void *&src,
+                               size_t &srcSize,
+                               size_t &retSize);
+
+    // This helper template is meant to simplify getDeviceInfo
+    template <cl_device_info Param>
+    void getCap(const void *&src,
+                size_t &size,
+                size_t &retSize);
+
+    template <cl_device_info Param>
+    void getStr(const void *&src,
+                size_t &size,
+                size_t &retSize);
+
+    Device &getDevice() const noexcept { return device; }
+    ClDevice *getDeviceById(uint32_t deviceId);
+    void initializeCaps();
+    std::unique_ptr<SyncBufferHandler> syncBufferHandler;
+
+  protected:
+    Device &device;
+    std::vector<std::unique_ptr<ClDevice>> subDevices;
+    cl_platform_id platformId;
+
+    std::vector<unsigned int> simultaneousInterops = {0};
+    void appendOSExtensions(std::string &deviceExtensions);
+};
+
+template <cl_device_info Param>
+inline void ClDevice::getCap(const void *&src,
+                             size_t &size,
+                             size_t &retSize) {
+    src = &DeviceInfoTable::Map<Param>::getValue(getDeviceInfo());
+    retSize = size = DeviceInfoTable::Map<Param>::size;
+}
+
+} // namespace NEO

runtime/device/device.cpp

@@ -13,13 +13,10 @@
 #include "core/os_interface/os_context.h"
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/os_time.h"
-#include "core/program/sync_buffer_handler.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
-#include "runtime/device/device_vector.h"
 #include "runtime/device/driver_info.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/platform/platform.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"
 
 namespace NEO {
@@ -27,102 +24,6 @@ namespace NEO {
 decltype(&PerformanceCounters::create) Device::createPerformanceCountersFunc = PerformanceCounters::create;
 extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex);
 
-ClDevice::ClDevice(Device &device) : device(device), platformId(platform()) {
-    device.incRefInternal();
-    initializeCaps();
-
-    auto numAvailableDevices = device.getNumAvailableDevices();
-    if (numAvailableDevices > 1) {
-        for (uint32_t i = 0; i < numAvailableDevices; i++) {
-            subDevices.push_back(std::make_unique<ClDevice>(*device.getDeviceById(i)));
-            platform()->clDeviceMap.emplace(device.getDeviceById(i), subDevices[i].get());
-        }
-    }
-}
-
-ClDevice::~ClDevice() {
-    syncBufferHandler.reset();
-    for (auto &subDevice : subDevices) {
-        subDevice.reset();
-    }
-    device.decRefInternal();
-}
-
-void ClDevice::allocateSyncBufferHandler() {
-    TakeOwnershipWrapper<ClDevice> lock(*this);
-    if (syncBufferHandler.get() == nullptr) {
-        syncBufferHandler = std::make_unique<SyncBufferHandler>(this->getDevice());
-        UNRECOVERABLE_IF(syncBufferHandler.get() == nullptr);
-    }
-}
-
-unsigned int ClDevice::getEnabledClVersion() const { return device.getEnabledClVersion(); }
-unsigned int ClDevice::getSupportedClVersion() const { return device.getSupportedClVersion(); }
-
-void ClDevice::retainApi() {
-    if (device.isReleasable()) {
-        platform()->getClDevice(device.getRootDeviceIndex())->incRefInternal();
-        this->incRefApi();
-    }
-};
-unique_ptr_if_unused<ClDevice> ClDevice::releaseApi() {
-    if (!device.isReleasable()) {
-        return unique_ptr_if_unused<ClDevice>(this, false);
-    }
-    platform()->getClDevice(device.getRootDeviceIndex())->decRefInternal();
-    return this->decRefApi();
-}
-
-ClDevice *ClDevice::getDeviceById(uint32_t deviceId) {
-    UNRECOVERABLE_IF(deviceId >= getNumAvailableDevices());
-    if (subDevices.empty()) {
-        return this;
-    }
-    return subDevices[deviceId].get();
-}
-
-bool ClDevice::getDeviceAndHostTimer(uint64_t *deviceTimestamp, uint64_t *hostTimestamp) const { return device.getDeviceAndHostTimer(deviceTimestamp, hostTimestamp); }
-bool ClDevice::getHostTimer(uint64_t *hostTimestamp) const { return device.getHostTimer(hostTimestamp); }
-const HardwareInfo &ClDevice::getHardwareInfo() const { return device.getHardwareInfo(); }
-const DeviceInfo &ClDevice::getDeviceInfo() const { return device.getDeviceInfo(); }
-EngineControl &ClDevice::getEngine(aub_stream::EngineType engineType, bool lowPriority) { return device.getEngine(engineType, lowPriority); }
-EngineControl &ClDevice::getDefaultEngine() { return device.getDefaultEngine(); }
-MemoryManager *ClDevice::getMemoryManager() const { return device.getMemoryManager(); }
-GmmHelper *ClDevice::getGmmHelper() const { return device.getGmmHelper(); }
-double ClDevice::getProfilingTimerResolution() { return device.getProfilingTimerResolution(); }
-double ClDevice::getPlatformHostTimerResolution() const { return device.getPlatformHostTimerResolution(); }
-bool ClDevice::isSimulation() const { return device.isSimulation(); }
-GFXCORE_FAMILY ClDevice::getRenderCoreFamily() const { return device.getRenderCoreFamily(); }
-PerformanceCounters *ClDevice::getPerformanceCounters() { return device.getPerformanceCounters(); }
-PreemptionMode ClDevice::getPreemptionMode() const { return device.getPreemptionMode(); }
-bool ClDevice::isSourceLevelDebuggerActive() const { return device.isSourceLevelDebuggerActive(); }
-SourceLevelDebugger *ClDevice::getSourceLevelDebugger() { return device.getSourceLevelDebugger(); }
-ExecutionEnvironment *ClDevice::getExecutionEnvironment() const { return device.getExecutionEnvironment(); }
-const RootDeviceEnvironment &ClDevice::getRootDeviceEnvironment() const { return device.getRootDeviceEnvironment(); }
-const HardwareCapabilities &ClDevice::getHardwareCapabilities() const { return device.getHardwareCapabilities(); }
-bool ClDevice::isFullRangeSvm() const { return device.isFullRangeSvm(); }
-bool ClDevice::areSharedSystemAllocationsAllowed() const { return device.areSharedSystemAllocationsAllowed(); }
-uint32_t ClDevice::getRootDeviceIndex() const { return device.getRootDeviceIndex(); }
-uint32_t ClDevice::getNumAvailableDevices() const { return device.getNumAvailableDevices(); }
-
-ClDeviceVector::ClDeviceVector(const cl_device_id *devices,
-                               cl_uint numDevices) {
-    for (cl_uint i = 0; i < numDevices; i++) {
-        auto pClDevice = castToObject<ClDevice>(devices[i]);
-        this->push_back(pClDevice);
-    }
-}
-
-void ClDeviceVector::toDeviceIDs(std::vector<cl_device_id> &devIDs) {
-    int i = 0;
-    devIDs.resize(this->size());
-
-    for (auto &it : *this) {
-        devIDs[i] = it;
-        i++;
-    }
-}
-
 Device::Device(ExecutionEnvironment *executionEnvironment)
     : executionEnvironment(executionEnvironment) {
     memset(&deviceInfo, 0, sizeof(deviceInfo));

runtime/device/device.h

@@ -9,101 +9,13 @@
 #include "core/helpers/common_types.h"
 #include "core/helpers/engine_control.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/api/cl_types.h"
+#include "runtime/device/device_info.h"
-#include "runtime/device/device_info_map.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/base_object.h"
 #include "runtime/os_interface/performance_counters.h"
 
-#include "engine_node.h"
-
 namespace NEO {
-class Device;
 class DriverInfo;
 class OSTime;
-class SyncBufferHandler;
-
-template <>
-struct OpenCLObjectMapper<_cl_device_id> {
-    typedef class ClDevice DerivedType;
-};
-
-class ClDevice : public BaseObject<_cl_device_id> {
-  public:
-    static const cl_ulong objectMagic = 0x8055832341AC8D08LL;
-
-    ClDevice &operator=(const ClDevice &) = delete;
-    ClDevice(const ClDevice &) = delete;
-
-    explicit ClDevice(Device &device);
-    ~ClDevice() override;
-
-    unsigned int getEnabledClVersion() const; //CL
-    unsigned int getSupportedClVersion() const;
-
-    void retainApi();
-    unique_ptr_if_unused<ClDevice> releaseApi();
-
-    bool getDeviceAndHostTimer(uint64_t *deviceTimestamp, uint64_t *hostTimestamp) const;
-    bool getHostTimer(uint64_t *hostTimestamp) const;
-    const HardwareInfo &getHardwareInfo() const;
-    const DeviceInfo &getDeviceInfo() const;
-    EngineControl &getEngine(aub_stream::EngineType engineType, bool lowPriority);
-    EngineControl &getDefaultEngine();
-    MemoryManager *getMemoryManager() const;
-    GmmHelper *getGmmHelper() const;
-    double getProfilingTimerResolution();
-    double getPlatformHostTimerResolution() const;
-    bool isSimulation() const;
-    GFXCORE_FAMILY getRenderCoreFamily() const;
-    void allocateSyncBufferHandler();
-    PerformanceCounters *getPerformanceCounters();
-    PreemptionMode getPreemptionMode() const;
-    bool isSourceLevelDebuggerActive() const;
-    SourceLevelDebugger *getSourceLevelDebugger();
-    ExecutionEnvironment *getExecutionEnvironment() const;
-    const RootDeviceEnvironment &getRootDeviceEnvironment() const;
-    const HardwareCapabilities &getHardwareCapabilities() const;
-    bool isFullRangeSvm() const;
-    bool areSharedSystemAllocationsAllowed() const;
-    uint32_t getRootDeviceIndex() const;
-    uint32_t getNumAvailableDevices() const;
-
-    // API entry points
-    cl_int getDeviceInfo(cl_device_info paramName,
-                         size_t paramValueSize,
-                         void *paramValue,
-                         size_t *paramValueSizeRet);
-
-    bool getDeviceInfoForImage(cl_device_info paramName,
-                               const void *&src,
-                               size_t &srcSize,
-                               size_t &retSize);
-
-    // This helper template is meant to simplify getDeviceInfo
-    template <cl_device_info Param>
-    void getCap(const void *&src,
-                size_t &size,
-                size_t &retSize);
-
-    template <cl_device_info Param>
-    void getStr(const void *&src,
-                size_t &size,
-                size_t &retSize);
-
-    Device &getDevice() const noexcept { return device; }
-    ClDevice *getDeviceById(uint32_t deviceId);
-    void initializeCaps();
-    std::unique_ptr<SyncBufferHandler> syncBufferHandler;
-
-  protected:
-    Device &device;
-    std::vector<std::unique_ptr<ClDevice>> subDevices;
-    cl_platform_id platformId;
-
-    std::vector<unsigned int> simultaneousInterops = {0};
-    void appendOSExtensions(std::string &deviceExtensions);
-};
 
 class Device : public ReferenceTrackedObject<Device> {
   public:
@@ -196,14 +108,6 @@ class Device : public ReferenceTrackedObject<Device> {
     uint32_t defaultEngineIndex = 0;
 };
 
-template <cl_device_info Param>
-inline void ClDevice::getCap(const void *&src,
-                             size_t &size,
-                             size_t &retSize) {
-    src = &DeviceInfoTable::Map<Param>::getValue(device.getDeviceInfo());
-    retSize = size = DeviceInfoTable::Map<Param>::size;
-}
-
 inline EngineControl &Device::getDefaultEngine() {
     return engines[defaultEngineIndex];
 }

runtime/device/device_info.cpp

@@ -9,6 +9,7 @@
 
 #include "core/helpers/get_info.h"
 #include "core/os_interface/os_time.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/device.h"
 #include "runtime/device/device_info_map.h"
 #include "runtime/device/device_vector.h"

runtime/device_queue/device_queue.cpp

@@ -9,6 +9,7 @@
 
 #include "core/helpers/hw_helper.h"
 #include "runtime/context/context.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/queue_helpers.h"

runtime/device_queue/device_queue_hw_bdw_plus.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue_hw_base.inl"
 #include "runtime/program/block_kernel_manager.h"
 

runtime/gen8/aub_command_stream_receiver_gen8.cpp

@@ -8,6 +8,7 @@
 #include "core/helpers/array_count.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl"
+#include "runtime/helpers/base_object.h"
 
 namespace NEO {
 

runtime/gtpin/gtpin_callbacks.cpp

@@ -9,7 +9,7 @@
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/device_info.h"
 #include "runtime/gtpin/gtpin_defs.h"
 #include "runtime/gtpin/gtpin_hw_helper.h"

runtime/helpers/built_ins_helper.cpp

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

runtime/helpers/hardware_commands_helper.h

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

runtime/helpers/hardware_commands_helper.inl

@@ -15,6 +15,7 @@
 #include "core/helpers/string.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_queue/local_id_gen.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/block_kernel_manager.h"

runtime/helpers/task_information.cpp

@@ -18,7 +18,7 @@
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/enqueue_properties.h"

runtime/helpers/validators.cpp

@@ -9,7 +9,7 @@
 
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/kernel/kernel.h"

runtime/kernel/kernel.cpp

@@ -25,6 +25,7 @@
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/execution_model/device_enqueue.h"
 #include "runtime/gtpin/gtpin_notify.h"

runtime/mem_obj/buffer.cpp

@@ -21,7 +21,7 @@
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/mem_obj/mem_obj_helper.h"

runtime/mem_obj/image.cpp

@@ -21,7 +21,7 @@
 #include "core/helpers/string.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/helpers/surface_formats.h"

runtime/mem_obj/mem_obj.cpp

@@ -18,7 +18,7 @@
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/memory_manager/memory_manager.h"
 
 #include <algorithm>

runtime/mem_obj/pipe.cpp

@@ -9,7 +9,7 @@
 
 #include "core/helpers/get_info.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/memory_manager.h"

runtime/os_interface/linux/device_factory_linux.cpp

@@ -10,7 +10,8 @@
 #include "core/helpers/hw_info.h"
 #include "core/os_interface/linux/drm_neo.h"
 #include "core/os_interface/linux/os_interface.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
+#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/linux/drm_memory_operations_handler.h"

runtime/os_interface/windows/api_win.cpp

@@ -12,7 +12,7 @@
 #include "runtime/api/dispatch.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/d3d/d3d_buffer.h"

runtime/os_interface/windows/device_factory_win.cpp

@@ -9,6 +9,7 @@
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/device.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/windows/os_interface.h"

runtime/os_interface/windows/wddm/wddm.cpp

@@ -30,6 +30,8 @@
 
 #include "gmm_memory.h"
 
+#include <dxgi.h>
+
 std::wstring getIgdrclPath() {
     std::wstring returnValue;
     WCHAR path[255];

runtime/platform/platform.cpp

@@ -19,6 +19,7 @@
 #include "core/os_interface/os_interface.h"
 #include "runtime/api/api.h"
 #include "runtime/command_stream/command_stream_receiver.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/root_device.h"
 #include "runtime/event/async_events_handler.h"
 #include "runtime/execution_environment/execution_environment.h"

runtime/program/build.cpp

@@ -7,7 +7,8 @@
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/utilities/time_measure_wrapper.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
+#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"

runtime/program/compile.cpp

@@ -7,7 +7,8 @@
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/elf/writer.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
+#include "runtime/execution_environment/execution_environment.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,8 +6,9 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/string_helpers.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/program.h"

runtime/program/get_info.cpp

@@ -8,7 +8,7 @@
 #include "core/helpers/get_info.h"
 
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/program/kernel_info.h"

runtime/program/kernel_info.cpp

@@ -10,7 +10,7 @@
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"

runtime/program/link.cpp

@@ -8,7 +8,8 @@
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/elf/writer.h"
 #include "core/utilities/stackvec.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
+#include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/program.h"

runtime/program/printf_handler.cpp

@@ -10,7 +10,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/program/print_formatter.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_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

@@ -17,7 +17,7 @@
 #include "core/program/program_info_from_patchtokens.h"
 #include "core/program/program_initialization.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/program/kernel_info.h"

runtime/program/program.cpp

@@ -16,7 +16,7 @@
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/block_kernel_manager.h"

runtime/sampler/sampler.cpp

@@ -10,7 +10,7 @@
 #include "core/helpers/get_info.h"
 #include "core/helpers/hw_info.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 
 #include "patch_list.h"
 

runtime/scheduler/scheduler_kernel.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,7 @@
 #include "runtime/scheduler/scheduler_kernel.h"
 
 #include "core/helpers/hw_helper.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 
 #include <cinttypes>
 

runtime/sharings/d3d/d3d_surface.cpp

@@ -11,7 +11,7 @@
 #include "core/gmm_helper/gmm_types_converter.h"
 #include "core/helpers/get_info.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"

runtime/sharings/d3d/d3d_texture.cpp

@@ -13,7 +13,7 @@
 #include "core/helpers/get_info.h"
 #include "core/helpers/hw_helper.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/memory_manager.h"
 

runtime/sharings/gl/windows/cl_gl_api.cpp

@@ -10,7 +10,7 @@
 #include "runtime/api/api.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/event/async_events_handler.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/validators.h"

runtime/sharings/gl/windows/gl_buffer_windows.cpp

@@ -9,7 +9,7 @@
 #include "core/helpers/get_info.h"
 #include "public/cl_gl_private_intel.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/sharings/gl/gl_buffer.h"

runtime/sharings/gl/windows/gl_texture_windows.cpp

@@ -14,7 +14,7 @@
 #include "core/helpers/hw_info.h"
 #include "public/cl_gl_private_intel.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/sharings/gl/gl_texture.h"

runtime/sharings/va/cl_va_api.cpp

@@ -10,7 +10,7 @@
 #include "runtime/api/api.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/va/va_sharing.h"
 #include "runtime/sharings/va/va_surface.h"

runtime/sharings/va/va_surface.cpp

@@ -10,7 +10,7 @@
 #include "core/gmm_helper/gmm.h"
 #include "core/helpers/get_info.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/memory_manager.h"
 

unit_tests/api/cl_add_comment_to_aub_tests.inl

@@ -7,7 +7,7 @@
 
 #include "core/execution_environment/root_device_environment.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/api/cl_api_tests.h"

unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp

@@ -8,6 +8,7 @@
 #include "core/compiler_interface/compiler_interface.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/context/context.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/kernel/kernel.h"

unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp

@@ -7,7 +7,7 @@
 
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "unit_tests/api/cl_api_tests.h"
 #include "unit_tests/os_interface/windows/gl/gl_dll_helper.h"
 

unit_tests/fixtures/device_host_queue_fixture.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/command_queue/command_queue.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "test.h"

unit_tests/fixtures/kernel_data_fixture.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/program/kernel_info.h"
 #include "unit_tests/mocks/mock_context.h"

unit_tests/fixtures/platform_fixture.cpp

@@ -7,7 +7,7 @@
 
 #include "unit_tests/fixtures/platform_fixture.h"
 
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/libult/create_command_stream.h"
 

unit_tests/mem_obj/image_validate_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "core/helpers/aligned_memory.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"

unit_tests/mocks/mock_device.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "core/helpers/hw_helper.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/root_device.h"
 #include "runtime/device/sub_device.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"

unit_tests/mocks/mock_kernel.h

@@ -9,6 +9,7 @@
 
 #include "core/helpers/string.h"
 #include "core/kernel/grf_config.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/device.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/platform/platform.h"

unit_tests/program/program_with_block_kernels_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/device/device.h"
 #include "runtime/program/block_kernel_manager.h"
 #include "unit_tests/fixtures/context_fixture.h"

unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/resource_info.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/sharings/gl/gl_buffer.h"
 #include "test.h"

unit_tests/sharings/va/va_sharing_tests.cpp

@@ -10,7 +10,7 @@
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/api/api.h"
-#include "runtime/device/device.h"
+#include "runtime/device/cl_device.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/va/cl_va_api.h"
 #include "runtime/sharings/va/va_sharing.h"