X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fbenchmark.cpp;h=1d97c95b7109a720a8b1302ad95f1a43e387c5d5;hb=0935dca9a6729f8036b3bde3554708743e47ac43;hp=63a9d84c7eaf5369d873df9d0dbded8f18df49e0;hpb=41641e3b1eea0038ab6984766d2b3bca869be7fa;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 63a9d84c..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,6 +67,7 @@ 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
@@ -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";
@@ -137,11 +141,8 @@ void benchmark(const Position& current, istream& is) {
cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
if (limitType == "perft")
- {
- uint64_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, st);
@@ -150,7 +151,9 @@ void benchmark(const Position& current, istream& is) {
}
}
- 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