[SYCL][NFC] Add urGetInfoString helper (#18292)

Author: aelovikov-intel

sycl/source/backend/opencl.cpp

@@ -32,27 +32,9 @@ __SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
         "has_extension can only be used with an OpenCL backend");
   }
 
-  std::shared_ptr<sycl::detail::platform_impl> PlatformImpl =
-      getSyclObjImpl(SyclPlatform);
-  ur_platform_handle_t AdapterPlatform = PlatformImpl->getHandleRef();
-  const AdapterPtr &Adapter = PlatformImpl->getAdapter();
+  std::string ExtensionsString = urGetInfoString<UrApiKind::urPlatformGetInfo>(
+      *getSyclObjImpl(SyclPlatform), UR_PLATFORM_INFO_EXTENSIONS);
 
-  // Manual invocation of UR API to avoid using deprecated
-  // info::platform::extensions call.
-  size_t ResultSize = 0;
-  Adapter->call<UrApiKind::urPlatformGetInfo>(
-      AdapterPlatform, UR_PLATFORM_INFO_EXTENSIONS,
-      /*propSize=*/0,
-      /*pPropValue=*/nullptr, &ResultSize);
-  if (ResultSize == 0)
-    return false;
-
-  std::unique_ptr<char[]> Result(new char[ResultSize]);
-  Adapter->call<UrApiKind::urPlatformGetInfo>(
-      AdapterPlatform, UR_PLATFORM_INFO_EXTENSIONS, ResultSize, Result.get(),
-      nullptr);
-
-  std::string_view ExtensionsString(Result.get());
   return ExtensionsString.find(std::string_view{Extension.data()}) !=
          std::string::npos;
 }
@@ -65,26 +47,9 @@ __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
         "has_extension can only be used with an OpenCL backend");
   }
 
-  detail::device_impl &DeviceImpl = *getSyclObjImpl(SyclDevice);
-  ur_device_handle_t AdapterDevice = DeviceImpl.getHandleRef();
-  const AdapterPtr &Adapter = DeviceImpl.getAdapter();
-
-  // Manual invocation of UR API to avoid using deprecated
-  // info::device::extensions call.
-  size_t ResultSize = 0;
-  Adapter->call<UrApiKind::urDeviceGetInfo>(
-      AdapterDevice, UR_DEVICE_INFO_EXTENSIONS,
-      /*propSize=*/0,
-      /*pPropValue=*/nullptr, &ResultSize);
-  if (ResultSize == 0)
-    return false;
-
-  std::unique_ptr<char[]> Result(new char[ResultSize]);
-  Adapter->call<UrApiKind::urDeviceGetInfo>(AdapterDevice,
-                                            UR_DEVICE_INFO_EXTENSIONS,
-                                            ResultSize, Result.get(), nullptr);
+  std::string ExtensionsString = urGetInfoString<UrApiKind::urDeviceGetInfo>(
+      *getSyclObjImpl(SyclDevice), UR_DEVICE_INFO_EXTENSIONS);
 
-  std::string_view ExtensionsString(Result.get());
   return ExtensionsString.find(std::string_view{Extension.data()}) !=
          std::string::npos;
 }

sycl/source/detail/device_image_impl.hpp

@@ -19,6 +19,7 @@
 #include <detail/mem_alloc_helper.hpp>
 #include <detail/persistent_device_code_cache.hpp>
 #include <detail/program_manager/program_manager.hpp>
+#include <detail/split_string.hpp>
 #include <sycl/context.hpp>
 #include <sycl/detail/common.hpp>
 #include <sycl/detail/ur.hpp>

sycl/source/detail/device_info.hpp

@@ -199,22 +199,7 @@ template <typename Param> struct get_device_info_impl<platform, Param> {
 // for string return type in other specializations.
 inline std::string
 device_impl::get_device_info_string(ur_device_info_t InfoCode) const {
-  size_t resultSize = 0;
-  getAdapter()->call<UrApiKind::urDeviceGetInfo>(getHandleRef(), InfoCode, 0,
-                                                 nullptr, &resultSize);
-  if (resultSize == 0) {
-    return std::string();
-  }
-  std::string result;
-  // C++23's `resize_and_overwrite` would be better...
-  //
-  // UR counts null terminator in the size, std::string doesn't. Adjust by "-1"
-  // for that.
-  result.resize(resultSize - 1);
-  getAdapter()->call<UrApiKind::urDeviceGetInfo>(
-      getHandleRef(), InfoCode, resultSize, result.data(), nullptr);
-
-  return result;
+  return urGetInfoString<UrApiKind::urDeviceGetInfo>(*this, InfoCode);
 }
 
 // Specialization for string return type, variable return size
@@ -737,17 +722,10 @@ struct get_device_info_impl<
         }
         return ext::oneapi::experimental::architecture::unknown;
       };
