From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7857) id 65DFC384AB65; Mon, 22 Apr 2024 18:56:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65DFC384AB65 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713812213; bh=OVPz27QTUE/ck9rquktn6ImMz2d/EM/z4sYKO7uNJEk=; h=From:To:Subject:Date:From; b=r2BnSar6T2l/5gVwoFRJ05YEY91a77dfEdAT7yVoDuZM4ewp+9+A+Icggq3qNywTJ IOKuoXMEgXpNRvfKrDU3UP2UzNWKpbJbP/4nvXmHxzp0NrHwwHp7VUW1FH5H9Bf/Iy HrFWqVGmXA5ZnCM+0yFQPNLPHNHQSdPXVOMhLbgg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Matthias Kretz To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-10079] libstdc++: Fix conversion of simd to vector builtin X-Act-Checkin: gcc X-Git-Author: Matthias Kretz X-Git-Refname: refs/heads/master X-Git-Oldrev: e7a3ad29c9c832b6ae999cbfb0af89e121959030 X-Git-Newrev: 7ef139146a8923a8719873ca3fdae175668e8d63 Message-Id: <20240422185653.65DFC384AB65@sourceware.org> Date: Mon, 22 Apr 2024 18:56:53 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7ef139146a8923a8719873ca3fdae175668e8d63 commit r14-10079-g7ef139146a8923a8719873ca3fdae175668e8d63 Author: Matthias Kretz Date: Mon Apr 22 16:12:34 2024 +0200 libstdc++: Fix conversion of simd to vector builtin Signed-off-by: Matthias Kretz libstdc++-v3/ChangeLog: PR libstdc++/114803 * include/experimental/bits/simd_builtin.h (_SimdBase2::operator __vector_type_t): There is no __builtin() function in _SimdWrapper, instead use its conversion operator. * testsuite/experimental/simd/pr114803_vecbuiltin_cvt.cc: New test. Diff: --- .../include/experimental/bits/simd_builtin.h | 2 +- .../experimental/simd/pr114803_vecbuiltin_cvt.cc | 105 +++++++++++++++++++++ 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/experimental/bits/simd_builtin.h b/libstdc++-v3/include/experimental/bits/simd_builtin.h index 49c7c7e1c70..4ceeb423894 100644 --- a/libstdc++-v3/include/experimental/bits/simd_builtin.h +++ b/libstdc++-v3/include/experimental/bits/simd_builtin.h @@ -841,7 +841,7 @@ template _GLIBCXX_SIMD_ALWAYS_INLINE explicit operator __vector_type_t<_Tp, _Np>() const - { return static_cast*>(this)->_M_data.__builtin(); } + { return __data(*static_cast*>(this)); } }; struct _SimdBase1 diff --git a/libstdc++-v3/testsuite/experimental/simd/pr114803_vecbuiltin_cvt.cc b/libstdc++-v3/testsuite/experimental/simd/pr114803_vecbuiltin_cvt.cc new file mode 100644 index 00000000000..103dd19394c --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/simd/pr114803_vecbuiltin_cvt.cc @@ -0,0 +1,105 @@ +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include + +template + void + maybe_test() + { + using V = std::experimental::simd>; + if constexpr (std::is_destructible_v) + { + using V2 [[gnu::vector_size(16)]] = T; + V x = {}; + V2 x2 = static_cast(x); + x = static_cast(x2); + for (unsigned i = 0; i < V::size(); ++i) + { + if (x2[i] != 0) + __builtin_abort(); + } +#ifdef __SSE__ + if constexpr (std::is_same_v) + x = static_cast(static_cast<__m128>(x)); + else if constexpr (std::is_same_v) + x = static_cast(static_cast<__m128d>(x)); + else if constexpr (std::is_integral_v) + x = static_cast(static_cast<__m128i>(x)); +#elif __ALTIVEC__ + if constexpr (std::is_same_v) + x = static_cast(static_cast<__vector float>(x)); +#ifdef __VSX__ + else if constexpr (std::is_same_v) + x = static_cast(static_cast<__vector double>(x)); +#endif + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(signed char) + && std::is_signed_v) + x = static_cast(static_cast<__vector signed char>(x)); + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(signed char)) + x = static_cast(static_cast<__vector unsigned char>(x)); + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(short) + && std::is_signed_v) + x = static_cast(static_cast<__vector signed short>(x)); + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(short)) + x = static_cast(static_cast<__vector unsigned short>(x)); + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(int) + && std::is_signed_v) + x = static_cast(static_cast<__vector signed int>(x)); + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(int)) + x = static_cast(static_cast<__vector unsigned int>(x)); +#ifdef __VSX__ + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(long long) + && std::is_signed_v) + x = static_cast(static_cast<__vector signed long long>(x)); + else if constexpr (std::is_integral_v && sizeof(T) == sizeof(long long)) + x = static_cast(static_cast<__vector unsigned long long>(x)); +#endif +#elif __ARM_NEON + if constexpr (std::is_same_v) + x = static_cast(static_cast(x)); +#ifdef __aarch64__ + else if constexpr (std::is_same_v) + x = static_cast(static_cast(x)); +#endif + else if constexpr (std::is_integral_v && sizeof(T) == 1 && std::is_signed_v) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 1) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 2 && std::is_signed_v) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 2) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 4 && std::is_signed_v) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 4) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 8 && std::is_signed_v) + x = static_cast(static_cast(x)); + else if constexpr (std::is_integral_v && sizeof(T) == 8) + x = static_cast(static_cast(x)); +#endif + } + } + +int main() +{ + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); + maybe_test(); +}