diff --git a/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.h b/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.h --- a/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.h +++ b/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.h @@ -88,8 +88,6 @@ class FunctionExecutor { public: virtual ~FunctionExecutor(); - // FIXME deprecate this. - virtual Expected runAndMeasure(const char *Counters) const = 0; virtual Expected> runAndSample(const char *Counters) const = 0; diff --git a/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp b/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp --- a/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp +++ b/llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp @@ -47,13 +47,6 @@ Scratch(Scratch) {} private: - Expected runAndMeasure(const char *Counters) const override { - auto ResultOrError = runAndSample(Counters); - if (ResultOrError) - return ResultOrError.get()[0]; - return ResultOrError.takeError(); - } - static void accumulateCounterValues(const llvm::SmallVector &NewValues, llvm::SmallVector *Result) { diff --git a/llvm/tools/llvm-exegesis/lib/UopsBenchmarkRunner.cpp b/llvm/tools/llvm-exegesis/lib/UopsBenchmarkRunner.cpp --- a/llvm/tools/llvm-exegesis/lib/UopsBenchmarkRunner.cpp +++ b/llvm/tools/llvm-exegesis/lib/UopsBenchmarkRunner.cpp @@ -25,19 +25,19 @@ IssueCounter != IssueCounterEnd; ++IssueCounter) { if (!IssueCounter->Counter) continue; - auto ExpectedCounterValue = Executor.runAndMeasure(IssueCounter->Counter); + auto ExpectedCounterValue = Executor.runAndSample(IssueCounter->Counter); if (!ExpectedCounterValue) return ExpectedCounterValue.takeError(); Result.push_back(BenchmarkMeasure::Create(IssueCounter->ProcResName, - *ExpectedCounterValue)); + (*ExpectedCounterValue)[0])); } // NumMicroOps. if (const char *const UopsCounter = PCI.UopsCounter) { - auto ExpectedCounterValue = Executor.runAndMeasure(UopsCounter); + auto ExpectedCounterValue = Executor.runAndSample(UopsCounter); if (!ExpectedCounterValue) return ExpectedCounterValue.takeError(); Result.push_back( - BenchmarkMeasure::Create("NumMicroOps", *ExpectedCounterValue)); + BenchmarkMeasure::Create("NumMicroOps", (*ExpectedCounterValue)[0])); } return std::move(Result); }