X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=b9071ea8bab0beb0323e1b597e27097c6ce7a732;hp=8c70a8e27b10820e27f288f28febfced33f91657;hb=bc4f3155ae3937d32a3ebaae77ee4f7be355aa60;hpb=d632e77058114e87a6d7c02fda3a40768546e1d6

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index 8c70a8e2..b9071ea8 100644
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -65,8 +65,8 @@ namespace {
   Bitboard RAttacksTable[0x19000];
   Bitboard BAttacksTable[0x1480];
 
-  void do_magics(Bitboard magic[], Bitboard* attack[], Bitboard attTabl[],
-                 Bitboard mask[], int shift[], Square deltas[]);
+  void init_sliding_attacks(Bitboard magic[], Bitboard* attack[], Bitboard attTable[],
+                            Bitboard mask[], int shift[], Square delta[]);
 }
 
 
@@ -79,7 +79,7 @@ void print_bitboard(Bitboard b) {
   {
       std::cout << "+---+---+---+---+---+---+---+---+" << '\n';
       for (File f = FILE_A; f <= FILE_H; f++)
-          std::cout << "| " << (bit_is_set(b, make_square(f, r)) ? 'X' : ' ') << ' ';
+          std::cout << "| " << (bit_is_set(b, make_square(f, r)) ? "X " : "  ");
 
       std::cout << "|\n";
   }
@@ -226,8 +226,8 @@ void init_bitboards() {
   Square RDeltas[] = { DELTA_N,  DELTA_E,  DELTA_S,  DELTA_W  };
   Square BDeltas[] = { DELTA_NE, DELTA_SE, DELTA_SW, DELTA_NW };
 
-  do_magics(BMult, BAttacks, BAttacksTable, BMask, BShift, BDeltas);
-  do_magics(RMult, RAttacks, RAttacksTable, RMask, RShift, RDeltas);
+  init_sliding_attacks(BMult, BAttacks, BAttacksTable, BMask, BShift, BDeltas);
+  init_sliding_attacks(RMult, RAttacks, RAttacksTable, RMask, RShift, RDeltas);
 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
   {
@@ -255,13 +255,20 @@ namespace {
 
   Bitboard submask(Bitboard mask, int key) {
 
-    Bitboard subMask = 0;
-    int bitNum = -1;
+    Bitboard b, subMask = 0;
+    int bitProbe = 1;
 
     // Extract an unique submask out of a mask according to the given key
-    for (Square s = SQ_A1; s <= SQ_H8; s++)
-        if (bit_is_set(mask, s) && bit_is_set(key, Square(++bitNum)))
-            set_bit(&subMask, s);
+    while (mask)
+    {
+        b = mask & -mask;
+        mask ^= b;
+
+        if (key & bitProbe)
+            subMask |= b;
+
+        bitProbe <<= 1;
+    }
 
     return subMask;
   }
@@ -289,62 +296,58 @@ namespace {
     return attacks;
   }
 
-  template<bool Is64>
   Bitboard pick_magic(Bitboard mask, RKISS& rk, int booster) {
 
     Bitboard magic;
-    int lsb;
 
-    if (!Is64)
-        lsb = first_1(mask);
-
-    // Advance PRNG state of a quantity known to be the optimal to
-    // quickly retrieve all the magics.
-    for (int i = 0; i < booster; i++)
-        rk.rand<Bitboard>();
+    // Values s1 and s2 are used to rotate the candidate magic of
+    // a quantity known to be the optimal to quickly find the magics.
+    int s1 = booster & 63, s2 = (booster >> 6) & 63;
 
     while (true)
     {
-        magic = rk.rand<Bitboard>() & rk.rand<Bitboard>();
-        magic &= Is64 ? rk.rand<Bitboard>() : (rk.rand<Bitboard>() | rk.rand<Bitboard>());
+        magic = rk.rand<Bitboard>();
+        magic = (magic >> s1) | (magic << (64 - s1));
+        magic &= rk.rand<Bitboard>();
+        magic = (magic >> s2) | (magic << (64 - s2));
+        magic &= rk.rand<Bitboard>();
 
-        if (   BitCount8Bit[(mask * magic) >> 56] >= 6
-            && (Is64 || BitCount8Bit[(lsb * magic) >> 56]))
+        if (BitCount8Bit[(mask * magic) >> 56] >= 6)
             return magic;
     }
   }
 
-  void do_magics(Bitboard magic[], Bitboard* attack[], Bitboard attTabl[],
-                 Bitboard mask[], int shift[], Square deltas[]) {
-
-    const int  MagicBoosters32[] = { 43, 53, 76, 17, 51, 65, 55, 23 };
-    const int  MagicBoosters64[] = { 26, 21, 21, 32, 31,  9,  5, 11 };
+  void init_sliding_attacks(Bitboard magic[], Bitboard* attack[], Bitboard attTable[],
+                            Bitboard mask[], int shift[], Square delta[]) {
 
+    const int  MagicBoosters[][8] = { { 3191, 2184, 1310, 3618, 2091, 1308, 2452, 3996 },
+                                      { 1059, 3608,  605, 3234, 3326,   38, 2029, 3043 } };
     RKISS rk;
-    Bitboard occupancy[4096], proofs[4096], excluded;
+    Bitboard occupancy[4096], reference[4096], excluded;
     int key, maxKey, index, booster, offset = 0;
 
     for (Square s = SQ_A1; s <= SQ_H8; s++)
     {
         excluded = ((Rank1BB | Rank8BB) & ~rank_bb(s)) | ((FileABB | FileHBB) & ~file_bb(s));
 
-        attack[s] = &attTabl[offset];
-        mask[s]   = sliding_attacks(s, EmptyBoardBB, deltas, excluded);
-        shift[s]  = (CpuIs64Bit ? 64 : 32) - count_1s<CNT64>(mask[s]);
+        attack[s] = &attTable[offset];
+        mask[s]   = sliding_attacks(s, EmptyBoardBB, delta, excluded);
+        shift[s]  = (CpuIs64Bit ? 64 : 32) - count_1s<CNT32_MAX15>(mask[s]);
 
-        maxKey = 1 << count_1s<CNT32>(mask[s]);
-        booster = CpuIs64Bit ? MagicBoosters64[square_rank(s)] : MagicBoosters32[square_rank(s)];
+        maxKey = 1 << count_1s<CNT32_MAX15>(mask[s]);
+        offset += maxKey;
+        booster = MagicBoosters[CpuIs64Bit][square_rank(s)];
 
         // First compute occupancy and attacks for square 's'
         for (key = 0; key < maxKey; key++)
         {
             occupancy[key] = submask(mask[s], key);
-            proofs[key] = sliding_attacks(s, occupancy[key], deltas, EmptyBoardBB);
+            reference[key] = sliding_attacks(s, occupancy[key], delta, EmptyBoardBB);
         }
 
-        // Then find a possible magic and corresponding attacks
+        // Then find a possible magic and the corresponding attacks
         do {
-            magic[s] = pick_magic<CpuIs64Bit>(mask[s], rk, booster);
+            magic[s] = pick_magic(mask[s], rk, booster);
             memset(attack[s], 0, maxKey * sizeof(Bitboard));
 
             for (key = 0; key < maxKey; key++)
@@ -353,14 +356,12 @@ namespace {
                                    : unsigned(occupancy[key] * magic[s] ^ (occupancy[key] >> 32) * (magic[s] >> 32)) >> shift[s];
 
                 if (!attack[s][index])
-                    attack[s][index] = proofs[key];
+                    attack[s][index] = reference[key];
 
-                else if (attack[s][index] != proofs[key])
+                else if (attack[s][index] != reference[key])
                     break;
             }
         } while (key != maxKey);
-
-        offset += maxKey;
     }
   }
 }