[llvm] [MC] Make pseudo-probe divisions ordering stable (PR #214803)

[via llvm-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-llvm-mc

Author: Navya  (NavyaZaveri)

<details>
<summary>Changes</summary>

**Problem**

MCPseudoProbeSections::emit sorted probe divisions only by section ordinal. 

Functions sharing a section therefore retained nondeterministic `unordered_map`

iteration order, producing different .pseudo_probe bytes for identical inputs.

**Solution**


Use the function symbol name as a stable tie-breaker when section ordinals match.

 Add an MC regression test that reverses pseudo-probe insertion order and requires byte-identical object files.

---
Full diff: https://github.com/llvm/llvm-project/pull/214803.diff


2 Files Affected:

- (modified) llvm/lib/MC/MCPseudoProbe.cpp (+6-3) 
- (added) llvm/test/MC/ELF/pseudoprobe-order.s (+30) 


``````````diff
diff --git a/llvm/lib/MC/MCPseudoProbe.cpp b/llvm/lib/MC/MCPseudoProbe.cpp
index 99cba8e3d8375..c226a7706c049 100644
--- a/llvm/lib/MC/MCPseudoProbe.cpp
+++ b/llvm/lib/MC/MCPseudoProbe.cpp
@@ -216,9 +216,12 @@ void MCPseudoProbeSections::emit(MCObjectStreamer *MCOS) {
     Vec.emplace_back(ProbeSec.first, &ProbeSec.second);
   for (auto I : llvm::enumerate(MCOS->getAssembler()))
     I.value().setOrdinal(I.index());
-  llvm::sort(Vec, [](auto A, auto B) {
-    return A.first->getSection().getOrdinal() <
-           B.first->getSection().getOrdinal();
+  llvm::sort(Vec, [](const auto &A, const auto &B) {
+    const auto AOrdinal = A.first->getSection().getOrdinal();
+    const auto BOrdinal = B.first->getSection().getOrdinal();
+    if (AOrdinal != BOrdinal)
+      return AOrdinal < BOrdinal;
+    return A.first->getName() < B.first->getName();
   });
   for (auto [FuncSym, RootPtr] : Vec) {
     const auto &Root = *RootPtr;
diff --git a/llvm/test/MC/ELF/pseudoprobe-order.s b/llvm/test/MC/ELF/pseudoprobe-order.s
new file mode 100644
index 0000000000000..a13177872dd75
--- /dev/null
+++ b/llvm/test/MC/ELF/pseudoprobe-order.s
@@ -0,0 +1,30 @@
+# RUN: rm -rf %t && split-file %s %t
+# RUN: llvm-mc -triple=x86_64 -filetype=obj %t/forward.s -o %t/forward.o
+# RUN: llvm-mc -triple=x86_64 -filetype=obj %t/reverse.s -o %t/reverse.o
+# RUN: cmp %t/forward.o %t/reverse.o
+
+#--- forward.s
+.text
+.globl z_func
+.type z_func, at function
+z_func:
+  nop
+.globl a_func
+.type a_func, at function
+a_func:
+  nop
+.pseudoprobe 1 1 0 0 z_func
+.pseudoprobe 2 1 0 0 a_func
+
+#--- reverse.s
+.text
+.globl z_func
+.type z_func, at function
+z_func:
+  nop
+.globl a_func
+.type a_func, at function
+a_func:
+  nop
+.pseudoprobe 2 1 0 0 a_func
+.pseudoprobe 1 1 0 0 z_func

``````````

</details>


https://github.com/llvm/llvm-project/pull/214803