sycl, ocl: avoid duplication of common engine functions

Author: densamoilov

src/cpu/sycl/engine.hpp

@@ -47,15 +47,12 @@ class engine_t : public cpu::cpu_engine_t {
         return cpu::sycl::stream_t::create_stream(stream, this, stream_impl);
     }
 
-    const ::sycl::device &device() const { return impl()->device(); }
-    const ::sycl::context &context() const { return impl()->context(); }
-
-    xpu::sycl::backend_t backend() const { return impl()->backend(); }
-
     bool mayiuse_system_memory_allocators() const override {
         return impl()->mayiuse_system_memory_allocators();
     }
 
+    DECLARE_COMMON_SYCL_ENGINE_FUNCTIONS();
+
 protected:
     const xpu::sycl::engine_impl_t *impl() const {
         return (const xpu::sycl::engine_impl_t *)impl::engine_t::impl();

src/gpu/amd/engine.hpp

@@ -55,11 +55,6 @@ class engine_t : public gpu::engine_t {
     void activate_stream_miopen(HIPstream hip_stream);
     void activate_stream_rocblas(HIPstream hip_stream);
 
-    const ::sycl::device &device() const { return impl()->device(); }
-    const ::sycl::context &context() const { return impl()->context(); }
-
-    xpu::sycl::backend_t backend() const { return impl()->backend(); }
-
     hipCtx_t get_underlying_context() const;
     hipDevice_t get_underlying_device() const;
     miopenHandle_t *get_miopen_handle();
@@ -70,6 +65,8 @@ class engine_t : public gpu::engine_t {
         return impl()->mayiuse_system_memory_allocators();
     }
 
+    DECLARE_COMMON_SYCL_ENGINE_FUNCTIONS();
+
 protected:
     const xpu::sycl::engine_impl_t *impl() const {
         return (const xpu::sycl::engine_impl_t *)impl::engine_t::impl();

src/gpu/generic/sycl/engine.hpp

@@ -43,15 +43,12 @@ class engine_t : public gpu::engine_t {
     status_t create_stream(
             impl::stream_t **stream, impl::stream_impl_t *stream_impl) override;
 
-    const ::sycl::device &device() const { return impl()->device(); }
-    const ::sycl::context &context() const { return impl()->context(); }
-
-    xpu::sycl::backend_t backend() const { return impl()->backend(); }
-
     bool mayiuse_system_memory_allocators() const override {
         return impl()->mayiuse_system_memory_allocators();
     }
 
+    DECLARE_COMMON_SYCL_ENGINE_FUNCTIONS();
+
 protected:
     const xpu::sycl::engine_impl_t *impl() const {
         return (const xpu::sycl::engine_impl_t *)impl::engine_t::impl();

src/gpu/intel/ocl/ocl_gpu_engine.hpp

@@ -93,10 +93,6 @@ class ocl_gpu_engine_t : public compute::compute_engine_t {
         return gpu_impl_list_t::get_implementation_list(desc);
     }
 
-    cl_device_id device() const { return impl()->device(); }
-    cl_context context() const { return impl()->context(); }
-    cl_platform_id platform() const { return impl()->platform(); }
-
     gpu_utils::device_id_t device_id() const override {
         return std::make_tuple(0, reinterpret_cast<uint64_t>(device()), 0);
     }
@@ -111,6 +107,8 @@ class ocl_gpu_engine_t : public compute::compute_engine_t {
         return device_info_->get_cache_blob(size, cache_blob);
     }
 
+    DECLARE_COMMON_OCL_ENGINE_FUNCTIONS();
+
 protected:
     const xpu::ocl::engine_impl_t *impl() const {
         return (const xpu::ocl::engine_impl_t *)engine_t::impl();

src/gpu/intel/sycl/engine.hpp

@@ -159,11 +159,6 @@ class engine_t : public gpu::intel::compute::compute_engine_t {
         return status::success;
     }
 
-    const ::sycl::device &device() const { return impl()->device(); }
-    const ::sycl::context &context() const { return impl()->context(); }
-
-    xpu::sycl::backend_t backend() const { return impl()->backend(); }
-
     cl_device_id ocl_device() const {
         if (backend() != xpu::sycl::backend_t::opencl) {
             assert(!"not expected");
@@ -188,6 +183,8 @@ class engine_t : public gpu::intel::compute::compute_engine_t {
         return gpu::intel::sycl::device_id(device());
     }
 
+    DECLARE_COMMON_SYCL_ENGINE_FUNCTIONS();
+
 protected:
     const xpu::sycl::engine_impl_t *impl() const {
         return (const xpu::sycl::engine_impl_t *)impl::engine_t::impl();

src/gpu/nvidia/engine.hpp

@@ -49,11 +49,6 @@ class engine_t : public gpu::engine_t {
     void activate_stream_cudnn(CUstream cuda_stream);
     void activate_stream_cublas(CUstream cuda_stream);
 
-    const ::sycl::device &device() const { return impl()->device(); }
-    const ::sycl::context &context() const { return impl()->context(); }
-
-    xpu::sycl::backend_t backend() const { return impl()->backend(); }
-
     CUcontext get_underlying_context() const;
     CUdevice get_underlying_device() const;
     cudnnHandle_t *get_cudnn_handle();
@@ -63,6 +58,8 @@ class engine_t : public gpu::engine_t {
         return impl()->mayiuse_system_memory_allocators();
     }
 
+    DECLARE_COMMON_SYCL_ENGINE_FUNCTIONS();
+
 protected:
     const xpu::sycl::engine_impl_t *impl() const {
         return (const xpu::sycl::engine_impl_t *)impl::engine_t::impl();

src/xpu/ocl/engine_impl.hpp

@@ -144,6 +144,11 @@ class engine_impl_t : public impl::engine_impl_t {
     bool is_user_context_;
 };
 
+#define DECLARE_COMMON_OCL_ENGINE_FUNCTIONS() \
+    cl_device_id device() const { return impl()->device(); } \
+    cl_context context() const { return impl()->context(); } \
+    cl_platform_id platform() const { return impl()->platform(); }
+
 } // namespace ocl
 } // namespace xpu
 } // namespace impl

src/xpu/sycl/engine_impl.hpp

@@ -113,6 +113,11 @@ class engine_impl_t : public impl::engine_impl_t {
     backend_t backend_;
 };
 
+#define DECLARE_COMMON_SYCL_ENGINE_FUNCTIONS() \
+    const ::sycl::device &device() const { return impl()->device(); } \
+    const ::sycl::context &context() const { return impl()->context(); } \
+    xpu::sycl::backend_t backend() const { return impl()->backend(); }
+
 } // namespace sycl
 } // namespace xpu
 } // namespace impl