aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/CodeGen/MachineScheduler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/CodeGen/MachineScheduler.cpp')
-rw-r--r--llvm/lib/CodeGen/MachineScheduler.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/llvm/lib/CodeGen/MachineScheduler.cpp b/llvm/lib/CodeGen/MachineScheduler.cpp
index 7b4f29e..76cba29 100644
--- a/llvm/lib/CodeGen/MachineScheduler.cpp
+++ b/llvm/lib/CodeGen/MachineScheduler.cpp
@@ -1290,13 +1290,13 @@ LLVM_DUMP_METHOD void ScheduleDAGMI::dumpScheduleTraceTopDown() const {
SchedModel.getWriteProcResEnd(SC)));
if (MISchedSortResourcesInTrace)
- llvm::stable_sort(ResourcesIt,
- [](const MCWriteProcResEntry &LHS,
- const MCWriteProcResEntry &RHS) -> bool {
- return LHS.AcquireAtCycle < RHS.AcquireAtCycle ||
- (LHS.AcquireAtCycle == RHS.AcquireAtCycle &&
- LHS.ReleaseAtCycle < RHS.ReleaseAtCycle);
- });
+ llvm::stable_sort(
+ ResourcesIt,
+ [](const MCWriteProcResEntry &LHS,
+ const MCWriteProcResEntry &RHS) -> bool {
+ return std::tie(LHS.AcquireAtCycle, LHS.ReleaseAtCycle) <
+ std::tie(RHS.AcquireAtCycle, RHS.ReleaseAtCycle);
+ });
for (const MCWriteProcResEntry &PI : ResourcesIt) {
C = FirstCycle;
const std::string ResName =
@@ -1371,13 +1371,13 @@ LLVM_DUMP_METHOD void ScheduleDAGMI::dumpScheduleTraceBottomUp() const {
SchedModel.getWriteProcResEnd(SC)));
if (MISchedSortResourcesInTrace)
- llvm::stable_sort(ResourcesIt,
- [](const MCWriteProcResEntry &LHS,
- const MCWriteProcResEntry &RHS) -> bool {
- return LHS.AcquireAtCycle < RHS.AcquireAtCycle ||
- (LHS.AcquireAtCycle == RHS.AcquireAtCycle &&
- LHS.ReleaseAtCycle < RHS.ReleaseAtCycle);
- });
+ llvm::stable_sort(
+ ResourcesIt,
+ [](const MCWriteProcResEntry &LHS,
+ const MCWriteProcResEntry &RHS) -> bool {
+ return std::tie(LHS.AcquireAtCycle, LHS.ReleaseAtCycle) <
+ std::tie(RHS.AcquireAtCycle, RHS.ReleaseAtCycle);
+ });
for (const MCWriteProcResEntry &PI : ResourcesIt) {
C = FirstCycle;
const std::string ResName =