LimitsType Limits;
RootMoveVector RootMoves;
Position RootPos;
- Time::point SearchTime;
+ TimePoint SearchTime;
StateStackPtr SetupStates;
}
double BestMoveChanges;
Value DrawValue[COLOR_NB];
HistoryStats History;
+ CounterMovesHistoryStats CounterMovesHistory;
GainsStats Gains;
MovesStats Countermoves, Followupmoves;
Value value_from_tt(Value v, int ply);
void update_pv(Move* pv, Move move, Move* childPv);
void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt);
- string uci_pv(const Position& pos, Depth depth, Value alpha, Value beta);
} // namespace
CheckInfo ci(pos);
const bool leaf = (depth == 2 * ONE_PLY);
- for (const ExtMove& ms : MoveList<LEGAL>(pos))
+ for (const auto& m : MoveList<LEGAL>(pos))
{
if (Root && depth <= ONE_PLY)
cnt = 1, nodes++;
else
{
- pos.do_move(ms.move, st, ci, pos.gives_check(ms.move, ci));
+ pos.do_move(m, st, pos.gives_check(m, ci));
cnt = leaf ? MoveList<LEGAL>(pos).size() : perft<false>(pos, depth - ONE_PLY);
nodes += cnt;
- pos.undo_move(ms.move);
+ pos.undo_move(m);
}
if (Root)
- sync_cout << UCI::move(ms.move, pos.is_chess960()) << ": " << cnt << sync_endl;
+ sync_cout << UCI::move(m, pos.is_chess960()) << ": " << cnt << sync_endl;
}
return nodes;
}
if (RootMoves.empty())
{
- RootMoves.push_back(MOVE_NONE);
+ RootMoves.push_back(RootMove(MOVE_NONE));
sync_cout << "info depth 0 score "
<< UCI::value(RootPos.checkers() ? -VALUE_MATE : VALUE_DRAW)
<< sync_endl;
TT.new_search();
History.clear();
+ CounterMovesHistory.clear();
Gains.clear();
Countermoves.clear();
Followupmoves.clear();
// the UI) before a re-search.
if ( multiPV == 1
&& (bestValue <= alpha || bestValue >= beta)
- && Time::now() - SearchTime > 3000)
- sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
+ && now() - SearchTime > 3000)
+ sync_cout << UCI::pv(pos, depth, alpha, beta) << sync_endl;
// In case of failing low/high increase aspiration window and
// re-search, otherwise exit the loop.
if (Signals.stop)
sync_cout << "info nodes " << RootPos.nodes_searched()
- << " time " << Time::now() - SearchTime << sync_endl;
+ << " time " << now() - SearchTime << sync_endl;
- else if (PVIdx + 1 == multiPV || Time::now() - SearchTime > 3000)
- sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
+ else if (PVIdx + 1 == multiPV || now() - SearchTime > 3000)
+ sync_cout << UCI::pv(pos, depth, alpha, beta) << sync_endl;
}
// If skill level is enabled and time is up, pick a sub-optimal best move
// Stop the search if only one legal move is available or all
// of the available time has been used.
if ( RootMoves.size() == 1
- || Time::now() - SearchTime > TimeMgr.available_time())
+ || now() - SearchTime > TimeMgr.available_time())
{
// If we are allowed to ponder do not stop the search now but
// keep pondering until the GUI sends "ponderhit" or "stop".
assert((ss-1)->currentMove != MOVE_NONE);
assert((ss-1)->currentMove != MOVE_NULL);
- MovePicker mp(pos, ttMove, History, pos.captured_piece_type());
+ MovePicker mp(pos, ttMove, History, CounterMovesHistory, pos.captured_piece_type());
CheckInfo ci(pos);
while ((move = mp.next_move<false>()) != MOVE_NONE)
if (pos.legal(move, ci.pinned))
{
ss->currentMove = move;
- pos.do_move(move, st, ci, pos.gives_check(move, ci));
+ pos.do_move(move, st, pos.gives_check(move, ci));
value = -search<NonPV, false>(pos, ss+1, -rbeta, -rbeta+1, rdepth, !cutNode);
pos.undo_move(move);
if (value >= rbeta)
Move followupmoves[] = { Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].first,
Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].second };
- MovePicker mp(pos, ttMove, depth, History, countermoves, followupmoves, ss);
+ MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, countermoves, followupmoves, ss);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
improving = ss->staticEval >= (ss-2)->staticEval
{
Signals.firstRootMove = (moveCount == 1);
- if (thisThread == Threads.main() && Time::now() - SearchTime > 3000)
+ if (thisThread == Threads.main() && now() - SearchTime > 3000)
sync_cout << "info depth " << depth / ONE_PLY
<< " currmove " << UCI::move(move, pos.is_chess960())
<< " currmovenumber " << moveCount + PVIdx << sync_endl;
}
// Speculative prefetch as early as possible
- prefetch((char*)TT.first_entry(pos.key_after(move)));
+ prefetch(TT.first_entry(pos.key_after(move)));
// Check for legality just before making the move
if (!RootNode && !SpNode && !pos.legal(move, ci.pinned))
quietsSearched[quietCount++] = move;
// Step 14. Make the move
- pos.do_move(move, st, ci, givesCheck);
+ pos.do_move(move, st, givesCheck);
// Step 15. Reduced depth search (LMR). If the move fails high it will be
// re-searched at full depth.
&& Threads.size() >= 2
&& depth >= Threads.minimumSplitDepth
&& ( !thisThread->activeSplitPoint
- || !thisThread->activeSplitPoint->allSlavesSearching)
+ || !thisThread->activeSplitPoint->allSlavesSearching
+ || ( Threads.size() > MAX_SLAVES_PER_SPLITPOINT
+ && thisThread->activeSplitPoint->slavesMask.count() == MAX_SLAVES_PER_SPLITPOINT))
&& thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD)
{
assert(bestValue > -VALUE_INFINITE && bestValue < beta);
// to search the moves. Because the depth is <= 0 here, only captures,
// queen promotions and checks (only if depth >= DEPTH_QS_CHECKS) will
// be generated.
- MovePicker mp(pos, ttMove, depth, History, to_sq((ss-1)->currentMove));
+ MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, to_sq((ss-1)->currentMove));
CheckInfo ci(pos);
// Loop through the moves until no moves remain or a beta cutoff occurs
continue;
// Speculative prefetch as early as possible
- prefetch((char*)TT.first_entry(pos.key_after(move)));
+ prefetch(TT.first_entry(pos.key_after(move)));
// Check for legality just before making the move
if (!pos.legal(move, ci.pinned))
ss->currentMove = move;
// Make and search the move
- pos.do_move(move, st, ci, givesCheck);
+ pos.do_move(move, st, givesCheck);
value = givesCheck ? -qsearch<NT, true>(pos, ss+1, -beta, -alpha, depth - ONE_PLY)
: -qsearch<NT, false>(pos, ss+1, -beta, -alpha, depth - ONE_PLY);
pos.undo_move(move);
if (is_ok((ss-1)->currentMove))
{
Square prevMoveSq = to_sq((ss-1)->currentMove);
- Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, move);
+ Piece prevMovePiece = pos.piece_on(prevMoveSq);
+ Countermoves.update(prevMovePiece, prevMoveSq, move);
+
+ HistoryStats& cmh = CounterMovesHistory[prevMovePiece][prevMoveSq];
+ cmh.update(pos.moved_piece(move), to_sq(move), bonus);
+ for (int i = 0; i < quietsCnt; ++i)
+ {
+ Move m = quiets[i];
+ cmh.update(pos.moved_piece(m), to_sq(m), -bonus);
+ }
}
if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove)
Move Skill::pick_best(size_t multiPV) {
// PRNG sequence should be non-deterministic, so we seed it with the time at init
- static PRNG rng(Time::now());
+ static PRNG rng(now());
// RootMoves are already sorted by score in descending order
int variance = std::min(RootMoves[0].score - RootMoves[multiPV - 1].score, PawnValueMg);
// then we choose the move with the resulting highest score.
for (size_t i = 0; i < multiPV; ++i)
{
- int score = RootMoves[i].score;
-
// This is our magic formula
- score += ( weakness * int(RootMoves[0].score - score)
- + variance * (rng.rand<unsigned>() % weakness)) / 128;
+ int push = ( weakness * int(RootMoves[0].score - RootMoves[i].score)
+ + variance * (rng.rand<unsigned>() % weakness)) / 128;
- if (score > maxScore)
+ if (RootMoves[i].score + push > maxScore)
{
- maxScore = score;
+ maxScore = RootMoves[i].score + push;
best = RootMoves[i].pv[0];
}
}
return best;
}
+} // namespace
+
- // uci_pv() formats PV information according to the UCI protocol. UCI
- // requires that all (if any) unsearched PV lines are sent using a previous
- // search score.
+/// UCI::pv() formats PV information according to the UCI protocol. UCI requires
+/// that all (if any) unsearched PV lines are sent using a previous search score.
- string uci_pv(const Position& pos, Depth depth, Value alpha, Value beta) {
+string UCI::pv(const Position& pos, Depth depth, Value alpha, Value beta) {
- std::stringstream ss;
- Time::point elapsed = Time::now() - SearchTime + 1;
- size_t uciPVSize = std::min((size_t)Options["MultiPV"], RootMoves.size());
- int selDepth = 0;
+ std::stringstream ss;
+ TimePoint elapsed = now() - SearchTime + 1;
+ size_t multiPV = std::min((size_t)Options["MultiPV"], RootMoves.size());
+ int selDepth = 0;
- for (Thread* th : Threads)
- if (th->maxPly > selDepth)
- selDepth = th->maxPly;
+ for (Thread* th : Threads)
+ if (th->maxPly > selDepth)
+ selDepth = th->maxPly;
- for (size_t i = 0; i < uciPVSize; ++i)
- {
- bool updated = (i <= PVIdx);
+ for (size_t i = 0; i < multiPV; ++i)
+ {
+ bool updated = (i <= PVIdx);
- if (depth == ONE_PLY && !updated)
- continue;
+ if (depth == ONE_PLY && !updated)
+ continue;
- Depth d = updated ? depth : depth - ONE_PLY;
- Value v = updated ? RootMoves[i].score : RootMoves[i].previousScore;
+ Depth d = updated ? depth : depth - ONE_PLY;
+ Value v = updated ? RootMoves[i].score : RootMoves[i].previousScore;
- bool tb = TB::RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
- v = tb ? TB::Score : v;
+ bool tb = TB::RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
+ v = tb ? TB::Score : v;
- if (ss.rdbuf()->in_avail()) // Not at first line
- ss << "\n";
+ if (ss.rdbuf()->in_avail()) // Not at first line
+ ss << "\n";
- ss << "info depth " << d / ONE_PLY
- << " seldepth " << selDepth
- << " multipv " << i + 1
- << " score " << UCI::value(v);
+ ss << "info"
+ << " depth " << d / ONE_PLY
+ << " seldepth " << selDepth
+ << " multipv " << i + 1
+ << " score " << UCI::value(v);
- if (!tb && i == PVIdx)
- ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
+ if (!tb && i == PVIdx)
+ ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
- ss << " nodes " << pos.nodes_searched()
- << " nps " << pos.nodes_searched() * 1000 / elapsed
- << " tbhits " << TB::Hits
- << " time " << elapsed
- << " pv";
+ ss << " nodes " << pos.nodes_searched()
+ << " nps " << pos.nodes_searched() * 1000 / elapsed;
- for (size_t j = 0; j < RootMoves[i].pv.size(); ++j)
- ss << " " << UCI::move(RootMoves[i].pv[j], pos.is_chess960());
- }
+ if (elapsed > 1000) // Earlier makes little sense
+ ss << " hashfull " << TT.hashfull();
- return ss.str();
+ ss << " tbhits " << TB::Hits
+ << " time " << elapsed
+ << " pv";
+
+ for (Move m : RootMoves[i].pv)
+ ss << " " << UCI::move(m, pos.is_chess960());
}
-} // namespace
+ return ss.str();
+}
/// RootMove::insert_pv_in_tt() is called at the end of a search iteration, and
void RootMove::insert_pv_in_tt(Position& pos) {
StateInfo state[MAX_PLY], *st = state;
- size_t idx = 0;
+ bool ttHit;
- for ( ; idx < pv.size(); ++idx)
+ for (Move m : pv)
{
- bool ttHit;
- TTEntry* tte = TT.probe(pos.key(), ttHit);
+ assert(MoveList<LEGAL>(pos).contains(m));
- if (!ttHit || tte->move() != pv[idx]) // Don't overwrite correct entries
- tte->save(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[idx], VALUE_NONE, TT.generation());
+ TTEntry* tte = TT.probe(pos.key(), ttHit);
- assert(MoveList<LEGAL>(pos).contains(pv[idx]));
+ if (!ttHit || tte->move() != m) // Don't overwrite correct entries
+ tte->save(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, m, VALUE_NONE, TT.generation());
- pos.do_move(pv[idx], *st++);
+ pos.do_move(m, *st++, pos.gives_check(m, CheckInfo(pos)));
}
- while (idx) pos.undo_move(pv[--idx]);
+ for (size_t i = pv.size(); i > 0; )
+ pos.undo_move(pv[--i]);
}
/// root. We try hard to have a ponder move to return to the GUI, otherwise in case of
/// 'ponder on' we have nothing to think on.
-Move RootMove::extract_ponder_from_tt(Position& pos)
+bool RootMove::extract_ponder_from_tt(Position& pos)
{
StateInfo st;
- bool found;
+ bool ttHit;
assert(pv.size() == 1);
- pos.do_move(pv[0], st);
- TTEntry* tte = TT.probe(pos.key(), found);
- Move m = found ? tte->move() : MOVE_NONE;
- if (!MoveList<LEGAL>(pos).contains(m))
- m = MOVE_NONE;
-
+ pos.do_move(pv[0], st, pos.gives_check(pv[0], CheckInfo(pos)));
+ TTEntry* tte = TT.probe(pos.key(), ttHit);
pos.undo_move(pv[0]);
- pv.push_back(m);
- return m;
+
+ if (ttHit)
+ {
+ Move m = tte->move(); // Local copy to be SMP safe
+ if (MoveList<LEGAL>(pos).contains(m))
+ return pv.push_back(m), true;
+ }
+
+ return false;
}
// Pointer 'this_sp' is not null only if we are called from split(), and not
// at the thread creation. This means we are the split point's master.
- SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : nullptr;
+ SplitPoint* this_sp = activeSplitPoint;
- assert(!this_sp || (this_sp->masterThread == this && searching));
+ assert(!this_sp || (this_sp->master == this && searching));
while (!exit)
{
// If this thread has been assigned work, launch a search
while (searching)
{
- Threads.mutex.lock();
+ mutex.lock();
assert(activeSplitPoint);
SplitPoint* sp = activeSplitPoint;
- Threads.mutex.unlock();
+ mutex.unlock();
Stack stack[MAX_PLY+4], *ss = stack+2; // To allow referencing (ss-2) and (ss+2)
Position pos(*sp->pos, this);
// Wake up the master thread so to allow it to return from the idle
// loop in case we are the last slave of the split point.
- if ( this != sp->masterThread
- && sp->slavesMask.none())
+ if (this != sp->master && sp->slavesMask.none())
{
- assert(!sp->masterThread->searching);
- sp->masterThread->notify_one();
+ assert(!sp->master->searching);
+
+ sp->master->notify_one();
}
// After releasing the lock we can't access any SplitPoint related data
// Try to late join to another split point if none of its slaves has
// already finished.
- if (Threads.size() > 2)
- for (size_t i = 0; i < Threads.size(); ++i)
+ SplitPoint* bestSp = NULL;
+ int minLevel = INT_MAX;
+
+ for (Thread* th : Threads)
+ {
+ const size_t size = th->splitPointsSize; // Local copy
+ sp = size ? &th->splitPoints[size - 1] : nullptr;
+
+ if ( sp
+ && sp->allSlavesSearching
+ && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
+ && can_join(sp))
+ {
+ assert(this != th);
+ assert(!(this_sp && this_sp->slavesMask.none()));
+ assert(Threads.size() > 2);
+
+ // Prefer to join to SP with few parents to reduce the probability
+ // that a cut-off occurs above us, and hence we waste our work.
+ int level = 0;
+ for (SplitPoint* p = th->activeSplitPoint; p; p = p->parentSplitPoint)
+ level++;
+
+ if (level < minLevel)
+ {
+ bestSp = sp;
+ minLevel = level;
+ }
+ }
+ }
+
+ if (bestSp)
+ {
+ sp = bestSp;
+
+ // Recheck the conditions under lock protection
+ sp->mutex.lock();
+
+ if ( sp->allSlavesSearching
+ && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT)
{
- const int size = Threads[i]->splitPointsSize; // Local copy
- sp = size ? &Threads[i]->splitPoints[size - 1] : nullptr;
+ mutex.lock();
- if ( sp
- && sp->allSlavesSearching
- && available_to(Threads[i]))
+ if (can_join(sp))
{
- // Recheck the conditions under lock protection
- Threads.mutex.lock();
- sp->mutex.lock();
-
- if ( sp->allSlavesSearching
- && available_to(Threads[i]))
- {
- sp->slavesMask.set(idx);
- activeSplitPoint = sp;
- searching = true;
- }
-
- sp->mutex.unlock();
- Threads.mutex.unlock();
-
- break; // Just a single attempt
+ sp->slavesMask.set(idx);
+ activeSplitPoint = sp;
+ searching = true;
}
+
+ mutex.unlock();
}
+
+ sp->mutex.unlock();
+ }
}
- // Grab the lock to avoid races with Thread::notify_one()
- std::unique_lock<std::mutex> lk(mutex);
+ // Avoid races with notify_one() fired from last slave of the split point
+ std::unique_lock<Mutex> lk(mutex);
// If we are master and all slaves have finished then exit idle_loop
if (this_sp && this_sp->slavesMask.none())
void check_time() {
- static Time::point lastInfoTime = Time::now();
- Time::point elapsed = Time::now() - SearchTime;
+ static TimePoint lastInfoTime = now();
+ TimePoint elapsed = now() - SearchTime;
- if (Time::now() - lastInfoTime >= 1000)
+ if (now() - lastInfoTime >= 1000)
{
- lastInfoTime = Time::now();
+ lastInfoTime = now();
dbg_print();
}
else if (Limits.nodes)
{
- Threads.mutex.lock();
-
int64_t nodes = RootPos.nodes_searched();
// Loop across all split points and sum accumulated SplitPoint nodes plus
// all the currently active positions nodes.
+ // FIXME: Racy...
for (Thread* th : Threads)
- for (int i = 0; i < th->splitPointsSize; ++i)
+ for (size_t i = 0; i < th->splitPointsSize; ++i)
{
SplitPoint& sp = th->splitPoints[i];
sp.mutex.unlock();
}
- Threads.mutex.unlock();
-
if (nodes >= Limits.nodes)
Signals.stop = true;
}