WebSVN – Games.Chess Giants – Diff – //engine-stockfish/benchmark.cpp

   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2015-2018 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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 #include <fstream>
 #include <iostream>
 #include <istream>
 #include <vector>
-#include "misc.h"
 #include "position.h"
-#include "search.h"
-#include "thread.h"
-#include "uci.h"
 using namespace std;
 namespace {
 const vector<string> Defaults = {
+  "setoption name UCI_Chess960 value false",
   "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
   "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10",
   "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11",
   "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19",
-  "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14",
+  "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14 moves d4e6",
-  "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14",
+  "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14 moves g2g4",
   "r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15",
   "r1bbk1nr/pp3p1p/2n5/1N4p1/2Np1B2/8/PPP2PPP/2KR1B1R w kq - 0 13",
   "r1bq1rk1/ppp1nppp/4n3/3p3Q/3P4/1BP1B3/PP1N2PP/R4RK1 w - - 1 16",
   "4r1k1/r1q2ppp/ppp2n2/4P3/5Rb1/1N1BQ3/PPP3PP/R5K1 w - - 1 17",
   "2rqkb1r/ppp2p2/2npb1p1/1N1Nn2p/2P1PP2/8/PP2B1PP/R1BQK2R b KQ - 0 11",
   "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",
   "6k1/6p1/6Pp/ppp5/3pn2P/1P3K2/1PP2P2/3N4 b - - 0 1",
   "3b4/5kp1/1p1p1p1p/pP1PpP1P/P1P1P3/3KN3/8/8 w - - 0 1",
-  "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1",
+  "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1 moves g5g6 f3e3 g6g5 e3f3",
   "8/6pk/1p6/8/PP3p1p/5P2/4KP1q/3Q4 w - - 0 1",
   "7k/3p2pp/4q3/8/4Q3/5Kp1/P6b/8 w - - 0 1",
   "8/2p5/8/2kPKp1p/2p4P/2P5/3P4/8 w - - 0 1",
   "8/1p3pp1/7p/5P1P/2k3P1/8/2K2P2/8 w - - 0 1",
   "8/pp2r1k1/2p1p3/3pP2p/1P1P1P1P/P5KR/8/8 w - - 0 1",
   // 7-man positions
   "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw
   // Mate and stalemate positions
+  "6k1/3b3r/1p1p4/p1n2p2/1PPNpP1q/P3Q1p1/1R1RB1P1/5K2 b - - 0 1",
+  "r2r1n2/pp2bk2/2p1p2p/3q4/3PN1QP/2P3R1/P4PP1/5RK1 w - - 0 1",
   "8/8/8/8/8/6k1/6p1/6K1 w - -",
-  "5k2/5P2/5K2/8/8/8/8/8 b - -",
+  "7k/7P/6K1/8/3B4/8/8/8 b - -",
-  "8/8/8/8/8/4k3/4p3/4K3 w - -",
+  // Chess 960
-  "8/8/8/8/8/5K2/8/3Q1k2 b - -",
+  "setoption name UCI_Chess960 value true",
+  "bbqnnrkr/pppppppp/8/8/8/8/PPPPPPPP/BBQNNRKR w KQkq - 0 1 moves g2g3 d7d5 d2d4 c8h3 c1g5 e8d6 g5e7 f7f6",
-  "7k/7P/6K1/8/3B4/8/8/8 b - -"
+  "setoption name UCI_Chess960 value false"
 };
 } // namespace
-/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
+/// 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
-/// of positions for a given limit each. There are five parameters: the
+/// should be used, the limit value spent for each position, a file name
-/// transposition table size, the number of search threads that should
+/// where to look for positions in FEN format and the type of the limit:
+/// depth, perft, nodes and movetime (in millisecs).
+///
-/// be used, the limit value spent for each position (optional, default is
+/// bench -> search default positions up to depth 13
+/// bench 64 1 15 -> search default positions up to depth 15 (TT = 64MB)
-/// depth 13), an optional file name where to look for positions in FEN
+/// bench 64 4 5000 current movetime -> search current position with 4 threads for 5 sec
-/// format (defaults are the positions defined above) and the type of the
+/// bench 64 1 100000 default nodes -> search default positions for 100K nodes each
-/// limit value: depth (default), time in millisecs or number of nodes.
+/// bench 16 1 5 default perft -> run a perft 5 on default positions
-void benchmark(const Position& current, istream& is) {
+vector<string> setup_bench(const Position& current, istream& is) {
-  string token;
-  vector<string> fens;
+  vector<string> fens, list;
-  Search::LimitsType limits;
+  string go, token;
   // Assign default values to missing arguments
   string ttSize    = (is >> token) ? token : "16";
   string threads   = (is >> token) ? token : "1";
   string limit     = (is >> token) ? token : "13";
   string fenFile   = (is >> token) ? token : "default";
   string limitType = (is >> token) ? token : "depth";
-  Options["Hash"]    = ttSize;
-  Options["Threads"] = threads;
-  Search::clear();
-  if (limitType == "time")
-      limits.movetime = stoi(limit); // movetime is in millisecs
-  else if (limitType == "nodes")
-      limits.nodes = stoi(limit);
-  else if (limitType == "mate")
-      limits.mate = stoi(limit);
-  else
-      limits.depth = stoi(limit);
+  go = "go " + limitType + " " + limit;
   if (fenFile == "default")
       fens = Defaults;
   else if (fenFile == "current")
       ifstream file(fenFile);
       if (!file.is_open())
+      {
           cerr << "Unable to open file " << fenFile << endl;
-          return;
+          exit(EXIT_FAILURE);
+      }
       while (getline(file, fen))
           if (!fen.empty())
               fens.push_back(fen);
       file.close();
+  }
-  uint64_t nodes = 0;
-  TimePoint elapsed = now();
+  list.emplace_back("ucinewgame");
-  Position pos;
-  for (size_t i = 0; i < fens.size(); ++i)
-  {
-      StateListPtr states(new std::deque<StateInfo>(1));
+  list.emplace_back("setoption name Threads value " + threads);
-      pos.set(fens[i], Options["UCI_Chess960"], &states->back(), Threads.main());
-      cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
+  list.emplace_back("setoption name Hash value " + ttSize);
-      if (limitType == "perft")
-          nodes += Search::perft(pos, limits.depth * ONE_PLY);
+  for (const string& fen : fens)
+      if (fen.find("setoption") != string::npos)
+          list.emplace_back(fen);
       else
+      {
-          limits.startTime = now();
-          Threads.start_thinking(pos, states, limits);
+          list.emplace_back("position fen " + fen);
-          Threads.main()->wait_for_search_finished();
-          nodes += Threads.nodes_searched();
+          list.emplace_back(go);
+      }
-  }
-  elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
-  dbg_print(); // Just before exiting
-  cerr << "\n==========================="
-       << "\nTotal time (ms) : " << elapsed
+  return list;
-       << "\nNodes searched  : " << nodes
-       << "\nNodes/second    : " << 1000 * nodes / elapsed << endl;
+}

Subversion Repositories Games.Chess Giants

Games.Chess Giants//engine-stockfish/benchmark.cpp – Rev 154 → 169