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 738523850201; Tue, 21 Mar 2023 09:23:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 738523850201 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 ACB95203E804; Tue, 21 Mar 2023 10:23:11 +0100 (CET) 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 0KZ7aPrQrJW7; Tue, 21 Mar 2023 10:23:11 +0100 (CET) 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 8CB03203E7FC; Tue, 21 Mar 2023 10:23:11 +0100 (CET) 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.25; Tue, 21 Mar 2023 10:23:11 +0100 From: Matthias Kretz To: , Subject: [PATCH 2/2] libstdc++: Fix simd compilation with Clang Date: Tue, 21 Mar 2023 10:23:10 +0100 Message-ID: <25835488.EfDdHjke4D@minbar> Organization: GSI Helmholtz Centre for Heavy Ion Research In-Reply-To: <6895974.e9J7NaK4W3@minbar> References: <6895974.e9J7NaK4W3@minbar> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart11522500.EvYhyI6sBW" Content-Transfer-Encoding: 7Bit X-Originating-IP: [140.181.3.12] X-ClientProxiedBy: srvex5.Campus.gsi.de (10.10.4.95) To srvEX6.campus.gsi.de (10.10.4.96) X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00,BODY_8BITS,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP 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: --nextPart11522500.EvYhyI6sBW Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" CgpDbGFuZyBmYWlscyB0byBjb21waWxlIHNvbWUgY29uc3RhbnQgZXhwcmVzc2lvbnMgaW52b2x2 aW5nIHNpbWQuClRoZXJlZm9yZSwganVzdCBkaXNhYmxlIHRoaXMgbm9uLWNvbmZvcm1pbmcgZXh0 ZW5zaW9uIGZvciBjbGFuZy4KCkZpeCBBVlg1MTIgYmxlbmQgaW1wbGVtZW50YXRpb24gZm9yIENs YW5nLiBJdCB3YXMgY29udmVydGluZyB0aGUgYml0bWFzawp0byBib29sIGJlZm9yZSwgd2hpY2gg aXMgb2J2aW91c2x5IHdyb25nLiBJbnN0ZWFkIHVzZSBhIENsYW5nIGJ1aWx0aW4gdG8KY29udmVy dCB0aGUgYml0bWFzayB0byB2ZWN0b3ItbWFzayBiZWZvcmUgdXNpbmcgYSB2ZWN0b3IgYmxlbmQg PzouIEEKc2ltaWxhciBjaGFuZ2UgaXMgcmVxdWlyZWQgZm9yIHRoZSBtYXNrZWQgdW5hcnkgaW1w bGVtZW50YXRpb24sIGJlY2F1c2UKdGhlIEdDQyBidWlsdGlucyBkbyBub3QgZXhpc3Qgb24gQ2xh bmcuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGlhcyBLcmV0eiA8bS5rcmV0ekBnc2kuZGU+CgpsaWJz dGRjKystdjMvQ2hhbmdlTG9nOgoKCSogaW5jbHVkZS9leHBlcmltZW50YWwvYml0cy9zaW1kX2Rl dGFpbC5oOiBEb24ndCBkZWNsYXJlIHRoZQoJc2ltZCBBUEkgYXMgY29uc3RleHByIHdpdGggQ2xh bmcuCgkqIGluY2x1ZGUvZXhwZXJpbWVudGFsL2JpdHMvc2ltZF94ODYuaCAoX19tb3ZtKTogTmV3 LgoJKF9TX2JsZW5kX2F2eDUxMik6IFJlc29sdmUgRklYTUUuIEltcGxlbWVudCBibGVuZCB1c2lu ZyBfX21vdm0KCWFuZCA/Oi4KCShfU2ltZEltcGxYODY6Ol9TX21hc2tlZF91bmFyeSk6IENsYW5n IGRvZXMgbm90IGltcGxlbWVudCB0aGUKCXNhbWUgYnVpbHRpbnMuIEltcGxlbWVudCB0aGUgZnVu Y3Rpb24gdXNpbmcgX19tb3ZtLCA/OiwgYW5kIC0KCW9wZXJhdG9ycyBvbiB2ZWN0b3Jfc2l6ZSB0 eXBlcyBpbnN0ZWFkLgotLS0KIC4uLi9pbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWRfZGV0 YWlsLmggICB8ICAyICstCiAuLi4vaW5jbHVkZS9leHBlcmltZW50YWwvYml0cy9zaW1kX3g4Ni5o ICAgICAgfCA1OSArKysrKysrKysrKysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDU2IGluc2Vy dGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgoKLS0K4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSACiBEci4gTWF0dGhpYXMgS3JldHogICAgICAgICAgICAg ICAgICAgICAgICAgICBodHRwczovL21hdHRrcmV0ei5naXRodWIuaW8KIEdTSSBIZWxtaG9sdHog Q2VudHJlIGZvciBIZWF2eSBJb24gUmVzZWFyY2ggICAgICAgICAgICAgICBodHRwczovL2dzaS5k ZQogc3Rk4oKTOjpzaW1kCuKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgA== --nextPart11522500.EvYhyI6sBW Content-Disposition: inline; filename="0002-libstdc-Fix-simd-compilation-with-Clang.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="0002-libstdc-Fix-simd-compilation-with-Clang.patch" diff --git a/libstdc++-v3/include/experimental/bits/simd_detail.h b/libstdc++-v3/include/experimental/bits/simd_detail.h index 30cc1ef0eef..f3745bf3e4c 100644 --- a/libstdc++-v3/include/experimental/bits/simd_detail.h +++ b/libstdc++-v3/include/experimental/bits/simd_detail.h @@ -267,7 +267,7 @@ namespace experimental #define _GLIBCXX_SIMD_IS_UNLIKELY(__x) __builtin_expect(__x, 0) #define _GLIBCXX_SIMD_IS_LIKELY(__x) __builtin_expect(__x, 1) -#if defined __STRICT_ANSI__ && __STRICT_ANSI__ +#if (defined __STRICT_ANSI__ && __STRICT_ANSI__) || defined __clang__ #define _GLIBCXX_SIMD_CONSTEXPR #define _GLIBCXX_SIMD_USE_CONSTEXPR_API const #else diff --git a/libstdc++-v3/include/experimental/bits/simd_x86.h b/libstdc++-v3/include/experimental/bits/simd_x86.h index 608918542c6..165738c4e2c 100644 --- a/libstdc++-v3/include/experimental/bits/simd_x86.h +++ b/libstdc++-v3/include/experimental/bits/simd_x86.h @@ -363,6 +363,53 @@ __maskload_pd(const double* __ptr, _Tp __k) // }}} +#ifdef __clang__ +template + _GLIBCXX_SIMD_INTRINSIC constexpr auto + __movm(_Kp __k) noexcept + { + static_assert(is_unsigned_v<_Kp>); + if constexpr (sizeof(_Tp) == 1 && __have_avx512bw) + { + if constexpr (_Np <= 16 && __have_avx512vl) + return __builtin_ia32_cvtmask2b128(__k); + else if constexpr (_Np <= 32 && __have_avx512vl) + return __builtin_ia32_cvtmask2b256(__k); + else + return __builtin_ia32_cvtmask2b512(__k); + } + else if constexpr (sizeof(_Tp) == 2 && __have_avx512bw) + { + if constexpr (_Np <= 8 && __have_avx512vl) + return __builtin_ia32_cvtmask2w128(__k); + else if constexpr (_Np <= 16 && __have_avx512vl) + return __builtin_ia32_cvtmask2w256(__k); + else + return __builtin_ia32_cvtmask2w512(__k); + } + else if constexpr (sizeof(_Tp) == 4 && __have_avx512dq) + { + if constexpr (_Np <= 4 && __have_avx512vl) + return __builtin_ia32_cvtmask2d128(__k); + else if constexpr (_Np <= 8 && __have_avx512vl) + return __builtin_ia32_cvtmask2d256(__k); + else + return __builtin_ia32_cvtmask2d512(__k); + } + else if constexpr (sizeof(_Tp) == 8 && __have_avx512dq) + { + if constexpr (_Np <= 2 && __have_avx512vl) + return __builtin_ia32_cvtmask2q128(__k); + else if constexpr (_Np <= 4 && __have_avx512vl) + return __builtin_ia32_cvtmask2q256(__k); + else + return __builtin_ia32_cvtmask2q512(__k); + } + else + __assert_unreachable<_Tp>(); + } +#endif // __clang__ + #ifdef _GLIBCXX_SIMD_WORKAROUND_PR85048 #include "simd_x86_conversions.h" #endif @@ -619,14 +666,13 @@ _pdep_u32( _GLIBCXX_SIMD_INTRINSIC static _TV _S_blend_avx512(const _Kp __k, const _TV __a, const _TV __b) noexcept { -#ifdef __clang__ - // FIXME: this does a boolean choice, not a blend - return __k ? __a : __b; -#else static_assert(__is_vector_type_v<_TV>); using _Tp = typename _VectorTraits<_TV>::value_type; static_assert(sizeof(_TV) >= 16); static_assert(sizeof(_Tp) <= 8); +#ifdef __clang__ + return __movm<_VectorTraits<_TV>::_S_full_size, _Tp>(__k) ? __b : __a; +#else using _IntT = conditional_t<(sizeof(_Tp) > 2), conditional_t, @@ -3483,6 +3529,10 @@ _S_masked_unary(const _SimdWrapper<_K, _Np> __k, const _SimdWrapper<_Tp, _Np> __ // optimize masked unary increment and decrement as masked sub +/-1 constexpr int __pm_one = is_same_v<_Op, __increment> ? -1 : 1; +#ifdef __clang__ + return __vector_bitcast<_Tp, _Np>(__movm<_Np, _Tp>(__k._M_data)) + ? __v._M_data - __pm_one : __v._M_data; +#else // __clang__ if constexpr (is_integral_v<_Tp>) { constexpr bool __lp64 = sizeof(long) == sizeof(long long); @@ -3526,6 +3576,7 @@ _S_masked_unary(const _SimdWrapper<_K, _Np> __k, const _SimdWrapper<_Tp, _Np> __ _GLIBCXX_SIMD_MASK_SUB(8, 16, subpd128); #undef _GLIBCXX_SIMD_MASK_SUB } +#endif // __clang__ } else return _Base::template _S_masked_unary<_Op>(__k, __v); --nextPart11522500.EvYhyI6sBW--