X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=7b7b116ee233999760f381c6e960b57a284739eb;hp=ff804f97a28476c3e644bd41f3ec71a744a066c7;hb=18505f1fc40643ed033f681c36dc5efa3ddf2a05;hpb=ecb98a33301ee39b1470d045d33c6772fe2366d9 diff --git a/src/uci.cpp b/src/uci.cpp index ff804f97..7b7b116e 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 @@ -17,26 +17,25 @@ along with this program. If not, see . */ -#include #include #include #include -#include #include "evaluate.h" -#include "misc.h" -#include "move.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 for the initial position - const char* StarFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; + // 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 @@ -45,41 +44,57 @@ namespace { void set_option(istringstream& up); void set_position(Position& pos, istringstream& up); - bool go(Position& pos, istringstream& up); - void perft(Position& pos, istringstream& up); + void go(Position& pos, istringstream& up); } /// Wait for a command from the user, parse this text string as an UCI command, -/// and calls 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. +/// 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. -void uci_loop() { +void uci_loop(const string& args) { - Position pos(StarFEN, false, 0); // The root position + Position pos(StartFEN, false, Threads.main_thread()); // The root position string cmd, token; - bool quit = false; - while (!quit) + while (token != "quit") { - Threads.getline(cmd); + if (!args.empty()) + cmd = args; + + else if (!getline(cin, cmd)) // Block here waiting for input + cmd = "quit"; istringstream is(cmd); is >> skipws >> token; - if (token == "quit") - quit = true; + if (token == "quit" || token == "stop") + { + Search::Signals.stop = true; + Threads.wait_for_search_finished(); // Cannot quit while threads are running + } - else if (token == "stop") - { /* avoid to reply "Unknown command: stop" */ } + else if (token == "ponderhit") + { + // The opponent has played the expected move. GUI sends "ponderhit" if + // we were told to ponder on the same move the opponent has played. We + // should continue searching but switching from pondering to normal search. + Search::Limits.ponder = false; + + if (Search::Signals.stopOnPonderhit) + { + Search::Signals.stop = true; + Threads.main_thread()->wake_up(); // Could be sleeping + } + } else if (token == "go") - quit = !go(pos, is); + go(pos, is); else if (token == "ucinewgame") - pos.from_fen(StarFEN, false); + TT.clear(); else if (token == "isready") cout << "readyok" << endl; @@ -90,33 +105,46 @@ 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.get_key() - << "\nmaterial key: " << pos.get_material_key() - << "\npawn key: " << pos.get_pawn_key() << endl; + cout << "key: " << hex << pos.key() + << "\nmaterial key: " << pos.material_key() + << "\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; + } } } @@ -137,7 +165,7 @@ namespace { if (token == "startpos") { - fen = StarFEN; + fen = StartFEN; is >> token; // Consume "moves" token if any } else if (token == "fen") @@ -146,7 +174,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) @@ -160,9 +188,8 @@ namespace { } - // set_option() is called when engine receives the "setoption" UCI - // command. The function updates the corresponding UCI option ("name") - // to the given value ("value"). + // set_option() is called when engine receives the "setoption" UCI command. The + // function updates the UCI option ("name") to the given value ("value"). void set_option(istringstream& is) { @@ -178,80 +205,50 @@ 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; } - // 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 calls think(). Returns false if a quit command - // is received while thinking, true otherwise. + // 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 search. - bool go(Position& pos, istringstream& is) { + void go(Position& pos, istringstream& is) { + Search::LimitsType limits; + vector searchMoves; string token; - SearchLimits limits; - std::vector searchMoves; - int time[] = { 0, 0 }, inc[] = { 0, 0 }; 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)); } - searchMoves.push_back(MOVE_NONE); - limits.time = time[pos.side_to_move()]; - limits.increment = inc[pos.side_to_move()]; - - return think(pos, limits, &searchMoves[0]); - } - - - // perft() is called when engine receives the "perft" command. - // The function calls perft() passing the required search depth - // then prints counted leaf nodes and elapsed time. - - void perft(Position& pos, istringstream& is) { - - int depth, time; - int64_t n; - - if (!(is >> depth)) - return; - - time = get_system_time(); - - n = perft(pos, depth * ONE_PLY); - - time = get_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); } }