[SYCL] Make sycl::platform use raw platform_impl * for its impl

Similar to intel#20821.

Author: aelovikov-intel

sycl/gdb/libsycl.so-gdb.py

@@ -375,7 +375,7 @@ class SYCLDevice(SYCLValue):
     """Provides information about a sycl::device from a gdb.Value."""
 
     IMPL_OFFSET_TO_PLATFORM = 0x8
-    PLATFORM_OFFSET_TO_BACKEND = 0x20
+    PLATFORM_OFFSET_TO_BACKEND = 0x10
 
     def __init__(self, gdb_value):
         super().__init__(gdb_value)

sycl/include/sycl/platform.hpp

@@ -207,8 +207,8 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
 private:
   ur_native_handle_t getNative() const;
 
-  std::shared_ptr<detail::platform_impl> impl;
-  platform(std::shared_ptr<detail::platform_impl> impl) : impl(impl) {}
+  detail::platform_impl *impl = nullptr;
+  platform(detail::platform_impl &impl) : impl(&impl) {}
 
   platform(const device &Device);
 

sycl/source/detail/global_handler.cpp

@@ -179,8 +179,8 @@ Sync &GlobalHandler::getSync() {
   return sync;
 }
 
-std::vector<std::shared_ptr<platform_impl>> &GlobalHandler::getPlatformCache() {
-  static std::vector<std::shared_ptr<platform_impl>> &PlatformCache =
+std::vector<std::unique_ptr<platform_impl>> &GlobalHandler::getPlatformCache() {
+  static std::vector<std::unique_ptr<platform_impl>> &PlatformCache =
       getOrCreate(MPlatformCache);
   return PlatformCache;
 }

sycl/source/detail/global_handler.hpp

@@ -63,7 +63,7 @@ class GlobalHandler {
   bool isSchedulerAlive() const;
   ProgramManager &getProgramManager();
   Sync &getSync();
-  std::vector<std::shared_ptr<platform_impl>> &getPlatformCache();
+  std::vector<std::unique_ptr<platform_impl>> &getPlatformCache();
 
   std::unordered_map<platform_impl *, std::shared_ptr<context_impl>> &
   getPlatformToDefaultContextCache();
@@ -118,7 +118,7 @@ class GlobalHandler {
   InstWithLock<Scheduler> MScheduler;
   InstWithLock<ProgramManager> MProgramManager;
   InstWithLock<Sync> MSync;
-  InstWithLock<std::vector<std::shared_ptr<platform_impl>>> MPlatformCache;
+  InstWithLock<std::vector<std::unique_ptr<platform_impl>>> MPlatformCache;
   InstWithLock<
       std::unordered_map<platform_impl *, std::shared_ptr<context_impl>>>
       MPlatformToDefaultContextCache;

sycl/source/detail/platform_impl.cpp

@@ -47,31 +47,26 @@ platform_impl::~platform_impl() = default;
 platform_impl &
 platform_impl::getOrMakePlatformImpl(ur_platform_handle_t UrPlatform,
                                      adapter_impl &Adapter) {
-  std::shared_ptr<platform_impl> Result;
-  {
-    const std::lock_guard<std::mutex> Guard(
-        GlobalHandler::instance().getPlatformMapMutex());
-
-    std::vector<std::shared_ptr<platform_impl>> &PlatformCache =
-        GlobalHandler::instance().getPlatformCache();
-
-    // If we've already seen this platform, return the impl
-    for (const auto &PlatImpl : PlatformCache) {
-      if (PlatImpl->getHandleRef() == UrPlatform)
-        return *PlatImpl;
-    }
+  const std::lock_guard<std::mutex> Guard(
+      GlobalHandler::instance().getPlatformMapMutex());
+
+  std::vector<std::unique_ptr<platform_impl>> &PlatformCache =
+      GlobalHandler::instance().getPlatformCache();
 
-    // Otherwise make the impl. Our ctor/dtor are private, so std::make_shared
-    // needs a bit of help...
-    struct creator : platform_impl {
-      creator(ur_platform_handle_t APlatform, adapter_impl &AAdapter)
-          : platform_impl(APlatform, AAdapter) {}
-    };
-    Result = std::make_shared<creator>(UrPlatform, Adapter);
-    PlatformCache.emplace_back(Result);
+  // If we've already seen this platform, return the impl
+  for (const auto &PlatImpl : PlatformCache) {
+    if (PlatImpl->getHandleRef() == UrPlatform)
+      return *PlatImpl;
   }
 
-  return *Result;
+  // Otherwise make the impl. Our ctor/dtor are private, so std::make_unique
+  // needs a bit of help...
+  struct creator : platform_impl {
+    creator(ur_platform_handle_t APlatform, adapter_impl &AAdapter)
+        : platform_impl(APlatform, AAdapter) {}
+  };
+  return *PlatformCache.emplace_back(
+      std::make_unique<creator>(UrPlatform, Adapter));
 }
 
 platform_impl &

sycl/source/detail/platform_impl.hpp

@@ -29,9 +29,7 @@ enum class aspect;
 namespace detail {
 class device_impl;
 
-// TODO: implement extension management for host device
-// TODO: implement parameters treatment for host device
-class platform_impl : public std::enable_shared_from_this<platform_impl> {
+class platform_impl {
   /// Constructs platform_impl from a UR platform handle.
   ///
   /// \param APlatform is a raw plug-in platform handle.
@@ -41,9 +39,9 @@ class platform_impl : public std::enable_shared_from_this<platform_impl> {
   // `platform_impl::getOrMakePlatformImpl` method.
   explicit platform_impl(ur_platform_handle_t APlatform, adapter_impl &Adapter);
 
+public:
   ~platform_impl();
 
-public:
   /// Checks if this platform supports extension.
   ///
   /// \param ExtensionName is a string containing extension name.

sycl/source/platform.cpp

@@ -31,8 +31,7 @@ platform::platform(cl_platform_id PlatformId) {
   Adapter.call<detail::UrApiKind::urPlatformCreateWithNativeHandle>(
       detail::ur::cast<ur_native_handle_t>(PlatformId), Adapter.getUrAdapter(),
       /* pProperties = */ nullptr, &UrPlatform);
-  impl = detail::platform_impl::getOrMakePlatformImpl(UrPlatform, Adapter)
-             .shared_from_this();
+  impl = &detail::platform_impl::getOrMakePlatformImpl(UrPlatform, Adapter);
 }
 
 // protected constructor for internal use

sycl/test/abi/symbol_size_alignment.cpp

@@ -60,7 +60,7 @@ int main() {
   check<image<1>, 16, 8>();
   check<kernel, 16, 8>();
   check<detail::nd_range_view, 32, 8>();
-  check<platform, 16, 8>();
+  check<platform, 8, 8>();
 #ifdef __SYCL_DEVICE_ONLY__
   check<private_memory<int, 1>, 4, 4>();
   check<detail::sampler_impl, 8, 8>();

sycl/test/gdb/printers.cpp

@@ -67,7 +67,7 @@ sycl::item<2, false> item_wo_offset =
 // CHECK:       120 |     void * MUserPtr
 
 // CHECK:         0 | class sycl::detail::platform_impl
-// CHECK:        32 |   backend MBackend
+// CHECK:        16 |   backend MBackend
 
 // CHECK:         0 | class sycl::detail::device_impl
 // CHECK:         8 |   platform_impl & MPlatform

sycl/unittests/Extensions/CommandGraph/InOrderQueue.cpp

@@ -642,7 +642,6 @@ TEST_F(CommandGraphTest, InOrderQueueEventlessWithDependency) {
     return UR_RESULT_SUCCESS;
   };
 
-  sycl::unittest::UrMock<> Mock;
   mock::getCallbacks().set_before_callback("urEnqueueCommandBufferExp",
                                            beforeUrEnqueueCommandBufferExp);