mirror of
https://github.com/official-stockfish/Stockfish.git
synced 2026-07-23 05:07:14 +00:00
+1








8e5392d79a
This commit introduces Full Threat Input features, which are a subset of Piece(Square)-Piece(Square) pairs. In any given position, the active features consist of pairs where the second piece’s square lies in the attack set of the first piece. This is an extremely simplified explanation that leaves out many details. The already-used HalfKAv2_hm feature set completes the input features. Minor quantization changes have also been made. The net nn-49c1193b131c.nnue was trained by vondele using the following setup: https://github.com/vondele/nettest/blob/7de71238e9b295e3f88ed7c9c5936af632c9b981/threats.yaml A graphical version of an earlier scheme (with less refinement) that illustrates the core concepts can be found attached. [NewInputs.pdf](https://github.com/user-attachments/files/23478441/NewInputs.pdf) Further information, as well as a brief description of the history of development, can be found attached. [Stockfish threat inputs PR summary.pdf](https://github.com/user-attachments/files/23478634/Stockfish.threat.inputs.PR.summary.pdf) This has been a huge effort spanning over half a year, with the original [discussion thread](https://discord.com/channels/435943710472011776/1336647760388034610) reaching over 11k messages. Thanks to everyone who has contributed. Monty PRs: https://github.com/official-monty/Monty/pull/87 (Initial threat input PR) https://github.com/official-monty/Monty/pull/114 (Fixed threat indexing to take into account colour correctly) https://github.com/official-monty/Monty/pull/116 (i8 quantisation of weights whilst keeping calculations in i16) Yukari commit: https://github.com/yukarichess/yukari/commit/2d482c64a79cec03cf4987d5289334b9cdc737bc (Threat inputs merged) Plentychess PRs: https://github.com/Yoshie2000/PlentyChess/pull/400 (Threat inputs merged) https://github.com/Yoshie2000/PlentyChess/pull/411 (Threat input weights quantised to i8) Passed STC: LLR: 2.93 (-2.94,2.94) <0.00,2.00> Total: 63424 W: 16956 L: 16591 D: 29877 Ptnml(0-2): 276, 7522, 15797, 7795, 322 https://tests.stockfishchess.org/tests/view/69105b3dec1d00d2c195c569 Passed LTC: LLR: 2.95 (-2.94,2.94) <0.50,2.50> Total: 27876 W: 7417 L: 7110 D: 13349 Ptnml(0-2): 23, 3033, 7530, 3318, 34 https://tests.stockfishchess.org/tests/view/6910d817ec1d00d2c195c66e Passed VVLTC (Hash accidentally set to 1/2 normal value for both sides): LLR: 2.94 (-2.94,2.94) <0.50,2.50> Total: 12458 W: 3353 L: 3102 D: 6003 Ptnml(0-2): 0, 1106, 3767, 1355, 1 https://tests.stockfishchess.org/tests/view/69115a26ec1d00d2c195c7cd This version has also passed non-regression LTC against the originally passed version: LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 51144 W: 13086 L: 12903 D: 25155 Ptnml(0-2): 22, 5167, 15018, 5336, 29 https://tests.stockfishchess.org/tests/view/69138a317ca87818523314bf LTC elo estimate on ARM: 1 patch : 13.9 1.9 38296.5 73728 52 2 master : 0.0 ---- 35431.5 73728 48 closes https://github.com/official-stockfish/Stockfish/pull/6411 bench: 2626086 Co-authored-by: Shawn Xu <xu107288696@gmail.com> Co-authored-by: Timothy Herchen <timothy.herchen@gmail.com> Co-authored-by: Viren6 <94880762+Viren6@users.noreply.github.com> Co-authored-by: Yoshie2000 <patrick.leonhardt@gmx.net> Co-authored-by: Joost Vandevondele <Joost.VandeVondele@gmail.com> Co-authored-by: rn5f107s2 <clemens.lerchl@gmail.com> Co-authored-by: cj5716 <125858804+cj5716@users.noreply.github.com> Co-authored-by: AliceRoselia <63040919+AliceRoselia@users.noreply.github.com> Co-authored-by: Linmiao Xu <linmiao.xu@gmail.com> Co-authored-by: Disservin <disservin.social@gmail.com>
379 lines
11 KiB
C++
379 lines
11 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
Copyright (C) 2004-2025 The Stockfish developers (see AUTHORS file)
|
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef BITBOARD_H_INCLUDED
|
|
#define BITBOARD_H_INCLUDED
|
|
|
|
#include <algorithm>
|
|
#include <cassert>
|
|
#include <cmath>
|
|
#include <cstring>
|
|
#include <cstdint>
|
|
#include <cstdlib>
|
|
#include <string>
|
|
|
|
#include "types.h"
|
|
|
|
namespace Stockfish {
|
|
|
|
namespace Bitboards {
|
|
|
|
void init();
|
|
std::string pretty(Bitboard b);
|
|
|
|
} // namespace Stockfish::Bitboards
|
|
|
|
constexpr Bitboard FileABB = 0x0101010101010101ULL;
|
|
constexpr Bitboard FileBBB = FileABB << 1;
|
|
constexpr Bitboard FileCBB = FileABB << 2;
|
|
constexpr Bitboard FileDBB = FileABB << 3;
|
|
constexpr Bitboard FileEBB = FileABB << 4;
|
|
constexpr Bitboard FileFBB = FileABB << 5;
|
|
constexpr Bitboard FileGBB = FileABB << 6;
|
|
constexpr Bitboard FileHBB = FileABB << 7;
|
|
|
|
constexpr Bitboard Rank1BB = 0xFF;
|
|
constexpr Bitboard Rank2BB = Rank1BB << (8 * 1);
|
|
constexpr Bitboard Rank3BB = Rank1BB << (8 * 2);
|
|
constexpr Bitboard Rank4BB = Rank1BB << (8 * 3);
|
|
constexpr Bitboard Rank5BB = Rank1BB << (8 * 4);
|
|
constexpr Bitboard Rank6BB = Rank1BB << (8 * 5);
|
|
constexpr Bitboard Rank7BB = Rank1BB << (8 * 6);
|
|
constexpr Bitboard Rank8BB = Rank1BB << (8 * 7);
|
|
|
|
extern uint8_t PopCnt16[1 << 16];
|
|
extern uint8_t SquareDistance[SQUARE_NB][SQUARE_NB];
|
|
|
|
extern Bitboard BetweenBB[SQUARE_NB][SQUARE_NB];
|
|
extern Bitboard LineBB[SQUARE_NB][SQUARE_NB];
|
|
extern Bitboard RayPassBB[SQUARE_NB][SQUARE_NB];
|
|
extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
|
|
|
|
|
|
// Magic holds all magic bitboards relevant data for a single square
|
|
struct Magic {
|
|
Bitboard mask;
|
|
Bitboard* attacks;
|
|
#ifndef USE_PEXT
|
|
Bitboard magic;
|
|
unsigned shift;
|
|
#endif
|
|
|
|
// Compute the attack's index using the 'magic bitboards' approach
|
|
unsigned index(Bitboard occupied) const {
|
|
|
|
#ifdef USE_PEXT
|
|
return unsigned(pext(occupied, mask));
|
|
#else
|
|
if (Is64Bit)
|
|
return unsigned(((occupied & mask) * magic) >> shift);
|
|
|
|
unsigned lo = unsigned(occupied) & unsigned(mask);
|
|
unsigned hi = unsigned(occupied >> 32) & unsigned(mask >> 32);
|
|
return (lo * unsigned(magic) ^ hi * unsigned(magic >> 32)) >> shift;
|
|
#endif
|
|
}
|
|
|
|
Bitboard attacks_bb(Bitboard occupied) const { return attacks[index(occupied)]; }
|
|
};
|
|
|
|
extern Magic Magics[SQUARE_NB][2];
|
|
|
|
constexpr Bitboard square_bb(Square s) {
|
|
assert(is_ok(s));
|
|
return (1ULL << s);
|
|
}
|
|
|
|
|
|
// Overloads of bitwise operators between a Bitboard and a Square for testing
|
|
// whether a given bit is set in a bitboard, and for setting and clearing bits.
|
|
|
|
constexpr Bitboard operator&(Bitboard b, Square s) { return b & square_bb(s); }
|
|
constexpr Bitboard operator|(Bitboard b, Square s) { return b | square_bb(s); }
|
|
constexpr Bitboard operator^(Bitboard b, Square s) { return b ^ square_bb(s); }
|
|
constexpr Bitboard& operator|=(Bitboard& b, Square s) { return b |= square_bb(s); }
|
|
constexpr Bitboard& operator^=(Bitboard& b, Square s) { return b ^= square_bb(s); }
|
|
|
|
constexpr Bitboard operator&(Square s, Bitboard b) { return b & s; }
|
|
constexpr Bitboard operator|(Square s, Bitboard b) { return b | s; }
|
|
constexpr Bitboard operator^(Square s, Bitboard b) { return b ^ s; }
|
|
|
|
constexpr Bitboard operator|(Square s1, Square s2) { return square_bb(s1) | s2; }
|
|
|
|
constexpr bool more_than_one(Bitboard b) { return b & (b - 1); }
|
|
|
|
|
|
// rank_bb() and file_bb() return a bitboard representing all the squares on
|
|
// the given file or rank.
|
|
|
|
constexpr Bitboard rank_bb(Rank r) { return Rank1BB << (8 * r); }
|
|
|
|
constexpr Bitboard rank_bb(Square s) { return rank_bb(rank_of(s)); }
|
|
|
|
constexpr Bitboard file_bb(File f) { return FileABB << f; }
|
|
|
|
constexpr Bitboard file_bb(Square s) { return file_bb(file_of(s)); }
|
|
|
|
|
|
// Moves a bitboard one or two steps as specified by the direction D
|
|
template<Direction D>
|
|
constexpr Bitboard shift(Bitboard b) {
|
|
return D == NORTH ? b << 8
|
|
: D == SOUTH ? b >> 8
|
|
: D == NORTH + NORTH ? b << 16
|
|
: D == SOUTH + SOUTH ? b >> 16
|
|
: D == EAST ? (b & ~FileHBB) << 1
|
|
: D == WEST ? (b & ~FileABB) >> 1
|
|
: D == NORTH_EAST ? (b & ~FileHBB) << 9
|
|
: D == NORTH_WEST ? (b & ~FileABB) << 7
|
|
: D == SOUTH_EAST ? (b & ~FileHBB) >> 7
|
|
: D == SOUTH_WEST ? (b & ~FileABB) >> 9
|
|
: 0;
|
|
}
|
|
|
|
|
|
// Returns the squares attacked by pawns of the given color
|
|
// from the squares in the given bitboard.
|
|
template<Color C>
|
|
constexpr Bitboard pawn_attacks_bb(Bitboard b) {
|
|
return C == WHITE ? shift<NORTH_WEST>(b) | shift<NORTH_EAST>(b)
|
|
: shift<SOUTH_WEST>(b) | shift<SOUTH_EAST>(b);
|
|
}
|
|
|
|
|
|
// Returns a bitboard representing an entire line (from board edge
|
|
// to board edge) that intersects the two given squares. If the given squares
|
|
// are not on a same file/rank/diagonal, the function returns 0. For instance,
|
|
// line_bb(SQ_C4, SQ_F7) will return a bitboard with the A2-G8 diagonal.
|
|
inline Bitboard line_bb(Square s1, Square s2) {
|
|
|
|
assert(is_ok(s1) && is_ok(s2));
|
|
return LineBB[s1][s2];
|
|
}
|
|
|
|
|
|
// Returns a bitboard representing the squares in the semi-open
|
|
// segment between the squares s1 and s2 (excluding s1 but including s2). If the
|
|
// given squares are not on a same file/rank/diagonal, it returns s2. For instance,
|
|
// between_bb(SQ_C4, SQ_F7) will return a bitboard with squares D5, E6 and F7, but
|
|
// between_bb(SQ_E6, SQ_F8) will return a bitboard with the square F8. This trick
|
|
// allows to generate non-king evasion moves faster: the defending piece must either
|
|
// interpose itself to cover the check or capture the checking piece.
|
|
inline Bitboard between_bb(Square s1, Square s2) {
|
|
|
|
assert(is_ok(s1) && is_ok(s2));
|
|
return BetweenBB[s1][s2];
|
|
}
|
|
|
|
// distance() functions return the distance between x and y, defined as the
|
|
// number of steps for a king in x to reach y.
|
|
|
|
template<typename T1 = Square>
|
|
inline int distance(Square x, Square y);
|
|
|
|
template<>
|
|
inline int distance<File>(Square x, Square y) {
|
|
return std::abs(file_of(x) - file_of(y));
|
|
}
|
|
|
|
template<>
|
|
inline int distance<Rank>(Square x, Square y) {
|
|
return std::abs(rank_of(x) - rank_of(y));
|
|
}
|
|
|
|
template<>
|
|
inline int distance<Square>(Square x, Square y) {
|
|
return SquareDistance[x][y];
|
|
}
|
|
|
|
inline int edge_distance(File f) { return std::min(f, File(FILE_H - f)); }
|
|
|
|
// Returns the pseudo attacks of the given piece type
|
|
// assuming an empty board.
|
|
template<PieceType Pt>
|
|
inline Bitboard attacks_bb(Square s, Color c = COLOR_NB) {
|
|
|
|
assert((Pt != PAWN || c < COLOR_NB) && (is_ok(s)));
|
|
return Pt == PAWN ? PseudoAttacks[c][s] : PseudoAttacks[Pt][s];
|
|
}
|
|
|
|
|
|
// Returns the attacks by the given piece
|
|
// assuming the board is occupied according to the passed Bitboard.
|
|
// Sliding piece attacks do not continue passed an occupied square.
|
|
template<PieceType Pt>
|
|
inline Bitboard attacks_bb(Square s, Bitboard occupied) {
|
|
|
|
assert((Pt != PAWN) && (is_ok(s)));
|
|
|
|
switch (Pt)
|
|
{
|
|
case BISHOP :
|
|
case ROOK :
|
|
return Magics[s][Pt - BISHOP].attacks_bb(occupied);
|
|
case QUEEN :
|
|
return attacks_bb<BISHOP>(s, occupied) | attacks_bb<ROOK>(s, occupied);
|
|
default :
|
|
return PseudoAttacks[Pt][s];
|
|
}
|
|
}
|
|
|
|
// Returns the attacks by the given piece
|
|
// assuming the board is occupied according to the passed Bitboard.
|
|
// Sliding piece attacks do not continue passed an occupied square.
|
|
inline Bitboard attacks_bb(PieceType pt, Square s, Bitboard occupied) {
|
|
|
|
assert((pt != PAWN) && (is_ok(s)));
|
|
|
|
switch (pt)
|
|
{
|
|
case BISHOP :
|
|
return attacks_bb<BISHOP>(s, occupied);
|
|
case ROOK :
|
|
return attacks_bb<ROOK>(s, occupied);
|
|
case QUEEN :
|
|
return attacks_bb<BISHOP>(s, occupied) | attacks_bb<ROOK>(s, occupied);
|
|
default :
|
|
return PseudoAttacks[pt][s];
|
|
}
|
|
}
|
|
|
|
inline Bitboard attacks_bb(Piece pc, Square s) {
|
|
if (type_of(pc) == PAWN)
|
|
return PseudoAttacks[color_of(pc)][s];
|
|
|
|
return PseudoAttacks[type_of(pc)][s];
|
|
}
|
|
|
|
|
|
inline Bitboard attacks_bb(Piece pc, Square s, Bitboard occupied) {
|
|
if (type_of(pc) == PAWN)
|
|
return PseudoAttacks[color_of(pc)][s];
|
|
|
|
return attacks_bb(type_of(pc), s, occupied);
|
|
}
|
|
|
|
// Counts the number of non-zero bits in a bitboard.
|
|
inline int popcount(Bitboard b) {
|
|
|
|
#ifndef USE_POPCNT
|
|
|
|
std::uint16_t indices[4];
|
|
std::memcpy(indices, &b, sizeof(b));
|
|
return PopCnt16[indices[0]] + PopCnt16[indices[1]] + PopCnt16[indices[2]]
|
|
+ PopCnt16[indices[3]];
|
|
|
|
#elif defined(_MSC_VER)
|
|
|
|
return int(_mm_popcnt_u64(b));
|
|
|
|
#else // Assumed gcc or compatible compiler
|
|
|
|
return __builtin_popcountll(b);
|
|
|
|
#endif
|
|
}
|
|
|
|
// Returns the least significant bit in a non-zero bitboard.
|
|
inline Square lsb(Bitboard b) {
|
|
assert(b);
|
|
|
|
#if defined(__GNUC__) // GCC, Clang, ICX
|
|
|
|
return Square(__builtin_ctzll(b));
|
|
|
|
#elif defined(_MSC_VER)
|
|
#ifdef _WIN64 // MSVC, WIN64
|
|
|
|
unsigned long idx;
|
|
_BitScanForward64(&idx, b);
|
|
return Square(idx);
|
|
|
|
#else // MSVC, WIN32
|
|
unsigned long idx;
|
|
|
|
if (b & 0xffffffff)
|
|
{
|
|
_BitScanForward(&idx, int32_t(b));
|
|
return Square(idx);
|
|
}
|
|
else
|
|
{
|
|
_BitScanForward(&idx, int32_t(b >> 32));
|
|
return Square(idx + 32);
|
|
}
|
|
#endif
|
|
#else // Compiler is neither GCC nor MSVC compatible
|
|
#error "Compiler not supported."
|
|
#endif
|
|
}
|
|
|
|
// Returns the most significant bit in a non-zero bitboard.
|
|
inline Square msb(Bitboard b) {
|
|
assert(b);
|
|
|
|
#if defined(__GNUC__) // GCC, Clang, ICX
|
|
|
|
return Square(63 ^ __builtin_clzll(b));
|
|
|
|
#elif defined(_MSC_VER)
|
|
#ifdef _WIN64 // MSVC, WIN64
|
|
|
|
unsigned long idx;
|
|
_BitScanReverse64(&idx, b);
|
|
return Square(idx);
|
|
|
|
#else // MSVC, WIN32
|
|
|
|
unsigned long idx;
|
|
|
|
if (b >> 32)
|
|
{
|
|
_BitScanReverse(&idx, int32_t(b >> 32));
|
|
return Square(idx + 32);
|
|
}
|
|
else
|
|
{
|
|
_BitScanReverse(&idx, int32_t(b));
|
|
return Square(idx);
|
|
}
|
|
#endif
|
|
#else // Compiler is neither GCC nor MSVC compatible
|
|
#error "Compiler not supported."
|
|
#endif
|
|
}
|
|
|
|
// Returns the bitboard of the least significant
|
|
// square of a non-zero bitboard. It is equivalent to square_bb(lsb(bb)).
|
|
inline Bitboard least_significant_square_bb(Bitboard b) {
|
|
assert(b);
|
|
return b & -b;
|
|
}
|
|
|
|
// Finds and clears the least significant bit in a non-zero bitboard.
|
|
inline Square pop_lsb(Bitboard& b) {
|
|
assert(b);
|
|
const Square s = lsb(b);
|
|
b &= b - 1;
|
|
return s;
|
|
}
|
|
|
|
} // namespace Stockfish
|
|
|
|
#endif // #ifndef BITBOARD_H_INCLUDED
|