X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=a4235f2b23fb601c535f91c33f4d7c1b0ab36f77;hb=0dbc72d82e7f5f314499b22a04dcef45edcdba9a;hp=b7127b758153c9fd008563f2f7412a5802ebdfad;hpb=0da7295795448fc826cb5b2613ac64a6e0c4adcd;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index b7127b75..a4235f2b 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -2,6 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,6 +18,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -26,30 +28,27 @@
#include "position.h"
#include "search.h"
#include "thread.h"
+#include "timeman.h"
#include "tt.h"
#include "uci.h"
+#include "syzygy/tbprobe.h"
using namespace std;
-extern void benchmark(const Position& pos, istream& is);
+extern vector setup_bench(const Position&, istream&);
namespace {
// FEN string of the initial position, normal chess
const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // Stack to keep track of the position states along the setup moves (from the
- // start position to the position just before the search starts). Needed by
- // 'draw by repetition' detection.
- Search::StateStackPtr SetupStates;
-
// position() is called when engine receives the "position" UCI command.
// The function sets up the position described in the given FEN string ("fen")
// or the starting position ("startpos") and then makes the moves given in the
// following move list ("moves").
- void position(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is, StateListPtr& states) {
Move m;
string token, fen;
@@ -67,14 +66,14 @@ namespace {
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main());
- SetupStates = Search::StateStackPtr(new std::stack());
+ states = StateListPtr(new std::deque(1)); // Drop old and create a new one
+ pos.set(fen, Options["UCI_Chess960"], &states->back(), Threads.main());
// Parse move list (if any)
while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
{
- SetupStates->push(StateInfo());
- pos.do_move(m, SetupStates->top(), pos.gives_check(m, CheckInfo(pos)));
+ states->emplace_back();
+ pos.do_move(m, states->back());
}
}
@@ -90,11 +89,11 @@ namespace {
// Read option name (can contain spaces)
while (is >> token && token != "value")
- name += string(" ", !name.empty()) + token;
+ name += (name.empty() ? "" : " ") + token;
// Read option value (can contain spaces)
while (is >> token)
- value += string(" ", !value.empty()) + token;
+ value += (value.empty() ? "" : " ") + token;
if (Options.count(name))
Options[name] = value;
@@ -107,10 +106,13 @@ namespace {
// the thinking time and other parameters from the input string, then starts
// the search.
- void go(const Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is, StateListPtr& states) {
Search::LimitsType limits;
string token;
+ bool ponderMode = false;
+
+ limits.startTime = now(); // As early as possible!
while (is >> token)
if (token == "searchmoves")
@@ -126,10 +128,53 @@ namespace {
else if (token == "nodes") is >> limits.nodes;
else if (token == "movetime") is >> limits.movetime;
else if (token == "mate") is >> limits.mate;
- else if (token == "infinite") limits.infinite = true;
- else if (token == "ponder") limits.ponder = true;
+ else if (token == "perft") is >> limits.perft;
+ else if (token == "infinite") limits.infinite = 1;
+ else if (token == "ponder") ponderMode = true;
+
+ Threads.start_thinking(pos, states, limits, ponderMode);
+ }
+
+
+ // bench() is called when engine receives the "bench" command. Firstly
+ // a list of UCI commands is setup according to bench parameters, then
+ // it is run one by one printing a summary at the end.
+
+ void bench(Position& pos, istream& args, StateListPtr& states) {
+
+ string token;
+ uint64_t num, nodes = 0, cnt = 1;
+
+ vector list = setup_bench(pos, args);
+ num = count_if(list.begin(), list.end(), [](string s) { return s.find("go ") == 0; });
+
+ TimePoint elapsed = now();
- Threads.start_thinking(pos, limits, SetupStates);
+ for (const auto& cmd : list)
+ {
+ istringstream is(cmd);
+ is >> skipws >> token;
+
+ if (token == "go")
+ {
+ cerr << "\nPosition: " << cnt++ << '/' << num << endl;
+ go(pos, is, states);
+ Threads.main()->wait_for_search_finished();
+ nodes += Threads.nodes_searched();
+ }
+ else if (token == "setoption") setoption(is);
+ else if (token == "position") position(pos, is, states);
+ else if (token == "ucinewgame") { Search::clear(); elapsed = now(); } // Search::clear() may take some while
+ }
+
+ elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
+
+ dbg_print(); // Just before exiting
+
+ cerr << "\n==========================="
+ << "\nTotal time (ms) : " << elapsed
+ << "\nNodes searched : " << nodes
+ << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
}
} // namespace
@@ -143,8 +188,12 @@ namespace {
void UCI::loop(int argc, char* argv[]) {
- Position pos(StartFEN, false, Threads.main()); // The root position
+ Position pos;
string token, cmd;
+ StateListPtr states(new std::deque(1));
+ auto uiThread = std::make_shared(0);
+
+ pos.set(StartFEN, false, &states->back(), uiThread.get());
for (int i = 1; i < argc; ++i)
cmd += std::string(argv[i]) + " ";
@@ -155,57 +204,40 @@ void UCI::loop(int argc, char* argv[]) {
istringstream is(cmd);
- token.clear(); // getline() could return empty or blank line
+ token.clear(); // Avoid a stale if getline() returns empty or blank line
is >> skipws >> token;
- // The GUI sends 'ponderhit' to tell us to ponder on the same move the
- // opponent has played. In case Signals.stopOnPonderhit is set we are
- // waiting for 'ponderhit' to stop the search (for instance because we
- // already ran out of time), otherwise we should continue searching but
- // switching from pondering to normal search.
if ( token == "quit"
- || token == "stop"
- || (token == "ponderhit" && Search::Signals.stopOnPonderhit))
- {
- Search::Signals.stop = true;
- Threads.main()->notify_one(); // Could be sleeping
- }
+ || token == "stop")
+ Threads.stop = true;
+
+ // The GUI sends 'ponderhit' to tell us the user has played the expected move.
+ // So 'ponderhit' will be sent if we were told to ponder on the same move the
+ // user has played. We should continue searching but switch from pondering to
+ // normal search.
else if (token == "ponderhit")
- Search::Limits.ponder = false; // Switch to normal search
+ Threads.main()->ponder = false; // Switch to normal search
else if (token == "uci")
sync_cout << "id name " << engine_info(true)
<< "\n" << Options
<< "\nuciok" << sync_endl;
- else if (token == "isready") sync_cout << "readyok" << sync_endl;
- else if (token == "ucinewgame") TT.clear();
- else if (token == "go") go(pos, is);
- else if (token == "position") position(pos, is);
else if (token == "setoption") setoption(is);
+ else if (token == "go") go(pos, is, states);
+ else if (token == "position") position(pos, is, states);
+ else if (token == "ucinewgame") Search::clear();
+ else if (token == "isready") sync_cout << "readyok" << sync_endl;
- // Additional custom non-UCI commands, useful for debugging
- else if (token == "flip") pos.flip();
- else if (token == "bench") benchmark(pos, is);
- else if (token == "d") sync_cout << pos << sync_endl;
- else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
- else if (token == "perft")
- {
- int depth;
- stringstream ss;
-
- is >> depth;
- ss << Options["Hash"] << " "
- << Options["Threads"] << " " << depth << " current perft";
-
- benchmark(pos, ss);
- }
+ // Additional custom non-UCI commands, mainly for debugging
+ else if (token == "flip") pos.flip();
+ else if (token == "bench") bench(pos, is, states);
+ else if (token == "d") sync_cout << pos << sync_endl;
+ else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
else
sync_cout << "Unknown command: " << cmd << sync_endl;
- } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
-
- Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
+ } while (token != "quit" && argc == 1); // Command line args are one-shot
}
@@ -218,6 +250,8 @@ void UCI::loop(int argc, char* argv[]) {
string UCI::value(Value v) {
+ assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
+
stringstream ss;
if (abs(v) < VALUE_MATE - MAX_PLY)