inline bool cpu_has_popcnt() { return false; }
-#define POPCNT_INTRINSIC(x) sw_count_1s(x)
+#define POPCNT_INTRINSIC(x) count_1s(x)
#endif
#if defined(BITCOUNT_LOOP)
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
int r;
for(r = 0; b; r++, b &= b - 1);
return r;
}
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
return count_1s(b);
}
#elif defined(BITCOUNT_SWAR_32)
-inline int sw_count_1s(Bitboard b) {
+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;
return int(v >> 24);
}
-inline int sw_count_1s_max_15(Bitboard b) {
+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;
#elif defined(BITCOUNT_SWAR_64)
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
b -= ((b>>1) & 0x5555555555555555ULL);
b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
b = ((b>>4) + b) & 0x0F0F0F0F0F0F0F0FULL;
return int(b >> 56);
}
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
b -= (b>>1) & 0x5555555555555555ULL;
b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
b *= 0x1111111111111111ULL;
template<bool UseIntrinsic>
inline int count_1s(Bitboard b) {
- return UseIntrinsic ? POPCNT_INTRINSIC(b) : sw_count_1s(b);
+ return UseIntrinsic ? POPCNT_INTRINSIC(b) : count_1s(b);
}
template<bool UseIntrinsic>
inline int count_1s_max_15(Bitboard b) {
- return UseIntrinsic ? POPCNT_INTRINSIC(b) : sw_count_1s_max_15(b);
+ return UseIntrinsic ? POPCNT_INTRINSIC(b) : count_1s_max_15(b);
}