kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 00:33:09 +00:00
Code Issues Releases Wiki Activity

Optimisation of Position::see and Position::see_sign

Browse source 
Stephane's patch removes the only usage of Position::see, where the
returned value isn't immediately compared with a value. So I replaced
this function by its optimised and more specific version see_ge. This
function also supersedes the function Position::see_sign.

bool Position::see_ge(Move m, Value v) const;

This function tests if the SEE of a move is greater or equal than a
given value. We use forward iteration on captures instread of backward
one, therefore we don't need the swapList array. Also we stop as soon
as we have enough information to obtain the result, avoiding unnecessary
calls to the min_attacker function.

Speed tests (Windows 7), 20 runs for each engine:
Test engine: mean 866648, st. dev. 5964
Base engine: mean 846751, st. dev. 22846
Speedup: 1.023

Speed test by Stephane Nicolet

Fishtest STC test:
LLR: 2.96 (-2.94,2.94) [0.00,5.00]
Total: 26040 W: 4675 L: 4442 D: 16923
http://tests.stockfishchess.org/tests/view/57f648990ebc59038170fa03

No functional change.
This commit is contained in:
atumanian 2016-10-06 20:55:10 +03:00 • committed by Marco Costalba
parent 1e586288ca
commit 073eed590e
4 changed files with 67 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/movepick.cpp
View file

