[SYCL] Support sycl::opencl::has_extension compiled with pre-C++11 ABI

Author: aelovikov-intel

sycl/include/sycl/backend/opencl.hpp

@@ -19,10 +19,21 @@
 namespace sycl {
 inline namespace _V1 {
 namespace opencl {
+namespace detail {
+using namespace sycl::detail;
 __SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
-                                 const std::string &Extension);
+                                 detail::string_view Extension);
 __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
-                                 const std::string &Extension);
+                                 detail::string_view Extension);
+} // namespace detail
+inline bool has_extension(const sycl::platform &SyclPlatform,
+                          const std::string &Extension) {
+  return detail::has_extension(SyclPlatform, detail::string_view{Extension});
+}
+inline bool has_extension(const sycl::device &SyclDevice,
+                          const std::string &Extension) {
+  return detail::has_extension(SyclDevice, detail::string_view{Extension});
+}
 } // namespace opencl
 } // namespace _V1
 } // namespace sycl

sycl/source/backend/opencl.cpp

@@ -17,12 +17,15 @@
 namespace sycl {
 inline namespace _V1 {
 namespace opencl {
-using namespace detail;
 
 //----------------------------------------------------------------------------
 // Free functions to query OpenCL backend extensions
+
+namespace detail {
+using namespace sycl::detail;
+
 __SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
-                                 const std::string &Extension) {
+                                 detail::string_view Extension) {
   if (SyclPlatform.get_backend() != sycl::backend::opencl) {
     throw sycl::exception(
         errc::backend_mismatch,
@@ -50,11 +53,12 @@ __SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
       nullptr);
 
   std::string_view ExtensionsString(Result.get());
-  return ExtensionsString.find(Extension) != std::string::npos;
+  return ExtensionsString.find(std::string_view{Extension.data()}) !=
+         std::string::npos;
 }
 
 __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
-                                 const std::string &Extension) {
+                                 detail::string_view Extension) {
   if (SyclDevice.get_backend() != sycl::backend::opencl) {
     throw sycl::exception(
         errc::backend_mismatch,
@@ -82,8 +86,21 @@ __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
                                             ResultSize, Result.get(), nullptr);
 
   std::string_view ExtensionsString(Result.get());
-  return ExtensionsString.find(Extension) != std::string::npos;
+  return ExtensionsString.find(std::string_view{Extension.data()}) !=
+         std::string::npos;
+}
+} // namespace detail
+
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+__SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
+                                 const std::string &Extension) {
+  return detail::has_extension(SyclDevice, detail::string_view{Extension});
+}
+__SYCL_EXPORT bool has_extension(const sycl::platform &SyclPlatform,
+                                 const std::string &Extension) {
+  return detail::has_extension(SyclPlatform, detail::string_view{Extension});
 }
+#endif
 } // namespace opencl
 } // namespace _V1
 } // namespace sycl

sycl/test/abi/sycl_symbols_linux.dump

@@ -3451,6 +3451,8 @@ _ZN4sycl3_V16native13__divide_implENS0_3vecIfLi8EEES3_
 _ZN4sycl3_V16native13__divide_implEff
 _ZN4sycl3_V16opencl13has_extensionERKNS0_6deviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 _ZN4sycl3_V16opencl13has_extensionERKNS0_8platformERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
+_ZN4sycl3_V16opencl6detail13has_extensionERKNS0_6deviceENS0_6detail11string_viewE
+_ZN4sycl3_V16opencl6detail13has_extensionERKNS0_8platformENS0_6detail11string_viewE
 _ZN4sycl3_V16streamC1EmmRNS0_7handlerE
 _ZN4sycl3_V16streamC1EmmRNS0_7handlerERKNS0_13property_listE
 _ZN4sycl3_V16streamC2EmmRNS0_7handlerE