X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=1d97c95b7109a720a8b1302ad95f1a43e387c5d5;hb=a43f633c19c43b43ec7a5e460eb91b7abcf59e3a;hp=0adbc8614fc56295da6f78292e7881cc18f357a9;hpb=c9dcda6ac488c0058ebd567e1f52e30b8cd0db20;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 0adbc861..1d97c95b 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -27,11 +28,13 @@
#include "search.h"
#include "thread.h"
#include "tt.h"
-#include "ucioption.h"
+#include "uci.h"
using namespace std;
-static const char* Defaults[] = {
+namespace {
+
+const char* Defaults[] = {
"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",
@@ -64,12 +67,13 @@ static const char* Defaults[] = {
"8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1"
};
+} // namespace
/// 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
/// be used, the limit value spent for each position (optional, default is
-/// depth 12), an optional file name where to look for positions in FEN
+/// 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.
@@ -80,7 +84,7 @@ void benchmark(const Position& current, istream& is) {
vector fens;
// Assign default values to missing arguments
- string ttSize = (is >> token) ? token : "32";
+ string ttSize = (is >> token) ? token : "16";
string threads = (is >> token) ? token : "1";
string limit = (is >> token) ? token : "13";
string fenFile = (is >> token) ? token : "default";
@@ -126,7 +130,7 @@ void benchmark(const Position& current, istream& is) {
file.close();
}
- int64_t nodes = 0;
+ uint64_t nodes = 0;
Search::StateStackPtr st;
Time::point elapsed = Time::now();
@@ -137,20 +141,19 @@ void benchmark(const Position& current, istream& is) {
cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
if (limitType == "perft")
- {
- size_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
- cerr << "\nPerft " << limits.depth << " leaf nodes: " << cnt << endl;
- nodes += cnt;
- }
+ nodes += Search::perft(pos, limits.depth * ONE_PLY);
+
else
{
- Threads.start_thinking(pos, limits, vector(), st);
+ Threads.start_thinking(pos, limits, st);
Threads.wait_for_think_finished();
nodes += Search::RootPos.nodes_searched();
}
}
- elapsed = Time::now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
+ elapsed = std::max(Time::now() - elapsed, Time::point(1)); // Avoid a 'divide by zero'
+
+ dbg_print(); // Just before to exit
cerr << "\n==========================="
<< "\nTotal time (ms) : " << elapsed