X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=6cda0742257cec384bab48a109f20c73b73c9aee;hp=766b769873528d09d22720296a2e10aad89321e1;hb=5cbcff55cc3a2ff78dd83e7a3f94c5414946f82c;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 766b7698..6cda0742 100644
--- 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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
@@ -17,29 +17,26 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
+#include
#include
-#include
+#include
+#include
#include
-#include "benchmark.h"
+#include "misc.h"
+#include "notation.h"
+#include "position.h"
#include "search.h"
#include "thread.h"
-#include "ucioption.h"
+#include "tt.h"
+#include "uci.h"
using namespace std;
-////
-//// Variables
-////
-
-const string BenchmarkPositions[] = {
+static const char* Defaults[] = {
"rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
- "r4rk1/1b2qppp/p1n1p3/1p6/1b1PN3/3BRN2/PP3PPP/R2Q2K1 b - - 7 16",
- "4r1k1/ppq3pp/3b4/2pP4/2Q1p3/4B1P1/PP5P/R5K1 b - - 0 20",
+ "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",
"r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14",
@@ -51,131 +48,113 @@ const string BenchmarkPositions[] = {
"r1bq1r1k/b1p1npp1/p2p3p/1p6/3PP3/1B2NN2/PP3PPP/R2Q1RK1 w - - 1 16",
"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"
+ "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",
+ "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",
+ "8/3p4/p1bk3p/Pp6/1Kp1PpPp/2P2P1P/2P5/5B2 b - - 0 1",
+ "5k2/7R/4P2p/5K2/p1r2P1p/8/8/8 b - - 0 1",
+ "6k1/6p1/P6p/r1N5/5p2/7P/1b3PP1/4R1K1 w - - 0 1",
+ "1r3k2/4q3/2Pp3b/3Bp3/2Q2p2/1p1P2P1/1P2KP2/3N4 w - - 0 1",
+ "6k1/4pp1p/3p2p1/P1pPb3/R7/1r2P1PP/3B1P2/6K1 w - - 0 1",
+ "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1"
};
-////
-//// Functions
-////
-
/// 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).
-/// The analysis is written to a file named bench.txt.
-
-void benchmark(const string& commandLine) {
+/// 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 secs or number of nodes.
- istringstream csVal(commandLine);
- istringstream csStr(commandLine);
- string ttSize, threads, fileName, limitType, timFile;
- int val, secsPerPos, maxDepth, maxNodes;
+void benchmark(const Position& current, istream& is) {
- csStr >> ttSize;
- csVal >> val;
- if (val < 4 || val > 1024)
- {
- cerr << "The hash table size must be between 4 and 1024" << endl;
- Application::exit_with_failure();
- }
- csStr >> threads;
- csVal >> val;
- if (val < 1 || val > MAX_THREADS)
- {
- cerr << "The number of threads must be between 1 and " << MAX_THREADS << endl;
- Application::exit_with_failure();
- }
- set_option_value("Hash", ttSize);
- set_option_value("Threads", threads);
- set_option_value("OwnBook", "false");
- set_option_value("Use Search Log", "true");
- set_option_value("Search Log Filename", "bench.txt");
+ string token;
+ Search::LimitsType limits;
+ vector fens;
- csVal >> val;
- csVal >> fileName;
- csVal >> limitType;
- csVal >> timFile;
+ // 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";
- secsPerPos = maxDepth = maxNodes = 0;
+ Options["Hash"] = ttSize;
+ Options["Threads"] = threads;
+ TT.clear();
if (limitType == "time")
- secsPerPos = val * 1000;
- else if (limitType == "depth" || limitType == "perft")
- maxDepth = val;
+ limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
+
+ else if (limitType == "nodes")
+ limits.nodes = atoi(limit.c_str());
+
+ else if (limitType == "mate")
+ limits.mate = atoi(limit.c_str());
+
else
- maxNodes = val;
+ limits.depth = atoi(limit.c_str());
- vector positions;
+ if (fenFile == "default")
+ fens.assign(Defaults, Defaults + 30);
- if (fileName != "default")
- {
- ifstream fenFile(fileName.c_str());
- if (!fenFile.is_open())
- {
- cerr << "Unable to open positions file " << fileName << endl;
- Application::exit_with_failure();
- }
- string pos;
- while (fenFile.good())
- {
- getline(fenFile, pos);
- if (!pos.empty())
- positions.push_back(pos);
- }
- fenFile.close();
- } else
- for (int i = 0; i < 16; i++)
- positions.push_back(string(BenchmarkPositions[i]));
+ else if (fenFile == "current")
+ fens.push_back(current.fen());
- ofstream timingFile;
- if (!timFile.empty())
+ else
{
- timingFile.open(timFile.c_str(), ios::out | ios::app);
- if (!timingFile.is_open())
+ string fen;
+ ifstream file(fenFile.c_str());
+
+ if (!file.is_open())
{
- cerr << "Unable to open timing file " << timFile << endl;
- Application::exit_with_failure();
+ cerr << "Unable to open file " << fenFile << endl;
+ return;
}
+
+ while (getline(file, fen))
+ if (!fen.empty())
+ fens.push_back(fen);
+
+ file.close();
}
- vector::iterator it;
- int cnt = 1;
- int64_t totalNodes = 0;
- int startTime = get_system_time();
+ uint64_t nodes = 0;
+ Search::StateStackPtr st;
+ Time::point elapsed = Time::now();
- for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
+ for (size_t i = 0; i < fens.size(); ++i)
{
- Move moves[1] = {MOVE_NONE};
- int dummy[2] = {0, 0};
- Position pos(*it);
- cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
+ Position pos(fens[i], Options["UCI_Chess960"], Threads.main());
+
+ cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
+
if (limitType == "perft")
- totalNodes += perft(pos, maxDepth * OnePly);
- else if (!think(pos, false, false, 0, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
- break;
- totalNodes += nodes_searched();
+ nodes += Search::perft(pos, limits.depth * ONE_PLY);
+
+ else
+ {
+ Threads.start_thinking(pos, limits, st);
+ Threads.wait_for_think_finished();
+ nodes += Search::RootPos.nodes_searched();
+ }
}
- cnt = get_system_time() - startTime;
- cerr << "==============================="
- << "\nTotal time (ms) : " << cnt
- << "\nNodes searched : " << totalNodes
- << "\nNodes/second : " << (int)(totalNodes/(cnt/1000.0)) << endl << endl;
+ elapsed = std::max(Time::now() - elapsed, Time::point(1)); // Avoid a 'divide by zero'
- if (!timFile.empty())
- {
- timingFile << cnt << endl << endl;
- timingFile.close();
- }
+ dbg_print(); // Just before to exit
- // Under MS Visual C++ debug window always unconditionally closes
- // when program exits, this is bad because we want to read results before.
- #if (defined(WINDOWS) || defined(WIN32) || defined(WIN64))
- cerr << "Press any key to exit" << endl;
- cin >> fileName;
- #endif
+ cerr << "\n==========================="
+ << "\nTotal time (ms) : " << elapsed
+ << "\nNodes searched : " << nodes
+ << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
}