Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Vector fixes #8

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Vector fixes #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a99abc6
Vector component const conversion operators should return references
Oblomov Dec 15, 2021
cc81f2c
Only overload vector operators for convertible types
Oblomov Dec 16, 2021
223d35d
Vector ops: support compilers without ext_vector_type
Oblomov Dec 16, 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
125 changes: 99 additions & 26 deletions include/hip/amd_detail/amd_hip_vector_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,15 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
Vector data;

__HOST_DEVICE__
operator T() const noexcept { return data[idx]; }
constexpr operator const T&() const noexcept {
return reinterpret_cast<
const T (&)[sizeof(Vector) / sizeof(T)]>(data)[idx];
}
__HOST_DEVICE__
operator T() const volatile noexcept { return data[idx]; }
constexpr operator const volatile T&() const volatile noexcept {
return reinterpret_cast<
const volatile T (&)[sizeof(Vector) / sizeof(T)]>(data)[idx];
}

#ifdef __HIP_ENABLE_VECTOR_SCALAR_ACCESSORY_ENUM_CONVERSION__
// The conversions to enum are fairly ghastly, but unfortunately used in
Expand Down Expand Up @@ -805,7 +811,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator+=(const HIP_vector_type& x) noexcept
{
data += x.data;
#if __has_attribute(ext_vector_type)
data += x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] += x.data[i];
#endif
return *this;
}
template<
Expand All @@ -821,7 +832,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator-=(const HIP_vector_type& x) noexcept
{
data -= x.data;
#if __has_attribute(ext_vector_type)
data -= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] -= x.data[i];
#endif
return *this;
}
template<
Expand All @@ -837,7 +853,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator*=(const HIP_vector_type& x) noexcept
{
data *= x.data;
#if __has_attribute(ext_vector_type)
data *= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] *= x.data[i];
#endif
return *this;
}
template<
Expand All @@ -853,7 +874,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator/=(const HIP_vector_type& x) noexcept
{
data /= x.data;
#if __has_attribute(ext_vector_type)
data /= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] /= x.data[i];
#endif
return *this;
}
template<
Expand All @@ -873,7 +899,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
HIP_vector_type operator-() const noexcept
{
auto tmp(*this);
tmp.data = -tmp.data;
#if __has_attribute(ext_vector_type)
tmp.data = -tmp.data;
#else
for (auto i = 0u; i < rank; ++i)
tmp.data[i] = -tmp.data[i];
#endif
return tmp;
}

Expand All @@ -884,7 +915,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
HIP_vector_type operator~() const noexcept
{
HIP_vector_type r{*this};
r.data = ~r.data;
#if __has_attribute(ext_vector_type)
r.data = ~r.data;
#else
for (auto i = 0u; i < rank; ++i)
r.data[i] = ~r.data[i];
#endif
return r;
}

Expand All @@ -894,7 +930,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator%=(const HIP_vector_type& x) noexcept
{
data %= x.data;
#if __has_attribute(ext_vector_type)
data %= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] %= x.data[i];
#endif
return *this;
}

Expand All @@ -904,7 +945,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator^=(const HIP_vector_type& x) noexcept
{
data ^= x.data;
#if __has_attribute(ext_vector_type)
data ^= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] ^= x.data[i];
#endif
return *this;
}

Expand All @@ -914,7 +960,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator|=(const HIP_vector_type& x) noexcept
{
data |= x.data;
#if __has_attribute(ext_vector_type)
data |= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] |= x.data[i];
#endif
return *this;
}

Expand All @@ -924,7 +975,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator&=(const HIP_vector_type& x) noexcept
{
data &= x.data;
#if __has_attribute(ext_vector_type)
data &= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] &= x.data[i];
#endif
return *this;
}

Expand All @@ -934,7 +990,12 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator>>=(const HIP_vector_type& x) noexcept
{
data >>= x.data;
#if __has_attribute(ext_vector_type)
data >>= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] >>= x.data[i];
#endif
return *this;
}

