X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=76a85a8ccc795a78d70dccd1194b026d49307ef2;hp=5b27284fe897c9e27b45c67442a5109744425cf2;hb=535f70088e6fbf19f4775490edab050006734814;hpb=190aea4cdc6e8e165028803be846563da53f9330
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 5b27284f..76a85a8c 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-2013 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"
@@ -69,7 +71,7 @@ static const char* Defaults[] = {
/// 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.
@@ -126,7 +128,7 @@ void benchmark(const Position& current, istream& is) {
file.close();
}
- int64_t nodes = 0;
+ uint64_t nodes = 0;
Search::StateStackPtr st;
Time::point elapsed = Time::now();
@@ -137,20 +139,26 @@ void benchmark(const Position& current, istream& is) {
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_thinking(pos, limits, vector(), st);
+ Threads.start_thinking(pos, limits, st);
Threads.wait_for_think_finished();
nodes += Search::RootPos.nodes_searched();
}
}
- elapsed = Time::now() - elapsed + 1; // Ensure positivity 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) : " << elapsed