Skip to content

[SYCL] Remove handler::codeplay_host_task #4426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romanovvlad merged 5 commits into from
Sep 9, 2021
Merged

[SYCL] Remove handler::codeplay_host_task #4426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7baf62d
Removed codeplay_host_task from tests
maximdimakov Aug 30, 2021
048dfb1
Removed codeplay_host_task
maximdimakov Aug 30, 2021
ad55c29
Merge branch 'depr_codeplay_test' into depr_codeplay_host_task
maximdimakov Sep 2, 2021
d59565a
Merge remote-tracking branch 'origin/sycl' into depr_codeplay_host_task
maximdimakov Sep 6, 2021
e7d8648
Removed codeplay_host_task from queue.hpp
maximdimakov Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions sycl/include/CL/sycl/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,18 +1268,6 @@ class __SYCL_EXPORT handler {
setType(detail::CG::RunOnHostIntel);
}

template <typename FuncT>
__SYCL2020_DEPRECATED(
"codeplay_host_task() is deprecated, use host_task() instead")
detail::enable_if_t<
detail::check_fn_signature<detail::remove_reference_t<FuncT>,
void()>::value ||
detail::check_fn_signature<
detail::remove_reference_t<FuncT>,
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 <typename FuncT>
detail::enable_if_t<
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl/queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ event submitAssertCapture(queue &Self, event &Event, queue *SecondaryQueue,

auto Acc = Buffer.get_access<mode::read, target::host_buffer>(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
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/scheduler/scheduler_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void initStream(StreamImplPtr Stream, QueueImplPtr Queue) {
StrBufs->FlushBuf.get_access<access::mode::discard_write,
access::target::host_buffer>(
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());
});
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/stream_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void stream_impl::flush() {
->second->FlushBuf
.get_access<access::mode::read_write, access::target::host_buffer>(
cgh);
cgh.codeplay_host_task([=] {
cgh.host_task([=] {
printf("%s", BufHostAcc.get_pointer());
fflush(stdout);
});
Expand Down
6 changes: 3 additions & 3 deletions sycl/unittests/pi/cuda/test_interop_get_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeMem) {
buffer<int, 1> syclBuffer(range<1>{1});
syclQueue_->submit([&](handler &cgh) {
auto syclAccessor = syclBuffer.get_access<access::mode::read>(cgh);
cgh.codeplay_host_task([=](interop_handle ih) {
cgh.host_task([=](interop_handle ih) {
CUdeviceptr cudaPtr = ih.get_native_mem<backend::cuda>(syclAccessor);
CUdeviceptr cudaPtrBase;
size_t cudaPtrSize = 0;
Expand All @@ -106,7 +106,7 @@ TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeMem) {
TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeQueue) {
CUstream cudaStream = get_native<backend::cuda>(*syclQueue_);
syclQueue_->submit([&](handler &cgh) {
cgh.codeplay_host_task([=](interop_handle ih) {
cgh.host_task([=](interop_handle ih) {
CUstream cudaInteropStream = ih.get_native_queue<backend::cuda>();
ASSERT_EQ(cudaInteropStream, cudaStream);
});
Expand All @@ -116,7 +116,7 @@ TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeQueue) {
TEST_P(CudaInteropGetNativeTests, hostTaskGetNativeContext) {
CUcontext cudaContext = get_native<backend::cuda>(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<backend::cuda>();
ASSERT_EQ(cudaInteropContext, cudaContext);
});
Expand Down
2 changes: 1 addition & 1 deletion sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down