From nobody Wed Jun 28 18:00:52 2023 X-Original-To: dev-commits-src-all@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 4QrqBY27TJz4kPt4; Wed, 28 Jun 2023 18:00:53 +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 4QrqBX5hFKz44Jm; Wed, 28 Jun 2023 18:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687975252; 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=WPdrgWz2x51Hz9zqZVjLgFcU8UFUxo+kOIk/S58rVI0=; b=T1YFQ8aaqg2zm3pnWyhNTbkdFiGOK1L63IALg+XGMd+OkxNntLxAHip7bml0NsS3GBRNNh zPtDe4bxE2PBxCI2Klg/bbcgP/ZmT/22+XqGXuKkKHOJjFEDtf1cCDf09/WNKfIi7O3K0c kkP4eBg8jIsfFWsSrUguso8n4pic3ueG3TVZZF5xUhsA8Lpg7uUYDUKto7VkafZvqxiIIn Snktdsb+Mh51kj105f+5jrem+5iN8gwrutO7rwOOKisjjw3RPKZJpIa1wOP2nSerMoFpCR RO6nNWamSiemHeb/3RtSRq7WWr6h7aWBMXaGJ47KO6vfFlNzNaXNzsrvwCJGXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687975252; 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=WPdrgWz2x51Hz9zqZVjLgFcU8UFUxo+kOIk/S58rVI0=; b=VWXwftz65af2Ap6i2bWk1GSk9NqPICsyDh/Ua/tePYIwcyThF15x7GbxKe9Yz874wl57mw lt0fmIQfJl8PYv91bDPbNzQyizbvDjhWfiIhoWb3wDvcprk7RS6WWuVqRZ6LOCmA1mCElJ DQC2E6uateLTelKkp+RjXStfyYtG9gvBtovnoNRmJ2yXHdkb5FD/yCzUKHEkZr0zjPLugF 0o11wR4SdR6SSPjfxlA0taxA0xbY/Kpzxp6cZsfEwI3skCy96ZzAQuSzebWeUJi4WVPrHT 4pI5fU6byJz5F04ME8/LBQUr2TnbGMPwU/GYN6ucz7dRm3nrrtTln6NdT/j15w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687975252; a=rsa-sha256; cv=none; b=mgJuBr1teg6lNtOpR3qorsauWLOeyBDkrvy1gABjA6uJq/9uhck+CilEPoUOMAYhtDMe/t 6dHAr6ko578D0qt2Is4GK7ielmVIDXpDQ5bRLC7QvKNl8FtXm+jYp537SIdogQjl/TLir+ hKOPKs7ElxV110ywXUflNcJwtDtQLEWMS0mOBbkvAvV62ewxYy1/h5X1YeYbLdkvx2+cM5 MFsVDQn/z6kPcSbRnaqU2u+/OCCze0Ie56zETM7tipPRxDZjRK3v/jr1Mp/VW5e6S8rH8o BS6jUe3s3Z0x3BlC1t84e29laEl+Cy6nTc5RNDjkM6J+qAzQT9Ls/4+hqKUCaQ== 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 4QrqBX4mHBzjjM; Wed, 28 Jun 2023 18:00:52 +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 35SI0qZS088377; Wed, 28 Jun 2023 18:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35SI0quc088376; Wed, 28 Jun 2023 18:00:52 GMT (envelope-from git) Date: Wed, 28 Jun 2023 18:00:52 GMT Message-Id: <202306281800.35SI0quc088376@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: 1706d72e36a0 - stable/13 - Apply llvm fix for hanging gcc builds on 32-bit arm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 1706d72e36a03da4e5c2bd166362dabf8f2b1d6a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1706d72e36a03da4e5c2bd166362dabf8f2b1d6a commit 1706d72e36a03da4e5c2bd166362dabf8f2b1d6a Author: Dimitry Andric AuthorDate: 2023-06-19 18:32:40 +0000 Commit: Dimitry Andric CommitDate: 2023-06-28 17:59:58 +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 5fd4e45d80fb..9d95cb25efa0 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -4627,11 +4627,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. @@ -4679,8 +4685,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); } }