From patchwork Fri Jun 30 03:48:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 114547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10081305vqr; Thu, 29 Jun 2023 20:49:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlGf+jkfOfxDqXZxAUmXfM2eDT3Ml0DkiChcwSpoUByBGioVWjLIUESg4s4JUJN+w+uUbaN/ X-Received: by 2002:a2e:98d6:0:b0:2b6:9930:871 with SMTP id s22-20020a2e98d6000000b002b699300871mr1105792ljj.13.1688096984166; Thu, 29 Jun 2023 20:49:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688096984; cv=none; d=google.com; s=arc-20160816; b=HP/HQ29KwbwocVm3ZIwRHtDVs0Tpdj1UUGT3iMoKJJ1UOYFmOFqVa583wu0NdY2Abv 78OeHRMN5H+ILDup626Y0bksSSrAWW8LEnbm31fTplc6iwr8UaDdod16cJAJI9eUz4lF TEZWNAVhWQXIrjMJuyFoXWGrfttz+IgKnW4hDo+pBIQ0rdgg2z8I1EnWwiRA6mAAzc7y YL9g/ZVTxm6wJakc56k06FozM0E3m3/HMAhi3KckdERDSLXBfavEhqO6/MdIOewKpEJM UamQxFLd4KpUFSCwd9hxjIlJEMtEMC8g5WT0kbYbaH9AYp1SMxu1LQd8gpn4byLD+Rxh WxmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:date:message-id :references:content-transfer-encoding:mime-version:subject :in-reply-to:cc:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=xeMOMNmxOE0f6JannPjHVweXSMYfqXcy9KLO3tLsZzQ=; fh=tfhXZeGRYndXzCkreX65xDu/bx8Qg9wDgNkxXs/z398=; b=LbWbTf2zicLpkK+yVF5z+qTapyzDWA0tVS2THtHt8BJn5EdAIxKlCH1SiIDl4kYIFI pEyqvQ05g7a5zEKNilLMmLKzjFIpY6h/dkauZpM+96t8xKOwb93T4uWIW877W84Mj49o 6UWTsTsdXO3kpeZa3Fm2fc06erV1pXTHCLz5j3Pxeaf/4I+S6pfkoBXbEG7zC8rjCP2o aI3kVWyt6tou1jfiWQO+xvJzJP4gfIXQ/9QrvCSqe6rJA5GCiWJXTMX8tzFxbnoWXACM a4vcUCiMRDry2PupQKNQetdusnMgBuqt4FpKlCiYkE4oO+RqdrEHVkDP/APGo5HdHCyN t+FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="c9EcR/jr"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i12-20020a170906264c00b0098be1e9150fsi8450623ejc.298.2023.06.29.20.49.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 20:49:44 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="c9EcR/jr"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 297053857701 for ; Fri, 30 Jun 2023 03:49:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 297053857701 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688096974; bh=xeMOMNmxOE0f6JannPjHVweXSMYfqXcy9KLO3tLsZzQ=; h=To:CC:In-Reply-To:Subject:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=c9EcR/jrNnZRsyi5M8747iEtFUtBMza3C6p70NxmfQH5aaKSawb04WgIArlHrmWdl CxbgJTgCuYCknoX9LG+nWbdsOzrXXj9SrJLuyW5ZGf+nQ7bPImZoah6qCRwgYJv9WC VM3kjSKGMwHg6xlvp3XGfsZrqCBF+5DLQb5ovnZE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by sourceware.org (Postfix) with ESMTPS id 8E5303858D37; Fri, 30 Jun 2023 03:48:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E5303858D37 To: Thomas Rodgers CC: , , In-Reply-To: (message from Thomas Rodgers via Gcc-patches on Mon, 26 Jun 2023 11:57:49 -0700) Subject: PR108672 re-fixed after [PATCH] libstdc++: Synchronize PSTL with upstream MIME-Version: 1.0 References: Message-ID: <20230630034847.0D200203F8@pchp3.se.axis.com> Date: Fri, 30 Jun 2023 05:48:47 +0200 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Hans-Peter Nilsson via Gcc-patches From: Hans-Peter Nilsson Reply-To: Hans-Peter Nilsson Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770097983332526067?= X-GMAIL-MSGID: =?utf-8?q?1770097983332526067?= > Date: Mon, 26 Jun 2023 11:57:49 -0700 > From: Thomas Rodgers via Gcc-patches > On Wed, May 17, 2023 at 12:32 PM Jonathan Wakely wrote: > > All the actual code changes look good. Unfortunately, this overwrote the fix for PR108672. I take it there's a step missing from the synchronization process; a check that no local commits are overwritten? Sounds like something that can be fully scripted (not volunteering) or already available (like, "list all commits affecting contents touched by/between two named commits"). I did *not* check whether any other local commits were also overwritten. Also, not sure about whether better try to get this upstreamed: __INT32_TYPE__ seems gcc-specific. Anyway, r13-5702-g72058eea9d407e was "re-committed" per below as obvious after regtesting cris-elf. brgds, H-P -- >8 -- Subject: libstdc++: Re-apply PR108672 fix (avoid use of naked int32_t in unseq_backend_simd.h) The fix was overwritten by r14-2109-g3162ca09dbdc2e "libstdc++: Synchronize PSTL with upstream". libstdc++-v3: PR libstdc++/108672 * include/pstl/unseq_backend_simd.h (__simd_or): Re-apply using __INT32_TYPE__ instead of int32_t. --- libstdc++-v3/include/pstl/unseq_backend_simd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/pstl/unseq_backend_simd.h b/libstdc++-v3/include/pstl/unseq_backend_simd.h index 69784bcdbe66..f3c38fbbbc2a 100644 --- a/libstdc++-v3/include/pstl/unseq_backend_simd.h +++ b/libstdc++-v3/include/pstl/unseq_backend_simd.h @@ -74,7 +74,7 @@ __simd_or(_Index __first, _DifferenceType __n, _Pred __pred) noexcept const _Index __last = __first + __n; while (__last != __first) { - int32_t __flag = 1; + __INT32_TYPE__ __flag = 1; _PSTL_PRAGMA_SIMD_REDUCTION(& : __flag) for (_DifferenceType __i = 0; __i < __block_size; ++__i) if (__pred(*(__first + __i)))