Rework Thread hierarchy

[stockfish] / src / benchmark.cpp

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index c31609bbf090589f05fe5356813cc7e39444b100..f22ea6dada5d2ca7246039d45454c9e5e7e01a63 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,13 +19,14 @@
 
 #include <fstream>
 #include <iostream>
-#include <sstream>
+#include <istream>
 #include <vector>
 
 #include "misc.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
+#include "tt.h"
 #include "ucioption.h"
 
 using namespace std;
@@ -58,14 +59,14 @@ 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.
 
-void benchmark(istringstream& is) {
+void benchmark(const Position& current, istream& is) {
 
   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";
+  string ttSize    = (is >> token) ? token : "32";
   string threads   = (is >> token) ? token : "1";
   string limit     = (is >> token) ? token : "12";
   string fenFile   = (is >> token) ? token : "default";
@@ -73,6 +74,7 @@ void benchmark(istringstream& is) {
 
   Options["Hash"]    = ttSize;
   Options["Threads"] = threads;
+  TT.clear();
 
   if (limitType == "time")
       limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
@@ -80,10 +82,19 @@ void benchmark(istringstream& is) {
   else if (limitType == "nodes")
       limits.nodes = atoi(limit.c_str());
 
+  else if (limitType == "mate")
+      limits.mate = atoi(limit.c_str());
+
   else
       limits.depth = atoi(limit.c_str());
 
-  if (fenFile != "default")
+  if (fenFile == "default")
+      fens.assign(Defaults, Defaults + 16);
+
+  else if (fenFile == "current")
+      fens.push_back(current.fen());
+
+  else
   {
       string fen;
       ifstream file(fenFile.c_str());
@@ -91,7 +102,7 @@ void benchmark(istringstream& is) {
       if (!file.is_open())
       {
           cerr << "Unable to open file " << fenFile << endl;
-          exit(EXIT_FAILURE);
+          return;
       }
 
       while (getline(file, fen))
@@ -102,32 +113,33 @@ void benchmark(istringstream& is) {
   }
 
   int64_t nodes = 0;
-  Time time = Time::current_time();
+  Search::StateStackPtr st;
+  Time::point elapsed = Time::now();
 
   for (size_t i = 0; i < fens.size(); i++)
   {
-      Position pos(fens[i], false, 0);
+      Position pos(fens[i], Options["UCI_Chess960"], Threads.main());
 
       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.wait_for_search_finished();
-          nodes += Search::RootPosition.nodes_searched();
+          Threads.start_thinking(pos, limits, vector<Move>(), st);
+          Threads.wait_for_think_finished();
+          nodes += Search::RootPos.nodes_searched();
       }
   }
 
-  int e = time.elapsed();
+  elapsed = Time::now() - elapsed + 1; // Assure positive to avoid a 'divide by zero'
 
   cerr << "\n==========================="
-       << "\nTotal time (ms) : " << e
+       << "\nTotal time (ms) : " << elapsed
        << "\nNodes searched  : " << nodes
-       << "\nNodes/second    : " << int(nodes / (e / 1000.0)) << endl;
+       << "\nNodes/second    : " << 1000 * nodes / elapsed << endl;
 }