From nobody Wed Dec 22 10:06:14 2021 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 81871190616D; Wed, 22 Dec 2021 10:06:21 +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 4JJpr94RKQz4Ywb; Wed, 22 Dec 2021 10:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1B4231B4AF; Wed, 22 Dec 2021 10:06:14 +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 1BMA6E8e092408; Wed, 22 Dec 2021 10:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6ETI092407; Wed, 22 Dec 2021 10:06:14 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:14 GMT Message-Id: <202112221006.1BMA6ETI092407@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: f5f773059e05 - stable/12 - Merge commit e6bb4c8e7 from llvm git (by Craig Topper): 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: f5f773059e05823dfe7b92e659ba5f0218ba46a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167579; 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=5s2iXDnEiCx78W24+G535RWkZ5K1bdfhjoCp3hjgURs=; b=Pf+BB67ClDnoDBxIxzK2ooGhYBcw0Gortc4hqiFHI9dQ5WqN7k85AM/roWZSPlTdmSd0Ee pNhjrAmgEAUI7RGE+/z30IAWB5v2gZaejxETzdWkzfn3He60hx5LkyI6Wm469I1KrLYG7T c/ZQqlBOxOUTsM6oKJDkO/alIiJOItCoyxgjqZWQcN9zaf2f4an9LadN2y1+HuUHvvLA9C rGcSWPGHyhYfGe8t2oobutGu1M014B6pwRnjE6Nyy6mB2vsxLmjvORstpAfYHPqGnulgy+ 73QWhyjo/jJ5gh1qIV5uZJZQWRAlIRdHAdhGbmyQYMF6qUoSJvRZujo4ksgC1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167579; a=rsa-sha256; cv=none; b=vFuN2VRaiyEG+AEbyZwU1CbyfvvQLsFHfZEQ0maJQ8K2Zqcj8Jv5kUj/+8e77sTixV7ECJ 0xzaA4NIjt+KtWgk99d3083+voR+BJ9btY0p4H7rkHaUMQ5X3Pn/NbvuaDxL67KVNkbFO7 NDyvul/4/nTMXks+HBlw2WCD1XJI+n7lltEYhQUqYfYIS8HhRjSH2LyNNY3Mo4Jw59MIm/ AxsDwGwtfmKUx+T0RsqTh2Y5M4V2LYeIgkcoWheRc2u+KJFHGlCJivpfUT0PO10tMkJXNZ FZTWdRD1tNXsL20GF8cGaqcfT+tjQ/ZqjSixD3AHyUhPRP3J0UfZ4M7coUz3CQ== 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=f5f773059e05823dfe7b92e659ba5f0218ba46a3 commit f5f773059e05823dfe7b92e659ba5f0218ba46a3 Author: Dimitry Andric AuthorDate: 2020-09-09 18:11:04 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:16 +0000 Merge commit e6bb4c8e7 from llvm git (by Craig Topper): [X86] SSE4_A should only imply SSE3 not SSSE3 in the frontend. SSE4_1 and SSE4_2 due imply SSSE3. So I guess I got confused when switching the code to being table based in D83273. Fixes PR47464 This should fix builds with -march=amdfam10 emitting SSSE3 instructions such as pshufb, which lead to programs crashing with SIGILL on such processors. Reported by: avg MFC after: 6 weeks X-MFC-With: r364284 (cherry picked from commit 9fc62ba649126f546c7d6bd09ab44d147b3d8ff6) --- contrib/llvm-project/llvm/lib/Support/X86TargetParser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Support/X86TargetParser.cpp b/contrib/llvm-project/llvm/lib/Support/X86TargetParser.cpp index c629f872df12..4c2d4efbfca8 100644 --- a/contrib/llvm-project/llvm/lib/Support/X86TargetParser.cpp +++ b/contrib/llvm-project/llvm/lib/Support/X86TargetParser.cpp @@ -522,7 +522,7 @@ static constexpr FeatureBitset ImpliedFeaturesAVX5124FMAPS = {}; static constexpr FeatureBitset ImpliedFeaturesAVX5124VNNIW = {}; // SSE4_A->FMA4->XOP chain. -static constexpr FeatureBitset ImpliedFeaturesSSE4_A = FeatureSSSE3; +static constexpr FeatureBitset ImpliedFeaturesSSE4_A = FeatureSSE3; static constexpr FeatureBitset ImpliedFeaturesFMA4 = FeatureAVX | FeatureSSE4_A; static constexpr FeatureBitset ImpliedFeaturesXOP = FeatureFMA4;