libstdc++: Minor simd_math cleanups

Signed-off-by: Matthias Kretz <m.kretz@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.
This commit is contained in:
Matthias Kretz 2021-06-24 14:20:15 +01:00 committed by Jonathan Wakely
parent dd1c7792d6
commit 62a989ea66

View File

@ -645,11 +645,8 @@ template <typename _Tp, typename _Abi>
return __r; return __r;
} }
else if constexpr (__is_fixed_size_abi_v<_Abi>) 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 #if _GLIBCXX_SIMD_X86INTRIN
}
else if constexpr (__have_avx512f) else if constexpr (__have_avx512f)
{ {
constexpr size_t _Np = simd_size_v<_Tp, _Abi>; 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>( _Abi::_CommonImpl::_S_blend(_SimdWrapper<bool, _Np>(
__isnonzero), __isnonzero),
__v, __getmant_avx512(__v))}; __v, __getmant_avx512(__v))};
#endif // _GLIBCXX_SIMD_X86INTRIN
} }
#endif // _GLIBCXX_SIMD_X86INTRIN
else else
{ {
// fallback implementation // fallback implementation
@ -751,14 +748,7 @@ template <typename _Tp, typename _Abi>
if constexpr (_Np == 1) if constexpr (_Np == 1)
return std::logb(__x[0]); return std::logb(__x[0]);
else if constexpr (__is_fixed_size_abi_v<_Abi>) else if constexpr (__is_fixed_size_abi_v<_Abi>)
{ return {__private_init, _Abi::_SimdImpl::_S_logb(__data(__x))};
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)));
})};
}
#if _GLIBCXX_SIMD_X86INTRIN // {{{ #if _GLIBCXX_SIMD_X86INTRIN // {{{
else if constexpr (__have_avx512vl && __is_sse_ps<_Tp, _Np>()) else if constexpr (__have_avx512vl && __is_sse_ps<_Tp, _Np>())
return {__private_init, return {__private_init,
@ -829,9 +819,7 @@ template <typename _Tp, typename _Abi>
enable_if_t<is_floating_point_v<_Tp>, simd<_Tp, _Abi>> enable_if_t<is_floating_point_v<_Tp>, simd<_Tp, _Abi>>
modf(const simd<_Tp, _Abi>& __x, simd<_Tp, _Abi>* __iptr) modf(const simd<_Tp, _Abi>& __x, simd<_Tp, _Abi>* __iptr)
{ {
if constexpr (__is_scalar_abi<_Abi>() if constexpr (simd_size_v<_Tp, _Abi> == 1)
|| (__is_fixed_size_abi_v<
_Abi> && simd_size_v<_Tp, _Abi> == 1))
{ {
_Tp __tmp; _Tp __tmp;
_Tp __r = std::modf(__x[0], &__tmp); _Tp __r = std::modf(__x[0], &__tmp);
@ -1474,6 +1462,8 @@ template <typename _Tp, typename _Abi>
} }
// }}} // }}}
#undef _GLIBCXX_SIMD_CVTING2
#undef _GLIBCXX_SIMD_CVTING3
#undef _GLIBCXX_SIMD_MATH_CALL_ #undef _GLIBCXX_SIMD_MATH_CALL_
#undef _GLIBCXX_SIMD_MATH_CALL2_ #undef _GLIBCXX_SIMD_MATH_CALL2_
#undef _GLIBCXX_SIMD_MATH_CALL3_ #undef _GLIBCXX_SIMD_MATH_CALL3_