From nobody Fri Jun 23 23:38:05 2023 X-Original-To: dev-commits-ports-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 4Qntvy0c9fz4gQt9; Fri, 23 Jun 2023 23:38:06 +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 4Qntvx64zpz3pQF; Fri, 23 Jun 2023 23:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687563485; 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=b3OkUOm86mmcIiEN4T428BClwZUKUIctdSo1BrOPbkA=; b=YJiyRShH/XcMS2RxN2kSputuFZk25XJWMmZsthFp6PdZXtD1J4fQE8wnd17zY29yjc7i9Y 3uHSkja+vjb/44lBNkl1phtg0wvaqB+82l3IjFmf1Jg/NRZFyLFnehqzZSIb4Y/c08IT4e HpebirXS4iZPZIn2p9Ta0r+i+xegPDZY8DL/6AgyoPG8AbnoEyEt1OqKhvmwAKozYONCMc 3bS7t7YwgMFlPVPqKn69bF3n9AfOTWb0nYCodw5o7LY3cIz9I4+SCrRMJcppIDN8RldJBs 3RA6ombKZf72cfaPXmEJVgVqFB4ZWIIjJg2mxYkvx8yE0PdhpNhPS7Yi8XyC/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687563485; 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=b3OkUOm86mmcIiEN4T428BClwZUKUIctdSo1BrOPbkA=; b=SZmZAS7q9I2aUdw4rtDetAbwjS9N7X1JP13/CnDEkJhgIMOJGoIoGN7wJ7hLyCffn59LZ3 06TOQlkGEE1zu+8c0k4GrdNs0cMldG/NzexSgma0ZHsuQK3SLb1H7OcmDGYw7tw26YiqHT mtw9qCqAgJQPPZ0ZLVlnmUyzBnORvCVrANVsccxxRtnfDFo1xKFylfcP8GIKrK7NBVr+Qk pdII5Puon+lHTNSMcXuh952c0gERG3DIznsSkECweJs7EXXdiGWbWiETyk9BacgobhmQsi ho7pO0Lweo9g7lhhkEZ7IH1xVEXiAV8SezNlzurj2ncdyZxJkld02iQCMZdFog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687563485; a=rsa-sha256; cv=none; b=MAz34Jsa23NnJ5prnLQMQKCgLBv6EcsgVT+toq9JlnjTqhnnzPJ82CCk+P7IeTHUq0brtq O0FjDTnf25x3s5v8mXCIcgHCixB3WUgxwcHGbCHBOmF1dk/IRsD/3wm0B3MDmAhhH2cSQT pWgJ6B8bYcyXpTti+glptFraXDxdt0lpuUFYlZUlEZjwSqy9yvltVg1wftpzkvc3icJG6T KucmFUjoWfr4ZN5riBTLWjEt2SxfDABcpo6d2aNmYF2BipsYSTW5LnAL6miwSXl5PDReJN VhFFUkrNzgmfEINyr0q0evejOFctJ1g0TNcCnr2WKAB6FQA4L1PMEEpuzenp+Q== 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 4Qntvx4kfGzP9B; Fri, 23 Jun 2023 23:38:05 +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 35NNc5TN076854; Fri, 23 Jun 2023 23:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNc5Sj076853; Fri, 23 Jun 2023 23:38:05 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:38:05 GMT Message-Id: <202306232338.35NNc5Sj076853@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 5e81b0383c51 - 2023Q2 - devel/llvm16: update to 16.0.6 release List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 5e81b0383c515efab7ffba838969f2cbb2656082 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e81b0383c515efab7ffba838969f2cbb2656082 commit 5e81b0383c515efab7ffba838969f2cbb2656082 Author: Brooks Davis AuthorDate: 2023-06-19 18:44:06 +0000 Commit: Brooks Davis CommitDate: 2023-06-23 21:01:43 +0000 devel/llvm16: update to 16.0.6 release Change the lite flavor to default to BE_FREEBSD rather than BE_NATIVE to allow its use in cross-build CI pipelines. Backport fix for LLVM bug 61396. [0] This fixes miscompilation of gcc on 32-bit arm. PR: 271992 [0] Reported by: jfc@mit.edu [0] (cherry picked from commit 50593575e96b94f5de485c6216a870db44e487e0) --- devel/llvm16/Makefile | 4 +-- devel/llvm16/distinfo | 6 ++--- devel/llvm16/files/patch-backport-962c306a1 | 42 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 57bdeb3b7e61..025003aef3a9 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,5 +1,5 @@ PORTNAME= llvm -DISTVERSION= 16.0.5 +DISTVERSION= 16.0.6 PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ @@ -99,7 +99,7 @@ OPTIONS_EXCLUDE_armv7= COMPILER_RT OPTIONS_SUB= yes .if ${FLAVOR:Mlite} -OPTIONS_DEFAULT+= BE_NATIVE +OPTIONS_DEFAULT+= BE_FREEBSD .else OPTIONS_DEFINE+= EXTRAS FLANG LIT LLDB MLIR OPENMP PYCLANG OPTIONS_DEFINE_amd64= GOLD diff --git a/devel/llvm16/distinfo b/devel/llvm16/distinfo index 0169bda7d36f..95efc23fe3c1 100644 --- a/devel/llvm16/distinfo +++ b/devel/llvm16/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685986713 -SHA256 (llvm-project-16.0.5.src.tar.xz) = 37f540124b9cfd4680666e649f557077f9937c9178489cea285a672e714b2863 -SIZE (llvm-project-16.0.5.src.tar.xz) = 118000368 +TIMESTAMP = 1686758340 +SHA256 (llvm-project-16.0.6.src.tar.xz) = ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e +SIZE (llvm-project-16.0.6.src.tar.xz) = 118013488 diff --git a/devel/llvm16/files/patch-backport-962c306a1 b/devel/llvm16/files/patch-backport-962c306a1 new file mode 100644 index 000000000000..1b37decff88b --- /dev/null +++ b/devel/llvm16/files/patch-backport-962c306a1 @@ -0,0 +1,42 @@ +commit 8e1222aee4c657e572b7d7841daf7f48ec6ba035 +Author: John F. Carr +Date: Tue Jun 13 14:10:00 2023 -0400 + + LLVM commit 962c306a11d0a21c884c12e18825b8a41ba1bd7d + +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 +--- llvm/lib/Transforms/Vectorize/LoopVectorize.cpp ++++ 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); + } + }