Simplify printing of engine info

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index b2cb0745cd0343cbe2d20e852b8084942973bd0d..765cd2caa52b93d52ff9c7bbe0fb984b43d0676b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,23 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-#include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "bitboard.h"
-#include "evaluate.h"
+#include "misc.h"
 #include "position.h"
-#include "thread.h"
 #include "search.h"
-#include "ucioption.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
+#include "thread.h"
 
 using namespace std;
 
@@ -43,41 +34,24 @@ extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
-  // Disable IO buffering for C and C++ standard libraries
-  setvbuf(stdin, NULL, _IONBF, 0);
-  setvbuf(stdout, NULL, _IONBF, 0);
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
-
-  // Startup initializations
-  init_bitboards();
+  bitboards_init();
   Position::init();
   kpk_bitbase_init();
-  init_search();
+  Search::init();
   Threads.init();
 
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  cout << engine_info() << endl;
 
-  if (argc < 2)
-  {
-      // Print copyright notice
-      cout << engine_name() << " by " << engine_authors() << endl;
-
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
-
-      // Enter the UCI loop waiting for input
+  if (argc == 1)
       uci_loop();
-  }
-  else if (string(argv[1]) == "bench" && argc < 8)
+
+  else if (string(argv[1]) == "bench")
       benchmark(argc, argv);
+
   else
-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
+      cerr << "\nUsage: stockfish bench [hash size = 128] [threads = 1] "
            << "[limit = 12] [fen positions file = default] "
            << "[limited by depth, time, nodes or perft = depth]" << endl;
 
   Threads.exit();
-  return 0;
 }