X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=9f0ac0c145b220798eaab1449e8b848f3c411b94;hp=0253992710dd5618303464a5d3f0ddb495f85c69;hb=3aa471f2a9cb1cccd37c27906dd386b9724e32ab;hpb=660378d10e99f435df347f317878d7d2d9eade16
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 02539927..9f0ac0c1 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,27 +17,22 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
#include
+#include
#include
+#include "misc.h"
+#include "position.h"
#include "search.h"
#include "thread.h"
#include "ucioption.h"
using namespace std;
-////
-//// Variables
-////
-
-static 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",
@@ -54,100 +49,84 @@ 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
+/// 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 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;
+ vector fens;
+ Search::LimitsType limits;
+ int64_t nodes = 0;
+
+ // 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"] = ttSize;
+ Options["Threads"] = threads;
+
+ 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
- maxNodes = val;
+ limits.maxDepth = atoi(valStr.c_str());
- if (posFile != "default")
+ if (fenFile != "default")
{
- ifstream fenFile(posFile.c_str());
- if (!fenFile.is_open())
- {
- cerr << "Unable to open positions file " << posFile << endl;
- Application::exit_with_failure();
- }
- string pos;
- while (fenFile.good())
+ string fen;
+ ifstream file(fenFile.c_str());
+
+ if (!file.is_open())
{
- getline(fenFile, pos);
- if (!pos.empty())
- positions.push_back(pos);
+ cerr << "Unable to open file " << fenFile << endl;
+ exit(EXIT_FAILURE);
}
- fenFile.close();
- } else
- for (int i = 0; i < 16; i++)
- positions.push_back(string(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);
+
+ file.close();
+ }
+ else
+ fens.assign(Defaults, Defaults + 16);
+
+ 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, 0);
+
+ cerr << "\nPosition: " << i + 1 << '/' << fens.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, false, false, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
- break;
- totalNodes += pos.nodes_searched();
+ int64_t cnt = Search::perft(pos, limits.maxDepth * ONE_PLY);
+ cerr << "\nPerft " << limits.maxDepth << " leaf nodes: " << cnt << endl;
+ nodes += cnt;
+ }
+ else
+ {
+ Threads.start_searching(pos, limits);
+ 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;
-
- // 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
+ int e = time.elapsed();
+
+ cerr << "\n==========================="
+ << "\nTotal time (ms) : " << e
+ << "\nNodes searched : " << nodes
+ << "\nNodes/second : " << int(nodes / (e / 1000.0)) << endl;
}