X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=4d9e35956cf02e7a5440a5b80864bad0f42019be;hp=5800a37bb10484526c0aeb923d24c20bd2b0a0d8;hb=ed1574e46ca7ed9a9ce6286ab38fff6a8ff09b28;hpb=90ec4a403ae326b85dfa68afd5fd7ed47d5bc651 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 5800a37b..4d9e3595 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -66,7 +66,7 @@ void benchmark(const Position& current, istream& is) { vector fens; // Assign default values to missing arguments - string ttSize = (is >> token) ? token : "128"; + string ttSize = (is >> token) ? token : "32"; string threads = (is >> token) ? token : "1"; string limit = (is >> token) ? token : "12"; string fenFile = (is >> token) ? token : "default"; @@ -110,7 +110,8 @@ void benchmark(const Position& current, istream& is) { } int64_t nodes = 0; - Time time = Time::current_time(); + Search::StateStackPtr st; + Time::point elapsed = Time::now(); for (size_t i = 0; i < fens.size(); i++) { @@ -120,22 +121,22 @@ void benchmark(const Position& current, istream& is) { if (limitType == "perft") { - int64_t cnt = Search::perft(pos, limits.depth * ONE_PLY); + size_t cnt = Search::perft(pos, limits.depth * ONE_PLY); cerr << "\nPerft " << limits.depth << " leaf nodes: " << cnt << endl; nodes += cnt; } else { - Threads.start_searching(pos, limits, vector()); + Threads.start_searching(pos, limits, vector(), st); Threads.wait_for_search_finished(); - nodes += Search::RootPosition.nodes_searched(); + nodes += Search::RootPos.nodes_searched(); } } - int e = time.elapsed() + 1; // Assure positive to avoid a 'divide by zero' + elapsed = Time::now() - elapsed + 1; // Assure positive to avoid a 'divide by zero' cerr << "\n===========================" - << "\nTotal time (ms) : " << e + << "\nTotal time (ms) : " << elapsed << "\nNodes searched : " << nodes - << "\nNodes/second : " << 1000 * nodes / e << endl; + << "\nNodes/second : " << 1000 * nodes / elapsed << endl; }