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 DD6213858D1E; Mon, 20 Feb 2023 16:31:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD6213858D1E 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 DBF282051042; Mon, 20 Feb 2023 17:31:56 +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 Av51ky4FQ3FP; Mon, 20 Feb 2023 17:31:56 +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 BF9CB2051040; Mon, 20 Feb 2023 17:31:56 +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; Mon, 20 Feb 2023 17:31:56 +0100 From: Matthias Kretz To: , Subject: [committed] libstdc++: Fix uses of non-reserved names in simd header Date: Mon, 20 Feb 2023 17:31:55 +0100 Message-ID: <12342604.nUPlyArG6x@minbar> Organization: GSI Helmholtz Centre for Heavy Ion Research MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart4329822.iZASKD2KPV" Content-Transfer-Encoding: 7Bit X-Originating-IP: [140.181.3.12] X-ClientProxiedBy: srvEX8.Campus.gsi.de (10.10.4.160) 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: --nextPart4329822.iZASKD2KPV Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" VGVzdGVkIHg4Nl82NC1wYy1saW51eC4gUHVzaGVkIHRvIHRydW5rLgoKLS0gPjggLS0KClNpZ25l ZC1vZmYtYnk6IE1hdHRoaWFzIEtyZXR6IDxtLmtyZXR6QGdzaS5kZT4KCmxpYnN0ZGMrKy12My9D aGFuZ2VMb2c6CgoJKiBpbmNsdWRlL2V4cGVyaW1lbnRhbC9iaXRzL3NpbWQuaCAoX19leHRyYWN0 X3BhcnQsIHNwbGl0KToKCVVzZSByZXNlcnZlZCBuYW1lIGZvciB0ZW1wbGF0ZSBwYXJhbWV0ZXIu Ci0tLQogbGlic3RkYysrLXYzL2luY2x1ZGUvZXhwZXJpbWVudGFsL2JpdHMvc2ltZC5oIHwgMjIg KysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDEx IGRlbGV0aW9ucygtKQoKCi0tCuKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU gOKUgOKUgOKUgOKUgAogRHIuIE1hdHRoaWFzIEtyZXR6ICAgICAgICAgICAgICAgICAgICAgICAg ICAgaHR0cHM6Ly9tYXR0a3JldHouZ2l0aHViLmlvCiBHU0kgSGVsbWhvbHR6IENlbnRyZSBmb3Ig SGVhdnkgSW9uIFJlc2VhcmNoICAgICAgICAgICAgICAgaHR0cHM6Ly9nc2kuZGUKIHN0ZOKCkzo6 c2ltZArilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDi lIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDi lIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDi lIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIA= --nextPart4329822.iZASKD2KPV Content-Disposition: inline; filename="0001-libstdc-Fix-uses-of-non-reserved-names-in-simd-heade.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="0001-libstdc-Fix-uses-of-non-reserved-names-in-simd-heade.patch" diff --git a/libstdc++-v3/include/experimental/bits/simd.h b/libstdc++-v3/include/experimental/bits/simd.h index ffe72fa6ccf..2f615d13b73 100644 --- a/libstdc++-v3/include/experimental/bits/simd.h +++ b/libstdc++-v3/include/experimental/bits/simd.h @@ -3783,7 +3783,7 @@ template _SimdWrapper<_Tp, _Np / _Total * _Combine> __extract_part(const _SimdWrapper<_Tp, _Np> __x); -template _GLIBCXX_SIMD_INTRINSIC auto __extract_part(const _SimdTuple<_Tp, _A0, _As...>& __x); @@ -3896,19 +3896,19 @@ template // split(simd) {{{ template / _V::size()> - enable_if_t == Parts * _V::size() - && is_simd_v<_V>, array<_V, Parts>> + size_t _Parts = simd_size_v / _V::size()> + enable_if_t == _Parts * _V::size() + && is_simd_v<_V>, array<_V, _Parts>> split(const simd& __x) { using _Tp = typename _V::value_type; - if constexpr (Parts == 1) + if constexpr (_Parts == 1) { return {simd_cast<_V>(__x)}; } else if (__x._M_is_constprop()) { - return __generate_from_n_evaluations>( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>( [&](auto __i) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { return _V([&](auto __j) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { return __x[__i * _V::size() + __j]; }); @@ -3925,12 +3925,12 @@ template * const __element_ptr = reinterpret_cast*>(&__data(__x)); - return __generate_from_n_evaluations>( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>( [&](auto __i) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { return _V(__element_ptr + __i * _V::size(), vector_aligned); }); #else const auto& __xx = __data(__x); - return __generate_from_n_evaluations>( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>( [&](auto __i) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { [[maybe_unused]] constexpr size_t __offset = decltype(__i)::value * _V::size(); @@ -3944,12 +3944,12 @@ template ) { // normally memcpy should work here as well - return __generate_from_n_evaluations>( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>( [&](auto __i) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { return __x[__i]; }); } else { - return __generate_from_n_evaluations>( + return __generate_from_n_evaluations<_Parts, array<_V, _Parts>>( [&](auto __i) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { if constexpr (__is_fixed_size_abi_v) return _V([&](auto __j) constexpr _GLIBCXX_SIMD_ALWAYS_INLINE_LAMBDA { @@ -3957,7 +3957,7 @@ template (__data(__x))); + __extract_part(__data(__x))); }); } } --nextPart4329822.iZASKD2KPV--