X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=0ba4de3bddeb3cb9dd8c87eab097ed0a41afe00c;hp=b875eaf7f1840bd3d3b41553dbeed55538dc1730;hb=5e905800887da94d481978d3bddd9539b2111458;hpb=c2d42ea8339b49e52a116e488214a14fda09d413 diff --git a/src/uci.cpp b/src/uci.cpp index b875eaf7..0ba4de3b 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -1,7 +1,7 @@ /* 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-2012 Marco Costalba, Joona Kiiski, 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 @@ -20,10 +20,8 @@ #include #include #include -#include #include "evaluate.h" -#include "misc.h" #include "position.h" #include "search.h" #include "thread.h" @@ -31,6 +29,8 @@ using namespace std; +extern void benchmark(const Position& pos, istream& is); + namespace { // FEN string of the initial position, normal chess @@ -44,7 +44,6 @@ namespace { void set_option(istringstream& up); void set_position(Position& pos, istringstream& up); void go(Position& pos, istringstream& up); - void perft(Position& pos, istringstream& up); } @@ -53,14 +52,17 @@ 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 + Position pos(StartFEN, false, Threads.main_thread()); // The root position string cmd, token; while (token != "quit") { - if (!getline(cin, cmd)) // Block here waiting for input + if (!args.empty()) + cmd = args; + + else if (!getline(cin, cmd)) // Block here waiting for input cmd = "quit"; istringstream is(cmd); @@ -70,7 +72,7 @@ void uci_loop() { if (token == "quit" || token == "stop") { Search::Signals.stop = true; - Threads[0].wake_up(); // In case is waiting for stop or ponderhit + Threads.wait_for_search_finished(); // Cannot quit while threads are running } else if (token == "ponderhit") @@ -81,16 +83,17 @@ void uci_loop() { Search::Limits.ponder = false; if (Search::Signals.stopOnPonderhit) + { Search::Signals.stop = true; - - Threads[0].wake_up(); // In case is waiting for stop or ponderhit + Threads.main_thread()->wake_up(); // Could be sleeping + } } else if (token == "go") go(pos, is); else if (token == "ucinewgame") - pos.from_fen(StartFEN, false); + { /* Avoid returning "Unknown command" */ } else if (token == "isready") cout << "readyok" << endl; @@ -101,20 +104,17 @@ void uci_loop() { 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(); + pos.flip(); else if (token == "eval") - { - read_evaluation_uci_options(pos.side_to_move()); - cout << trace_evaluate(pos) << endl; - } + cout << Eval::trace(pos) << endl; + + else if (token == "bench") + benchmark(pos, is); else if (token == "key") cout << "key: " << hex << pos.key() @@ -122,12 +122,28 @@ void uci_loop() { << "\npawn key: " << pos.pawn_key() << endl; else if (token == "uci") - cout << "id name " << engine_name() - << "\nid author " << engine_authors() - << "\n" << Options.print_all() + cout << "id name " << engine_info(true) + << "\n" << Options << "\nuciok" << 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; + + if (!args.empty()) // Command line arguments have one-shot behaviour + { + Threads.wait_for_search_finished(); + break; + } } } @@ -157,7 +173,7 @@ namespace { else return; - pos.from_fen(fen, Options["UCI_Chess960"].value()); + pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread()); // Parse move list (if any) while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE) @@ -188,8 +204,8 @@ namespace { while (is >> token) value += string(" ", !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; } @@ -197,68 +213,41 @@ 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 then starts - // the main searching thread. + // the search. void go(Position& pos, istringstream& is) { - string token; Search::LimitsType limits; - std::vector searchMoves; - int time[] = { 0, 0 }, inc[] = { 0, 0 }; + vector searchMoves; + string token; while (is >> token) { - if (token == "infinite") - limits.infinite = true; - else if (token == "ponder") - limits.ponder = true; - else if (token == "wtime") - is >> time[WHITE]; + if (token == "wtime") + is >> limits.time[WHITE]; else if (token == "btime") - is >> time[BLACK]; + is >> limits.time[BLACK]; else if (token == "winc") - is >> inc[WHITE]; + is >> limits.inc[WHITE]; else if (token == "binc") - is >> inc[BLACK]; + is >> limits.inc[BLACK]; else if (token == "movestogo") - is >> limits.movesToGo; + is >> limits.movestogo; else if (token == "depth") - is >> limits.maxDepth; + is >> limits.depth; else if (token == "nodes") - is >> limits.maxNodes; + is >> limits.nodes; else if (token == "movetime") - is >> limits.maxTime; + is >> limits.movetime; + else if (token == "infinite") + limits.infinite = true; + else if (token == "ponder") + limits.ponder = true; else if (token == "searchmoves") while (is >> token) searchMoves.push_back(move_from_uci(pos, token)); } - limits.time = time[pos.side_to_move()]; - limits.increment = inc[pos.side_to_move()]; - - Threads.start_thinking(pos, limits, searchMoves, true); - } - - - // 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, time; - - if (!(is >> depth)) - return; - - time = system_time(); - - int64_t n = Search::perft(pos, depth * ONE_PLY); - - time = system_time() - time; - - std::cout << "\nNodes " << n - << "\nTime (ms) " << time - << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl; + Threads.start_searching(pos, limits, searchMoves); } }