Move common code to engine class

Author: jkasprza

src/plugins/intel_gpu/include/intel_gpu/runtime/engine.hpp

@@ -142,7 +142,7 @@ class engine {
     virtual stream_ptr create_stream(const ExecutionConfig& config, void *handle) const = 0;
 
     /// Returns service stream which can be used during program build and optimizations
-    virtual stream& get_service_stream() const = 0;
+    virtual stream& get_service_stream() const;
 
     virtual std::shared_ptr<kernel_builder> create_kernel_builder() const = 0;
 
@@ -157,7 +157,7 @@ class engine {
     virtual void create_onednn_engine(const ExecutionConfig& config) = 0;
 
     /// Returns onednn engine object which shares device and context with current engine
-    virtual dnnl::engine& get_onednn_engine() const = 0;
+    virtual dnnl::engine& get_onednn_engine() const;
 #endif
 
     /// Factory method which creates engine object with impl configured by @p engine_type
@@ -177,6 +177,12 @@ class engine {
     engine(const device::ptr device);
     const device::ptr _device;
     bool enable_large_allocations = false;
+    std::unique_ptr<stream> _service_stream;
+
+#ifdef ENABLE_ONEDNN_FOR_GPU
+    std::mutex onednn_mutex;
+    std::shared_ptr<dnnl::engine> _onednn_engine;
+#endif
 
     std::array<std::atomic<uint64_t>, static_cast<size_t>(allocation_type::max_value)> _memory_usage_data{};
     std::array<std::atomic<uint64_t>, static_cast<size_t>(allocation_type::max_value)> _peak_memory_usage_data{};

src/plugins/intel_gpu/src/runtime/engine.cpp

@@ -339,4 +339,15 @@ bool engine::check_allocatable(const layout& layout, allocation_type type) {
     return true;
 }
 
+#ifdef ENABLE_ONEDNN_FOR_GPU
+dnnl::engine& engine::get_onednn_engine() const {
+    OPENVINO_ASSERT(_onednn_engine, "[GPU] Can't get onednn engine handle as it was not initialized. Please check that create_onednn_engine() was called");
+    return *_onednn_engine;
+}
+#endif
+
+stream& engine::get_service_stream() const {
+    return *_service_stream;
+}
+
 }  // namespace cldnn

src/plugins/intel_gpu/src/runtime/ocl/ocl_engine.cpp

@@ -71,11 +71,6 @@ void ocl_engine::create_onednn_engine(const ExecutionConfig& config) {
 #endif
     }
 }
-
-dnnl::engine& ocl_engine::get_onednn_engine() const {
-    OPENVINO_ASSERT(_onednn_engine, "[GPU] Can't get onednn engine handle as it was not initialized. Please check that create_onednn_engine() was called");
-    return *_onednn_engine;
-}
 #endif
 
 const cl::Context& ocl_engine::get_cl_context() const {
@@ -281,10 +276,6 @@ stream::ptr ocl_engine::create_stream(const ExecutionConfig& config, void* handl
     return std::make_shared<ocl_stream>(*this, config, handle);
 }
 
-stream& ocl_engine::get_service_stream() const {
-    return *_service_stream;
-}
-
 std::shared_ptr<cldnn::engine> ocl_engine::create(const device::ptr device, runtime_types runtime_type) {
     return std::make_shared<ocl::ocl_engine>(device, runtime_type);
 }

src/plugins/intel_gpu/src/runtime/ocl/ocl_engine.hpp

@@ -43,26 +43,17 @@ class ocl_engine : public engine {
 
     stream_ptr create_stream(const ExecutionConfig& config) const override;
     stream_ptr create_stream(const ExecutionConfig& config, void *handle) const override;
-    stream& get_service_stream() const override;
 
     std::shared_ptr<kernel_builder> create_kernel_builder() const override;
 
 #ifdef ENABLE_ONEDNN_FOR_GPU
     void create_onednn_engine(const ExecutionConfig& config) override;
-    // Returns onednn engine object which shares device and context with current engine
-    dnnl::engine& get_onednn_engine() const override;
 #endif
 
     static std::shared_ptr<cldnn::engine> create(const device::ptr device, runtime_types runtime_type);
 
 private:
     std::string _extensions;
-    std::unique_ptr<stream> _service_stream;
-
-#ifdef ENABLE_ONEDNN_FOR_GPU
-    std::mutex onednn_mutex;
-    std::shared_ptr<dnnl::engine> _onednn_engine;
-#endif
 };
 
 }  // namespace ocl

src/plugins/intel_gpu/src/runtime/ze/ze_engine.cpp

@@ -45,11 +45,6 @@ void ze_engine::create_onednn_engine(const ExecutionConfig& config) {
         _onednn_engine = std::make_shared<dnnl::engine>(dnnl::l0_interop::make_engine(casted->get_driver(), casted->get_device(), casted->get_context()));
     }
 }
-
-dnnl::engine& ze_engine::get_onednn_engine() const {
-    OPENVINO_ASSERT(_onednn_engine, "[GPU] Can't get onednn engine handle as it was not initialized. Please check that create_onednn_engine() was called");
-    return *_onednn_engine;
-}
 #endif
 
 const ze_driver_handle_t ze_engine::get_driver() const {
@@ -173,10 +168,6 @@ stream::ptr ze_engine::create_stream(const ExecutionConfig& config, void* handle
     OPENVINO_NOT_IMPLEMENTED;
 }
 
-stream& ze_engine::get_service_stream() const {
-    return *_service_stream;
-}
-
 std::shared_ptr<cldnn::engine> ze_engine::create(const device::ptr device, runtime_types runtime_type) {
     return std::make_shared<ze::ze_engine>(device, runtime_type);
 }

src/plugins/intel_gpu/src/runtime/ze/ze_engine.hpp

@@ -38,25 +38,14 @@ class ze_engine : public engine {
 
     stream_ptr create_stream(const ExecutionConfig& config) const override;
     stream_ptr create_stream(const ExecutionConfig& config, void *handle) const override;
-    stream& get_service_stream() const override;
 
     std::shared_ptr<kernel_builder> create_kernel_builder() const override;
 
 #ifdef ENABLE_ONEDNN_FOR_GPU
     void create_onednn_engine(const ExecutionConfig& config) override;
-    // Returns onednn engine object which shares device and context with current engine
-    dnnl::engine& get_onednn_engine() const override;
 #endif
 
     static std::shared_ptr<cldnn::engine> create(const device::ptr device, runtime_types runtime_type);
-
-private:
-    std::unique_ptr<stream> _service_stream;
-
-#ifdef ENABLE_ONEDNN_FOR_GPU
-    std::mutex onednn_mutex;
-    std::shared_ptr<dnnl::engine> _onednn_engine;
-#endif
 };
 
 }  // namespace ze