rebase errors and issues.

Signed-off-by: Garima Gupta <[email protected]>

Author: garimagu

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

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <CL/sycl/detail/common.hpp>
+#include <CL/sycl/detail/context_impl.hpp>
 #include <CL/sycl/detail/sycl_mem_obj_allocator.hpp>
 #include <CL/sycl/detail/plugin.hpp>
 #include <CL/sycl/detail/sycl_mem_obj_i.hpp>
@@ -71,35 +72,8 @@ class SYCLMemObjT : public SYCLMemObjI {
       : SYCLMemObjT(/*SizeInBytes*/ 0, Props, std::move(Allocator)) {}
 
   SYCLMemObjT(cl_mem MemObject, const context &SyclContext,
-<<<<<<< HEAD
               const size_t SizeInBytes, event AvailableEvent,
               unique_ptr_class<SYCLMemObjAllocator> Allocator);
-=======
-              const size_t SizeInBytes, event AvailableEvent)
-      : MAllocator(), MProps(),
-        MInteropEvent(detail::getSyclObjImpl(std::move(AvailableEvent))),
-        MInteropContext(detail::getSyclObjImpl(SyclContext)),
-        MInteropMemObject(MemObject), MOpenCLInterop(true),
-        MHostPtrReadOnly(false), MNeedWriteBack(true),
-        MSizeInBytes(SizeInBytes), MUserPtr(nullptr), MShadowCopy(nullptr),
-        MUploadDataFunctor(nullptr), MSharedPtrStorage(nullptr) {
-    if (MInteropContext->is_host())
-      throw cl::sycl::invalid_parameter_error(
-          "Creation of interoperability memory object using host context is "
-          "not allowed");
-
-    RT::PiMem Mem = pi::cast<RT::PiMem>(MInteropMemObject);
-    RT::PiContext Context = nullptr;
-    const plugin &Plugin = getPlugin();
-    Plugin.call<PiApiKind::piMemGetInfo>(Mem, CL_MEM_CONTEXT, sizeof(Context),
-                                         &Context, nullptr);
-
-    if (MInteropContext->getHandleRef() != Context)
-      throw cl::sycl::invalid_parameter_error(
-          "Input context must be the same as the context of cl_mem");
-    Plugin.call<PiApiKind::piMemRetain>(Mem);
-  }
->>>>>>> [SYCL][PI] Renamed plugin_impl to plugin class.
 
   SYCLMemObjT(cl_mem MemObject, const context &SyclContext,
               event AvailableEvent,
@@ -201,26 +175,7 @@ class SYCLMemObjT : public SYCLMemObjI {
   // the memory object is allowed. This method is executed from child's
   // destructor. This cannot be done in SYCLMemObjT's destructor as child's
   // members must be alive.
-<<<<<<< HEAD
   void updateHostMemory();
-=======
-  void updateHostMemory() {
-    if ((MUploadDataFunctor != nullptr) && MNeedWriteBack)
-      MUploadDataFunctor();
-
-    // If we're attached to a memory record, process the deletion of the memory
-    // record. We may get detached before we do this.
-    if (MRecord)
-      Scheduler::getInstance().removeMemoryObject(this);
-    releaseHostMem(MShadowCopy);
-
-    if (MOpenCLInterop) {
-      const plugin &Plugin = getPlugin();
-      Plugin.call<PiApiKind::piMemRelease>(
-          pi::cast<RT::PiMem>(MInteropMemObject));
-    }
-  }
->>>>>>> [SYCL][PI] Renamed plugin_impl to plugin class.
 
   bool useHostPtr() {
     return has_property<property::buffer::use_host_ptr>() ||

sycl/source/detail/image_impl.cpp

@@ -246,26 +246,26 @@ image_impl<Dimensions>::image_impl(
                                        &(BaseT::MSizeInBytes), nullptr);
 
   RT::PiMemImageFormat Format;
-  getImageInfo(PI_IMAGE_INFO_FORMAT, Format);
+  getImageInfo(Context, PI_IMAGE_INFO_FORMAT, Format);
   MOrder = detail::convertChannelOrder(Format.image_channel_order);
   MType = detail::convertChannelType(Format.image_channel_data_type);
   MNumChannels = getImageNumberChannels(MOrder);
 
-  getImageInfo(PI_IMAGE_INFO_ELEMENT_SIZE, MElementSize);
+  getImageInfo(Context, PI_IMAGE_INFO_ELEMENT_SIZE, MElementSize);
   assert(getImageElementSize(MNumChannels, MType) == MElementSize);
 
-  getImageInfo(PI_IMAGE_INFO_ROW_PITCH, MRowPitch);
-  getImageInfo(PI_IMAGE_INFO_SLICE_PITCH, MSlicePitch);
+  getImageInfo(Context, PI_IMAGE_INFO_ROW_PITCH, MRowPitch);
+  getImageInfo(Context, PI_IMAGE_INFO_SLICE_PITCH, MSlicePitch);
 
   switch (Dimensions) {
   case 3:
-    getImageInfo(PI_IMAGE_INFO_DEPTH, MRange[2]);
+    getImageInfo(Context, PI_IMAGE_INFO_DEPTH, MRange[2]);
     // fall through
   case 2:
-    getImageInfo(PI_IMAGE_INFO_HEIGHT, MRange[1]);
+    getImageInfo(Context, PI_IMAGE_INFO_HEIGHT, MRange[1]);
     // fall through
   case 1:
-    getImageInfo(PI_IMAGE_INFO_WIDTH, MRange[0]);
+    getImageInfo(Context, PI_IMAGE_INFO_WIDTH, MRange[0]);
   }
 }
 

sycl/source/detail/sycl_mem_obj_t.cpp

@@ -31,7 +31,7 @@ SYCLMemObjT::SYCLMemObjT(cl_mem MemObject, const context &SyclContext,
 
   RT::PiMem Mem = pi::cast<RT::PiMem>(MInteropMemObject);
   RT::PiContext Context = nullptr;
-  const plugin_impl &Plugin = getPlugin();
+  const plugin &Plugin = getPlugin();
   Plugin.call<PiApiKind::piMemGetInfo>(Mem, CL_MEM_CONTEXT, sizeof(Context),
                                          &Context, nullptr);
 
@@ -75,7 +75,7 @@ void SYCLMemObjT::updateHostMemory() {
   releaseHostMem(MShadowCopy);
 
   if (MOpenCLInterop) {
-    const plugin_impl &Plugin = getPlugin();
+    const plugin &Plugin = getPlugin();
     Plugin.call<PiApiKind::piMemRelease>(
         pi::cast<RT::PiMem>(MInteropMemObject));
   }