From 0632f45885e7e61e562e8176eed84f9f1445ead3 Mon Sep 17 00:00:00 2001
From: wuchenghui <wuchenghui@xiaomi.com>
Date: Wed, 30 May 2018 14:22:53 +0800
Subject: [PATCH] fix benchmark

---
 mace/core/testing/test_benchmark.cc | 4 +---
 mace/core/testing/test_benchmark.h  | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mace/core/testing/test_benchmark.cc b/mace/core/testing/test_benchmark.cc
index f4c4c4d9..d01fffe3 100644
--- a/mace/core/testing/test_benchmark.cc
+++ b/mace/core/testing/test_benchmark.cc
@@ -37,9 +37,7 @@ Benchmark::Benchmark(const char *name, void (*benchmark_func)(int))
   Register();
 }
 
-// Run all benchmarks
-void Benchmark::Run() { Run("all"); }
-
+// Run all benchmarks that matches the pattern
 void Benchmark::Run(const char *pattern) {
   if (!all_benchmarks) return;
 
diff --git a/mace/core/testing/test_benchmark.h b/mace/core/testing/test_benchmark.h
index 96b883a4..b6c070c7 100644
--- a/mace/core/testing/test_benchmark.h
+++ b/mace/core/testing/test_benchmark.h
@@ -20,10 +20,9 @@
 #include <utility>
 #include <vector>
 
-#define MACE_BENCHMARK_CONCAT(a, b, c) a##b##c
-#define MACE_BENCHMARK(n)                                        \
-  static ::mace::testing::Benchmark *MACE_BENCHMARK_CONCAT(      \
-      __benchmark_, n, __LINE__) = (new ::mace::testing::Benchmark(#n, (n)))
+#define MACE_BENCHMARK(n) \
+  static ::mace::testing::Benchmark *__benchmark_##n = \
+      (new ::mace::testing::Benchmark(#n, (n)))
 
 namespace mace {
 namespace testing {
@@ -32,7 +31,6 @@ class Benchmark {
  public:
   Benchmark(const char *name, void (*benchmark_func)(int));
 
-  static void Run();
   static void Run(const char *pattern);
 
  private:
-- 
GitLab