From: Matthias Kretz <kr...@kde.org>
Signed-off-by: Matthias Kretz <m.kr...@gsi.de>
libstdc++-v3/ChangeLog:
* include/experimental/bits/simd_math.h: Undefine internal
macros after use.
(frexp): Move #if to a more sensible position and reformat
preceding code.
(logb): Call _SimdImpl::_S_logb for fixed_size instead of
duplicating the code here.
(modf): Simplify condition.
---
.../include/experimental/bits/simd_math.h | 22 +++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
--
──────────────────────────────────────────────────────────────────────────
Dr. Matthias Kretz https://mattkretz.github.io
GSI Helmholtz Centre for Heavy Ion Research https://gsi.de
std::experimental::simd https://github.com/VcDevel/std-simd
──────────────────────────────────────────────────────────────────────────
diff --git a/libstdc++-v3/include/experimental/bits/simd_math.h b/libstdc++-v3/include/experimental/bits/simd_math.h
index cff4371619d..a5df2039970 100644
--- a/libstdc++-v3/include/experimental/bits/simd_math.h
+++ b/libstdc++-v3/include/experimental/bits/simd_math.h
@@ -645,11 +645,8 @@ template <typename _Tp, typename _Abi>
return __r;
}
else if constexpr (__is_fixed_size_abi_v<_Abi>)
- {
- return {__private_init,
- _Abi::_SimdImpl::_S_frexp(__data(__x), __data(*__exp))};
+ return {__private_init, _Abi::_SimdImpl::_S_frexp(__data(__x), __data(*__exp))};
#if _GLIBCXX_SIMD_X86INTRIN
- }
else if constexpr (__have_avx512f)
{
constexpr size_t _Np = simd_size_v<_Tp, _Abi>;
@@ -667,8 +664,8 @@ template <typename _Tp, typename _Abi>
_Abi::_CommonImpl::_S_blend(_SimdWrapper<bool, _Np>(
__isnonzero),
__v, __getmant_avx512(__v))};
-#endif // _GLIBCXX_SIMD_X86INTRIN
}
+#endif // _GLIBCXX_SIMD_X86INTRIN
else
{
// fallback implementation
@@ -749,14 +746,7 @@ template <typename _Tp, typename _Abi>
if constexpr (_Np == 1)
return std::logb(__x[0]);
else if constexpr (__is_fixed_size_abi_v<_Abi>)
- {
- return {__private_init,
- __data(__x)._M_apply_per_chunk([](auto __impl, auto __xx) {
- using _V = typename decltype(__impl)::simd_type;
- return __data(
- std::experimental::logb(_V(__private_init, __xx)));
- })};
- }
+ return {__private_init, _Abi::_SimdImpl::_S_logb(__data(__x))};
#if _GLIBCXX_SIMD_X86INTRIN // {{{
else if constexpr (__have_avx512vl && __is_sse_ps<_Tp, _Np>())
return {__private_init,
@@ -827,9 +817,7 @@ template <typename _Tp, typename _Abi>
enable_if_t<is_floating_point_v<_Tp>, simd<_Tp, _Abi>>
modf(const simd<_Tp, _Abi>& __x, simd<_Tp, _Abi>* __iptr)
{
- if constexpr (__is_scalar_abi<_Abi>()
- || (__is_fixed_size_abi_v<
- _Abi> && simd_size_v<_Tp, _Abi> == 1))
+ if constexpr (simd_size_v<_Tp, _Abi> == 1)
{
_Tp __tmp;
_Tp __r = std::modf(__x[0], &__tmp);
@@ -1472,6 +1460,8 @@ template <typename _Tp, typename _Abi>
}
// }}}
+#undef _GLIBCXX_SIMD_CVTING2
+#undef _GLIBCXX_SIMD_CVTING3
#undef _GLIBCXX_SIMD_MATH_CALL_
#undef _GLIBCXX_SIMD_MATH_CALL2_
#undef _GLIBCXX_SIMD_MATH_CALL3_