mirror of
https://github.com/sockspls/badfish
synced 2025-04-29 16:23:09 +00:00
Restore std::cout instead of printf()
I am not able to reproduce the speed regression anymore, and also we were using cout even before speed regression so probably the reason is not there. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
e89a8e0913
commit
b5f6c2241b
2 changed files with 25 additions and 28 deletions
|
@ -17,7 +17,6 @@
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cstdio>
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
@ -36,9 +35,6 @@ extern void kpk_bitbase_init();
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
|
|
||||||
// Disable output buffering: printf() does not work correctly otherwise
|
|
||||||
setvbuf(stdout, NULL, _IONBF, 0);
|
|
||||||
|
|
||||||
bitboards_init();
|
bitboards_init();
|
||||||
Position::init();
|
Position::init();
|
||||||
kpk_bitbase_init();
|
kpk_bitbase_init();
|
||||||
|
|
|
@ -20,9 +20,9 @@
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstdio>
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -47,6 +47,8 @@ namespace Search {
|
||||||
}
|
}
|
||||||
|
|
||||||
using std::string;
|
using std::string;
|
||||||
|
using std::cout;
|
||||||
|
using std::endl;
|
||||||
using namespace Search;
|
using namespace Search;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -337,7 +339,7 @@ void Search::think() {
|
||||||
<< " time: " << Limits.time
|
<< " time: " << Limits.time
|
||||||
<< " increment: " << Limits.increment
|
<< " increment: " << Limits.increment
|
||||||
<< " moves to go: " << Limits.movesToGo
|
<< " moves to go: " << Limits.movesToGo
|
||||||
<< std::endl;
|
<< endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < Threads.size(); i++)
|
for (int i = 0; i < Threads.size(); i++)
|
||||||
|
@ -371,7 +373,7 @@ void Search::think() {
|
||||||
|
|
||||||
StateInfo st;
|
StateInfo st;
|
||||||
pos.do_move(RootMoves[0].pv[0], st);
|
pos.do_move(RootMoves[0].pv[0], st);
|
||||||
log << "\nPonder move: " << move_to_san(pos, RootMoves[0].pv[1]) << std::endl;
|
log << "\nPonder move: " << move_to_san(pos, RootMoves[0].pv[1]) << endl;
|
||||||
pos.undo_move(RootMoves[0].pv[0]);
|
pos.undo_move(RootMoves[0].pv[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,9 +386,8 @@ finish:
|
||||||
Threads.wait_for_stop_or_ponderhit();
|
Threads.wait_for_stop_or_ponderhit();
|
||||||
|
|
||||||
// Best move could be MOVE_NONE when searching on a stalemate position
|
// Best move could be MOVE_NONE when searching on a stalemate position
|
||||||
printf("bestmove %s ponder %s\n",
|
cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960)
|
||||||
move_to_uci(RootMoves[0].pv[0], Chess960).c_str(),
|
<< " ponder " << move_to_uci(RootMoves[0].pv[1], Chess960) << endl;
|
||||||
move_to_uci(RootMoves[0].pv[1], Chess960).c_str());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -412,8 +413,8 @@ namespace {
|
||||||
// Handle the special case of a mate/stalemate position
|
// Handle the special case of a mate/stalemate position
|
||||||
if (RootMoves.empty())
|
if (RootMoves.empty())
|
||||||
{
|
{
|
||||||
printf("info depth 0%s\n",
|
cout << "info depth 0"
|
||||||
score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW).c_str());
|
<< score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW) << endl;
|
||||||
|
|
||||||
RootMoves.push_back(MOVE_NONE);
|
RootMoves.push_back(MOVE_NONE);
|
||||||
return;
|
return;
|
||||||
|
@ -475,7 +476,7 @@ namespace {
|
||||||
|
|
||||||
// If search has been stopped exit the aspiration window loop.
|
// If search has been stopped exit the aspiration window loop.
|
||||||
// Sorting and writing PV back to TT is safe becuase RootMoves
|
// Sorting and writing PV back to TT is safe becuase RootMoves
|
||||||
// is still valid, although refers to previous iteration.
|
// is still valid, although refers to previous iteration.
|
||||||
if (Signals.stop)
|
if (Signals.stop)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -898,8 +899,9 @@ split_point_start: // At split points actual search starts from here
|
||||||
nodes = pos.nodes_searched();
|
nodes = pos.nodes_searched();
|
||||||
|
|
||||||
if (pos.thread() == 0 && elapsed_time() > 2000)
|
if (pos.thread() == 0 && elapsed_time() > 2000)
|
||||||
printf("info depth %i currmove %s currmovenumber %i\n", depth / ONE_PLY,
|
cout << "info depth " << depth / ONE_PLY
|
||||||
move_to_uci(move, Chess960).c_str(), moveCount + PVIdx);
|
<< " currmove " << move_to_uci(move, Chess960)
|
||||||
|
<< " currmovenumber " << moveCount + PVIdx << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
isPvMove = (PvNode && moveCount <= 1);
|
isPvMove = (PvNode && moveCount <= 1);
|
||||||
|
@ -1489,8 +1491,8 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
|
|
||||||
// value_to_tt() adjusts a mate score from "plies to mate from the root" to
|
// value_to_tt() adjusts a mate score from "plies to mate from the root" to
|
||||||
// "plies to mate from the current ply". Non-mate scores are unchanged.
|
// "plies to mate from the current ply". Non-mate scores are unchanged. The
|
||||||
// The function is called before storing a value to the transposition table.
|
// function is called before storing a value to the transposition table.
|
||||||
|
|
||||||
Value value_to_tt(Value v, int ply) {
|
Value value_to_tt(Value v, int ply) {
|
||||||
|
|
||||||
|
@ -1636,7 +1638,6 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
int t = elapsed_time();
|
int t = elapsed_time();
|
||||||
int selDepth = 0;
|
int selDepth = 0;
|
||||||
std::stringstream s;
|
|
||||||
|
|
||||||
for (int i = 0; i < Threads.size(); i++)
|
for (int i = 0; i < Threads.size(); i++)
|
||||||
if (Threads[i].maxPly > selDepth)
|
if (Threads[i].maxPly > selDepth)
|
||||||
|
@ -1651,19 +1652,19 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
int d = (updated ? depth : depth - 1);
|
int d = (updated ? depth : depth - 1);
|
||||||
Value v = (updated ? RootMoves[i].score : RootMoves[i].prevScore);
|
Value v = (updated ? RootMoves[i].score : RootMoves[i].prevScore);
|
||||||
|
std::stringstream s;
|
||||||
s << "info depth " << d
|
|
||||||
<< " seldepth " << selDepth
|
|
||||||
<< (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v))
|
|
||||||
<< " nodes " << pos.nodes_searched()
|
|
||||||
<< " nps " << (t > 0 ? pos.nodes_searched() * 1000 / t : 0)
|
|
||||||
<< " time " << t
|
|
||||||
<< " multipv " << i + 1 << " pv";
|
|
||||||
|
|
||||||
for (int j = 0; RootMoves[i].pv[j] != MOVE_NONE; j++)
|
for (int j = 0; RootMoves[i].pv[j] != MOVE_NONE; j++)
|
||||||
s << " " << move_to_uci(RootMoves[i].pv[j], Chess960);
|
s << " " << move_to_uci(RootMoves[i].pv[j], Chess960);
|
||||||
|
|
||||||
printf("%s\n", s.str().c_str()); // Much faster than std::cout
|
cout << "info depth " << d
|
||||||
|
<< " seldepth " << selDepth
|
||||||
|
<< (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v))
|
||||||
|
<< " nodes " << pos.nodes_searched()
|
||||||
|
<< " nps " << (t > 0 ? pos.nodes_searched() * 1000 / t : 0)
|
||||||
|
<< " time " << t
|
||||||
|
<< " multipv " << i + 1
|
||||||
|
<< " pv" << s.str() << endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1753,7 +1754,7 @@ split_point_start: // At split points actual search starts from here
|
||||||
pos.undo_move(*--m);
|
pos.undo_move(*--m);
|
||||||
|
|
||||||
Log l(Options["Search Log Filename"].value<string>());
|
Log l(Options["Search Log Filename"].value<string>());
|
||||||
l << s.str() << std::endl;
|
l << s.str() << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue