X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=ba05ac7fb8af7561bfd425e8dc1f4cdcfe738f16;hp=eef27c6a5b0f2f6ae85f81f735f8fa2faac9a78f;hb=103b368ab7f5fd696e0c6925917344d15a3c2d9c;hpb=7ac6e3b8506f54ddb8fb6560fbf238242627a141 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index eef27c6a..ba05ac7f 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,16 +21,18 @@ #include #include +#include "misc.h" #include "position.h" #include "search.h" +#include "thread.h" #include "ucioption.h" using namespace std; -static const string Defaults[] = { +static 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 -", - "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - -", + "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10", + "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11", "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19", "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14", "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14", @@ -43,30 +45,24 @@ static const string Defaults[] = { "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22", "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18", "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22", - "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26", - "" + "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26" }; /// benchmark() runs a simple benchmark by letting Stockfish analyze a set -/// of positions for a given limit each. There are five parameters; the +/// of positions for a given limit each. There are five parameters; the /// transposition table size, the number of search threads that should -/// be used, the limit value spent for each position (optional, default -/// is ply 12), an optional file name where to look for positions in fen -/// format (default are the BenchmarkPositions defined above) and the type -/// of the limit value: depth (default), time in secs or number of nodes. -/// The analysis is written to a file named bench.txt. +/// be used, the limit value spent for each position (optional, default is +/// depth 12), an optional file name where to look for positions in fen +/// format (defaults are the positions defined above) and the type of the +/// limit value: depth (default), time in secs or number of nodes. void benchmark(int argc, char* argv[]) { - vector fenList; - SearchLimits limits; - int64_t totalNodes; + vector fens; + Search::LimitsType limits; int time; - - // Load default positions - for (int i = 0; !Defaults[i].empty(); i++) - fenList.push_back(Defaults[i]); + int64_t nodes = 0; // Assign default values to missing arguments string ttSize = argc > 2 ? argv[2] : "128"; @@ -75,72 +71,64 @@ void benchmark(int argc, char* argv[]) { string fenFile = argc > 5 ? argv[5] : "default"; string valType = argc > 6 ? argv[6] : "depth"; - Options["Hash"].set_value(ttSize); - Options["Threads"].set_value(threads); - Options["OwnBook"].set_value("false"); + Options["Hash"] = ttSize; + Options["Threads"] = threads; + Options["OwnBook"] = false; - // Search should be limited by nodes, time or depth ? - if (valType == "nodes") - limits.maxNodes = atoi(valStr.c_str()); - else if (valType == "time") + if (valType == "time") limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms + + else if (valType == "nodes") + limits.maxNodes = atoi(valStr.c_str()); + else limits.maxDepth = atoi(valStr.c_str()); - // Do we need to load positions from a given FEN file ? if (fenFile != "default") { string fen; - ifstream f(fenFile.c_str()); + ifstream file(fenFile.c_str()); - if (f.is_open()) + if (!file.is_open()) { - fenList.clear(); - - while (getline(f, fen)) - if (!fen.empty()) - fenList.push_back(fen); - - f.close(); - } - else - { - cerr << "Unable to open FEN file " << fenFile << endl; + cerr << "Unable to open file " << fenFile << endl; exit(EXIT_FAILURE); } + + while (getline(file, fen)) + if (!fen.empty()) + fens.push_back(fen); + + file.close(); } + else + fens.assign(Defaults, Defaults + 16); - // Ok, let's start the benchmark ! - totalNodes = 0; - time = get_system_time(); + time = system_time(); - for (size_t i = 0; i < fenList.size(); i++) + for (size_t i = 0; i < fens.size(); i++) { - Move moves[] = { MOVE_NONE }; - Position pos(fenList[i], false, 0); + Position pos(fens[i], false, 0); - cerr << "\nBench position: " << i + 1 << '/' << fenList.size() << endl; + cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl; if (valType == "perft") { - int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY); - totalNodes += cnt; - - cerr << "\nPerft " << limits.maxDepth << " nodes counted: " << cnt << endl; + int64_t cnt = Search::perft(pos, limits.maxDepth * ONE_PLY); + cerr << "\nPerft " << limits.maxDepth << " leaf nodes: " << cnt << endl; + nodes += cnt; } else { - if (!think(pos, limits, moves)) - break; - - totalNodes += pos.nodes_searched(); + Threads.start_thinking(pos, limits); + nodes += Search::RootPosition.nodes_searched(); } } - time = get_system_time() - time; + time = system_time() - time; - cerr << "\n===============================" + cerr << "\n===========================" << "\nTotal time (ms) : " << time - << "\nNodes searched : " << totalNodes - << "\nNodes/second : " << (int)(totalNodes / (time / 1000.0)) << endl; + << "\nNodes searched : " << nodes + << "\nNodes/second : " << int(nodes / (time / 1000.0)) << endl; }