X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=bb43f4e6aa14db2c90fdde2f366ceb4d828b91a4;hp=590299d91439b981974fcd8c19647f909ae85072;hb=932ae761c6e3fd3e9b202283379e487a5c187989;hpb=b1e79fed99d52dcb20d2d6a9c62522226e957963 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 590299d9..bb43f4e6 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-2009 Marco Costalba + Copyright (C) 2008-2010 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 @@ -22,10 +22,9 @@ //// Includes //// #include -#include +#include #include -#include "benchmark.h" #include "search.h" #include "thread.h" #include "ucioption.h" @@ -36,10 +35,10 @@ using namespace std; //// Variables //// -const string BenchmarkPositions[] = { +static const string BenchmarkPositions[] = { "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1", - "r4rk1/1b2qppp/p1n1p3/1p6/1b1PN3/3BRN2/PP3PPP/R2Q2K1 b - - 7 16", - "4r1k1/ppq3pp/3b4/2pP4/2Q1p3/4B1P1/PP5P/R5K1 b - - 0 20", + "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq -", + "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - -", "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", @@ -51,8 +50,9 @@ const string BenchmarkPositions[] = { "r1bq1r1k/b1p1npp1/p2p3p/1p6/3PP3/1B2NN2/PP3PPP/R2Q1RK1 w - - 1 16", "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" + "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22", + "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26", + "" }; @@ -61,62 +61,49 @@ const string BenchmarkPositions[] = { //// /// benchmark() runs a simple benchmark by letting Stockfish analyze a set -/// of positions for a given time each. There are four 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 time in seconds spent for each position (optional, default -/// is 60) and an optional file name where to look for positions in fen -/// format (default are the BenchmarkPositions defined above). +/// 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(const string& commandLine) { +void benchmark(int argc, char* argv[]) { - istringstream csVal(commandLine); - istringstream csStr(commandLine); - string ttSize, threads, fileName, limitType; + vector positions; + string ttSize, threads, valStr, posFile, valType; int val, secsPerPos, maxDepth, maxNodes; - csStr >> ttSize; - csVal >> val; - if (val < 4 || val > 1024) - { - cerr << "The hash table size must be between 4 and 1024" << endl; - Application::exit_with_failure(); - } - csStr >> threads; - csVal >> val; - if (val < 1 || val > THREAD_MAX) - { - cerr << "The number of threads must be between 1 and " << THREAD_MAX << endl; - Application::exit_with_failure(); - } - set_option_value("Hash", ttSize); - set_option_value("Threads", threads); - set_option_value("OwnBook", "false"); - set_option_value("Use Search Log", "true"); - set_option_value("Search Log Filename", "bench.txt"); + 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"; - csVal >> val; - csVal >> fileName; - csVal >> limitType; + 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 (limitType == "time") - secsPerPos = val * 1000; - else if (limitType == "depth") + if (valType == "depth" || valType == "perft") maxDepth = val; + else if (valType == "time") + secsPerPos = val * 1000; else maxNodes = val; - vector positions; - - if (fileName != "default") + if (posFile != "default") { - ifstream fenFile(fileName.c_str()); + ifstream fenFile(posFile.c_str()); if (!fenFile.is_open()) { - cerr << "Unable to open positions file " << fileName << endl; - Application::exit_with_failure(); + cerr << "Unable to open positions file " << posFile << endl; + exit(EXIT_FAILURE); } string pos; while (fenFile.good()) @@ -127,33 +114,42 @@ void benchmark(const string& commandLine) { } fenFile.close(); } else - for (int i = 0; i < 16; i++) - positions.push_back(string(BenchmarkPositions[i])); + for (int i = 0; !BenchmarkPositions[i].empty(); i++) + positions.push_back(BenchmarkPositions[i]); - int startTime = get_system_time(); vector::iterator it; int cnt = 1; int64_t totalNodes = 0; + int startTime = get_system_time(); + for (it = positions.begin(); it != positions.end(); ++it, ++cnt) { - Move moves[1] = {MOVE_NONE}; - int dummy[2] = {0, 0}; - Position pos(*it); - cout << "\nProcessing position " << cnt << '/' << positions.size() << endl << endl; - if (!think(pos, true, false, 0, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves)) - break; - totalNodes += nodes_searched(); + 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") + { + 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(); + } } + cnt = get_system_time() - startTime; - cout << "\nProcessing time (ms) " << cnt - << "\nNodes searched " << totalNodes - << "\nNodes/second " << (int)(totalNodes/(cnt/1000.0)) - << endl; + 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)) - cout << "Press any key to exit" << endl; - cin >> fileName; + cerr << "Press any key to exit" << endl; + cin >> ttSize; #endif }