Move MockClDevice to a separate file

Related-To: NEO-3938

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

opencl/test/unit_test/api/cl_api_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "cl_api_tests.h"
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/api/cl_create_buffer_tests.cpp

@@ -8,6 +8,7 @@
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/mem_obj/buffer.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/api/cl_create_image_tests.cpp

@@ -9,6 +9,7 @@
 
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl

@@ -10,6 +10,7 @@
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/event/user_event.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl

@@ -9,6 +9,7 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl

@@ -9,6 +9,7 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl

@@ -9,6 +9,7 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp

@@ -11,6 +11,7 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/event/user_event.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 

opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl

@@ -9,6 +9,7 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl

@@ -9,6 +9,7 @@
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/context/context.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h

@@ -16,6 +16,7 @@
 #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/tests_configuration.h"
 

opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp

@@ -11,6 +11,7 @@
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/command_queue/command_queue_fixture.cpp

@@ -11,6 +11,7 @@
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/context/context.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 

opencl/test/unit_test/command_queue/local_work_size_tests.cpp

@@ -8,6 +8,7 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_queue/gpgpu_walker.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 

opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/helpers/flush_stamp.h"
 
 #include "opencl/source/event/event.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/context/context_tests.cpp

@@ -14,6 +14,7 @@
 #include "opencl/source/sharings/sharing.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h"

opencl/test/unit_test/context/get_supported_image_formats_tests.cpp

@@ -9,6 +9,7 @@
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/context_fixture.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 

opencl/test/unit_test/event/event_builder_tests.cpp

@@ -11,6 +11,7 @@
 #include "opencl/source/event/event_builder.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/helpers/task_information.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/fixtures/device_fixture.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 namespace NEO {

opencl/test/unit_test/fixtures/device_info_fixture.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/fixtures/dispatch_flags_fixture.h

@@ -9,6 +9,7 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/fixtures/multi_root_device_fixture.h

@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"
@@ -39,4 +40,4 @@ TGLLPTEST_F(KernelTgllpTests, GivenUseOffsetToSkipSetFFIDGPWorkaroundActiveWhenS
             }
         }
     }
-}
+}

opencl/test/unit_test/helpers/kmd_notify_tests.cpp

@@ -9,6 +9,7 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_queue/command_queue.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/helpers/timestamp_packet_tests.cpp

@@ -17,6 +17,7 @@
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"

opencl/test/unit_test/mem_obj/image_compression_fixture.h

@@ -8,6 +8,7 @@
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/helpers/surface_formats.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp

@@ -14,6 +14,7 @@
 #include "opencl/source/mem_obj/mem_obj.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/mocks/CMakeLists.txt

