Add cache size overrides to the context.

PiperOrigin-RevId: 831510353
Change-Id: Ic83ab97fb648f7c75df285d19afc6509dbe32799

Author: andreas-abel

fleetbench/benchmark_main.cc

@@ -143,6 +143,7 @@ int main(int argc, char* argv[]) {
   }
   fleetbench::DynamicRegistrar::Get()->Run();
 
+  fleetbench::AddEffectiveCacheSizeToContextIfSpecified();
   fleetbench::FleetbenchReporter display_reporter(
       benchmark::CreateDefaultDisplayReporter());
   if (!fleetbench::FindInCommandLine("--benchmark_out=")) {

fleetbench/common/common.cc

@@ -268,20 +268,24 @@ bool UseExplicitIterationCounts() {
          !FindInCommandLine("--benchmark_list_tests");
 }
 
+void AddEffectiveCacheSizeToContextIfSpecified() {
+  if (absl::GetFlag(FLAGS_L1_data_size).has_value() ||
+      absl::GetFlag(FLAGS_L2_size).has_value() ||
+      absl::GetFlag(FLAGS_L3_size).has_value()) {
+    benchmark::AddCustomContext("Effective L1 Data size [KiB]",
+                                absl::StrCat(GetCacheSize(1, "Data") / 1024));
+    benchmark::AddCustomContext("Effective L2 size [KiB]",
+                                absl::StrCat(GetCacheSize(2) / 1024));
+    benchmark::AddCustomContext("Effective L3 size [KiB]",
+                                absl::StrCat(GetCacheSize(3) / 1024));
+  }
+}
+
 bool FleetbenchReporter::ReportContext(
     const benchmark::BenchmarkReporter::Context& context) {
   reporter_->SetOutputStream(&this->GetOutputStream());
   reporter_->SetErrorStream(&this->GetErrorStream());
   bool result = reporter_->ReportContext(context);
-  if (absl::GetFlag(FLAGS_L1_data_size).has_value() ||
-      absl::GetFlag(FLAGS_L2_size).has_value() ||
-      absl::GetFlag(FLAGS_L3_size).has_value()) {
-    auto& err = this->GetErrorStream();
-    err << "Effective CPU Cache Sizes:\n";
-    err << "  L1 Data " << GetCacheSize(1, "Data") / 1024 << " KiB\n";
-    err << "  L2 " << GetCacheSize(2) / 1024 << " KiB\n";
-    err << "  L3 " << GetCacheSize(3) / 1024 << " KiB\n";
-  }
   return result;
 }
 

fleetbench/common/common.h

@@ -141,5 +141,9 @@ bool FindInCommandLine(absl::string_view s, bool exact_match = false);
 // `/iterations:x` when explicit iteration counts are used.
 bool UseExplicitIterationCounts();
 
+// Adds the effective cache sizes to the benchmark context if the cache sizes
+// are specified by the corresponding flags.
+void AddEffectiveCacheSizeToContextIfSpecified();
+
 }  // namespace fleetbench
 #endif  // THIRD_PARTY_FLEETBENCH_COMMON_COMMON_H_