And introduce SPlitPoint bestMove to pass back the
best move after a split point.
This allow to define as const the search stack passed
to split.
No functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
StateInfo st;
const TTEntry *tte;
Key posKey;
StateInfo st;
const TTEntry *tte;
Key posKey;
- Move ttMove, move, excludedMove, threatMove;
+ Move ttMove, move, excludedMove, bestMove, threatMove;
Depth ext, newDepth;
Bound bt;
Value bestValue, value, oldAlpha;
Depth ext, newDepth;
Bound bt;
Value bestValue, value, oldAlpha;
tte = NULL;
ttMove = excludedMove = MOVE_NONE;
sp = ss->sp;
tte = NULL;
ttMove = excludedMove = MOVE_NONE;
sp = ss->sp;
+ bestMove = sp->bestMove;
threatMove = sp->threatMove;
bestValue = sp->bestValue;
moveCount = sp->moveCount; // Lock must be held here
threatMove = sp->threatMove;
bestValue = sp->bestValue;
moveCount = sp->moveCount; // Lock must be held here
- ss->currentMove = ss->bestMove = threatMove = (ss+1)->excludedMove = MOVE_NONE;
+ ss->currentMove = threatMove = (ss+1)->excludedMove = bestMove = MOVE_NONE;
(ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO;
(ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE;
(ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO;
(ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE;
: can_return_tt(tte, depth, beta, ss->ply)))
{
TT.refresh(tte);
: can_return_tt(tte, depth, beta, ss->ply)))
{
TT.refresh(tte);
- ss->bestMove = move = ttMove; // Can be MOVE_NONE
+ ss->currentMove = ttMove; // Can be MOVE_NONE
value = value_from_tt(tte->value(), ss->ply);
if ( value >= beta
value = value_from_tt(tte->value(), ss->ply);
if ( value >= beta
- && move
- && !pos.is_capture_or_promotion(move)
- && move != ss->killers[0])
+ && ttMove
+ && !pos.is_capture_or_promotion(ttMove)
+ && ttMove != ss->killers[0])
{
ss->killers[1] = ss->killers[0];
{
ss->killers[1] = ss->killers[0];
+ ss->killers[0] = ttMove;
// move which was reduced. If a connection is found, return a fail
// low score (which will cause the reduced move to fail high in the
// parent node, which will trigger a re-search with full depth).
// move which was reduced. If a connection is found, return a fail
// low score (which will cause the reduced move to fail high in the
// parent node, which will trigger a re-search with full depth).
- threatMove = (ss+1)->bestMove;
+ threatMove = (ss+1)->currentMove;
if ( depth < ThreatDepth
&& (ss-1)->reduction
if ( depth < ThreatDepth
&& (ss-1)->reduction
assert(rdepth >= ONE_PLY);
assert((ss-1)->currentMove != MOVE_NONE);
assert(rdepth >= ONE_PLY);
assert((ss-1)->currentMove != MOVE_NONE);
+ assert((ss-1)->currentMove != MOVE_NULL);
MovePicker mp(pos, ttMove, H, pos.captured_piece_type());
CheckInfo ci(pos);
MovePicker mp(pos, ttMove, H, pos.captured_piece_type());
CheckInfo ci(pos);
MovePickerExt<SpNode> mp(pos, ttMove, depth, H, ss, PvNode ? -VALUE_INFINITE : beta);
CheckInfo ci(pos);
MovePickerExt<SpNode> mp(pos, ttMove, depth, H, ss, PvNode ? -VALUE_INFINITE : beta);
CheckInfo ci(pos);
- ss->bestMove = MOVE_NONE;
futilityBase = ss->eval + ss->evalMargin;
singularExtensionNode = !RootNode
&& !SpNode
futilityBase = ss->eval + ss->evalMargin;
singularExtensionNode = !RootNode
&& !SpNode
value = search<NonPV>(pos, ss, rBeta - 1, rBeta, depth / 2);
ss->skipNullMove = false;
ss->excludedMove = MOVE_NONE;
value = search<NonPV>(pos, ss, rBeta - 1, rBeta, depth / 2);
ss->skipNullMove = false;
ss->excludedMove = MOVE_NONE;
- ss->bestMove = MOVE_NONE;
if (value < rBeta)
ext = ONE_PLY;
}
if (value < rBeta)
ext = ONE_PLY;
}
if (value > bestValue)
{
bestValue = value;
if (value > bestValue)
{
bestValue = value;
if ( PvNode
&& value > alpha
if ( PvNode
&& value > alpha
if (SpNode && !thread.cutoff_occurred())
{
sp->bestValue = value;
if (SpNode && !thread.cutoff_occurred())
{
sp->bestValue = value;
- sp->ss->bestMove = move;
sp->alpha = alpha;
if (value >= beta)
sp->alpha = alpha;
if (value >= beta)
&& Threads.available_slave_exists(pos.thread())
&& !Signals.stop
&& !thread.cutoff_occurred())
&& Threads.available_slave_exists(pos.thread())
&& !Signals.stop
&& !thread.cutoff_occurred())
- bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, depth,
- threatMove, moveCount, &mp, NT);
+ bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove,
+ depth, threatMove, moveCount, &mp, NT);
}
// Step 20. Check for mate and stalemate
}
// Step 20. Check for mate and stalemate
{
assert(!playedMoveCount);
{
assert(!playedMoveCount);
}
// Step 21. Update tables
// Update transposition table entry, killers and history
if (!SpNode && !Signals.stop && !thread.cutoff_occurred())
{
}
// Step 21. Update tables
// Update transposition table entry, killers and history
if (!SpNode && !Signals.stop && !thread.cutoff_occurred())
{
- move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove;
+ move = bestValue <= oldAlpha ? MOVE_NONE : bestMove;
bt = bestValue <= oldAlpha ? BOUND_UPPER
: bestValue >= beta ? BOUND_LOWER : BOUND_EXACT;
bt = bestValue <= oldAlpha ? BOUND_UPPER
: bestValue >= beta ? BOUND_LOWER : BOUND_EXACT;
assert(pos.thread() >= 0 && pos.thread() < Threads.size());
StateInfo st;
assert(pos.thread() >= 0 && pos.thread() < Threads.size());
StateInfo st;
+ Move ttMove, move, bestMove;
Value bestValue, value, evalMargin, futilityValue, futilityBase;
bool inCheck, enoughMaterial, givesCheck, evasionPrunable;
const TTEntry* tte;
Value bestValue, value, evalMargin, futilityValue, futilityBase;
bool inCheck, enoughMaterial, givesCheck, evasionPrunable;
const TTEntry* tte;
Bound bt;
Value oldAlpha = alpha;
Bound bt;
Value oldAlpha = alpha;
- ss->bestMove = ss->currentMove = MOVE_NONE;
+ ss->currentMove = bestMove = MOVE_NONE;
ss->ply = (ss-1)->ply + 1;
// Check for an instant draw or maximum ply reached
ss->ply = (ss-1)->ply + 1;
// Check for an instant draw or maximum ply reached
if (!PvNode && tte && can_return_tt(tte, ttDepth, beta, ss->ply))
{
if (!PvNode && tte && can_return_tt(tte, ttDepth, beta, ss->ply))
{
- ss->bestMove = ttMove; // Can be MOVE_NONE
+ ss->currentMove = ttMove; // Can be MOVE_NONE
return value_from_tt(tte->value(), ss->ply);
}
return value_from_tt(tte->value(), ss->ply);
}
if (value > bestValue)
{
bestValue = value;
if (value > bestValue)
{
bestValue = value;
if ( PvNode
&& value > alpha
if ( PvNode
&& value > alpha
return mated_in(ss->ply); // Plies to mate from the root
// Update transposition table
return mated_in(ss->ply); // Plies to mate from the root
// Update transposition table
- move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove;
+ move = bestValue <= oldAlpha ? MOVE_NONE : bestMove;
bt = bestValue <= oldAlpha ? BOUND_UPPER
: bestValue >= beta ? BOUND_LOWER : BOUND_EXACT;
bt = bestValue <= oldAlpha ? BOUND_UPPER
: bestValue >= beta ? BOUND_LOWER : BOUND_EXACT;
int ply;
Move currentMove;
Move excludedMove;
int ply;
Move currentMove;
Move excludedMove;
Move killers[2];
Depth reduction;
Value eval;
Move killers[2];
Depth reduction;
Value eval;
template <bool Fake>
Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
template <bool Fake>
Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
- Value bestValue, Depth depth, Move threatMove,
- int moveCount, MovePicker* mp, int nodeType) {
+ Value bestValue, Move* bestMove, Depth depth,
+ Move threatMove, int moveCount, MovePicker *mp, int nodeType) {
assert(pos.pos_is_ok());
assert(bestValue > -VALUE_INFINITE);
assert(bestValue <= alpha);
assert(pos.pos_is_ok());
assert(bestValue > -VALUE_INFINITE);
assert(bestValue <= alpha);
sp->cutoff = false;
sp->slavesMask = 1ULL << master;
sp->depth = depth;
sp->cutoff = false;
sp->slavesMask = 1ULL << master;
sp->depth = depth;
+ sp->bestMove = *bestMove;
sp->threatMove = threatMove;
sp->alpha = alpha;
sp->beta = beta;
sp->threatMove = threatMove;
sp->alpha = alpha;
sp->beta = beta;
masterThread.splitPointsCnt--;
masterThread.curSplitPoint = sp->parent;
pos.set_nodes_searched(pos.nodes_searched() + sp->nodes);
masterThread.splitPointsCnt--;
masterThread.curSplitPoint = sp->parent;
pos.set_nodes_searched(pos.nodes_searched() + sp->nodes);
+ *bestMove = sp->bestMove;
lock_release(splitLock);
lock_release(sp->lock);
lock_release(splitLock);
lock_release(sp->lock);
}
// Explicit template instantiations
}
// Explicit template instantiations
-template Value ThreadsManager::split<false>(Position&, Stack*, Value, Value, Value, Depth, Move, int, MovePicker*, int);
-template Value ThreadsManager::split<true>(Position&, Stack*, Value, Value, Value, Depth, Move, int, MovePicker*, int);
+template Value ThreadsManager::split<false>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int);
+template Value ThreadsManager::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int);
// ThreadsManager::set_timer() is used to set the timer to trigger after msec
// ThreadsManager::set_timer() is used to set the timer to trigger after msec
- // Const data after splitPoint has been setup
- SplitPoint* parent;
+ // Const data after split point has been setup
+ const Search::Stack* ss;
Depth depth;
Value beta;
int nodeType;
Depth depth;
Value beta;
int nodeType;
// Const pointers to shared data
MovePicker* mp;
// Const pointers to shared data
MovePicker* mp;
// Shared data
Lock lock;
// Shared data
Lock lock;
volatile int64_t nodes;
volatile Value alpha;
volatile Value bestValue;
volatile int64_t nodes;
volatile Value alpha;
volatile Value bestValue;
+ volatile Move bestMove;
volatile int moveCount;
volatile bool cutoff;
};
volatile int moveCount;
volatile bool cutoff;
};
const std::set<Move>& = std::set<Move>(), bool async = false);
template <bool Fake>
const std::set<Move>& = std::set<Move>(), bool async = false);
template <bool Fake>
- Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue,
+ Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
private:
friend struct Thread;
Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
private:
friend struct Thread;