From 09d01ee9dc16f20962d5f5ffcb61ade56d4fa579 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Mon, 25 Apr 2011 10:46:52 +0100 Subject: [PATCH] Tidy up benchmark.cpp Node count is different just becuase now we don't log on "bench.txt" file anymore so that we avoid some calls to pretty_pv() that calls Position::do_move(). Signed-off-by: Marco Costalba --- src/benchmark.cpp | 127 +++++++++++++++++++++++----------------------- src/main.cpp | 2 +- src/search.cpp | 4 +- src/search.h | 5 +- src/uci.cpp | 4 +- 5 files changed, 72 insertions(+), 70 deletions(-) diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 9cf04532..df497870 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -17,25 +17,17 @@ along with this program. If not, see . */ - -//// -//// Includes -//// #include #include #include +#include "position.h" #include "search.h" -#include "thread.h" #include "ucioption.h" using namespace std; -//// -//// Variables -//// - -static const string BenchmarkPositions[] = { +static const string 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 - -", @@ -56,10 +48,6 @@ static const string BenchmarkPositions[] = { }; -//// -//// Functions -//// - /// benchmark() runs a simple benchmark by letting Stockfish analyze a set /// of positions for a given limit each. There are five parameters; the /// transposition table size, the number of search threads that should @@ -71,84 +59,95 @@ static const string BenchmarkPositions[] = { void benchmark(int argc, char* argv[]) { - vector positions; - string ttSize, threads, valStr, posFile, valType; - int val, maxTime, maxDepth, maxNodes; + vector fenList; + SearchLimits limits; + int64_t totalNodes; + int time; - ttSize = argc > 2 ? argv[2] : "128"; - threads = argc > 3 ? argv[3] : "1"; - valStr = argc > 4 ? argv[4] : "12"; - posFile = argc > 5 ? argv[5] : "default"; - valType = argc > 6 ? argv[6] : "depth"; + // Load default positions + for (int i = 0; !Defaults[i].empty(); i++) + fenList.push_back(Defaults[i]); + + // Assign default values to missing arguments + string ttSize = argc > 2 ? argv[2] : "128"; + string threads = argc > 3 ? argv[3] : "1"; + string valStr = argc > 4 ? argv[4] : "12"; + 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["Use Search Log"].set_value("true"); - Options["Search Log Filename"].set_value("bench.txt"); - - maxTime = maxDepth = maxNodes = 0; - val = atoi(valStr.c_str()); - if (valType == "depth" || valType == "perft") - maxDepth = val; + // Search should be limited by nodes, time or depth ? + if (valType == "nodes") + limits.maxNodes = atoi(valStr.c_str()); else if (valType == "time") - maxTime = val * 1000; + limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms else - maxNodes = val; + limits.maxDepth = atoi(valStr.c_str()); - if (posFile != "default") + // Do we need to load positions from a given FEN file ? + if (fenFile != "default") { - ifstream fenFile(posFile.c_str()); - if (!fenFile.is_open()) + string fen; + ifstream f(fenFile.c_str()); + + if (f.is_open()) { - cerr << "Unable to open positions file " << posFile << endl; - exit(EXIT_FAILURE); + fenList.clear(); + + while (getline(f, fen)) + if (!fen.empty()) + fenList.push_back(fen); + + f.close(); } - string pos; - while (fenFile.good()) + else { - getline(fenFile, pos); - if (!pos.empty()) - positions.push_back(pos); + cerr << "Unable to open FEN file " << fenFile << endl; + exit(EXIT_FAILURE); } - fenFile.close(); - } else - for (int i = 0; !BenchmarkPositions[i].empty(); i++) - positions.push_back(BenchmarkPositions[i]); + } - vector::iterator it; - int cnt = 1; - int64_t totalNodes = 0; - int startTime = get_system_time(); + // Ok, let's start the benchmark ! + totalNodes = 0; + time = get_system_time(); - for (it = positions.begin(); it != positions.end(); ++it, ++cnt) + for (size_t i = 0; i < fenList.size(); i++) { Move moves[] = { MOVE_NONE }; - Position pos(*it, false, 0); - cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl; + Position pos(fenList[i], false, 0); + + cerr << "\nBench position: " << i + 1 << '/' << fenList.size() << endl; + if (valType == "perft") { - int64_t perftCnt = perft(pos, maxDepth * ONE_PLY); - cerr << "\nPerft " << maxDepth << " result (nodes searched): " << perftCnt << endl << endl; - totalNodes += perftCnt; - } else { - if (!think(pos, SearchLimits(0, 0, 0, maxTime, maxDepth, maxNodes, false, false), moves)) + int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY); + totalNodes += cnt; + + cerr << "\nPerft " << limits.maxDepth << " nodes counted: " << cnt << endl; + } + else + { + if (!think(pos, limits, moves)) break; + totalNodes += pos.nodes_searched(); } } - cnt = get_system_time() - startTime; - cerr << "===============================" - << "\nTotal time (ms) : " << cnt + time = get_system_time() - time; + + cerr << "\n===============================" + << "\nTotal time (ms) : " << time << "\nNodes searched : " << totalNodes - << "\nNodes/second : " << (int)(totalNodes/(cnt/1000.0)) << endl << endl; + << "\nNodes/second : " << (int)(totalNodes / (time / 1000.0)) << endl << endl; - // Under MS Visual C++ debug window always unconditionally closes - // when program exits, this is bad because we want to read results before. + // MS Visual C++ debug window always unconditionally closes when program + // exits, this is bad because we want to read results before. #if (defined(WINDOWS) || defined(WIN32) || defined(WIN64)) cerr << "Press any key to exit" << endl; - cin >> ttSize; + cin >> time; #endif } diff --git a/src/main.cpp b/src/main.cpp index efc746b3..e6dfe934 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -80,7 +80,7 @@ int main(int argc, char* argv[]) { else cout << "Usage: stockfish bench [hash size = 128] [threads = 1] " << "[limit = 12] [fen positions file = default] " - << "[depth, time, perft or node limited = depth]" << endl; + << "[limited by depth, time, nodes or perft = depth]" << endl; Threads.exit(); return 0; diff --git a/src/search.cpp b/src/search.cpp index 3e36948f..a50b639a 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -414,8 +414,8 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { else NodesBetweenPolls = 30000; - // Look for a book move, only during games, not tests - if (Limits.useTimeManagement() && Options["OwnBook"].value()) + // Look for a book move + if (Options["OwnBook"].value()) { if (Options["Book File"].value() != OpeningBook.name()) OpeningBook.open(Options["Book File"].value()); diff --git a/src/search.h b/src/search.h index 06e384fb..b179c9c7 100644 --- a/src/search.h +++ b/src/search.h @@ -20,6 +20,8 @@ #if !defined(SEARCH_H_INCLUDED) #define SEARCH_H_INCLUDED +#include + #include "move.h" #include "types.h" @@ -52,7 +54,8 @@ struct SearchStack { struct SearchLimits { - SearchLimits() {} + SearchLimits() { memset(this, 0, sizeof(SearchLimits)); } + SearchLimits(int t, int i, int mtg, int mt, int md, int mn, bool inf, bool pon) : time(t), increment(i), movesToGo(mtg), maxTime(mt), maxDepth(md), maxNodes(mn), infinite(inf), ponder(pon) {} diff --git a/src/uci.cpp b/src/uci.cpp index 248601b5..34a26586 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -203,10 +203,10 @@ namespace { bool go(Position& pos, UCIParser& up) { string token; - int time[] = { 0, 0 }, inc[] = { 0, 0 }; - SearchLimits limits(0, 0, 0, 0, 0, 0, false, false); + SearchLimits limits; Move searchMoves[MAX_MOVES] = { MOVE_NONE }; Move* cur = searchMoves; + int time[] = { 0, 0 }, inc[] = { 0, 0 }; while (up >> token) { -- 2.39.2