@@ -38,6 +38,8 @@ set(IGDRCL_SRCS_tests_mocks
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_buffer.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.h

opencl/test/unit_test/mocks/mock_cl_device.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
+
+#include "shared/source/command_stream/preemption.h"
+#include "shared/source/os_interface/driver_info.h"
+#include "shared/source/os_interface/os_context.h"
+
+#include "opencl/test/unit_test/mocks/mock_device.h"
+#include "opencl/test/unit_test/mocks/mock_execution_environment.h"
+#include "opencl/test/unit_test/mocks/mock_memory_manager.h"
+#include "opencl/test/unit_test/mocks/mock_ostime.h"
+#include "opencl/test/unit_test/tests_configuration.h"
+
+using namespace NEO;
+
+bool &MockClDevice::createSingleDevice = MockDevice::createSingleDevice;
+
+decltype(&createCommandStream) &MockClDevice::createCommandStreamReceiverFunc = MockDevice::createCommandStreamReceiverFunc;
+
+MockClDevice::MockClDevice(MockDevice *pMockDevice)
+    : ClDevice(*pMockDevice, platform()), device(*pMockDevice), sharedDeviceInfo(device.deviceInfo),
+      executionEnvironment(pMockDevice->executionEnvironment), subdevices(pMockDevice->subdevices),
+      mockMemoryManager(pMockDevice->mockMemoryManager), engines(pMockDevice->engines) {
+}

opencl/test/unit_test/mocks/mock_cl_device.h

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2018-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/device/root_device.h"
+#include "shared/source/device/sub_device.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/test/unit_test/helpers/default_hw_info.h"
+
+#include "opencl/source/device/cl_device.h"
+#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
+#include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
+#include "opencl/test/unit_test/mocks/mock_device.h"
+
+namespace NEO {
+class OSTime;
+class FailMemoryManager;
+
+extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex);
+
+class MockClDevice : public ClDevice {
+  public:
+    using ClDevice::ClDevice;
+    using ClDevice::deviceExtensions;
+    using ClDevice::deviceInfo;
+    using ClDevice::driverInfo;
+    using ClDevice::enabledClVersion;
+    using ClDevice::initializeCaps;
+    using ClDevice::name;
+    using ClDevice::simultaneousInterops;
+
+    explicit MockClDevice(MockDevice *pMockDevice);
+
+    bool createEngines() { return device.createEngines(); }
+    void setOSTime(OSTime *osTime) { device.setOSTime(osTime); }
+    bool getCpuTime(uint64_t *timeStamp) { return device.getCpuTime(timeStamp); }
+    void setPreemptionMode(PreemptionMode mode) { device.setPreemptionMode(mode); }
+    void injectMemoryManager(MemoryManager *pMemoryManager) { device.injectMemoryManager(pMemoryManager); }
+    void setPerfCounters(PerformanceCounters *perfCounters) { device.setPerfCounters(perfCounters); }
+    const char *getProductAbbrev() const { return device.getProductAbbrev(); }
+    template <typename T>
+    UltCommandStreamReceiver<T> &getUltCommandStreamReceiver() { return device.getUltCommandStreamReceiver<T>(); }
+    template <typename T>
+    UltCommandStreamReceiver<T> &getUltCommandStreamReceiverFromIndex(uint32_t index) { return device.getUltCommandStreamReceiverFromIndex<T>(index); }
+    CommandStreamReceiver &getGpgpuCommandStreamReceiver() const { return device.getGpgpuCommandStreamReceiver(); }
+    void resetCommandStreamReceiver(CommandStreamReceiver *newCsr) { device.resetCommandStreamReceiver(newCsr); }
+    void resetCommandStreamReceiver(CommandStreamReceiver *newCsr, uint32_t engineIndex) { device.resetCommandStreamReceiver(newCsr, engineIndex); }
+    void setSourceLevelDebuggerActive(bool active) { device.setDebuggerActive(active); }
+    template <typename T>
+    static T *createWithExecutionEnvironment(const HardwareInfo *pHwInfo, ExecutionEnvironment *executionEnvironment, uint32_t rootDeviceIndex) {
+        return MockDevice::createWithExecutionEnvironment<T>(pHwInfo, executionEnvironment, rootDeviceIndex);
+    }
+    template <typename T>
+    static T *createWithNewExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex = 0) {
+        return MockDevice::createWithNewExecutionEnvironment<T>(pHwInfo, rootDeviceIndex);
+    }
+    SubDevice *createSubDevice(uint32_t subDeviceIndex) { return device.createSubDevice(subDeviceIndex); }
+    std::unique_ptr<CommandStreamReceiver> createCommandStreamReceiver() const { return device.createCommandStreamReceiver(); }
+    BuiltIns *getBuiltIns() const { return getDevice().getBuiltIns(); }
+
+    void setDebuggerActive(bool active) {
+        sharedDeviceInfo.debuggerActive = active;
+    }
+
+    MockDevice &device;
+    DeviceInfo &sharedDeviceInfo;
+    ExecutionEnvironment *&executionEnvironment;
+    static bool &createSingleDevice;
+    static decltype(&createCommandStream) &createCommandStreamReceiverFunc;
+    std::vector<SubDevice *> &subdevices;
+    std::unique_ptr<MemoryManager> &mockMemoryManager;
+    std::vector<EngineControl> &engines;
+};
+
+} // namespace NEO

opencl/test/unit_test/mocks/mock_device.cpp

@@ -19,17 +19,9 @@
 using namespace NEO;
 
 bool MockDevice::createSingleDevice = true;
-bool &MockClDevice::createSingleDevice = MockDevice::createSingleDevice;
 
 decltype(&createCommandStream) MockSubDevice::createCommandStreamReceiverFunc = createCommandStream;
 decltype(&createCommandStream) MockDevice::createCommandStreamReceiverFunc = createCommandStream;
