diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp index 5b7bfb5e90fae..7f38c9266a37e 100644 --- a/sycl/source/detail/queue_impl.cpp +++ b/sycl/source/detail/queue_impl.cpp @@ -435,13 +435,6 @@ EventImplPtr queue_impl::submit_kernel_scheduler_bypass( } bool DiscardEvent = !EventNeeded && supportsDiscardingPiEvents(); - if (DiscardEvent) { - // Kernel only uses assert if it's non interop one - bool KernelUsesAssert = - !(KernelImplPtr && KernelImplPtr->isInterop()) && KData.usesAssert(); - DiscardEvent = !KernelUsesAssert; - } - std::shared_ptr ResultEvent = DiscardEvent ? nullptr : detail::event_impl::create_device_event(*this); diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index 498a3cee61728..7914cc1ca2f2c 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -3346,16 +3346,6 @@ ur_result_t ExecCGCommand::enqueueImpQueue() { const std::shared_ptr &SyclKernel = ExecKernel->MSyclKernel; KernelNameStrRefT KernelName = ExecKernel->MDeviceKernelInfo.Name; - - if (!EventImpl) { - // Kernel only uses assert if it's non interop one - bool KernelUsesAssert = (!SyclKernel || SyclKernel->hasSYCLMetadata()) && - ExecKernel->MDeviceKernelInfo.usesAssert(); - if (KernelUsesAssert) { - EventImpl = MEvent.get(); - } - } - const RTDeviceBinaryImage *BinImage = nullptr; if (detail::SYCLConfig::get()) { BinImage = retrieveKernelBinary(*MQueue, KernelName);