Skip to content

[SYCL] Fix sycl::vec constructor ambiguity #8608

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
Mar 21, 2023
Merged

[SYCL] Fix sycl::vec constructor ambiguity #8608

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
396854f
[SYCL] Fix sycl::vec constructor ambiguity
steffenlarsen Mar 10, 2023
a014de5
Update sycl/test/regression/vec_init_list_ctor.cpp
steffenlarsen Mar 10, 2023
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/sycl/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,9 +729,6 @@ template <typename Type, int NumElements> class vec {
std::index_sequence<Is...>)
: m_Data{Arr[Is]...} {}

constexpr vec(const std::array<vec_data_t<DataT>, NumElements> &Arr)
: vec{Arr, std::make_index_sequence<NumElements>()} {}

public:
using element_type = DataT;
using rel_t = detail::rel_t<DataT>;
Expand Down Expand Up @@ -796,7 +793,8 @@ template <typename Type, int NumElements> class vec {
template <typename Ty = DataT>
explicit constexpr vec(const EnableIfHostHalf<Ty> &arg)
: vec{detail::RepeatValue<NumElements>(
static_cast<vec_data_t<DataT>>(arg))} {}
static_cast<vec_data_t<DataT>>(arg)),
std::make_index_sequence<NumElements>()} {}

template <typename Ty = DataT>
typename detail::enable_if_t<
Expand All @@ -812,7 +810,8 @@ template <typename Type, int NumElements> class vec {
#else
explicit constexpr vec(const DataT &arg)
: vec{detail::RepeatValue<NumElements>(
static_cast<vec_data_t<DataT>>(arg))} {}
static_cast<vec_data_t<DataT>>(arg)),
std::make_index_sequence<NumElements>()} {}

template <typename Ty = DataT>
typename detail::enable_if_t<
Expand Down Expand Up @@ -883,7 +882,8 @@ template <typename Type, int NumElements> class vec {
template <typename... argTN, typename = EnableIfSuitableTypes<argTN...>,
typename = EnableIfSuitableNumElements<argTN...>>
constexpr vec(const argTN &...args)
: vec{VecArgArrayCreator<vec_data_t<DataT>, argTN...>::Create(args...)} {}
: vec{VecArgArrayCreator<vec_data_t<DataT>, argTN...>::Create(args...),
std::make_index_sequence<NumElements>()} {}

// TODO: Remove, for debug purposes only.
void dump() {
Expand Down
12 changes: 12 additions & 0 deletions sycl/test/regression/vec_init_list_ctor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// RUN: %clang -fsycl -fsyntax-only -Xclang -verify %s
// expected-no-diagnostics

// Regression test checking that the vector ctor taking an initializer list
// doesn't cause warnings or errors.

#include <sycl/sycl.hpp>

int main() {
sycl::vec<int, 2> V({1, 2});
return 0;
}