From nobody Sat Jun 04 11:44:18 2022 X-Original-To: dev-commits-src-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 3EAEC1B5315E; Sat, 4 Jun 2022 11:44:20 +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 4LFdFb4n75z4YvX; Sat, 4 Jun 2022 11:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654343060; 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=ujQdyJ2kbxCQFH4BlVyp6YPnEnW2++taaMFBuJQ72KU=; b=aR544aMBJOBLC+1VrSBv44Gu+tHpjio14FMto3rrxObuS9uzdYyLtzAhmQIitJMZ/nsTC0 eArownzZ47g90izhstwuMN1dg1EiYw37ZGbT2FLD8WSK07WjS10tL35w+m3DQbDQAxGAwe 8poUqvtbfjFY5Phq3RNeqJn8HH2ciWO77bj8awf5zwtoNM04VDBwwmZjQmHaEPV5MK3Jwr zQonOcqRcnIUnD6plAIsbgRi9iXNyaKh6t1ACRL5h+OlY971l+6UAPLzeeWV4TFPWd5nfa wJqe0X3at3s79x9zLJH6R5c3bDCDLb+reZtTjLq+JaegtIDi8UquHoUsxIg5gg== 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 249B91CE3A; Sat, 4 Jun 2022 11:44:19 +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 254BiID0069787; Sat, 4 Jun 2022 11:44:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254BiIpI069786; Sat, 4 Jun 2022 11:44:18 GMT (envelope-from git) Date: Sat, 4 Jun 2022 11:44:18 GMT Message-Id: <202206041144.254BiIpI069786@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: 76886853f033 - stable/13 - Apply llvm fix for possible hangs with CPUTYPE=skylake-avx512 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 76886853f03395abb680824bcc74e98f83bd477a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654343060; 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=ujQdyJ2kbxCQFH4BlVyp6YPnEnW2++taaMFBuJQ72KU=; b=N4GgXQOB3k+i6ut9PWPXGScLTFNWEutYNTi81liGED0PWfYFvXb5QQl3S3/ntmNIu65DsD DazY9AQhQHeO//d8ie9kbszBGS4dDcrL/CEu+/gqUFn+U5LPXK+gNoyl1vkLrxp6taDiRV tD95+wd8Qo/G+BPmeBx9sPiKp5qdY7wJfnaPFSHce1tg4GSTWu1mDKe1pSiIIAhKcXWDdn on+HU7QuDrT8ezKe6VMbpIE2+MVEgyvOujiPnaaja+hxDKIGM1JDm9aKIi+vSVZKVctc/h s+ORnCRvtEfk1w+SwKT4BCMTeLAPZLh7LnAwX6iEVNmIJUSO0yRIwCR+aIjsyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654343060; a=rsa-sha256; cv=none; b=myht3l6a//EHMSySoy4XMCfBa8sUbrubgn6XoRYhDVY954EwKgSc3rv0+k/F1A1fCa9WQJ HNnvSo3iJVKlhEE9f9EN0YFly6klDm9XU5UscksyyByL56LU90f5ldJmbMYskPQZTZPjy7 cqNWMiQpPRxvFpchPeAApRupmiASAmUrPD4EebPDOMsj6EnLwcVXUf44o023S1/4dP4eZi 7xidJGL/Oke5SvUcQv9IYVRoxutALwernPpf4BWq+xfeoveGGYgx1kWLQS2fJg0Vg12uO/ dMI3sQyyfC0T2geT99zTrqPRzwTOgbWMk27QcysgnshxrIBqD1ljMEyv1lbrqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=76886853f03395abb680824bcc74e98f83bd477a commit 76886853f03395abb680824bcc74e98f83bd477a Author: Dimitry Andric AuthorDate: 2022-06-01 21:43:18 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 11:43:43 +0000 Apply llvm fix for possible 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: 264394 Reported by: VVD MFC after: 3 days (cherry picked from commit 592e876a422960a78938caa714f2263ff38eb87b) --- contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp index 032db2a80a77..a9a3343abc4d 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -36195,7 +36195,11 @@ static SDValue combineX86ShuffleChain(ArrayRef Inputs, SDValue Root, (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);