Set platform pointer during first allocation

Signed-off-by: Steffen Larsen <[email protected]>

Author: steffenlarsen

sycl/include/CL/sycl/detail/resource_pool.hpp

@@ -178,12 +178,6 @@ class __SYCL_EXPORT ResourcePool {
     assert(MAllocCount == 0 && "Not all resources have returned to the pool.");
   }
 
-  /// Sets the platform of the resource pool.
-  void setPlatform(const std::shared_ptr<platform_impl> &Platform) {
-    assert(MPlatform == nullptr && "Platform of pool has already been set.");
-    MPlatform = Platform;
-  }
-
   /// Returns true if the resource pool is enabled and false otherwise.
   ///
   /// \return a boolean value specifying whether the pool is enabled.

sycl/source/detail/context_impl.cpp

@@ -30,7 +30,6 @@ context_impl::context_impl(const device &Device, async_handler AsyncHandler,
     : MAsyncHandler(AsyncHandler), MDevices(1, Device), MContext(nullptr),
       MPlatform(), MPropList(PropList), MHostContext(Device.is_host()) {
   MKernelProgramCache.setContextPtr(this);
-  MAuxiliaryResourcePool.setPlatform(MPlatform);
 }
 
 context_impl::context_impl(const std::vector<cl::sycl::device> Devices,
@@ -62,7 +61,6 @@ context_impl::context_impl(const std::vector<cl::sycl::device> Devices,
   }
 
   MKernelProgramCache.setContextPtr(this);
-  MAuxiliaryResourcePool.setPlatform(MPlatform);
 }
 
 context_impl::context_impl(RT::PiContext PiContext, async_handler AsyncHandler,
@@ -101,7 +99,6 @@ context_impl::context_impl(RT::PiContext PiContext, async_handler AsyncHandler,
     getPlugin().call<PiApiKind::piContextRetain>(MContext);
   }
   MKernelProgramCache.setContextPtr(this);
-  MAuxiliaryResourcePool.setPlatform(MPlatform);
 }
 
 cl_context context_impl::get() const {

sycl/source/detail/resource_pool.cpp

@@ -40,11 +40,14 @@ ResourcePool::FreeEntry ResourcePool::getOrAllocateEntry(
     const size_t Size, const std::shared_ptr<context_impl> &ContextImplPtr,
     void *DataPtr, bool *IsNewEntry) {
   assert(Size && "Size must be greater than 0");
-  assert(ContextImplPtr->getPlatformImpl() == MPlatform &&
-         "Context platform does not match the resource pool platform.");
+
   {
     std::lock_guard<std::mutex> Lock{MMutex};
 
+    // Store platform to allow future freeing.
+    if (!MPlatform)
+      MPlatform = ContextImplPtr->getPlatformImpl();
+
     // Find the free entry with the smallest suitable size.
     auto FoundFreeEntry = MFreeEntries.upper_bound(Size - 1);
 

sycl/test/abi/sycl_symbols_windows.dump

@@ -3951,7 +3951,6 @@
 ?setPitches@?$image_impl@$00@detail@sycl@cl@@AEAAXXZ
 ?setPitches@?$image_impl@$01@detail@sycl@cl@@AEAAXXZ
 ?setPitches@?$image_impl@$02@detail@sycl@cl@@AEAAXXZ
-?setPlatform@ResourcePool@detail@sycl@cl@@QEAAXAEBV?$shared_ptr@Vplatform_impl@detail@sycl@cl@@@std@@@Z
 ?setStateExplicitKernelBundle@handler@sycl@cl@@AEAAXXZ
 ?setStateSpecConstSet@handler@sycl@cl@@AEAAXXZ
 ?setType@handler@sycl@cl@@AEAAXW4CGTYPE@CG@detail@23@@Z