X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=c9a5933daa25d5c280956acb4e88f6b97767839c;hp=fbf7b0e3a88990004ecbbe5ec54a02ecb20c1290;hb=45e254a0a0d4cbc574e5a65bd4584036b01091b6;hpb=26dabb1e6bcd8035f0f3516c4358a73f2b041a1c

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index fbf7b0e3..c9a5933d 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -2,6 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, 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
@@ -22,11 +23,7 @@
 #include <istream>
 #include <vector>
 
-#include "misc.h"
 #include "position.h"
-#include "search.h"
-#include "thread.h"
-#include "tt.h"
 #include "uci.h"
 
 using namespace std;
@@ -77,23 +74,33 @@ const vector<string> Defaults = {
 
   // 7-man positions
   "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw
+
+  // Mate and stalemate positions
+  "8/8/8/8/8/6k1/6p1/6K1 w - -",
+  "5k2/5P2/5K2/8/8/8/8/8 b - -",
+  "8/8/8/8/8/4k3/4p3/4K3 w - -",
+  "8/8/8/8/8/5K2/8/3Q1k2 b - -",
+  "7k/7P/6K1/8/3B4/8/8/8 b - -"
 };
 
 } // namespace
 
-/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
-/// of positions for a given limit each. There are five parameters: the
-/// transposition table size, the number of search threads that should
-/// be used, the limit value spent for each position (optional, default is
-/// depth 13), an optional file name where to look for positions in FEN
-/// format (defaults are the positions defined above) and the type of the
-/// limit value: depth (default), time in millisecs or number of nodes.
+/// setup_bench() builds a list of UCI commands to be run by bench. There
+/// are five parameters: TT size in MB, number of search threads that
+/// should be used, the limit value spent for each position, a file name
+/// where to look for positions in FEN format and the type of the limit:
+/// depth, perft, nodes and movetime (in millisecs).
+///
+/// bench -> search default positions up to depth 13
+/// bench 64 1 15 -> search default positions up to depth 15 (TT = 64MB)
+/// bench 64 4 5000 current movetime -> search current position with 4 threads for 5 sec
+/// bench 64 1 100000 default nodes -> search default positions for 100K nodes each
+/// bench 16 1 5 default perft -> run a perft 5 on default positions
 
-void benchmark(const Position& current, istream& is) {
+std::vector<string> setup_bench(const Position& current , istream& is) {
 
-  string token;
-  Search::LimitsType limits;
-  vector<string> fens;
+  vector<string> fens, list;
+  string go, token;
 
   // Assign default values to missing arguments
   string ttSize    = (is >> token) ? token : "16";
@@ -102,22 +109,10 @@ void benchmark(const Position& current, istream& is) {
   string fenFile   = (is >> token) ? token : "default";
   string limitType = (is >> token) ? token : "depth";
 
-  Options["Hash"]    = ttSize;
-  Options["Threads"] = threads;
-  TT.clear();
-
-  if (limitType == "time")
-      limits.movetime = stoi(limit); // movetime is in ms
-
-  else if (limitType == "nodes")
-      limits.nodes = stoi(limit);
-
-  else if (limitType == "mate")
-      limits.mate = stoi(limit);
-
-  else
-      limits.depth = stoi(limit);
+  // Build 'go' string (movetime is in millisecs)
+  go = "go " + limitType + " " + limit;
 
+  // Get test positions fens
   if (fenFile == "default")
       fens = Defaults;
 
@@ -132,7 +127,7 @@ void benchmark(const Position& current, istream& is) {
       if (!file.is_open())
       {
           cerr << "Unable to open file " << fenFile << endl;
-          return;
+          exit(EXIT_FAILURE);
       }
 
       while (getline(file, fen))
@@ -142,33 +137,16 @@ void benchmark(const Position& current, istream& is) {
       file.close();
   }
 
-  uint64_t nodes = 0;
-  Search::StateStackPtr st;
-  TimePoint elapsed = now();
+  // Build UCI command list
+  list.emplace_back("ucinewgame");
+  list.emplace_back("setoption name Threads value " + threads);
+  list.emplace_back("setoption name Hash value " + ttSize);
 
-  for (size_t i = 0; i < fens.size(); ++i)
+  for (const string& fen : fens)
   {
-      Position pos(fens[i], Options["UCI_Chess960"], Threads.main());
-
-      cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
-
-      if (limitType == "perft")
-          nodes += Search::perft<true>(pos, limits.depth * ONE_PLY);
-
-      else
-      {
-          Threads.start_thinking(pos, limits, st);
-          Threads.main()->join();
-          nodes += Search::RootPos.nodes_searched();
-      }
+      list.emplace_back("position fen " + fen);
+      list.emplace_back(go);
   }
 
-  elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
-
-  dbg_print(); // Just before to exit
-
-  cerr << "\n==========================="
-       << "\nTotal time (ms) : " << elapsed
-       << "\nNodes searched  : " << nodes
-       << "\nNodes/second    : " << 1000 * nodes / elapsed << endl;
+  return list;
 }