X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=de8b48bb4c039f480f45f5e6339b19192b8ab70b;hp=f59ded730d6f3f6f0751a568a7f55e476927994e;hb=6044f25d7104c25e0218831027eade75e092ed0c;hpb=b50ce5ebfbc9f8b043f0d915c47b0ac550d4affc diff --git a/src/benchmark.cpp b/src/benchmark.cpp index f59ded73..de8b48bb 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.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-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 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,12 +17,14 @@ along with this program. If not, see . */ +#include #include #include #include #include #include "misc.h" +#include "notation.h" #include "position.h" #include "search.h" #include "thread.h" @@ -47,15 +49,29 @@ 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" }; /// 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. @@ -66,9 +82,9 @@ void benchmark(const Position& current, istream& is) { vector fens; // Assign default values to missing arguments - string ttSize = (is >> token) ? token : "128"; + 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"; @@ -82,14 +98,17 @@ void benchmark(const Position& current, istream& is) { 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()); if (fenFile == "default") - fens.assign(Defaults, Defaults + 16); + fens.assign(Defaults, Defaults + 30); else if (fenFile == "current") - fens.push_back(current.to_fen()); + fens.push_back(current.fen()); else { @@ -99,7 +118,7 @@ void benchmark(const Position& current, istream& is) { if (!file.is_open()) { cerr << "Unable to open file " << fenFile << endl; - exit(EXIT_FAILURE); + return; } while (getline(file, fen)) @@ -109,34 +128,40 @@ void benchmark(const Position& current, istream& is) { file.close(); } - int64_t nodes = 0; + uint64_t nodes = 0; Search::StateStackPtr st; - Time::point t = Time::now(); + Time::point elapsed = Time::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; - } + for (MoveList it(pos); *it; ++it) + { + StateInfo si; + pos.do_move(*it, si); + uint64_t cnt = limits.depth > 1 ? Search::perft(pos, (limits.depth - 1) * ONE_PLY) : 1; + pos.undo_move(*it); + cerr << move_to_uci(*it, pos.is_chess960()) << ": " << cnt << endl; + nodes += cnt; + } else { - Threads.start_searching(pos, limits, vector(), st); - Threads.wait_for_search_finished(); - nodes += Search::RootPosition.nodes_searched(); + Threads.start_thinking(pos, limits, st); + Threads.wait_for_think_finished(); + nodes += Search::RootPos.nodes_searched(); } } - int e = Time::now() - t + 1; // Assure positive to avoid a 'divide by zero' + elapsed = std::max(Time::now() - elapsed, Time::point(1)); // Avoid a 'divide by zero' + + dbg_print(); // Just before to exit cerr << "\n===========================" - << "\nTotal time (ms) : " << e + << "\nTotal time (ms) : " << elapsed << "\nNodes searched : " << nodes - << "\nNodes/second : " << 1000 * nodes / e << endl; + << "\nNodes/second : " << 1000 * nodes / elapsed << endl; }