diff --git a/sycl/include/CL/sycl/handler.hpp b/sycl/include/CL/sycl/handler.hpp index ac8e50450da90..87ce1101a4d45 100644 --- a/sycl/include/CL/sycl/handler.hpp +++ b/sycl/include/CL/sycl/handler.hpp @@ -1268,18 +1268,6 @@ class __SYCL_EXPORT handler { setType(detail::CG::RunOnHostIntel); } - template - __SYCL2020_DEPRECATED( - "codeplay_host_task() is deprecated, use host_task() instead") - detail::enable_if_t< - detail::check_fn_signature, - void()>::value || - detail::check_fn_signature< - detail::remove_reference_t, - void(interop_handle)>::value> codeplay_host_task(FuncT Func) { - host_task_impl(Func); - } - /// Enqueues a command to the SYCL runtime to invoke \p Func once. template detail::enable_if_t< diff --git a/sycl/include/CL/sycl/queue.hpp b/sycl/include/CL/sycl/queue.hpp index d50840e8f345e..0615f52433682 100644 --- a/sycl/include/CL/sycl/queue.hpp +++ b/sycl/include/CL/sycl/queue.hpp @@ -1151,7 +1151,7 @@ event submitAssertCapture(queue &Self, event &Event, queue *SecondaryQueue, auto Acc = Buffer.get_access(CGH); - CGH.codeplay_host_task([=] { + CGH.host_task([=] { const detail::AssertHappened *AH = &Acc[0]; // Don't use assert here as msvc will insert reference to __imp__wassert diff --git a/sycl/source/detail/scheduler/scheduler_helpers.cpp b/sycl/source/detail/scheduler/scheduler_helpers.cpp index c86ddaa789003..141fddd0dac2c 100644 --- a/sycl/source/detail/scheduler/scheduler_helpers.cpp +++ b/sycl/source/detail/scheduler/scheduler_helpers.cpp @@ -43,7 +43,7 @@ void initStream(StreamImplPtr Stream, QueueImplPtr Queue) { StrBufs->FlushBuf.get_access( cgh, range<1>(FlushBufSize), id<1>(0)); - cgh.codeplay_host_task([=] { + cgh.host_task([=] { char *FlushBufPtr = FlushBufAcc.get_pointer(); std::memset(FlushBufPtr, 0, FlushBufAcc.get_size()); }); diff --git a/sycl/source/detail/stream_impl.cpp b/sycl/source/detail/stream_impl.cpp index 0da23fd7e2d7a..0ac2dd192a56e 100644 --- a/sycl/source/detail/stream_impl.cpp +++ b/sycl/source/detail/stream_impl.cpp @@ -85,7 +85,7 @@ void stream_impl::flush() { ->second->FlushBuf .get_access( cgh); - cgh.codeplay_host_task([=] { + cgh.host_task([=] { printf("%s", BufHostAcc.get_pointer()); fflush(stdout); }); diff --git a/sycl/unittests/pi/cuda/test_interop_get_native.cpp b/sycl/unittests/pi/cuda/test_interop_get_native.cpp index 5d6efb63636cb..60ec75a421292 100644 --- a/sycl/unittests/pi/cuda/test_interop_get_native.cpp +++ b/sycl/unittests/pi/cuda/test_interop_get_native.cpp @@ -88,7 +88,7 @@ TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeMem) { buffer syclBuffer(range<1>{1}); syclQueue_->submit([&](handler &cgh) { auto syclAccessor = syclBuffer.get_access(cgh); - cgh.codeplay_host_task([=](interop_handle ih) { + cgh.host_task([=](interop_handle ih) { CUdeviceptr cudaPtr = ih.get_native_mem(syclAccessor); CUdeviceptr cudaPtrBase; size_t cudaPtrSize = 0; @@ -106,7 +106,7 @@ TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeMem) { TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeQueue) { CUstream cudaStream = get_native(*syclQueue_); syclQueue_->submit([&](handler &cgh) { - cgh.codeplay_host_task([=](interop_handle ih) { + cgh.host_task([=](interop_handle ih) { CUstream cudaInteropStream = ih.get_native_queue(); ASSERT_EQ(cudaInteropStream, cudaStream); }); @@ -116,7 +116,7 @@ TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeQueue) { TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeContext) { CUcontext cudaContext = get_native(syclQueue_->get_context()); syclQueue_->submit([&](handler &cgh) { - cgh.codeplay_host_task([=](interop_handle ih) { + cgh.host_task([=](interop_handle ih) { CUcontext cudaInteropContext = ih.get_native_context(); ASSERT_EQ(cudaInteropContext, cudaContext); }); diff --git a/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp b/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp index 5fb7589605e4a..25742a3501795 100644 --- a/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp +++ b/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp @@ -106,7 +106,7 @@ TEST_F(SchedulerTest, InOrderQueueHostTaskDeps) { InOrderQueue .submit([&](sycl::handler &CGH) { CGH.use_kernel_bundle(ExecBundle); - CGH.codeplay_host_task([=] {}); + CGH.host_task([=] {}); }) .wait();