feat: add walltime support to google benchmark

Author: not-matthias

google_benchmark/include/benchmark/benchmark.h

@@ -946,7 +946,7 @@ class BENCHMARK_EXPORT BENCHMARK_INTERNAL_CACHELINE_ALIGNED State {
 
  public:
   const IterationCount max_iterations;
-#ifdef CODSPEED_INSTRUMENTATION
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
   codspeed::CodSpeed* codspeed_;
 #endif
 
@@ -970,7 +970,7 @@ class BENCHMARK_EXPORT BENCHMARK_INTERNAL_CACHELINE_ALIGNED State {
         internal::ThreadTimer* timer, internal::ThreadManager* manager,
         internal::PerfCountersMeasurement* perf_counters_measurement,
         ProfilerManager* profiler_manager
-#ifdef CODSPEED_INSTRUMENTATION
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
         ,
         codspeed::CodSpeed* codspeed = NULL
 #endif
@@ -1064,12 +1064,9 @@ struct State::StateIterator {
   BENCHMARK_ALWAYS_INLINE
   bool operator!=(StateIterator const&) const {
     if (BENCHMARK_BUILTIN_EXPECT(cached_ != 0, true)) return true;
-#ifdef CODSPEED_INSTRUMENTATION
-    measurement_stop();
 
-    if (parent_->codspeed_ != NULL) {
-      parent_->codspeed_->end_benchmark();
-    }
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
+    measurement_stop();
 #endif
     parent_->FinishKeepRunning();
     return false;
@@ -1085,13 +1082,11 @@ inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::begin() {
 }
 inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
   StartKeepRunning();
-#ifdef CODSPEED_INSTRUMENTATION
-  if (this->codspeed_ != NULL) {
-    this->codspeed_->start_benchmark(name_);
-  }
 
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
   measurement_start();
 #endif
+
   return StateIterator();
 }
 

google_benchmark/src/benchmark.cc

@@ -175,15 +175,15 @@ State::State(std::string name, IterationCount max_iters,
              internal::ThreadTimer* timer, internal::ThreadManager* manager,
              internal::PerfCountersMeasurement* perf_counters_measurement,
              ProfilerManager* profiler_manager
-#ifdef CODSPEED_INSTRUMENTATION
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
              ,
              codspeed::CodSpeed* codspeed
 #endif
              )
     : total_iterations_(0),
       batch_leftover_(0),
       max_iterations(max_iters),
-#ifdef CODSPEED_INSTRUMENTATION
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
       codspeed_(codspeed),
 #endif
       started_(false),
@@ -542,6 +542,14 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
 #endif
     for (size_t repetition_index : repetition_indices) {
       internal::BenchmarkRunner& runner = runners[repetition_index];
+
+#ifdef CODSPEED_WALLTIME
+      auto codspeed = codspeed::CodSpeed::getInstance();
+      if (codspeed != nullptr) {
+        codspeed->start_benchmark(runner.GetBenchmarkName());
+      }
+#endif
+      
       runner.DoOneRepetition();
       if (runner.HasRepeatsRemaining()) {
         continue;
@@ -571,6 +579,10 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
       }
 
 #ifdef CODSPEED_WALLTIME
+      if (codspeed != nullptr) {
+        codspeed->end_benchmark();
+      }
+
       codspeed_walltime_data.push_back(generate_raw_walltime_data(run_results));
 #endif
 

google_benchmark/src/benchmark_api_internal.cc

@@ -119,8 +119,14 @@ State BenchmarkInstance::Run(
     internal::ThreadManager* manager,
     internal::PerfCountersMeasurement* perf_counters_measurement,
     ProfilerManager* profiler_manager) const {
+#ifdef CODSPEED_WALLTIME
+  State st(name_.function_name, iters, args_, thread_id, threads_, timer,
+           manager, perf_counters_measurement, profiler_manager, codspeed::CodSpeed::getInstance());
+#else
   State st(name_.function_name, iters, args_, thread_id, threads_, timer,
            manager, perf_counters_measurement, profiler_manager);
+#endif
+
   benchmark_.Run(st);
   return st;
 }

google_benchmark/src/benchmark_runner.h

@@ -119,6 +119,13 @@ class BenchmarkRunner {
   void FinishWarmUp(const IterationCount& i);
 
   void RunWarmUp();
+
+#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
+public:  
+  inline std::string GetBenchmarkName() {
+    return b.name().str();
+  }
+#endif
 };
 
 }  // namespace internal