From nobody Mon Jun 06 18:51:55 2022 X-Original-To: dev-commits-ports-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 022821BE8A0D; Mon, 6 Jun 2022 18:51:56 +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 4LH2f3319sz51Dn; Mon, 6 Jun 2022 18:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654541515; 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=hwFtCDOuf+Kwvee+/X15MRTboquBnYbHyBVFuOA3wcs=; b=ZWI6Adm6V4lRZzCUf7HMGrn98bGvu7sJD00ZGO52+DWvKeYGj5c466jewjc+3K61E+rbZF S36q9RF7SpIcCd9t2Yq3L9blG9ffwtlspXhhyCYlOcoV6ieDpben9XYhRTne4vJMw0mGpE ivgJS4aEX6jUvFkuewghVKiZZbG8crZimFBLXyk+jVnljdejRpAn/66sX7L8DYeQ0hoMPP 2SY7xntUKWwfFR5Xj7oEQ8tzmkAX7AwcrsgWllxypXsWYrxQ3vPxmoAVd5sb1F9RKr9KXX g604B3Dh0iRQU8qF1BSgLpTkOwLm0ME5CPVfHSaGAxcACqtGBu4HkubKSla/0Q== 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 240273841; Mon, 6 Jun 2022 18:51:55 +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 256IptB6033602; Mon, 6 Jun 2022 18:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 256Ipte7033601; Mon, 6 Jun 2022 18:51:55 GMT (envelope-from git) Date: Mon, 6 Jun 2022 18:51:55 GMT Message-Id: <202206061851.256Ipte7033601@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: 7aba7c32a067 - main - devel/llvm13: fix hangs with CPUTYPE=skylake-avx512 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 7aba7c32a06718082a54fee86fbb98d056a6a094 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654541515; 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=hwFtCDOuf+Kwvee+/X15MRTboquBnYbHyBVFuOA3wcs=; b=l/n7itUnKz4wnuDKWqCfS/JhpC9gN1bQAdM0/ze1KXQg2bp5stAqJTm7Q8+b5FpHeLMcYQ E3o+I7qJxYgid73K101TzdtCZiKtP9QiMTXxBqh8yhpTY45ToBUeTYHISMmLTWAAdvljjJ JUlLDkhODXr6hfe1GgmCAgjrCk5JmWl5GOpAsE3HtVYigbvPKXbkZR1CFSmPng7OqqB1Xl qeO/GBWzo0PmbqMlegAFs1KMT7giDgbUhI365S4tF036jOUu8pmPLpqfBxJ1PNTdCMErSP PpKWYdCI9vtmt5IX+CEIjUKW65vff9bQexe1/Epa2y/l2O87Uk/JvRFFXfpT+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654541515; a=rsa-sha256; cv=none; b=CkHpetdlyNGYHn1rRSS1znPoGYX8vBV5Xl51R0tcpfZ/yVbf/gzc0lyBehXPm/9eVhffAt TsqMCHN0lETUYpoxzDQAIhZBN4QXbbn1pH4HdqQw4ljfNwWslBFrUt9mmvuhfLsV43nUUu 1pxQQyg+wzUIeKq8o7FYx6Zrn9Ihb9KZI3tr9NMARQ839jsCGzWy52K8nJfopIxMZTBz17 pRaLB3R61mdeD589/dAvWxHB2eM36hP2YfAhLja3WA/9iR8v/Q4Mcvt19wDBOcdTJp5jow t8Mi0VS/UKwmz7Uv3AYhJvC56mmgmA+gnFDutBt38eJPxzgTgSAc9Molm07lcw== 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=7aba7c32a06718082a54fee86fbb98d056a6a094 commit 7aba7c32a06718082a54fee86fbb98d056a6a094 Author: Brooks Davis AuthorDate: 2022-06-06 18:51:37 +0000 Commit: Brooks Davis CommitDate: 2022-06-06 18:51:37 +0000 devel/llvm13: 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/llvm13/Makefile | 2 +- .../files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 1b5b4e4bbdbb..8b2f1a094a66 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 13.0.1 -PORTREVISION= 2 +PORTREVISION= 3 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/llvm13/files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp b/devel/llvm13/files/patch-llvm_lib_Target_X86_X86ISelLowering.cpp new file mode 100644 index 000000000000..877b03db54b9 --- /dev/null +++ b/devel/llvm13/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);