Use bench to implement UI 'perft' command

Now that we can call bench on current position
we can directly use it to perform our perft.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 0417313cbb6bf3ac22ba5733cd77bda68fc3212f..5d8757a61f49dd7214e48038746f0c93cdfe6ffd 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -19,7 +19,7 @@
 
 #include <fstream>
 #include <iostream>
 
 #include <fstream>
 #include <iostream>

-#include <sstream>
+#include <istream>

 #include <vector>
 
 #include "misc.h"
 #include <vector>
 
 #include "misc.h"


@@ -58,11 +58,11 @@ static const char* Defaults[] = {
 /// format (defaults are the positions defined above) and the type of the
 /// limit value: depth (default), time in secs or number of nodes.
 
 /// format (defaults are the positions defined above) and the type of the
 /// limit value: depth (default), time in secs or number of nodes.
 

-void benchmark(istringstream& is) {
+void benchmark(const Position& current, istream& is) {

 
   string token;
   Search::LimitsType limits;
 
   string token;
   Search::LimitsType limits;

-  vector<string> fens(Defaults, Defaults + 16);
+  vector<string> fens;

 
   // Assign default values to missing arguments
   string ttSize    = (is >> token) ? token : "128";
 
   // Assign default values to missing arguments
   string ttSize    = (is >> token) ? token : "128";


@@ -83,14 +83,14 @@ void benchmark(istringstream& is) {
   else
       limits.depth = atoi(limit.c_str());
 
   else
       limits.depth = atoi(limit.c_str());
 

-  if (fenFile == "current")
-  {
-      fens.clear();
-      fens.push_back(Search::RootPosition.to_fen());
-  }
-  else if (fenFile != "default")
+  if (fenFile == "default")
+      fens.assign(Defaults, Defaults + 16);
+
+  else if (fenFile == "current")
+      fens.push_back(current.to_fen());
+
+  else

   {
   {

-      fens.clear();

       string fen;
       ifstream file(fenFile.c_str());
 
       string fen;
       ifstream file(fenFile.c_str());
 

diff --git a/src/uci.cpp b/src/uci.cpp
index 96aae854311245558d678b163ce25107ccce6aa9..0ba4de3bddeb3cb9dd8c87eab097ed0a41afe00c 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "evaluate.h"
 #include <string>
 
 #include "evaluate.h"

-#include "misc.h"

 #include "position.h"
 #include "search.h"
 #include "thread.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"


@@ -30,7 +29,7 @@
 
 using namespace std;
 
 
 using namespace std;
 

-extern void benchmark(istringstream& is);
+extern void benchmark(const Position& pos, istream& is);

 
 namespace {
 
 
 namespace {
 


@@ -45,7 +44,6 @@ namespace {
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
   void go(Position& pos, istringstream& up);
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
   void go(Position& pos, istringstream& up);

-  void perft(Position& pos, istringstream& up);

 }
 
 
 }
 
 


@@ -59,8 +57,6 @@ void uci_loop(const string& args) {
   Position pos(StartFEN, false, Threads.main_thread()); // The root position
   string cmd, token;
 
   Position pos(StartFEN, false, Threads.main_thread()); // The root position
   string cmd, token;
 

-  Search::RootPosition = pos;
-

   while (token != "quit")
   {
       if (!args.empty())
   while (token != "quit")
   {
       if (!args.empty())


@@ -108,9 +104,6 @@ void uci_loop(const string& args) {
       else if (token == "setoption")
           set_option(is);
 
       else if (token == "setoption")
           set_option(is);
 

-      else if (token == "perft")
-          perft(pos, is);
-

       else if (token == "d")
           pos.print();
 
       else if (token == "d")
           pos.print();
 


@@ -121,7 +114,7 @@ void uci_loop(const string& args) {
           cout << Eval::trace(pos) << endl;
 
       else if (token == "bench")
           cout << Eval::trace(pos) << endl;
 
       else if (token == "bench")

-          benchmark(is);
+          benchmark(pos, is);

 
       else if (token == "key")
           cout << "key: " << hex     << pos.key()
 
       else if (token == "key")
           cout << "key: " << hex     << pos.key()


@@ -132,6 +125,17 @@ void uci_loop(const string& args) {
           cout << "id name "     << engine_info(true)
                << "\n"           << Options
                << "\nuciok"      << endl;
           cout << "id name "     << engine_info(true)
                << "\n"           << Options
                << "\nuciok"      << endl;

+
+      else if (token == "perft" && (is >> token)) // Read depth
+      {
+          stringstream ss;
+
+          ss << Options["Hash"]    << " "
+             << Options["Threads"] << " " << token << " current perft";
+
+          benchmark(pos, ss);
+      }
+

       else
           cout << "Unknown command: " << cmd << endl;
 
       else
           cout << "Unknown command: " << cmd << endl;
 


@@ -246,27 +250,4 @@ namespace {
 
     Threads.start_searching(pos, limits, searchMoves);
   }
 
     Threads.start_searching(pos, limits, searchMoves);
   }

-
-
-  // perft() is called when engine receives the "perft" command. The function
-  // calls perft() with the required search depth then prints counted leaf nodes
-  // and elapsed time.
-
-  void perft(Position& pos, istringstream& is) {
-
-    int depth;
-
-    if (!(is >> depth))
-        return;
-
-    Time time = Time::current_time();
-
-    int64_t n = Search::perft(pos, depth * ONE_PLY);
-
-    int e = time.elapsed();
-
-    cout << "\nNodes " << n
-         << "\nTime (ms) " << e
-         << "\nNodes/second " << int(n / (e / 1000.0)) << endl;
-  }

 }
 }