[llvm-commits] [llvm] r164153 - /llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
Andrew Trick
atrick at apple.com
Tue Sep 18 11:20:00 PDT 2012
Author: atrick
Date: Tue Sep 18 13:20:00 2012
New Revision: 164153
URL: http://llvm.org/viewvc/llvm-project?rev=164153&view=rev
Log:
misched: Make ScheduleDAGInstrs use the TargetSchedule interface.
Modified:
llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
Modified: llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp?rev=164153&r1=164152&r2=164153&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp Tue Sep 18 13:20:00 2012
@@ -52,6 +52,9 @@
DbgValues.clear();
assert(!(IsPostRA && MRI.getNumVirtRegs()) &&
"Virtual registers must be removed prior to PostRA scheduling");
+
+ const TargetSubtargetInfo &ST = TM.getSubtarget<TargetSubtargetInfo>();
+ SchedModel.init(*ST.getSchedModel(), &ST, TII);
}
/// getUnderlyingObjectFromInt - This is the function that does the work of
@@ -274,15 +277,13 @@
// perform its own adjustments.
SDep dep(SU, SDep::Data, LDataLatency, *Alias);
if (!UnitLatencies) {
- unsigned Latency =
- TII->computeOperandLatency(InstrItins, SU->getInstr(), OperIdx,
- (UseOp < 0 ? 0 : UseMI), UseOp);
- dep.setLatency(Latency);
- unsigned MinLatency =
- TII->computeOperandLatency(InstrItins, SU->getInstr(), OperIdx,
- (UseOp < 0 ? 0 : UseMI), UseOp,
- /*FindMin=*/true);
- dep.setMinLatency(MinLatency);
+ MachineInstr *RegUse = UseOp < 0 ? 0 : UseMI;
+ dep.setLatency(
+ SchedModel.computeOperandLatency(SU->getInstr(), OperIdx,
+ RegUse, UseOp, /*FindMin=*/false));
+ dep.setMinLatency(
+ SchedModel.computeOperandLatency(SU->getInstr(), OperIdx,
+ RegUse, UseOp, /*FindMin=*/true));
ST.adjustSchedDependency(SU, UseSU, dep);
}
@@ -477,13 +478,10 @@
// Adjust the dependence latency using operand def/use information, then
// allow the target to perform its own adjustments.
int DefOp = Def->findRegisterDefOperandIdx(Reg);
- unsigned Latency =
- TII->computeOperandLatency(InstrItins, Def, DefOp, MI, OperIdx);
- dep.setLatency(Latency);
- unsigned MinLatency =
- TII->computeOperandLatency(InstrItins, Def, DefOp, MI, OperIdx,
- /*FindMin=*/true);
- dep.setMinLatency(MinLatency);
+ dep.setLatency(
+ SchedModel.computeOperandLatency(Def, DefOp, MI, OperIdx, false));
+ dep.setMinLatency(
+ SchedModel.computeOperandLatency(Def, DefOp, MI, OperIdx, true));
const TargetSubtargetInfo &ST = TM.getSubtarget<TargetSubtargetInfo>();
ST.adjustSchedDependency(DefSU, SU, const_cast<SDep &>(dep));
More information about the llvm-commits
mailing list