X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=51bd7949d1a2b2386d8da1b1f8c9a5432a0b146e;hp=bb43f4e6aa14db2c90fdde2f366ceb4d828b91a4;hb=9050eac59564fe96b3f24d2889bbef7336b28100;hpb=932ae761c6e3fd3e9b202283379e487a5c187989 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index bb43f4e6..51bd7949 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -1,7 +1,8 @@ /* 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-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -17,31 +18,25 @@ along with this program. If not, see . */ - -//// -//// Includes -//// #include #include +#include #include -#include "search.h" -#include "thread.h" -#include "ucioption.h" +#include "position.h" using namespace std; -//// -//// Variables -//// +namespace { -static const string BenchmarkPositions[] = { +const vector Defaults = { + "setoption name UCI_Chess960 value false", "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", + "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14 moves d4e6", + "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14 moves g2g4", "r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15", "r1bbk1nr/pp3p1p/2n5/1N4p1/2Np1B2/8/PPP2PPP/2KR1B1R w kq - 0 13", "r1bq1rk1/ppp1nppp/4n3/3p3Q/3P4/1BP1B3/PP1N2PP/R4RK1 w - - 1 16", @@ -52,104 +47,110 @@ static const string BenchmarkPositions[] = { "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", - "" + "6k1/6p1/6Pp/ppp5/3pn2P/1P3K2/1PP2P2/3N4 b - - 0 1", + "3b4/5kp1/1p1p1p1p/pP1PpP1P/P1P1P3/3KN3/8/8 w - - 0 1", + "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1 moves g5g6 f3e3 g6g5 e3f3", + "8/6pk/1p6/8/PP3p1p/5P2/4KP1q/3Q4 w - - 0 1", + "7k/3p2pp/4q3/8/4Q3/5Kp1/P6b/8 w - - 0 1", + "8/2p5/8/2kPKp1p/2p4P/2P5/3P4/8 w - - 0 1", + "8/1p3pp1/7p/5P1P/2k3P1/8/2K2P2/8 w - - 0 1", + "8/pp2r1k1/2p1p3/3pP2p/1P1P1P1P/P5KR/8/8 w - - 0 1", + "8/3p4/p1bk3p/Pp6/1Kp1PpPp/2P2P1P/2P5/5B2 b - - 0 1", + "5k2/7R/4P2p/5K2/p1r2P1p/8/8/8 b - - 0 1", + "6k1/6p1/P6p/r1N5/5p2/7P/1b3PP1/4R1K1 w - - 0 1", + "1r3k2/4q3/2Pp3b/3Bp3/2Q2p2/1p1P2P1/1P2KP2/3N4 w - - 0 1", + "6k1/4pp1p/3p2p1/P1pPb3/R7/1r2P1PP/3B1P2/6K1 w - - 0 1", + "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1", + + // 5-man positions + "8/8/8/8/5kp1/P7/8/1K1N4 w - - 0 1", // Kc2 - mate + "8/8/8/5N2/8/p7/8/2NK3k w - - 0 1", // Na2 - mate + "8/3k4/8/8/8/4B3/4KB2/2B5 w - - 0 1", // draw + + // 6-man positions + "8/8/1P6/5pr1/8/4R3/7k/2K5 w - - 0 1", // Re5 - mate + "8/2p4P/8/kr6/6R1/8/8/1K6 w - - 0 1", // Ka2 - mate + "8/8/3P3k/8/1p6/8/1P6/1K3n2 b - - 0 1", // Nd2 - draw + + // 7-man positions + "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw + + // Mate and stalemate positions + "6k1/3b3r/1p1p4/p1n2p2/1PPNpP1q/P3Q1p1/1R1RB1P1/5K2 b - - 0 1", + "r2r1n2/pp2bk2/2p1p2p/3q4/3PN1QP/2P3R1/P4PP1/5RK1 w - - 0 1", + "8/8/8/8/8/6k1/6p1/6K1 w - -", + "7k/7P/6K1/8/3B4/8/8/8 b - -", + + // Chess 960 + "setoption name UCI_Chess960 value true", + "bbqnnrkr/pppppppp/8/8/8/8/PPPPPPPP/BBQNNRKR w KQkq - 0 1 moves g2g3 d7d5 d2d4 c8h3 c1g5 e8d6 g5e7 f7f6", + "setoption name UCI_Chess960 value false" }; +} // namespace -//// -//// 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 -/// 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. - -void benchmark(int argc, char* argv[]) { - - vector positions; - string ttSize, threads, valStr, posFile, valType; - int val, secsPerPos, maxDepth, maxNodes; - - 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"; - - 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"); - - secsPerPos = maxDepth = maxNodes = 0; - val = atoi(valStr.c_str()); - - if (valType == "depth" || valType == "perft") - maxDepth = val; - else if (valType == "time") - secsPerPos = val * 1000; - else - maxNodes = val; +/// setup_bench() builds a list of UCI commands to be run by bench. There +/// are five parameters: TT size in MB, number of search threads that +/// should be used, the limit value spent for each position, a file name +/// where to look for positions in FEN format and the type of the limit: +/// depth, perft, nodes and movetime (in millisecs). +/// +/// bench -> search default positions up to depth 13 +/// bench 64 1 15 -> search default positions up to depth 15 (TT = 64MB) +/// bench 64 4 5000 current movetime -> search current position with 4 threads for 5 sec +/// bench 64 1 100000 default nodes -> search default positions for 100K nodes each +/// bench 16 1 5 default perft -> run a perft 5 on default positions + +vector setup_bench(const Position& current, istream& is) { + + vector fens, list; + string go, token; + + // Assign default values to missing arguments + string ttSize = (is >> token) ? token : "16"; + string threads = (is >> token) ? token : "1"; + string limit = (is >> token) ? token : "13"; + string fenFile = (is >> token) ? token : "default"; + string limitType = (is >> token) ? token : "depth"; - if (posFile != "default") + go = "go " + limitType + " " + limit; + + if (fenFile == "default") + fens = Defaults; + + else if (fenFile == "current") + fens.push_back(current.fen()); + + else { - ifstream fenFile(posFile.c_str()); - if (!fenFile.is_open()) + string fen; + ifstream file(fenFile); + + if (!file.is_open()) { - cerr << "Unable to open positions file " << posFile << endl; + cerr << "Unable to open file " << fenFile << endl; exit(EXIT_FAILURE); } - string pos; - while (fenFile.good()) - { - getline(fenFile, pos); - if (!pos.empty()) - positions.push_back(pos); - } - 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(); + while (getline(file, fen)) + if (!fen.empty()) + fens.push_back(fen); - for (it = positions.begin(); it != positions.end(); ++it, ++cnt) - { - Move moves[1] = { MOVE_NONE }; - int dummy[2] = { 0, 0 }; - Position pos(*it, false, 0); - cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl; - if (valType == "perft") + file.close(); + } + + list.emplace_back("ucinewgame"); + list.emplace_back("setoption name Threads value " + threads); + list.emplace_back("setoption name Hash value " + ttSize); + + for (const string& fen : fens) + if (fen.find("setoption") != string::npos) + list.emplace_back(fen); + else { - int64_t perftCnt = perft(pos, maxDepth * ONE_PLY); - cerr << "\nPerft " << maxDepth << " result (nodes searched): " << perftCnt << endl << endl; - totalNodes += perftCnt; - } else { - if (!think(pos, false, false, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves)) - break; - totalNodes += pos.nodes_searched(); + list.emplace_back("position fen " + fen); + list.emplace_back(go); } - } - cnt = get_system_time() - startTime; - cerr << "===============================" - << "\nTotal time (ms) : " << cnt - << "\nNodes searched : " << totalNodes - << "\nNodes/second : " << (int)(totalNodes/(cnt/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. - #if (defined(WINDOWS) || defined(WIN32) || defined(WIN64)) - cerr << "Press any key to exit" << endl; - cin >> ttSize; - #endif + return list; }