X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=de8b48bb4c039f480f45f5e6339b19192b8ab70b;hp=7ca4b59e0ff13e7112228cd27d236c42bdc0d9cb;hb=6044f25d7104c25e0218831027eade75e092ed0c;hpb=a646f74e6a62af756b2e51756a81ee983db4ff34
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 7ca4b59e..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";
@@ -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