Revert previous commit.

Optimization is correct but slightly slower
so it is a pessimization :-)

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

diff --git a/src/bitboard.h b/src/bitboard.h
index da467cd85c94dafdb5a8b2b3a5f796ffc3e45553..1aefd8add5a623729652f70fc21a45076aacb5ee 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -395,8 +395,10 @@ inline int count_1s_max_15(Bitboard b) {
 
 inline int count_1s(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
 
 inline int count_1s(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);

-  v -= ((v >> 1) & 0x77777777) + ((v >> 2) & 0x33333333) + ((v & 0x88888888) >> 3); // 0-4 in 4 bits
-  w -= ((w >> 1) & 0x77777777) + ((w >> 2) & 0x33333333) + ((w & 0x88888888) >> 3);
+  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
   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


@@ -405,8 +407,10 @@ inline int count_1s(Bitboard b) {
 
 inline int count_1s_max_15(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
 
 inline int count_1s_max_15(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);

-  v -= ((v >> 1) & 0x77777777) + ((v >> 2) & 0x33333333) + ((v & 0x88888888) >> 3); // 0-4 in 4 bits
-  w -= ((w >> 1) & 0x77777777) + ((w >> 2) & 0x33333333) + ((w & 0x88888888) >> 3);
+  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);
   v += w; // 0-8 in 4 bits
   v *= 0x11111111;
   return int(v >> 28);