X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=72eda4a0958a29d3d15957711944508b9732a18a;hp=ee1b07023a5fe97b17a8c28cb8911fd9caaefc73;hb=255df4ffae29f4a038c9881c1f2f675e2f21f71e;hpb=5644e14d0e3d69b3f845e475771564ffb3e25445 diff --git a/src/uci.cpp b/src/uci.cpp index ee1b0702..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-2014 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,7 +18,7 @@ along with this program. If not, see . */ -#include +#include #include #include #include @@ -27,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"; - // Keep a track of the position keys along the setup moves (from the start position - // to the position just before the search starts). This is needed by the repetition - // draw detection code. - 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; @@ -68,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()); + states->emplace_back(); + pos.do_move(m, states->back()); } } @@ -91,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; @@ -105,16 +103,18 @@ 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 starts + // 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") while (is >> token) limits.searchmoves.push_back(UCI::to_move(pos, token)); @@ -128,131 +128,156 @@ 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(); + + 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(); } - Threads.start_thinking(pos, limits, SetupStates); + 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 -/// 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. +/// 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. 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]) + " "; do { - if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input + if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input or EOF cmd = "quit"; istringstream is(cmd); + token.clear(); // Avoid a stale if getline() returns empty or blank line is >> skipws >> token; - if (token == "quit" || token == "stop" || token == "ponderhit") - { - // 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 - // switch from pondering to normal search. - if (token != "ponderhit" || Search::Signals.stopOnPonderhit) - { - Search::Signals.stop = true; - Threads.main()->notify_one(); // Could be sleeping - } - else - Search::Limits.ponder = false; - } - else if (token == "perft") - { - int depth; - stringstream ss; - - is >> depth; - ss << Options["Hash"] << " " - << Options["Threads"] << " " << depth << " current " << token; - - benchmark(pos, ss); - } - else if (token == "key") - sync_cout << hex << uppercase << setfill('0') - << "position key: " << setw(16) << pos.key() - << "\nmaterial key: " << setw(16) << pos.material_key() - << "\npawn key: " << setw(16) << pos.pawn_key() - << dec << nouppercase << setfill(' ') << sync_endl; + // 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 == "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 == "flip") pos.flip(); - else if (token == "bench") benchmark(pos, is); - else if (token == "d") sync_cout << pos << sync_endl; + 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; - else if (token == "eval") sync_cout << Eval::trace(pos) << 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); // 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 } -/// format_value() converts a Value to a string suitable for use with the UCI -/// protocol specifications: +/// 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. +/// 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) { -string UCI::format_value(Value v, Value alpha, Value beta) { + assert(-VALUE_INFINITE < v && v < VALUE_INFINITE); stringstream ss; - if (abs(v) < VALUE_MATE_IN_MAX_PLY) + 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; - ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : ""); - return ss.str(); } -/// format_square() converts a Square to a string (g1, a7, etc.) - -std::string UCI::format_square(Square s) { +/// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.) - char ch[] = { char('a' + file_of(s)), - char('1' + rank_of(s)), 0 }; // Zero-terminating - return ch; +std::string UCI::square(Square s) { + return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) }; } -/// format_move() converts a Move to a string in coordinate notation -/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print -/// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960 -/// mode. Internally castling moves are always encoded as "king captures rook". +/// 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::format_move(Move m, bool chess960) { +string UCI::move(Move m, bool chess960) { Square from = from_sq(m); Square to = to_sq(m); @@ -266,7 +291,7 @@ string UCI::format_move(Move m, bool chess960) { if (type_of(m) == CASTLING && !chess960) to = make_square(to > from ? FILE_G : FILE_C, rank_of(from)); - string move = format_square(from) + format_square(to); + string move = UCI::square(from) + UCI::square(to); if (type_of(m) == PROMOTION) move += " pnbrqk"[promotion_type(m)]; @@ -275,17 +300,17 @@ string UCI::format_move(Move m, bool chess960) { } -/// to_move() takes a position and a string representing a move in -/// simple coordinate notation and returns an equivalent legal Move if any. +/// 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 (MoveList it(pos); *it; ++it) - if (str == format_move(*it, pos.is_chess960())) - return *it; + for (const auto& m : MoveList(pos)) + if (str == UCI::move(m, pos.is_chess960())) + return m; return MOVE_NONE; }