X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=9cf04532d59f61584ce23bf5caeff5e90f731036;hp=a4d2939fd8cf1fc1a50c27a692b371bcd35706f8;hb=1d368bbbdc50bbb4e10933c4986abc07a08010fd;hpb=fad595f5b6b343708fc0b4d8ab15ab73040f84c1

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index a4d2939f..9cf04532 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -22,7 +22,7 @@
 //// Includes
 ////
 #include <fstream>
-#include <sstream>
+#include <iostream>
 #include <vector>
 
 #include "search.h"
@@ -51,7 +51,8 @@ static const string BenchmarkPositions[] = {
   "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22",
   "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18",
   "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22",
-  "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26"
+  "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26",
+  ""
 };
 
 
@@ -60,21 +61,25 @@ static const string BenchmarkPositions[] = {
 ////
 
 /// benchmark() runs a simple benchmark by letting Stockfish analyze a set
-/// of positions for a given time each.  There are four parameters; the
+/// 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 time in seconds spent for each position (optional, default
-/// is 60) and an optional file name where to look for positions in fen
-/// format (default are the BenchmarkPositions defined above).
+/// be used, the limit value spent for each position (optional, default
+/// is ply 12), an optional file name where to look for positions in fen
+/// format (default are the BenchmarkPositions defined above) and the type
+/// of the limit value: depth (default), time in secs or number of nodes.
 /// The analysis is written to a file named bench.txt.
 
-void benchmark(const string& commandLine) {
+void benchmark(int argc, char* argv[]) {
 
-  istringstream csStr(commandLine);
   vector<string> positions;
-  string ttSize, threads, limit, posFile, limitType;
-  int val, secsPerPos, maxDepth, maxNodes;
+  string ttSize, threads, valStr, posFile, valType;
+  int val, maxTime, maxDepth, maxNodes;
 
-  csStr >> ttSize >> threads >> limit >> posFile >> limitType;
+  ttSize  = argc > 2 ? argv[2] : "128";
+  threads = argc > 3 ? argv[3] : "1";
+  valStr  = argc > 4 ? argv[4] : "12";
+  posFile = argc > 5 ? argv[5] : "default";
+  valType = argc > 6 ? argv[6] : "depth";
 
   Options["Hash"].set_value(ttSize);
   Options["Threads"].set_value(threads);
@@ -82,13 +87,13 @@ void benchmark(const string& commandLine) {
   Options["Use Search Log"].set_value("true");
   Options["Search Log Filename"].set_value("bench.txt");
 
-  secsPerPos = maxDepth = maxNodes = 0;
-  val = atoi(limit.c_str());
+  maxTime = maxDepth = maxNodes = 0;
+  val = atoi(valStr.c_str());
 
-  if (limitType == "depth" || limitType == "perft")
+  if (valType == "depth" || valType == "perft")
       maxDepth = val;
-  else if (limitType == "time")
-      secsPerPos = val * 1000;
+  else if (valType == "time")
+      maxTime = val * 1000;
   else
       maxNodes = val;
 
@@ -98,7 +103,7 @@ void benchmark(const string& commandLine) {
       if (!fenFile.is_open())
       {
           cerr << "Unable to open positions file " << posFile << endl;
-          Application::exit_with_failure();
+          exit(EXIT_FAILURE);
       }
       string pos;
       while (fenFile.good())
@@ -109,8 +114,8 @@ void benchmark(const string& commandLine) {
       }
       fenFile.close();
   } else
-      for (int i = 0; i < 16; i++)
-          positions.push_back(string(BenchmarkPositions[i]));
+      for (int i = 0; !BenchmarkPositions[i].empty(); i++)
+          positions.push_back(BenchmarkPositions[i]);
 
   vector<string>::iterator it;
   int cnt = 1;
@@ -119,17 +124,16 @@ void benchmark(const string& commandLine) {
 
   for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
   {
-      Move moves[1] = { MOVE_NONE };
-      int dummy[2] = { 0, 0 };
-      Position pos(*it, 0);
+      Move moves[] = { MOVE_NONE };
+      Position pos(*it, false, 0);
       cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
-      if (limitType == "perft")
+      if (valType == "perft")
       {
           int64_t perftCnt = perft(pos, maxDepth * ONE_PLY);
           cerr << "\nPerft " << maxDepth << " result (nodes searched): " << perftCnt << endl << endl;
           totalNodes += perftCnt;
       } else {
-          if (!think(pos, false, false, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
+          if (!think(pos, SearchLimits(0, 0, 0, maxTime, maxDepth, maxNodes, false, false), moves))
               break;
           totalNodes += pos.nodes_searched();
       }