Update comments.

Author: lialan

iree/turbine/kernel/boo/driver/driver.py

@@ -33,7 +33,7 @@
     STDDEV_CHECK_ATOL_DEFAULT,
     STDDEV_CHECK_RTOL_DEFAULT,
 )
-from iree.turbine.kernel.boo.driver.utils import get_timing_parser
+from iree.turbine.kernel.boo.driver.utils import get_timing_parser, resolve_timing_args
 from iree.turbine.runtime.device import get_device_from_torch
 
 ZoneData = dict[str, list[float]]
@@ -52,23 +52,23 @@ class ZoneStats(NamedTuple):
 ZoneStatsSummary = dict[str, ZoneStats]
 
 
-def compute_auto_iters(warmup_time: float, min_time: float, iter_fallback: int) -> int:
+def compute_auto_iters(warmup_time: float, min_time: float, min_iter: int) -> int:
     """Compute the number of iterations needed to run for at least `min_time` seconds.
 
-    When min_time is active (> 0), its computed iteration count takes priority
-    over --iter. The iter_fallback is only used when min_time is disabled.
+    When min_time is active (> 0), its computed iteration count takes priority.
+    The min_iter value is only used when min_time is disabled (i.e. via --iter).
 
     Args:
         warmup_time: Time in seconds for a single warmup iteration.
         min_time: Minimum benchmark duration in seconds.
-        iter_fallback: Fallback number of iterations when min_time is disabled (from --iter).
+        min_iter: Number of iterations when min_time is disabled (from --min-iter).
 
     Returns:
         The iteration count to use.
     """
     if warmup_time > 0 and min_time > 0:
         return math.ceil(min_time / warmup_time)
-    return iter_fallback
+    return min_iter
 
 
 def _get_main_driver_parser() -> argparse.ArgumentParser:
@@ -267,6 +267,7 @@ def main(args: list[str] = sys.argv[1:]) -> int:
         else:
             print("Running test :", test_count)
         timing_args, runner_args = timing_parser.parse_known_args(driver_args)
+        resolve_timing_args(timing_args)
         csv_row.append(shlex.join(driver_args))
         signature = BooOpRegistry.parse_command(runner_args)
 
@@ -550,15 +551,16 @@ def pause_and_collect_mem():
     # Auto-adjust iteration count: ensure benchmark runs for at least min_time seconds.
     if timing_args.time:
         actual_iters = compute_auto_iters(
-            warmup_time, timing_args.min_time, timing_args.iter
+            warmup_time, timing_args.min_time, timing_args.min_iter
         )
     else:
-        actual_iters = timing_args.iter
+        actual_iters = timing_args.min_iter
 
-    if verbose and actual_iters != timing_args.iter:
+    if verbose and actual_iters != timing_args.min_iter:
         print(
             f">>>\tAuto-adjusted iterations: {actual_iters} "
-            f"(warmup: {warmup_time:.4f}s, target: {timing_args.min_time:.1f}s, floor: {timing_args.iter})"
+            f"(warmup: {warmup_time:.4f}s, target: {timing_args.min_time:.1f}s, "
+            f"min-iter: {timing_args.min_iter})"
         )
 
     output_num_bytes = sum(x.element_size() * x.numel() for x in example_results)

tests/kernel/boo/driver/csv_output_test.py

@@ -38,7 +38,7 @@ def test_roundtrip_csv_single_command():
         csv_file = Path(td) / "conv_stats.csv"
         iters = 4
         meta_args = [f"--csv={csv_file}"]
-        command_args = ["convbfp16", "-F=1", f"--iter={iters}", "--min-time=0"]
+        command_args = ["convbfp16", "-F=1", f"--iter={iters}"]
         args = meta_args + command_args
         # Check we don't encounter an error.
         assert driver.main(args) == 0
@@ -58,7 +58,7 @@ def test_roundtrip_csv_commands_file():
     with tempfile.TemporaryDirectory() as td:
         commands_file = Path(td) / "commands.txt"
         commands = [
-            ["convbfp16", "-F", "1", "--iter", "4", "--min-time", "0"],
+            ["convbfp16", "-F", "1", "--iter", "4"],
             [
                 "convbfp16",
                 "-F",
@@ -71,8 +71,6 @@ def test_roundtrip_csv_commands_file():
                 "NHWC",
                 "--iter",
                 "2",
-                "--min-time",
-                "0",
             ],
         ]
         commands_file.write_text("\n".join([shlex.join(c) for c in commands]))

tests/kernel/boo/driver/profiler_schedule_test.py

@@ -153,36 +153,36 @@ def dummy_kernel():
 class TestComputeAutoIters:
     def test_short_kernel_gets_more_iters(self):
         """A 1ms kernel should need 3000 iters for 3s target."""
-        result = compute_auto_iters(warmup_time=0.001, min_time=3.0, iter_fallback=100)
+        result = compute_auto_iters(warmup_time=0.001, min_time=3.0, min_iter=100)
         assert result == 3000
 
     def test_long_kernel_uses_min_time(self):
         """A 10s kernel with 3s target → 1 iter. min_time overrides --iter."""
-        result = compute_auto_iters(warmup_time=10.0, min_time=3.0, iter_fallback=100)
+        result = compute_auto_iters(warmup_time=10.0, min_time=3.0, min_iter=100)
         assert result == 1
 
     def test_exact_match(self):
         """A 0.03s kernel needs exactly 100 iters for 3s target."""
-        result = compute_auto_iters(warmup_time=0.03, min_time=3.0, iter_fallback=100)
+        result = compute_auto_iters(warmup_time=0.03, min_time=3.0, min_iter=100)
         assert result == 100
 
     def test_rounds_up(self):
         """Should round up to ensure minimum time is met."""
-        result = compute_auto_iters(warmup_time=0.007, min_time=3.0, iter_fallback=100)
+        result = compute_auto_iters(warmup_time=0.007, min_time=3.0, min_iter=100)
         # 3.0 / 0.007 = 428.57... -> ceil = 429
         assert result == 429
 
-    def test_min_time_overrides_high_iter(self):
-        """min_time takes priority over --iter. 3s / 0.1s = 30 iters, not 500."""
-        result = compute_auto_iters(warmup_time=0.1, min_time=3.0, iter_fallback=500)
+    def test_min_time_overrides_high_min_iter(self):
+        """min_time takes priority over --min-iter. 3s / 0.1s = 30 iters, not 500."""
+        result = compute_auto_iters(warmup_time=0.1, min_time=3.0, min_iter=500)
         assert result == 30
 
     def test_zero_min_time_uses_fallback(self):
         """When min_time is 0, use the fallback (disables auto-adjust)."""
-        result = compute_auto_iters(warmup_time=0.001, min_time=0.0, iter_fallback=100)
+        result = compute_auto_iters(warmup_time=0.001, min_time=0.0, min_iter=100)
         assert result == 100
 
     def test_zero_warmup_time_uses_fallback(self):
         """When warmup_time is 0 (shouldn't happen), use the fallback."""
-        result = compute_auto_iters(warmup_time=0.0, min_time=3.0, iter_fallback=100)
+        result = compute_auto_iters(warmup_time=0.0, min_time=3.0, min_iter=100)
         assert result == 100