From d2d808d2efa46dc9d430c7cd8ddb30eedc03af46 Mon Sep 17 00:00:00 2001
From: Clement Courbet <courbet@google.com>
Date: Wed, 8 Apr 2020 14:17:57 +0200
Subject: [PATCH] [llvm-exegesis][NFC] Remove dead code.

---
 llvm/tools/llvm-exegesis/lib/PerfHelper.h          | 18 -----------------
 .../tools/llvm-exegesis/PerfHelperTest.cpp         | 23 ++++++++--------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/llvm/tools/llvm-exegesis/lib/PerfHelper.h b/llvm/tools/llvm-exegesis/lib/PerfHelper.h
index 7f4fb1f..a6a2fc9 100644
--- a/llvm/tools/llvm-exegesis/lib/PerfHelper.h
+++ b/llvm/tools/llvm-exegesis/lib/PerfHelper.h
@@ -82,24 +82,6 @@ private:
 #endif
 };
 
-// Helper to measure a list of PerfEvent for a particular function.
-// callback is called for each successful measure (PerfEvent needs to be valid).
-template <typename Function>
-void Measure(
-    ArrayRef<PerfEvent> Events,
-    const std::function<void(const PerfEvent &Event, int64_t Value)> &Callback,
-    Function Fn) {
-  for (const auto &Event : Events) {
-    if (!Event.valid())
-      continue;
-    Counter Cnt(Event);
-    Cnt.start();
-    Fn();
-    Cnt.stop();
-    Callback(Event, Cnt.read());
-  }
-}
-
 } // namespace pfm
 } // namespace exegesis
 } // namespace llvm
diff --git a/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp b/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp
index 5332b84..fa6f05c 100644
--- a/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp
+++ b/llvm/unittests/tools/llvm-exegesis/PerfHelperTest.cpp
@@ -22,21 +22,14 @@ using ::testing::Not;
 TEST(PerfHelperTest, FunctionalTest) {
 #ifdef HAVE_LIBPFM
   ASSERT_FALSE(pfmInitialize());
-  const PerfEvent SingleEvent("CYCLES:u");
-  const auto &EmptyFn = []() {};
-  std::string CallbackEventName;
-  std::string CallbackEventNameFullyQualifed;
-  int64_t CallbackEventCycles;
-  Measure(
-      makeArrayRef(SingleEvent),
-      [&](const PerfEvent &Event, int64_t Value) {
-        CallbackEventName = std::string(Event.name());
-        CallbackEventNameFullyQualifed = std::string(Event.getPfmEventString());
-        CallbackEventCycles = Value;
-      },
-      EmptyFn);
-  EXPECT_EQ(CallbackEventName, "CYCLES:u");
-  EXPECT_THAT(CallbackEventNameFullyQualifed, Not(IsEmpty()));
+  const PerfEvent Event("CYCLES:u");
+  ASSERT_TRUE(Event.valid());
+  EXPECT_EQ(Event.name(), "CYCLES:u");
+  EXPECT_THAT(Event.getPfmEventString(), Not(IsEmpty()));
+  Counter Cnt(Event);
+  Cnt.start();
+  Cnt.stop();
+  Cnt.read();
   pfmTerminate();
 #else
   ASSERT_TRUE(pfmInitialize());
-- 
2.7.4