X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=72eda4a0958a29d3d15957711944508b9732a18a;hb=0cfb653eeca1bc44b9d331498a9ccb3e9b97a9c1;hp=fb2d3eac5834e7e9d8dc28b88dc7022cef7e96fa;hpb=348f8241041a26cd9458beb8098306099f44a46a;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index fb2d3eac..72eda4a0 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 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,130 +18,37 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include
#include "evaluate.h"
-#include "misc.h"
-#include "move.h"
+#include "movegen.h"
#include "position.h"
#include "search.h"
#include "thread.h"
-#include "ucioption.h"
+#include "timeman.h"
+#include "tt.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
using namespace std;
+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";
- // Keep track of position keys along the setup moves (from start position to the
- // position just before to start searching). This is needed by draw detection
- // where, due to 50 moves rule, we need to check at most 100 plies back.
- StateInfo StateRingBuf[102], *SetupState = StateRingBuf;
-
- void set_option(istringstream& up);
- void set_position(Position& pos, istringstream& up);
- void go(Position& pos, istringstream& up);
- void perft(Position& pos, istringstream& up);
-}
-
-
-/// Wait for a command from the user, parse this text string as an UCI command,
-/// and call the appropriate functions. Also intercepts EOF from stdin to ensure
-/// 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() {
-
- Position pos(StartFEN, false, 0); // The root position
- string cmd, token;
-
- while (token != "quit")
- {
- if (!getline(cin, cmd)) // Block here waiting for input
- cmd = "quit";
-
- istringstream is(cmd);
-
- is >> skipws >> token;
-
- if (token == "quit" || token == "stop")
- {
- Search::Signals.stop = true;
- Threads[0].wake_up(); // In case is waiting for stop or ponderhit
- }
-
- else if (token == "ponderhit")
- {
- // The opponent has played the expected move. GUI sends "ponderhit" if
- // we were told to ponder on the same move the opponent has played. We
- // should continue searching but switching from pondering to normal search.
- Search::Limits.ponder = false;
-
- if (Search::Signals.stopOnPonderhit)
- Search::Signals.stop = true;
-
- Threads[0].wake_up(); // In case is waiting for stop or ponderhit
- }
-
- else if (token == "go")
- go(pos, is);
-
- else if (token == "ucinewgame")
- pos.from_fen(StartFEN, false);
-
- else if (token == "isready")
- cout << "readyok" << endl;
-
- else if (token == "position")
- set_position(pos, is);
-
- else if (token == "setoption")
- set_option(is);
-
- else if (token == "perft")
- perft(pos, is);
- else if (token == "d")
- pos.print();
+ // 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").
- else if (token == "flip")
- pos.flip_me();
-
- else if (token == "eval")
- {
- read_evaluation_uci_options(pos.side_to_move());
- cout << trace_evaluate(pos) << endl;
- }
-
- else if (token == "key")
- cout << "key: " << hex << pos.get_key()
- << "\nmaterial key: " << pos.get_material_key()
- << "\npawn key: " << pos.get_pawn_key() << endl;
-
- else if (token == "uci")
- cout << "id name " << engine_name()
- << "\nid author " << engine_authors()
- << "\n" << Options.print_all()
- << "\nuciok" << endl;
- else
- cout << "Unknown command: " << cmd << endl;
- }
-}
-
-
-namespace {
-
- // set_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 set_position(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is, StateListPtr& states) {
Move m;
string token, fen;
@@ -158,24 +66,22 @@ namespace {
else
return;
- pos.from_fen(fen, Options["UCI_Chess960"].value());
+ 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 = move_from_uci(pos, token)) != MOVE_NONE)
+ while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
{
- pos.do_move(m, *SetupState);
-
- // Increment pointer to StateRingBuf circular buffer
- if (++SetupState - StateRingBuf >= 102)
- SetupState = StateRingBuf;
+ states->emplace_back();
+ pos.do_move(m, states->back());
}
}
- // set_option() is called when engine receives the "setoption" UCI command. The
+ // setoption() is called when engine receives the "setoption" UCI command. The
// function updates the UCI option ("name") to the given value ("value").
- void set_option(istringstream& is) {
+ void setoption(istringstream& is) {
string token, name, value;
@@ -183,84 +89,228 @@ 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.find(name) != Options.end())
- Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value"
+ if (Options.count(name))
+ Options[name] = value;
else
- cout << "No such option: " << name << endl;
+ sync_cout << "No such option: " << name << sync_endl;
}
// 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 thinking time and other parameters from the input string, then starts
+ // the search.
- void go(Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is, StateListPtr& states) {
- string token;
Search::LimitsType limits;
- std::vector searchMoves;
- int time[] = { 0, 0 }, inc[] = { 0, 0 };
+ string token;
+ bool ponderMode = false;
+
+ limits.startTime = now(); // As early as possible!
while (is >> token)
- {
- if (token == "infinite")
- limits.infinite = true;
- else if (token == "ponder")
- limits.ponder = true;
- else if (token == "wtime")
- is >> time[WHITE];
- else if (token == "btime")
- is >> time[BLACK];
- else if (token == "winc")
- is >> inc[WHITE];
- else if (token == "binc")
- is >> inc[BLACK];
- else if (token == "movestogo")
- is >> limits.movesToGo;
- else if (token == "depth")
- is >> limits.maxDepth;
- else if (token == "nodes")
- is >> limits.maxNodes;
- else if (token == "movetime")
- is >> limits.maxTime;
- else if (token == "searchmoves")
+ if (token == "searchmoves")
while (is >> token)
- searchMoves.push_back(move_from_uci(pos, token));
+ limits.searchmoves.push_back(UCI::to_move(pos, token));
+
+ else if (token == "wtime") is >> limits.time[WHITE];
+ else if (token == "btime") is >> limits.time[BLACK];
+ else if (token == "winc") is >> limits.inc[WHITE];
+ else if (token == "binc") is >> limits.inc[BLACK];
+ else if (token == "movestogo") is >> limits.movestogo;
+ else if (token == "depth") is >> limits.depth;
+ else if (token == "nodes") is >> limits.nodes;
+ else if (token == "movetime") is >> limits.movetime;
+ else if (token == "mate") is >> limits.mate;
+ 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();
+
+ 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();
}
- searchMoves.push_back(MOVE_NONE);
- limits.time = time[pos.side_to_move()];
- limits.increment = inc[pos.side_to_move()];
+ elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
- Threads.start_thinking(pos, limits, searchMoves, true);
+ dbg_print(); // Just before exiting
+
+ cerr << "\n==========================="
+ << "\nTotal time (ms) : " << elapsed
+ << "\nNodes searched : " << nodes
+ << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
}
+} // namespace
- // 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) {
+/// UCI::loop() waits for a command from stdin, parses it and calls the appropriate
+/// function. Also intercepts EOF from stdin to ensure gracefully exiting if the
+/// GUI dies unexpectedly. When called with some command line arguments, e.g. to
+/// run 'bench', once the command is executed the function returns immediately.
+/// In addition to the UCI ones, also some additional debug commands are supported.
- int depth, time;
+void UCI::loop(int argc, char* argv[]) {
- if (!(is >> depth))
- return;
+ 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());
- time = get_system_time();
+ for (int i = 1; i < argc; ++i)
+ cmd += std::string(argv[i]) + " ";
- int64_t n = Search::perft(pos, depth * ONE_PLY);
+ do {
+ if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input or EOF
+ cmd = "quit";
- time = get_system_time() - time;
+ istringstream is(cmd);
- std::cout << "\nNodes " << n
- << "\nTime (ms) " << time
- << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
- }
+ token.clear(); // Avoid a stale if getline() returns empty or blank line
+ is >> skipws >> token;
+
+ // 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. In case Threads.stopOnPonderhit is set we are waiting for
+ // 'ponderhit' to stop the search, for instance if max search depth is reached.
+ if ( token == "quit"
+ || token == "stop"
+ || (token == "ponderhit" && Threads.stopOnPonderhit))
+ Threads.stop = true;
+
+ else if (token == "ponderhit")
+ Threads.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 == "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, 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); // Command line args are one-shot
+}
+
+
+/// UCI::value() converts a Value to a string suitable for use with the UCI
+/// protocol specification:
+///
+/// cp The score from the engine's point of view in centipawns.
+/// mate Mate in y moves, not plies. If the engine is getting mated
+/// use negative values for y.
+
+string UCI::value(Value v) {
+
+ assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
+
+ stringstream ss;
+
+ if (abs(v) < VALUE_MATE - MAX_PLY)
+ ss << "cp " << v * 100 / PawnValueEg;
+ else
+ ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
+
+ return ss.str();
+}
+
+
+/// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
+
+std::string UCI::square(Square s) {
+ return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
+}
+
+
+/// UCI::move() converts a Move to a string in coordinate notation (g1f3, a7a8q).
+/// The only special case is castling, where we print in the e1g1 notation in
+/// normal chess mode, and in e1h1 notation in chess960 mode. Internally all
+/// castling moves are always encoded as 'king captures rook'.
+
+string UCI::move(Move m, bool chess960) {
+
+ Square from = from_sq(m);
+ Square to = to_sq(m);
+
+ if (m == MOVE_NONE)
+ return "(none)";
+
+ if (m == MOVE_NULL)
+ return "0000";
+
+ if (type_of(m) == CASTLING && !chess960)
+ to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
+
+ string move = UCI::square(from) + UCI::square(to);
+
+ if (type_of(m) == PROMOTION)
+ move += " pnbrqk"[promotion_type(m)];
+
+ return move;
+}
+
+
+/// UCI::to_move() converts a string representing a move in coordinate notation
+/// (g1f3, a7a8q) to the corresponding legal Move, if any.
+
+Move UCI::to_move(const Position& pos, string& str) {
+
+ if (str.length() == 5) // Junior could send promotion piece in uppercase
+ str[4] = char(tolower(str[4]));
+
+ for (const auto& m : MoveList(pos))
+ if (str == UCI::move(m, pos.is_chess960()))
+ return m;
+
+ return MOVE_NONE;
}