-      size_t ResultSize = 0;
-      Dev.getAdapter()->call<UrApiKind::urDeviceGetInfo>(
-          Dev.getHandleRef(), UrInfoCode<info::device::version>::value, 0,
-          nullptr, &ResultSize);
-      std::unique_ptr<char[]> DeviceArch(new char[ResultSize]);
-      Dev.getAdapter()->call<UrApiKind::urDeviceGetInfo>(
-          Dev.getHandleRef(), UrInfoCode<info::device::version>::value,
-          ResultSize, DeviceArch.get(), nullptr);
-      std::string DeviceArchCopy(DeviceArch.get());
-      std::string DeviceArchSubstr =
-          DeviceArchCopy.substr(0, DeviceArchCopy.find(":"));
+      std::string DeviceArch = urGetInfoString<UrApiKind::urDeviceGetInfo>(
+          Dev, UrInfoCode<info::device::version>::value);
+      std::string_view DeviceArchSubstr =
+          std::string_view{DeviceArch}.substr(0, DeviceArch.find(":"));
       return MapArchIDToArchName(DeviceArchSubstr.data());
     } else if (Dev.is_cpu() && backend::opencl == CurrentBackend) {
       return LookupIPVersion(IntelCPUArchitectures)

sycl/source/detail/platform_impl.cpp

@@ -11,7 +11,7 @@
 #include <detail/device_impl.hpp>
 #include <detail/global_handler.hpp>
 #include <detail/platform_impl.hpp>
-#include <detail/platform_info.hpp>
+#include <detail/split_string.hpp>
 #include <detail/ur_info_code.hpp>
 #include <sycl/backend_types.hpp>
 #include <sycl/detail/iostream_proxy.hpp>
@@ -547,9 +547,9 @@ platform_impl::get_devices(info::device_type DeviceType) const {
 }
 
 bool platform_impl::has_extension(const std::string &ExtensionName) const {
-  std::string AllExtensionNames = get_platform_info_string_impl(
-      MPlatform, getAdapter(),
-      detail::UrInfoCode<info::platform::extensions>::value);
+
+  std::string AllExtensionNames = urGetInfoString<UrApiKind::urPlatformGetInfo>(
+      *this, detail::UrInfoCode<info::platform::extensions>::value);
   return (AllExtensionNames.find(ExtensionName) != std::string::npos);
 }
 
@@ -567,7 +567,13 @@ ur_native_handle_t platform_impl::getNative() const {
 
 template <typename Param>
 typename Param::return_type platform_impl::get_info() const {
-  return get_platform_info<Param>(this->getHandleRef(), getAdapter());
+  std::string InfoStr = urGetInfoString<UrApiKind::urPlatformGetInfo>(
+      *this, detail::UrInfoCode<Param>::value);
+  if constexpr (std::is_same_v<Param, info::platform::extensions>) {
+    return split_string(InfoStr, ' ');
+  } else {
+    return InfoStr;
+  }
 }
 
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES

sycl/source/detail/platform_impl.hpp

@@ -9,7 +9,6 @@
 #pragma once
 
 #include <detail/adapter.hpp>
-#include <detail/platform_info.hpp>
 #include <detail/ur.hpp>
 #include <detail/ur_info_code.hpp>
 #include <sycl/backend_types.hpp>

sycl/source/detail/platform_info.hpp

@@ -17,6 +17,7 @@
 #include <ur_api.h>
 
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace sycl {
@@ -40,6 +41,30 @@ template <backend BE> const AdapterPtr &getAdapter();
 // Convert from UR backend to SYCL backend enum
 backend convertUrBackend(ur_platform_backend_t UrBackend);
 
+template <auto ApiKind, typename SyclImplTy, typename DescTy>
+std::string urGetInfoString(SyclImplTy &SyclImpl, DescTy Desc) {
+  // Avoid explicit type to keep template-type-dependent.
+  auto &Adapter = SyclImpl.getAdapter();
+  size_t ResultSize = 0;
+  auto Handle = SyclImpl.getHandleRef();
+  Adapter->template call<ApiKind>(Handle, Desc,
+                                  /*propSize=*/0,
+                                  /*pPropValue=*/nullptr, &ResultSize);
+  if (ResultSize == 0)
+    return std::string{};
+
+  std::string Result;
+  // C++23's `resize_and_overwrite` would be better...
+  //
+  // UR counts null terminator in the size, std::string doesn't. Adjust by "-1"
+  // for that.
+  Result.resize(ResultSize - 1);
+  Adapter->template call<ApiKind>(Handle, Desc, ResultSize, Result.data(),
+                                  nullptr);
+
+  return Result;
+}
+
 } // namespace detail
 } // namespace _V1
 } // namespace sycl

sycl/source/detail/ur.hpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <detail/context_impl.hpp>
+#include <detail/split_string.hpp>
 #include <gtest/gtest.h>
 #include <helpers/UrMock.hpp>
 #include <sycl/sycl.hpp>