From ceb70203f0e248f897a7bf8b5a7c2e7ed2263a24 Mon Sep 17 00:00:00 2001
From: Jan Wassenberg <janwas@google.com>
Date: Thu, 19 Mar 2026 04:21:24 -0700
Subject: [PATCH] Add min_verbosity to MaybePrint

PiperOrigin-RevId: 886094998
---
 evals/benchmark_helper.cc | 2 +-
 gemma/gemma.cc            | 6 +++---
 util/basics.cc            | 3 ++-
 util/basics.h             | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/evals/benchmark_helper.cc b/evals/benchmark_helper.cc
index 6e5c0cb..71869d1 100644
--- a/evals/benchmark_helper.cc
+++ b/evals/benchmark_helper.cc
@@ -122,7 +122,7 @@ QueryResultAndMetrics GemmaEnv::BatchQueryModelWithMetrics(
     return true;
   };
   runtime_config_.batch_stream_token = batch_stream_token;
-  MaybePrint(runtime_config_.verbosity,
+  MaybePrint(2, runtime_config_.verbosity,
              "Max gen: %zu temp: %f tbatch: %zu qbatch: %zu\n",
              runtime_config_.max_generated_tokens, runtime_config_.temperature,
              runtime_config_.prefill_tbatch_size,
diff --git a/gemma/gemma.cc b/gemma/gemma.cc
index 39b352b..ff02963 100644
--- a/gemma/gemma.cc
+++ b/gemma/gemma.cc
@@ -601,7 +601,7 @@ static void GenerateT(const ModelConfig& config,
     SetWeightStats(layer, activations, env.ctx);
   }
 
-  MaybePrint(timing_info.verbosity, "[ BEGIN PHASE: prefill ]");
+  MaybePrint(2, timing_info.verbosity, "[ BEGIN PHASE: prefill ]");
   const size_t max_gen_steps = PrefillTBatchOrQBatch(
       config, runtime_config, weights, activations, qbatch, env, timing_info);
   // No-op if the profiler is disabled, but useful to separate prefill and
@@ -622,7 +622,7 @@ static void GenerateT(const ModelConfig& config,
   const SampleFunc sample_token =
       ChooseSampleFunc(runtime_config, engine, env.ctx);
 
-  MaybePrint(timing_info.verbosity, "\n[ BEGIN PHASE: generate ]\n");
+  MaybePrint(2, timing_info.verbosity, "\n[ BEGIN PHASE: generate ]\n");
 
   timing_info.generate_start = hwy::platform::Now();
   for (size_t gen = 0; gen < max_gen_steps && non_eos.Any(); ++gen) {
@@ -736,7 +736,7 @@ void GenerateImageTokensT(const ModelConfig& config,
   const ModelConfig vit_config = GetVitConfig(config);
   const size_t num_tokens = vit_config.max_seq_len;
 
-  MaybePrint(timing_info.verbosity, "\n[ BEGIN PHASE: image_token_gen ]\n");
+  MaybePrint(2, timing_info.verbosity, "\n[ BEGIN PHASE: image_token_gen ]\n");
   timing_info.NotifyImageTokenStart();
 
   {
diff --git a/util/basics.cc b/util/basics.cc
index 76c6092..bec522f 100644
--- a/util/basics.cc
+++ b/util/basics.cc
@@ -26,7 +26,8 @@
 
 namespace gcpp {
 
-void MaybePrint(int verbosity, const char* format, ...) {
+void MaybePrint(int min_verbosity, int verbosity, const char* format, ...) {
+  if (verbosity < min_verbosity) return;
   char buf[800];
   va_list args;
   va_start(args, format);
diff --git a/util/basics.h b/util/basics.h
index 2fc050e..f4423a1 100644
--- a/util/basics.h
+++ b/util/basics.h
@@ -81,8 +81,8 @@ static inline intptr_t MaybeTestInitialized(const void* ptr, size_t size) {
 #endif
 }
 
-// If verbosity >= 2, prints the formatted message to stderr.
-void MaybePrint(int verbosity, const char* format, ...);
+// If `verbosity >= min_verbosity`, prints the formatted message to stderr.
+void MaybePrint(int min_verbosity, int verbosity, const char* format, ...);
 
 // Shared between gemma.h and ops-inl.h.
 #pragma pack(push, 1)