[SYCL][NFC] Make sycl_mem_obj::getAdapter() return by reference

Author: uditagarwal97

sycl/source/detail/buffer_impl.cpp

@@ -52,11 +52,11 @@ void buffer_impl::addInteropObject(
     if (std::find(Handles.begin(), Handles.end(),
                   ur::cast<ur_native_handle_t>(MInteropMemObject)) ==
         Handles.end()) {
-      const AdapterPtr &Adapter = getAdapter();
-      Adapter->call<UrApiKind::urMemRetain>(
+      adapter_impl &Adapter = getAdapter();
+      Adapter.call<UrApiKind::urMemRetain>(
           ur::cast<ur_mem_handle_t>(MInteropMemObject));
       ur_native_handle_t NativeHandle = 0;
-      Adapter->call<UrApiKind::urMemGetNativeHandle>(MInteropMemObject, nullptr,
+      Adapter.call<UrApiKind::urMemGetNativeHandle>(MInteropMemObject, nullptr,
                                                      &NativeHandle);
       Handles.push_back(NativeHandle);
     }

sycl/source/detail/sycl_mem_obj_t.cpp

@@ -36,20 +36,20 @@ SYCLMemObjT::SYCLMemObjT(ur_native_handle_t MemObject,
       MSharedPtrStorage(nullptr), MHostPtrProvided(true),
       MOwnNativeHandle(OwnNativeHandle) {
   ur_context_handle_t Context = nullptr;
-  const AdapterPtr &Adapter = getAdapter();
+  adapter_impl &Adapter = getAdapter();
 
   ur_mem_native_properties_t MemProperties = {
       UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES, nullptr, OwnNativeHandle};
-  Adapter->call<UrApiKind::urMemBufferCreateWithNativeHandle>(
+  Adapter.call<UrApiKind::urMemBufferCreateWithNativeHandle>(
       MemObject, MInteropContext->getHandleRef(), &MemProperties,
       &MInteropMemObject);
 
   // Get the size of the buffer in bytes
-  Adapter->call<UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_SIZE,
+  Adapter.call<UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_SIZE,
                                          sizeof(size_t), &MSizeInBytes,
                                          nullptr);
 
-  Adapter->call<UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
+  Adapter.call<UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
                                          sizeof(Context), &Context, nullptr);
 
   if (MInteropContext->getHandleRef() != Context)
@@ -84,7 +84,7 @@ SYCLMemObjT::SYCLMemObjT(ur_native_handle_t MemObject,
       MSharedPtrStorage(nullptr), MHostPtrProvided(true),
       MOwnNativeHandle(OwnNativeHandle) {
   ur_context_handle_t Context = nullptr;
-  const AdapterPtr &Adapter = getAdapter();
+  adapter_impl &Adapter = getAdapter();
 
   ur_image_desc_t Desc = {};
   Desc.stype = UR_STRUCTURE_TYPE_IMAGE_DESC;
@@ -101,11 +101,11 @@ SYCLMemObjT::SYCLMemObjT(ur_native_handle_t MemObject,
   ur_mem_native_properties_t NativeProperties = {
       UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES, nullptr, OwnNativeHandle};
 
-  Adapter->call<UrApiKind::urMemImageCreateWithNativeHandle>(
+  Adapter.call<UrApiKind::urMemImageCreateWithNativeHandle>(
       MemObject, MInteropContext->getHandleRef(), &Format, &Desc,
       &NativeProperties, &MInteropMemObject);
 
-  Adapter->call<UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
+  Adapter.call<UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
                                          sizeof(Context), &Context, nullptr);
 
   if (MInteropContext->getHandleRef() != Context)
@@ -157,14 +157,13 @@ void SYCLMemObjT::updateHostMemory() {
   releaseHostMem(MShadowCopy);
 
   if (MOpenCLInterop) {
-    const AdapterPtr &Adapter = getAdapter();
-    Adapter->call<UrApiKind::urMemRelease>(MInteropMemObject);
+    getAdapter().call<UrApiKind::urMemRelease>(MInteropMemObject);
   }
 }
-const AdapterPtr &SYCLMemObjT::getAdapter() const {
+adapter_impl &SYCLMemObjT::getAdapter() const {
   assert((MInteropContext != nullptr) &&
          "Trying to get Adapter from SYCLMemObjT with nullptr ContextImpl.");
-  return (MInteropContext->getAdapter());
+  return *(MInteropContext->getAdapter());
 }
 
 bool SYCLMemObjT::isInterop() const { return MOpenCLInterop; }

sycl/source/detail/sycl_mem_obj_t.hpp

@@ -90,7 +90,7 @@ class SYCLMemObjT : public SYCLMemObjI {
 
   virtual ~SYCLMemObjT() = default;
 
-  const AdapterPtr &getAdapter() const;
+  adapter_impl &getAdapter() const;
 
   size_t getSizeInBytes() const noexcept override { return MSizeInBytes; }
   __SYCL2020_DEPRECATED("get_count() is deprecated, please use size() instead")