X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=bf0312c206594b8d80414f6af2a3a48be9b0ce87;hp=052176cdc2c9b11ee3c5605815ff742be4f50679;hb=e0504ab876a997321102f040ab88203cb893db12;hpb=81cd417b4584b0e3830940c5cb122c898afde08a diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 052176cd..bf0312c2 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 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 @@ -19,16 +20,20 @@ #include #include +#include #include +#include "misc.h" #include "position.h" #include "search.h" #include "thread.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", @@ -45,97 +50,134 @@ static const char* Defaults[] = { "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18", "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22", "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26", - "" + "6k1/6p1/6Pp/ppp5/3pn2P/1P3K2/1PP2P2/3N4 b - - 0 1", + "3b4/5kp1/1p1p1p1p/pP1PpP1P/P1P1P3/3KN3/8/8 w - - 0 1", + "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1", + "8/6pk/1p6/8/PP3p1p/5P2/4KP1q/3Q4 w - - 0 1", + "7k/3p2pp/4q3/8/4Q3/5Kp1/P6b/8 w - - 0 1", + "8/2p5/8/2kPKp1p/2p4P/2P5/3P4/8 w - - 0 1", + "8/1p3pp1/7p/5P1P/2k3P1/8/2K2P2/8 w - - 0 1", + "8/pp2r1k1/2p1p3/3pP2p/1P1P1P1P/P5KR/8/8 w - - 0 1", + "8/3p4/p1bk3p/Pp6/1Kp1PpPp/2P2P1P/2P5/5B2 b - - 0 1", + "5k2/7R/4P2p/5K2/p1r2P1p/8/8/8 b - - 0 1", + "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", + + // 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 +/// 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 +/// depth 13), 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. +/// limit value: depth (default), time in millisecs or number of nodes. -void benchmark(int argc, char* argv[]) { +void benchmark(const Position& current, istream& is) { - vector searchMoves(1, MOVE_NONE); - vector fenList; + string token; + vector fens; Search::LimitsType limits; - int64_t totalNodes; - int time; // Assign default values to missing arguments - string ttSize = argc > 2 ? argv[2] : "128"; - string threads = argc > 3 ? argv[3] : "1"; - string valStr = argc > 4 ? argv[4] : "12"; - string fenFile = argc > 5 ? argv[5] : "default"; - string valType = argc > 6 ? argv[6] : "depth"; - - Options["Hash"].set_value(ttSize); - Options["Threads"].set_value(threads); - Options["OwnBook"].set_value("false"); - - // Search should be limited by nodes, time or depth ? - if (valType == "nodes") - limits.maxNodes = atoi(valStr.c_str()); - else if (valType == "time") - limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms + 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; + Search::clear(); + + if (limitType == "time") + limits.movetime = stoi(limit); // movetime is in millisecs + + else if (limitType == "nodes") + limits.nodes = stoll(limit); + + else if (limitType == "mate") + limits.mate = stoi(limit); + else - limits.maxDepth = atoi(valStr.c_str()); + limits.depth = stoi(limit); - // Do we need to load positions from a given FEN file? if (fenFile == "default") - for (int i = 0; *Defaults[i]; i++) - fenList.push_back(Defaults[i]); + fens = Defaults; + + else if (fenFile == "current") + fens.push_back(current.fen()); + else { string fen; - ifstream f(fenFile.c_str()); + ifstream file(fenFile); - if (!f.is_open()) + if (!file.is_open()) { cerr << "Unable to open file " << fenFile << endl; - exit(EXIT_FAILURE); + return; } - while (getline(f, fen)) + while (getline(file, fen)) if (!fen.empty()) - fenList.push_back(fen); + fens.push_back(fen); - f.close(); + file.close(); } - // Ok, let's start the benchmark ! - totalNodes = 0; - time = get_system_time(); + uint64_t nodes = 0; + TimePoint elapsed = now(); + Position pos; - for (size_t i = 0; i < fenList.size(); i++) + for (size_t i = 0; i < fens.size(); ++i) { - Position pos(fenList[i], false, 0); - - cerr << "\nBench position: " << i + 1 << '/' << fenList.size() << endl; + StateListPtr states(new std::deque(1)); + pos.set(fens[i], Options["UCI_Chess960"], &states->back(), Threads.main()); - if (valType == "perft") - { - int64_t cnt = Search::perft(pos, limits.maxDepth * ONE_PLY); + cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl; - cerr << "\nPerft " << limits.maxDepth - << " nodes counted: " << cnt << endl; + if (limitType == "perft") + nodes += Search::perft(pos, limits.depth * ONE_PLY); - totalNodes += cnt; - } else { - Threads.start_thinking(pos, limits, searchMoves, false); - totalNodes += Search::RootPosition.nodes_searched(); + limits.startTime = now(); + Threads.start_thinking(pos, states, limits); + Threads.main()->wait_for_search_finished(); + nodes += Threads.nodes_searched(); } } - time = get_system_time() - time; + elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero' + + dbg_print(); // Just before exiting - cerr << "\n===============================" - << "\nTotal time (ms) : " << time - << "\nNodes searched : " << totalNodes - << "\nNodes/second : " << (int)(totalNodes / (time / 1000.0)) << endl; + cerr << "\n===========================" + << "\nTotal time (ms) : " << elapsed + << "\nNodes searched : " << nodes + << "\nNodes/second : " << 1000 * nodes / elapsed << endl; }