Expand All @@ -944,11 +1005,23 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
HIP_vector_type& operator<<=(const HIP_vector_type& x) noexcept
{
data <<= x.data;
#if __has_attribute(ext_vector_type)
data <<= x.data;
#else
for (auto i = 0u; i < rank; ++i)
data[i] <<= x.data[i];
#endif
return *this;
}
};

// comfort type to only enable an operator if U can be converted to
// a HIP_vector_type<T, N>
template<typename U, typename T, unsigned int n,
typename R=HIP_vector_type<T, n> /* operator return value */>
using enable_if_convertible = typename
std::enable_if<std::is_convertible<U, HIP_vector_type<T, n>>::value, R>::type;

template<typename T, unsigned int n>
__HOST_DEVICE__
inline
Expand All @@ -962,7 +1035,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator+(
enable_if_convertible<U, T, n> operator+(
const HIP_vector_type<T, n>& x, U y) noexcept
{
return HIP_vector_type<T, n>{x} += HIP_vector_type<T, n>{y};
Expand All @@ -971,7 +1044,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator+(
enable_if_convertible<U, T, n> operator+(
U x, const HIP_vector_type<T, n>& y) noexcept
{
return HIP_vector_type<T, n>{x} += y;
Expand All @@ -990,7 +1063,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator-(
enable_if_convertible<U, T, n> operator-(
const HIP_vector_type<T, n>& x, U y) noexcept
{
return HIP_vector_type<T, n>{x} -= HIP_vector_type<T, n>{y};
Expand All @@ -999,7 +1072,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator-(
enable_if_convertible<U, T, n> operator-(
U x, const HIP_vector_type<T, n>& y) noexcept
{
return HIP_vector_type<T, n>{x} -= y;
Expand All @@ -1018,7 +1091,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator*(
enable_if_convertible<U, T, n> operator*(
const HIP_vector_type<T, n>& x, U y) noexcept
{
return HIP_vector_type<T, n>{x} *= HIP_vector_type<T, n>{y};
Expand All @@ -1027,7 +1100,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator*(
enable_if_convertible<U, T, n> operator*(
U x, const HIP_vector_type<T, n>& y) noexcept
{
return HIP_vector_type<T, n>{x} *= y;
Expand All @@ -1046,7 +1119,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator/(
enable_if_convertible<U, T, n> operator/(
const HIP_vector_type<T, n>& x, U y) noexcept
{
return HIP_vector_type<T, n>{x} /= HIP_vector_type<T, n>{y};
Expand All @@ -1055,7 +1128,7 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
HIP_vector_type<T, n> operator/(
enable_if_convertible<U, T, n> operator/(
U x, const HIP_vector_type<T, n>& y) noexcept
{
return HIP_vector_type<T, n>{x} /= y;
Expand Down Expand Up @@ -1084,15 +1157,15 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
bool operator==(const HIP_vector_type<T, n>& x, U y) noexcept
enable_if_convertible<U, T, n, bool> operator==(const HIP_vector_type<T, n>& x, U y) noexcept
{
return x == HIP_vector_type<T, n>{y};
}
template<typename T, unsigned int n, typename U>
__HOST_DEVICE__
inline
constexpr
bool operator==(U x, const HIP_vector_type<T, n>& y) noexcept
enable_if_convertible<U, T, n, bool> operator==(U x, const HIP_vector_type<T, n>& y) noexcept
{
return HIP_vector_type<T, n>{x} == y;
}
Expand All @@ -1110,15 +1183,15 @@ template <typename __T> struct is_scalar : public integral_constant<bool, __is_s
__HOST_DEVICE__
inline
constexpr
bool operator!=(const HIP_vector_type<T, n>& x, U y) noexcept
enable_if_convertible<U, T, n, bool> operator!=(const HIP_vector_type<T, n>& x, U y) noexcept
{
return !(x == y);
}
template<typename T, unsigned int n, typename U>
__HOST_DEVICE__
inline
constexpr
bool operator!=(U x, const HIP_vector_type<T, n>& y) noexcept
enable_if_convertible<U, T, n, bool> operator!=(U x, const HIP_vector_type<T, n>& y) noexcept
{
return !(x == y);
}
Expand Down