X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fbenchmark.cpp;h=3abcda62f75e2a2fe87adba4878e4f1d715870c6;hb=62b43130e27e4322c5edde976d0827840b9deee4;hp=7e2628b1ea77e7d82b38547bd8cdb8d0d64e751c;hpb=18860cce406f9646cb6af218c2b23f51d2e47b8d;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 7e2628b1..3abcda62 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -1,17 +1,18 @@
/*
- Glaurung, a UCI chess playing engine.
- Copyright (C) 2004-2008 Tord Romstad
+ 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
- Glaurung is free software: you can redistribute it and/or modify
+ Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
- Glaurung is distributed in the hope that it will be useful,
+
+ Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -29,12 +30,14 @@
#include "thread.h"
#include "ucioption.h"
+using namespace std;
////
//// Variables
////
-const std::string BenchmarkPositions[15] = {
+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",
"4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19",
@@ -51,13 +54,13 @@ const std::string BenchmarkPositions[15] = {
"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 Glaurung analyze a set
+/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
/// of positions for a given time each. There are four parameters; the
/// transposition table size, the number of search threads that should
/// be used, the time in seconds spent for each position (optional, default
@@ -65,66 +68,114 @@ const std::string BenchmarkPositions[15] = {
/// format (default are the BenchmarkPositions defined above).
/// The analysis is written to a file named bench.txt.
-void benchmark(const std::string& commandLine) {
+void benchmark(const string& commandLine) {
- std::istringstream csVal(commandLine);
- std::istringstream csStr(commandLine);
- std::string ttSize, threads, fileName;
- int val, secsPerPos;
+ istringstream csVal(commandLine);
+ istringstream csStr(commandLine);
+ string ttSize, threads, fileName, limitType, timFile;
+ int val, secsPerPos, maxDepth, maxNodes;
csStr >> ttSize;
csVal >> val;
if (val < 4 || val > 1024)
{
- std::cerr << "The hash table size must be between 4 and 1024" << std::endl;
- exit(EXIT_FAILURE);
+ 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)
{
- std::cerr << "The number of threads must be between 1 and " << THREAD_MAX
- << std::endl;
- exit(EXIT_FAILURE);
- }
+ 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");
- csVal >> secsPerPos;
+ csVal >> val;
csVal >> fileName;
+ csVal >> limitType;
+ csVal >> timFile;
+
+ secsPerPos = maxDepth = maxNodes = 0;
+
+ if (limitType == "time")
+ secsPerPos = val * 1000;
+ else if (limitType == "depth" || limitType == "perft")
+ maxDepth = val;
+ else
+ maxNodes = val;
+
+ vector positions;
- std::vector positions;
-
if (fileName != "default")
{
- std::ifstream fenFile(fileName.c_str());
+ ifstream fenFile(fileName.c_str());
if (!fenFile.is_open())
{
- std::cerr << "Unable to open positions file " << fileName
- << std::endl;
- exit(EXIT_FAILURE);
- }
- std::string pos;
+ cerr << "Unable to open positions file " << fileName << endl;
+ Application::exit_with_failure();
+ }
+ string pos;
while (fenFile.good())
{
- std::getline(fenFile, pos);
+ getline(fenFile, pos);
if (!pos.empty())
positions.push_back(pos);
}
fenFile.close();
} else
- for (int i = 0; i < 15; i++)
- positions.push_back(std::string(BenchmarkPositions[i]));
+ for (int i = 0; i < 16; i++)
+ positions.push_back(string(BenchmarkPositions[i]));
+
+ ofstream timingFile;
+ if (!timFile.empty())
+ {
+ timingFile.open(timFile.c_str(), ios::out | ios::app);
+ if (!timingFile.is_open())
+ {
+ cerr << "Unable to open timing file " << timFile << endl;
+ Application::exit_with_failure();
+ }
+ }
+
+ vector::iterator it;
+ int cnt = 1;
+ int64_t totalNodes = 0;
+ int startTime = get_system_time();
- std::vector::iterator it;
- for (it = positions.begin(); it != positions.end(); ++it)
+ for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
{
- Move moves[1] = {MOVE_NONE};
- int dummy[2] = {0, 0};
- Position pos(*it);
- think(pos, true, false, 0, dummy, dummy, 0, 0, 0, secsPerPos * 1000, moves);
+ Move moves[1] = {MOVE_NONE};
+ int dummy[2] = {0, 0};
+ Position pos(*it);
+ cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
+ if (limitType == "perft")
+ totalNodes += perft(pos, maxDepth * OnePly);
+ else if (!think(pos, false, false, 0, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
+ break;
+ totalNodes += 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();
+ }
+
+ // 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
}