X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=de8b48bb4c039f480f45f5e6339b19192b8ab70b;hb=6044f25d7104c25e0218831027eade75e092ed0c;hp=63a9d84c7eaf5369d873df9d0dbded8f18df49e0;hpb=41641e3b1eea0038ab6984766d2b3bca869be7fa;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 63a9d84c..de8b48bb 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -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"
@@ -80,7 +82,7 @@ void benchmark(const Position& current, istream& is) {
vector fens;
// 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";
@@ -137,11 +139,15 @@ void benchmark(const Position& current, istream& is) {
cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
if (limitType == "perft")
- {
- uint64_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, st);
@@ -150,7 +156,9 @@ void benchmark(const Position& current, istream& is) {
}
}
- 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