chore(google_benchmark): rework benches

Author: not-matthias

examples/google_benchmark/main.cpp

@@ -1,59 +1,15 @@
+#include "template_bench.hpp"
 #include <benchmark/benchmark.h>
 #include <cstring>
 
-// Passing Arbitrary Arguments to a Benchmark
-// See:
-// https://github.com/google/benchmark/blob/main/docs/user_guide.md#passing-arbitrary-arguments-to-a-benchmark
 template <class... Args>
-void BM_takes_args(benchmark::State &state, Args &&...args) {
+void BM_Capture(benchmark::State &state, Args &&...args) {
   auto args_tuple = std::make_tuple(std::move(args)...);
   for (auto _ : state) {
   }
 }
-BENCHMARK_CAPTURE(BM_takes_args, int_string_test, 42, std::string("abc"));
-BENCHMARK_CAPTURE(BM_takes_args, int_test, 42, 43);
-
-// Benchmark template
-//
-template <class T> void BM_VectorPushBack(benchmark::State &state) {
-  std::vector<T> v;
-  for (auto _ : state) {
-    v.push_back(T());
-  }
-}
-BENCHMARK_TEMPLATE(BM_VectorPushBack, int);
-BENCHMARK_TEMPLATE(BM_VectorPushBack, std::string);
-
-template <typename T> void BM_Template1(benchmark::State &state) {
-  T val = T();
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(val++);
-  }
-}
-BENCHMARK_TEMPLATE1(BM_Template1, int);
-
-template <typename T, typename U> void BM_Template2(benchmark::State &state) {
-  T t = T();
-  U u = U();
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(t + u);
-  }
-}
-BENCHMARK_TEMPLATE2(BM_Template2, int, double);
-
-// Benchmark template capture
-//
-template <typename T, class... ExtraArgs>
-void BM_takes_args(benchmark::State &state, ExtraArgs &&...extra_args) {
-  auto args_tuple = std::make_tuple(std::move(extra_args)...);
-  for (auto _ : state) {
-  }
-}
-BENCHMARK_TEMPLATE1_CAPTURE(BM_takes_args, void, int_string_test, 42,
-                            std::string("abc"));
-
-BENCHMARK_TEMPLATE2_CAPTURE(BM_takes_args, int, double, two_type_test, 42,
-                            std::string("abc"));
+BENCHMARK_CAPTURE(BM_Capture, int_string_test, 42, std::string("abc"));
+BENCHMARK_CAPTURE(BM_Capture, int_test, 42, 43);
 
 // Function to benchmark
 static void BM_rand_vector(benchmark::State &state) {

examples/google_benchmark/template_bench.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <benchmark/benchmark.h>
+#include <cstring>
+#include <string>
+
+template <class T> void BM_Template(benchmark::State &state) {
+  std::vector<T> v;
+  for (auto _ : state) {
+    v.push_back(T());
+  }
+}
+BENCHMARK_TEMPLATE(BM_Template, int);
+BENCHMARK_TEMPLATE(BM_Template, std::string);
+
+//
+//
+
+template <typename T> void BM_Template1(benchmark::State &state) {
+  T val = T();
+  for (auto _ : state) {
+    benchmark::DoNotOptimize(val++);
+  }
+}
+BENCHMARK_TEMPLATE1(BM_Template1, int);
+
+//
+//
+
+template <typename T, typename U> void BM_Template2(benchmark::State &state) {
+  T t = T();
+  U u = U();
+  for (auto _ : state) {
+    benchmark::DoNotOptimize(t + u);
+  }
+}
+BENCHMARK_TEMPLATE2(BM_Template2, int, double);
+
+//
+//
+
+template <typename T, class... ExtraArgs>
+void BM_Template1_Capture(benchmark::State &state, ExtraArgs &&...extra_args) {
+  auto args_tuple = std::make_tuple(std::move(extra_args)...);
+  for (auto _ : state) {
+  }
+}
+BENCHMARK_TEMPLATE1_CAPTURE(BM_Template1_Capture, void, int_string_test, 42,
+                            std::string("abc"));
+BENCHMARK_TEMPLATE2_CAPTURE(BM_Template1_Capture, int, double, two_type_test,
+                            42, std::string("abc"));

google_benchmark/include/benchmark/benchmark.h

@@ -1537,8 +1537,18 @@ class Fixture : public internal::Benchmark {
 // BENCHMARK_TEMPLATE1_CAPTURE(BM_takes_args, void, int_string_test, 42,
 //                             std::string("abc"));
 #ifdef CODSPEED_ENABLED
+
+// BM_Template1_Capture<void>[int_string_test] will be turned into
+// BM_Template1_Capture[int_string_test]
+#define BENCHMARK_CAPTURE_WITH_NAME(func, func_name, test_case_name, ...) \
+  BENCHMARK_PRIVATE_DECLARE(_benchmark_) =                                \
+      (::benchmark::internal::RegisterBenchmarkInternal(                  \
+          std::make_unique<::benchmark::internal::FunctionBenchmark>(     \
+              CUR_FILE + #func_name NAME_START #test_case_name NAME_END,  \
+              [](::benchmark::State& st) { func(st, __VA_ARGS__); })))
+
 #define BENCHMARK_TEMPLATE1_CAPTURE(func, a, test_case_name, ...) \
-  BENCHMARK_CAPTURE(func, test_case_name, __VA_ARGS__)
+  BENCHMARK_CAPTURE_WITH_NAME(func<a>, func, test_case_name, __VA_ARGS__)
 #else
 #define BENCHMARK_TEMPLATE1_CAPTURE(func, a, test_case_name, ...) \
   BENCHMARK_CAPTURE(func<a>, test_case_name, __VA_ARGS__)