X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=0ba4de3bddeb3cb9dd8c87eab097ed0a41afe00c;hp=7c2bd1e5696cfccb68f2842700868fb52f8c1cbe;hb=5e905800887da94d481978d3bddd9539b2111458;hpb=a56322fde813094afd8ffa60d12761f94e0bd3ef

diff --git a/src/uci.cpp b/src/uci.cpp
index 7c2bd1e5..0ba4de3b 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "evaluate.h"
-#include "misc.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
@@ -30,6 +29,8 @@
 
 using namespace std;
 
+extern void benchmark(const Position& pos, istream& is);
+
 namespace {
 
   // FEN string of the initial position, normal chess
@@ -43,7 +44,6 @@ namespace {
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
   void go(Position& pos, istringstream& up);
-  void perft(Position& pos, istringstream& up);
 }
 
 
@@ -52,14 +52,17 @@ namespace {
 /// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI
 /// commands, the function also supports a few debug commands.
 
-void uci_loop() {
+void uci_loop(const string& args) {
 
-  Position pos(StartFEN, false, 0); // The root position
+  Position pos(StartFEN, false, Threads.main_thread()); // The root position
   string cmd, token;
 
   while (token != "quit")
   {
-      if (!getline(cin, cmd)) // Block here waiting for input
+      if (!args.empty())
+          cmd = args;
+
+      else if (!getline(cin, cmd)) // Block here waiting for input
           cmd = "quit";
 
       istringstream is(cmd);
@@ -69,9 +72,7 @@ void uci_loop() {
       if (token == "quit" || token == "stop")
       {
           Search::Signals.stop = true;
-
-          if (token == "quit") // Cannot quit while threads are still running
-              Threads.wait_for_search_finished();
+          Threads.wait_for_search_finished(); // Cannot quit while threads are running
       }
 
       else if (token == "ponderhit")
@@ -82,12 +83,18 @@ void uci_loop() {
           Search::Limits.ponder = false;
 
           if (Search::Signals.stopOnPonderhit)
+          {
               Search::Signals.stop = true;
+              Threads.main_thread()->wake_up(); // Could be sleeping
+          }
       }
 
       else if (token == "go")
           go(pos, is);
 
+      else if (token == "ucinewgame")
+      { /* Avoid returning "Unknown command" */ }
+
       else if (token == "isready")
           cout << "readyok" << endl;
 
@@ -97,18 +104,18 @@ void uci_loop() {
       else if (token == "setoption")
           set_option(is);
 
-      else if (token == "perft")
-          perft(pos, is);
-
       else if (token == "d")
           pos.print();
 
       else if (token == "flip")
-          pos.flip_me();
+          pos.flip();
 
       else if (token == "eval")
           cout << Eval::trace(pos) << endl;
 
+      else if (token == "bench")
+          benchmark(pos, is);
+
       else if (token == "key")
           cout << "key: " << hex     << pos.key()
                << "\nmaterial key: " << pos.material_key()
@@ -118,8 +125,25 @@ void uci_loop() {
           cout << "id name "     << engine_info(true)
                << "\n"           << Options
                << "\nuciok"      << endl;
+
+      else if (token == "perft" && (is >> token)) // Read depth
+      {
+          stringstream ss;
+
+          ss << Options["Hash"]    << " "
+             << Options["Threads"] << " " << token << " current perft";
+
+          benchmark(pos, ss);
+      }
+
       else
           cout << "Unknown command: " << cmd << endl;
+
+      if (!args.empty()) // Command line arguments have one-shot behaviour
+      {
+          Threads.wait_for_search_finished();
+          break;
+      }
   }
 }
 
@@ -149,7 +173,7 @@ namespace {
     else
         return;
 
-    pos.from_fen(fen, Options["UCI_Chess960"]);
+    pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
 
     // Parse move list (if any)
     while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
@@ -189,68 +213,41 @@ namespace {
 
   // go() is called when engine receives the "go" UCI command. The function sets
   // the thinking time and other parameters from the input string, and then starts
-  // the main searching thread.
+  // the search.
 
   void go(Position& pos, istringstream& is) {
 
-    string token;
     Search::LimitsType limits;
-    std::set<Move> searchMoves;
-    int time[] = { 0, 0 }, inc[] = { 0, 0 };
+    vector<Move> searchMoves;
+    string token;
 
     while (is >> token)
     {
-        if (token == "infinite")
-            limits.infinite = true;
-        else if (token == "ponder")
-            limits.ponder = true;
-        else if (token == "wtime")
-            is >> time[WHITE];
+        if (token == "wtime")
+            is >> limits.time[WHITE];
         else if (token == "btime")
-            is >> time[BLACK];
+            is >> limits.time[BLACK];
         else if (token == "winc")
-            is >> inc[WHITE];
+            is >> limits.inc[WHITE];
         else if (token == "binc")
-            is >> inc[BLACK];
+            is >> limits.inc[BLACK];
         else if (token == "movestogo")
-            is >> limits.movesToGo;
+            is >> limits.movestogo;
         else if (token == "depth")
-            is >> limits.maxDepth;
+            is >> limits.depth;
         else if (token == "nodes")
-            is >> limits.maxNodes;
+            is >> limits.nodes;
         else if (token == "movetime")
-            is >> limits.maxTime;
+            is >> limits.movetime;
+        else if (token == "infinite")
+            limits.infinite = true;
+        else if (token == "ponder")
+            limits.ponder = true;
         else if (token == "searchmoves")
             while (is >> token)
-                searchMoves.insert(move_from_uci(pos, token));
+                searchMoves.push_back(move_from_uci(pos, token));
     }
 
-    limits.time = time[pos.side_to_move()];
-    limits.increment = inc[pos.side_to_move()];
-
     Threads.start_searching(pos, limits, searchMoves);
   }
-
-
-  // perft() is called when engine receives the "perft" command. The function
-  // calls perft() with the required search depth then prints counted leaf nodes
-  // and elapsed time.
-
-  void perft(Position& pos, istringstream& is) {
-
-    int depth;
-
-    if (!(is >> depth))
-        return;
-
-    Time time = Time::current_time();
-
-    int64_t n = Search::perft(pos, depth * ONE_PLY);
-
-    int e = time.elapsed();
-
-    std::cout << "\nNodes " << n
-              << "\nTime (ms) " << e
-              << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;
-  }
 }