yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libstdc++: Correct NTTP and simd_mask ctor call

Browse Source 
Signed-off-by: Matthias Kretz <m.kretz@gsi.de>

libstdc++-v3/ChangeLog:

	PR libstdc++/109822
	* include/experimental/bits/simd.h (to_native): Use int NTTP
	as specified in PTS2.
	(to_compatible): Likewise. Add missing tag to call mask
	generator ctor.
	* testsuite/experimental/simd/pr109822_cast_functions.cc: New
	test.

(cherry picked from commit 668d43502f465d48adbc1fe2956b979f36657e5f)
This commit is contained in:
Matthias Kretz 2023-05-26 12:23:44 +02:00
parent 3f90a56c08
commit 717a14e727
2 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/include/experimental/bits/simd.h
View File

@ -3304,7 +3304,7 @@ template <typename _Tp, int _Np>
return {__mem, vector_aligned};
}
template <typename _Tp, size_t _Np>
template <typename _Tp, int _Np>
_GLIBCXX_SIMD_INTRINSIC
enable_if_t<(_Np == native_simd_mask<_Tp>::size()), native_simd_mask<_Tp>>
to_native(const fixed_size_simd_mask<_Tp, _Np>& __x)
@ -3315,7 +3315,7 @@ template <typename _Tp, size_t _Np>
}
// to_compatible {{{2
template <typename _Tp, size_t _Np>
template <typename _Tp, int _Np>
_GLIBCXX_SIMD_INTRINSIC enable_if_t<(_Np == simd<_Tp>::size()), simd<_Tp>>
to_compatible(const simd<_Tp, simd_abi::fixed_size<_Np>>& __x)
{
@ -3324,12 +3324,13 @@ template <typename _Tp, size_t _Np>
return {__mem, vector_aligned};
}
template <typename _Tp, size_t _Np>
template <typename _Tp, int _Np>
_GLIBCXX_SIMD_INTRINSIC
enable_if_t<(_Np == simd_mask<_Tp>::size()), simd_mask<_Tp>>
to_compatible(const simd_mask<_Tp, simd_abi::fixed_size<_Np>>& __x)
{
return simd_mask<_Tp>(
__private_init,
[&](auto __i) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { return __x[__i]; });
}

63
libstdc++-v3/testsuite/experimental/simd/pr109822_cast_functions.cc Normal file
View File

@ -0,0 +1,63 @@
// { dg-options "-std=gnu++17" }
// { dg-do compile { target c++17 } }
#include <experimental/simd>
namespace stdx = std::experimental;
template <typename T, typename V>
void
test01()
{
using M = typename V::mask_type;
[[maybe_unused]] auto x = to_fixed_size(V());
[[maybe_unused]] auto k = to_fixed_size(M());
if constexpr (stdx::simd<T>::size() == V::size())
{
[[maybe_unused]] auto xx = to_compatible(x);
[[maybe_unused]] auto kk = to_compatible(k);
x = to_fixed_size(xx);
k = to_fixed_size(kk);
}
if constexpr (stdx::native_simd<T>::size() == V::size())
{
[[maybe_unused]] auto xx = to_native(x);
[[maybe_unused]] auto kk = to_native(k);
x = to_fixed_size(xx);
k = to_fixed_size(kk);
}
}
template <typename T>
void
iterate_abis()
{
test01<T, stdx::simd<T, stdx::simd_abi::scalar>>();
test01<T, stdx::simd<T>>();
test01<T, stdx::native_simd<T>>();
test01<T, stdx::fixed_size_simd<T, 3>>();
test01<T, stdx::fixed_size_simd<T, stdx::simd_abi::max_fixed_size<T> - 4>>();
}
int
main()
{
iterate_abis<char>();
iterate_abis<wchar_t>();
iterate_abis<char16_t>();
iterate_abis<char32_t>();
iterate_abis<signed char>();
iterate_abis<unsigned char>();
iterate_abis<short>();
iterate_abis<unsigned short>();
iterate_abis<int>();
iterate_abis<unsigned int>();
iterate_abis<long>();
iterate_abis<unsigned long>();
iterate_abis<long long>();
iterate_abis<unsigned long long>();
iterate_abis<float>();
iterate_abis<double>();
iterate_abis<long double>();
}