From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lxmtout1.gsi.de (lxmtout1.gsi.de [140.181.3.111]) by sourceware.org (Postfix) with ESMTPS id 5817E394FC36; Tue, 8 Jun 2021 12:11:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5817E394FC36 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gsi.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gsi.de Received: from localhost (localhost [127.0.0.1]) by lxmtout1.gsi.de (Postfix) with ESMTP id 675DF2050D0A; Tue, 8 Jun 2021 14:11:38 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at lxmtout1.gsi.de Received: from lxmtout1.gsi.de ([127.0.0.1]) by localhost (lxmtout1.gsi.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id cL0wb7KhdQcj; Tue, 8 Jun 2021 14:11:38 +0200 (CEST) Received: from srvex3.campus.gsi.de (unknown [10.10.4.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by lxmtout1.gsi.de (Postfix) with ESMTPS id 4BE602050D00; Tue, 8 Jun 2021 14:11:38 +0200 (CEST) Received: from excalibur.localnet (140.181.3.12) by srvex3.campus.gsi.de (10.10.4.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2242.10; Tue, 8 Jun 2021 14:11:37 +0200 From: Matthias Kretz To: , Subject: [PATCH 04/11] libstdc++: Make use of __builtin_bit_cast Date: Tue, 8 Jun 2021 14:11:37 +0200 Message-ID: <3553838.ebMzRN9Arp@excalibur> Organization: GSI Helmholtzzentrum =?UTF-8?B?ZsO8cg==?= Schwerionenforschung In-Reply-To: <270527782.u9WJ3AIrlG@excalibur> References: <270527782.u9WJ3AIrlG@excalibur> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart4273537.CdeeP7ohKn" Content-Transfer-Encoding: 7Bit X-Originating-IP: [140.181.3.12] X-ClientProxiedBy: SRVEX2.campus.gsi.de (10.10.4.15) To srvex3.campus.gsi.de (10.10.4.16) X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, BODY_8BITS, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_SBL, URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 12:11:41 -0000 --nextPart4273537.CdeeP7ohKn Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" CgpGcm9tOiBNYXR0aGlhcyBLcmV0eiA8a3JldHpAa2RlLm9yZz4KClRoZSBfX2JpdF9jYXN0IGZ1 bmN0aW9uIHdhcyBhIGhhY2sgdG8gYWNoaWV2ZSB3aGF0IF9fYnVpbHRpbl9iaXRfY2FzdApjYW4g ZG8sIHRoZXJlZm9yZSB1c2UgX19idWlsdGluX2JpdF9jYXN0IGlmIHBvc3NpYmxlLiBIb3dldmVy LApfX2J1aWx0aW5fYml0X2Nhc3QgY2Fubm90IGJlIHVzZWQgdG8gY2FzdCBmcm9tL3RvIGZpeGVk X3NpemVfc2ltZCwgc2luY2UKaXQgaXNuJ3QgdHJpdmlhbGx5IGNvcHlhYmxlIChpbiB0aGUgbGFu Z3VhZ2Ugc2Vuc2Ug4oCUIGluIHByaW5jaXBsZSBpdAppcykuIFRoZXJlZm9yZSBhZGQgX19wcm9w b3NlZDo6c2ltZF9iaXRfY2FzdCB0byBlbmFibGUgdGhlIHVzZSBjYXNlCnJlcXVpcmVkIGluIHRo ZSB0ZXN0IGZyYW1ld29yay4KClNpZ25lZC1vZmYtYnk6IE1hdHRoaWFzIEtyZXR6IDxtLmtyZXR6 QGdzaS5kZT4KCmxpYnN0ZGMrKy12My9DaGFuZ2VMb2c6CgoJKiBpbmNsdWRlL2V4cGVyaW1lbnRh bC9iaXRzL3NpbWQuaCAoX19iaXRfY2FzdCk6IEltcGxlbWVudCB2aWEKCV9fYnVpbHRpbl9iaXRf Y2FzdCAjaWYgYXZhaWxhYmxlLgoJKF9fcHJvcG9zZWQ6OnNpbWRfYml0X2Nhc3QpOiBBZGQgb3Zl cmxvYWRzIGZvciBzaW1kIGFuZAoJc2ltZF9tYXNrLCB3aGljaCB1c2UgX19idWlsdGluX2JpdF9j YXN0IChvciBfX2JpdF9jYXN0ICNpZiBub3QKCWF2YWlsYWJsZSksIHdoaWNoIHJldHVybiBhbiBv YmplY3Qgb2YgdGhlIHJlcXVlc3RlZCB0eXBlIHdpdGgKCXRoZSBzYW1lIGJpdHMgYXMgdGhlIGFy Z3VtZW50LgoJKiBpbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWRfbWF0aC5oOiBVc2Ugc2lt ZF9iaXRfY2FzdAoJaW5zdGVhZCBvZiBfX2JpdF9jYXN0IHRvIGFsbG93IGNhc3RzIHRvIGZpeGVk X3NpemVfc2ltZC4KCSogdGVzdHN1aXRlL2V4cGVyaW1lbnRhbC9zaW1kL3Rlc3RzL2JpdHMvdGVz dF92YWx1ZXMuaDogU3dpdGNoCglmcm9tIF9fYml0X2Nhc3QgdG8gX19wcm9wb3NlZDo6c2ltZF9i aXRfY2FzdCBzaW5jZSB0aGUgZm9ybWVyCgl3aWxsIG5vdCBjYXN0IGZpeGVkX3NpemUgb2JqZWN0 cyBhbnltb3JlLgotLS0KIGxpYnN0ZGMrKy12My9pbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3Np bWQuaCB8IDQwICsrKysrKysrKysrKysrKysrKy0KIC4uLi9pbmNsdWRlL2V4cGVyaW1lbnRhbC9i aXRzL3NpbWRfbWF0aC5oICAgICB8ICA4ICsrLS0KIC4uLi9zaW1kL3Rlc3RzL2JpdHMvdGVzdF92 YWx1ZXMuaCAgICAgICAgICAgICB8ICA4ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0 aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgoKLS0K4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSACiBEci4gTWF0dGhpYXMgS3JldHogICAgICAgICAgICAg ICAgICAgICAgICAgICBodHRwczovL21hdHRrcmV0ei5naXRodWIuaW8KIEdTSSBIZWxtaG9sdHog Q2VudHJlIGZvciBIZWF2eSBJb24gUmVzZWFyY2ggICAgICAgICAgICAgICBodHRwczovL2dzaS5k ZQogc3RkOjpleHBlcmltZW50YWw6OnNpbWQgICAgICAgICAgICAgIGh0dHBzOi8vZ2l0aHViLmNv bS9WY0RldmVsL3N0ZC1zaW1kCuKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgA== --nextPart4273537.CdeeP7ohKn Content-Disposition: inline; filename="0004-libstdc-Make-use-of-__builtin_bit_cast.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="0004-libstdc-Make-use-of-__builtin_bit_cast.patch" diff --git a/libstdc++-v3/include/experimental/bits/simd.h b/libstdc++-v3/include/experimental/bits/simd.h index 163f1b574e2..5d243f22434 100644 --- a/libstdc++-v3/include/experimental/bits/simd.h +++ b/libstdc++-v3/include/experimental/bits/simd.h @@ -1598,7 +1598,9 @@ template _GLIBCXX_SIMD_INTRINSIC constexpr _To __bit_cast(const _From __x) { - // TODO: implement with / replace by __builtin_bit_cast ASAP +#if __has_builtin(__builtin_bit_cast) + return __builtin_bit_cast(_To, __x); +#else static_assert(sizeof(_To) == sizeof(_From)); constexpr bool __to_is_vectorizable = is_arithmetic_v<_To> || is_enum_v<_To>; @@ -1629,6 +1631,7 @@ template reinterpret_cast(&__x), sizeof(_To)); return __r; } +#endif } // }}} @@ -2900,6 +2903,41 @@ template (__x)}; } + +template + _GLIBCXX_SIMD_INTRINSIC _GLIBCXX_SIMD_CONSTEXPR + _To + simd_bit_cast(const simd<_Up, _Abi>& __x) + { + using _Tp = typename _To::value_type; + using _ToMember = typename _SimdTraits<_Tp, typename _To::abi_type>::_SimdMember; + using _From = simd<_Up, _Abi>; + using _FromMember = typename _SimdTraits<_Up, _Abi>::_SimdMember; + // with concepts, the following should be constraints + static_assert(sizeof(_To) == sizeof(_From)); + static_assert(is_trivially_copyable_v<_Tp> && is_trivially_copyable_v<_Up>); + static_assert(is_trivially_copyable_v<_ToMember> && is_trivially_copyable_v<_FromMember>); +#if __has_builtin(__builtin_bit_cast) + return {__private_init, __builtin_bit_cast(_ToMember, __data(__x))}; +#else + return {__private_init, __bit_cast<_ToMember>(__data(__x))}; +#endif + } + +template + _GLIBCXX_SIMD_INTRINSIC _GLIBCXX_SIMD_CONSTEXPR + _To + simd_bit_cast(const simd_mask<_Up, _Abi>& __x) + { + using _From = simd_mask<_Up, _Abi>; + static_assert(sizeof(_To) == sizeof(_From)); + static_assert(is_trivially_copyable_v<_To> && is_trivially_copyable_v<_From>); +#if __has_builtin(__builtin_bit_cast) + return __builtin_bit_cast(_To, __x); +#else + return __bit_cast<_To>(__x); +#endif + } } // namespace __proposed // simd_cast {{{2 diff --git a/libstdc++-v3/include/experimental/bits/simd_math.h b/libstdc++-v3/include/experimental/bits/simd_math.h index d954e761eee..3ade293fcbf 100644 --- a/libstdc++-v3/include/experimental/bits/simd_math.h +++ b/libstdc++-v3/include/experimental/bits/simd_math.h @@ -700,11 +700,9 @@ template // (inf and NaN are excluded by -ffinite-math-only) const auto __iszero_inf_nan = __x == 0; #else - const auto __as_int - = __bit_cast, _V>>(abs(__x)); - const auto __inf - = __bit_cast, _V>>( - _V(__infinity_v<_Tp>)); + using _Ip = __int_for_sizeof_t<_Tp>; + const auto __as_int = simd_bit_cast>(abs(__x)); + const auto __inf = simd_bit_cast>(_V(__infinity_v<_Tp>)); const auto __iszero_inf_nan = static_simd_cast( __as_int == 0 || __as_int >= __inf); #endif diff --git a/libstdc++-v3/testsuite/experimental/simd/tests/bits/test_values.h b/libstdc++-v3/testsuite/experimental/simd/tests/bits/test_values.h index b69bd0b704d..67aa870659b 100644 --- a/libstdc++-v3/testsuite/experimental/simd/tests/bits/test_values.h +++ b/libstdc++-v3/testsuite/experimental/simd/tests/bits/test_values.h @@ -221,11 +221,11 @@ template if constexpr (sizeof(T) <= sizeof(double)) { using I = rebind_simd_t<__int_for_sizeof_t, V>; - const I abs_x = __bit_cast(abs(x)); - const I min = __bit_cast(V(std::__norm_min_v)); - const I max = __bit_cast(V(std::__finite_max_v)); + const I abs_x = simd_bit_cast(abs(x)); + const I min = simd_bit_cast(V(std::__norm_min_v)); + const I max = simd_bit_cast(V(std::__finite_max_v)); return static_simd_cast( - __bit_cast(x) == 0 || (abs_x >= min && abs_x <= max)); + simd_bit_cast(x) == 0 || (abs_x >= min && abs_x <= max)); } else { --nextPart4273537.CdeeP7ohKn--