From nobody Mon Jun 13 16:40:31 2022 X-Original-To: dev-commits-ports-main@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 56E5F85B61E; Mon, 13 Jun 2022 16:40:31 +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 4LMHPC1zvhz4m4l; Mon, 13 Jun 2022 16:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655138431; 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=tPLA7+Q8b2QzE+yl009MvjRpcXdnJJ0Gw6OUviawhD4=; b=Et/bfQ/2Vi/dBPP0L4Mcbj81mnHj11wXY/zChjl2Y9s5x0t+kmrK8hbRLRetOncGcT6z5V yRWRTYaMUV9/96NlOmBzyr0QyJhbZLTxUgJgqQ6zUE2pOhl2GSKp0ppxXjwYGXYvqtSOpp zOThO3Shf4k2eABwJIhtYu0qJariu8uMI6xbhr218+XWI1EpSDLAAPaRyZw6PFCZzB+Z56 Oac5TiBLhXDU37FOxM/h/Ed3fWnhseblT0gefd1kgJA5unxInk8UAqeflzlEaMT1X8Yep5 na6abTxDdvXCqX+rACxD5tHOGzA3JydrhEsnUMuSQicQItsyEAwf91xx/uDBSg== 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 20C1D19261; Mon, 13 Jun 2022 16:40:31 +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 25DGeVbU089506; Mon, 13 Jun 2022 16:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DGeVLa089505; Mon, 13 Jun 2022 16:40:31 GMT (envelope-from git) Date: Mon, 13 Jun 2022 16:40:31 GMT Message-Id: <202206131640.25DGeVLa089505@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 5509f8e7f242 - main - devel/llvm12: fix hangs with CPUTYPE=skylake-avx512 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 5509f8e7f242d4de27d457834995386b07f11410 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655138431; 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=tPLA7+Q8b2QzE+yl009MvjRpcXdnJJ0Gw6OUviawhD4=; b=Hph8clm7dG76m8dSKWlMrKnGK0Xru1MqLUb2LS81YuktP5y/dIwd1o+LYFQemqzpv5VDQG yrgRNa5kumDk/MGoVLJlQ90nE2q7RAd5yEbtB7P6zPuAuR7dup69F/wM1NbaSWdFHEUGG3 gUc2FyqDA1zme+oZxauypw5vXl2r5FEiLciEJU+/50CcMger+jGQRl3Vm3IcYyygJ89psq 6aculkZmGWgXKdgZY58QoLXay7akMfeVi54vnJRvP0uNWlqgsd1A/3vXOydTaQiTjJl1G8 3YPqGru4UNTxSqEbJoaXIpqhyVLnnXFneXzMT12FxjUmdeNLwTNgTqVZkrY+Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655138431; a=rsa-sha256; cv=none; b=TAPflGDV9Ij9eep+ZGMgSoz3OBTeQZCBuTrAkl3sLxBPZi8LfWBBE76+vJMqNNWmO4xAv3 xTkuLMKMOGiN1rMYUwGcx7KWoU57lHO7nfIZxEvgQo42hbf6uDKgYR8Q84iTMLmAW9kEfJ wNVGMH2yJ/vur1tTbskUFjE6gT7IpZOnhfNWMvFnQWLagqWBODV3ez+T+LCq55tBqA3Crn nZu+ya9BvGX78T8kgMYVg4ZDnfqj3pExhULH4ED7MSM6/u2bzqz9mJeY05oqgLLN+PXBdf Jw2P2yLFSv34ldwAcgPbCiaMbJgc3noS3QjRKHjqmnabx/fE5wLhkWyQZystBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=5509f8e7f242d4de27d457834995386b07f11410 commit 5509f8e7f242d4de27d457834995386b07f11410 Author: Brooks Davis AuthorDate: 2022-06-13 16:40:26 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 16:40:26 +0000 devel/llvm12: fix hangs with CPUTYPE=skylake-avx512 Merge commit e8305c0b8f49 from llvm git (by Simon Pilgrim) [X86] combineX86ShuffleChain - don't fold to truncate(concat(V1,V2)) if it was already a PACK op Fixes #55050 PR: 264480 MFH: 2022Q2 Sponsored by: DARPA, AFRL --- devel/llvm12/Makefile | 2 +- .../files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index d6ddffb680fc..1324fab94452 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 12.0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} diff --git a/devel/llvm12/files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp b/devel/llvm12/files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp new file mode 100644 index 000000000000..877b03db54b9 --- /dev/null +++ b/devel/llvm12/files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp @@ -0,0 +1,15 @@ +--- llvm/lib/Target/X86/X86ISelLowering.cpp.orig ++++ llvm/lib/Target/X86/X86ISelLowering.cpp +@@ -36201,7 +36201,11 @@ + (RootVT.is128BitVector() && Subtarget.hasVLX())) && + (MaskEltSizeInBits > 8 || Subtarget.hasBWI()) && + isSequentialOrUndefInRange(Mask, 0, NumMaskElts, 0, 2)) { +- if (Depth == 0 && Root.getOpcode() == ISD::TRUNCATE) ++ // Bail if this was already a truncation or PACK node. ++ // We sometimes fail to match PACK if we demand known undef elements. ++ if (Depth == 0 && (Root.getOpcode() == ISD::TRUNCATE || ++ Root.getOpcode() == X86ISD::PACKSS || ++ Root.getOpcode() == X86ISD::PACKUS)) + return SDValue(); // Nothing to do! + ShuffleSrcVT = MVT::getIntegerVT(MaskEltSizeInBits * 2); + ShuffleSrcVT = MVT::getVectorVT(ShuffleSrcVT, NumMaskElts / 2);