Skip to content

[SYCL] Fix SYCL accessor.get_count() and accessor.get_size() methods. #696

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
Nov 11, 2019
Merged

[SYCL] Fix SYCL accessor.get_count() and accessor.get_size() methods. #696

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
12 changes: 6 additions & 6 deletions sycl/include/CL/sycl/accessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,11 +748,11 @@ class accessor :
(IsPlaceH && (IsGlobalBuf || IsConstantBuf)))>* = nullptr>
accessor(buffer<DataT, 1, AllocatorT> &BufferRef)
#ifdef __SYCL_DEVICE_ONLY__
: impl(id<AdjustedDim>(), BufferRef.get_range(), BufferRef.get_range()) {
: impl(id<AdjustedDim>(), range<1>{1}, BufferRef.get_range()) {
#else
: AccessorBaseHost(
/*Offset=*/{0, 0, 0},
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
detail::convertToArrayOfN<3, 1>(range<1>{1}),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()), AccessMode,
detail::getSyclObjImpl(BufferRef).get(), AdjustedDim, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
Expand All @@ -771,12 +771,12 @@ class accessor :
(!IsPlaceH && (IsGlobalBuf || IsConstantBuf)),
handler> &CommandGroupHandler)
#ifdef __SYCL_DEVICE_ONLY__
: impl(id<AdjustedDim>(), BufferRef.get_range(), BufferRef.get_range()) {
: impl(id<AdjustedDim>(), range<1>{1}, BufferRef.get_range()) {
}
#else
: AccessorBaseHost(
/*Offset=*/{0, 0, 0},
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()),
detail::convertToArrayOfN<3, 1>(range<1>{1}),
detail::convertToArrayOfN<3, 1>(BufferRef.get_range()), AccessMode,
detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
Expand Down Expand Up @@ -875,9 +875,9 @@ class accessor :

constexpr bool is_placeholder() const { return IsPlaceH; }

size_t get_size() const { return getMemoryRange().size() * sizeof(DataT); }
size_t get_size() const { return getAccessRange().size() * sizeof(DataT); }

size_t get_count() const { return getMemoryRange().size(); }
size_t get_count() const { return getAccessRange().size(); }

template <int Dims = Dimensions, typename = detail::enable_if_t<(Dims > 0)>>
range<Dimensions> get_range() const {
Expand Down
33 changes: 33 additions & 0 deletions sycl/test/basic_tests/buffer/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,39 @@ int main() {
b(data, cl::sycl::range<1>(8), buf_alloc);
}

{
constexpr int Size = 6;
cl::sycl::buffer<char, 1> Buf_1(Size);
cl::sycl::buffer<char, 1> Buf_2(Size / 2);

auto AccA = Buf_1.get_access<cl::sycl::access::mode::read_write>(Size / 2);
auto AccB = Buf_2.get_access<cl::sycl::access::mode::read_write>(Size / 2);
assert(AccA.get_size() == AccB.get_size());
assert(AccA.get_range() == AccB.get_range());
assert(AccA.get_count() == AccB.get_count());

auto AH0 = accessor<char, 0, access::mode::read_write,
access::target::host_buffer>(Buf_1);
auto BH0 = accessor<char, 0, access::mode::read_write,
access::target::host_buffer>(Buf_2);
assert(AH0.get_size() == sizeof(char));
assert(BH0.get_size() == sizeof(char));
assert(AH0.get_count() == 1);
assert(BH0.get_count() == 1);

queue Queue;
Queue.submit([&](handler &CGH) {
auto AK0 = accessor<char, 0, access::mode::read_write,
access::target::global_buffer>(Buf_1, CGH);
auto BK0 = accessor<char, 0, access::mode::read_write,
access::target::global_buffer>(Buf_2, CGH);
assert(AK0.get_size() == sizeof(char));
assert(BK0.get_size() == sizeof(char));
assert(AK0.get_count() == 1);
assert(BK0.get_count() == 1);
});
}

// TODO tests with mutex property
return failed;
}