[ABI-Break][SYCL] ABI-neutralize filter_selector constructor (#13213)

Signed-off-by: Byoungro So <[email protected]>

Author: bso-intel

sycl/include/sycl/ext/oneapi/filter_selector.hpp

@@ -23,6 +23,11 @@ inline namespace _V1 {
 // Forward declarations
 class device;
 class device_selector;
+#ifdef __SYCL_INTERNAL_API
+namespace ONEAPI {
+class filter_selector;
+}
+#endif // __SYCL_INTERNAL_API
 
 namespace ext::oneapi {
 namespace detail {
@@ -31,13 +36,18 @@ class filter_selector_impl;
 
 class __SYCL_EXPORT filter_selector : public device_selector {
 public:
-  filter_selector(const std::string &filter);
+  filter_selector(const std::string &filter)
+      : filter_selector(sycl::detail::string_view{filter}) {}
   int operator()(const device &dev) const override;
   void reset() const;
   device select_device() const override;
+#ifdef __SYCL_INTERNAL_API
+  friend class sycl::ONEAPI::filter_selector;
+#endif
 
 private:
   std::shared_ptr<detail::filter_selector_impl> impl;
+  filter_selector(sycl::detail::string_view filter);
 };
 } // namespace ext::oneapi
 
@@ -46,10 +56,14 @@ namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
 using namespace ext::oneapi;
 class __SYCL_EXPORT filter_selector : public ext::oneapi::filter_selector {
 public:
-  filter_selector(const std::string &filter);
+  filter_selector(const std::string &filter)
+      : filter_selector(sycl::detail::string_view{filter}) {}
   int operator()(const device &dev) const override;
   void reset() const;
   device select_device() const override;
+
+private:
+  filter_selector(sycl::detail::string_view filter);
 };
 } // namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead")ONEAPI
 #endif // __SYCL_INTERNAL_API

sycl/source/device_selector.cpp

@@ -283,8 +283,8 @@ int accelerator_selector::operator()(const device &dev) const {
 
 namespace ext::oneapi {
 
-filter_selector::filter_selector(const std::string &Input)
-    : impl(std::make_shared<detail::filter_selector_impl>(Input)) {}
+filter_selector::filter_selector(sycl::detail::string_view Input)
+    : impl(std::make_shared<detail::filter_selector_impl>(Input.data())) {}
 
 int filter_selector::operator()(const device &Dev) const {
   return impl->operator()(Dev);
@@ -316,7 +316,7 @@ device filter_selector::select_device() const {
 
 namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
 using namespace ext::oneapi;
-filter_selector::filter_selector(const std::string &Input)
+filter_selector::filter_selector(sycl::detail::string_view Input)
     : ext::oneapi::filter_selector(Input) {}
 
 int filter_selector::operator()(const device &Dev) const {

sycl/test/abi/sycl_abi_neutrality_test.cpp

@@ -21,10 +21,6 @@
 // CHECK:_ZN4sycl3_V13ext6oneapi12experimental6detail17build_from_sourceERNS0_13kernel_bundleILNS0_12bundle_stateE3EEERKSt6vectorINS0_6deviceESaISA_EERKS9_INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISK_EEPSK_SO_
 // CHECK:_ZN4sycl3_V13ext6oneapi12experimental6detail30make_kernel_bundle_from_sourceERKNS0_7contextENS3_15source_languageERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorISt4pairISE_SE_ESaISJ_EE
 // CHECK:_ZN4sycl3_V13ext6oneapi12experimental6detail30make_kernel_bundle_from_sourceERKNS0_7contextENS3_15source_languageERKSt6vectorISt4byteSaISA_EES9_ISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESL_ESaISM_EE
-// CHECK:_ZN4sycl3_V13ext6oneapi15filter_selectorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
-// CHECK:_ZN4sycl3_V13ext6oneapi15filter_selectorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
-// CHECK:_ZN4sycl3_V16ONEAPI15filter_selectorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
-// CHECK:_ZN4sycl3_V16ONEAPI15filter_selectorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 // CHECK:_ZN4sycl3_V16detail19kernel_bundle_plain21ext_oneapi_get_kernelERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 // CHECK:_ZN4sycl3_V16detail19kernel_bundle_plain21ext_oneapi_has_kernelERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 // CHECK:_ZN4sycl3_V16detail6OSUtil10getDirNameB5cxx11EPKc

sycl/test/abi/sycl_symbols_linux.dump

@@ -3104,8 +3104,8 @@ _ZN4sycl3_V13ext6oneapi12experimental9image_memC1ERKNS3_16image_descriptorERKNS0
 _ZN4sycl3_V13ext6oneapi12experimental9image_memC1ERKNS3_16image_descriptorERKNS0_6deviceERKNS0_7contextE
 _ZN4sycl3_V13ext6oneapi12experimental9image_memC2ERKNS3_16image_descriptorERKNS0_5queueE
 _ZN4sycl3_V13ext6oneapi12experimental9image_memC2ERKNS3_16image_descriptorERKNS0_6deviceERKNS0_7contextE
-_ZN4sycl3_V13ext6oneapi15filter_selectorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
-_ZN4sycl3_V13ext6oneapi15filter_selectorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
+_ZN4sycl3_V13ext6oneapi15filter_selectorC1ENS0_6detail11string_viewE
+_ZN4sycl3_V13ext6oneapi15filter_selectorC2ENS0_6detail11string_viewE
 _ZN4sycl3_V13ext8codeplay12experimental14fusion_wrapper12start_fusionEv
 _ZN4sycl3_V13ext8codeplay12experimental14fusion_wrapper13cancel_fusionEv
 _ZN4sycl3_V13ext8codeplay12experimental14fusion_wrapper15complete_fusionERKNS0_13property_listE
@@ -3160,8 +3160,8 @@ _ZN4sycl3_V15queueC2ERKNS0_7contextERKNS0_15device_selectorERKNS0_13property_lis
 _ZN4sycl3_V15queueC2ERKNS0_7contextERKNS0_15device_selectorERKSt8functionIFvNS0_14exception_listEEERKNS0_13property_listE
 _ZN4sycl3_V15queueC2ERKNS0_7contextERKNS0_6deviceERKNS0_13property_listE
 _ZN4sycl3_V15queueC2ERKNS0_7contextERKNS0_6deviceERKSt8functionIFvNS0_14exception_listEEERKNS0_13property_listE
-_ZN4sycl3_V16ONEAPI15filter_selectorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
-_ZN4sycl3_V16ONEAPI15filter_selectorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
+_ZN4sycl3_V16ONEAPI15filter_selectorC1ENS0_6detail11string_viewE
+_ZN4sycl3_V16ONEAPI15filter_selectorC2ENS0_6detail11string_viewE
 _ZN4sycl3_V16detail10build_implERKNS0_13kernel_bundleILNS0_12bundle_stateE0EEERKSt6vectorINS0_6deviceESaIS8_EERKNS0_13property_listE
 _ZN4sycl3_V16detail10frexp_implENS1_9half_impl4halfEPi
 _ZN4sycl3_V16detail10frexp_implEdPi

sycl/test/abi/sycl_symbols_windows.dump

@@ -361,9 +361,11 @@
 ??0executable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@IEAA@AEBV?$shared_ptr@Vgraph_impl@detail@experimental@oneapi@ext@_V1@sycl@@@std@@AEBVcontext@56@AEBVproperty_list@56@@Z
 ??0executable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@$$QEAV0123456@@Z
 ??0executable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@AEBV0123456@@Z
+??0filter_selector@ONEAPI@_V1@sycl@@AEAA@Vstring_view@detail@23@@Z
 ??0filter_selector@ONEAPI@_V1@sycl@@QEAA@$$QEAV0123@@Z
 ??0filter_selector@ONEAPI@_V1@sycl@@QEAA@AEBV0123@@Z
 ??0filter_selector@ONEAPI@_V1@sycl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
+??0filter_selector@oneapi@ext@_V1@sycl@@AEAA@Vstring_view@detail@34@@Z
 ??0filter_selector@oneapi@ext@_V1@sycl@@QEAA@$$QEAV01234@@Z
 ??0filter_selector@oneapi@ext@_V1@sycl@@QEAA@AEBV01234@@Z
 ??0filter_selector@oneapi@ext@_V1@sycl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z