Merge remote-tracking branch 'origin/master' into c-portability

4 files changed, 29 insertions, 0 deletions

diff --git a/src/arch/avx2.h b/src/arch/avx2.h
index e3fddd6..21a6f3b 100644
--- a/src/arch/avx2.h
+++ b/src/arch/avx2.h
@@ -34,6 +34,12 @@ popcount_u32(uint32_t x)
         return _mm_popcnt_u32(x);
 }
 
+STATIC_INLINE int
+popcount_u64(uint64_t x)
+{
+        return _mm_popcnt_u64(x);
+}
+
 STATIC void
 pieces(cube_t cube[NON_NULL], uint8_t c[SIZE(8)], uint8_t e[SIZE(12)])
 {
diff --git a/src/arch/common.h b/src/arch/common.h
index 2a83fbf..a7c4a3b 100644
--- a/src/arch/common.h
+++ b/src/arch/common.h
@@ -13,6 +13,7 @@
 #define EFLIP       UINT8_C(0x10)
 
 STATIC_INLINE int popcount_u32(uint32_t);
+STATIC_INLINE int popcount_u64(uint64_t);
 
 STATIC void pieces(cube_t [NON_NULL], uint8_t [SIZE(8)], uint8_t [SIZE(12)]);
 STATIC_INLINE bool equal(cube_t, cube_t);
diff --git a/src/arch/neon.h b/src/arch/neon.h
index 1157938..501b722 100644
--- a/src/arch/neon.h
+++ b/src/arch/neon.h
@@ -47,6 +47,17 @@ popcount_u32(uint32_t x)
         return (int)x;
 }
 
+STATIC_INLINE int
+popcount_u64(uint64_t x)
+{
+        int top, bottom;
+
+        bottom = popcount_u32((uint32_t)(x & UINT64_C(0xFFFFFFFF)));
+        top = popcount_u32((uint32_t)(x >> UINT64_C(32)));
+
+        return top + bottom;
+}
+
 STATIC void
 pieces(cube_t cube[NON_NULL], uint8_t c[SIZE(8)], uint8_t e[SIZE(12)])
 {
diff --git a/src/arch/portable.h b/src/arch/portable.h
index 311d427..f1491f0 100644
--- a/src/arch/portable.h
+++ b/src/arch/portable.h
@@ -34,6 +34,17 @@ popcount_u32(uint32_t x)
         return (int)x;
 }
 
+STATIC_INLINE int
+popcount_u64(uint64_t x)
+{
+        int top, bottom;
+
+        bottom = popcount_u32((uint32_t)(x & UINT64_C(0xFFFFFFFF)));
+        top = popcount_u32((uint32_t)(x >> UINT64_C(32)));
+
+        return top + bottom;
+}
+
 STATIC void
 pieces(cube_t cube[NON_NULL], uint8_t c[SIZE(8)], uint8_t e[SIZE(12)])
 {