Skip to content

Commit 4dbcdf2

Browse files
committed
bench: Suppress output when running with -sanity-check option
This change allows to simplify CI tests, and makes it easier to integrate the `bench_bitcoin` binary into CMake custom targets or commands, as `COMMAND` does not support output redirection
1 parent 9dce301 commit 4dbcdf2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/bench/bench.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void BenchRunner::RunAll(const Args& args)
8383
std::smatch baseMatch;
8484

8585
if (args.sanity_check) {
86-
std::cout << "Running with --sanity-check option, benchmark results will be useless." << std::endl;
86+
std::cout << "Running with -sanity-check option, output is being suppressed as benchmark results will be useless." << std::endl;
8787
}
8888

8989
std::vector<ankerl::nanobench::Result> benchmarkResults;
@@ -106,6 +106,7 @@ void BenchRunner::RunAll(const Args& args)
106106
Bench bench;
107107
if (args.sanity_check) {
108108
bench.epochs(1).epochIterations(1);
109+
bench.output(nullptr);
109110
}
110111
bench.name(name);
111112
if (args.min_time > 0ms) {

src/bench/bench_bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static void SetupBenchArgs(ArgsManager& argsman)
3131
argsman.AddArg("-min-time=<milliseconds>", strprintf("Minimum runtime per benchmark, in milliseconds (default: %d)", DEFAULT_MIN_TIME_MS), ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION, OptionsCategory::OPTIONS);
3232
argsman.AddArg("-output-csv=<output.csv>", "Generate CSV file with the most important benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
3333
argsman.AddArg("-output-json=<output.json>", "Generate JSON file with all benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
34-
argsman.AddArg("-sanity-check", "Run benchmarks for only one iteration", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
34+
argsman.AddArg("-sanity-check", "Run benchmarks for only one iteration with no output", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
3535
argsman.AddArg("-priority-level=<l1,l2,l3>", strprintf("Run benchmarks of one or multiple priority level(s) (%s), default: '%s'",
3636
benchmark::ListPriorities(), DEFAULT_PRIORITY), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
3737
}

0 commit comments

Comments
 (0)