Skip to content

[SYCL] Add missing sycl::span constructor #6593

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 2 commits into from
Aug 19, 2022
Merged

[SYCL] Add missing sycl::span constructor #6593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f51c70
[SYCL] Add missing sycl::span constructor
AlexeySachkov Aug 17, 2022
00c95b4
Fix extent deduction for unspecialized sycl::span
AlexeySachkov Aug 17, 2022
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
14 changes: 11 additions & 3 deletions sycl/include/sycl/sycl_span.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,15 @@ template <typename _Tp, size_t _Extent> class _SYCL_SPAN_TEMPLATE_VIS span {
constexpr span(const span &) noexcept = default;
constexpr span &operator=(const span &) noexcept = default;

template <size_t _Sz = _Extent>
_SYCL_SPAN_INLINE_VISIBILITY constexpr explicit span(
element_type (&__arr)[_Sz])
: __data{__arr} {
(void)_Sz;
_SYCL_SPAN_ASSERT(_Extent == _Sz,
"size mismatch in span's constructor (&_arr)[_Sz]");
}

_SYCL_SPAN_INLINE_VISIBILITY constexpr explicit span(pointer __ptr,
size_type __count)
: __data{__ptr} {
Expand Down Expand Up @@ -609,10 +618,9 @@ as_writable_bytes(span<_Tp, _Extent> __s) noexcept

// Deduction guides

// array arg deduction guide. dynamic_extent arg used to select
// the correct template. The _Sz will be used for the __size of the span.
// array arg deduction guide
template <class _Tp, size_t _Sz>
span(_Tp (&)[_Sz]) -> span<_Tp, dynamic_extent>;
span(_Tp (&)[_Sz]) -> span<_Tp, _Sz>;

template <class _Tp, size_t _Sz> span(std::array<_Tp, _Sz> &) -> span<_Tp, _Sz>;

Expand Down
16 changes: 12 additions & 4 deletions sycl/test/basic_tests/span.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,18 @@ int main() {
sycl::span<int> fromIntVec{vec};

// fully specialized
// TODO: fix fully specialized span from array declaration support
// sycl::span<int,4> fullSpecArray{arr};
// sycl::span<const int,3> fullSpecConstArray{constArr};
sycl::span<int,4> fullSpecArray{arr};
sycl::span<const int,3> fullSpecConstArray{constArr};
sycl::span<int, 4> fullSpecVecArray{vec};

// check that the extent is deduced correctly
static_assert(decltype(fromArray)::extent == decltype(fullSpecArray)::extent,
"extent doesn't match between unspecialized and fully "
"specialized span from array");
static_assert(decltype(fromConstArray)::extent ==
decltype(fullSpecConstArray)::extent,
"extent doesn't match between unspecialized and fully "
"specialized span from const array");

return 0;
}
}