X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=c9a5933daa25d5c280956acb4e88f6b97767839c;hp=450afa99f926ff235706de0461c21caec26383d4;hb=45e254a0a0d4cbc574e5a65bd4584036b01091b6;hpb=bd1c3ed7e32d3df0ceb29cb6959599e3cac2057c diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 450afa99..c9a5933d 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -1,7 +1,8 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2017 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 @@ -22,16 +23,14 @@ #include #include -#include "misc.h" #include "position.h" -#include "search.h" -#include "thread.h" -#include "tt.h" -#include "ucioption.h" +#include "uci.h" using namespace std; -static const char* Defaults[] = { +namespace { + +const vector Defaults = { "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1", "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10", "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11", @@ -61,49 +60,61 @@ static const char* Defaults[] = { "6k1/6p1/P6p/r1N5/5p2/7P/1b3PP1/4R1K1 w - - 0 1", "1r3k2/4q3/2Pp3b/3Bp3/2Q2p2/1p1P2P1/1P2KP2/3N4 w - - 0 1", "6k1/4pp1p/3p2p1/P1pPb3/R7/1r2P1PP/3B1P2/6K1 w - - 0 1", - "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1" + "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1", + + // 5-man positions + "8/8/8/8/5kp1/P7/8/1K1N4 w - - 0 1", // Kc2 - mate + "8/8/8/5N2/8/p7/8/2NK3k w - - 0 1", // Na2 - mate + "8/3k4/8/8/8/4B3/4KB2/2B5 w - - 0 1", // draw + + // 6-man positions + "8/8/1P6/5pr1/8/4R3/7k/2K5 w - - 0 1", // Re5 - mate + "8/2p4P/8/kr6/6R1/8/8/1K6 w - - 0 1", // Ka2 - mate + "8/8/3P3k/8/1p6/8/1P6/1K3n2 b - - 0 1", // Nd2 - draw + + // 7-man positions + "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw + + // Mate and stalemate positions + "8/8/8/8/8/6k1/6p1/6K1 w - -", + "5k2/5P2/5K2/8/8/8/8/8 b - -", + "8/8/8/8/8/4k3/4p3/4K3 w - -", + "8/8/8/8/8/5K2/8/3Q1k2 b - -", + "7k/7P/6K1/8/3B4/8/8/8 b - -" }; +} // namespace -/// benchmark() runs a simple benchmark by letting Stockfish analyze a set -/// of positions for a given limit each. There are five parameters; the -/// transposition table size, the number of search threads that should -/// be used, the limit value spent for each position (optional, default is -/// depth 12), an optional file name where to look for positions in fen -/// format (defaults are the positions defined above) and the type of the -/// limit value: depth (default), time in secs or number of nodes. +/// setup_bench() builds a list of UCI commands to be run by bench. There +/// are five parameters: TT size in MB, number of search threads that +/// should be used, the limit value spent for each position, a file name +/// where to look for positions in FEN format and the type of the limit: +/// depth, perft, nodes and movetime (in millisecs). +/// +/// bench -> search default positions up to depth 13 +/// bench 64 1 15 -> search default positions up to depth 15 (TT = 64MB) +/// bench 64 4 5000 current movetime -> search current position with 4 threads for 5 sec +/// bench 64 1 100000 default nodes -> search default positions for 100K nodes each +/// bench 16 1 5 default perft -> run a perft 5 on default positions -void benchmark(const Position& current, istream& is) { +std::vector setup_bench(const Position& current , istream& is) { - string token; - Search::LimitsType limits; - vector fens; + vector fens, list; + string go, token; // Assign default values to missing arguments - string ttSize = (is >> token) ? token : "32"; + string ttSize = (is >> token) ? token : "16"; string threads = (is >> token) ? token : "1"; string limit = (is >> token) ? token : "13"; string fenFile = (is >> token) ? token : "default"; string limitType = (is >> token) ? token : "depth"; - Options["Hash"] = ttSize; - Options["Threads"] = threads; - TT.clear(); - - if (limitType == "time") - limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms - - else if (limitType == "nodes") - limits.nodes = atoi(limit.c_str()); - - else if (limitType == "mate") - limits.mate = atoi(limit.c_str()); - - else - limits.depth = atoi(limit.c_str()); + // Build 'go' string (movetime is in millisecs) + go = "go " + limitType + " " + limit; + // Get test positions fens if (fenFile == "default") - fens.assign(Defaults, Defaults + 30); + fens = Defaults; else if (fenFile == "current") fens.push_back(current.fen()); @@ -111,12 +122,12 @@ void benchmark(const Position& current, istream& is) { else { string fen; - ifstream file(fenFile.c_str()); + ifstream file(fenFile); if (!file.is_open()) { cerr << "Unable to open file " << fenFile << endl; - return; + exit(EXIT_FAILURE); } while (getline(file, fen)) @@ -126,34 +137,16 @@ void benchmark(const Position& current, istream& is) { file.close(); } - int64_t nodes = 0; - Search::StateStackPtr st; - Time::point elapsed = Time::now(); + // Build UCI command list + list.emplace_back("ucinewgame"); + list.emplace_back("setoption name Threads value " + threads); + list.emplace_back("setoption name Hash value " + ttSize); - for (size_t i = 0; i < fens.size(); ++i) + for (const string& fen : fens) { - Position pos(fens[i], Options["UCI_Chess960"], Threads.main()); - - cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl; - - if (limitType == "perft") - { - size_t cnt = Search::perft(pos, limits.depth * ONE_PLY); - cerr << "\nPerft " << limits.depth << " leaf nodes: " << cnt << endl; - nodes += cnt; - } - else - { - Threads.start_thinking(pos, limits, vector(), st); - Threads.wait_for_think_finished(); - nodes += Search::RootPos.nodes_searched(); - } + list.emplace_back("position fen " + fen); + list.emplace_back(go); } - elapsed = Time::now() - elapsed + 1; // Assure positive to avoid a 'divide by zero' - - cerr << "\n===========================" - << "\nTotal time (ms) : " << elapsed - << "\nNodes searched : " << nodes - << "\nNodes/second : " << 1000 * nodes / elapsed << endl; + return list; }