From nobody Tue Aug 13 16:59:40 2024 X-Original-To: dev-commits-src-all@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 4WjyKm3Vj1z5T3G8; Tue, 13 Aug 2024 16:59:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjyKm2vJTz4SrB; Tue, 13 Aug 2024 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568380; 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=w9YtRebyZ4bNNOR/ue7oQAa6kVY5X2LIw7ybbAIf75w=; b=odJy10pHXKJO3J52Iwi7tisd+Jvl/g5X2UhL4p/hJTfudaCPQnUE12i6duMVXEHGld9dI2 PMBMBsclZBTexda2hed9agd2oepTEqKVPnhNRjt4Q6LU19BEb1oXksSzdICLC54lIfOVoz fvcWA14zi6sJzGHKJ5YWFlfMxrFtFhji8tVmmB1p4KY1a+7RZn3PizPjmWDj6iTTyPL6wK 92Vamt0D6zJx4HWAGZEuXW9XR31Sdki+UqquE4xv6M+iQWIEkcFGgGAG1+9Vd95v8OJb47 6CgwFrgij9UnrILKGuZc7+tgNGl6xudn6QWUq7wgjpNXqE/DRWflvz3FTOKylQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723568380; a=rsa-sha256; cv=none; b=DmcCg7vaS3QA5knpLcgyW5V+rAOk8vI37qqIUvrFNkYvj90Upt6mZBcZRKUazXK8NPesOn KJJxFUq1vTrHCLoNUPVPX6sAOPlUli4uvxzQB0YPy0F3j2xblE1MQhVBVO8G9nRGzGeztb 5D2Ypj4JbohRm3XcNTxMnIjOuYWKReeJTVupbz3KwZOpjv9s9uWPDdxKL9xJ6LLGVt/X7x 0gH7rVmPDucVDHF0XOsS7ntygG/H2iFhklJ6p/OvkKbT31acKlGzGQGhD4rcgOSC6FMt1k ql9ISFjbuEp8ksjYDvsGvg+edfRLLCDEm6O9FvVOFCUrTlCpFK5xDBVqJvEFYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568380; 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=w9YtRebyZ4bNNOR/ue7oQAa6kVY5X2LIw7ybbAIf75w=; b=OIWLSAGjDamV/sbR411Txm0WOcwhEEqlcMO/k0ise7BQQc2x1a2b5a18bfR1zd9GRmJ0/U HNoGWD5kduZ0OnIn7mnoPtTTkf65SZrxnUf9OenvQJsq7NGZCH35ezso7P0o0EMxnZFv/N V7FlWOI01BCLMFxxlWE/G4uLnARhLzdeMrTv9YY2GL6RY3ZWSxyo3wfQS48ww2ZzcPsjkY TKRbrEHlP0HgA9kTb8GmiDEqAIFpgJ9PZkmhp3nZY54SSMoljVYep5bKPkg5NlOcmZjDUT 11xSoDGoAaT8O+1hIABCsfhTq4gfr6MB4TfyxVWmEAhUtq21a4NTlqB5Sos8MQ== 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 4WjyKm2N2qzJCd; Tue, 13 Aug 2024 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DGxecd085574; Tue, 13 Aug 2024 16:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DGxeWB085571; Tue, 13 Aug 2024 16:59:40 GMT (envelope-from git) Date: Tue, 13 Aug 2024 16:59:40 GMT Message-Id: <202408131659.47DGxeWB085571@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: 140f361aa60f - releng/13.4 - Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 140f361aa60fbf3fd48fdfe1936fef4faa25c720 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=140f361aa60fbf3fd48fdfe1936fef4faa25c720 commit 140f361aa60fbf3fd48fdfe1936fef4faa25c720 Author: Dimitry Andric AuthorDate: 2024-08-10 21:03:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-13 16:59:05 +0000 Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): [utils/TableGen/X86CompressEVEXTablesEmitter.cpp] Make sure the tablegen output for the `checkPredicate` function is deterministic (#84533) The output for the `checkPredicate` function was depending on a `std::map` iteration that was non-deterministic from run to run, because the keys were pointer values. Make a change so that the keys are `StringRef`s so the ordering is stable. This avoids non-determinism in llvm-tblgen output, which could cause differences in the generated X86GenCompressEVEXTables.inc file. Although these differences are not influencing the meaning of the generated code, they still change a few bytes in libllvm. This in turn influences all the binaries linked with libllvm, such as clang, ld.lld, etc. Reported by: cperciva Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 7a8d05ba19b7762596c0ff22e668e4d50bac81cf) (cherry picked from commit 4dac78525c448c898473e2163660b38b705b3a34) --- .../llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp index fef8dc7236f5..ee0a96ee5b53 100644 --- a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp @@ -46,7 +46,7 @@ class X86CompressEVEXTablesEmitter { typedef std::pair Entry; - typedef std::map> + typedef std::map> PredicateInstMap; std::vector Table; @@ -89,7 +89,7 @@ void X86CompressEVEXTablesEmitter::printCheckPredicate( for (const auto &[Key, Val] : PredicateInsts) { for (const auto &Inst : Val) OS << " case X86::" << Inst->TheDef->getName() << ":\n"; - OS << " return " << Key->getValueAsString("CondString") << ";\n"; + OS << " return " << Key << ";\n"; } OS << " }\n"; @@ -226,7 +226,7 @@ void X86CompressEVEXTablesEmitter::run(raw_ostream &OS) { Name == "HasAVXIFMA"; }); if(It!= Predicates.end()) - PredicateInsts[*It].push_back(NewInst); + PredicateInsts[(*It)->getValueAsString("CondString")].push_back(NewInst); } printTable(Table, OS);