commit c9f409eb6f3c6cccfc248de5beffd66b05751e7a
author Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net> Tue Apr 10 09:55:33 2018 +0000
committer Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net> Tue Apr 10 09:55:33 2018 +0000
tree fe1d539791a28d6b890874ee8d334ec4cb27119b
parent 31f199c82d64f29aec76a54fe8c78c93096ec412

Reapply "[llvm-mca] Do not separate iterations with a newline in the timeline view."

This reapplies r329403 with a fix for the floating point rounding issue.

llvm-svn: 329680

llvm/tools/llvm-mca/TimelineView.cpp

diff --git a/llvm/tools/llvm-mca/TimelineView.cpp b/llvm/tools/llvm-mca/TimelineView.cpp
index 9419fe4..840d4db 100644
--- a/llvm/tools/llvm-mca/TimelineView.cpp
+++ b/llvm/tools/llvm-mca/TimelineView.cpp
@@ -72,6 +72,17 @@
   LastCycle = std::max(LastCycle, CurrentCycle);
 }
 
+static void printAverageTime(raw_string_ostream &OS, double AverageTime) {
+  // Round to the nearest tenth.
+  OS << format("%.1f", floor((AverageTime * 10) + 0.5)/10);
+  if (AverageTime < 10.0)
+    OS << "    ";
+  else if (AverageTime < 100.0)
+    OS << "   ";
+  else
+    OS << "  ";
+}
+
 void TimelineView::printWaitTimeEntry(raw_string_ostream &OS,
                                       const WaitTimeEntry &Entry,
                                       unsigned SourceIndex) const {
@@ -100,27 +111,9 @@
     else
       OS << Executions << "   ";
 
-    OS << format("%.1f", AverageTime1);
-    if (AverageTime1 < 10.0)
-      OS << "    ";
-    else if (AverageTime1 < 100.0)
-      OS << "   ";
-    else
-      OS << "  ";
-
-    OS << format("%.1f", AverageTime2);
-    if (AverageTime2 < 10.0)
-      OS << "    ";
-    else if (AverageTime2 < 100.0)
-      OS << "   ";
-    else
-      OS << "  ";
-
-    OS << format("%.1f", AverageTime3);
-    if (AverageTime3 < 10.0)
-      OS << "  ";
-    else if (AverageTime3 < 100.0)
-      OS << ' ';
+    printAverageTime(OS, AverageTime1);
+    printAverageTime(OS, AverageTime2);
+    printAverageTime(OS, AverageTime3);
   }
 }
 
@@ -155,7 +148,7 @@
                                           const TimelineViewEntry &Entry,
                                           unsigned Iteration,
                                           unsigned SourceIndex) const {
-  if (SourceIndex == 0)
+  if (Iteration == 0 && SourceIndex == 0)
     OS << '\n';
   OS << '[' << Iteration << ',' << SourceIndex << "]\t";
   for (unsigned I = 0, E = Entry.CycleDispatched; I < E; ++I)