X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=0e7208755fbacc65e4fc4c916de552e23dacfa4e;hp=b0b9e16b7881da1783326d72825a376998e99020;hb=55bd27b8f08a151128d7065fa2819aa3e9605299;hpb=8b00e50cb74392c24938c0019ac528a9feabd614 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index b0b9e16b..0e720875 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(); } } - int e = time.elapsed(); + 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 : " << int(nodes / (e / 1000.0)) << endl; + << "\nNodes/second : " << 1000 * nodes / elapsed << endl; }