X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbenchmark.cpp;h=9b1b40091d48e2d623d617e989ee777059fcd0a4;hb=f32992f88c16c6d4c2b72164c88fc4581f8faba7;hp=058291732567b10cf71e2a1a29e5be0aa304fe0c;hpb=f1e245850f55578bd55cb9448a832233dc229a86;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 05829173..9b1b4009 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 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 .
*/
@@ -20,7 +21,9 @@
////
//// Includes
////
+#include
#include
+#include
#include "benchmark.h"
#include "search.h"
@@ -32,7 +35,8 @@
//// Variables
////
-const std::string BenchmarkPositions[15] = {
+const std::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",
@@ -49,25 +53,26 @@ 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 15
-/// positions for 60 seconds each. There are two parameters; the
-/// transposition table size and the number of search threads that should
-/// be used. The analysis is written to a file named bench.txt.
+/// 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
+/// 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.
void benchmark(const std::string& commandLine) {
- Position pos;
- Move moves[1] = {MOVE_NONE};
- std::string ttSize, threads, fileName;
std::istringstream csVal(commandLine);
std::istringstream csStr(commandLine);
- int val, time;
+ std::string ttSize, threads, fileName, limitType;
+ int val, secsPerPos, maxDepth, maxNodes;
csStr >> ttSize;
csVal >> val;
@@ -83,22 +88,64 @@ void benchmark(const std::string& commandLine) {
std::cerr << "The number of threads must be between 1 and " << THREAD_MAX
<< std::endl;
exit(EXIT_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 >> time; // In seconds
+ csVal >> val;
csVal >> fileName;
-
+ csVal >> limitType;
+
+ secsPerPos = maxDepth = maxNodes = 0;
+
+ if (limitType == "time")
+ secsPerPos = val * 1000;
+ else if (limitType == "depth")
+ maxDepth = val;
+ else
+ maxNodes = val;
+
+ std::vector positions;
+
if (fileName != "default")
- exit(0);
+ {
+ std::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;
+ while (fenFile.good())
+ {
+ std::getline(fenFile, pos);
+ if (!pos.empty())
+ positions.push_back(pos);
+ }
+ fenFile.close();
+ } else
+ for (int i = 0; i < 16; i++)
+ positions.push_back(std::string(BenchmarkPositions[i]));
- for (int i = 0; i < 15; i++)
+ int startTime = get_system_time();
+ std::vector::iterator it;
+ int cnt = 1;
+ int64_t totalNodes = 0;
+ for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
{
- pos.from_fen(BenchmarkPositions[i]);
- think(pos, true, false, 0, 0, 0, 0, 0, time * 1000, moves);
+ Move moves[1] = {MOVE_NONE};
+ int dummy[2] = {0, 0};
+ Position pos(*it);
+ std::cout << "\nProcessing position " << cnt << '/' << positions.size() << std::endl << std::endl;
+ think(pos, true, false, 0, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves);
+ totalNodes += nodes_searched();
}
+ std::cout << "\nProcessing time (ms) " << get_system_time() - startTime << std::endl
+ << "Nodes searched " << totalNodes << std::endl
+ << "Press any key to exit" << std::endl;
+ std::cin >> fileName;
}