[AArch64] Fix strict weak ordering violation in regalloc hints sort. (#192055)
This fixes an error with expensive checks after landing #190139.
The issue was:
Error: comparison doesn't meet irreflexive requirements, assert(!(a <
a)).
because it could have previously returned 'true' in the ordering
function if registers A and B were equal.
Also made NFC change to rename 'HandleMatchCmpPredicateHint' ->
'HandleDestructivePredicateHint' (that was missed in the review).
diff --git a/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp b/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
index a5b934b..f232fa7 100644
--- a/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
+++ b/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
@@ -1115,7 +1115,7 @@
}
}
-static bool HandleMatchCmpPredicateHint(
+static bool HandleDestructivePredicateHint(
Register VirtReg, ArrayRef<MCPhysReg> Order,
SmallVectorImpl<MCPhysReg> &Hints, const VirtRegMap *VRM,
const MachineRegisterInfo &MRI, const TargetInstrInfo &TII,
@@ -1158,7 +1158,7 @@
Hints.append(Order.begin(), Order.end());
llvm::stable_sort(Hints, [&](Register A, Register B) {
- return B == Op1Reg &&
+ return A != B && B == Op1Reg &&
(!CSRs.contains(A) || !MRI.def_empty(A) || Matrix->isPhysRegUsed(A));
});
return true;
@@ -1253,8 +1253,8 @@
return ConsiderOnlyHints;
}
- if (HandleMatchCmpPredicateHint(VirtReg, Order, Hints, VRM, MRI, *TII, ST,
- Matrix))
+ if (HandleDestructivePredicateHint(VirtReg, Order, Hints, VRM, MRI, *TII, ST,
+ Matrix))
return ConsiderOnlyHints;
if (!ST.hasSME() || !ST.isStreaming())