Get rid of plugin calls in buffer and image

Signed-off-by: Alexander Batashev <[email protected]>

Author: Alexander Batashev

sycl/include/CL/sycl/buffer.hpp

@@ -194,12 +194,8 @@ class buffer {
          event AvailableEvent = {})
       : Range{0} {
 
-    size_t BufSize = 0;
-    const detail::plugin &Plugin =
-        getPluginFromContext(detail::getSyclObjImpl(SyclContext));
-    Plugin.call<detail::PiApiKind::piMemGetInfo>(
-        detail::pi::cast<detail::RT::PiMem>(MemObject), CL_MEM_SIZE,
-        sizeof(size_t), &BufSize, nullptr);
+    size_t BufSize = detail::SYCLMemObjT::getBufSizeForContext(
+        detail::getSyclObjImpl(SyclContext), MemObject);
 
     Range[0] = BufSize / sizeof(T);
     impl = std::make_shared<detail::buffer_impl>(

sycl/include/CL/sycl/context.hpp

@@ -21,8 +21,6 @@ class device;
 class platform;
 namespace detail {
 class context_impl;
-const detail::plugin &
-getPluginFromContext(const shared_ptr_class<context_impl> Context);
 }
 
 class context {

sycl/include/CL/sycl/detail/image_impl.hpp

@@ -219,15 +219,6 @@ template <int Dimensions> class image_impl final : public SYCLMemObjT {
   ~image_impl() { BaseT::updateHostMemory(); }
 
 private:
-  template <typename T>
-  void getImageInfo(const ContextImplPtr Context, RT::PiMemImageInfo Info,
-                    T &Dest) {
-    const detail::plugin &Plugin = getPluginFromContext(Context);
-    RT::PiMem Mem = pi::cast<RT::PiMem>(BaseT::MInteropMemObject);
-    Plugin.call<PiApiKind::piMemImageGetInfo>(Mem, Info, sizeof(T), &Dest,
-                                              nullptr);
-  }
-
   vector_class<device> getDevices(const ContextImplPtr Context);
 
   template <info::device Param>

sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp

@@ -256,6 +256,8 @@ class SYCLMemObjT : public SYCLMemObjI {
     MAllocator->setAlignment(RequiredAlign);
   }
 
+  static size_t getBufSizeForContext(ContextImplPtr Context, cl_mem MemObject);
+
 protected:
   // Allocator used for allocation memory on host.
   unique_ptr_class<SYCLMemObjAllocator> MAllocator;

sycl/source/context.cpp

@@ -88,11 +88,5 @@ vector_class<device> context::get_devices() const {
 
 context::context(shared_ptr_class<detail::context_impl> Impl) : impl(Impl) {}
 
-namespace detail {
-const detail::plugin &
-getPluginFromContext(const shared_ptr_class<context_impl> Context) {
-  return Context->getPlugin();
-}
-} // namespace detail
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

sycl/source/detail/image_impl.cpp

@@ -231,6 +231,15 @@ image_channel_type convertChannelType(RT::PiMemImageChannelType Type) {
   }
 }
 
+template <typename T>
+static void getImageInfo(const ContextImplPtr Context, RT::PiMemImageInfo Info,
+                         T &Dest, RT::PiMem InteropMemObject) {
+  const detail::plugin &Plugin = Context->getPlugin();
+  RT::PiMem Mem = pi::cast<RT::PiMem>(InteropMemObject);
+  Plugin.call<PiApiKind::piMemImageGetInfo>(Mem, Info, sizeof(T), &Dest,
+                                            nullptr);
+}
+
 template <int Dimensions>
 image_impl<Dimensions>::image_impl(
     cl_mem MemObject, const context &SyclContext, event AvailableEvent,
@@ -245,26 +254,26 @@ image_impl<Dimensions>::image_impl(
                                        &(BaseT::MSizeInBytes), nullptr);
 
   RT::PiMemImageFormat Format;
-  getImageInfo(Context, PI_IMAGE_INFO_FORMAT, Format);
+  getImageInfo(Context, PI_IMAGE_INFO_FORMAT, Format, Mem);
   MOrder = detail::convertChannelOrder(Format.image_channel_order);
   MType = detail::convertChannelType(Format.image_channel_data_type);
   MNumChannels = getImageNumberChannels(MOrder);
 
-  getImageInfo(Context, PI_IMAGE_INFO_ELEMENT_SIZE, MElementSize);
+  getImageInfo(Context, PI_IMAGE_INFO_ELEMENT_SIZE, MElementSize, Mem);
   assert(getImageElementSize(MNumChannels, MType) == MElementSize);
 
-  getImageInfo(Context, PI_IMAGE_INFO_ROW_PITCH, MRowPitch);
-  getImageInfo(Context, PI_IMAGE_INFO_SLICE_PITCH, MSlicePitch);
+  getImageInfo(Context, PI_IMAGE_INFO_ROW_PITCH, MRowPitch, Mem);
+  getImageInfo(Context, PI_IMAGE_INFO_SLICE_PITCH, MSlicePitch, Mem);
 
   switch (Dimensions) {
   case 3:
-    getImageInfo(Context, PI_IMAGE_INFO_DEPTH, MRange[2]);
+    getImageInfo(Context, PI_IMAGE_INFO_DEPTH, MRange[2], Mem);
     // fall through
   case 2:
-    getImageInfo(Context, PI_IMAGE_INFO_HEIGHT, MRange[1]);
+    getImageInfo(Context, PI_IMAGE_INFO_HEIGHT, MRange[1], Mem);
     // fall through
   case 1:
-    getImageInfo(Context, PI_IMAGE_INFO_WIDTH, MRange[0]);
+    getImageInfo(Context, PI_IMAGE_INFO_WIDTH, MRange[0], Mem);
   }
 }
 

sycl/source/detail/sycl_mem_obj_t.cpp

@@ -86,6 +86,16 @@ const plugin &SYCLMemObjT::getPlugin() const {
          "Trying to get Plugin from SYCLMemObjT with nullptr ContextImpl.");
   return (MInteropContext->getPlugin());
 }
+
+size_t SYCLMemObjT::getBufSizeForContext(ContextImplPtr Context,
+                                         cl_mem MemObject) {
+  size_t BufSize = 0;
+  const detail::plugin &Plugin = Context->getPlugin();
+  Plugin.call<detail::PiApiKind::piMemGetInfo>(
+      detail::pi::cast<detail::RT::PiMem>(MemObject), CL_MEM_SIZE,
+      sizeof(size_t), &BufSize, nullptr);
+  return BufSize;
+}
 } // namespace detail
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)