Skip to content

[SYCL] Add missed constexpr for vec #4324

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 12, 2021
Merged

[SYCL] Add missed constexpr for vec #4324

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
e9cc315
[SYCL] Add missed constexpr for vec
vladimirlaz Aug 12, 2021
5991c3b
Apply clang-format
vladimirlaz Aug 12, 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
35 changes: 19 additions & 16 deletions sycl/include/CL/sycl/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,8 @@ template <typename Type, int NumElements> class vec {
#ifdef __SYCL_USE_EXT_VECTOR_TYPE__
template <int Num = NumElements, typename Ty = int,
typename = typename detail::enable_if_t<1 != Num>>
void setValue(EnableIfNotHostHalf<Ty> Index, const DataT &Value, int) {
constexpr void setValue(EnableIfNotHostHalf<Ty> Index, const DataT &Value,
int) {
m_Data[Index] = Value;
}

Expand All @@ -1214,7 +1215,7 @@ template <typename Type, int NumElements> class vec {

template <int Num = NumElements, typename Ty = int,
typename = typename detail::enable_if_t<1 != Num>>
void setValue(EnableIfHostHalf<Ty> Index, const DataT &Value, int) {
constexpr void setValue(EnableIfHostHalf<Ty> Index, const DataT &Value, int) {
m_Data.s[Index] = Value;
}

Expand All @@ -1226,7 +1227,7 @@ template <typename Type, int NumElements> class vec {
#else // __SYCL_USE_EXT_VECTOR_TYPE__
template <int Num = NumElements,
typename = typename detail::enable_if_t<1 != Num>>
void setValue(int Index, const DataT &Value, int) {
constexpr void setValue(int Index, const DataT &Value, int) {
m_Data.s[Index] = Value;
}

Expand All @@ -1239,7 +1240,7 @@ template <typename Type, int NumElements> class vec {

template <int Num = NumElements,
typename = typename detail::enable_if_t<1 == Num>>
void setValue(int, const DataT &Value, float) {
constexpr void setValue(int, const DataT &Value, float) {
m_Data = Value;
}

Expand All @@ -1250,7 +1251,7 @@ template <typename Type, int NumElements> class vec {
}

// Special proxies as specialization is not allowed in class scope.
void setValue(int Index, const DataT &Value) {
constexpr void setValue(int Index, const DataT &Value) {
if (NumElements == 1)
setValue(Index, Value, 0);
else
Expand All @@ -1263,13 +1264,13 @@ template <typename Type, int NumElements> class vec {

// Helpers for variadic template constructor of vec.
template <typename T, typename... argTN>
int vaargCtorHelper(int Idx, const T &arg) {
constexpr int vaargCtorHelper(int Idx, const T &arg) {
setValue(Idx, arg);
return Idx + 1;
}

template <typename DataT_, int NumElements_>
int vaargCtorHelper(int Idx, const vec<DataT_, NumElements_> &arg) {
constexpr int vaargCtorHelper(int Idx, const vec<DataT_, NumElements_> &arg) {
for (size_t I = 0; I < NumElements_; ++I) {
setValue(Idx + I, arg.getValue(I));
}
Expand All @@ -1278,9 +1279,9 @@ template <typename Type, int NumElements> class vec {

template <typename DataT_, int NumElements_, typename T2, typename T3,
template <typename> class T4, int... T5>
int vaargCtorHelper(int Idx,
const detail::SwizzleOp<vec<DataT_, NumElements_>, T2, T3,
T4, T5...> &arg) {
constexpr int
vaargCtorHelper(int Idx, const detail::SwizzleOp<vec<DataT_, NumElements_>,
T2, T3, T4, T5...> &arg) {
size_t NumElems = sizeof...(T5);
for (size_t I = 0; I < NumElems; ++I) {
setValue(Idx + I, arg.getValue(I));
Expand All @@ -1290,9 +1291,10 @@ template <typename Type, int NumElements> class vec {

template <typename DataT_, int NumElements_, typename T2, typename T3,
template <typename> class T4, int... T5>
int vaargCtorHelper(int Idx,
const detail::SwizzleOp<const vec<DataT_, NumElements_>,
T2, T3, T4, T5...> &arg) {
constexpr int
vaargCtorHelper(int Idx,
const detail::SwizzleOp<const vec<DataT_, NumElements_>, T2,
T3, T4, T5...> &arg) {
size_t NumElems = sizeof...(T5);
for (size_t I = 0; I < NumElems; ++I) {
setValue(Idx + I, arg.getValue(I));
Expand All @@ -1301,14 +1303,15 @@ template <typename Type, int NumElements> class vec {
}

template <typename T1, typename... argTN>
void vaargCtorHelper(int Idx, const T1 &arg, const argTN &... args) {
constexpr void vaargCtorHelper(int Idx, const T1 &arg,
const argTN &... args) {
int NewIdx = vaargCtorHelper(Idx, arg);
vaargCtorHelper(NewIdx, args...);
}

template <typename DataT_, int NumElements_, typename... argTN>
void vaargCtorHelper(int Idx, const vec<DataT_, NumElements_> &arg,
const argTN &... args) {
constexpr void vaargCtorHelper(int Idx, const vec<DataT_, NumElements_> &arg,
const argTN &... args) {
int NewIdx = vaargCtorHelper(Idx, arg);
vaargCtorHelper(NewIdx, args...);
}
Expand Down
7 changes: 7 additions & 0 deletions sycl/test/basic_tests/SYCL-2020-spec-constants.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ constexpr sycl::specialization_id<sycl::vec<double, 4>> vec_id_def(v);
constexpr sycl::specialization_id<sycl::vec<double, 1>> vec_id1(11.0);
constexpr sycl::specialization_id<sycl::vec<double, 4>> vec_id4(11.0);

constexpr sycl::vec<long long, 1> vv(1);

template <typename T> inline constexpr auto helper(int x) { return T{x}; }

constexpr sycl::specialization_id<sycl::vec<long long, 1>>
vec_helper1(helper<sycl::vec<long long, 1>>(1));

struct composite {
int a;
int b;
Expand Down