X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=64de5d6dfdb4c979f7a2326819ef2bb440346808;hb=f9571e8d57381275f08ffbfb960358319d4c34dd;hp=2f943c4e725e8c3ac2e57a726c148f4532107746;hpb=e49eb67119f772ef6fcecb736cf136b851ee72cc;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 2f943c4e..64de5d6d 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,22 +17,24 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
#include "misc.h"
-#include "notation.h"
#include "position.h"
#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",
@@ -62,9 +64,23 @@ static const char* Defaults[] = {
"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"
+ "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1",
+
+ // 5-man positions
+ "8/8/8/8/5kp1/P7/8/1K1N4 w - - 0 1", // Kc2 - mate
+ "8/8/8/5N2/8/p7/8/2NK3k w - - 0 1", // Na2 - mate
+ "8/3k4/8/8/8/4B3/4KB2/2B5 w - - 0 1", // draw
+
+ // 6-man positions
+ "8/8/1P6/5pr1/8/4R3/7k/2K5 w - - 0 1", // Re5 - mate
+ "8/2p4P/8/kr6/6R1/8/8/1K6 w - - 0 1", // Ka2 - mate
+ "8/8/3P3k/8/1p6/8/1P6/1K3n2 b - - 0 1", // Nd2 - draw
+
+ // 7-man positions
+ "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw
};
+} // namespace
/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
/// of positions for a given limit each. There are five parameters: the
@@ -81,7 +97,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";
@@ -104,7 +120,7 @@ void benchmark(const Position& current, istream& is) {
limits.depth = atoi(limit.c_str());
if (fenFile == "default")
- fens.assign(Defaults, Defaults + 30);
+ fens.assign(Defaults, Defaults + 37);
else if (fenFile == "current")
fens.push_back(current.fen());
@@ -137,22 +153,9 @@ void benchmark(const Position& current, istream& is) {
cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
- if (limitType == "divide")
- for (MoveList it(pos); *it; ++it)
- {
- StateInfo si;
- pos.do_move(*it, si);
- uint64_t cnt = limits.depth > 1 ? Search::perft(pos, (limits.depth - 1) * ONE_PLY) : 1;
- pos.undo_move(*it);
- cerr << move_to_uci(*it, pos.is_chess960()) << ": " << cnt << endl;
- nodes += cnt;
- }
- else if (limitType == "perft")
- {
- uint64_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
- cerr << "\nPerft " << limits.depth << " leaf nodes: " << cnt << endl;
- nodes += cnt;
- }
+ if (limitType == "perft")
+ nodes += Search::perft(pos, limits.depth * ONE_PLY);
+
else
{
Threads.start_thinking(pos, limits, st);
@@ -161,7 +164,7 @@ 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