Unify getOrMakeSubDeviceImpl with getOrMakeDeviceImpl

Author: ldorau

sycl/source/detail/device_impl.cpp

@@ -163,12 +163,13 @@ std::vector<device> device_impl::create_sub_devices(
   // times with the same arguments?
   //
   std::vector<device> res;
-  std::for_each(SubDevices.begin(), SubDevices.end(),
-                [&res, this](const ur_device_handle_t &a_ur_device) {
-                  device sycl_device = detail::createSyclObjFromImpl<device>(
-                      MPlatform.getOrMakeSubDeviceImpl(a_ur_device));
-                  res.push_back(sycl_device);
-                });
+  std::for_each(
+      SubDevices.begin(), SubDevices.end(),
+      [&res, this](const ur_device_handle_t &a_ur_device) {
+        device sycl_device = detail::createSyclObjFromImpl<device>(
+            MPlatform.getOrMakeDeviceImpl(a_ur_device, true /*IsSubDevice*/));
+        res.push_back(sycl_device);
+      });
   return res;
 }
 

sycl/source/detail/device_impl.hpp

@@ -429,8 +429,7 @@ class device_impl : public std::enable_shared_from_this<device_impl> {
   /// Constructs a SYCL device instance using the provided
   /// UR device instance.
   //
-  // Must be called through `platform_impl::getOrMakeDeviceImpl` or
-  // `platform_impl::getOrMakeSubDeviceImpl` only.
+  // Must be called through `platform_impl::getOrMakeDeviceImpl` only.
   // `private_tag` ensures that is true.
   explicit device_impl(ur_device_handle_t Device, platform_impl &Platform,
                        private_tag, bool IsSubDevice);

sycl/source/detail/platform_impl.cpp

@@ -298,29 +298,16 @@ device_impl *platform_impl::getDeviceImpl(ur_device_handle_t UrDevice) {
   return getDeviceImplHelper(UrDevice);
 }
 
-device_impl &platform_impl::getOrMakeDeviceImpl(ur_device_handle_t UrDevice) {
+device_impl &platform_impl::getOrMakeDeviceImpl(ur_device_handle_t UrDevice,
+                                                bool IsSubDevice = false) {
   const std::lock_guard<std::mutex> Guard(MDeviceMapMutex);
   // If we've already seen this device, return the impl
   if (device_impl *Result = getDeviceImplHelper(UrDevice))
     return *Result;
 
   // Otherwise make the impl
   MDevices.emplace_back(std::make_shared<device_impl>(
-      UrDevice, *this, device_impl::private_tag{}, false /*IsSubDevice*/));
-
-  return *MDevices.back();
-}
-
-device_impl &
-platform_impl::getOrMakeSubDeviceImpl(ur_device_handle_t UrSubDevice) {
-  const std::lock_guard<std::mutex> Guard(MDeviceMapMutex);
-  // If we've already seen this device, return the impl
-  if (device_impl *Result = getDeviceImplHelper(UrSubDevice))
-    return *Result;
-
-  // Otherwise make the impl
-  MDevices.emplace_back(std::make_shared<device_impl>(
-      UrSubDevice, *this, device_impl::private_tag{}, true /*IsSubDevice*/));
+      UrDevice, *this, device_impl::private_tag{}, IsSubDevice));
 
   return *MDevices.back();
 }

sycl/source/detail/platform_impl.hpp

@@ -172,17 +172,6 @@ class platform_impl : public std::enable_shared_from_this<platform_impl> {
   /// \return a device_impl* corresponding to the device
   device_impl &getOrMakeDeviceImpl(ur_device_handle_t UrDevice);
 
-  /// Queries the device_impl cache to either return a shared_ptr
-  /// for the device_impl corresponding to the UrSubDevice or add
-  /// a new entry to the cache
-  ///
-  /// \param UrSubDevice is the UrSubDevice whose impl is requested
-  ///
-  /// \param PlatormImpl is the Platform for that Device
-  ///
-  /// \return a device_impl* corresponding to the subdevice
-  device_impl &getOrMakeSubDeviceImpl(ur_device_handle_t UrSubDevice);
-
   /// Queries the cache to see if the specified UR platform has been seen
   /// before.  If so, return the cached platform_impl, otherwise create a new
   /// one and cache it.