Skip to content

fix: warmup being sampled by perf #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2025
Merged

fix: warmup being sampled by perf #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions google_benchmark/src/benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,6 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
if (codspeed != nullptr) {
codspeed->start_benchmark(runner.GetBenchmarkName());
}

measurement_start();
#endif

runner.DoOneRepetition();
Expand Down Expand Up @@ -605,8 +603,6 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
}

#ifdef CODSPEED_WALLTIME
measurement_stop();

if (codspeed != nullptr) {
codspeed->end_benchmark();
}
Expand Down
11 changes: 11 additions & 0 deletions google_benchmark/src/benchmark_runner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,10 @@ void BenchmarkRunner::DoOneRepetition() {
manager.reset(new internal::ThreadManager(b.threads()));
internal::ThreadTimer timer = internal::ThreadTimer::Create();
b.Setup();
measurement_start();
State st = b.RunInstrumented(codspeed::CodSpeed::getInstance(), &timer,
manager.get(), nullptr, nullptr);
measurement_stop();
b.Teardown();

return;
Expand All @@ -486,6 +488,12 @@ void BenchmarkRunner::DoOneRepetition() {
RunWarmUp();
}

// IMPORTANT: We must not sample the warmup otherwise the flamegraph timings will be incorrect since we
// divide by the iteration count.
#ifdef CODSPEED_WALLTIME
measurement_start();
#endif

IterationResults i;
// We *may* be gradually increasing the length (iteration count)
// of the benchmark until we decide the results are significant.
Expand Down Expand Up @@ -519,6 +527,9 @@ void BenchmarkRunner::DoOneRepetition() {
"if we did more iterations than we want to do the next time, "
"then we should have accepted the current iteration run.");
}
#ifdef CODSPEED_WALLTIME
measurement_stop();
#endif

// Produce memory measurements if requested.
MemoryManager::Result* memory_result = nullptr;
Expand Down