X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=69bfc6c633a11219282645923d202f27ec05528c;hp=7ca4b59e0ff13e7112228cd27d236c42bdc0d9cb;hb=29451de8749ac5c2ed8573ccaeb359a72b8c00c9;hpb=a646f74e6a62af756b2e51756a81ee983db4ff34

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 7ca4b59e..69bfc6c6 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,12 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <istream>
 #include <vector>
 
 #include "misc.h"
+#include "notation.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
@@ -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();
 
@@ -136,21 +138,33 @@ void benchmark(const Position& current, istream& is) {
 
       cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
 
-      if (limitType == "perft")
+      if (limitType == "divide")
+          for (MoveList<LEGAL> 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 if (limitType == "perft")
       {
-          size_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
+          uint64_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
           cerr << "\nPerft " << limits.depth  << " leaf nodes: " << cnt << endl;
           nodes += cnt;
       }
       else
       {
-          Threads.start_thinking(pos, limits, vector<Move>(), 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