diff --git a/cli/js/40_testing.js b/cli/js/40_testing.js index 7b60dd13303e07..f4eb0a5a72dfc7 100644 --- a/cli/js/40_testing.js +++ b/cli/js/40_testing.js @@ -982,20 +982,17 @@ async function benchMeasure(timeBudget, fn, async, context) { fn(context); const t2 = benchNow(); const totalTime = t2 - t1; - let measuredTime = totalTime; if (currentBenchUserExplicitStart !== null) { - measuredTime -= currentBenchUserExplicitStart - t1; currentBenchUserExplicitStart = null; usedExplicitTimers = true; } if (currentBenchUserExplicitEnd !== null) { - measuredTime -= t2 - currentBenchUserExplicitEnd; currentBenchUserExplicitEnd = null; usedExplicitTimers = true; } c++; - wavg += measuredTime; + wavg += totalTime; budget -= totalTime; } } else { @@ -1004,20 +1001,17 @@ async function benchMeasure(timeBudget, fn, async, context) { await fn(context); const t2 = benchNow(); const totalTime = t2 - t1; - let measuredTime = totalTime; if (currentBenchUserExplicitStart !== null) { - measuredTime -= currentBenchUserExplicitStart - t1; currentBenchUserExplicitStart = null; usedExplicitTimers = true; } if (currentBenchUserExplicitEnd !== null) { - measuredTime -= t2 - currentBenchUserExplicitEnd; currentBenchUserExplicitEnd = null; usedExplicitTimers = true; } c++; - wavg += measuredTime; + wavg += totalTime; budget -= totalTime; } } diff --git a/cli/tests/testdata/bench/explicit_start_and_end_low_precision.out b/cli/tests/testdata/bench/explicit_start_and_end_low_precision.out index e9ac5a86457ef2..771164bac3182f 100644 --- a/cli/tests/testdata/bench/explicit_start_and_end_low_precision.out +++ b/cli/tests/testdata/bench/explicit_start_and_end_low_precision.out @@ -6,4 +6,4 @@ benchmark time (avg) iter/s (min … max) ----------------------------------------------------------------------------- ----------------------------- noop with start and end [WILDCARD] [WILDCARD]/iter[WILDCARD]([WILDCARD] … [WILDCARD]) [WILDCARD] Warning: start() and end() calls in "noop with start and end" are ignored because it averages less -than 0.01s per iteration. Remove them for better results. +than 10µs per iteration. Remove them for better results. diff --git a/cli/tools/bench/reporters.rs b/cli/tools/bench/reporters.rs index 68788bc96fc703..35b4a229c90592 100644 --- a/cli/tools/bench/reporters.rs +++ b/cli/tools/bench/reporters.rs @@ -237,7 +237,7 @@ impl BenchReporter for ConsoleReporter { ); if !stats.high_precision && stats.used_explicit_timers { - println!("{}", colors::yellow(format!("Warning: start() and end() calls in \"{}\" are ignored because it averages less\nthan 0.01s per iteration. Remove them for better results.", &desc.name))); + println!("{}", colors::yellow(format!("Warning: start() and end() calls in \"{}\" are ignored because it averages less\nthan 10µs per iteration. Remove them for better results.", &desc.name))); } self.group_measurements.push((desc, stats.clone()));