From nobody Tue Jul 5 12:35:24 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 A06A31D03636; Tue, 5 Jul 2022 12:35:25 +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 4LchwF1FQYz3FN7; Tue, 5 Jul 2022 12:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657024525; 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=ShDkRnMQgZyS165vhXN1T3+4vlNi90pM2tlzd+7CjQY=; b=Vod/iH7Or8qNrfyran6DR8ekH/9VD75rAnwp7S4TloA6urT9HFJ/P/8SQCqk7kO1vXJZCH ZctXb80IjElnD5EBj93GtLHgtBV/OYBvUjXmp1caDtDfp8k71GXIWuhrnxHIQMrY+KX5xC soJ7JC5ZwZcrvaWLu6mjL2QwEqvAwIdh/9VCOGz8fuYGN2hM5HaQdjZ7b3IXut3JsAQ9l1 89Pnu9FyX5cI/UFKGTCMIvb2s3DgWhGZyeNe2PQdihj+pXNw/eibopTEaYwIdtEeBcRKcd AbkIyrsD2mK/IHhW5rwMsu44wLTjtbfQgMVSTeA2h9UhWIO6Mxmv0by3hKLjSA== 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 BF3FE25ADC; Tue, 5 Jul 2022 12:35:24 +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 265CZOCx066456; Tue, 5 Jul 2022 12:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265CZO4l066455; Tue, 5 Jul 2022 12:35:24 GMT (envelope-from git) Date: Tue, 5 Jul 2022 12:35:24 GMT Message-Id: <202207051235.265CZO4l066455@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: 8c5c5a01e50d - main - devel/llvm11: 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: 8c5c5a01e50d37cbcc50c0499fee610f55570c99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657024525; 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=ShDkRnMQgZyS165vhXN1T3+4vlNi90pM2tlzd+7CjQY=; b=vo3bETFRYjUQJgaoRK84leIQ0ePEKJ2PHoH3rQfdd1aAiag4F5FoV3l+EmJbmWTank0IMk 3j1ZJP5uO8oXccU2ixDaaTf1Zx4Rc4V1D0wnWylGr40Wwg4DikrroUEGoF/7CwG8gzRo15 YQ/gf/ZmxoRM/5JohA9n+ccBZaHVseQzgtt682Xr9XHtltaJbbgTlq75D31CQxvX72WFvI JUmBKiB1KqiQdYgwG/Y3PsLJt7+3QhNmTuJRj4Ia/CNYUAlDeTU5urPDUtmtbR9sh3KP9M rgMrHMhWZPd3ryu0/rmozNP7x30iN3FLlLriDojWrIAm9dKsJf9sDCsMm8aidA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657024525; a=rsa-sha256; cv=none; b=GIdrrOpcHN+PeqIVHkz2atWTwEj8vPHXSzKFJhQ22si2rePRpxeHQuxIPzrosmo6PgiKZk s7ExsNIemgvEQw7N50nS6ZEm0Dgl2nNzX10iaD/M99wjyIyedhQJXSWgmhop57vM3K2F+I qvQmZX8RdVkmSM0xbzzQJs81Q02P7PtLt8g6BcLCU9PzWiwtHZ1nMRWxNoZg3aWpf9lOud J1DiLsyDRZwlIaxL8fhTPuothBDiF02YfDMqvQsyAB3gQrIzHEZwXPGHDayFGG3x4b9JmD klFJ0gQnbD2UsrU5qO1LXT10eHyJ5VLR66twdy4RccZC0d8EtYVuOaQjoSwTMQ== 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=8c5c5a01e50d37cbcc50c0499fee610f55570c99 commit 8c5c5a01e50d37cbcc50c0499fee610f55570c99 Author: Brooks Davis AuthorDate: 2022-07-05 12:32:58 +0000 Commit: Brooks Davis CommitDate: 2022-07-05 12:32:58 +0000 devel/llvm11: 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: 2022Q3 Sponsored by: DARPA, AFRL --- devel/llvm11/Makefile | 10 +++++----- .../llvm11/files/patch-lib_Target_X86_X86ISelLowering.cpp | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index e8f66d19c899..f0c2973f0dc0 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 11.0.1 -PORTREVISION= 6 +PORTREVISION= 7 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} @@ -31,7 +31,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe libedit perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:3.6+,build +_USES_PYTHON?= python:build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ @@ -129,7 +129,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6+ +LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_BUILD_DEPENDS= swig:devel/swig @@ -145,12 +145,12 @@ LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb LLDB_IMPLIES= CLANG LLDB_PORTDOCS= lldb -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_VARS= _USES_PYTHON=python PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) diff --git a/devel/llvm11/files/patch-lib_Target_X86_X86ISelLowering.cpp b/devel/llvm11/files/patch-lib_Target_X86_X86ISelLowering.cpp new file mode 100644 index 000000000000..ad1254577241 --- /dev/null +++ b/devel/llvm11/files/patch-lib_Target_X86_X86ISelLowering.cpp @@ -0,0 +1,15 @@ +--- lib/Target/X86/X86ISelLowering.cpp.orig ++++ 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);