Skip to content

Commit 5c1df39

Browse files
committed
Revert "Speculative buildbot fix after ca2e8f"
This reverts commit bd2dac9, and part of ca2e8fc. My speculative attempt at fixing buildbot failed, so just roll back the relavant part of the change.
1 parent 5e4fd50 commit 5c1df39

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

llvm/lib/CodeGen/RegAllocScore.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,8 @@ llvm::calculateRegAllocScore(const MachineFunction &MF,
7979
return MBFI.getBlockFreqRelativeToEntryBlock(&MBB);
8080
},
8181
[&](const MachineInstr &MI) {
82-
auto *TTI = MF.getSubtarget().getInstrInfo();
83-
return TTI->isTriviallyReMaterializable(MI) &&
84-
llvm::all_of(MI.all_uses(), [](const MachineOperand &MO) {
85-
return MO.getReg().isVirtual();
86-
});
82+
return MF.getSubtarget().getInstrInfo()->isTriviallyReMaterializable(
83+
MI);
8784
});
8885
}
8986

llvm/test/CodeGen/MLRegAlloc/dev-mode-logging.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
; NOML: observation: 17
3434
; ML: observation: 83
3535
; ML: reward: 38.42
36-
; NOML: reward: 39.07316970825195
36+
; NOML: reward: 37.06
3737

3838

3939
; CHECK-TWO-FCTS: context: SyFgets

llvm/test/CodeGen/MLRegAlloc/dev-mode-prio-logging.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323

2424
; CHECK-NOT: nan
2525
; CHECK-LABEL: priority:
26-
; NOML-SAME: 2684354560.0
26+
; NOML-SAME: 2684358144.0
2727
; ML-SAME: 3535
2828
; CHECK-LABEL: reward:

0 commit comments

Comments
 (0)