github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-28 05:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

prefix VLOG (#1187)

Browse Source
This commit is contained in:
Dominic Hamon 2021-06-24 18:55:37 +01:00 committed by GitHub
parent 6a5bf081d3
commit 1799e1b9ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/benchmark_runner.cc
View File

@ -175,7 +175,7 @@ BenchmarkRunner::BenchmarkRunner(
} }
BenchmarkRunner::IterationResults BenchmarkRunner::DoNIterations() { BenchmarkRunner::IterationResults BenchmarkRunner::DoNIterations() {
VLOG(2) << "Running " << b.name().str() << " for " << iters << "\n"; BM_VLOG(2) << "Running " << b.name().str() << " for " << iters << "\n";
std::unique_ptr<internal::ThreadManager> manager; std::unique_ptr<internal::ThreadManager> manager;
manager.reset(new internal::ThreadManager(b.threads())); manager.reset(new internal::ThreadManager(b.threads()));
@ -210,8 +210,8 @@ BenchmarkRunner::IterationResults BenchmarkRunner::DoNIterations() {
// If we were measuring whole-process CPU usage, adjust the CPU time too. // If we were measuring whole-process CPU usage, adjust the CPU time too.
if (b.measure_process_cpu_time()) i.results.cpu_time_used /= b.threads(); if (b.measure_process_cpu_time()) i.results.cpu_time_used /= b.threads();
VLOG(2) << "Ran in " << i.results.cpu_time_used << "/" BM_VLOG(2) << "Ran in " << i.results.cpu_time_used << "/"
<< i.results.real_time_used << "\n"; << i.results.real_time_used << "\n";
// By using KeepRunningBatch a benchmark can iterate more times than // By using KeepRunningBatch a benchmark can iterate more times than
// requested, so take the iteration count from i.results. // requested, so take the iteration count from i.results.
@ -249,7 +249,7 @@ IterationCount BenchmarkRunner::PredictNumItersNeeded(
// But we do have *some* sanity limits though.. // But we do have *some* sanity limits though..
const IterationCount next_iters = std::min(max_next_iters, kMaxIterations); const IterationCount next_iters = std::min(max_next_iters, kMaxIterations);
VLOG(3) << "Next iters: " << next_iters << ", " << multiplier << "\n"; BM_VLOG(3) << "Next iters: " << next_iters << ", " << multiplier << "\n";
return next_iters; // round up before conversion to integer. return next_iters; // round up before conversion to integer.
} }

2
src/log.h
View File

@ -67,7 +67,7 @@ inline LogType& GetLogInstanceForLevel(int level) {
} // end namespace benchmark } // end namespace benchmark
// clang-format off // clang-format off
#define VLOG(x) \ #define BM_VLOG(x) \
(::benchmark::internal::GetLogInstanceForLevel(x) << "-- LOG(" << x << "):" \ (::benchmark::internal::GetLogInstanceForLevel(x) << "-- LOG(" << x << "):" \
" ") " ")
// clang-format on // clang-format on

13
test/output_test_helper.cc
View File

@ -10,6 +10,7 @@
#include "../src/benchmark_api_internal.h" #include "../src/benchmark_api_internal.h"
#include "../src/check.h" // NOTE: check.h is for internal use only! #include "../src/check.h" // NOTE: check.h is for internal use only!
#include "../src/log.h" // NOTE: log.h is for internal use only
#include "../src/re.h" // NOTE: re.h is for internal use only #include "../src/re.h" // NOTE: re.h is for internal use only
#include "output_test.h" #include "output_test.h"
@ -237,18 +238,18 @@ void ResultsChecker::CheckResults(std::stringstream& output) {
} }
// finally we can call the subscribed check functions // finally we can call the subscribed check functions
for (const auto& p : check_patterns) { for (const auto& p : check_patterns) {
VLOG(2) << "--------------------------------\n"; BM_VLOG(2) << "--------------------------------\n";
VLOG(2) << "checking for benchmarks matching " << p.regex_str << "...\n"; BM_VLOG(2) << "checking for benchmarks matching " << p.regex_str << "...\n";
for (const auto& r : results) { for (const auto& r : results) {
if (!p.regex->Match(r.name)) { if (!p.regex->Match(r.name)) {
VLOG(2) << p.regex_str << " is not matched by " << r.name << "\n"; BM_VLOG(2) << p.regex_str << " is not matched by " << r.name << "\n";
continue; continue;
} else { } else {
VLOG(2) << p.regex_str << " is matched by " << r.name << "\n"; BM_VLOG(2) << p.regex_str << " is matched by " << r.name << "\n";
} }
VLOG(1) << "Checking results of " << r.name << ": ... \n"; BM_VLOG(1) << "Checking results of " << r.name << ": ... \n";
p.fn(r); p.fn(r);
VLOG(1) << "Checking results of " << r.name << ": OK.\n"; BM_VLOG(1) << "Checking results of " << r.name << ": OK.\n";
} }
} }
} }