From 754e0ab36ba2af34e032ea433414f66ae4518cf0 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Mon, 15 Jul 2024 12:28:27 -0700
Subject: [PATCH 1/9] changed getSyclObjImpl to ref

---
 sycl/include/sycl/accessor.hpp                       | 10 +++++-----
 sycl/include/sycl/accessor_image.hpp                 | 12 ++++++------
 sycl/include/sycl/buffer.hpp                         |  2 +-
 sycl/include/sycl/context.hpp                        |  2 +-
 sycl/include/sycl/detail/impl_utils.hpp              |  2 +-
 sycl/include/sycl/device.hpp                         |  2 +-
 sycl/include/sycl/event.hpp                          |  2 +-
 .../sycl/ext/oneapi/bindless_images_memory.hpp       |  2 +-
 sycl/include/sycl/ext/oneapi/experimental/graph.hpp  |  8 ++++----
 .../sycl/ext/oneapi/virtual_mem/physical_mem.hpp     |  2 +-
 sycl/include/sycl/ext/oneapi/weak_object_base.hpp    |  4 ++--
 sycl/include/sycl/image.hpp                          |  6 +++---
 sycl/include/sycl/kernel.hpp                         |  2 +-
 sycl/include/sycl/kernel_bundle.hpp                  |  8 ++++----
 sycl/include/sycl/platform.hpp                       |  2 +-
 sycl/include/sycl/queue.hpp                          |  3 +--
 sycl/include/sycl/sampler.hpp                        |  2 +-
 sycl/include/sycl/stream.hpp                         |  2 +-
 .../detail/program_manager/program_manager.cpp       |  2 +-
 sycl/source/detail/queue_impl.cpp                    |  3 ++-
 sycl/source/detail/queue_impl.hpp                    |  1 +
 sycl/source/queue.cpp                                |  2 ++
 22 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index 1b9371769d826..4500188389ac8 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -551,7 +551,7 @@ class __SYCL_EXPORT AccessorBaseHost {
   void *getMemoryObject() const;
 
   template <class Obj>
-  friend decltype(Obj::impl) getSyclObjImpl(const Obj &SyclObject);
+  friend decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -586,7 +586,7 @@ class __SYCL_EXPORT LocalAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -844,7 +844,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
   friend class sycl::ext::intel::esimd::detail::AccessorPrivateProxy;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2241,7 +2241,7 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2659,7 +2659,7 @@ class __SYCL_EBO host_accessor
                  access::placeholder::false_t>{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl) getSyclObjImpl(const Obj &SyclObject);
+  friend decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/accessor_image.hpp b/sycl/include/sycl/accessor_image.hpp
index 01415502e818a..e7ff92480c06d 100644
--- a/sycl/include/sycl/accessor_image.hpp
+++ b/sycl/include/sycl/accessor_image.hpp
@@ -97,7 +97,7 @@ class __SYCL_EXPORT UnsampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -167,7 +167,7 @@ class __SYCL_EXPORT SampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -931,7 +931,7 @@ class __SYCL_EBO unsampled_image_accessor :
   }
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1067,7 +1067,7 @@ class __SYCL_EBO host_unsampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1210,7 +1210,7 @@ class __SYCL_EBO sampled_image_accessor :
   }
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1313,7 +1313,7 @@ class __SYCL_EBO host_sampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp
index fe5a17c13a4aa..ddae9e7e12398 100644
--- a/sycl/include/sycl/buffer.hpp
+++ b/sycl/include/sycl/buffer.hpp
@@ -722,7 +722,7 @@ class buffer : public detail::buffer_plain,
 
 private:
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
   template <typename A, int dims, typename C, typename Enable>
   friend class buffer;
   template <typename DataT, int dims, access::mode mode, access::target target,
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
index 2b874cbfca9d4..33d062286ed9e 100644
--- a/sycl/include/sycl/context.hpp
+++ b/sycl/include/sycl/context.hpp
@@ -242,7 +242,7 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   friend auto get_native(const SyclT &Obj) -> backend_return_t<Backend, SyclT>;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend typename std::add_pointer_t<typename decltype(T::impl)::element_type>
diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp
index 17da417843541..cc024088c4157 100644
--- a/sycl/include/sycl/detail/impl_utils.hpp
+++ b/sycl/include/sycl/detail/impl_utils.hpp
@@ -27,7 +27,7 @@ namespace detail {
 // would trigger that error in MSVC:
 //   template <class T>
 //   friend decltype(T::impl) detail::getSyclObjImpl(const T &SyclObject);
-template <class Obj> decltype(Obj::impl) getSyclObjImpl(const Obj &SyclObject) {
+template <class Obj> const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject) {
   assert(SyclObject.impl && "every constructor should create an impl");
   return SyclObject.impl;
 }
diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index 80bf15bd10583..332d02ca9212d 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -344,7 +344,7 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
   pi_native_handle getNative() const;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend typename std::add_pointer_t<typename decltype(T::impl)::element_type>
diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp
index c4ed0c045aa9e..437c8a00a5d9a 100644
--- a/sycl/include/sycl/event.hpp
+++ b/sycl/include/sycl/event.hpp
@@ -145,7 +145,7 @@ class __SYCL_EXPORT event : public detail::OwnerLessBase<event> {
   std::shared_ptr<detail::event_impl> impl;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
index 72ecfc4f33b98..52548eb9c276c 100644
--- a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
+++ b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
@@ -92,7 +92,7 @@ class __SYCL_EXPORT image_mem {
   std::shared_ptr<detail::image_mem_impl> impl;
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 
diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
index 62a772eb362d5..aeeb2a9775922 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
@@ -133,7 +133,7 @@ class __SYCL_EXPORT node {
   node(const std::shared_ptr<detail::node_impl> &Impl) : impl(Impl) {}
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -342,7 +342,7 @@ class __SYCL_EXPORT modifiable_command_graph {
   void addGraphLeafDependencies(node Node);
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -380,7 +380,7 @@ class __SYCL_EXPORT executable_command_graph {
                            const property_list &PropList = {});
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   /// Creates a backend representation of the graph in \p impl member variable.
@@ -442,7 +442,7 @@ class __SYCL_EXPORT dynamic_parameter_base {
   std::shared_ptr<dynamic_parameter_impl> impl;
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 } // namespace detail
diff --git a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
index 24d371fe8c6fd..ef7fe03d35493 100644
--- a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
+++ b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
@@ -59,7 +59,7 @@ class __SYCL_EXPORT physical_mem
   std::shared_ptr<sycl::detail::physical_mem_impl> impl;
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
diff --git a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
index 57e6aed30b0df..29f65fc3e88d5 100644
--- a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
+++ b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
@@ -63,8 +63,8 @@ template <typename SYCLObjT> class weak_object_base {
 protected:
 #ifndef __SYCL_DEVICE_ONLY__
   // Store a weak variant of the impl in the SYCLObjT.
-  typename decltype(sycl::detail::getSyclObjImpl(
-      std::declval<SYCLObjT>()))::weak_type MObjWeakPtr;
+  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
+  // relies on <type_traits> from impl_utils.h
 
   static decltype(MObjWeakPtr) GetWeakImpl(const SYCLObjT &SYCLObj) {
     return sycl::detail::getSyclObjImpl(SYCLObj);
diff --git a/sycl/include/sycl/image.hpp b/sycl/include/sycl/image.hpp
index 2d0401764bbe9..51c38319e83ca 100644
--- a/sycl/include/sycl/image.hpp
+++ b/sycl/include/sycl/image.hpp
@@ -710,7 +710,7 @@ class image : public detail::unsampled_image_common<Dimensions, AllocatorT> {
              const context &TargetContext, event AvailableEvent);
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <typename DataT, int Dims, access::mode AccMode,
             access::target AccTarget, access::placeholder IsPlaceholder,
@@ -996,7 +996,7 @@ class unsampled_image
 
 private:
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1131,7 +1131,7 @@ class sampled_image
 
 private:
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/kernel.hpp b/sycl/include/sycl/kernel.hpp
index dec5e9547a7ae..f9ea6397c7ec8 100644
--- a/sycl/include/sycl/kernel.hpp
+++ b/sycl/include/sycl/kernel.hpp
@@ -180,7 +180,7 @@ class __SYCL_EXPORT kernel : public detail::OwnerLessBase<kernel> {
   std::shared_ptr<detail::kernel_impl> impl;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <backend BackendName, class SyclObjectT>
diff --git a/sycl/include/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp
index 99663183ad8d3..50d9391303a69 100644
--- a/sycl/include/sycl/kernel_bundle.hpp
+++ b/sycl/include/sycl/kernel_bundle.hpp
@@ -75,7 +75,7 @@ class __SYCL_EXPORT kernel_id : public detail::OwnerLessBase<kernel_id> {
   std::shared_ptr<detail::kernel_id_impl> impl;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -110,7 +110,7 @@ class __SYCL_EXPORT device_image_plain {
   detail::DeviceImageImplPtr impl;
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -141,7 +141,7 @@ class device_image : public detail::device_image_plain,
       : device_image_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -415,7 +415,7 @@ class kernel_bundle : public detail::kernel_bundle_plain,
       : kernel_bundle_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp
index 7d174f18a291d..687e16fda4878 100644
--- a/sycl/include/sycl/platform.hpp
+++ b/sycl/include/sycl/platform.hpp
@@ -239,7 +239,7 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <backend BackendName, class SyclObjectT>
   friend auto get_native(const SyclObjectT &Obj)
diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp
index fbcf563ddfaa1..39dd4e7134615 100644
--- a/sycl/include/sycl/queue.hpp
+++ b/sycl/include/sycl/queue.hpp
@@ -438,7 +438,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
     detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
     wait_proxy(CodeLoc);
   }
-
   /// Performs a blocking wait for the completion of all enqueued tasks in the
   /// queue.
   ///
@@ -2677,7 +2676,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   queue(std::shared_ptr<detail::queue_impl> impl) : impl(impl) {}
 
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
index 13f28b34363b1..c2933e084267a 100644
--- a/sycl/include/sycl/sampler.hpp
+++ b/sycl/include/sycl/sampler.hpp
@@ -121,7 +121,7 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(sampler) sampler {
 #else
   std::shared_ptr<detail::sampler_impl> impl;
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
   template <typename DataT, int Dimensions, sycl::access::mode AccessMode,
             sycl::access::target AccessTarget,
diff --git a/sycl/include/sycl/stream.hpp b/sycl/include/sycl/stream.hpp
index 00236a0fdd816..78e8e6ea3d446 100644
--- a/sycl/include/sycl/stream.hpp
+++ b/sycl/include/sycl/stream.hpp
@@ -923,7 +923,7 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(stream) stream
 #else
   std::shared_ptr<detail::stream_impl> impl;
   template <class Obj>
-  friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
 
   // NOTE: Some members are required for reconstructing the stream, but are not
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index dfec4a811382f..f528694433975 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -345,7 +345,7 @@ static void appendCompileOptionsFromImage(std::string &CompileOpts,
 
   appendCompileOptionsForGRFSizeProperties(CompileOpts, Img, isEsimdImage);
 
-  const auto &PlatformImpl = detail::getSyclObjImpl(Devs[0].get_platform());
+  const auto PlatformImpl = detail::getSyclObjImpl(Devs[0].get_platform());
 
   // Add optimization flags.
   auto str = getUint32PropAsOptStr(Img, "optLevel");
diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp
index 4adb0f2dccac1..25067ff6e62b9 100644
--- a/sycl/source/detail/queue_impl.cpp
+++ b/sycl/source/detail/queue_impl.cpp
@@ -384,8 +384,9 @@ event queue_impl::submit_impl(const std::function<void(handler &)> &CGF,
     finalizeHandler(Handler, Event);
 
     (*PostProcess)(IsKernel, KernelUsesAssert, Event);
-  } else
+  } else {
     finalizeHandler(Handler, Event);
+  }
 
   addEvent(Event);
 
diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp
index 6e803aae2bcc8..dac178d6c753e 100644
--- a/sycl/source/detail/queue_impl.hpp
+++ b/sycl/source/detail/queue_impl.hpp
@@ -436,6 +436,7 @@ class queue_impl {
                             const std::shared_ptr<queue_impl> &Self,
                             const detail::code_location &Loc,
                             const SubmitPostProcessF *PostProcess = nullptr) {
+
     submit_impl(CGF, Self, Self, nullptr, /*CallerNeedsEvent=*/false, Loc,
                 PostProcess);
   }
diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp
index d7201ae64c7ef..2e38f72b6b6a3 100644
--- a/sycl/source/queue.cpp
+++ b/sycl/source/queue.cpp
@@ -188,7 +188,9 @@ event queue::submit_impl(std::function<void(handler &)> CGH, queue SecondQueue,
 
 void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
                                       const detail::code_location &CodeLoc) {
+  std::cerr << "submit_without_event_impl invoked" << std::endl;
   return impl->submit_without_event(CGH, impl, CodeLoc);
+  std::cerr << "submit_without_event_impl is fine" << std::endl;
 }
 
 event queue::submit_impl_and_postprocess(

From f4ccc9422fb478320ad10928f2a2fcc5db16d5e2 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 08:25:16 -0700
Subject: [PATCH 2/9] removed getRawSyclObjImpl

---
 sycl/include/sycl/accessor.hpp                     |  2 +-
 sycl/include/sycl/context.hpp                      |  4 ----
 sycl/include/sycl/detail/impl_utils.hpp            |  9 ---------
 sycl/include/sycl/device.hpp                       |  4 ----
 .../detail/program_manager/program_manager.cpp     | 14 +++++++-------
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index f3fae922357e5..9862c69aadc09 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -551,7 +551,7 @@ class __SYCL_EXPORT AccessorBaseHost {
   void *getMemoryObject() const;
 
   template <class Obj>
-  friend decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
index f06c080579c18..0d5b87859be96 100644
--- a/sycl/include/sycl/context.hpp
+++ b/sycl/include/sycl/context.hpp
@@ -248,10 +248,6 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   template <class Obj>
   friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
-  template <class T>
-  friend typename std::add_pointer_t<typename decltype(T::impl)::element_type>
-  detail::getRawSyclObjImpl(const T &SyclObject);
-
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 
diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp
index cc024088c4157..5ed3d4dc8aad4 100644
--- a/sycl/include/sycl/detail/impl_utils.hpp
+++ b/sycl/include/sycl/detail/impl_utils.hpp
@@ -32,15 +32,6 @@ template <class Obj> const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclOb
   return SyclObject.impl;
 }
 
-// Returns the raw pointer to the impl object of given face object. The caller
-// must make sure the returned pointer is not captured in a field or otherwise
-// stored - i.e. must live only as on-stack value.
-template <class T>
-typename std::add_pointer_t<typename decltype(T::impl)::element_type>
-getRawSyclObjImpl(const T &SyclObject) {
-  return SyclObject.impl.get();
-}
-
 // Helper function for creation SYCL interface objects from implementations.
 // Note! This function relies on the fact that all SYCL interface classes
 // contain "impl" field that points to implementation object. "impl" field
diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index 332d02ca9212d..fb8716737349b 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -346,10 +346,6 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
   template <class Obj>
   friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
-  template <class T>
-  friend typename std::add_pointer_t<typename decltype(T::impl)::element_type>
-  detail::getRawSyclObjImpl(const T &SyclObject);
-
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index 63a6b62b0642d..192d8a0876f05 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -177,7 +177,7 @@ ProgramManager::createPIProgram(const RTDeviceBinaryImage &Img,
                                 const context &Context, const device &Device) {
   if (DbgProgMgr > 0)
     std::cerr << ">>> ProgramManager::createPIProgram(" << &Img << ", "
-              << getRawSyclObjImpl(Context) << ", " << getRawSyclObjImpl(Device)
+              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
               << ")\n";
   const pi_device_binary_struct &RawImg = Img.getRawData();
 
@@ -716,7 +716,7 @@ sycl::detail::pi::PiProgram ProgramManager::getBuiltPIProgram(
     }
     ProgramPtr BuiltProgram =
         build(std::move(ProgramManaged), ContextImpl, CompileOpts, LinkOpts,
-              getRawSyclObjImpl(Device)->getHandleRef(), DeviceLibReqMask,
+              getSyclObjImpl(Device).get()->getHandleRef(), DeviceLibReqMask,
               ProgramsToLink);
     // Those extra programs won't be used anymore, just the final linked result
     for (sycl::detail::pi::PiProgram Prg : ProgramsToLink)
@@ -1152,7 +1152,7 @@ ProgramManager::getDeviceImage(const std::string &KernelName,
                                bool JITCompilationIsRequired) {
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(\"" << KernelName << "\", "
-              << getRawSyclObjImpl(Context) << ", " << getRawSyclObjImpl(Device)
+              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
               << ", " << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
@@ -1202,7 +1202,7 @@ RTDeviceBinaryImage &ProgramManager::getDeviceImage(
 
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(Custom SPV file "
-              << getRawSyclObjImpl(Context) << ", " << getRawSyclObjImpl(Device)
+              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
               << ", " << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
@@ -2369,7 +2369,7 @@ device_image_plain ProgramManager::build(const device_image_plain &DeviceImage,
     std::vector<sycl::detail::pi::PiProgram> ExtraProgramsToLink;
     ProgramPtr BuiltProgram =
         build(std::move(ProgramManaged), ContextImpl, CompileOpts, LinkOpts,
-              getRawSyclObjImpl(Devs[0])->getHandleRef(), DeviceLibReqMask,
+              getSyclObjImpl(Devs[0]).get()->getHandleRef(), DeviceLibReqMask,
               ExtraProgramsToLink);
 
     emitBuiltProgramInfo(BuiltProgram.get(), ContextImpl);
@@ -2402,7 +2402,7 @@ device_image_plain ProgramManager::build(const device_image_plain &DeviceImage,
 
   uint32_t ImgId = Img.getImageID();
   const sycl::detail::pi::PiDevice PiDevice =
-      getRawSyclObjImpl(Devs[0])->getHandleRef();
+      getSyclObjImpl(Devs[0]).get()->getHandleRef();
   auto CacheKey =
       std::make_pair(std::make_pair(std::move(SpecConsts), ImgId), PiDevice);
 
@@ -2431,7 +2431,7 @@ device_image_plain ProgramManager::build(const device_image_plain &DeviceImage,
   // call to getOrBuild, so starting with "1"
   for (size_t Idx = 1; Idx < Devs.size(); ++Idx) {
     const sycl::detail::pi::PiDevice PiDeviceAdd =
-        getRawSyclObjImpl(Devs[Idx])->getHandleRef();
+        getSyclObjImpl(Devs[Idx]).get()->getHandleRef();
 
     // Change device in the cache key to reduce copying of spec const data.
     CacheKey.second = PiDeviceAdd;

From 404bf3219ee0ae43881f947c5e7d3909aa399ac4 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 08:45:02 -0700
Subject: [PATCH 3/9] Applied clang-format

---
 sycl/include/sycl/accessor.hpp                | 66 ++++++++++---------
 sycl/include/sycl/accessor_image.hpp          | 18 +++--
 sycl/include/sycl/buffer.hpp                  | 16 +++--
 sycl/include/sycl/context.hpp                 |  3 +-
 sycl/include/sycl/detail/impl_utils.hpp       |  3 +-
 sycl/include/sycl/device.hpp                  |  3 +-
 sycl/include/sycl/event.hpp                   |  3 +-
 .../ext/oneapi/bindless_images_memory.hpp     |  2 +-
 .../sycl/ext/oneapi/experimental/graph.hpp    |  8 +--
 .../ext/oneapi/virtual_mem/physical_mem.hpp   |  2 +-
 .../sycl/ext/oneapi/weak_object_base.hpp      |  3 +-
 sycl/include/sycl/image.hpp                   |  9 ++-
 sycl/include/sycl/kernel.hpp                  |  3 +-
 sycl/include/sycl/kernel_bundle.hpp           | 12 ++--
 sycl/include/sycl/platform.hpp                |  3 +-
 sycl/include/sycl/queue.hpp                   |  3 +-
 sycl/include/sycl/sampler.hpp                 |  3 +-
 sycl/include/sycl/stream.hpp                  |  3 +-
 .../program_manager/program_manager.cpp       | 14 ++--
 19 files changed, 104 insertions(+), 73 deletions(-)

diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index 9862c69aadc09..78e0b3fbd26ad 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -551,7 +551,7 @@ class __SYCL_EXPORT AccessorBaseHost {
   void *getMemoryObject() const;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -586,7 +586,8 @@ class __SYCL_EXPORT LocalAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -833,7 +834,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
             /*AccessMode=*/getAdjustedMode({}),
             /*SYCLMemObject=*/nullptr, /*Dims=*/0, /*ElemSize=*/0,
             /*IsPlaceH=*/false,
-            /*OffsetInBytes=*/0, /*IsSubBuffer=*/false, /*PropertyList=*/{}){};
+            /*OffsetInBytes=*/0, /*IsSubBuffer=*/false, /*PropertyList=*/{}) {};
 
   template <typename, int, access_mode> friend class host_accessor;
 
@@ -844,7 +845,8 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
   friend class sycl::ext::intel::esimd::detail::AccessorPrivateProxy;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1943,7 +1945,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
     if (PropertyList.template has_property<property::no_init>() &&
         AccessMode == access::mode::read) {
       throw sycl::exception(make_error_code(errc::invalid),
-          "accessor cannot be both read_only and no_init");
+                            "accessor cannot be both read_only and no_init");
     }
   }
 
@@ -2045,9 +2047,9 @@ accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3, Type4,
                 ext::oneapi::accessor_property_list<PropsT...>>;
 
 template <typename DataT, int Dimensions, typename AllocatorT>
-accessor(buffer<DataT, Dimensions, AllocatorT>, handler &)
-    -> accessor<DataT, Dimensions, access::mode::read_write, target::device,
-                access::placeholder::false_t>;
+accessor(buffer<DataT, Dimensions, AllocatorT>,
+         handler &) -> accessor<DataT, Dimensions, access::mode::read_write,
+                                target::device, access::placeholder::false_t>;
 
 template <typename DataT, int Dimensions, typename AllocatorT,
           typename... PropsT>
@@ -2236,7 +2238,8 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2263,10 +2266,10 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 #endif
 
-        template <int Dims = Dimensions, typename = std::enable_if_t<Dims == 0>>
-        local_accessor_base(handler &, const property_list &propList,
-                            const detail::code_location CodeLoc =
-                                detail::code_location::current())
+  template <int Dims = Dimensions, typename = std::enable_if_t<Dims == 0>>
+  local_accessor_base(
+      handler &, const property_list &propList,
+      const detail::code_location CodeLoc = detail::code_location::current())
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(range<AdjustedDim>{1}) {
     (void)propList;
@@ -2298,12 +2301,11 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 #endif
 
-        template <int Dims = Dimensions,
-                  typename = std::enable_if_t<(Dims > 0)>>
-        local_accessor_base(range<Dimensions> AllocationSize, handler &,
-                            const property_list &propList,
-                            const detail::code_location CodeLoc =
-                                detail::code_location::current())
+  template <int Dims = Dimensions, typename = std::enable_if_t<(Dims > 0)>>
+  local_accessor_base(
+      range<Dimensions> AllocationSize, handler &,
+      const property_list &propList,
+      const detail::code_location CodeLoc = detail::code_location::current())
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(AllocationSize) {
     (void)propList;
@@ -2654,7 +2656,7 @@ class __SYCL_EBO host_accessor
                  access::placeholder::false_t>{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
+  friend decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2878,27 +2880,27 @@ host_accessor(buffer<DataT, Dimensions, AllocatorT>)
     -> host_accessor<DataT, Dimensions, access::mode::read_write>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1)
-    -> host_accessor<DataT, Dimensions,
-                     detail::deduceAccessMode<Type1, Type1>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>,
+              Type1) -> host_accessor<DataT, Dimensions,
+                                      detail::deduceAccessMode<Type1, Type1>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2)
-    -> host_accessor<DataT, Dimensions,
-                     detail::deduceAccessMode<Type1, Type2>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1,
+              Type2) -> host_accessor<DataT, Dimensions,
+                                      detail::deduceAccessMode<Type1, Type2>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2, typename Type3>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3)
-    -> host_accessor<DataT, Dimensions,
-                     detail::deduceAccessMode<Type2, Type3>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2,
+              Type3) -> host_accessor<DataT, Dimensions,
+                                      detail::deduceAccessMode<Type2, Type3>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2, typename Type3, typename Type4>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3, Type4)
-    -> host_accessor<DataT, Dimensions,
-                     detail::deduceAccessMode<Type3, Type4>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3,
+              Type4) -> host_accessor<DataT, Dimensions,
+                                      detail::deduceAccessMode<Type3, Type4>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2, typename Type3, typename Type4, typename Type5>
diff --git a/sycl/include/sycl/accessor_image.hpp b/sycl/include/sycl/accessor_image.hpp
index e7ff92480c06d..420e3468d22ab 100644
--- a/sycl/include/sycl/accessor_image.hpp
+++ b/sycl/include/sycl/accessor_image.hpp
@@ -97,7 +97,8 @@ class __SYCL_EXPORT UnsampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -167,7 +168,8 @@ class __SYCL_EXPORT SampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -931,7 +933,8 @@ class __SYCL_EBO unsampled_image_accessor :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1067,7 +1070,8 @@ class __SYCL_EBO host_unsampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1210,7 +1214,8 @@ class __SYCL_EBO sampled_image_accessor :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1313,7 +1318,8 @@ class __SYCL_EBO host_sampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp
index 290ec21d9e49b..d9b6e3c92ed5c 100644
--- a/sycl/include/sycl/buffer.hpp
+++ b/sycl/include/sycl/buffer.hpp
@@ -445,13 +445,14 @@ class buffer : public detail::buffer_plain,
 
     if (b.is_sub_buffer())
       throw sycl::exception(make_error_code(errc::invalid),
-          "Cannot create sub buffer from sub buffer.");
+                            "Cannot create sub buffer from sub buffer.");
     if (isOutOfBounds(baseIndex, subRange, b.Range))
-      throw sycl::exception(make_error_code(errc::invalid),
+      throw sycl::exception(
+          make_error_code(errc::invalid),
           "Requested sub-buffer size exceeds the size of the parent buffer");
     if (!isContiguousRegion(baseIndex, subRange, b.Range))
       throw sycl::exception(make_error_code(errc::invalid),
-          "Requested sub-buffer region is not contiguous");
+                            "Requested sub-buffer region is not contiguous");
   }
 
   buffer(const buffer &rhs,
@@ -543,7 +544,8 @@ class buffer : public detail::buffer_plain,
       id<dimensions> accessOffset = {},
       const detail::code_location CodeLoc = detail::code_location::current()) {
     if (isOutOfBounds(accessOffset, accessRange, this->Range))
-      throw sycl::exception(make_error_code(errc::invalid),
+      throw sycl::exception(
+          make_error_code(errc::invalid),
           "Requested accessor would exceed the bounds of the buffer");
 
     return accessor<T, dimensions, mode, target, access::placeholder::false_t,
@@ -565,7 +567,8 @@ class buffer : public detail::buffer_plain,
                                                        detail::code_location::
                                                            current()) {
     if (isOutOfBounds(accessOffset, accessRange, this->Range))
-      throw sycl::exception(make_error_code(errc::invalid),
+      throw sycl::exception(
+          make_error_code(errc::invalid),
           "Requested accessor would exceed the bounds of the buffer");
 
     return accessor<T, dimensions, mode, access::target::host_buffer,
@@ -723,7 +726,8 @@ class buffer : public detail::buffer_plain,
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
   template <typename A, int dims, typename C, typename Enable>
   friend class buffer;
   template <typename DataT, int dims, access::mode mode, access::target target,
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
index 0d5b87859be96..5e387d5f94cc7 100644
--- a/sycl/include/sycl/context.hpp
+++ b/sycl/include/sycl/context.hpp
@@ -246,7 +246,8 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   friend auto get_native(const SyclT &Obj) -> backend_return_t<Backend, SyclT>;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp
index 5ed3d4dc8aad4..fc5a297e20476 100644
--- a/sycl/include/sycl/detail/impl_utils.hpp
+++ b/sycl/include/sycl/detail/impl_utils.hpp
@@ -27,7 +27,8 @@ namespace detail {
 // would trigger that error in MSVC:
 //   template <class T>
 //   friend decltype(T::impl) detail::getSyclObjImpl(const T &SyclObject);
-template <class Obj> const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject) {
+template <class Obj>
+const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject) {
   assert(SyclObject.impl && "every constructor should create an impl");
   return SyclObject.impl;
 }
diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index fb8716737349b..355eb227e8b69 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -344,7 +344,8 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
   pi_native_handle getNative() const;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp
index a67f1534f438f..ded2794c6c603 100644
--- a/sycl/include/sycl/event.hpp
+++ b/sycl/include/sycl/event.hpp
@@ -145,7 +145,8 @@ class __SYCL_EXPORT event : public detail::OwnerLessBase<event> {
   std::shared_ptr<detail::event_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
index 52548eb9c276c..cb8c44020ab21 100644
--- a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
+++ b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
@@ -92,7 +92,7 @@ class __SYCL_EXPORT image_mem {
   std::shared_ptr<detail::image_mem_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 
diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
index aeeb2a9775922..8b2b36f17401c 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
@@ -133,7 +133,7 @@ class __SYCL_EXPORT node {
   node(const std::shared_ptr<detail::node_impl> &Impl) : impl(Impl) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -342,7 +342,7 @@ class __SYCL_EXPORT modifiable_command_graph {
   void addGraphLeafDependencies(node Node);
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -380,7 +380,7 @@ class __SYCL_EXPORT executable_command_graph {
                            const property_list &PropList = {});
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   /// Creates a backend representation of the graph in \p impl member variable.
@@ -442,7 +442,7 @@ class __SYCL_EXPORT dynamic_parameter_base {
   std::shared_ptr<dynamic_parameter_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 } // namespace detail
diff --git a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
index ef7fe03d35493..d5152716495d1 100644
--- a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
+++ b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
@@ -59,7 +59,7 @@ class __SYCL_EXPORT physical_mem
   std::shared_ptr<sycl::detail::physical_mem_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
diff --git a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
index 29f65fc3e88d5..0a037d31f5fe8 100644
--- a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
+++ b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
@@ -63,7 +63,8 @@ template <typename SYCLObjT> class weak_object_base {
 protected:
 #ifndef __SYCL_DEVICE_ONLY__
   // Store a weak variant of the impl in the SYCLObjT.
-  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
+  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(
+      std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
   // relies on <type_traits> from impl_utils.h
 
   static decltype(MObjWeakPtr) GetWeakImpl(const SYCLObjT &SYCLObj) {
diff --git a/sycl/include/sycl/image.hpp b/sycl/include/sycl/image.hpp
index 63c394c81ae61..3103231404f46 100644
--- a/sycl/include/sycl/image.hpp
+++ b/sycl/include/sycl/image.hpp
@@ -716,7 +716,8 @@ class image : public detail::unsampled_image_common<Dimensions, AllocatorT> {
              const context &TargetContext, event AvailableEvent);
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <typename DataT, int Dims, access::mode AccMode,
             access::target AccTarget, access::placeholder IsPlaceholder,
@@ -1002,7 +1003,8 @@ class unsampled_image
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1137,7 +1139,8 @@ class sampled_image
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/kernel.hpp b/sycl/include/sycl/kernel.hpp
index f9ea6397c7ec8..241e94aad6bcc 100644
--- a/sycl/include/sycl/kernel.hpp
+++ b/sycl/include/sycl/kernel.hpp
@@ -180,7 +180,8 @@ class __SYCL_EXPORT kernel : public detail::OwnerLessBase<kernel> {
   std::shared_ptr<detail::kernel_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <backend BackendName, class SyclObjectT>
diff --git a/sycl/include/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp
index 50d9391303a69..e3d893f25742f 100644
--- a/sycl/include/sycl/kernel_bundle.hpp
+++ b/sycl/include/sycl/kernel_bundle.hpp
@@ -75,7 +75,8 @@ class __SYCL_EXPORT kernel_id : public detail::OwnerLessBase<kernel_id> {
   std::shared_ptr<detail::kernel_id_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -110,7 +111,8 @@ class __SYCL_EXPORT device_image_plain {
   detail::DeviceImageImplPtr impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -141,7 +143,8 @@ class device_image : public detail::device_image_plain,
       : device_image_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -415,7 +418,8 @@ class kernel_bundle : public detail::kernel_bundle_plain,
       : kernel_bundle_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp
index 687e16fda4878..05d606790cb5e 100644
--- a/sycl/include/sycl/platform.hpp
+++ b/sycl/include/sycl/platform.hpp
@@ -239,7 +239,8 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <backend BackendName, class SyclObjectT>
   friend auto get_native(const SyclObjectT &Obj)
diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp
index bc900c3cb923e..ccb2d89a9188c 100644
--- a/sycl/include/sycl/queue.hpp
+++ b/sycl/include/sycl/queue.hpp
@@ -2680,7 +2680,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   queue(std::shared_ptr<detail::queue_impl> impl) : impl(impl) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
index d863b87002f03..c4d02ae5b8c39 100644
--- a/sycl/include/sycl/sampler.hpp
+++ b/sycl/include/sycl/sampler.hpp
@@ -125,7 +125,8 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(sampler) sampler {
 #else
   std::shared_ptr<detail::sampler_impl> impl;
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
   template <typename DataT, int Dimensions, sycl::access::mode AccessMode,
             sycl::access::target AccessTarget,
diff --git a/sycl/include/sycl/stream.hpp b/sycl/include/sycl/stream.hpp
index 62072fe81c24c..05a26d9614e64 100644
--- a/sycl/include/sycl/stream.hpp
+++ b/sycl/include/sycl/stream.hpp
@@ -927,7 +927,8 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(stream) stream
 #else
   std::shared_ptr<detail::stream_impl> impl;
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
 
   // NOTE: Some members are required for reconstructing the stream, but are not
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index 192d8a0876f05..d3d9544ca5873 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -177,8 +177,8 @@ ProgramManager::createPIProgram(const RTDeviceBinaryImage &Img,
                                 const context &Context, const device &Device) {
   if (DbgProgMgr > 0)
     std::cerr << ">>> ProgramManager::createPIProgram(" << &Img << ", "
-              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
-              << ")\n";
+              << getSyclObjImpl(Context).get() << ", "
+              << getSyclObjImpl(Device).get() << ")\n";
   const pi_device_binary_struct &RawImg = Img.getRawData();
 
   // perform minimal sanity checks on the device image and the descriptor
@@ -1152,8 +1152,9 @@ ProgramManager::getDeviceImage(const std::string &KernelName,
                                bool JITCompilationIsRequired) {
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(\"" << KernelName << "\", "
-              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
-              << ", " << JITCompilationIsRequired << ")\n";
+              << getSyclObjImpl(Context).get() << ", "
+              << getSyclObjImpl(Device).get() << ", "
+              << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
     debugPrintBinaryImages();
@@ -1202,8 +1203,9 @@ RTDeviceBinaryImage &ProgramManager::getDeviceImage(
 
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(Custom SPV file "
-              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
-              << ", " << JITCompilationIsRequired << ")\n";
+              << getSyclObjImpl(Context).get() << ", "
+              << getSyclObjImpl(Device).get() << ", "
+              << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
     debugPrintBinaryImages();

From 5a9ba364fd2eec98302d8743f440312e0e7bfddc Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 13:13:47 -0700
Subject: [PATCH 4/9] Revert "Applied clang-format"

This reverts commit 404bf3219ee0ae43881f947c5e7d3909aa399ac4.
---
 sycl/include/sycl/accessor.hpp                | 66 +++++++++----------
 sycl/include/sycl/accessor_image.hpp          | 18 ++---
 sycl/include/sycl/buffer.hpp                  | 16 ++---
 sycl/include/sycl/context.hpp                 |  3 +-
 sycl/include/sycl/detail/impl_utils.hpp       |  3 +-
 sycl/include/sycl/device.hpp                  |  3 +-
 sycl/include/sycl/event.hpp                   |  3 +-
 .../ext/oneapi/bindless_images_memory.hpp     |  2 +-
 .../sycl/ext/oneapi/experimental/graph.hpp    |  8 +--
 .../ext/oneapi/virtual_mem/physical_mem.hpp   |  2 +-
 .../sycl/ext/oneapi/weak_object_base.hpp      |  3 +-
 sycl/include/sycl/image.hpp                   |  9 +--
 sycl/include/sycl/kernel.hpp                  |  3 +-
 sycl/include/sycl/kernel_bundle.hpp           | 12 ++--
 sycl/include/sycl/platform.hpp                |  3 +-
 sycl/include/sycl/queue.hpp                   |  3 +-
 sycl/include/sycl/sampler.hpp                 |  3 +-
 sycl/include/sycl/stream.hpp                  |  3 +-
 .../program_manager/program_manager.cpp       | 14 ++--
 19 files changed, 73 insertions(+), 104 deletions(-)

diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index 78e0b3fbd26ad..9862c69aadc09 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -551,7 +551,7 @@ class __SYCL_EXPORT AccessorBaseHost {
   void *getMemoryObject() const;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -586,8 +586,7 @@ class __SYCL_EXPORT LocalAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -834,7 +833,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
             /*AccessMode=*/getAdjustedMode({}),
             /*SYCLMemObject=*/nullptr, /*Dims=*/0, /*ElemSize=*/0,
             /*IsPlaceH=*/false,
-            /*OffsetInBytes=*/0, /*IsSubBuffer=*/false, /*PropertyList=*/{}) {};
+            /*OffsetInBytes=*/0, /*IsSubBuffer=*/false, /*PropertyList=*/{}){};
 
   template <typename, int, access_mode> friend class host_accessor;
 
@@ -845,8 +844,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
   friend class sycl::ext::intel::esimd::detail::AccessorPrivateProxy;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1945,7 +1943,7 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
     if (PropertyList.template has_property<property::no_init>() &&
         AccessMode == access::mode::read) {
       throw sycl::exception(make_error_code(errc::invalid),
-                            "accessor cannot be both read_only and no_init");
+          "accessor cannot be both read_only and no_init");
     }
   }
 
@@ -2047,9 +2045,9 @@ accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3, Type4,
                 ext::oneapi::accessor_property_list<PropsT...>>;
 
 template <typename DataT, int Dimensions, typename AllocatorT>
-accessor(buffer<DataT, Dimensions, AllocatorT>,
-         handler &) -> accessor<DataT, Dimensions, access::mode::read_write,
-                                target::device, access::placeholder::false_t>;
+accessor(buffer<DataT, Dimensions, AllocatorT>, handler &)
+    -> accessor<DataT, Dimensions, access::mode::read_write, target::device,
+                access::placeholder::false_t>;
 
 template <typename DataT, int Dimensions, typename AllocatorT,
           typename... PropsT>
@@ -2238,8 +2236,7 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2266,10 +2263,10 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 #endif
 
-  template <int Dims = Dimensions, typename = std::enable_if_t<Dims == 0>>
-  local_accessor_base(
-      handler &, const property_list &propList,
-      const detail::code_location CodeLoc = detail::code_location::current())
+        template <int Dims = Dimensions, typename = std::enable_if_t<Dims == 0>>
+        local_accessor_base(handler &, const property_list &propList,
+                            const detail::code_location CodeLoc =
+                                detail::code_location::current())
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(range<AdjustedDim>{1}) {
     (void)propList;
@@ -2301,11 +2298,12 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 #endif
 
-  template <int Dims = Dimensions, typename = std::enable_if_t<(Dims > 0)>>
-  local_accessor_base(
-      range<Dimensions> AllocationSize, handler &,
-      const property_list &propList,
-      const detail::code_location CodeLoc = detail::code_location::current())
+        template <int Dims = Dimensions,
+                  typename = std::enable_if_t<(Dims > 0)>>
+        local_accessor_base(range<Dimensions> AllocationSize, handler &,
+                            const property_list &propList,
+                            const detail::code_location CodeLoc =
+                                detail::code_location::current())
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(AllocationSize) {
     (void)propList;
@@ -2656,7 +2654,7 @@ class __SYCL_EBO host_accessor
                  access::placeholder::false_t>{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
+  friend decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2880,27 +2878,27 @@ host_accessor(buffer<DataT, Dimensions, AllocatorT>)
     -> host_accessor<DataT, Dimensions, access::mode::read_write>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>,
-              Type1) -> host_accessor<DataT, Dimensions,
-                                      detail::deduceAccessMode<Type1, Type1>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1)
+    -> host_accessor<DataT, Dimensions,
+                     detail::deduceAccessMode<Type1, Type1>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1,
-              Type2) -> host_accessor<DataT, Dimensions,
-                                      detail::deduceAccessMode<Type1, Type2>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2)
+    -> host_accessor<DataT, Dimensions,
+                     detail::deduceAccessMode<Type1, Type2>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2, typename Type3>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2,
-              Type3) -> host_accessor<DataT, Dimensions,
-                                      detail::deduceAccessMode<Type2, Type3>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3)
+    -> host_accessor<DataT, Dimensions,
+                     detail::deduceAccessMode<Type2, Type3>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2, typename Type3, typename Type4>
-host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3,
-              Type4) -> host_accessor<DataT, Dimensions,
-                                      detail::deduceAccessMode<Type3, Type4>()>;
+host_accessor(buffer<DataT, Dimensions, AllocatorT>, Type1, Type2, Type3, Type4)
+    -> host_accessor<DataT, Dimensions,
+                     detail::deduceAccessMode<Type3, Type4>()>;
 
 template <typename DataT, int Dimensions, typename AllocatorT, typename Type1,
           typename Type2, typename Type3, typename Type4, typename Type5>
diff --git a/sycl/include/sycl/accessor_image.hpp b/sycl/include/sycl/accessor_image.hpp
index 420e3468d22ab..e7ff92480c06d 100644
--- a/sycl/include/sycl/accessor_image.hpp
+++ b/sycl/include/sycl/accessor_image.hpp
@@ -97,8 +97,7 @@ class __SYCL_EXPORT UnsampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -168,8 +167,7 @@ class __SYCL_EXPORT SampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -933,8 +931,7 @@ class __SYCL_EBO unsampled_image_accessor :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1070,8 +1067,7 @@ class __SYCL_EBO host_unsampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1214,8 +1210,7 @@ class __SYCL_EBO sampled_image_accessor :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1318,8 +1313,7 @@ class __SYCL_EBO host_sampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp
index d9b6e3c92ed5c..290ec21d9e49b 100644
--- a/sycl/include/sycl/buffer.hpp
+++ b/sycl/include/sycl/buffer.hpp
@@ -445,14 +445,13 @@ class buffer : public detail::buffer_plain,
 
     if (b.is_sub_buffer())
       throw sycl::exception(make_error_code(errc::invalid),
-                            "Cannot create sub buffer from sub buffer.");
+          "Cannot create sub buffer from sub buffer.");
     if (isOutOfBounds(baseIndex, subRange, b.Range))
-      throw sycl::exception(
-          make_error_code(errc::invalid),
+      throw sycl::exception(make_error_code(errc::invalid),
           "Requested sub-buffer size exceeds the size of the parent buffer");
     if (!isContiguousRegion(baseIndex, subRange, b.Range))
       throw sycl::exception(make_error_code(errc::invalid),
-                            "Requested sub-buffer region is not contiguous");
+          "Requested sub-buffer region is not contiguous");
   }
 
   buffer(const buffer &rhs,
@@ -544,8 +543,7 @@ class buffer : public detail::buffer_plain,
       id<dimensions> accessOffset = {},
       const detail::code_location CodeLoc = detail::code_location::current()) {
     if (isOutOfBounds(accessOffset, accessRange, this->Range))
-      throw sycl::exception(
-          make_error_code(errc::invalid),
+      throw sycl::exception(make_error_code(errc::invalid),
           "Requested accessor would exceed the bounds of the buffer");
 
     return accessor<T, dimensions, mode, target, access::placeholder::false_t,
@@ -567,8 +565,7 @@ class buffer : public detail::buffer_plain,
                                                        detail::code_location::
                                                            current()) {
     if (isOutOfBounds(accessOffset, accessRange, this->Range))
-      throw sycl::exception(
-          make_error_code(errc::invalid),
+      throw sycl::exception(make_error_code(errc::invalid),
           "Requested accessor would exceed the bounds of the buffer");
 
     return accessor<T, dimensions, mode, access::target::host_buffer,
@@ -726,8 +723,7 @@ class buffer : public detail::buffer_plain,
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
   template <typename A, int dims, typename C, typename Enable>
   friend class buffer;
   template <typename DataT, int dims, access::mode mode, access::target target,
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
index 5e387d5f94cc7..0d5b87859be96 100644
--- a/sycl/include/sycl/context.hpp
+++ b/sycl/include/sycl/context.hpp
@@ -246,8 +246,7 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   friend auto get_native(const SyclT &Obj) -> backend_return_t<Backend, SyclT>;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp
index fc5a297e20476..5ed3d4dc8aad4 100644
--- a/sycl/include/sycl/detail/impl_utils.hpp
+++ b/sycl/include/sycl/detail/impl_utils.hpp
@@ -27,8 +27,7 @@ namespace detail {
 // would trigger that error in MSVC:
 //   template <class T>
 //   friend decltype(T::impl) detail::getSyclObjImpl(const T &SyclObject);
-template <class Obj>
-const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject) {
+template <class Obj> const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject) {
   assert(SyclObject.impl && "every constructor should create an impl");
   return SyclObject.impl;
 }
diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index 355eb227e8b69..fb8716737349b 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -344,8 +344,7 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
   pi_native_handle getNative() const;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp
index ded2794c6c603..a67f1534f438f 100644
--- a/sycl/include/sycl/event.hpp
+++ b/sycl/include/sycl/event.hpp
@@ -145,8 +145,7 @@ class __SYCL_EXPORT event : public detail::OwnerLessBase<event> {
   std::shared_ptr<detail::event_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
index cb8c44020ab21..52548eb9c276c 100644
--- a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
+++ b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
@@ -92,7 +92,7 @@ class __SYCL_EXPORT image_mem {
   std::shared_ptr<detail::image_mem_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 
diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
index 8b2b36f17401c..aeeb2a9775922 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
@@ -133,7 +133,7 @@ class __SYCL_EXPORT node {
   node(const std::shared_ptr<detail::node_impl> &Impl) : impl(Impl) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -342,7 +342,7 @@ class __SYCL_EXPORT modifiable_command_graph {
   void addGraphLeafDependencies(node Node);
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -380,7 +380,7 @@ class __SYCL_EXPORT executable_command_graph {
                            const property_list &PropList = {});
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   /// Creates a backend representation of the graph in \p impl member variable.
@@ -442,7 +442,7 @@ class __SYCL_EXPORT dynamic_parameter_base {
   std::shared_ptr<dynamic_parameter_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 } // namespace detail
diff --git a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
index d5152716495d1..ef7fe03d35493 100644
--- a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
+++ b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
@@ -59,7 +59,7 @@ class __SYCL_EXPORT physical_mem
   std::shared_ptr<sycl::detail::physical_mem_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
+  friend const decltype(Obj::impl)&
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
diff --git a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
index 0a037d31f5fe8..29f65fc3e88d5 100644
--- a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
+++ b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
@@ -63,8 +63,7 @@ template <typename SYCLObjT> class weak_object_base {
 protected:
 #ifndef __SYCL_DEVICE_ONLY__
   // Store a weak variant of the impl in the SYCLObjT.
-  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(
-      std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
+  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
   // relies on <type_traits> from impl_utils.h
 
   static decltype(MObjWeakPtr) GetWeakImpl(const SYCLObjT &SYCLObj) {
diff --git a/sycl/include/sycl/image.hpp b/sycl/include/sycl/image.hpp
index 3103231404f46..63c394c81ae61 100644
--- a/sycl/include/sycl/image.hpp
+++ b/sycl/include/sycl/image.hpp
@@ -716,8 +716,7 @@ class image : public detail::unsampled_image_common<Dimensions, AllocatorT> {
              const context &TargetContext, event AvailableEvent);
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <typename DataT, int Dims, access::mode AccMode,
             access::target AccTarget, access::placeholder IsPlaceholder,
@@ -1003,8 +1002,7 @@ class unsampled_image
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1139,8 +1137,7 @@ class sampled_image
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/kernel.hpp b/sycl/include/sycl/kernel.hpp
index 241e94aad6bcc..f9ea6397c7ec8 100644
--- a/sycl/include/sycl/kernel.hpp
+++ b/sycl/include/sycl/kernel.hpp
@@ -180,8 +180,7 @@ class __SYCL_EXPORT kernel : public detail::OwnerLessBase<kernel> {
   std::shared_ptr<detail::kernel_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <backend BackendName, class SyclObjectT>
diff --git a/sycl/include/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp
index e3d893f25742f..50d9391303a69 100644
--- a/sycl/include/sycl/kernel_bundle.hpp
+++ b/sycl/include/sycl/kernel_bundle.hpp
@@ -75,8 +75,7 @@ class __SYCL_EXPORT kernel_id : public detail::OwnerLessBase<kernel_id> {
   std::shared_ptr<detail::kernel_id_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -111,8 +110,7 @@ class __SYCL_EXPORT device_image_plain {
   detail::DeviceImageImplPtr impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -143,8 +141,7 @@ class device_image : public detail::device_image_plain,
       : device_image_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -418,8 +415,7 @@ class kernel_bundle : public detail::kernel_bundle_plain,
       : kernel_bundle_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp
index 05d606790cb5e..687e16fda4878 100644
--- a/sycl/include/sycl/platform.hpp
+++ b/sycl/include/sycl/platform.hpp
@@ -239,8 +239,7 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <backend BackendName, class SyclObjectT>
   friend auto get_native(const SyclObjectT &Obj)
diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp
index ccb2d89a9188c..bc900c3cb923e 100644
--- a/sycl/include/sycl/queue.hpp
+++ b/sycl/include/sycl/queue.hpp
@@ -2680,8 +2680,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   queue(std::shared_ptr<detail::queue_impl> impl) : impl(impl) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
index c4d02ae5b8c39..d863b87002f03 100644
--- a/sycl/include/sycl/sampler.hpp
+++ b/sycl/include/sycl/sampler.hpp
@@ -125,8 +125,7 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(sampler) sampler {
 #else
   std::shared_ptr<detail::sampler_impl> impl;
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
   template <typename DataT, int Dimensions, sycl::access::mode AccessMode,
             sycl::access::target AccessTarget,
diff --git a/sycl/include/sycl/stream.hpp b/sycl/include/sycl/stream.hpp
index 05a26d9614e64..62072fe81c24c 100644
--- a/sycl/include/sycl/stream.hpp
+++ b/sycl/include/sycl/stream.hpp
@@ -927,8 +927,7 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(stream) stream
 #else
   std::shared_ptr<detail::stream_impl> impl;
   template <class Obj>
-  friend const decltype(Obj::impl) &
-  detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
 
   // NOTE: Some members are required for reconstructing the stream, but are not
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index d3d9544ca5873..192d8a0876f05 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -177,8 +177,8 @@ ProgramManager::createPIProgram(const RTDeviceBinaryImage &Img,
                                 const context &Context, const device &Device) {
   if (DbgProgMgr > 0)
     std::cerr << ">>> ProgramManager::createPIProgram(" << &Img << ", "
-              << getSyclObjImpl(Context).get() << ", "
-              << getSyclObjImpl(Device).get() << ")\n";
+              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
+              << ")\n";
   const pi_device_binary_struct &RawImg = Img.getRawData();
 
   // perform minimal sanity checks on the device image and the descriptor
@@ -1152,9 +1152,8 @@ ProgramManager::getDeviceImage(const std::string &KernelName,
                                bool JITCompilationIsRequired) {
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(\"" << KernelName << "\", "
-              << getSyclObjImpl(Context).get() << ", "
-              << getSyclObjImpl(Device).get() << ", "
-              << JITCompilationIsRequired << ")\n";
+              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
+              << ", " << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
     debugPrintBinaryImages();
@@ -1203,9 +1202,8 @@ RTDeviceBinaryImage &ProgramManager::getDeviceImage(
 
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(Custom SPV file "
-              << getSyclObjImpl(Context).get() << ", "
-              << getSyclObjImpl(Device).get() << ", "
-              << JITCompilationIsRequired << ")\n";
+              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
+              << ", " << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
     debugPrintBinaryImages();

From 840cd710d61b55ff1b7ae6f5624c2b5ee99d50c4 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 13:29:08 -0700
Subject: [PATCH 5/9] Reapplied clang-format on only changed lines

---
 sycl/include/sycl/accessor.hpp                 | 13 ++++++++-----
 sycl/include/sycl/accessor_image.hpp           | 18 ++++++++++++------
 sycl/include/sycl/buffer.hpp                   |  3 ++-
 sycl/include/sycl/context.hpp                  |  3 ++-
 sycl/include/sycl/detail/impl_utils.hpp        |  3 ++-
 sycl/include/sycl/device.hpp                   |  3 ++-
 sycl/include/sycl/event.hpp                    |  3 ++-
 .../sycl/ext/oneapi/bindless_images_memory.hpp |  2 +-
 .../sycl/ext/oneapi/experimental/graph.hpp     |  8 ++++----
 .../ext/oneapi/virtual_mem/physical_mem.hpp    |  2 +-
 .../sycl/ext/oneapi/weak_object_base.hpp       |  3 ++-
 sycl/include/sycl/image.hpp                    |  9 ++++++---
 sycl/include/sycl/kernel.hpp                   |  3 ++-
 sycl/include/sycl/kernel_bundle.hpp            | 12 ++++++++----
 sycl/include/sycl/platform.hpp                 |  3 ++-
 sycl/include/sycl/sampler.hpp                  |  3 ++-
 sycl/include/sycl/stream.hpp                   |  3 ++-
 .../detail/program_manager/program_manager.cpp | 14 ++++++++------
 18 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index 9862c69aadc09..951767cd30422 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -551,7 +551,7 @@ class __SYCL_EXPORT AccessorBaseHost {
   void *getMemoryObject() const;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -586,7 +586,8 @@ class __SYCL_EXPORT LocalAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -844,7 +845,8 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
   friend class sycl::ext::intel::esimd::detail::AccessorPrivateProxy;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2236,7 +2238,8 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -2654,7 +2657,7 @@ class __SYCL_EBO host_accessor
                  access::placeholder::false_t>{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject);
+  friend decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/accessor_image.hpp b/sycl/include/sycl/accessor_image.hpp
index e7ff92480c06d..420e3468d22ab 100644
--- a/sycl/include/sycl/accessor_image.hpp
+++ b/sycl/include/sycl/accessor_image.hpp
@@ -97,7 +97,8 @@ class __SYCL_EXPORT UnsampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -167,7 +168,8 @@ class __SYCL_EXPORT SampledImageAccessorBaseHost {
 
 protected:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -931,7 +933,8 @@ class __SYCL_EBO unsampled_image_accessor :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1067,7 +1070,8 @@ class __SYCL_EBO host_unsampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1210,7 +1214,8 @@ class __SYCL_EBO sampled_image_accessor :
   }
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1313,7 +1318,8 @@ class __SYCL_EBO host_sampled_image_accessor
       : base_class{Impl} {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp
index 290ec21d9e49b..752ac70878282 100644
--- a/sycl/include/sycl/buffer.hpp
+++ b/sycl/include/sycl/buffer.hpp
@@ -723,7 +723,8 @@ class buffer : public detail::buffer_plain,
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
   template <typename A, int dims, typename C, typename Enable>
   friend class buffer;
   template <typename DataT, int dims, access::mode mode, access::target target,
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
index 0d5b87859be96..5e387d5f94cc7 100644
--- a/sycl/include/sycl/context.hpp
+++ b/sycl/include/sycl/context.hpp
@@ -246,7 +246,8 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   friend auto get_native(const SyclT &Obj) -> backend_return_t<Backend, SyclT>;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp
index 5ed3d4dc8aad4..fc5a297e20476 100644
--- a/sycl/include/sycl/detail/impl_utils.hpp
+++ b/sycl/include/sycl/detail/impl_utils.hpp
@@ -27,7 +27,8 @@ namespace detail {
 // would trigger that error in MSVC:
 //   template <class T>
 //   friend decltype(T::impl) detail::getSyclObjImpl(const T &SyclObject);
-template <class Obj> const decltype(Obj::impl)& getSyclObjImpl(const Obj &SyclObject) {
+template <class Obj>
+const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject) {
   assert(SyclObject.impl && "every constructor should create an impl");
   return SyclObject.impl;
 }
diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index fb8716737349b..355eb227e8b69 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -344,7 +344,8 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
   pi_native_handle getNative() const;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp
index a67f1534f438f..ded2794c6c603 100644
--- a/sycl/include/sycl/event.hpp
+++ b/sycl/include/sycl/event.hpp
@@ -145,7 +145,8 @@ class __SYCL_EXPORT event : public detail::OwnerLessBase<event> {
   std::shared_ptr<detail::event_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
index 52548eb9c276c..cb8c44020ab21 100644
--- a/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
+++ b/sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp
@@ -92,7 +92,7 @@ class __SYCL_EXPORT image_mem {
   std::shared_ptr<detail::image_mem_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 
diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
index aeeb2a9775922..8b2b36f17401c 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
@@ -133,7 +133,7 @@ class __SYCL_EXPORT node {
   node(const std::shared_ptr<detail::node_impl> &Impl) : impl(Impl) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -342,7 +342,7 @@ class __SYCL_EXPORT modifiable_command_graph {
   void addGraphLeafDependencies(node Node);
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T sycl::detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -380,7 +380,7 @@ class __SYCL_EXPORT executable_command_graph {
                            const property_list &PropList = {});
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   /// Creates a backend representation of the graph in \p impl member variable.
@@ -442,7 +442,7 @@ class __SYCL_EXPORT dynamic_parameter_base {
   std::shared_ptr<dynamic_parameter_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 };
 } // namespace detail
diff --git a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
index ef7fe03d35493..d5152716495d1 100644
--- a/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
+++ b/sycl/include/sycl/ext/oneapi/virtual_mem/physical_mem.hpp
@@ -59,7 +59,7 @@ class __SYCL_EXPORT physical_mem
   std::shared_ptr<sycl::detail::physical_mem_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)&
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
diff --git a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
index 29f65fc3e88d5..0a037d31f5fe8 100644
--- a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
+++ b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
@@ -63,7 +63,8 @@ template <typename SYCLObjT> class weak_object_base {
 protected:
 #ifndef __SYCL_DEVICE_ONLY__
   // Store a weak variant of the impl in the SYCLObjT.
-  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
+  typename std::remove_reference<decltype(sycl::detail::getSyclObjImpl(
+      std::declval<SYCLObjT>()))>::type::weak_type MObjWeakPtr;
   // relies on <type_traits> from impl_utils.h
 
   static decltype(MObjWeakPtr) GetWeakImpl(const SYCLObjT &SYCLObj) {
diff --git a/sycl/include/sycl/image.hpp b/sycl/include/sycl/image.hpp
index 63c394c81ae61..3103231404f46 100644
--- a/sycl/include/sycl/image.hpp
+++ b/sycl/include/sycl/image.hpp
@@ -716,7 +716,8 @@ class image : public detail::unsampled_image_common<Dimensions, AllocatorT> {
              const context &TargetContext, event AvailableEvent);
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <typename DataT, int Dims, access::mode AccMode,
             access::target AccTarget, access::placeholder IsPlaceholder,
@@ -1002,7 +1003,8 @@ class unsampled_image
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -1137,7 +1139,8 @@ class sampled_image
 
 private:
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/kernel.hpp b/sycl/include/sycl/kernel.hpp
index f9ea6397c7ec8..241e94aad6bcc 100644
--- a/sycl/include/sycl/kernel.hpp
+++ b/sycl/include/sycl/kernel.hpp
@@ -180,7 +180,8 @@ class __SYCL_EXPORT kernel : public detail::OwnerLessBase<kernel> {
   std::shared_ptr<detail::kernel_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <backend BackendName, class SyclObjectT>
diff --git a/sycl/include/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp
index 50d9391303a69..e3d893f25742f 100644
--- a/sycl/include/sycl/kernel_bundle.hpp
+++ b/sycl/include/sycl/kernel_bundle.hpp
@@ -75,7 +75,8 @@ class __SYCL_EXPORT kernel_id : public detail::OwnerLessBase<kernel_id> {
   std::shared_ptr<detail::kernel_id_impl> impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -110,7 +111,8 @@ class __SYCL_EXPORT device_image_plain {
   detail::DeviceImageImplPtr impl;
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -141,7 +143,8 @@ class device_image : public detail::device_image_plain,
       : device_image_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
@@ -415,7 +418,8 @@ class kernel_bundle : public detail::kernel_bundle_plain,
       : kernel_bundle_plain(std::move(Impl)) {}
 
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp
index 687e16fda4878..05d606790cb5e 100644
--- a/sycl/include/sycl/platform.hpp
+++ b/sycl/include/sycl/platform.hpp
@@ -239,7 +239,8 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 
   template <backend BackendName, class SyclObjectT>
   friend auto get_native(const SyclObjectT &Obj)
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
index d863b87002f03..c4d02ae5b8c39 100644
--- a/sycl/include/sycl/sampler.hpp
+++ b/sycl/include/sycl/sampler.hpp
@@ -125,7 +125,8 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(sampler) sampler {
 #else
   std::shared_ptr<detail::sampler_impl> impl;
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
   template <typename DataT, int Dimensions, sycl::access::mode AccessMode,
             sycl::access::target AccessTarget,
diff --git a/sycl/include/sycl/stream.hpp b/sycl/include/sycl/stream.hpp
index 62072fe81c24c..05a26d9614e64 100644
--- a/sycl/include/sycl/stream.hpp
+++ b/sycl/include/sycl/stream.hpp
@@ -927,7 +927,8 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(stream) stream
 #else
   std::shared_ptr<detail::stream_impl> impl;
   template <class Obj>
-  friend const decltype(Obj::impl)& detail::getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &
+  detail::getSyclObjImpl(const Obj &SyclObject);
 #endif
 
   // NOTE: Some members are required for reconstructing the stream, but are not
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index 192d8a0876f05..d3d9544ca5873 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -177,8 +177,8 @@ ProgramManager::createPIProgram(const RTDeviceBinaryImage &Img,
                                 const context &Context, const device &Device) {
   if (DbgProgMgr > 0)
     std::cerr << ">>> ProgramManager::createPIProgram(" << &Img << ", "
-              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
-              << ")\n";
+              << getSyclObjImpl(Context).get() << ", "
+              << getSyclObjImpl(Device).get() << ")\n";
   const pi_device_binary_struct &RawImg = Img.getRawData();
 
   // perform minimal sanity checks on the device image and the descriptor
@@ -1152,8 +1152,9 @@ ProgramManager::getDeviceImage(const std::string &KernelName,
                                bool JITCompilationIsRequired) {
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(\"" << KernelName << "\", "
-              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
-              << ", " << JITCompilationIsRequired << ")\n";
+              << getSyclObjImpl(Context).get() << ", "
+              << getSyclObjImpl(Device).get() << ", "
+              << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
     debugPrintBinaryImages();
@@ -1202,8 +1203,9 @@ RTDeviceBinaryImage &ProgramManager::getDeviceImage(
 
   if (DbgProgMgr > 0) {
     std::cerr << ">>> ProgramManager::getDeviceImage(Custom SPV file "
-              << getSyclObjImpl(Context).get() << ", " << getSyclObjImpl(Device).get()
-              << ", " << JITCompilationIsRequired << ")\n";
+              << getSyclObjImpl(Context).get() << ", "
+              << getSyclObjImpl(Device).get() << ", "
+              << JITCompilationIsRequired << ")\n";
 
     std::cerr << "available device images:\n";
     debugPrintBinaryImages();

From 76c1920ba29c6b16a668ce8459710966f594c621 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 13:30:52 -0700
Subject: [PATCH 6/9] Accidentally left in debug prints

---
 sycl/source/queue.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp
index 71fc1f5d0d5c7..2375443e1c727 100644
--- a/sycl/source/queue.cpp
+++ b/sycl/source/queue.cpp
@@ -180,9 +180,7 @@ event queue::submit_impl(std::function<void(handler &)> CGH, queue SecondQueue,
 
 void queue::submit_without_event_impl(std::function<void(handler &)> CGH,
                                       const detail::code_location &CodeLoc) {
-  std::cerr << "submit_without_event_impl invoked" << std::endl;
   return impl->submit_without_event(CGH, impl, CodeLoc);
-  std::cerr << "submit_without_event_impl is fine" << std::endl;
 }
 
 event queue::submit_impl_and_postprocess(

From 67b1c9842b41c0b20ed84796b75313381222ece4 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 13:38:37 -0700
Subject: [PATCH 7/9] Forgot a const quantifier

---
 sycl/include/sycl/accessor.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index 951767cd30422..0b9e53ee83082 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -2657,7 +2657,7 @@ class __SYCL_EBO host_accessor
                  access::placeholder::false_t>{Impl} {}
 
   template <class Obj>
-  friend decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
+  friend const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObject);
 
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);

From fc9dae964ec37daa58f381d0e71f44c3aa4c7785 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 13:40:06 -0700
Subject: [PATCH 8/9] Undo inadverted whitespace changes

---
 sycl/include/sycl/queue.hpp       | 1 +
 sycl/source/detail/queue_impl.cpp | 3 +--
 sycl/source/detail/queue_impl.hpp | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp
index bc900c3cb923e..b69bbad682dcc 100644
--- a/sycl/include/sycl/queue.hpp
+++ b/sycl/include/sycl/queue.hpp
@@ -438,6 +438,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
     detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
     wait_proxy(CodeLoc);
   }
+
   /// Performs a blocking wait for the completion of all enqueued tasks in the
   /// queue.
   ///
diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp
index 7b54a62187684..ebfa91bc8a19c 100644
--- a/sycl/source/detail/queue_impl.cpp
+++ b/sycl/source/detail/queue_impl.cpp
@@ -384,9 +384,8 @@ event queue_impl::submit_impl(const std::function<void(handler &)> &CGF,
     finalizeHandler(Handler, Event);
 
     (*PostProcess)(IsKernel, KernelUsesAssert, Event);
-  } else {
+  } else
     finalizeHandler(Handler, Event);
-  }
 
   addEvent(Event);
 
diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp
index 6bd33dd239ebe..699cfdce5e6b2 100644
--- a/sycl/source/detail/queue_impl.hpp
+++ b/sycl/source/detail/queue_impl.hpp
@@ -436,7 +436,6 @@ class queue_impl {
                             const std::shared_ptr<queue_impl> &Self,
                             const detail::code_location &Loc,
                             const SubmitPostProcessF *PostProcess = nullptr) {
-
     submit_impl(CGF, Self, Self, nullptr, /*CallerNeedsEvent=*/false, Loc,
                 PostProcess);
   }

From 70075d378109842d9cee963f80759f9ada12cff9 Mon Sep 17 00:00:00 2001
From: "Li, Ian" <ian.li@intel.com>
Date: Tue, 16 Jul 2024 19:28:02 -0700
Subject: [PATCH 9/9] Amended change from #14460

---
 sycl/include/sycl/handler.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp
index 3654d735e39b9..c16a9395db358 100644
--- a/sycl/include/sycl/handler.hpp
+++ b/sycl/include/sycl/handler.hpp
@@ -3369,7 +3369,7 @@ class __SYCL_EXPORT handler {
   friend class ext::intel::experimental::pipe;
 
   template <class Obj>
-  friend decltype(Obj::impl)
+  friend const decltype(Obj::impl) &
   sycl::detail::getSyclObjImpl(const Obj &SyclObject);
 
   /// Read from a host pipe given a host address and