Minor revert to fix memops2d failures

Author: aelovikov-intel

sycl/include/sycl/ext/oneapi/memcpy2d.hpp

@@ -34,7 +34,7 @@ void handler::ext_oneapi_memcpy2d(void *Dest, size_t DestPitch, const void *Src,
 #endif
 
   // Get the type of the pointers.
-  context Ctx = detail::createSyclObjFromImpl<context>(getContextImpl());
+  context Ctx = detail::createSyclObjFromImpl<context>(getContextImplPtr());
   usm::alloc SrcAllocType = get_pointer_type(Src, Ctx);
   usm::alloc DestAllocType = get_pointer_type(Dest, Ctx);
   bool SrcIsHost =
@@ -71,7 +71,7 @@ void handler::ext_oneapi_copy2d(const T *Src, size_t SrcPitch, T *Dest,
                           "to the width specified in 'ext_oneapi_copy2d'");
 
   // Get the type of the pointers.
-  context Ctx = detail::createSyclObjFromImpl<context>(getContextImpl());
+  context Ctx = detail::createSyclObjFromImpl<context>(getContextImplPtr());
   usm::alloc SrcAllocType = get_pointer_type(Src, Ctx);
   usm::alloc DestAllocType = get_pointer_type(Dest, Ctx);
   bool SrcIsHost =
@@ -106,7 +106,7 @@ void handler::ext_oneapi_memset2d(void *Dest, size_t DestPitch, int Value,
                           "to the width specified in 'ext_oneapi_memset2d'");
   T CharVal = static_cast<T>(Value);
 
-  context Ctx = detail::createSyclObjFromImpl<context>(getContextImpl());
+  context Ctx = detail::createSyclObjFromImpl<context>(getContextImplPtr());
   usm::alloc DestAllocType = get_pointer_type(Dest, Ctx);
 
   // If the backends supports 2D fill we use that. Otherwise we use a fallback
@@ -130,7 +130,7 @@ void handler::ext_oneapi_fill2d(void *Dest, size_t DestPitch, const T &Pattern,
                           "Destination pitch must be greater than or equal "
                           "to the width specified in 'ext_oneapi_fill2d'");
 
-  context Ctx = detail::createSyclObjFromImpl<context>(getContextImpl());
+  context Ctx = detail::createSyclObjFromImpl<context>(getContextImplPtr());
   usm::alloc DestAllocType = get_pointer_type(Dest, Ctx);
 
   // If the backends supports 2D fill we use that. Otherwise we use a fallback

sycl/include/sycl/handler.hpp

@@ -3507,10 +3507,7 @@ class __SYCL_EXPORT handler {
         UserRange, KernelFunc};
   }
 
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
   const std::shared_ptr<detail::context_impl> &getContextImplPtr() const;
-#endif
-  detail::context_impl &getContextImpl() const;
 
   // Checks if 2D memory operations are supported by the underlying platform.
   bool supportsUSMMemcpy2D();

sycl/source/detail/async_alloc.cpp

@@ -67,7 +67,7 @@ void *async_malloc(sycl::handler &h, sycl::usm::alloc kind, size_t size) {
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Only device backed asynchronous allocations are supported!");
 
-  auto &Adapter = h.getContextImpl().getAdapter();
+  auto &Adapter = detail::getSyclObjImpl(h)->get_context().getAdapter();
 
   // Get CG event dependencies for this allocation.
   const auto &DepEvents = h.impl->CGData.MEvents;
@@ -117,7 +117,7 @@ __SYCL_EXPORT void *async_malloc(const sycl::queue &q, sycl::usm::alloc kind,
 __SYCL_EXPORT void *async_malloc_from_pool(sycl::handler &h, size_t size,
                                            const memory_pool &pool) {
 
-  auto &Adapter = h.getContextImpl().getAdapter();
+  auto &Adapter = detail::getSyclObjImpl(h)->get_context().getAdapter();
   auto &memPoolImpl = sycl::detail::getSyclObjImpl(pool);
 
   // Get CG event dependencies for this allocation.

sycl/source/detail/queue_impl.hpp

@@ -293,12 +293,9 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
 
   const AdapterPtr &getAdapter() const { return MContext->getAdapter(); }
 
-  // To be removed soon, use `getContextImpl` below instead:
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  // This is used to implement `handler::getContextImplPtr` which is a part of
-  // ABI:
+  // TODO: stop using it in existing code. New code must NOT use this!
   const ContextImplPtr &getContextImplPtr() const { return MContext; }
-#endif
+
   context_impl &getContextImpl() const { return *MContext; }
 
   device_impl &getDeviceImpl() const { return MDevice; }

sycl/source/handler.cpp

@@ -2173,21 +2173,13 @@ void handler::memcpyFromHostOnlyDeviceGlobal(void *Dest,
   });
 }
 
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
 const std::shared_ptr<detail::context_impl> &
 handler::getContextImplPtr() const {
   if (auto *Graph = impl->get_graph_or_null()) {
     return Graph->getContextImplPtr();
   }
   return impl->get_queue().getContextImplPtr();
 }
-#endif
-detail::context_impl &handler::getContextImpl() const {
-  if (auto *Graph = impl->get_graph_or_null()) {
-    return *Graph->getContextImplPtr();
-  }
-  return impl->get_queue().getContextImpl();
-}
 
 void handler::setKernelCacheConfig(handler::StableKernelCacheConfig Config) {
   switch (Config) {

sycl/test/abi/sycl_symbols_linux.dump

@@ -4082,7 +4082,6 @@ _ZNK4sycl3_V17context8get_infoINS0_4info7context7devicesEEENS0_6detail20is_conte
 _ZNK4sycl3_V17context8get_infoINS0_4info7context8platformEEENS0_6detail20is_context_info_descIT_E11return_typeEv
 _ZNK4sycl3_V17context9getNativeEv
 _ZNK4sycl3_V17handler11eventNeededEv
-_ZNK4sycl3_V17handler14getContextImplEv
 _ZNK4sycl3_V17handler15getCommandGraphEv
 _ZNK4sycl3_V17handler16getDeviceBackendEv
 _ZNK4sycl3_V17handler17getContextImplPtrEv