From 821e1c72337e435d805aa2e29743d8b79c9d65a9 Mon Sep 17 00:00:00 2001
From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 18 Feb 2012 21:30:33 +0100
Subject: [PATCH] Micro-optimize castleRights update

When updating castleRights in do_move() perform only one
64bit xor with zobCastle[] instead of two.

The trick here is to define zobCastle[] keys of composite
castling rights as a xor combination of the keys of the
single castling rights, instead of 16 independent keys.

Idea from Critter although implementation is different.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
 src/position.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/position.cpp b/src/position.cpp
index 9fa7c729..ef510766 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -843,9 +843,9 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
   if (    st->castleRights != CASTLES_NONE
       && (castleRightsMask[from] & castleRightsMask[to]) != ALL_CASTLES)
   {
-      k ^= zobCastle[st->castleRights];
-      st->castleRights &= castleRightsMask[from] & castleRightsMask[to];
-      k ^= zobCastle[st->castleRights];
+      int cr = castleRightsMask[from] & castleRightsMask[to];
+      k ^= zobCastle[st->castleRights & (cr ^ ALL_CASTLES)];
+      st->castleRights &= cr;
   }
 
   // Prefetch TT access as soon as we know key is updated
@@ -1151,9 +1151,9 @@ void Position::do_castle_move(Move m) {
       }
 
       // Update castling rights
-      st->key ^= zobCastle[st->castleRights];
-      st->castleRights &= castleRightsMask[kfrom];
-      st->key ^= zobCastle[st->castleRights];
+      int cr = castleRightsMask[kfrom];
+      st->key ^= zobCastle[st->castleRights & (cr ^ ALL_CASTLES)];
+      st->castleRights &= cr;
 
       // Update checkers BB
       st->checkersBB = attackers_to(king_square(~us)) & pieces(us);
@@ -1545,8 +1545,15 @@ void Position::init() {
   for (Square s = SQ_A1; s <= SQ_H8; s++)
       zobEp[s] = rk.rand<Key>();
 
-  for (int i = 0; i < 16; i++)
-      zobCastle[i] = rk.rand<Key>();
+  for (int cr = CASTLES_NONE; cr <= ALL_CASTLES; cr++)
+  {
+      Bitboard b = cr;
+      while (b)
+      {
+          Key k = zobCastle[1 << pop_1st_bit(&b)];
+          zobCastle[cr] ^= k ? k : rk.rand<Key>();
+      }
+  }
 
   zobSideToMove = rk.rand<Key>();
   zobExclusion  = rk.rand<Key>();
-- 
2.39.2