diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-02-22 03:33:28 +0000 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-02-22 03:33:28 +0000 |
| commit | e59c8af7059f2ba1d65ea421a8ba4a739ed80372 (patch) | |
| tree | 82340acfca3d130a9010741be335e29d5a27431c /llvm/lib/CodeGen/MachineCombiner.cpp | |
| parent | 0cc90a9147ccaef59cdb9caf4d68de990e5fdd05 (diff) | |
| download | bcm5719-llvm-e59c8af7059f2ba1d65ea421a8ba4a739ed80372.tar.gz bcm5719-llvm-e59c8af7059f2ba1d65ea421a8ba4a739ed80372.zip | |
Reapply "CodeGen: Use references in MachineTraceMetrics::Trace, NFC"
This reverts commit r261510, effectively reapplying r261509. The
original commit missed a caller in AArch64ConditionalCompares.
Original commit message:
Pass non-null arguments by reference in MachineTraceMetrics::Trace,
simplifying future work to remove implicit iterator => pointer
conversions.
llvm-svn: 261511
Diffstat (limited to 'llvm/lib/CodeGen/MachineCombiner.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/MachineCombiner.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/MachineCombiner.cpp b/llvm/lib/CodeGen/MachineCombiner.cpp index fa43c4dfa05..b5416f9b289 100644 --- a/llvm/lib/CodeGen/MachineCombiner.cpp +++ b/llvm/lib/CodeGen/MachineCombiner.cpp @@ -156,7 +156,7 @@ MachineCombiner::getDepth(SmallVectorImpl<MachineInstr *> &InsInstrs, } else { MachineInstr *DefInstr = getOperandDef(MO); if (DefInstr) { - DepthOp = BlockTrace.getInstrCycles(DefInstr).Depth; + DepthOp = BlockTrace.getInstrCycles(*DefInstr).Depth; LatencyOp = TSchedModel.computeOperandLatency( DefInstr, DefInstr->findRegisterDefOperandIdx(MO.getReg()), InstrPtr, InstrPtr->findRegisterUseOperandIdx(MO.getReg())); @@ -198,7 +198,7 @@ unsigned MachineCombiner::getLatency(MachineInstr *Root, MachineInstr *NewRoot, RI++; MachineInstr *UseMO = RI->getParent(); unsigned LatencyOp = 0; - if (UseMO && BlockTrace.isDepInTrace(Root, UseMO)) { + if (UseMO && BlockTrace.isDepInTrace(*Root, *UseMO)) { LatencyOp = TSchedModel.computeOperandLatency( NewRoot, NewRoot->findRegisterDefOperandIdx(MO.getReg()), UseMO, UseMO->findRegisterUseOperandIdx(MO.getReg())); @@ -250,7 +250,7 @@ bool MachineCombiner::improvesCriticalPathLen( // Get depth and latency of NewRoot and Root. unsigned NewRootDepth = getDepth(InsInstrs, InstrIdxForVirtReg, BlockTrace); - unsigned RootDepth = BlockTrace.getInstrCycles(Root).Depth; + unsigned RootDepth = BlockTrace.getInstrCycles(*Root).Depth; DEBUG(dbgs() << "DEPENDENCE DATA FOR " << Root << "\n"; dbgs() << " NewRootDepth: " << NewRootDepth << "\n"; @@ -269,7 +269,7 @@ bool MachineCombiner::improvesCriticalPathLen( // even if the instruction depths (data dependency cycles) become worse. unsigned NewRootLatency = getLatency(Root, NewRoot, BlockTrace); unsigned RootLatency = TSchedModel.computeInstrLatency(Root); - unsigned RootSlack = BlockTrace.getInstrSlack(Root); + unsigned RootSlack = BlockTrace.getInstrSlack(*Root); DEBUG(dbgs() << " NewRootLatency: " << NewRootLatency << "\n"; dbgs() << " RootLatency: " << RootLatency << "\n"; |
