X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=6d69541fcb574755fd21126880edbebc2bf6a38b;hp=fa0aa3e9e761d7afdd986413d0be8617380b2818;hb=24dac5ccd309837c6767dcf6b145be385eea2e21;hpb=0d68b523a390e2f5c37f211316869d798e852289 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index fa0aa3e9..6d69541f 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-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 @@ -26,12 +27,13 @@ #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", @@ -47,49 +49,77 @@ static const char* Defaults[] = { "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22", "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" + "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 }; +} // 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(const Position& current, istream& is) { string token; - Search::LimitsType limits; vector fens; + Search::LimitsType limits; // 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 : "12"; + 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(); + Search::clear(); if (limitType == "time") - limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms + limits.movetime = stoi(limit); // movetime is in millisecs else if (limitType == "nodes") - limits.nodes = atoi(limit.c_str()); + limits.nodes = stoi(limit); else if (limitType == "mate") - limits.mate = atoi(limit.c_str()); + limits.mate = stoi(limit); else - limits.depth = atoi(limit.c_str()); + limits.depth = stoi(limit); if (fenFile == "default") - fens.assign(Defaults, Defaults + 16); + fens = Defaults; else if (fenFile == "current") fens.push_back(current.fen()); @@ -97,7 +127,7 @@ void benchmark(const Position& current, istream& is) { else { string fen; - ifstream file(fenFile.c_str()); + ifstream file(fenFile); if (!file.is_open()) { @@ -112,32 +142,31 @@ void benchmark(const Position& current, istream& is) { file.close(); } - int64_t nodes = 0; - Search::StateStackPtr st; - Search::MovesVectPtr mv; - Time::point elapsed = Time::now(); + uint64_t nodes = 0; + TimePoint elapsed = now(); - for (size_t i = 0; i < fens.size(); i++) + for (size_t i = 0; i < fens.size(); ++i) { - Position pos(fens[i], Options["UCI_Chess960"], Threads.main_thread()); + 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; - } + nodes += Search::perft(pos, limits.depth * ONE_PLY); + else { - Threads.start_thinking(pos, limits, vector(), st, mv); - Threads.wait_for_think_finished(); - nodes += Search::RootPos.nodes_searched(); + Search::StateStackPtr st; + limits.startTime = now(); + Threads.start_thinking(pos, limits, st); + Threads.main()->wait_for_search_finished(); + nodes += Threads.nodes_searched(); } } - elapsed = Time::now() - elapsed + 1; // Assure positive to avoid a 'divide by zero' + elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero' + + dbg_print(); // Just before exiting cerr << "\n===========================" << "\nTotal time (ms) : " << elapsed