git: 592e876a4229 - main - Apply llvm fix for possible hangs with CPUTYPE=skylake-avx512

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=592e876a422960a78938caa714f2263ff38eb87b

commit 592e876a422960a78938caa714f2263ff38eb87b
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-06-01 21:43:18 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-06-01 21:45:59 +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 <vvd@unislabs.com>
    MFC after:      3 days
---
 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 682932b8f3e6..8bb7e81e19bb 100644
--- a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -37558,7 +37558,11 @@ static SDValue combineX86ShuffleChain(ArrayRef<SDValue> 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);