-decltype(&createCommandStream) &MockClDevice::createCommandStreamReceiverFunc = MockDevice::createCommandStreamReceiverFunc;
-
-MockClDevice::MockClDevice(MockDevice *pMockDevice)
-    : ClDevice(*pMockDevice, platform()), device(*pMockDevice), sharedDeviceInfo(device.deviceInfo),
-      executionEnvironment(pMockDevice->executionEnvironment), subdevices(pMockDevice->subdevices),
-      mockMemoryManager(pMockDevice->mockMemoryManager), engines(pMockDevice->engines) {
-}
 
 MockDevice::MockDevice()
     : MockDevice(new MockExecutionEnvironment(), 0u) {

opencl/test/unit_test/mocks/mock_device.h

@@ -120,60 +120,6 @@ class MockDevice : public RootDevice {
     std::unique_ptr<MemoryManager> mockMemoryManager;
 };
 
-class MockClDevice : public ClDevice {
-  public:
-    using ClDevice::ClDevice;
-    using ClDevice::deviceExtensions;
-    using ClDevice::deviceInfo;
-    using ClDevice::driverInfo;
-    using ClDevice::enabledClVersion;
-    using ClDevice::initializeCaps;
-    using ClDevice::name;
-    using ClDevice::simultaneousInterops;
-
-    explicit MockClDevice(MockDevice *pMockDevice);
-
-    bool createEngines() { return device.createEngines(); }
-    void setOSTime(OSTime *osTime) { device.setOSTime(osTime); }
-    bool getCpuTime(uint64_t *timeStamp) { return device.getCpuTime(timeStamp); }
-    void setPreemptionMode(PreemptionMode mode) { device.setPreemptionMode(mode); }
-    void injectMemoryManager(MemoryManager *pMemoryManager) { device.injectMemoryManager(pMemoryManager); }
-    void setPerfCounters(PerformanceCounters *perfCounters) { device.setPerfCounters(perfCounters); }
-    const char *getProductAbbrev() const { return device.getProductAbbrev(); }
-    template <typename T>
-    UltCommandStreamReceiver<T> &getUltCommandStreamReceiver() { return device.getUltCommandStreamReceiver<T>(); }
-    template <typename T>
-    UltCommandStreamReceiver<T> &getUltCommandStreamReceiverFromIndex(uint32_t index) { return device.getUltCommandStreamReceiverFromIndex<T>(index); }
-    CommandStreamReceiver &getGpgpuCommandStreamReceiver() const { return device.getGpgpuCommandStreamReceiver(); }
-    void resetCommandStreamReceiver(CommandStreamReceiver *newCsr) { device.resetCommandStreamReceiver(newCsr); }
-    void resetCommandStreamReceiver(CommandStreamReceiver *newCsr, uint32_t engineIndex) { device.resetCommandStreamReceiver(newCsr, engineIndex); }
-    void setSourceLevelDebuggerActive(bool active) { device.setDebuggerActive(active); }
-    template <typename T>
-    static T *createWithExecutionEnvironment(const HardwareInfo *pHwInfo, ExecutionEnvironment *executionEnvironment, uint32_t rootDeviceIndex) {
-        return MockDevice::createWithExecutionEnvironment<T>(pHwInfo, executionEnvironment, rootDeviceIndex);
-    }
-    template <typename T>
-    static T *createWithNewExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex = 0) {
-        return MockDevice::createWithNewExecutionEnvironment<T>(pHwInfo, rootDeviceIndex);
-    }
-    SubDevice *createSubDevice(uint32_t subDeviceIndex) { return device.createSubDevice(subDeviceIndex); }
-    std::unique_ptr<CommandStreamReceiver> createCommandStreamReceiver() const { return device.createCommandStreamReceiver(); }
-    BuiltIns *getBuiltIns() const { return getDevice().getBuiltIns(); }
-
-    void setDebuggerActive(bool active) {
-        sharedDeviceInfo.debuggerActive = active;
-    }
-
-    MockDevice &device;
-    DeviceInfo &sharedDeviceInfo;
-    ExecutionEnvironment *&executionEnvironment;
-    static bool &createSingleDevice;
-    static decltype(&createCommandStream) &createCommandStreamReceiverFunc;
-    std::vector<SubDevice *> &subdevices;
-    std::unique_ptr<MemoryManager> &mockMemoryManager;
-    std::vector<EngineControl> &engines;
-};
-
 template <>
 inline Device *MockDevice::createWithNewExecutionEnvironment<Device>(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex) {
     auto executionEnvironment = new ExecutionEnvironment();

opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"

opencl/test/unit_test/os_interface/linux/device_os_tests.cpp

@@ -12,6 +12,7 @@
 #include "opencl/source/api/api.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h

@@ -11,6 +11,7 @@
 
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h"

opencl/test/unit_test/os_interface/mock_performance_counters.h

@@ -9,6 +9,7 @@
 #include "shared/source/device/device.h"
 
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/os_interface/performance_counters_tests.cpp

@@ -12,6 +12,7 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/os_interface/mock_performance_counters.h"

opencl/test/unit_test/os_interface/windows/device_os_tests.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/helpers/get_info.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "gmock/gmock.h"

opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp

@@ -15,6 +15,7 @@
 
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"

opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp

@@ -27,6 +27,7 @@
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/program/printf_helper_tests.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/program/print_formatter.h"
 
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"

opencl/test/unit_test/program/process_elf_binary_tests.cpp

@@ -14,6 +14,7 @@
 #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
 
 #include "opencl/test/unit_test/helpers/test_files.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 

opencl/test/unit_test/program/program_data_tests.cpp

@@ -16,6 +16,7 @@
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/program/program.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp

@@ -13,6 +13,7 @@
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h"

opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp

@@ -15,6 +15,7 @@
 #include "opencl/source/sharings/sharing.h"
 #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h"
 #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp

@@ -28,6 +28,7 @@
 #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h"
 #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "opencl/test/unit_test/mocks/mock_async_event_handler.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp

@@ -11,6 +11,7 @@
 #include "opencl/source/sharings/gl/gl_texture.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

opencl/test/unit_test/sharings/sharing_factory_tests.cpp

@@ -16,6 +16,7 @@
 #include "opencl/source/sharings/sharing.h"
 #include "opencl/source/sharings/sharing_factory.h"
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_sharing_factory.h"

opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h

@@ -7,6 +7,7 @@
 
 #include "opencl/source/sharings/unified/unified_sharing_types.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"

opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp

@@ -9,6 +9,7 @@
 #include "opencl/source/sharings/unified/unified_buffer.h"
 #include "opencl/source/sharings/unified/unified_sharing.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"