@ -115,7 +115,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th)
ttMove = ttm
&& pos.pseudo_legal(ttm)
&& pos.capture(ttm)
&& pos.see(ttm) > threshold ? ttm : MOVE_NONE;
&& pos.see_ge(ttm, threshold + 1)? ttm : MOVE_NONE;
stage += (ttMove == MOVE_NONE);
}
@ -201,7 +201,7 @@ Move MovePicker::next_move() {
move = pick_best(cur++, endMoves);
if (move != ttMove)
{
if (pos.see_sign(move) >= VALUE_ZERO)
if (pos.see_ge(move, VALUE_ZERO))
return move;
// Losing capture, move it to the beginning of the array
@ -295,7 +295,7 @@ Move MovePicker::next_move() {
{
move = pick_best(cur++, endMoves);
if ( move != ttMove
&& pos.see(move) > threshold)
&& pos.see_ge(move, threshold + 1))
return move;
}
break;

133
src/position.cpp
View file

@ -955,102 +955,83 @@ Key Position::key_after(Move m) const {
}
/// Position::see() is a static exchange evaluator: It tries to estimate the
/// material gain or loss resulting from a move.
/// Position::see_ge (Static Exchange Evaluation Greater or Equal) tests if the
/// SEE value of move is greater or equal to the given value. We'll use an
/// algorithm similar to alpha-beta pruning with a null window.
Value Position::see_sign(Move m) const {
bool Position::see_ge(Move m, Value v) const {
assert(is_ok(m));
// Early return if SEE cannot be negative because captured piece value
// is not less then capturing one. Note that king moves always return
// here because king midgame value is set to 0.
if (PieceValue[MG][moved_piece(m)] <= PieceValue[MG][piece_on(to_sq(m))])
return VALUE_KNOWN_WIN;
return see(m);
}
Value Position::see(Move m) const {
Square from, to;
Bitboard occupied, attackers, stmAttackers;
Value swapList[32];
int slIndex = 1;
PieceType nextVictim;
Color stm;
assert(is_ok(m));
from = from_sq(m);
to = to_sq(m);
swapList[0] = PieceValue[MG][piece_on(to)];
stm = color_of(piece_on(from));
occupied = pieces() ^ from;
// Castling moves are implemented as king capturing the rook so cannot
// be handled correctly. Simply return VALUE_ZERO that is always correct
// unless in the rare case the rook ends up under attack.
// Castling moves are implemented as king capturing the rook so cannot be
// handled correctly. Simply assume the SEE value is VALUE_ZERO that is always
// correct unless in the rare case the rook ends up under attack.
if (type_of(m) == CASTLING)
return VALUE_ZERO;
return VALUE_ZERO >= v;
Square from = from_sq(m), to = to_sq(m);
PieceType nextVictim = type_of(piece_on(from));
Color stm = ~color_of(piece_on(from)); // First consider opponent's move
Value balance; // Values of the pieces taken by us minus opponent's ones
Bitboard occupied, stmAttackers;
if (type_of(m) == ENPASSANT)
{
occupied ^= to - pawn_push(stm); // Remove the captured pawn
swapList[0] = PieceValue[MG][PAWN];
occupied = SquareBB[to - pawn_push(~stm)]; // Remove the captured pawn
balance = PieceValue[MG][PAWN];
}
else
{
balance = PieceValue[MG][piece_on(to)];
occupied = 0;
}
// Find all attackers to the destination square, with the moving piece
// removed, but possibly an X-ray attacker added behind it.
attackers = attackers_to(to, occupied) & occupied;
if (balance < v)
return false;
// If the opponent has no attackers we are finished
stm = ~stm;
stmAttackers = attackers & pieces(stm);
occupied ^= to; // For the case when captured piece is a pinner
if (nextVictim == KING)
return true;
// Don't allow pinned pieces to attack pieces except the king as long all
// pinners are on their original square.
if (!(st->pinnersForKing[stm] & ~occupied))
stmAttackers &= ~st->blockersForKing[stm];
balance -= PieceValue[MG][nextVictim];
if (!stmAttackers)
return swapList[0];
if (balance >= v)
return true;
// The destination square is defended, which makes things rather more
// difficult to compute. We proceed by building up a "swap list" containing
// the material gain or loss at each stop in a sequence of captures to the
// destination square, where the sides alternately capture, and always
// capture with the least valuable piece. After each capture, we look for
// new X-ray attacks from behind the capturing piece.
nextVictim = type_of(piece_on(from));
bool relativeStm = true; // True if the opponent is to move
occupied ^= pieces() ^ from ^ to;
do {
assert(slIndex < 32);
// Find all attackers to the destination square, with the moving piece removed,
// but possibly an X-ray attacker added behind it.
Bitboard attackers = attackers_to(to, occupied) & occupied;
// Add the new entry to the swap list
swapList[slIndex] = -swapList[slIndex - 1] + PieceValue[MG][nextVictim];
while (true)
{
stmAttackers = attackers & pieces(stm);
// Don't allow pinned pieces to attack pieces except the king as long all
// pinners are on their original square.
if (!(st->pinnersForKing[stm] & ~occupied))
stmAttackers &= ~st->blockersForKing[stm];
if (!stmAttackers)
return relativeStm;
// Locate and remove the next least valuable attacker
nextVictim = min_attacker<PAWN>(byTypeBB, to, stmAttackers, occupied, attackers);
if (nextVictim == KING)
return relativeStm == bool(attackers & pieces(~stm));
balance += relativeStm ? PieceValue[MG][nextVictim]
: -PieceValue[MG][nextVictim];
relativeStm = !relativeStm;
if (relativeStm == (balance >= v))
return relativeStm;
stm = ~stm;
stmAttackers = attackers & pieces(stm);
// Don't allow pinned pieces to attack pieces except the king
if ( nextVictim != KING
&& !(st->pinnersForKing[stm] & ~occupied))
stmAttackers &= ~st->blockersForKing[stm];
++slIndex;
} while (stmAttackers && (nextVictim != KING || (--slIndex, false))); // Stop before a king capture
// Having built the swap list, we negamax through it to find the best
// achievable score from the point of view of the side to move.
while (--slIndex)
swapList[slIndex - 1] = std::min(-swapList[slIndex], swapList[slIndex - 1]);
return swapList[0];
}
}

3
src/position.h
View file

@ -133,8 +133,7 @@ public:
void undo_null_move();
// Static Exchange Evaluation
Value see(Move m) const;
Value see_sign(Move m) const;
bool see_ge(Move m, Value value) const;
// Accessing hash keys
Key key() const;

12
src/search.cpp
View file

@ -889,7 +889,7 @@ moves_loop: // When in check search starts from here
// Step 12. Extend checks
if ( givesCheck
&& !moveCountPruning
&& pos.see_sign(move) >= VALUE_ZERO)
&& pos.see_ge(move, VALUE_ZERO))
extension = ONE_PLY;
// Singular extension search. If all moves but one fail low on a search of
@ -946,11 +946,11 @@ moves_loop: // When in check search starts from here
// Prune moves with negative SEE
if ( lmrDepth < 8
&& pos.see_sign(move) < Value(-35 * lmrDepth * lmrDepth))
&& !pos.see_ge(move, Value(-35 * lmrDepth * lmrDepth)))
continue;
}
else if ( depth < 7 * ONE_PLY
&& pos.see_sign(move) < Value(-35 * depth / ONE_PLY * depth / ONE_PLY))
&& !pos.see_ge(move, Value(-35 * depth / ONE_PLY * depth / ONE_PLY)))
continue;
}
@ -992,7 +992,7 @@ moves_loop: // When in check search starts from here
// because the destination square is empty.
else if ( type_of(move) == NORMAL
&& type_of(pos.piece_on(to_sq(move))) != PAWN
&& pos.see(make_move(to_sq(move), from_sq(move))) < VALUE_ZERO)
&& !pos.see_ge(make_move(to_sq(move), from_sq(move)), VALUE_ZERO))
r -= 2 * ONE_PLY;
// Decrease/increase reduction for moves with a good/bad history
@ -1302,7 +1302,7 @@ moves_loop: // When in check search starts from here
continue;
}
if (futilityBase <= alpha && pos.see(move) <= VALUE_ZERO)
if (futilityBase <= alpha && !pos.see_ge(move, VALUE_ZERO + 1))
{
bestValue = std::max(bestValue, futilityBase);
continue;
@ -1317,7 +1317,7 @@ moves_loop: // When in check search starts from here
// Don't search moves with negative SEE values
if ( (!InCheck || evasionPrunable)
&& type_of(move) != PROMOTION
&& pos.see_sign(move) < VALUE_ZERO)
&& !pos.see_ge(move, VALUE_ZERO))
continue;
// Speculative prefetch as early as possible