X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=0598973a42aef60a7e864d0a8f6cff29793a2b0c;hp=4c2ba7472703a3c88979678c30a78361d8b51e76;hb=cff3a6d33e50d37322ffae511ddbe4c7e846505e;hpb=18677852315b960132b0e8daa220c83b1c3c17cd

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 4c2ba747..0598973a 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -71,8 +71,8 @@ void benchmark(const std::string& commandLine) {
 
   std::istringstream csVal(commandLine);
   std::istringstream csStr(commandLine);
-  std::string ttSize, threads, fileName, timeOrDepth;
-  int val, secsPerPos, maxDepth = 0;
+  std::string ttSize, threads, fileName, limitType;
+  int val, secsPerPos, maxDepth, maxNodes;
 
   csStr >> ttSize;
   csVal >> val;
@@ -95,17 +95,18 @@ void benchmark(const std::string& commandLine) {
   set_option_value("Use Search Log", "true");
   set_option_value("Search Log Filename", "bench.txt");
 
-  csVal >> secsPerPos;
+  csVal >> val;
   csVal >> fileName;
-  csVal >> timeOrDepth;
+  csVal >> limitType;
+
+  secsPerPos = maxDepth = maxNodes = 0;
 
-  if (timeOrDepth == "time")
-      secsPerPos *= 1000;
+  if (limitType == "time")
+      secsPerPos = val * 1000;
+  else if (limitType == "depth")
+      maxDepth = val;
   else
-  {
-      maxDepth = secsPerPos;
-      secsPerPos = 0;
-  }
+      maxNodes = val;
 
   std::vector<std::string> positions;
   
@@ -133,15 +134,18 @@ void benchmark(const std::string& commandLine) {
   int startTime = get_system_time();
   std::vector<std::string>::iterator it;
   int cnt = 1;
+  int64_t totalNodes = 0;
   for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
   {
       Move moves[1] = {MOVE_NONE};
       int dummy[2] = {0, 0};
       Position pos(*it);
       std::cout << "\nProcessing position " << cnt << '/' << positions.size() << std::endl << std::endl;
-      think(pos, true, false, 0, dummy, dummy, 0, maxDepth, 0, secsPerPos, moves);
+      think(pos, true, false, 0, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves);
+      totalNodes += nodes_searched();
   }
-  std::cout << "\n\nBenchmarking finished. Processing time (ms) " << get_system_time() - startTime
-            << std::endl << "Press any key to exit\n";
+  std::cout << "\nProcessing time (ms) " << get_system_time() - startTime << std::endl
+            << "Nodes searched " << totalNodes << std::endl
+            << "Press any key to exit" << std::endl;
   std::cin >> fileName;
 }