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 DFFBF3857007; Tue, 21 Mar 2023 17:01:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFFBF3857007 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 lxmtout1.gsi.de (Postfix) with ESMTP id BB5EA2051042; Tue, 21 Mar 2023 18:01:23 +0100 (CET) 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 ICwNkixSbgJQ; Tue, 21 Mar 2023 18:01:23 +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 lxmtout1.gsi.de (Postfix) with ESMTPS id 9E20B2051040; Tue, 21 Mar 2023 18:01:23 +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.26; Tue, 21 Mar 2023 18:01:23 +0100 From: Matthias Kretz To: , Subject: [committed] libstdc++: Fix simd compilation with Clang Date: Tue, 21 Mar 2023 18:01:22 +0100 Message-ID: <27030948.6Emhk5qWAg@minbar> Organization: GSI Helmholtz Centre for Heavy Ion Research In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart6573655.Lt9SDvczpP" 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: --nextPart6573655.Lt9SDvczpP Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" U2xpZ2h0bHkgbW9kaWZpZWQgcGF0Y2guIEkgaGFkIHRvIGZpeCBmbG9hdGluZy1wb2ludCBBVlg1 MTIgYmxlbmRpbmcgb24gCkNsYW5nIGJ5IHJlbW92aW5nIGEgY2FzdC4gV2hpbGUgYXQgaXQgSSBj bGVhbmVkIHVwIHRoZSAtV3VuZGVmIG5vaXNlLgoKLS0tLS0gODwgLS0tLS0tCgpDbGFuZyBmYWls cyB0byBjb21waWxlIHNvbWUgY29uc3RhbnQgZXhwcmVzc2lvbnMgaW52b2x2aW5nIHNpbWQuClRo ZXJlZm9yZSwganVzdCBkaXNhYmxlIHRoaXMgbm9uLWNvbmZvcm1pbmcgZXh0ZW5zaW9uIGZvciBj bGFuZy4KCkZpeCBBVlg1MTIgYmxlbmQgaW1wbGVtZW50YXRpb24gZm9yIENsYW5nLiBJdCB3YXMg Y29udmVydGluZyB0aGUgYml0bWFzawp0byBib29sIGJlZm9yZSwgd2hpY2ggaXMgb2J2aW91c2x5 IHdyb25nLiBJbnN0ZWFkIHVzZSBhIENsYW5nIGJ1aWx0aW4gdG8KY29udmVydCB0aGUgYml0bWFz ayB0byB2ZWN0b3ItbWFzayBiZWZvcmUgdXNpbmcgYSB2ZWN0b3IgYmxlbmQgPzouIEEKc2ltaWxh ciBjaGFuZ2UgaXMgcmVxdWlyZWQgZm9yIHRoZSBtYXNrZWQgdW5hcnkgaW1wbGVtZW50YXRpb24s IGJlY2F1c2UKdGhlIEdDQyBidWlsdGlucyBkbyBub3QgZXhpc3Qgb24gQ2xhbmcuCgpTaWduZWQt b2ZmLWJ5OiBNYXR0aGlhcyBLcmV0eiA8bS5rcmV0ekBnc2kuZGU+CgpsaWJzdGRjKystdjMvQ2hh bmdlTG9nOgoKCSogaW5jbHVkZS9leHBlcmltZW50YWwvYml0cy9zaW1kX2RldGFpbC5oOiBEb24n dCBkZWNsYXJlIHRoZQoJc2ltZCBBUEkgYXMgY29uc3RleHByIHdpdGggQ2xhbmcuCgkqIGluY2x1 ZGUvZXhwZXJpbWVudGFsL2JpdHMvc2ltZF94ODYuaCAoX19tb3ZtKTogTmV3LgoJKF9TX2JsZW5k X2F2eDUxMik6IFJlc29sdmUgRklYTUUuIEltcGxlbWVudCBibGVuZCB1c2luZyBfX21vdm0KCWFu ZCA/Oi4KCShfU2ltZEltcGxYODY6Ol9TX21hc2tlZF91bmFyeSk6IENsYW5nIGRvZXMgbm90IGlt cGxlbWVudCB0aGUKCXNhbWUgYnVpbHRpbnMuIEltcGxlbWVudCB0aGUgZnVuY3Rpb24gdXNpbmcg X19tb3ZtLCA/OiwgYW5kIC0KCW9wZXJhdG9ycyBvbiB2ZWN0b3Jfc2l6ZSB0eXBlcyBpbnN0ZWFk LgotLS0KIC4uLi9pbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWRfZGV0YWlsLmggICB8ICAy ICstCiAuLi4vaW5jbHVkZS9leHBlcmltZW50YWwvYml0cy9zaW1kX3g4Ni5oICAgICAgfCA1OCAr KysrKysrKysrKysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDUg ZGVsZXRpb25zKC0pCgoKLS0K4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA 4pSA4pSA4pSA4pSACiBEci4gTWF0dGhpYXMgS3JldHogICAgICAgICAgICAgICAgICAgICAgICAg ICBodHRwczovL21hdHRrcmV0ei5naXRodWIuaW8KIEdTSSBIZWxtaG9sdHogQ2VudHJlIGZvciBI ZWF2eSBJb24gUmVzZWFyY2ggICAgICAgICAgICAgICBodHRwczovL2dzaS5kZQogc3Rk4oKTOjpz aW1kCuKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgA== --nextPart6573655.Lt9SDvczpP Content-Disposition: inline; filename="0001-libstdc-Fix-simd-compilation-with-Clang.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="0001-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..49b94decf0a 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 __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..7b8f1c664b3 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,9 @@ _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 __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 +3575,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); --nextPart6573655.Lt9SDvczpP--