X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=7fc199f92866d26f09912df969e87f9543084857;hp=08768cde57cdb37bdcaa1627b7a00a5d668b08e0;hb=94fe366779e877e85e89ba5b536099658847fbcd;hpb=ca0804dfe431e4f91f5a9a1faa7df27996c4e1ba
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 08768cde..7fc199f9 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,12 +17,14 @@
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"
@@ -80,7 +82,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 : Options["Hash"];
string threads = (is >> token) ? token : "1";
string limit = (is >> token) ? token : "13";
string fenFile = (is >> token) ? token : "default";
@@ -137,11 +139,15 @@ 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;
- }
+ 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
{
Threads.start_thinking(pos, limits, st);
@@ -150,7 +156,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