Skip to content

[SYCL] Allow for local/image accessor to accept property_list #3129

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 16 commits into from
Feb 3, 2021
Merged

[SYCL] Allow for local/image accessor to accept property_list #3129

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1c56b1c
[SYCL] Fix set_final_data(..) for vector<bool>
maximdimakov Jan 26, 2021
a988a0b
[SYCL] Clang-format fix
maximdimakov Jan 26, 2021
02dbc6f
[SYCL] Adress review comments
maximdimakov Jan 26, 2021
a353a66
[SYCL] Clang-format fix
maximdimakov Jan 26, 2021
6d5d798
[SYCL] More correct usage of unique_ptr
maximdimakov Jan 26, 2021
ccc2627
[SYCL] Added <memory> lib
maximdimakov Jan 26, 2021
2efc552
Merge branch 'sycl' into fix-set_final_data
maximdimakov Jan 27, 2021
f2a2195
[SYCL] Use unique_ptr constructor instead of make_unique
maximdimakov Jan 27, 2021
d841469
[SYCL] Replace iterator_traits with iterators
maximdimakov Jan 28, 2021
ed736cd
Merge branch 'sycl' into fix-local/image_accessor_constructors
maximdimakov Feb 1, 2021
d19afcd
[SYCL] Fix - added constructors with prop list for local/image accessors
maximdimakov Feb 1, 2021
b38acb0
[SYCL] Clang-format fix
maximdimakov Feb 1, 2021
c25cc74
[SYCL] Clang-format fix
maximdimakov Feb 1, 2021
afa89eb
[SYCL] Clang-format fix
maximdimakov Feb 2, 2021
2451bc7
[SYCL] Clang-format fix
maximdimakov Feb 2, 2021
4f449ba
[SYCL] Syntax error fix
maximdimakov Feb 2, 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
63 changes: 63 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 @@ -1856,6 +1856,18 @@ class accessor<DataT, Dimensions, AccessMode, access::target::local,
}
#endif

template <int Dims = Dimensions, typename = detail::enable_if_t<Dims == 0>>
accessor(handler &, const property_list &propList)
#ifdef __SYCL_DEVICE_ONLY__
: impl(range<AdjustedDim>{1}) {
(void)propList;
}
#else
: LocalAccessorBaseHost(range<3>{1, 1, 1}, AdjustedDim, sizeof(DataT)) {
(void)propList;
}
#endif

template <int Dims = Dimensions, typename = detail::enable_if_t<(Dims > 0)>>
accessor(range<Dimensions> AllocationSize, handler &)
#ifdef __SYCL_DEVICE_ONLY__
Expand All @@ -1867,6 +1879,20 @@ class accessor<DataT, Dimensions, AccessMode, access::target::local,
}
#endif

template <int Dims = Dimensions, typename = detail::enable_if_t<(Dims > 0)>>
accessor(range<Dimensions> AllocationSize, handler &,
const property_list &propList)
#ifdef __SYCL_DEVICE_ONLY__
: impl(AllocationSize) {
(void)propList;
}
#else
: LocalAccessorBaseHost(detail::convertToArrayOfN<3, 1>(AllocationSize),
AdjustedDim, sizeof(DataT)) {
(void)propList;
}
#endif

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

size_t get_count() const { return getSize().size(); }
Expand Down Expand Up @@ -1954,6 +1980,20 @@ class accessor<DataT, Dimensions, AccessMode, access::target::image,
#ifndef __SYCL_DEVICE_ONLY__
detail::associateWithHandler(CommandGroupHandler, this,
access::target::image);
#endif
}

template <typename AllocatorT>
accessor(cl::sycl::image<Dimensions, AllocatorT> &Image,
handler &CommandGroupHandler, const property_list &propList)
: detail::image_accessor<DataT, Dimensions, AccessMode,
access::target::image, IsPlaceholder>(
Image, CommandGroupHandler,
(detail::getSyclObjImpl(Image))->getElementSize()) {
(void)propList;
#ifndef __SYCL_DEVICE_ONLY__
detail::associateWithHandler(CommandGroupHandler, this,
access::target::image);
#endif
}
#ifdef __SYCL_DEVICE_ONLY__
Expand Down Expand Up @@ -1994,6 +2034,15 @@ class accessor<DataT, Dimensions, AccessMode, access::target::host_image,
: detail::image_accessor<DataT, Dimensions, AccessMode,
access::target::host_image, IsPlaceholder>(
Image, (detail::getSyclObjImpl(Image))->getElementSize()) {}

template <typename AllocatorT>
accessor(cl::sycl::image<Dimensions, AllocatorT> &Image,
const property_list &propList)
: detail::image_accessor<DataT, Dimensions, AccessMode,
access::target::host_image, IsPlaceholder>(
Image, (detail::getSyclObjImpl(Image))->getElementSize()) {
(void)propList;
}
};

/// Image array accessor.
Expand Down Expand Up @@ -2041,6 +2090,20 @@ class accessor<DataT, Dimensions, AccessMode, access::target::image_array,
#endif
}

template <typename AllocatorT>
accessor(cl::sycl::image<Dimensions + 1, AllocatorT> &Image,
handler &CommandGroupHandler, const property_list &propList)
: detail::image_accessor<DataT, Dimensions + 1, AccessMode,
access::target::image, IsPlaceholder>(
Image, CommandGroupHandler,
(detail::getSyclObjImpl(Image))->getElementSize()) {
(void)propList;
#ifndef __SYCL_DEVICE_ONLY__
detail::associateWithHandler(CommandGroupHandler, this,
access::target::image_array);
#endif
}

detail::__image_array_slice__<DataT, Dimensions, AccessMode, IsPlaceholder>
operator[](size_t Index) const {
return detail::__image_array_slice__<DataT, Dimensions, AccessMode,
Expand Down