From nobody Wed Jun 01 21:46:25 2022 X-Original-To: dev-commits-src-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 2A6C51B5B354; Wed, 1 Jun 2022 21:46:26 +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 4LD2lk0QXSz4prW; Wed, 1 Jun 2022 21:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654119986; 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=CqNA0SprlgQU/iBTKDdznVTeltmttShUXme+3u25pVw=; b=GWB4zzJ1BA6RaApuReo5/fy8teZ2+Higwa8m4X06ZWU40XXe3jknwVdqKGLbMaSZC2UKoh ypnqPriWz0n9Vb0eozi+PBiSqq77GhWXIAlRIZbAiLQUEaP4qtjIdurEwUOcbTsalLb+fC rn0KQx0YZPZJkwxmWmDLsllqLhpYav+XLdMLRgvZwgWF+SSPxoVpqxlSP2aurEEMmK46cO YJ+zqaPH2cnPtlZ9DTBlMzQlJBxjTjJvZW0JHkLCjsL9GQ8nqP97KDm+GeXKBel5R7hiSg 6ribAUujVGKmiQSsBIF+zuEB+WzovVORQ37FmDl7HdEK8lskrC6EOTbbnieGmg== 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 E3AE027B76; Wed, 1 Jun 2022 21:46:25 +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 251LkP22029732; Wed, 1 Jun 2022 21:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 251LkPrn029731; Wed, 1 Jun 2022 21:46:25 GMT (envelope-from git) Date: Wed, 1 Jun 2022 21:46:25 GMT Message-Id: <202206012146.251LkPrn029731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 592e876a4229 - main - Apply llvm fix for possible hangs with CPUTYPE=skylake-avx512 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 592e876a422960a78938caa714f2263ff38eb87b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654119986; 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=CqNA0SprlgQU/iBTKDdznVTeltmttShUXme+3u25pVw=; b=tXpp54UGzkknYEDX705hTkU6W7et9xKDfCLvS8ld4l73mvqf46IPzSQSsczcU0ggiXXAl4 4RlAVOh7icA3d/UjUurega7QhxE9DFb5IfJJk7KLWY6aowB3rNF4JOJx2hI2hSEQae2vMd T1ZtRLc3MD3f/trCDpHvyJEcM7978GgjeXZkGiDb/vZs2H4sAY4HfLbR+DcQgPWcUseVku UkrdkcDm17XXuDrPZV7bs493E3jRypImafHK7/jUCOeS0n6mn1YhkOqJ+u7FqbVwOuYNbb egQQ6m6piWAO3Q5c2Dy0RE70Iqr43D6d5VsWQ8qYYg2kBxt7R87AfPPVPDhb9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654119986; a=rsa-sha256; cv=none; b=BB8HgaLDpxo0LE49rkYXLOPYUZMeEeH6ICcrzZ/H8S1BnkOsEbodQVdz/AvHAlkLP3lf7r ZZbDHlrCMTnIiyCP3K2LwFYMmX7wGAZXvVgbtlozD/mKO2WNVyQKvinIxvj238wBK3KOYB AXcWvMynbWL13nF8Co+QMhaiWwM5vgjhSTcZxHzCU9qgT2bsFvbebPsm+py/6IhWOKKYNV uCSCj1QFaYyd3MgHdIPsKarsKjINZ0rCsvs7QpSlgPAnCE24wzaleiWXktl44tjtSbo5pt pnwnqoaSShQjwW9+oYoPoN/Xp3BDQ9JefvHrJi0kWdLi8KUTppNWkHTFkLP5GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=592e876a422960a78938caa714f2263ff38eb87b commit 592e876a422960a78938caa714f2263ff38eb87b Author: Dimitry Andric AuthorDate: 2022-06-01 21:43:18 +0000 Commit: Dimitry Andric 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 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 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);