diff options
| author | Andrew Trick <atrick@apple.com> | 2012-07-02 19:12:29 +0000 |
|---|---|---|
| committer | Andrew Trick <atrick@apple.com> | 2012-07-02 19:12:29 +0000 |
| commit | 21cca97d9533ee2d019662380baa59b37f630d4d (patch) | |
| tree | 54e899a0546726f92d4c79fb07ae36fb874c2cb8 /llvm | |
| parent | ff123d5c6354ab5f76088ffa0550c3d0b70ff949 (diff) | |
| download | bcm5719-llvm-21cca97d9533ee2d019662380baa59b37f630d4d.tar.gz bcm5719-llvm-21cca97d9533ee2d019662380baa59b37f630d4d.zip | |
Revert accidental checkin.
My last checkin was apparently not the branch I intended. It was missing one change (added by chandlerc), and contained a spurious change.
llvm-svn: 159548
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp index 7227e62c7c3..57c20ae6a44 100644 --- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -3057,10 +3057,9 @@ unsigned ARMBaseInstrInfo::getInstrLatency(const InstrItineraryData *ItinData, unsigned Class = MCID.getSchedClass(); // For instructions with variable uops, use uops as latency. - if (!ItinData->isEmpty() && ItinData->getNumMicroOps(Class) < 0) { - dbgs() << "UOPS " << getNumMicroOps(ItinData, MI) << " " << *MI << '\n'; + if (!ItinData->isEmpty() && ItinData->getNumMicroOps(Class) < 0) return getNumMicroOps(ItinData, MI); - } + // For the common case, fall back on the itinerary's latency. unsigned Latency = ItinData->getStageLatency(Class); |
