[llvm-profgen][NFC] Fix test failure by making unwinder's output deterministic

[wlei]

Summary

Don't know why under Sanitizer build(asan/msan/ubsan), the std::unordered_map<string, ...>'s output order is reversed, make the regression test failed.

This change creates a workaround by using sorted container to make the output deterministic.

[hoy]

Thanks for the fast turnaround!

[wenlei]

Thanks for quick fix!

llvm/tools/llvm-profgen/PerfReader.cpp

202

Does this work?

std::map<std::string, RangeSample> OrderedCounter(Counter.begin(), Counter.end());

[wlei]

llvm/tools/llvm-profgen/PerfReader.cpp

202

Yeah, thanks for the suggestion!

[wlei]

change according wenlei's suggestion

llvm/test/tools/llvm-profgen/inline-cs-noprobe.test

 ; RUN: llvm-profgen --perfscript=%S/Inputs/inline-cs-noprobe.perfscript --binary=%S/Inputs/inline-cs-noprobe.perfbin --output=%t --show-unwinder-output | FileCheck %s --check-prefix=CHECK-UNWINDER
 ; RUN: FileCheck %s --input-file %t
 
 ; CHECK:[main:1 @ foo]:44:0
 ; CHECK: 2.2: 14
 ; CHECK: 3: 15
 ; CHECK: 3.2: 14 bar:14
 ; CHECK: 3.4: 1
 ; CHECK:[main:1 @ foo:3.2 @ bar]:14:0
 ; CHECK: 1: 14
 
 ; CHECK-UNWINDER: Binary(inline-cs-noprobe.perfbin)'s Range Counter:
-; CHECK-UNWINDER: main:1 @ foo:3.2 @ bar
-; CHECK-UNWINDER:   (6af, 6bb): 14
 ; CHECK-UNWINDER: main:1 @ foo
 ; CHECK-UNWINDER:   (670, 6ad): 1
 ; CHECK-UNWINDER:   (67e, 69b): 1
 ; CHECK-UNWINDER:   (67e, 6ad): 13
 ; CHECK-UNWINDER:   (6bd, 6c8): 14
+; CHECK-UNWINDER: main:1 @ foo:3.2 @ bar
+; CHECK-UNWINDER:   (6af, 6bb): 14
+
 
 ; CHECK-UNWINDER: Binary(inline-cs-noprobe.perfbin)'s Branch Counter:
 ; CHECK-UNWINDER: main:1 @ foo
 ; CHECK-UNWINDER:   (69b, 670): 1
 ; CHECK-UNWINDER:   (6c8, 67e): 15
 
 ; original code:
 ; clang -O3 -g test.c -o a.out

llvm/tools/llvm-profgen/PerfReader.cpp

if (Iter == AddrToBinaryMap.end() || Iter->first != Address) {
     if (Iter == AddrToBinaryMap.begin())
       return nullptr;
     Iter--;
   }
   return Iter->second;
 }
 
 static void printSampleCounter(ContextRangeCounter &Counter) {
-  for (auto Range : Counter) {
+  // Use ordered map to make the output deterministic
+  std::map<std::string, RangeSample> OrderedCounter(Counter.begin(),
+                                                    Counter.end());
+  for (auto Range : OrderedCounter) {
     outs() << Range.first << "\n";
     for (auto I : Range.second) {
       outs() << "  (" << format("%" PRIx64, I.first.first) << ", "
              << format("%" PRIx64, I.first.second) << "): " << I.second << "\n";
     }
   }
 }