From nobody Sat Jun 04 11:44:54 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 95AD81B537D3; Sat, 4 Jun 2022 11:44:55 +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 4LFdGH2fWyz4Z9D; Sat, 4 Jun 2022 11:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654343095; 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=KVNGCdR2lskqpMXQiMclF/hQF+tzeF8rXpekwaC3r8Q=; b=rKzPzZKPzTsdrg46l1pgRZ7KwWjTDkpsgEEuOQIO7UMFNmaQ+SG904dzVYYuDRRUsbQiaw wibOq07/IgfPLQJJ80FV/y1mtlG0Dt6H6vmSZ9FxS8wyAf/jDaual9AHjygJGPZnYUUdbp U1Lsjw3dzVXbnUT4ncIAed+6EJdhWjHlaGrW46uo+p5gqrIWQ6vy5UDAYGz1+zvw9MDrQZ 3Pj13dpk7MgBNJs9L2fJ1FdBPRFaLAhhcMy2IkjZba4TJ7gorVvzjzyeJeIEON54y8Fh8K ae378OpZrTsZbvhOlnOmO/01ykRfl2BNzvUjwo0wRf/IF/GoHUw8b2drk0YYow== 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 329C71CFFB; Sat, 4 Jun 2022 11:44: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 254Bis1x069945; Sat, 4 Jun 2022 11:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254BisCm069944; Sat, 4 Jun 2022 11:44:54 GMT (envelope-from git) Date: Sat, 4 Jun 2022 11:44:54 GMT Message-Id: <202206041144.254BisCm069944@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: e5896578b222 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: e5896578b22271be25f18996033a176fc6cdfe19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654343095; 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=KVNGCdR2lskqpMXQiMclF/hQF+tzeF8rXpekwaC3r8Q=; b=p5IbMKzuCsa1faRHwnB0gvihkRsCxfAx63esktFInxW2I/2GnMfejKYojJekIslWY0ehPT 8F0zEbmTFjUCx7sjpiRJ1eE9R9itM/zUHEkPcoCQxD/3YWROROkYXKZ5CqQXhY6ySHS95n VsC0+5FmsO6Rj7/r9McLDa9UVmvrzIGa0BswMNoNvYZLXMG0tt18PbTboiTAvBy7ORQ5zi k0c83BnL22YjltpVi7RUM0rlYockNlPHNbLzF2xHJp6WmDQQF45BFF97SUVyLKDrnsMUor cwhGK8Milw05Odsaxq2mYjUWCiCnuJm8YNLw7+h49ZIrFXcpELbz+OvaCbQn1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654343095; a=rsa-sha256; cv=none; b=QI3FioPBaaZ+tl+GoqSqzMxFWSgf3VLQxRllWHtr/SnDgHCUGtl3MdXKJAT/3pS/IF1J5z XrvPni2u97y2yUX43vW2It+2u2aDutgAIDcqEhC33Fiaq6M5Vm8z8Oj6JJpxzOxu3bK+pI W0jWmPWHGpinDbKZCBfRaToVxRIXy6H+pF4SJB9qMlbMRFrdgjQCICmAB7G0Os3BkNnDvA xiiflx+K8PguQeqCGvr8tg1GAPr7Xe80ltOFWaBesA6wKjsGhdrB6pA1GmJlYTIPl41LwG +jYTTUfcrQrf8GEYTaypogKbTebtXz1aeTXEaqUpwLYVME+zUoryQ/riHKHSAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e5896578b22271be25f18996033a176fc6cdfe19 commit e5896578b22271be25f18996033a176fc6cdfe19 Author: Dimitry Andric AuthorDate: 2022-06-01 21:43:18 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 11:44:33 +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);