Skip to content

[SYCL] Make vec and marray constructors constexpr #4301

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 3 commits into from
Aug 12, 2021
Merged

[SYCL] Make vec and marray constructors constexpr #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1904ca4
[SYCL] Ass constexpr constructors for vec and marray
vladimirlaz Aug 10, 2021
6716290
Apply clang-format
vladimirlaz Aug 10, 2021
7e4e5c7
Fix clang-format
vladimirlaz Aug 10, 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
10 changes: 5 additions & 5 deletions sycl/include/CL/sycl/marray.hpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ template <typename Type, std::size_t NumElements> class marray {
conjunction<TypeChecker<ArgTN, DataT>...>::value>::type;

public:
marray() : MData{} {}
constexpr marray() : MData{} {}

explicit marray(const Type &Arg) {
explicit constexpr marray(const Type &Arg) {
for (std::size_t I = 0; I < NumElements; ++I) {
MData[I] = Arg;
}
Expand All @@ -60,15 +60,15 @@ template <typename Type, std::size_t NumElements> class marray {
template <
typename... ArgTN, typename = EnableIfSuitableTypes<ArgTN...>,
typename = typename std::enable_if<sizeof...(ArgTN) == NumElements>::type>
marray(const ArgTN &... Args) : MData{Args...} {}
constexpr marray(const ArgTN &... Args) : MData{Args...} {}

marray(const marray<Type, NumElements> &Rhs) {
constexpr marray(const marray<Type, NumElements> &Rhs) {
for (std::size_t I = 0; I < NumElements; ++I) {
MData[I] = Rhs.MData[I];
}
}

marray(marray<Type, NumElements> &&Rhs) {
constexpr marray(marray<Type, NumElements> &&Rhs) {
for (std::size_t I = 0; I < NumElements; ++I) {
MData[I] = Rhs.MData[I];
}
Expand Down
45 changes: 25 additions & 20 deletions sycl/include/CL/sycl/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ template <typename Type, int NumElements> class vec {
#ifdef __SYCL_DEVICE_ONLY__
vec(const vec &Rhs) = default;
#else
vec(const vec &Rhs) : m_Data(Rhs.m_Data) {}
constexpr vec(const vec &Rhs) : m_Data(Rhs.m_Data) {}
#endif

vec(vec &&Rhs) = default;
Expand Down Expand Up @@ -682,7 +682,7 @@ template <typename Type, int NumElements> class vec {
T>;

template <typename Ty = DataT>
explicit vec(const EnableIfNotHostHalf<Ty> &arg) {
explicit constexpr vec(const EnableIfNotHostHalf<Ty> &arg) {
m_Data = (DataType)arg;
}

Expand All @@ -696,7 +696,8 @@ template <typename Type, int NumElements> class vec {
return *this;
}

template <typename Ty = DataT> explicit vec(const EnableIfHostHalf<Ty> &arg) {
template <typename Ty = DataT>
explicit constexpr vec(const EnableIfHostHalf<Ty> &arg) {
for (int i = 0; i < NumElements; ++i) {
setValue(i, arg);
}
Expand All @@ -714,7 +715,7 @@ template <typename Type, int NumElements> class vec {
return *this;
}
#else
explicit vec(const DataT &arg) {
explicit constexpr vec(const DataT &arg) {
for (int i = 0; i < NumElements; ++i) {
setValue(i, arg);
}
Expand Down Expand Up @@ -743,28 +744,32 @@ template <typename Type, int NumElements> class vec {
using EnableIfMultipleElems = typename detail::enable_if_t<
std::is_convertible<T, DataT>::value && NumElements == IdxNum, DataT>;
template <typename Ty = DataT>
vec(const EnableIfMultipleElems<2, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1)
constexpr vec(const EnableIfMultipleElems<2, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1)
: m_Data{Arg0, Arg1} {}
template <typename Ty = DataT>
vec(const EnableIfMultipleElems<3, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2)
constexpr vec(const EnableIfMultipleElems<3, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2)
: m_Data{Arg0, Arg1, Arg2} {}
template <typename Ty = DataT>
vec(const EnableIfMultipleElems<4, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2, const Ty Arg3)
constexpr vec(const EnableIfMultipleElems<4, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2,
const Ty Arg3)
: m_Data{Arg0, Arg1, Arg2, Arg3} {}
template <typename Ty = DataT>
vec(const EnableIfMultipleElems<8, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2, const DataT Arg3,
const DataT Arg4, const DataT Arg5, const DataT Arg6, const DataT Arg7)
constexpr vec(const EnableIfMultipleElems<8, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2,
const DataT Arg3, const DataT Arg4, const DataT Arg5,
const DataT Arg6, const DataT Arg7)
: m_Data{Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7} {}
template <typename Ty = DataT>
vec(const EnableIfMultipleElems<16, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2, const DataT Arg3,
const DataT Arg4, const DataT Arg5, const DataT Arg6, const DataT Arg7,
const DataT Arg8, const DataT Arg9, const DataT ArgA, const DataT ArgB,
const DataT ArgC, const DataT ArgD, const DataT ArgE, const DataT ArgF)
constexpr vec(const EnableIfMultipleElems<16, Ty> Arg0,
const EnableIfNotHostHalf<Ty> Arg1, const DataT Arg2,
const DataT Arg3, const DataT Arg4, const DataT Arg5,
const DataT Arg6, const DataT Arg7, const DataT Arg8,
const DataT Arg9, const DataT ArgA, const DataT ArgB,
const DataT ArgC, const DataT ArgD, const DataT ArgE,
const DataT ArgF)
: m_Data{Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7,
Arg8, Arg9, ArgA, ArgB, ArgC, ArgD, ArgE, ArgF} {}
#endif
Expand All @@ -773,7 +778,7 @@ template <typename Type, int NumElements> class vec {
// base types are match and that the NumElements == sum of lengths of args.
template <typename... argTN, typename = EnableIfSuitableTypes<argTN...>,
typename = EnableIfSuitableNumElements<argTN...>>
vec(const argTN &... args) {
constexpr vec(const argTN &... args) {
vaargCtorHelper(0, args...);
}

Expand All @@ -792,7 +797,7 @@ template <typename Type, int NumElements> class vec {
typename = typename detail::enable_if_t<
std::is_same<vector_t_, vector_t>::value &&
!std::is_same<vector_t_, DataT>::value>>
vec(vector_t openclVector) : m_Data(openclVector) {}
constexpr vec(vector_t openclVector) : m_Data(openclVector) {}
operator vector_t() const { return m_Data; }
#endif

Expand Down
8 changes: 8 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 @@ -37,6 +37,14 @@ constexpr sycl::specialization_id<uint64_t> uint64_id(8);
// constexpr sycl::specialization_id<half> half_id(9.0);
constexpr sycl::specialization_id<float> float_id(10.0);
constexpr sycl::specialization_id<double> double_id(11.0);
constexpr sycl::marray<double, 5> ma;
constexpr sycl::specialization_id<sycl::marray<double, 5>> marray_id5(11.0);
constexpr sycl::specialization_id<sycl::marray<double, 1>> marray_id1(11.0);
constexpr sycl::specialization_id<sycl::marray<double, 5>> marray_id_def(ma);
constexpr sycl::vec<double, 4> v{};
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);

struct composite {
int a;
Expand Down