Add explicit iteration counts to the cord, hashing, and proto benchmarks

PiperOrigin-RevId: 736568830
Change-Id: If01e162f1c0e72a6550c45fc7590515db0a49a3b

Author: andreas-abel

fleetbench/hashing/BUILD

@@ -9,7 +9,9 @@ cc_library(
     deps = [
         "//fleetbench:dynamic_registrar",
         "//fleetbench/common",
+        "@com_google_absl//absl/base:no_destructor",
         "@com_google_absl//absl/container:btree",
+        "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/crc:crc32c",
         "@com_google_absl//absl/hash",
         "@com_google_absl//absl/strings",

fleetbench/hashing/hashing_benchmark.cc

@@ -25,7 +25,9 @@
 #include <utility>
 #include <vector>
 
+#include "absl/base/no_destructor.h"
 #include "absl/container/btree_map.h"
+#include "absl/container/flat_hash_map.h"
 #include "absl/crc/crc32c.h"
 #include "absl/hash/hash.h"
 #include "absl/strings/str_cat.h"
@@ -39,6 +41,14 @@ namespace hashing {
 
 using CacheInfo = benchmark::CPUInfo::CacheInfo;
 
+// Maps the default benchmarks to their minimum iteration counts.
+// We use the fleet-wide cold distributions as the defaults.
+absl::NoDestructor<absl::flat_hash_map<std::string, benchmark::IterationCount>>
+    kDefaultBenchmarks(
+        {{"BM_HASHING_Extendcrc32cinternal_Fleet_cold", 2'000'000'000},
+         {"BM_HASHING_Computecrc32c_Fleet_cold", 1'000'000'000},
+         {"BM_HASHING_Combine_contiguous_Fleet_cold", 500'000'000}});
+
 struct BM_Hashing_Parameters {
   std::vector<int> str_lengths;
   absl::string_view sv;
@@ -240,9 +250,17 @@ void RegisterBenchmarks() {
       for (const auto &[hot_str, hot] : cache_resident_info) {
         std::string benchmark_name =
             absl::StrCat("BM_HASHING_", application, "_", hot_str);
-        benchmark::RegisterBenchmark(benchmark_name, BM_Hashing,
-                                     hashing_size_distribution, hash_function,
-                                     hot, suffix_name);
+        benchmark::internal::Benchmark *benchmark =
+            benchmark::RegisterBenchmark(benchmark_name, BM_Hashing,
+                                         hashing_size_distribution,
+                                         hash_function, hot, suffix_name);
+        // Use the default minimum iteration count if possible.
+        if (UseExplicitIterationCounts()) {
+          auto it = kDefaultBenchmarks->find(benchmark_name);
+          if (it != kDefaultBenchmarks->end()) {
+            benchmark->Iterations(it->second);
+          }
+        }
       }
     }
   }
@@ -252,14 +270,9 @@ class BenchmarkRegisterer {
  public:
   BenchmarkRegisterer() {
     DynamicRegistrar::Get()->AddCallback(RegisterBenchmarks);
-
-    // We use the fleet-wide cold distributions as the defaults.
-    DynamicRegistrar::Get()->AddDefaultFilter(
-        "BM_HASHING_Extendcrc32cinternal_Fleet_cold");
-    DynamicRegistrar::Get()->AddDefaultFilter(
-        "BM_HASHING_Computecrc32c_Fleet_cold");
-    DynamicRegistrar::Get()->AddDefaultFilter(
-        "BM_HASHING_Combine_contiguous_Fleet_cold");
+    for (const auto &[benchmark_name, _] : *kDefaultBenchmarks) {
+      DynamicRegistrar::Get()->AddDefaultFilter(benchmark_name);
+    }
   }
 };
 

fleetbench/libc/mem_benchmark.cc

@@ -543,9 +543,11 @@ void RegisterBenchmarks() {
                 overlap_probability, alignment_distribution, buffer_counter,
                 memory_function, cache_size, suffix_name);
         // Use the default minimum iteration count if possible.
-        auto it = kDefaultBenchmarks->find(benchmark_name);
-        if (it != kDefaultBenchmarks->end() && UseExplicitIterationCounts()) {
-          benchmark->Iterations(it->second);
+        if (UseExplicitIterationCounts()) {
+          auto it = kDefaultBenchmarks->find(benchmark_name);
+          if (it != kDefaultBenchmarks->end()) {
+            benchmark->Iterations(it->second);
+          }
         }
       }
     }

fleetbench/proto/benchmark.cc

@@ -15,6 +15,7 @@
 
 #include <cstdint>
 
+#include "fleetbench/common/common.h"
 #include "fleetbench/dynamic_registrar.h"
 #include "fleetbench/productivity_reporter.h"
 #include "fleetbench/proto/lifecycle.h"
@@ -53,7 +54,11 @@ void BM_Protogen_NoArena(benchmark::State& state) {
 }
 
 void RegisterBenchmarks() {
-  benchmark::RegisterBenchmark("BM_PROTO_Arena", BM_Protogen_Arena);
+  benchmark::internal::Benchmark* benchmark =
+      benchmark::RegisterBenchmark("BM_PROTO_Arena", BM_Protogen_Arena);
+  if (UseExplicitIterationCounts()) {
+    benchmark->Iterations(100);
+  }
   benchmark::RegisterBenchmark("BM_PROTO_NoArena", BM_Protogen_NoArena);
 }
 

fleetbench/stl/cord_benchmark.cc

@@ -17,6 +17,7 @@
 
 #include "absl/strings/cord.h"
 #include "benchmark/benchmark.h"
+#include "fleetbench/common/common.h"
 #include "fleetbench/dynamic_registrar.h"
 #include "fleetbench/stl/generated_cord_benchmarks.h"
 
@@ -35,9 +36,13 @@ static void BM_Cord(benchmark::State &state,
 
 void RegisterBenchmarks() {
   for (const auto &benchmark : GetBenchmarks()) {
-    benchmark::RegisterBenchmark(benchmark.name, BM_Cord,
-                                 benchmark.benchmark_code,
-                                 benchmark.benchmark_setup, benchmark.label);
+    benchmark::internal::Benchmark *registered_benchmark =
+        benchmark::RegisterBenchmark(
+            benchmark.name, BM_Cord, benchmark.benchmark_code,
+            benchmark.benchmark_setup, benchmark.label);
+    if (UseExplicitIterationCounts() && benchmark.name == "BM_CORD_Fleet") {
+      registered_benchmark->Iterations(100000);
+    }
   }
 }