Skip to content

[SYCL] Handle zero-sized buffer in device accessor #2011

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
merged 1 commit into from
Jul 7, 2020
Merged

[SYCL] Handle zero-sized buffer in device accessor #2011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions sycl/include/CL/sycl/accessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@ class accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
checkDeviceAccessorBufferSize(BufferRef.get_count());
if (!IsPlaceH)
addHostAccessorAndWait(AccessorBaseHost::impl.get());
#endif
Expand All @@ -912,6 +913,7 @@ class accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
checkDeviceAccessorBufferSize(BufferRef.get_count());
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
}
#endif
Expand All @@ -935,6 +937,7 @@ class accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
checkDeviceAccessorBufferSize(BufferRef.get_count());
if (!IsPlaceH)
addHostAccessorAndWait(AccessorBaseHost::impl.get());
}
Expand Down Expand Up @@ -972,6 +975,7 @@ class accessor :
getAdjustedMode(PropertyList),
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
checkDeviceAccessorBufferSize(BufferRef.get_count());
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
}
#endif
Expand Down Expand Up @@ -1058,6 +1062,7 @@ class accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer) {
checkDeviceAccessorBufferSize(BufferRef.get_count());
if (!IsPlaceH)
addHostAccessorAndWait(AccessorBaseHost::impl.get());
}
Expand Down Expand Up @@ -1097,6 +1102,7 @@ class accessor :
detail::getSyclObjImpl(BufferRef).get(), Dimensions,
sizeof(DataT), BufferRef.OffsetInBytes,
BufferRef.IsSubBuffer) {
checkDeviceAccessorBufferSize(BufferRef.get_count());
detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
}
#endif
Expand Down Expand Up @@ -1219,6 +1225,15 @@ class accessor :

bool operator==(const accessor &Rhs) const { return impl == Rhs.impl; }
bool operator!=(const accessor &Rhs) const { return !(*this == Rhs); }

private:
void checkDeviceAccessorBufferSize(const size_t elemInBuffer) {
if (!IsHostBuf && elemInBuffer == 0)
throw cl::sycl::invalid_object_error(
"SYCL buffer size is zero. To create a device accessor, SYCL "
"buffer size must be greater than zero.",
PI_INVALID_VALUE);
}
};

#if __cplusplus > 201402L
Expand Down
29 changes: 29 additions & 0 deletions sycl/test/basic_tests/accessor/accessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,4 +540,33 @@ int main() {
return 1;
}
}

// Accessor with buffer size 0.
{
try {
int data[10] = {0};
{
sycl::buffer<int, 1> b{&data[0], 10};
sycl::buffer<int, 1> b1{0};

sycl::queue queue;
queue.submit([&](sycl::handler &cgh) {
sycl::accessor<int, 1, sycl::access::mode::read_write,
sycl::access::target::global_buffer>
B(b, cgh);
auto B1 = b1.template get_access<sycl::access::mode::read_write>(cgh);

cgh.single_task<class acc_with_zero_sized_buffer>([=]() {
B[0] = 1;
});
});
}
assert(!"invalid device accessor buffer size exception wasn't caught");
} catch (const sycl::invalid_object_error &e) {
assert(e.get_cl_code() == CL_INVALID_VALUE);
} catch (sycl::exception e) {
std::cout << "SYCL exception caught: " << e.what();
return 1;
}
}
}