Skip to content
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

Change the return type of named swizzles #39

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Change the return type of named swizzles #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc80743
Fix vec constructors
GagaLP Jan 27, 2025
bf7fe2a
Add explicit conversion to vec
GagaLP Jan 27, 2025
98dc3b6
Fix 1-element ec ambiguities
GagaLP Jan 27, 2025
247702e
Change return type of 1D-element named swizzles
GagaLP Jan 27, 2025
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
69 changes: 51 additions & 18 deletions include/simsycl/sycl/vec.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "../detail/check.hh"
#include "../detail/utils.hh"

#include <concepts>
#include <cstdint>
#include <cstdlib>
#include <type_traits>
Expand Down Expand Up @@ -69,6 +70,11 @@ template<typename T, typename DataT, int NumElements>
concept VecCompatible
= vec_like_num_elements<DataT, T>::value == 1 || vec_like_num_elements<DataT, T>::value == NumElements;

template<typename From, typename To>
concept implicitly_convertible = requires { std::is_convertible_v<From, To>; };

template<typename From, typename To>
concept explicitly_convertible = requires { static_cast<To>(std::declval<From>()); };

template<int... Is>
struct no_repeat_indices;
Expand Down Expand Up @@ -229,8 +235,9 @@ class swizzled_vec {
swizzled_vec &operator=(const swizzled_vec &) = delete;
swizzled_vec &operator=(swizzled_vec &&) = delete;

swizzled_vec &operator=(const value_type &rhs)
requires(allow_assign)
template<typename T>
swizzled_vec &operator=(const T &rhs)
requires(allow_assign && std::convertible_to<T, value_type>)
{
for(size_t i = 0; i < num_elements; ++i) { m_elems[indices[i]] = rhs; }
return *this;
Expand Down Expand Up @@ -261,6 +268,13 @@ class swizzled_vec {
return m_elems[indices[0]];
}

template<typename T>
explicit operator T() const
requires(num_elements == 1 && detail::explicitly_convertible<value_type, T>)
{
return m_elems[indices[0]];
}

static constexpr size_t byte_size() noexcept { return sycl::vec<value_type, num_elements>::byte_size(); }

static constexpr size_t size() noexcept { return num_elements; }
Expand Down Expand Up @@ -288,10 +302,10 @@ class swizzled_vec {
}

#define SIMSYCL_DETAIL_DEFINE_1D_SWIZZLE(req, comp) \
auto comp() const \
ReferenceDataT &comp() const \
requires(req && num_elements > sycl::elem::comp) \
{ \
return detail::swizzled_vec<ReferenceDataT, indices[sycl::elem::comp]>(m_elems); \
return m_elems[indices[sycl::elem::comp]]; \
}

#define SIMSYCL_DETAIL_DEFINE_2D_SWIZZLE(req, comp1, comp2) \
Expand Down Expand Up @@ -515,7 +529,7 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {

vec() = default;

explicit constexpr vec(const DataT &arg) {
explicit(num_elements > 1) constexpr vec(const DataT &arg) {
for(int i = 0; i < NumElements; ++i) { m_elems[i] = arg; }
}

Expand All @@ -528,7 +542,10 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {
vec(const vec &) = default;
vec &operator=(const vec &rhs) = default;

vec &operator=(const DataT &rhs) {
template<typename T>
vec &operator=(const T &rhs)
requires(std::convertible_to<T, DataT>)
{
for(int i = 0; i < NumElements; ++i) { m_elems[i] = rhs; }
return *this;
}
Expand All @@ -548,6 +565,13 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {
return m_elems[0];
}

template<typename T>
explicit operator T() const
requires(NumElements == 1 && detail::explicitly_convertible<DataT, T>)
{
return m_elems[0];
}

static constexpr size_t byte_size() noexcept { return sizeof m_elems; }

static constexpr size_t size() noexcept { return NumElements; }
Expand Down Expand Up @@ -588,15 +612,15 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {
}

#define SIMSYCL_DETAIL_DEFINE_1D_SWIZZLE(req, comp) \
auto comp() \
DataT &comp() \
requires(req && num_elements > elem::comp) \
{ \
return detail::swizzled_vec<DataT, elem::comp>(m_elems); \
return m_elems[elem::comp]; \
} \
auto comp() const \
const DataT &comp() const \
requires(req && num_elements > elem::comp) \
{ \
return detail::swizzled_vec<const DataT, elem::comp>(m_elems); \
return m_elems[elem::comp]; \
}

#define SIMSYCL_DETAIL_DEFINE_2D_SWIZZLE(req, comp1, comp2) \
Expand Down Expand Up @@ -736,15 +760,17 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {
for(int i = 0; i < NumElements; ++i) { result.m_elems[i] = lhs.m_elems[i] op rhs.m_elems[i]; } \
return result; \
} \
friend vec operator op(const vec &lhs, const DataT &rhs) \
requires(enable_if) \
template<typename T> \
friend vec operator op(const vec &lhs, const T &rhs) \
requires(enable_if && std::convertible_to<T, DataT>) \
{ \
vec result; \
for(int i = 0; i < NumElements; ++i) { result.m_elems[i] = lhs.m_elems[i] op rhs; } \
return result; \
} \
friend vec operator op(const DataT &lhs, const vec &rhs) \
requires(enable_if) \
template<typename T> \
friend vec operator op(const T &lhs, const vec &rhs) \
requires(enable_if && std::convertible_to<T, DataT>) \
{ \
vec result; \
for(int i = 0; i < NumElements; ++i) { result.m_elems[i] = lhs op rhs.m_elems[i]; } \
Expand Down Expand Up @@ -778,8 +804,9 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {
for(int i = 0; i < NumElements; ++i) { lhs.m_elems[i] op rhs.m_elems[rhs.indices[i]]; } \
return lhs; \
} \
friend vec &operator op(vec & lhs, const DataT & rhs) \
requires(enable_if) \
template<typename T> \
friend vec &operator op(vec & lhs, const T & rhs) \
requires(enable_if && std::convertible_to<T, DataT>) \
{ \
for(int i = 0; i < NumElements; ++i) { lhs.m_elems[i] op rhs; } \
return lhs; \
Expand Down Expand Up @@ -847,12 +874,18 @@ class alignas(detail::vec_alignment_v<DataT, NumElements>) vec {
for(int i = 0; i < NumElements; ++i) { result.m_elems[i] = lhs.m_elems[i] op rhs.m_elems[i]; } \
return result; \
} \
friend vec<decltype(DataT {} op DataT{}), NumElements> operator op(const vec & lhs, const DataT & rhs) { \
template<typename T> \
friend vec<decltype(DataT {} op DataT{}), NumElements> operator op(const vec & lhs, const T & rhs) \
requires(std::convertible_to<T, DataT>) \
{ \
vec<decltype(DataT {} op DataT{}), NumElements> result; \
for(int i = 0; i < NumElements; ++i) { result.m_elems[i] = lhs.m_elems[i] op rhs; } \
return result; \
} \
friend vec<decltype(DataT {} op DataT{}), NumElements> operator op(const DataT & lhs, const vec & rhs) { \
template<typename T> \
friend vec<decltype(DataT {} op DataT{}), NumElements> operator op(const T & lhs, const vec & rhs) \
requires(std::convertible_to<T, DataT>) \
{ \
vec<decltype(DataT {} op DataT{}), NumElements> result; \
for(int i = 0; i < NumElements; ++i) { result.m_elems[i] = lhs op rhs.m_elems[i]; } \
return result; \
Expand Down
15 changes: 13 additions & 2 deletions test/vec_tests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,17 @@ TEST_CASE("Vector swizzled access is available", "[vec][swizzle]") {
vi.even() = {11, 12};
CHECK(check_bool_vec(vi == sycl::vec<int, 4>{11, 9, 12, 10}));
}

SECTION("1D swizzled vec return type") {
sycl::vec<uint8_t, 4> v4{255};
CHECK(std::is_same_v<decltype(v4.x()), uint8_t &>);
CHECK(std::is_same_v<decltype(v4.y()), uint8_t &>);
CHECK(std::is_same_v<decltype(v4.z()), uint8_t &>);
CHECK(std::is_same_v<decltype(v4.w()), uint8_t &>);

int i = (v4.x() + 1);
CHECK(i == 256);
}
}

TEST_CASE("Operations on swizzled vectors work as expected", "[vec][swizzle]") {
Expand Down Expand Up @@ -208,7 +219,7 @@ TEST_CASE("Operations on swizzled vectors work as expected", "[vec][swizzle]") {
CHECK(check_bool_vec(sycl::vec<int, 2>{0, 0} < vi.xy()));

CHECK(check_bool_vec(vi.zw() < 10));
CHECK(check_bool_vec(vi.z() == 3));
CHECK(check_bool_vec(4 == vi.a()));
CHECK((vi.z() == 3));
CHECK((4 == vi.a()));
}
}
Loading