mirror of
https://github.com/sockspls/badfish
synced 2025-04-29 16:23:09 +00:00
Do not shadow SplitPoint struct with search() parameter
Also retire move_is_killer() is called only from one place. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
85a7456bd7
commit
dcf2edfdea
1 changed files with 46 additions and 56 deletions
102
src/search.cpp
102
src/search.cpp
|
@ -284,7 +284,7 @@ namespace {
|
||||||
Value id_loop(const Position& pos, Move searchMoves[]);
|
Value id_loop(const Position& pos, Move searchMoves[]);
|
||||||
Value root_search(Position& pos, SearchStack* ss, Move* pv, RootMoveList& rml, Value* alphaPtr, Value* betaPtr);
|
Value root_search(Position& pos, SearchStack* ss, Move* pv, RootMoveList& rml, Value* alphaPtr, Value* betaPtr);
|
||||||
|
|
||||||
template <NodeType PvNode, bool SplitPoint>
|
template <NodeType PvNode, bool SpNode>
|
||||||
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply);
|
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply);
|
||||||
|
|
||||||
template <NodeType PvNode>
|
template <NodeType PvNode>
|
||||||
|
@ -302,7 +302,6 @@ namespace {
|
||||||
bool value_is_mate(Value value);
|
bool value_is_mate(Value value);
|
||||||
Value value_to_tt(Value v, int ply);
|
Value value_to_tt(Value v, int ply);
|
||||||
Value value_from_tt(Value v, int ply);
|
Value value_from_tt(Value v, int ply);
|
||||||
bool move_is_killer(Move m, SearchStack* ss);
|
|
||||||
bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
|
bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
|
||||||
bool connected_threat(const Position& pos, Move m, Move threat);
|
bool connected_threat(const Position& pos, Move m, Move threat);
|
||||||
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
|
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
|
||||||
|
@ -965,7 +964,7 @@ namespace {
|
||||||
// all this work again. We also don't need to store anything to the hash table
|
// all this work again. We also don't need to store anything to the hash table
|
||||||
// here: This is taken care of after we return from the split point.
|
// here: This is taken care of after we return from the split point.
|
||||||
|
|
||||||
template <NodeType PvNode, bool SplitPoint>
|
template <NodeType PvNode, bool SpNode>
|
||||||
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) {
|
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) {
|
||||||
|
|
||||||
assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE);
|
assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE);
|
||||||
|
@ -986,16 +985,18 @@ namespace {
|
||||||
bool mateThreat = false;
|
bool mateThreat = false;
|
||||||
int moveCount = 0;
|
int moveCount = 0;
|
||||||
int threadID = pos.thread();
|
int threadID = pos.thread();
|
||||||
|
SplitPoint* sp = NULL;
|
||||||
refinedValue = bestValue = value = -VALUE_INFINITE;
|
refinedValue = bestValue = value = -VALUE_INFINITE;
|
||||||
oldAlpha = alpha;
|
oldAlpha = alpha;
|
||||||
isCheck = pos.is_check();
|
isCheck = pos.is_check();
|
||||||
|
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
{
|
{
|
||||||
|
sp = ss->sp;
|
||||||
tte = NULL;
|
tte = NULL;
|
||||||
ttMove = excludedMove = MOVE_NONE;
|
ttMove = excludedMove = MOVE_NONE;
|
||||||
threatMove = ss->sp->threatMove;
|
threatMove = sp->threatMove;
|
||||||
mateThreat = ss->sp->mateThreat;
|
mateThreat = sp->mateThreat;
|
||||||
goto split_point_start;
|
goto split_point_start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1187,35 +1188,34 @@ split_point_start: // At split points actual search starts from here
|
||||||
// Initialize a MovePicker object for the current position
|
// Initialize a MovePicker object for the current position
|
||||||
// FIXME currently MovePicker() c'tor is needless called also in SplitPoint
|
// FIXME currently MovePicker() c'tor is needless called also in SplitPoint
|
||||||
MovePicker mpBase = MovePicker(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta));
|
MovePicker mpBase = MovePicker(pos, ttMove, depth, H, ss, (PvNode ? -VALUE_INFINITE : beta));
|
||||||
MovePicker& mp = SplitPoint ? *ss->sp->mp : mpBase;
|
MovePicker& mp = SpNode ? *sp->mp : mpBase;
|
||||||
CheckInfo ci(pos);
|
CheckInfo ci(pos);
|
||||||
ss->bestMove = MOVE_NONE;
|
ss->bestMove = MOVE_NONE;
|
||||||
singleEvasion = !SplitPoint && isCheck && mp.number_of_evasions() == 1;
|
singleEvasion = !SpNode && isCheck && mp.number_of_evasions() == 1;
|
||||||
futilityBase = ss->eval + ss->evalMargin;
|
futilityBase = ss->eval + ss->evalMargin;
|
||||||
singularExtensionNode = !SplitPoint
|
singularExtensionNode = !SpNode
|
||||||
&& depth >= SingularExtensionDepth[PvNode]
|
&& depth >= SingularExtensionDepth[PvNode]
|
||||||
&& tte
|
&& tte
|
||||||
&& tte->move()
|
&& tte->move()
|
||||||
&& !excludedMove // Do not allow recursive singular extension search
|
&& !excludedMove // Do not allow recursive singular extension search
|
||||||
&& (tte->type() & VALUE_TYPE_LOWER)
|
&& (tte->type() & VALUE_TYPE_LOWER)
|
||||||
&& tte->depth() >= depth - 3 * ONE_PLY;
|
&& tte->depth() >= depth - 3 * ONE_PLY;
|
||||||
|
if (SpNode)
|
||||||
|
{
|
||||||
|
lock_grab(&(sp->lock));
|
||||||
|
bestValue = sp->bestValue;
|
||||||
|
}
|
||||||
|
|
||||||
// Step 10. Loop through moves
|
// Step 10. Loop through moves
|
||||||
// Loop through all legal moves until no moves remain or a beta cutoff occurs
|
// Loop through all legal moves until no moves remain or a beta cutoff occurs
|
||||||
if (SplitPoint)
|
|
||||||
{
|
|
||||||
lock_grab(&(ss->sp->lock));
|
|
||||||
bestValue = ss->sp->bestValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
while ( bestValue < beta
|
while ( bestValue < beta
|
||||||
&& (move = mp.get_next_move()) != MOVE_NONE
|
&& (move = mp.get_next_move()) != MOVE_NONE
|
||||||
&& !ThreadsMgr.thread_should_stop(threadID))
|
&& !ThreadsMgr.thread_should_stop(threadID))
|
||||||
{
|
{
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
{
|
{
|
||||||
moveCount = ++ss->sp->moveCount;
|
moveCount = ++sp->moveCount;
|
||||||
lock_release(&(ss->sp->lock));
|
lock_release(&(sp->lock));
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(move_is_ok(move));
|
assert(move_is_ok(move));
|
||||||
|
@ -1271,8 +1271,9 @@ split_point_start: // At split points actual search starts from here
|
||||||
&& !(threatMove && connected_threat(pos, move, threatMove))
|
&& !(threatMove && connected_threat(pos, move, threatMove))
|
||||||
&& bestValue > value_mated_in(PLY_MAX)) // FIXME bestValue is racy
|
&& bestValue > value_mated_in(PLY_MAX)) // FIXME bestValue is racy
|
||||||
{
|
{
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
lock_grab(&(ss->sp->lock));
|
lock_grab(&(sp->lock));
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1285,14 +1286,15 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
if (futilityValueScaled < beta)
|
if (futilityValueScaled < beta)
|
||||||
{
|
{
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
{
|
{
|
||||||
lock_grab(&(ss->sp->lock));
|
lock_grab(&(sp->lock));
|
||||||
if (futilityValueScaled > ss->sp->bestValue)
|
if (futilityValueScaled > sp->bestValue)
|
||||||
ss->sp->bestValue = bestValue = futilityValueScaled;
|
sp->bestValue = bestValue = futilityValueScaled;
|
||||||
}
|
}
|
||||||
else if (futilityValueScaled > bestValue)
|
else if (futilityValueScaled > bestValue)
|
||||||
bestValue = futilityValueScaled;
|
bestValue = futilityValueScaled;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1302,7 +1304,7 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
// Step extra. pv search (only in PV nodes)
|
// Step extra. pv search (only in PV nodes)
|
||||||
// The first move in list is the expected PV
|
// The first move in list is the expected PV
|
||||||
if (!SplitPoint && PvNode && moveCount == 1)
|
if (!SpNode && PvNode && moveCount == 1)
|
||||||
value = newDepth < ONE_PLY ? -qsearch<PV>(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1)
|
value = newDepth < ONE_PLY ? -qsearch<PV>(pos, ss+1, -beta, -alpha, DEPTH_ZERO, ply+1)
|
||||||
: - search<PV>(pos, ss+1, -beta, -alpha, newDepth, ply+1);
|
: - search<PV>(pos, ss+1, -beta, -alpha, newDepth, ply+1);
|
||||||
else
|
else
|
||||||
|
@ -1315,12 +1317,12 @@ split_point_start: // At split points actual search starts from here
|
||||||
&& !captureOrPromotion
|
&& !captureOrPromotion
|
||||||
&& !dangerous
|
&& !dangerous
|
||||||
&& !move_is_castle(move)
|
&& !move_is_castle(move)
|
||||||
&& !move_is_killer(move, ss))
|
&& !(ss->killers[0] == move || ss->killers[1] == move))
|
||||||
{
|
{
|
||||||
ss->reduction = reduction<PvNode>(depth, moveCount);
|
ss->reduction = reduction<PvNode>(depth, moveCount);
|
||||||
if (ss->reduction)
|
if (ss->reduction)
|
||||||
{
|
{
|
||||||
alpha = SplitPoint ? ss->sp->alpha : alpha;
|
alpha = SpNode ? sp->alpha : alpha;
|
||||||
Depth d = newDepth - ss->reduction;
|
Depth d = newDepth - ss->reduction;
|
||||||
value = d < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1)
|
value = d < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1)
|
||||||
: - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, ply+1);
|
: - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, ply+1);
|
||||||
|
@ -1336,7 +1338,7 @@ split_point_start: // At split points actual search starts from here
|
||||||
assert(newDepth - ONE_PLY >= ONE_PLY);
|
assert(newDepth - ONE_PLY >= ONE_PLY);
|
||||||
|
|
||||||
ss->reduction = ONE_PLY;
|
ss->reduction = ONE_PLY;
|
||||||
alpha = SplitPoint ? ss->sp->alpha : alpha;
|
alpha = SpNode ? sp->alpha : alpha;
|
||||||
value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, ply+1);
|
value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, ply+1);
|
||||||
doFullDepthSearch = (value > alpha);
|
doFullDepthSearch = (value > alpha);
|
||||||
}
|
}
|
||||||
|
@ -1346,7 +1348,7 @@ split_point_start: // At split points actual search starts from here
|
||||||
// Step 15. Full depth search
|
// Step 15. Full depth search
|
||||||
if (doFullDepthSearch)
|
if (doFullDepthSearch)
|
||||||
{
|
{
|
||||||
alpha = SplitPoint ? ss->sp->alpha : alpha;
|
alpha = SpNode ? sp->alpha : alpha;
|
||||||
value = newDepth < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1)
|
value = newDepth < ONE_PLY ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO, ply+1)
|
||||||
: - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1);
|
: - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1);
|
||||||
|
|
||||||
|
@ -1365,20 +1367,20 @@ split_point_start: // At split points actual search starts from here
|
||||||
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
|
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
|
||||||
|
|
||||||
// Step 17. Check for new best move
|
// Step 17. Check for new best move
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
{
|
{
|
||||||
lock_grab(&(ss->sp->lock));
|
lock_grab(&(sp->lock));
|
||||||
bestValue = ss->sp->bestValue;
|
bestValue = sp->bestValue;
|
||||||
alpha = ss->sp->alpha;
|
alpha = sp->alpha;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value > bestValue && !(SplitPoint && ThreadsMgr.thread_should_stop(threadID)))
|
if (value > bestValue && !(SpNode && ThreadsMgr.thread_should_stop(threadID)))
|
||||||
{
|
{
|
||||||
bestValue = value;
|
bestValue = value;
|
||||||
if (value > alpha)
|
if (value > alpha)
|
||||||
{
|
{
|
||||||
if (SplitPoint && (!PvNode || value >= beta))
|
if (SpNode && (!PvNode || value >= beta))
|
||||||
ss->sp->stopRequest = true;
|
sp->stopRequest = true;
|
||||||
|
|
||||||
if (PvNode && value < beta) // We want always alpha < beta
|
if (PvNode && value < beta) // We want always alpha < beta
|
||||||
alpha = value;
|
alpha = value;
|
||||||
|
@ -1388,16 +1390,16 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
ss->bestMove = move;
|
ss->bestMove = move;
|
||||||
}
|
}
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
{
|
{
|
||||||
ss->sp->bestValue = bestValue;
|
sp->bestValue = bestValue;
|
||||||
ss->sp->alpha = alpha;
|
sp->alpha = alpha;
|
||||||
ss->sp->parentSstack->bestMove = ss->bestMove;
|
sp->parentSstack->bestMove = ss->bestMove;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 18. Check for split
|
// Step 18. Check for split
|
||||||
if ( !SplitPoint
|
if ( !SpNode
|
||||||
&& depth >= MinimumSplitDepth
|
&& depth >= MinimumSplitDepth
|
||||||
&& ThreadsMgr.active_threads() > 1
|
&& ThreadsMgr.active_threads() > 1
|
||||||
&& bestValue < beta
|
&& bestValue < beta
|
||||||
|
@ -1409,11 +1411,11 @@ split_point_start: // At split points actual search starts from here
|
||||||
threatMove, mateThreat, moveCount, &mp, PvNode);
|
threatMove, mateThreat, moveCount, &mp, PvNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SplitPoint)
|
if (SpNode)
|
||||||
{
|
{
|
||||||
/* Here we have the lock still grabbed */
|
/* Here we have the lock still grabbed */
|
||||||
ss->sp->slaves[threadID] = 0;
|
sp->slaves[threadID] = 0;
|
||||||
lock_release(&(ss->sp->lock));
|
lock_release(&(sp->lock));
|
||||||
return bestValue;
|
return bestValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1717,17 +1719,6 @@ split_point_start: // At split points actual search starts from here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// move_is_killer() checks if the given move is among the killer moves
|
|
||||||
|
|
||||||
bool move_is_killer(Move m, SearchStack* ss) {
|
|
||||||
|
|
||||||
if (ss->killers[0] == m || ss->killers[1] == m)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// extension() decides whether a move should be searched with normal depth,
|
// extension() decides whether a move should be searched with normal depth,
|
||||||
// or with extended depth. Certain classes of moves (checking moves, in
|
// or with extended depth. Certain classes of moves (checking moves, in
|
||||||
// particular) are searched with bigger depth than ordinary moves and in
|
// particular) are searched with bigger depth than ordinary moves and in
|
||||||
|
@ -1873,7 +1864,6 @@ split_point_start: // At split points actual search starts from here
|
||||||
|
|
||||||
void update_history(const Position& pos, Move move, Depth depth,
|
void update_history(const Position& pos, Move move, Depth depth,
|
||||||
Move movesSearched[], int moveCount) {
|
Move movesSearched[], int moveCount) {
|
||||||
|
|
||||||
Move m;
|
Move m;
|
||||||
|
|
||||||
H.success(pos.piece_on(move_from(move)), move_to(move), depth);
|
H.success(pos.piece_on(move_from(move)), move_to(move), depth);
|
||||||
|
|
Loading…
Add table
Reference in a new issue