X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=49a0b22fd6723a89bbbc87174240dc0a125be197;hp=c3eb9190b4f2b5809c4642c827bb2bcd83873d14;hb=e1191b35e85cbf0d488d747ac26cdf13e1fa0f9a;hpb=d6e3a40c819d29db00866bc7f09b9315dff9b95a diff --git a/src/uci.cpp b/src/uci.cpp index c3eb9190..49a0b22f 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -22,28 +22,29 @@ #include #include "evaluate.h" -#include "misc.h" +#include "notation.h" #include "position.h" #include "search.h" #include "thread.h" +#include "tt.h" #include "ucioption.h" using namespace std; +extern void benchmark(const Position& pos, istream& is); + 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; + // position just before to start searching). Needed by repetition draw detection. + Search::StateStackPtr SetupStates; 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 +53,13 @@ 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 - string cmd, token; + Position pos(StartFEN, false, Threads.main_thread()); // The root position + string token, cmd = args; - while (token != "quit") - { - if (!getline(cin, cmd)) // Block here waiting for input + do { + if (args.empty() && !getline(cin, cmd)) // Block here waiting for input cmd = "quit"; istringstream is(cmd); @@ -69,11 +69,8 @@ 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.main_thread()->wake_up(); // Could be sleeping } - else if (token == "ponderhit") { // The opponent has played the expected move. GUI sends "ponderhit" if @@ -82,57 +79,53 @@ 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 == "perft" && (is >> token)) // Read perft depth + { + stringstream ss; - else if (token == "go") - go(pos, is); - - else if (token == "ucinewgame") - { /* Avoid returning "Unknown command" */ } - - 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(); - - else if (token == "flip") - pos.flip_me(); + ss << Options["Hash"] << " " + << Options["Threads"] << " " << token << " current perft"; - else if (token == "eval") - cout << Eval::trace(pos) << endl; + benchmark(pos, ss); + } + else if (token == "key") sync_cout << "position key: " << hex << pos.key() + << "\nmaterial key: " << pos.material_key() + << "\npawn key: " << pos.pawn_key() + << sync_endl; + + 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") set_position(pos, is); + else if (token == "setoption") set_option(is); + else if (token == "flip") pos.flip(); + else if (token == "bench") benchmark(pos, is); + else if (token == "d") sync_cout << pos.pretty() << sync_endl; + else if (token == "isready") sync_cout << "readyok" << sync_endl; + else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl; + else + sync_cout << "Unknown command: " << cmd << sync_endl; - else if (token == "key") - cout << "key: " << hex << pos.key() - << "\nmaterial key: " << pos.material_key() - << "\npawn key: " << pos.pawn_key() << endl; + } while (token != "quit" && args.empty()); // Args have one-shot behaviour - else if (token == "uci") - cout << "id name " << engine_info(true) - << "\n" << Options - << "\nuciok" << endl; - else - cout << "Unknown command: " << cmd << endl; - } + Threads.wait_for_search_finished(); // Cannot quit while search is running } 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"). + // 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) { @@ -152,16 +145,14 @@ namespace { else return; - pos.from_fen(fen, Options["UCI_Chess960"]); + pos.set(fen, Options["UCI_Chess960"], Threads.main_thread()); + SetupStates = Search::StateStackPtr(new std::stack()); // Parse move list (if any) while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE) { - pos.do_move(m, *SetupState); - - // Increment pointer to StateRingBuf circular buffer - if (++SetupState - StateRingBuf >= 102) - SetupState = StateRingBuf; + SetupStates->push(StateInfo()); + pos.do_move(m, SetupStates->top()); } } @@ -186,70 +177,39 @@ namespace { 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 thinking time and other parameters from the input string, and starts // the search. void go(Position& pos, istringstream& is) { Search::LimitsType limits; - std::set searchMoves; + vector searchMoves; string token; while (is >> token) { - if (token == "wtime") - is >> limits.times[WHITE]; - else if (token == "btime") - is >> limits.times[BLACK]; - else if (token == "winc") - is >> limits.incs[WHITE]; - else if (token == "binc") - is >> limits.incs[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 == "infinite") - limits.infinite = true; - else if (token == "ponder") - limits.ponder = true; - else if (token == "searchmoves") + if (token == "searchmoves") while (is >> token) - searchMoves.insert(move_from_uci(pos, token)); + searchMoves.push_back(move_from_uci(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 == "infinite") limits.infinite = true; + else if (token == "ponder") limits.ponder = true; } - 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; + Threads.start_searching(pos, limits, searchMoves, SetupStates); } }