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 | 14ccc7b963861a856b593cc4fff62decd8ce248a (patch) | |
| tree | bcb03bfe9fb6e16590ad1910ca78d4bccce59ef7 | |
| parent | 1de43ede8904e08de37f601c9bab0b70f71156e1 (diff) | |
| download | external_llvm-14ccc7b963861a856b593cc4fff62decd8ce248a.zip external_llvm-14ccc7b963861a856b593cc4fff62decd8ce248a.tar.gz external_llvm-14ccc7b963861a856b593cc4fff62decd8ce248a.tar.bz2 | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159548 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMBaseInstrInfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp index 7227e62..57c20ae 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/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); |