Micro optimize count_1s_max_15() for 32 bit system

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/bitboard.h b/src/bitboard.h
index 847132c499fdc41df9cddf97e44f01c90dd4bb7f..1140664838b47bfb875a4a4841b7c07f90c1e7e3 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -397,11 +397,10 @@ inline int count_1s(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v = v - ((v >> 1) & 0x55555555);
   w = w - ((w >> 1) & 0x55555555);
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v = v - ((v >> 1) & 0x55555555);
   w = w - ((w >> 1) & 0x55555555);

+  v += w;

   v = (v & 0x33333333) + ((v >> 2) & 0x33333333);
   v = (v & 0x33333333) + ((v >> 2) & 0x33333333);

-  w = (w & 0x33333333) + ((w >> 2) & 0x33333333);

   v = (v + (v >> 4)) & 0x0F0F0F0F;
   v = (v + (v >> 4)) & 0x0F0F0F0F;

-  w = (w + (w >> 4)) & 0x0F0F0F0F;
-  v = ((v+w) * 0x01010101) >> 24; // mul is fast on amd procs
+  v = (v * 0x01010101) >> 24; // mul is fast on amd procs

   return int(v);
 }
 
   return int(v);
 }
 


@@ -409,9 +408,9 @@ inline int count_1s_max_15(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v = v - ((v >> 1) & 0x55555555);
   w = w - ((w >> 1) & 0x55555555);
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v = v - ((v >> 1) & 0x55555555);
   w = w - ((w >> 1) & 0x55555555);

+  v += w;

   v = (v & 0x33333333) + ((v >> 2) & 0x33333333);
   v = (v & 0x33333333) + ((v >> 2) & 0x33333333);

-  w = (w & 0x33333333) + ((w >> 2) & 0x33333333);
-  v = ((v+w) * 0x11111111) >> 28;
+  v = (v * 0x11111111) >> 28;

   return int(v);
 }
 
   return int(v);
 }