X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=f42c0e6c312460742dd944d1765398bd2f001788;hp=e23afb1422cd2709427f0d69f3e9c050bc7ec776;hb=c2fc80e5d16339266b5bf6687fa843ff65de3b3e;hpb=b6ab610e2f3d9148e2a75984800cebc0757b7f01
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index e23afb14..f42c0e6c 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
@@ -17,29 +17,23 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
#include
+#include
#include
#include
-#include "benchmark.h"
+#include "misc.h"
+#include "position.h"
#include "search.h"
#include "thread.h"
#include "ucioption.h"
using namespace std;
-////
-//// Variables
-////
-
-const string BenchmarkPositions[] = {
+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",
@@ -51,136 +45,90 @@ 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",
+ "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22",
"3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26"
};
-////
-//// Functions
-////
-
/// 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).
-/// 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(const string& commandLine) {
+void benchmark(istringstream& is) {
- istringstream csVal(commandLine);
- istringstream csStr(commandLine);
- string ttSize, threads, fileName, limitType, timFile;
- int val, secsPerPos, maxDepth, maxNodes;
+ string token;
+ Search::LimitsType limits;
+ vector fens(Defaults, Defaults + 16);
- 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 > MAX_THREADS)
- {
- cerr << "The number of threads must be between 1 and " << MAX_THREADS << 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");
+ // Assign default values to missing arguments
+ string ttSize = (is >> token) ? token : "128";
+ string threads = (is >> token) ? token : "1";
+ string limit = (is >> token) ? token : "12";
+ string fenFile = (is >> token) ? token : "default";
+ string limitType = (is >> token) ? token : "depth";
- csVal >> val;
- csVal >> fileName;
- csVal >> limitType;
- csVal >> timFile;
-
- secsPerPos = maxDepth = maxNodes = 0;
+ Options["Hash"] = ttSize;
+ Options["Threads"] = threads;
if (limitType == "time")
- secsPerPos = val * 1000;
- else if (limitType == "depth" || limitType == "perft")
- maxDepth = val;
- else
- maxNodes = val;
+ limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
- vector positions;
+ else if (limitType == "nodes")
+ limits.nodes = atoi(limit.c_str());
- if (fileName != "default")
- {
- ifstream fenFile(fileName.c_str());
- if (!fenFile.is_open())
- {
- cerr << "Unable to open positions file " << fileName << endl;
- Application::exit_with_failure();
- }
- string pos;
- while (fenFile.good())
- {
- getline(fenFile, pos);
- if (!pos.empty())
- positions.push_back(pos);
- }
- fenFile.close();
- } else
- for (int i = 0; i < 16; i++)
- positions.push_back(string(BenchmarkPositions[i]));
+ else
+ limits.depth = atoi(limit.c_str());
- ofstream timingFile;
- if (!timFile.empty())
+ if (fenFile != "default")
{
- timingFile.open(timFile.c_str(), ios::out | ios::app);
- if (!timingFile.is_open())
+ fens.clear();
+ string fen;
+ ifstream file(fenFile.c_str());
+
+ if (!file.is_open())
{
- cerr << "Unable to open timing file " << timFile << endl;
- Application::exit_with_failure();
+ cerr << "Unable to open file " << fenFile << endl;
+ exit(EXIT_FAILURE);
}
+
+ while (getline(file, fen))
+ if (!fen.empty())
+ fens.push_back(fen);
+
+ file.close();
}
- vector::iterator it;
- int cnt = 1;
- int64_t totalNodes = 0;
- int startTime = get_system_time();
+ int64_t nodes = 0;
+ Time time = Time::current_time();
- for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
+ for (size_t i = 0; i < fens.size(); i++)
{
- Move moves[1] = {MOVE_NONE};
- int dummy[2] = {0, 0};
- Position pos(*it, 0);
- cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
+ Position pos(fens[i], false, NULL);
+
+ cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
+
if (limitType == "perft")
{
- int64_t perftCnt = perft(pos, maxDepth * OnePly);
- 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 += nodes_searched();
+ int64_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.wait_for_search_finished();
+ nodes += Search::RootPosition.nodes_searched();
}
}
- cnt = get_system_time() - startTime;
- cerr << "==============================="
- << "\nTotal time (ms) : " << cnt
- << "\nNodes searched : " << totalNodes
- << "\nNodes/second : " << (int)(totalNodes/(cnt/1000.0)) << endl << endl;
-
- if (!timFile.empty())
- {
- timingFile << cnt << endl << endl;
- timingFile.close();
- }
+ int e = time.elapsed();
- // 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 >> fileName;
- #endif
+ cerr << "\n==========================="
+ << "\nTotal time (ms) : " << e
+ << "\nNodes searched : " << nodes
+ << "\nNodes/second : " << int(nodes / (e / 1000.0)) << endl;
}