From nobody Wed Jun 28 18:15:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QrqWG2GSqz4kXw6; Wed, 28 Jun 2023 18:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QrqWG1jXwz48ts; Wed, 28 Jun 2023 18:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687976122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OL267aC1C5s18Yaf8kKUpAvIWdE+lsiLf7HvywgMXEc=; b=W9OTQaYS8sFgPnxK5SmUHhj3u6NDZoJxlp9JSrCRpO34LKb5seDmbXRm6D9CRLLTkK5zaA BNn2yDhWYHaYaPyYC5XM445Z2T9hVW69eFKSxxoE6290SnWSkuFu6hK8S6GQO3cGMmgdtO /r7a9mBKnV9Bcghn766H+P/jYFtRgsa6DELpXPn4vlAVzdb0fnb5jRh72KE/rzQ3xh8m1q S95EoyRcE0zYA8nSjLS7BctPNGbiBHI0lZKMpnwUX/KTORwoZke1ky/MiiwaO2cBERW1pa b/ele0umQuMnmImdCzliZ0wOMcsLWCE0PFI2ax0IHSmsT7tfLEdupVGmZW0zeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687976122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OL267aC1C5s18Yaf8kKUpAvIWdE+lsiLf7HvywgMXEc=; b=etmwUV75tBOi8V7IJWj+d4LbQrlPKTadbdfnNdVIMOEyeVHsmCj+fGef13joMgqP9gihk+ WV3QfE22mGptmebjo6S7/24l3JoUDb4+YE5iiqReIAdqrWc+EO9oDMHNyNTtniacaJMyIL ZRhC52QvMA19HWAK54e4LuDOJ6AOVwgOuZfjtD650y8Llf5gmyXiXTsBU2YumHNB1qPeIv SCgkWvjCHjmL0nze04TmcQsnmSMdfjhlXUp3muM9NDh0gSezBQWjtwEdbJ+5V4L+Vi5rre iy19Fhe8/AmokA9hwNG6Ca3r3CzIZs2aN3cCX7cpcuy5SfFYpGaFw6RDNJTT9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687976122; a=rsa-sha256; cv=none; b=BI4cMrJKvAUEoQ8APsKj0TW9czWI+LKq6CVZiKMCgSSd4eOkDi5KthlD5xXGyhmVewyo/M qo20+oDUbThtqxzDtMt10w73QooTnYe6l3OKH15ZI4MLs7ENSdqtah+B6EEMehC4voKRuV 6ffwUVdqB4ytaAOZDjQSNPHO4zUA7bPtx9HwJo7wYyQkU2qhIGlGst4bNHUYx8LWZj8/x5 7RAa2uuJUOf7dUp4do3knV9+GwOeogYjPrrhvtN0kxNPwfXx+3BDDk6uQIiJYcBdVYqksj Yvc77eDwPFB6Ar7pmXQ5gKRtm7NEFyp0QuFcvjdRxRGzKOf6BlVRNHfxc3ifDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QrqWG0n19zkR3; Wed, 28 Jun 2023 18:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35SIFM8T009238; Wed, 28 Jun 2023 18:15:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35SIFMLk009237; Wed, 28 Jun 2023 18:15:22 GMT (envelope-from git) Date: Wed, 28 Jun 2023 18:15:22 GMT Message-Id: <202306281815.35SIFMLk009237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2846052cd44e - stable/12 - Apply llvm fix for hanging gcc builds on 32-bit arm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2846052cd44ec28a99af774127f578d626d6f368 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2846052cd44ec28a99af774127f578d626d6f368 commit 2846052cd44ec28a99af774127f578d626d6f368 Author: Dimitry Andric AuthorDate: 2023-06-19 18:32:40 +0000 Commit: Dimitry Andric CommitDate: 2023-06-28 18:00:06 +0000 Apply llvm fix for hanging gcc builds on 32-bit arm Merge commit 962c306a11d0 from llvm-project (by Florian Hahn): [LV] Don't consider pointer as uniform if it is also stored. Update isVectorizedMemAccessUse to also check if the pointer is stored. This prevents LV to incorrectly consider a pointer as uniform if it is used as both pointer and stored by the same StoreInst. Fixes #61396. PR: 271992 Reported by: John F. Carr MFC after: 3 days (cherry picked from commit dbbaf77801a8f30e49731395e85757f339f345bf) --- .../llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index 671bc6b5212b..d131f48a7af3 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -5415,11 +5415,17 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) { WideningDecision == CM_Interleave); }; - // Returns true if Ptr is the pointer operand of a memory access instruction - // I, and I is known to not require scalarization. + // I, I is known to not require scalarization, and the pointer is not also + // stored. auto isVectorizedMemAccessUse = [&](Instruction *I, Value *Ptr) -> bool { - return getLoadStorePointerOperand(I) == Ptr && isUniformDecision(I, VF); + auto GetStoredValue = [I]() -> Value * { + if (!isa(I)) + return nullptr; + return I->getOperand(0); + }; + return getLoadStorePointerOperand(I) == Ptr && isUniformDecision(I, VF) && + GetStoredValue() != Ptr; }; // Holds a list of values which are known to have at least one uniform use. @@ -5458,8 +5464,8 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) { if (isa(I) && Legal->isUniformMemOp(I)) addToWorklistIfAllowed(&I); - if (isUniformDecision(&I, VF)) { - assert(isVectorizedMemAccessUse(&I, Ptr) && "consistency check"); + if (isVectorizedMemAccessUse(&I, Ptr)) { + assert(isUniformDecision(&I, VF) && "consistency check"); HasUniformUse.insert(Ptr); } }