X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=c861c8f3947ac90e99b420477b7a066720e625d8;hp=2f943c4e725e8c3ac2e57a726c148f4532107746;hb=5ab55827b84f1aef79478ec9b030330973036bda;hpb=e49eb67119f772ef6fcecb736cf136b851ee72cc
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 2f943c4e..c861c8f3 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,18 +17,18 @@
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;
@@ -81,7 +81,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,22 +137,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 +148,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