[SYCL][ABI-break] Cleanup ABI entries (#20846)

Remove unused ABI entries and implement couple of TODOs:
* Renamed `getOrInsertHandlerKernelBundlePtr` to
`getOrInsertHandlerKernelBundle`
* Employed inline namespace for `SubmissionInfo`

Co-authored-by: Steffen Larsen <steffen.larsen@intel.com>

Author: againull

sycl/include/sycl/backend.hpp

@@ -272,18 +272,10 @@ __SYCL_EXPORT event make_event(ur_native_handle_t NativeHandle,
 __SYCL_EXPORT event make_event(ur_native_handle_t NativeHandle,
                                const context &TargetContext, bool KeepOwnership,
                                backend Backend);
-// TODO: Unused. Remove when allowed.
-__SYCL_EXPORT kernel make_kernel(ur_native_handle_t NativeHandle,
-                                 const context &TargetContext, backend Backend);
 __SYCL_EXPORT kernel make_kernel(
     const context &TargetContext,
     const kernel_bundle<bundle_state::executable> &KernelBundle,
     ur_native_handle_t NativeKernelHandle, bool KeepOwnership, backend Backend);
-// TODO: Unused. Remove when allowed.
-__SYCL_EXPORT std::shared_ptr<detail::kernel_bundle_impl>
-make_kernel_bundle(ur_native_handle_t NativeHandle,
-                   const context &TargetContext, bundle_state State,
-                   backend Backend);
 __SYCL_EXPORT std::shared_ptr<detail::kernel_bundle_impl>
 make_kernel_bundle(ur_native_handle_t NativeHandle,
                    const context &TargetContext, bool KeepOwnership,
@@ -403,8 +395,10 @@ make_kernel(const typename backend_traits<Backend>::template input_type<kernel>
                 &BackendObject,
             const context &TargetContext) {
   return detail::make_kernel(
-      detail::ur::cast<ur_native_handle_t>(BackendObject), TargetContext,
-      Backend);
+      TargetContext,
+      detail::get_empty_interop_kernel_bundle<bundle_state::executable>(
+          TargetContext),
+      detail::ur::cast<ur_native_handle_t>(BackendObject), false, Backend);
 }
 
 template <backend Backend, bundle_state State>

sycl/include/sycl/detail/ur.hpp

@@ -102,10 +102,6 @@ __SYCL_EXPORT void contextSetExtendedDeleter(const sycl::context &constext,
                                              void *user_data);
 }
 
-// TODO: To be removed as this was only introduced for esimd which was removed.
-template <sycl::backend BE>
-__SYCL_EXPORT void *getPluginOpaqueData(void *opaquedata_arg);
-
 namespace ur {
 // Function to load a shared library
 // Implementation is OS dependent

sycl/include/sycl/ext/oneapi/bfloat16.hpp

@@ -21,12 +21,6 @@ namespace ext::oneapi {
 
 class bfloat16 {
 public:
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  using Bfloat16StorageT
-      __SYCL_DEPRECATED("bfloat16::Bfloat16StorageT is non-standard and has "
-                        "been deprecated.") = uint16_t;
-#endif
-
   bfloat16() = default;
   ~bfloat16() = default;
   constexpr bfloat16(const bfloat16 &) = default;

sycl/include/sycl/handler.hpp

@@ -777,7 +777,7 @@ class __SYCL_EXPORT handler {
     // If the kernel lambda is callable with a kernel_handler argument, manifest
     // the associated kernel handler.
     if constexpr (IsCallableWithKernelHandler) {
-      getOrInsertHandlerKernelBundlePtr(/*Insert=*/true);
+      getOrInsertHandlerKernelBundle(/*Insert=*/true);
     }
   }
 
@@ -1237,11 +1237,7 @@ class __SYCL_EXPORT handler {
   void setStateSpecConstSet();
   bool isStateExplicitKernelBundle() const;
 
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
-  // Rename to just getOrInsertHandlerKernelBundle
-#endif
-  detail::kernel_bundle_impl *
-  getOrInsertHandlerKernelBundlePtr(bool Insert) const;
+  detail::kernel_bundle_impl *getOrInsertHandlerKernelBundle(bool Insert) const;
 
   void setHandlerKernelBundle(kernel Kernel);
 

sycl/include/sycl/kernel_bundle.hpp

@@ -115,13 +115,8 @@ class __SYCL_EXPORT device_image_plain {
 
   bool has_kernel(const kernel_id &KernelID, const device &Dev) const noexcept;
 
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  ur_native_handle_t getNative() const;
-#endif
 protected:
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
   ur_native_handle_t getNative() const;
-#endif
 
   std::shared_ptr<device_image_impl> impl;
 

sycl/include/sycl/queue.hpp

@@ -98,7 +98,7 @@ void __SYCL_EXPORT submit_graph_direct_without_event_impl(
 namespace detail {
 class queue_impl;
 
-namespace v1 {
+inline namespace _V1 {
 
 // This class is a part of the ABI, so it's moved to a separate namespace to
 // simplify changes.
@@ -110,9 +110,6 @@ namespace v1 {
 //   overloaded with a new variant using v(N+1) namespace,
 // * old namespace vN should be moved under #ifndef
 //   __INTEL_PREVIEW_BREAKING_CHANGES guard.
-// TODO: inline namespace can be employed here after SubmissionInfo removed from
-// the enclosing scope.
-
 class __SYCL_EXPORT SubmissionInfo {
 public:
   SubmissionInfo() {}
@@ -123,14 +120,11 @@ class __SYCL_EXPORT SubmissionInfo {
   }
 
 private:
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  std::shared_ptr<detail::queue_impl> MSecondaryQueue = nullptr;
-#endif
   ext::oneapi::experimental::event_mode_enum MEventMode =
       ext::oneapi::experimental::event_mode_enum::none;
 };
 
-} // namespace v1
+} // namespace _V1
 
 template <detail::WrapAs WrapAs, typename LambdaArgType,
           typename KernelName = detail::auto_name, bool EventNeeded = false,
@@ -513,13 +507,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   typename detail::is_backend_info_desc<Param>::return_type
   get_backend_info() const;
 
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-private:
-  // A shorthand for `get_device().has()' which is expected to be a bit quicker
-  // than the long version
-  bool device_has(aspect Aspect) const;
-#endif
-
 public:
   /// Submits a command group function object to the queue, in order to be
   /// scheduled for execution on the device.
@@ -3719,23 +3706,14 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   bool khr_empty() const;
 #endif
 
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  // TODO: to be made private in the next ABI-breaking window
-  __SYCL_DEPRECATED(
-      "This is a non-standard method, use sycl::get_native instead")
-  ur_native_handle_t getNative(int32_t &NativeHandleDesc) const;
-#endif
-
   std::optional<event> ext_oneapi_get_last_event() const {
     return static_cast<std::optional<event>>(ext_oneapi_get_last_event_impl());
   }
 
   void ext_oneapi_set_external_event(const event &external_event);
 
 private:
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
   ur_native_handle_t getNative(int32_t &NativeHandleDesc) const;
-#endif
 
   std::shared_ptr<detail::queue_impl> impl;
   queue(std::shared_ptr<detail::queue_impl> impl) : impl(impl) {}
@@ -3760,7 +3738,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
 
   template <typename PropertiesT>
   void ProcessSubmitProperties(PropertiesT Props,
-                               detail::v1::SubmissionInfo &SI) const {
+                               detail::SubmissionInfo &SI) const {
     if constexpr (Props.template has_property<
                       ext::oneapi::experimental::event_mode_key>()) {
       ext::oneapi::experimental::event_mode EventModeProp =
@@ -3773,13 +3751,13 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
 
   /// A template-free version of submit as const member function.
   event submit_with_event_impl(const detail::type_erased_cgfo_ty &CGH,
-                               const detail::v1::SubmissionInfo &SubmitInfo,
+                               const detail::SubmissionInfo &SubmitInfo,
                                const detail::code_location &CodeLoc,
                                bool IsTopCodeLoc) const;
 
   /// A template-free version of submit_without_event as const member function.
   void submit_without_event_impl(const detail::type_erased_cgfo_ty &CGH,
-                                 const detail::v1::SubmissionInfo &SubmitInfo,
+                                 const detail::SubmissionInfo &SubmitInfo,
                                  const detail::code_location &CodeLoc,
                                  bool IsTopCodeLoc) const;
 
@@ -3797,7 +3775,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
                           const detail::code_location &CodeLoc =
                               detail::code_location::current()) const {
     detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
-    detail::v1::SubmissionInfo SI{};
+    detail::SubmissionInfo SI{};
     ProcessSubmitProperties(Props, SI);
     return submit_with_event_impl(CGF, SI, TlsCodeLocCapture.query(),
                                   TlsCodeLocCapture.isToplevel());
@@ -3815,7 +3793,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
                             const detail::type_erased_cgfo_ty &CGF,
                             const detail::code_location &CodeLoc) const {
     detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
-    detail::v1::SubmissionInfo SI{};
+    detail::SubmissionInfo SI{};
     ProcessSubmitProperties(Props, SI);
     submit_without_event_impl(CGF, SI, TlsCodeLocCapture.query(),
                               TlsCodeLocCapture.isToplevel());

sycl/include/sycl/usm/usm_pointer_info.hpp

@@ -7,8 +7,10 @@
 // ===--------------------------------------------------------------------=== //
 #pragma once
 
-#include <sycl/detail/export.hpp> // for __SYCL_EXPORT
-#include <sycl/usm/usm_enums.hpp> // for alloc
+#include <sycl/context.hpp>
+#include <sycl/detail/export.hpp>
+#include <sycl/detail/impl_utils.hpp>
+#include <sycl/usm/usm_enums.hpp>
 
 namespace sycl {
 inline namespace _V1 {
@@ -26,13 +28,9 @@ __SYCL_EXPORT usm::alloc get_pointer_type(const void *ptr, context_impl &ctxt);
 ///
 /// \param ptr is the USM pointer to query
 /// \param ctxt is the sycl context the ptr was allocated in
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
 inline usm::alloc get_pointer_type(const void *ptr, const context &ctxt) {
-  return get_pointer_type(ptr, *getSyclObjImpl(ctxt));
+  return get_pointer_type(ptr, *detail::getSyclObjImpl(ctxt));
 }
-#else
-__SYCL_EXPORT usm::alloc get_pointer_type(const void *ptr, const context &ctxt);
-#endif
 
 /// Queries the device against which the pointer was allocated
 /// Throws an exception with errc::invalid error code if ptr is a host

sycl/source/backend.cpp

@@ -309,14 +309,6 @@ make_kernel_bundle(ur_native_handle_t NativeHandle,
                                     std::move(UrProgram), ImageOriginInterop)});
 }
 
-// TODO: Unused. Remove when allowed.
-std::shared_ptr<detail::kernel_bundle_impl>
-make_kernel_bundle(ur_native_handle_t NativeHandle,
-                   const context &TargetContext, bundle_state State,
-                   backend Backend) {
-  return make_kernel_bundle(NativeHandle, TargetContext, false, State, Backend);
-}
-
 kernel make_kernel(const context &TargetContext,
                    const kernel_bundle<bundle_state::executable> &KernelBundle,
                    ur_native_handle_t NativeHandle, bool KeepOwnership,
@@ -363,14 +355,6 @@ kernel make_kernel(const context &TargetContext,
       std::move(UrKernel), ContextImpl, &KernelBundleImpl));
 }
 
-kernel make_kernel(ur_native_handle_t NativeHandle,
-                   const context &TargetContext, backend Backend) {
-  return make_kernel(
-      TargetContext,
-      get_empty_interop_kernel_bundle<bundle_state::executable>(TargetContext),
-      NativeHandle, false, Backend);
-}
-
 } // namespace detail
 } // namespace _V1
 } // namespace sycl

sycl/source/backend/opencl.cpp

@@ -54,29 +54,6 @@ __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
          std::string::npos;
 }
 } // namespace detail
-
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-// Magic combination found by trial and error:
-__SYCL_EXPORT
-#if _WIN32
-inline
-#endif
-    bool
-    has_extension(const sycl::device &SyclDevice,
-                  const std::string &Extension) {
-  return detail::has_extension(SyclDevice, detail::string_view{Extension});
-}
-// Magic combination found by trial and error:
-__SYCL_EXPORT
-#if _WIN32
-inline
-#endif
-    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/source/detail/global_handler.hpp

@@ -11,9 +11,6 @@
 #include <sycl/detail/spinlock.hpp>
 #include <sycl/detail/util.hpp>
 
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-#include <deque>
-#endif
 #include <memory>
 #include <unordered_map>
 
@@ -29,10 +26,6 @@ class adapter_impl;
 class ods_target_list;
 class XPTIRegistry;
 class ThreadPool;
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-struct KernelNameBasedCacheT;
-class DeviceKernelInfo;
-#endif
 
 /// Wrapper class for global data structures with non-trivial destructors.
 ///
@@ -130,9 +123,6 @@ class GlobalHandler {
   InstWithLock<XPTIRegistry> MXPTIRegistry;
   // Thread pool for host task and event callbacks execution
   InstWithLock<ThreadPool> MHostTaskThreadPool;
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  InstWithLock<std::deque<DeviceKernelInfo>> MDeviceKernelInfoStorage;
-#endif
 
   static GlobalHandler *RTGlobalObjHandler;
 };