X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=df4978709f1e758a96b5b5aeac22c1e6bc67662b;hp=1d40b8fdb29e64c83b8c58ccfd11416197c4102b;hb=09d01ee9dc16f20962d5f5ffcb61ade56d4fa579;hpb=a49e4fac9839263ef2a3b885a051ec842b1202d9
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 1d40b8fd..df497870 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,26 +17,17 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
#include
-#include
+#include
#include
-#include "benchmark.h"
+#include "position.h"
#include "search.h"
-#include "thread.h"
#include "ucioption.h"
using namespace std;
-////
-//// Variables
-////
-
-const string BenchmarkPositions[] = {
+static const string Defaults[] = {
"rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
"r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq -",
"8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - -",
@@ -51,136 +42,112 @@ 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",
+ ""
};
-////
-//// 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).
+/// 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) {
-
- istringstream csVal(commandLine);
- istringstream csStr(commandLine);
- string ttSize, threads, fileName, limitType, timFile;
- int val, secsPerPos, maxDepth, maxNodes;
-
- 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");
-
- csVal >> val;
- csVal >> fileName;
- csVal >> limitType;
- csVal >> timFile;
-
- secsPerPos = maxDepth = maxNodes = 0;
-
- if (limitType == "time")
- secsPerPos = val * 1000;
- else if (limitType == "depth" || limitType == "perft")
- maxDepth = val;
+void benchmark(int argc, char* argv[]) {
+
+ vector fenList;
+ SearchLimits limits;
+ int64_t totalNodes;
+ int time;
+
+ // Load default positions
+ for (int i = 0; !Defaults[i].empty(); i++)
+ fenList.push_back(Defaults[i]);
+
+ // Assign default values to missing arguments
+ string ttSize = argc > 2 ? argv[2] : "128";
+ string threads = argc > 3 ? argv[3] : "1";
+ string valStr = argc > 4 ? argv[4] : "12";
+ string fenFile = argc > 5 ? argv[5] : "default";
+ string valType = argc > 6 ? argv[6] : "depth";
+
+ Options["Hash"].set_value(ttSize);
+ Options["Threads"].set_value(threads);
+ Options["OwnBook"].set_value("false");
+
+ // Search should be limited by nodes, time or depth ?
+ if (valType == "nodes")
+ limits.maxNodes = atoi(valStr.c_str());
+ else if (valType == "time")
+ limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms
else
- maxNodes = val;
+ limits.maxDepth = atoi(valStr.c_str());
- vector positions;
-
- if (fileName != "default")
+ // Do we need to load positions from a given FEN file ?
+ if (fenFile != "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())
+ string fen;
+ ifstream f(fenFile.c_str());
+
+ if (f.is_open())
{
- 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]));
+ fenList.clear();
- ofstream timingFile;
- if (!timFile.empty())
- {
- timingFile.open(timFile.c_str(), ios::out | ios::app);
- if (!timingFile.is_open())
+ while (getline(f, fen))
+ if (!fen.empty())
+ fenList.push_back(fen);
+
+ f.close();
+ }
+ else
{
- cerr << "Unable to open timing file " << timFile << endl;
- Application::exit_with_failure();
+ cerr << "Unable to open FEN file " << fenFile << endl;
+ exit(EXIT_FAILURE);
}
}
- vector::iterator it;
- int cnt = 1;
- int64_t totalNodes = 0;
- int startTime = get_system_time();
+ // Ok, let's start the benchmark !
+ totalNodes = 0;
+ time = get_system_time();
- for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
+ for (size_t i = 0; i < fenList.size(); i++)
{
- Move moves[1] = {MOVE_NONE};
- int dummy[2] = {0, 0};
- Position pos(*it);
- cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
- if (limitType == "perft")
+ Move moves[] = { MOVE_NONE };
+ Position pos(fenList[i], false, 0);
+
+ cerr << "\nBench position: " << i + 1 << '/' << fenList.size() << endl;
+
+ if (valType == "perft")
{
- int64_t perftCnt = perft(pos, maxDepth * OnePly);
- cerr << "\nPerft " << maxDepth << " result (nodes searched): " << perftCnt << endl << endl;
- totalNodes += perftCnt;
- } else {
- if (!think(pos, false, false, 0, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
+ int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY);
+ totalNodes += cnt;
+
+ cerr << "\nPerft " << limits.maxDepth << " nodes counted: " << cnt << endl;
+ }
+ else
+ {
+ if (!think(pos, limits, moves))
break;
- totalNodes += nodes_searched();
+
+ totalNodes += pos.nodes_searched();
}
}
- cnt = get_system_time() - startTime;
- cerr << "==============================="
- << "\nTotal time (ms) : " << cnt
- << "\nNodes searched : " << totalNodes
- << "\nNodes/second : " << (int)(totalNodes/(cnt/1000.0)) << endl << endl;
+ time = get_system_time() - time;
- if (!timFile.empty())
- {
- timingFile << cnt << endl << endl;
- timingFile.close();
- }
+ cerr << "\n==============================="
+ << "\nTotal time (ms) : " << time
+ << "\nNodes searched : " << totalNodes
+ << "\nNodes/second : " << (int)(totalNodes / (time / 1000.0)) << endl << endl;
- // Under MS Visual C++ debug window always unconditionally closes
- // when program exits, this is bad because we want to read results before.
+ // 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;
+ cin >> time;
#endif
}