[SYCL][ABI-break] Remove legacy get member function from event (#6570)

SYCL 1.2.1 had a get member function on select classes for getting the
underlying OpenCL object. With SYCL 2020 those were removed and replaced
with a more general API. This commit removes the get member function
from the sycl::event class.

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/include/sycl/event.hpp

@@ -64,13 +64,6 @@ class __SYCL_EXPORT event {
 
   bool operator!=(const event &rhs) const;
 
-  /// Returns a valid OpenCL event interoperability handle.
-  ///
-  /// \return a valid instance of OpenCL cl_event.
-#ifdef __SYCL_INTERNAL_API
-  cl_event get() const;
-#endif
-
   /// Checks if this event is a SYCL host event.
   ///
   /// \return true if this event is a SYCL host event.

sycl/source/detail/event_impl.cpp

@@ -50,17 +50,7 @@ void event_impl::ensureContextInitialized() {
 bool event_impl::is_host() {
   // Treat all devices that don't support interoperability as host devices to
   // avoid attempts to call method get on such events.
-  return MHostEvent || !MOpenCLInterop;
-}
-
-cl_event event_impl::get() {
-  if (!MOpenCLInterop) {
-    throw invalid_object_error(
-        "This instance of event doesn't support OpenCL interoperability.",
-        PI_ERROR_INVALID_EVENT);
-  }
-  getPlugin().call<PiApiKind::piEventRetain>(MEvent);
-  return pi::cast<cl_event>(MEvent);
+  return MHostEvent;
 }
 
 event_impl::~event_impl() {
@@ -123,7 +113,6 @@ void event_impl::setStateIncomplete() { MState = HES_NotComplete; }
 
 void event_impl::setContextImpl(const ContextImplPtr &Context) {
   MHostEvent = Context->is_host();
-  MOpenCLInterop = !MHostEvent;
   MContext = Context;
   MIsContextInitialized = true;
 }
@@ -134,8 +123,8 @@ event_impl::event_impl(std::optional<HostEventState> State)
 
 event_impl::event_impl(RT::PiEvent Event, const context &SyclContext)
     : MIsContextInitialized(true), MEvent(Event),
-      MContext(detail::getSyclObjImpl(SyclContext)), MOpenCLInterop(true),
-      MHostEvent(false), MIsFlushed(true), MState(HES_Complete) {
+      MContext(detail::getSyclObjImpl(SyclContext)), MHostEvent(false),
+      MIsFlushed(true), MState(HES_Complete) {
 
   if (MContext->is_host()) {
     throw sycl::invalid_parameter_error(

sycl/source/detail/event_impl.hpp

@@ -66,11 +66,6 @@ class event_impl {
   /// \return true if this event is a SYCL host event.
   bool is_host();
 
-  /// Returns a valid OpenCL event interoperability handle.
-  ///
-  /// \return a valid instance of OpenCL cl_event.
-  cl_event get();
-
   /// Waits for the event.
   ///
   /// Self is needed in order to pass shared_ptr to Scheduler.
@@ -231,7 +226,6 @@ class event_impl {
   bool MIsContextInitialized = false;
   RT::PiEvent MEvent = nullptr;
   ContextImplPtr MContext;
-  bool MOpenCLInterop = false;
   bool MHostEvent = true;
   std::unique_ptr<HostProfilingInfo> MHostProfilingInfo;
   void *MCommand = nullptr;

sycl/source/event.cpp

@@ -37,8 +37,6 @@ bool event::operator==(const event &rhs) const { return rhs.impl == impl; }
 
 bool event::operator!=(const event &rhs) const { return !(*this == rhs); }
 
-cl_event event::get() const { return impl->get(); }
-
 bool event::is_host() const { return impl->is_host(); }
 
 void event::wait() { impl->wait(impl); }

sycl/test/abi/sycl_symbols_linux.dump

@@ -4054,7 +4054,6 @@ _ZNK4sycl3_V15event15getNativeVectorEv
 _ZNK4sycl3_V15event18get_profiling_infoINS0_4info15event_profiling11command_endEEENS0_6detail28is_event_profiling_info_descIT_E11return_typeEv
 _ZNK4sycl3_V15event18get_profiling_infoINS0_4info15event_profiling13command_startEEENS0_6detail28is_event_profiling_info_descIT_E11return_typeEv
 _ZNK4sycl3_V15event18get_profiling_infoINS0_4info15event_profiling14command_submitEEENS0_6detail28is_event_profiling_info_descIT_E11return_typeEv
-_ZNK4sycl3_V15event3getEv
 _ZNK4sycl3_V15event7is_hostEv
 _ZNK4sycl3_V15event8get_infoINS0_4info5event15reference_countEEENS0_6detail18is_event_info_descIT_E11return_typeEv
 _ZNK4sycl3_V15event8get_infoINS0_4info5event24command_execution_statusEEENS0_6detail18is_event_info_descIT_E11return_typeEv