X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=f59ded730d6f3f6f0751a568a7f55e476927994e;hb=b50ce5ebfbc9f8b043f0d915c47b0ac550d4affc;hp=5d8757a61f49dd7214e48038746f0c93cdfe6ffd;hpb=9546b79e204faef2e2759b481b09a97bdab0fb76;p=stockfish

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 5d8757a6..f59ded73 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -26,6 +26,7 @@
 #include "position.h"
 #include "search.h"
 #include "thread.h"
+#include "tt.h"
 #include "ucioption.h"
 
 using namespace std;
@@ -73,6 +74,7 @@ void benchmark(const Position& current, istream& is) {
 
   Options["Hash"]    = ttSize;
   Options["Threads"] = threads;
+  TT.clear();
 
   if (limitType == "time")
       limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
@@ -108,32 +110,33 @@ void benchmark(const Position& current, istream& is) {
   }
 
   int64_t nodes = 0;
-  Time time = Time::current_time();
+  Search::StateStackPtr st;
+  Time::point t = Time::now();
 
   for (size_t i = 0; i < fens.size(); i++)
   {
-      Position pos(fens[i], false, Threads.main_thread());
+      Position pos(fens[i], Options["UCI_Chess960"], Threads.main_thread());
 
       cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
 
       if (limitType == "perft")
       {
-          int64_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
+          size_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
           cerr << "\nPerft " << limits.depth  << " leaf nodes: " << cnt << endl;
           nodes += cnt;
       }
       else
       {
-          Threads.start_searching(pos, limits, vector<Move>());
+          Threads.start_searching(pos, limits, vector<Move>(), st);
           Threads.wait_for_search_finished();
           nodes += Search::RootPosition.nodes_searched();
       }
   }
 
-  int e = time.elapsed();
+  int e = Time::now() - t + 1; // Assure positive to avoid a 'divide by zero'
 
   cerr << "\n==========================="
        << "\nTotal time (ms) : " << e
        << "\nNodes searched  : " << nodes
-       << "\nNodes/second    : " << int(nodes / (e / 1000.0)) << endl;
+       << "\nNodes/second    : " << 1000 * nodes / e << endl;
 }