From 71a144a62fc44b8f65157b3f109d115c08eb7bd9 Mon Sep 17 00:00:00 2001 From: aelovikov-intel Date: Fri, 12 Jul 2024 05:00:12 -0700 Subject: [PATCH] [SYCL] Remove `queue::discard_or_return` (#14550) Was marked for the removal during ABI Breaking window. There is `queue_impl::discard_or_return` already. --- sycl/include/sycl/queue.hpp | 5 ----- sycl/source/queue.cpp | 8 -------- sycl/test/abi/sycl_symbols_linux.dump | 1 - sycl/test/abi/sycl_symbols_windows.dump | 1 - 4 files changed, 15 deletions(-) diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index fb29961201d5d..b1b7d93bc6798 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -2728,11 +2728,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { #endif // __SYCL_USE_FALLBACK_ASSERT } - /// Checks if the event needs to be discarded and if so, discards it and - /// returns a discarded event. Otherwise, it returns input event. - /// TODO: move to impl class in the next ABI Breaking window - event discard_or_return(const event &Event); - // Function to postprocess submitted command // Arguments: // bool IsKernel - true if the submitted command was kernel, false otherwise diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp index 5b6c76630bbed..2375443e1c727 100644 --- a/sycl/source/queue.cpp +++ b/sycl/source/queue.cpp @@ -168,14 +168,6 @@ event queue::mem_advise(const void *Ptr, size_t Length, int Advice, /*CallerNeedsEvent=*/true); } -event queue::discard_or_return(const event &Event) { - if (!(impl->MDiscardEvents)) - return Event; - using detail::event_impl; - auto Impl = std::make_shared(event_impl::HES_Discarded); - return detail::createSyclObjFromImpl(Impl); -} - event queue::submit_impl(std::function CGH, const detail::code_location &CodeLoc) { return impl->submit(CGH, impl, CodeLoc); diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index db5026458f8ec..4b442721a1082 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3132,7 +3132,6 @@ _ZN4sycl3_V15queue10wait_proxyERKNS0_6detail13code_locationE _ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationE _ZN4sycl3_V15queue11submit_implESt8functionIFvRNS0_7handlerEEES1_RKNS0_6detail13code_locationE _ZN4sycl3_V15queue15ext_oneapi_prodEv -_ZN4sycl3_V15queue17discard_or_returnERKNS0_5eventE _ZN4sycl3_V15queue18throw_asynchronousEv _ZN4sycl3_V15queue20memcpyToDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE _ZN4sycl3_V15queue20wait_and_throw_proxyERKNS0_6detail13code_locationE diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 488600ab51189..d79c06baf7d8c 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -3767,7 +3767,6 @@ ?destroy_image_handle@experimental@oneapi@ext@_V1@sycl@@YAXAEAUunsampled_image_handle@12345@AEBVqueue@45@@Z ?device_has@queue@_V1@sycl@@AEBA_NW4aspect@23@@Z ?die@pi@detail@_V1@sycl@@YAXPEBD@Z -?discard_or_return@queue@_V1@sycl@@AEAA?AVevent@23@AEBV423@@Z ?empty@kernel_bundle_plain@detail@_V1@sycl@@QEBA_NXZ ?enable_ext_oneapi_default_context@detail@_V1@sycl@@YAX_N@Z ?end@HostProfilingInfo@detail@_V1@sycl@@QEAAXXZ