X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=9c84ade312896eec2f6052977ac6922abaa47e14;hp=cf54497d7c427d14c81b1a588b0592c1876fd42a;hb=09bef14c76e119103cc1a9404cbde7e249205deb;hpb=444d99b6d24ba823c8c1ed7a94f3c15b0a536024 diff --git a/src/uci.cpp b/src/uci.cpp index cf54497d..9c84ade3 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -2,7 +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-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2020 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 @@ -28,14 +28,14 @@ #include "position.h" #include "search.h" #include "thread.h" -#include "tt.h" #include "timeman.h" +#include "tt.h" #include "uci.h" #include "syzygy/tbprobe.h" using namespace std; -extern std::vector setup_bench(const Position&, istream&); +extern vector setup_bench(const Position&, istream&); namespace { @@ -89,11 +89,11 @@ namespace { // Read option name (can contain spaces) while (is >> token && token != "value") - name += string(" ", name.empty() ? 0 : 1) + token; + name += (name.empty() ? "" : " ") + token; // Read option value (can contain spaces) while (is >> token) - value += string(" ", value.empty() ? 0 : 1) + token; + value += (value.empty() ? "" : " ") + token; if (Options.count(name)) Options[name] = value; @@ -128,6 +128,7 @@ 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 == "perft") is >> limits.perft; else if (token == "infinite") limits.infinite = 1; else if (token == "ponder") ponderMode = true; @@ -137,7 +138,7 @@ namespace { // 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 summaries at the end. + // it is run one by one printing a summary at the end. void bench(Position& pos, istream& args, StateListPtr& states) { @@ -145,7 +146,7 @@ namespace { 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; }); + num = count_if(list.begin(), list.end(), [](string s) { return s.find("go ") == 0 || s.find("eval") == 0; }); TimePoint elapsed = now(); @@ -154,16 +155,21 @@ namespace { istringstream is(cmd); is >> skipws >> token; - if (token == "go") + if (token == "go" || token == "eval") { cerr << "\nPosition: " << cnt++ << '/' << num << endl; - go(pos, is, states); - Threads.main()->wait_for_search_finished(); - nodes += Threads.nodes_searched(); + if (token == "go") + { + go(pos, is, states); + Threads.main()->wait_for_search_finished(); + nodes += Threads.nodes_searched(); + } + else + sync_cout << "\n" << Eval::trace(pos) << sync_endl; } else if (token == "setoption") setoption(is); else if (token == "position") position(pos, is, states); - else if (token == "ucinewgame") Search::clear(); + 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' @@ -190,9 +196,8 @@ void UCI::loop(int argc, char* argv[]) { 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()); + pos.set(StartFEN, false, &states->back(), Threads.main()); for (int i = 1; i < argc; ++i) cmd += std::string(argv[i]) + " "; @@ -206,18 +211,16 @@ void UCI::loop(int argc, char* argv[]) { 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)) + || 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") - Threads.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) @@ -230,22 +233,12 @@ void UCI::loop(int argc, char* argv[]) { else if (token == "ucinewgame") Search::clear(); else if (token == "isready") sync_cout << "readyok" << sync_endl; - // Additional custom non-UCI commands, mainly for debugging + // Additional custom non-UCI commands, mainly for debugging. + // Do not use these commands during a search! 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 if (token == "perft") - { - int depth; - stringstream ss; - - is >> depth; - ss << Options["Hash"] << " " << Options["Threads"] - << " " << depth << " current perft"; - - // TODO benchmark(pos, ss); - } else sync_cout << "Unknown command: " << cmd << sync_endl;