Tidy up benchmark.cpp

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index d75350b17f7ea1f43413754318c6754c73cf48ae..e6dfe9344d5837a8194839aa7680927d46a75f3e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@
 #include "evaluate.h"
 #include "position.h"
 #include "thread.h"
+#include "search.h"
 #include "ucioption.h"
 
 #ifdef USE_CALLGRIND
@@ -50,12 +51,11 @@ int main(int argc, char* argv[]) {
 
   // Startup initializations
   init_bitboards();
-  init_uci_options();
   Position::init_zobrist();
   Position::init_piece_square_tables();
-  init_eval(1);
   init_kpk_bitbase();
-  init_threads();
+  init_search();
+  Threads.init();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
@@ -64,7 +64,7 @@ int main(int argc, char* argv[]) {
   if (argc < 2)
   {
       // Print copyright notice
-      cout << engine_name() << " by " << engine_author() << endl;
+      cout << engine_name() << " by " << engine_authors() << endl;
 
       if (CpuHasPOPCNT)
           cout << "Good! CPU has hardware POPCNT." << endl;
@@ -80,9 +80,8 @@ int main(int argc, char* argv[]) {
   else
       cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
            << "[limit = 12] [fen positions file = default] "
-           << "[depth, time, perft or node limited = depth]" << endl;
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
 
-  exit_threads();
-  quit_eval();
+  Threads.exit();
   return 0;
 }