Revert [llvm-mca] Return the total number of cycles from method Pipeline::run().

This reverts commits 347767.

llvm-svn: 347775

3 files changed, 5 insertions, 9 deletions

diff --git a/llvm/tools/llvm-mca/include/Pipeline.h b/llvm/tools/llvm-mca/include/Pipeline.h
index 0fd40264569..47ff07b2882 100644
--- a/llvm/tools/llvm-mca/include/Pipeline.h
+++ b/llvm/tools/llvm-mca/include/Pipeline.h
@@ -67,10 +67,7 @@ class Pipeline {
 public:
   Pipeline() : Cycles(0) {}
   void appendStage(std::unique_ptr<Stage> S);
-
-  /// Returns the total number of simulated cycles.
-  Expected<unsigned> run();
-
+  Error run();
   void addEventListener(HWEventListener *Listener);
 };
 } // namespace mca
diff --git a/llvm/tools/llvm-mca/lib/Pipeline.cpp b/llvm/tools/llvm-mca/lib/Pipeline.cpp
index 0f91060ef3f..309f415913d 100644
--- a/llvm/tools/llvm-mca/lib/Pipeline.cpp
+++ b/llvm/tools/llvm-mca/lib/Pipeline.cpp
@@ -35,7 +35,7 @@ bool Pipeline::hasWorkToProcess() {
   });
 }
 
-Expected<unsigned> Pipeline::run() {
+Error Pipeline::run() {
   assert(!Stages.empty() && "Unexpected empty pipeline found!");
 
   do {
@@ -46,7 +46,7 @@ Expected<unsigned> Pipeline::run() {
     ++Cycles;
   } while (hasWorkToProcess());
 
-  return Cycles;
+  return ErrorSuccess();
 }
 
 Error Pipeline::runCycle() {
diff --git a/llvm/tools/llvm-mca/llvm-mca.cpp b/llvm/tools/llvm-mca/llvm-mca.cpp
index 985889677de..8b792be0101 100644
--- a/llvm/tools/llvm-mca/llvm-mca.cpp
+++ b/llvm/tools/llvm-mca/llvm-mca.cpp
@@ -240,9 +240,8 @@ static void processViewOptions() {
 // Returns true on success.
 static bool runPipeline(mca::Pipeline &P) {
   // Handle pipeline errors here.
-  Expected<unsigned> Cycles = P.run();
-  if (!Cycles) {
-    WithColor::error() << toString(Cycles.takeError());
+  if (auto Err = P.run()) {
+    WithColor::error() << toString(std::move(Err));
     return false;
   }
   return true;