X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=3895c7a1d49aa001535430616d97c58920179697;hp=4c3faf05c02c07999017594728c1249213dd4b2d;hb=0a18adb02ac375f7d7fc31ef76b59e13a0263773;hpb=0439a79566d03065317b2025b9b479b9ae9f2d65 diff --git a/src/uci.cpp b/src/uci.cpp index 4c3faf05..3895c7a1 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -22,7 +22,7 @@ #include #include "evaluate.h" -#include "misc.h" +#include "notation.h" #include "position.h" #include "search.h" #include "thread.h" @@ -30,7 +30,7 @@ using namespace std; -extern void benchmark(istringstream& is); +extern void benchmark(const Position& pos, istream& is); namespace { @@ -38,14 +38,12 @@ namespace { 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); } @@ -54,9 +52,9 @@ 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(const string& args) { +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") @@ -87,7 +85,7 @@ void uci_loop(const string& args) { if (Search::Signals.stopOnPonderhit) { Search::Signals.stop = true; - Threads.wait_for_search_finished(); // Wake up if is sleeping + Threads.main_thread()->wake_up(); // Could be sleeping } } @@ -98,7 +96,7 @@ void uci_loop(const string& args) { { /* Avoid returning "Unknown command" */ } else if (token == "isready") - cout << "readyok" << endl; + sync_cout << "readyok" << sync_endl; else if (token == "position") set_position(pos, is); @@ -106,9 +104,6 @@ void uci_loop(const string& args) { else if (token == "setoption") set_option(is); - else if (token == "perft") - perft(pos, is); - else if (token == "d") pos.print(); @@ -116,22 +111,33 @@ void uci_loop(const string& args) { pos.flip(); else if (token == "eval") - cout << Eval::trace(pos) << endl; + sync_cout << Eval::trace(pos) << sync_endl; else if (token == "bench") - benchmark(is); + benchmark(pos, is); else if (token == "key") - cout << "key: " << hex << pos.key() - << "\nmaterial key: " << pos.material_key() - << "\npawn key: " << pos.pawn_key() << endl; + sync_cout << "key: " << hex << pos.key() + << "\nmaterial key: " << pos.material_key() + << "\npawn key: " << pos.pawn_key() << sync_endl; else if (token == "uci") - cout << "id name " << engine_info(true) - << "\n" << Options - << "\nuciok" << endl; + sync_cout << "id name " << engine_info(true) + << "\n" << Options + << "\nuciok" << sync_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; + sync_cout << "Unknown command: " << cmd << sync_endl; if (!args.empty()) // Command line arguments have one-shot behaviour { @@ -144,10 +150,10 @@ void uci_loop(const string& args) { 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) { @@ -167,16 +173,14 @@ namespace { else return; - pos.from_fen(fen, Options["UCI_Chess960"]); + pos.from_fen(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()); } } @@ -201,7 +205,7 @@ namespace { if (Options.count(name)) Options[name] = value; else - cout << "No such option: " << name << endl; + sync_cout << "No such option: " << name << sync_endl; } @@ -242,29 +246,6 @@ namespace { searchMoves.push_back(move_from_uci(pos, token)); } - 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(); - - cout << "\nNodes " << n - << "\nTime (ms) " << e - << "\nNodes/second " << int(n / (e / 1000.0)) << endl; + Threads.start_searching(pos, limits, searchMoves, SetupStates); } }