https://github.com/nikic created https://github.com/llvm/llvm-project/pull/79595
Resolves #79420. >From fb66a8484904a1e585c0e54553c1c8b5e5d13dd2 Mon Sep 17 00:00:00 2001 From: Wang Pengcheng <wangpengcheng...@bytedance.com> Date: Thu, 25 Jan 2024 16:16:19 +0800 Subject: [PATCH] [TableGen] Use MapVector to remove non-determinism This fixes found non-determinism when `LLVM_REVERSE_ITERATION` option is `ON`. Fixes #79420. Reviewers: ilovepi, MaskRay Reviewed By: MaskRay Pull Request: https://github.com/llvm/llvm-project/pull/79411 (cherry picked from commit 41fe98a6e7e5cdcab4a4e9e0d09339231f480c01) --- llvm/test/TableGen/address-space-patfrags.td | 4 ++-- llvm/utils/TableGen/DAGISelMatcherEmitter.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/test/TableGen/address-space-patfrags.td b/llvm/test/TableGen/address-space-patfrags.td index 4aec6ea7e0eae86..46050a70720fbe1 100644 --- a/llvm/test/TableGen/address-space-patfrags.td +++ b/llvm/test/TableGen/address-space-patfrags.td @@ -46,7 +46,7 @@ def inst_d : Instruction { let InOperandList = (ins GPR32:$src0, GPR32:$src1); } -// SDAG: case 1: { +// SDAG: case 0: { // SDAG-NEXT: // Predicate_pat_frag_b // SDAG-NEXT: // Predicate_truncstorei16_addrspace // SDAG-NEXT: SDNode *N = Node; @@ -69,7 +69,7 @@ def : Pat < >; -// SDAG: case 6: { +// SDAG: case 4: { // SDAG: // Predicate_pat_frag_a // SDAG-NEXT: SDNode *N = Node; // SDAG-NEXT: (void)N; diff --git a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp index 455183987b7b27b..50156d34528c153 100644 --- a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp +++ b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp @@ -57,7 +57,8 @@ class MatcherTableEmitter { // We de-duplicate the predicates by code string, and use this map to track // all the patterns with "identical" predicates. - StringMap<TinyPtrVector<TreePattern *>> NodePredicatesByCodeToRun; + MapVector<std::string, TinyPtrVector<TreePattern *>, StringMap<unsigned>> + NodePredicatesByCodeToRun; std::vector<std::string> PatternPredicates; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits