From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lxmtout2.gsi.de (lxmtout2.gsi.de [140.181.3.112]) by sourceware.org (Postfix) with ESMTPS id 465053858D39; Wed, 24 May 2023 15:04:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 465053858D39 Authentication-Results: sourceware.org; dmarc=pass (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 lxmtout2.gsi.de (Postfix) with ESMTP id 2CAEA203E7E8; Wed, 24 May 2023 17:04:33 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at lxmtout2.gsi.de Received: from lxmtout2.gsi.de ([127.0.0.1]) by localhost (lxmtout2.gsi.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id kKTAxKdKEQjQ; Wed, 24 May 2023 17:04:33 +0200 (CEST) Received: from srvEX6.campus.gsi.de (unknown [10.10.4.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lxmtout2.gsi.de (Postfix) with ESMTPS id 025D22027E5B; Wed, 24 May 2023 17:04:33 +0200 (CEST) Received: from minbar.localnet (140.181.3.12) by srvEX6.campus.gsi.de (10.10.4.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 24 May 2023 17:04:32 +0200 From: Matthias Kretz To: , Subject: [PATCH] libstdc++: Fix type of first argument to vec_cntm call Date: Wed, 24 May 2023 17:04:32 +0200 Message-ID: <7719656.MHq7AAxBmi@minbar> Organization: GSI Helmholtz Centre for Heavy Ion Research MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart5936068.taCxCBeP46" Content-Transfer-Encoding: 7Bit X-Originating-IP: [140.181.3.12] X-ClientProxiedBy: srvEX7.Campus.gsi.de (10.10.4.97) To srvEX6.campus.gsi.de (10.10.4.96) X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00,BODY_8BITS,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --nextPart5936068.taCxCBeP46 Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" T0sgZm9yIG1hc3RlciBhbmQgYmFja3BvcnRzPyAoYWxzbyBhIGxvbmctc3RhbmRpbmcgYnVnIHRo YXQgZGlkbid0IHN1cmZhY2UgCnVudGlsIHRoZSBuZXcgY29uc3RleHByIHRlc3Qgd2FzIGFkZGVk KQoKdGVzdGVkIG9uIHBvd2VycGM2NGxlLWxpbnV4LWdudQoKLS0tLS0tLS0tLS0tLSA4PCAtLS0t LS0tLS0tLS0tLS0tLQoKU2lnbmVkLW9mZi1ieTogTWF0dGhpYXMgS3JldHogPG0ua3JldHpAZ3Np LmRlPgoKbGlic3RkYysrLXYzL0NoYW5nZUxvZzoKCglQUiBsaWJzdGRjKysvMTA5OTQ5CgkqIGlu Y2x1ZGUvZXhwZXJpbWVudGFsL2JpdHMvc2ltZC5oIChfX2ludHJpbnNpY190eXBlKTogSWYKCV9f QUxUSVZFQ19fIGlzIGRlZmluZWQsIG1hcCBnbnU6OnZlY3Rvcl9zaXplIHR5cGVzIHRvIHRoZWly Cgljb3JyZXNwb25kaW5nIF9fdmVjdG9yIFQgdHlwZXMgd2l0aG91dCBsb3NpbmcgdW5zaWduZWRu ZXNzIG9mCglpbnRlZ2VyIHR5cGVzLiBBbHNvIHByZWZlciBsb25nIGxvbmcgb3ZlciBsb25nLgoJ KiBpbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWRfcHBjLmggKF9TX3BvcGNvdW50KTogQ2Fz dCBtYXNrCglvYmplY3QgdG8gdGhlIGV4cGVjdGVkIHVuc2lnbmVkIHZlY3RvciB0eXBlLgotLS0K IGxpYnN0ZGMrKy12My9pbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWQuaCB8IDM5ICsrKysr KysrKysrKysrKystLS0KIC4uLi9pbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWRfcHBjLmgg ICAgICB8ICAzICstCiAyIGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDYgZGVsZXRp b25zKC0pCgoKLS0K4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSACiBEci4gTWF0dGhpYXMgS3JldHogICAgICAgICAgICAgICAgICAgICAgICAgICBodHRw czovL21hdHRrcmV0ei5naXRodWIuaW8KIEdTSSBIZWxtaG9sdHogQ2VudHJlIGZvciBIZWF2eSBJ b24gUmVzZWFyY2ggICAgICAgICAgICAgICBodHRwczovL2dzaS5kZQogc3Rk4oKTOjpzaW1kCuKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgA== --nextPart5936068.taCxCBeP46 Content-Disposition: inline; filename="0001-libstdc-Fix-type-of-first-argument-to-vec_cntm-call.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="0001-libstdc-Fix-type-of-first-argument-to-vec_cntm-call.patch" diff --git a/libstdc++-v3/include/experimental/bits/simd.h b/libstdc++-v3/include/experimental/bits/simd.h index d1f388310f9..26f08f83ab0 100644 --- a/libstdc++-v3/include/experimental/bits/simd.h +++ b/libstdc++-v3/include/experimental/bits/simd.h @@ -2466,11 +2466,40 @@ struct __intrinsic_type<_Tp, _Bytes, enable_if_t<__is_vectorizable_v<_Tp> && _By "no __intrinsic_type support for 64-bit floating point on PowerPC w/o VSX"); #endif - using type = - typename __intrinsic_type_impl< - conditional_t, - conditional_t<_S_is_ldouble, double, _Tp>, - __int_for_sizeof_t<_Tp>>>::type; + static constexpr auto __element_type() + { + if constexpr (is_floating_point_v<_Tp>) + { + if constexpr (_S_is_ldouble) + return double {}; + else + return _Tp {}; + } + else if constexpr (is_signed_v<_Tp>) + { + if constexpr (sizeof(_Tp) == sizeof(_SChar)) + return _SChar {}; + else if constexpr (sizeof(_Tp) == sizeof(short)) + return short {}; + else if constexpr (sizeof(_Tp) == sizeof(int)) + return int {}; + else if constexpr (sizeof(_Tp) == sizeof(_LLong)) + return _LLong {}; + } + else + { + if constexpr (sizeof(_Tp) == sizeof(_UChar)) + return _UChar {}; + else if constexpr (sizeof(_Tp) == sizeof(_UShort)) + return _UShort {}; + else if constexpr (sizeof(_Tp) == sizeof(_UInt)) + return _UInt {}; + else if constexpr (sizeof(_Tp) == sizeof(_ULLong)) + return _ULLong {}; + } + } + + using type = typename __intrinsic_type_impl::type; }; #endif // __ALTIVEC__ diff --git a/libstdc++-v3/include/experimental/bits/simd_ppc.h b/libstdc++-v3/include/experimental/bits/simd_ppc.h index eca1b34241b..2ea7234bd99 100644 --- a/libstdc++-v3/include/experimental/bits/simd_ppc.h +++ b/libstdc++-v3/include/experimental/bits/simd_ppc.h @@ -130,7 +130,8 @@ _S_popcount(simd_mask<_Tp, _Abi> __k) const auto __kv = __as_vector(__k); if constexpr (__have_power10vec) { - return vec_cntm(__to_intrin(__kv), 1); + using _Intrin = __intrinsic_type16_t>>; + return vec_cntm(reinterpret_cast<_Intrin>(__kv), 1); } else if constexpr (sizeof(_Tp) >= sizeof(int)) { --nextPart5936068.taCxCBeP46--