X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=46f8fbd46a104ad173d80ec73db4608f1f331b73;hp=d3a4ae53e5ed93137e44df2d6fc329729a2ff223;hb=942c18ef6620967921049ba24f25e08d710c947e;hpb=3e40bd0648ab69c04e37da50fd3f3d4beb072df2 diff --git a/src/bitboard.h b/src/bitboard.h index d3a4ae53..46f8fbd4 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -22,43 +22,6 @@ #if !defined(BITBOARD_H_INCLUDED) #define BITBOARD_H_INCLUDED - -//// -//// Defines -//// - -// Comment following define if you prefer manually adjust -// platform macros defined below -#define AUTO_CONFIGURATION - -// Quiet a warning on Intel compiler -#if !defined(__SIZEOF_INT__ ) -#define __SIZEOF_INT__ 0 -#endif - -// Check for 64 bits for different compilers: Intel, MSVC and gcc -#if defined(__x86_64) || defined(_WIN64) || (__SIZEOF_INT__ > 4) -#define IS_64BIT -#endif - -#if !defined(AUTO_CONFIGURATION) || defined(IS_64BIT) - -//#define USE_COMPACT_ROOK_ATTACKS -//#define USE_32BIT_ATTACKS -#define USE_FOLDED_BITSCAN - -#define BITCOUNT_SWAR_64 -//#define BITCOUNT_SWAR_32 -//#define BITCOUNT_LOOP - -#else - -#define USE_32BIT_ATTACKS -#define USE_FOLDED_BITSCAN -#define BITCOUNT_SWAR_32 - -#endif - //// //// Includes //// @@ -69,13 +32,6 @@ #include "types.h" -//// -//// Types -//// - -typedef uint64_t Bitboard; - - //// //// Constants and variables //// @@ -84,7 +40,6 @@ const Bitboard EmptyBoardBB = 0ULL; const Bitboard WhiteSquaresBB = 0x55AA55AA55AA55AAULL; const Bitboard BlackSquaresBB = 0xAA55AA55AA55AA55ULL; -const Bitboard SquaresByColorBB[2] = { BlackSquaresBB, WhiteSquaresBB }; const Bitboard FileABB = 0x0101010101010101ULL; const Bitboard FileBBB = 0x0202020202020202ULL; @@ -95,22 +50,6 @@ const Bitboard FileFBB = 0x2020202020202020ULL; const Bitboard FileGBB = 0x4040404040404040ULL; const Bitboard FileHBB = 0x8080808080808080ULL; -const Bitboard FileBB[8] = { - FileABB, FileBBB, FileCBB, FileDBB, FileEBB, FileFBB, FileGBB, FileHBB -}; - -const Bitboard NeighboringFilesBB[8] = { - FileBBB, FileABB|FileCBB, FileBBB|FileDBB, FileCBB|FileEBB, - FileDBB|FileFBB, FileEBB|FileGBB, FileFBB|FileHBB, FileGBB -}; - -const Bitboard ThisAndNeighboringFilesBB[8] = { - FileABB|FileBBB, FileABB|FileBBB|FileCBB, - FileBBB|FileCBB|FileDBB, FileCBB|FileDBB|FileEBB, - FileDBB|FileEBB|FileFBB, FileEBB|FileFBB|FileGBB, - FileFBB|FileGBB|FileHBB, FileGBB|FileHBB -}; - const Bitboard Rank1BB = 0xFFULL; const Bitboard Rank2BB = 0xFF00ULL; const Bitboard Rank3BB = 0xFF0000ULL; @@ -120,35 +59,13 @@ const Bitboard Rank6BB = 0xFF0000000000ULL; const Bitboard Rank7BB = 0xFF000000000000ULL; const Bitboard Rank8BB = 0xFF00000000000000ULL; -const Bitboard RankBB[8] = { - Rank1BB, Rank2BB, Rank3BB, Rank4BB, Rank5BB, Rank6BB, Rank7BB, Rank8BB -}; - -const Bitboard RelativeRankBB[2][8] = { - { Rank1BB, Rank2BB, Rank3BB, Rank4BB, Rank5BB, Rank6BB, Rank7BB, Rank8BB }, - { Rank8BB, Rank7BB, Rank6BB, Rank5BB, Rank4BB, Rank3BB, Rank2BB, Rank1BB } -}; - -const Bitboard InFrontBB[2][8] = { - { Rank2BB | Rank3BB | Rank4BB | Rank5BB | Rank6BB | Rank7BB | Rank8BB, - Rank3BB | Rank4BB | Rank5BB | Rank6BB | Rank7BB | Rank8BB, - Rank4BB | Rank5BB | Rank6BB | Rank7BB | Rank8BB, - Rank5BB | Rank6BB | Rank7BB | Rank8BB, - Rank6BB | Rank7BB | Rank8BB, - Rank7BB | Rank8BB, - Rank8BB, - EmptyBoardBB - }, - { EmptyBoardBB, - Rank1BB, - Rank2BB | Rank1BB, - Rank3BB | Rank2BB | Rank1BB, - Rank4BB | Rank3BB | Rank2BB | Rank1BB, - Rank5BB | Rank4BB | Rank3BB | Rank2BB | Rank1BB, - Rank6BB | Rank5BB | Rank4BB | Rank3BB | Rank2BB | Rank1BB, - Rank7BB | Rank6BB | Rank5BB | Rank4BB | Rank3BB | Rank2BB | Rank1BB - } -}; +extern const Bitboard SquaresByColorBB[2]; +extern const Bitboard FileBB[8]; +extern const Bitboard NeighboringFilesBB[8]; +extern const Bitboard ThisAndNeighboringFilesBB[8]; +extern const Bitboard RankBB[8]; +extern const Bitboard RelativeRankBB[2][8]; +extern const Bitboard InFrontBB[2][8]; extern Bitboard SetMaskBB[65]; extern Bitboard ClearMaskBB[65]; @@ -160,20 +77,12 @@ extern Bitboard BetweenBB[64][64]; extern Bitboard PassedPawnMask[2][64]; extern Bitboard OutpostMask[2][64]; -#if defined(USE_COMPACT_ROOK_ATTACKS) - -extern Bitboard RankAttacks[8][64], FileAttacks[8][64]; - -#else - extern const uint64_t RMult[64]; extern const int RShift[64]; extern Bitboard RMask[64]; extern int RAttackIndex[64]; extern Bitboard RAttacks[0x19000]; -#endif // defined(USE_COMPACT_ROOK_ATTACKS) - extern const uint64_t BMult[64]; extern const int BShift[64]; extern Bitboard BMask[64]; @@ -184,6 +93,8 @@ extern Bitboard BishopPseudoAttacks[64]; extern Bitboard RookPseudoAttacks[64]; extern Bitboard QueenPseudoAttacks[64]; +extern uint8_t BitCount8Bit[256]; + //// //// Inline functions @@ -309,29 +220,24 @@ inline Bitboard ray_bb(Square s, SignedDirection d) { } -/// Functions for computing sliding attack bitboards. rook_attacks_bb(), +/// Functions for computing sliding attack bitboards. rook_attacks_bb(), /// bishop_attacks_bb() and queen_attacks_bb() all take a square and a /// bitboard of occupied squares as input, and return a bitboard representing /// all squares attacked by a rook, bishop or queen on the given square. -#if defined(USE_COMPACT_ROOK_ATTACKS) +#if defined(IS_64BIT) -inline Bitboard file_attacks_bb(Square s, Bitboard blockers) { - Bitboard b = (blockers >> square_file(s)) & 0x01010101010100ULL; - return - FileAttacks[square_rank(s)][(b*0xd6e8802041d0c441ULL)>>58] & file_bb(s); -} - -inline Bitboard rank_attacks_bb(Square s, Bitboard blockers) { - Bitboard b = (blockers >> ((s & 56) + 1)) & 63; - return RankAttacks[square_file(s)][b] & rank_bb(s); +inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { + Bitboard b = blockers & RMask[s]; + return RAttacks[RAttackIndex[s] + ((b * RMult[s]) >> RShift[s])]; } -inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { - return file_attacks_bb(s, blockers) | rank_attacks_bb(s, blockers); +inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { + Bitboard b = blockers & BMask[s]; + return BAttacks[BAttackIndex[s] + ((b * BMult[s]) >> BShift[s])]; } -#elif defined(USE_32BIT_ATTACKS) +#else // if !defined(IS_64BIT) inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { Bitboard b = blockers & RMask[s]; @@ -341,17 +247,6 @@ inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { >> RShift[s])]; } -#else - -inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { - Bitboard b = blockers & RMask[s]; - return RAttacks[RAttackIndex[s] + ((b * RMult[s]) >> RShift[s])]; -} - -#endif - -#if defined(USE_32BIT_ATTACKS) - inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { Bitboard b = blockers & BMask[s]; return BAttacks[BAttackIndex[s] + @@ -360,14 +255,7 @@ inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { >> BShift[s])]; } -#else // defined(USE_32BIT_ATTACKS) - -inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { - Bitboard b = blockers & BMask[s]; - return BAttacks[BAttackIndex[s] + ((b * BMult[s]) >> BShift[s])]; -} - -#endif // defined(USE_32BIT_ATTACKS) +#endif inline Bitboard queen_attacks_bb(Square s, Bitboard blockers) { return rook_attacks_bb(s, blockers) | bishop_attacks_bb(s, blockers); @@ -429,63 +317,30 @@ inline Bitboard isolated_pawn_mask(Square s) { } -/// count_1s() counts the number of nonzero bits in a bitboard. - -#if defined(BITCOUNT_LOOP) - -inline int count_1s(Bitboard b) { - int r; - for(r = 0; b; r++, b &= b - 1); - return r; -} - -inline int count_1s_max_15(Bitboard b) { - return count_1s(b); -} +/// first_1() finds the least significant nonzero bit in a nonzero bitboard. +/// pop_1st_bit() finds and clears the least significant nonzero bit in a +/// nonzero bitboard. -#elif defined(BITCOUNT_SWAR_32) +#if defined(USE_BSFQ) // Assembly code by Heinz van Saanen -inline int count_1s(Bitboard b) { - unsigned w = unsigned(b >> 32), v = unsigned(b); - v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits - w -= (w >> 1) & 0x55555555; - v = ((v >> 2) & 0x33333333) + (v & 0x33333333); // 0-4 in 4 bits - w = ((w >> 2) & 0x33333333) + (w & 0x33333333); - v = ((v >> 4) + v) & 0x0F0F0F0F; // 0-8 in 8 bits - v += (((w >> 4) + w) & 0x0F0F0F0F); // 0-16 in 8 bits - v *= 0x01010101; // mul is fast on amd procs - return int(v >> 24); +inline Square first_1(Bitboard b) { + Bitboard dummy; + __asm__("bsfq %1, %0": "=r"(dummy): "rm"(b) ); + return (Square)(dummy); } -inline int count_1s_max_15(Bitboard b) { - unsigned w = unsigned(b >> 32), v = unsigned(b); - v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits - w -= (w >> 1) & 0x55555555; - v = ((v >> 2) & 0x33333333) + (v & 0x33333333); // 0-4 in 4 bits - w = ((w >> 2) & 0x33333333) + (w & 0x33333333); - v += w; // 0-8 in 4 bits - v *= 0x11111111; - return int(v >> 28); +inline Square pop_1st_bit(Bitboard* b) { + const Square s = first_1(*b); + *b &= ~(1ULL<>1) & 0x5555555555555555ULL); - b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL); - b = ((b>>4) + b) & 0x0F0F0F0F0F0F0F0FULL; - b *= 0x0101010101010101ULL; - return int(b >> 56); -} +#else // if !defined(USE_BSFQ) -inline int count_1s_max_15(Bitboard b) { - b -= (b>>1) & 0x5555555555555555ULL; - b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL); - b *= 0x1111111111111111ULL; - return int(b >> 60); -} +extern Square first_1(Bitboard b); +extern Square pop_1st_bit(Bitboard* b); -#endif // BITCOUNT +#endif //// @@ -494,8 +349,7 @@ inline int count_1s_max_15(Bitboard b) { extern void print_bitboard(Bitboard b); extern void init_bitboards(); -extern Square first_1(Bitboard b); -extern Square pop_1st_bit(Bitboard *b); +extern int bitScanReverse32(uint32_t b); #endif // !defined(BITBOARD_H_INCLUDED)