Use bench for a short benchmark and benchmark for a full one. (#2120)

Author: mooskagh

src/main.cc

@@ -56,6 +56,7 @@ int main(int argc, const char** argv) {
     CommandLine::RegisterMode("uci", "(default) Act as UCI engine");
     CommandLine::RegisterMode("selfplay", "Play games with itself");
     CommandLine::RegisterMode("benchmark", "Quick benchmark");
+    CommandLine::RegisterMode("bench", "Very quick benchmark");
     CommandLine::RegisterMode("backendbench",
                               "Quick benchmark of backend only");
     CommandLine::RegisterMode("leela2onnx", "Convert Leela network to ONNX.");
@@ -75,11 +76,14 @@ int main(int argc, const char** argv) {
       // Selfplay mode.
       SelfPlayLoop loop;
       loop.RunLoop();
-    } else if (CommandLine::ConsumeCommand("benchmark") ||
-               CommandLine::ConsumeCommand("bench")) {
-      // Benchmark mode.
+    } else if (CommandLine::ConsumeCommand("benchmark")) {
+      // Benchmark mode, longer version.
       Benchmark benchmark;
       benchmark.Run();
+    } else if (CommandLine::ConsumeCommand("bench")) {
+      // Benchmark mode, shorter version.
+      Benchmark benchmark;
+      benchmark.Run(/*run_shorter_benchmark=*/true);
     } else if (CommandLine::ConsumeCommand("backendbench")) {
       // Backend Benchmark mode.
       BackendBenchmark benchmark;

src/tools/benchmark.cc

@@ -48,7 +48,7 @@ const OptionId kNumPositionsId{"num-positions", "",
                                "The number of benchmark positions to test."};
 }  // namespace
 
-void Benchmark::Run() {
+void Benchmark::Run(bool run_shorter_benchmark) {
   OptionsParser options;
   SharedBackendParams::Populate(&options);
   options.Add<IntOption>(kThreadsOptionId, 1, 128) = kDefaultThreads;
@@ -57,9 +57,14 @@ void Benchmark::Run() {
   classic::SearchParams::Populate(&options);
 
   options.Add<IntOption>(kNodesId, -1, 999999999) = -1;
-  options.Add<IntOption>(kMovetimeId, -1, 999999999) = 500;
   options.Add<StringOption>(kFenId) = "";
-  options.Add<IntOption>(kNumPositionsId, 1, 34) = 10;
+  if (run_shorter_benchmark) {
+    options.Add<IntOption>(kMovetimeId, -1, 999999999) = 500;
+    options.Add<IntOption>(kNumPositionsId, 1, 34) = 10;
+  } else {
+    options.Add<IntOption>(kMovetimeId, -1, 999999999) = 10000;
+    options.Add<IntOption>(kNumPositionsId, 1, 34) = 34;
+  }
 
   if (!options.ProcessAllFlags()) return;
 

src/tools/benchmark.h

@@ -78,7 +78,7 @@ class Benchmark{
       "3Qb1k1/1r2ppb1/pN1n2q1/Pp1Pp1Pr/4P2p/4BP2/4B1R1/1R5K b - - 11 40"
   };
 
-  void Run();
+  void Run(bool run_shorter_benchmark = false);
   void OnBestMove(const BestMoveInfo& move);
   void OnInfo(const std::vector<ThinkingInfo>& infos);
 };