X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=df4978709f1e758a96b5b5aeac22c1e6bc67662b;hb=bc4f3155ae3937d32a3ebaae77ee4f7be355aa60;hp=33c1a1a9982c061ae5672eeaa4d3245322498696;hpb=fa80479b1db2ba1d99dfc983f017759ecf160aab;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 33c1a1a9..df497870 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,24 +17,17 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
#include
+#include
#include
+#include "position.h"
#include "search.h"
-#include "thread.h"
#include "ucioption.h"
using namespace std;
-////
-//// Variables
-////
-
-static 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 - -",
@@ -55,10 +48,6 @@ static const string BenchmarkPositions[] = {
};
-////
-//// Functions
-////
-
/// 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
@@ -70,85 +59,95 @@ static const string BenchmarkPositions[] = {
void benchmark(int argc, char* argv[]) {
- vector positions;
- string ttSize, threads, valStr, posFile, valType;
- int val, secsPerPos, maxDepth, maxNodes;
+ 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]);
- 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";
+ // 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");
- Options["Use Search Log"].set_value("true");
- Options["Search Log Filename"].set_value("bench.txt");
- secsPerPos = maxDepth = maxNodes = 0;
- val = atoi(valStr.c_str());
-
- if (valType == "depth" || valType == "perft")
- maxDepth = val;
+ // Search should be limited by nodes, time or depth ?
+ if (valType == "nodes")
+ limits.maxNodes = atoi(valStr.c_str());
else if (valType == "time")
- secsPerPos = val * 1000;
+ limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms
else
- maxNodes = val;
+ limits.maxDepth = atoi(valStr.c_str());
- if (posFile != "default")
+ // Do we need to load positions from a given FEN file ?
+ if (fenFile != "default")
{
- ifstream fenFile(posFile.c_str());
- if (!fenFile.is_open())
+ string fen;
+ ifstream f(fenFile.c_str());
+
+ if (f.is_open())
{
- cerr << "Unable to open positions file " << posFile << endl;
- Application::exit_with_failure();
+ fenList.clear();
+
+ while (getline(f, fen))
+ if (!fen.empty())
+ fenList.push_back(fen);
+
+ f.close();
}
- string pos;
- while (fenFile.good())
+ else
{
- getline(fenFile, pos);
- if (!pos.empty())
- positions.push_back(pos);
+ cerr << "Unable to open FEN file " << fenFile << endl;
+ exit(EXIT_FAILURE);
}
- fenFile.close();
- } else
- for (int i = 0; !BenchmarkPositions[i].empty(); i++)
- positions.push_back(BenchmarkPositions[i]);
+ }
- 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, 0);
- cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
+ 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 * 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))
+ 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 += pos.nodes_searched();
}
}
- cnt = get_system_time() - startTime;
- cerr << "==============================="
- << "\nTotal time (ms) : " << cnt
+ time = get_system_time() - time;
+
+ cerr << "\n==============================="
+ << "\nTotal time (ms) : " << time
<< "\nNodes searched : " << totalNodes
- << "\nNodes/second : " << (int)(totalNodes/(cnt/1000.0)) << endl << endl;
+ << "\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 >> ttSize;
+ cin >> time;
#endif
}