merge bitcoin#26481: Suppress output when running with -sanity-check option

kwvg · kwvg · commit fda951f6682c · 2025-07-16T10:17:25.000Z
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -400,7 +400,7 @@ if TARGET_WINDOWS
 else
 if ENABLE_BENCH
 	@echo "Running bench/bench_dash (one iteration sanity check, only high priority)..."
-	$(BENCH_BINARY) -sanity-check -priority-level=high > /dev/null
+	$(BENCH_BINARY) -sanity-check -priority-level=high
 endif
 endif
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
@@ -84,7 +84,7 @@ void BenchRunner::RunAll(const Args& args)
     std::smatch baseMatch;
 
     if (args.sanity_check) {
-        std::cout << "Running with --sanity-check option, benchmark results will be useless." << std::endl;
+        std::cout << "Running with -sanity-check option, output is being suppressed as benchmark results will be useless." << std::endl;
     }
 
     std::vector<ankerl::nanobench::Result> benchmarkResults;
@@ -107,6 +107,7 @@ void BenchRunner::RunAll(const Args& args)
         Bench bench;
         if (args.sanity_check) {
             bench.epochs(1).epochIterations(1);
+            bench.output(nullptr);
         }
         bench.name(name);
         if (args.min_time > 0ms) {
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
@@ -31,7 +31,7 @@ static void SetupBenchArgs(ArgsManager& argsman)
     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);
     argsman.AddArg("-output-csv=<output.csv>", "Generate CSV file with the most important benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-output-json=<output.json>", "Generate JSON file with all benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
-    argsman.AddArg("-sanity-check", "Run benchmarks for only one iteration", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-sanity-check", "Run benchmarks for only one iteration with no output", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-priority-level=<l1,l2,l3>", strprintf("Run benchmarks of one or multiple priority level(s) (%s), default: '%s'",
                                                            benchmark::ListPriorities(), DEFAULT_PRIORITY), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void BenchRunner::RunAll(const Args& args)`
`84`	`84`	`std::smatch baseMatch;`
`85`	`85`
`86`	`86`	`if (args.sanity_check) {`
`87`		`- std::cout << "Running with --sanity-check option, benchmark results will be useless." << std::endl;`
	`87`	`+ std::cout << "Running with -sanity-check option, output is being suppressed as benchmark results will be useless." << std::endl;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`std::vector<ankerl::nanobench::Result> benchmarkResults;`
`@@ -107,6 +107,7 @@ void BenchRunner::RunAll(const Args& args)`
`107`	`107`	`Bench bench;`
`108`	`108`	`if (args.sanity_check) {`
`109`	`109`	`bench.epochs(1).epochIterations(1);`
	`110`	`+ bench.output(nullptr);`
`110`	`111`	`}`
`111`	`112`	`bench.name(name);`
`112`	`113`	`if (args.min_time > 0ms) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ static void SetupBenchArgs(ArgsManager& argsman)`
`31`	`31`	`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);`
`32`	`32`	`argsman.AddArg("-output-csv=<output.csv>", "Generate CSV file with the most important benchmark results", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);`
`33`	`33`	`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);`
`35`	`35`	`argsman.AddArg("-priority-level=<l1,l2,l3>", strprintf("Run benchmarks of one or multiple priority level(s) (%s), default: '%s'",`
`36`	`36`	`benchmark::ListPriorities(), DEFAULT_PRIORITY), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);`
`37`	`37`	`}`