X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fcrc32.h;h=2b20fef90275741c7644c2061a7f5c0a733094a9;hb=af62f93478e760b675bba7aba06b30efd63d12b4;hp=7361129ed55d2f278ea62d36347d01288cfbf082;hpb=0d88301a576191a0e330e539cf1dcb3837ee1bf6;p=vpp.git

diff --git a/src/vppinfra/crc32.h b/src/vppinfra/crc32.h
index 7361129ed55..2b20fef9027 100644
--- a/src/vppinfra/crc32.h
+++ b/src/vppinfra/crc32.h
@@ -21,65 +21,85 @@
 #if __SSE4_2__
 #define clib_crc32c_uses_intrinsics
 #include <x86intrin.h>
-
-#define crc32_u64 _mm_crc32_u64
-#define crc32_u32 _mm_crc32_u32
-
 static_always_inline u32
-clib_crc32c (u8 * s, int len)
+clib_crc32c_u8 (u32 last, u8 data)
 {
-  u32 v = 0;
-
-#if __x86_64__
-  for (; len >= 8; len -= 8, s += 8)
-    v = _mm_crc32_u64 (v, *((u64 *) s));
-#else
-  /* workaround weird GCC bug when using _mm_crc32_u32
-     which happens with -O2 optimization */
-  volatile ("":::"memory");
-#endif
-
-  for (; len >= 4; len -= 4, s += 4)
-    v = _mm_crc32_u32 (v, *((u32 *) s));
+  return _mm_crc32_u8 (last, data);
+}
 
-  for (; len >= 2; len -= 2, s += 2)
-    v = _mm_crc32_u16 (v, *((u16 *) s));
+static_always_inline u32
+clib_crc32c_u16 (u32 last, u16 data)
+{
+  return _mm_crc32_u16 (last, data);
+}
 
-  for (; len >= 1; len -= 1, s += 1)
-    v = _mm_crc32_u8 (v, *((u16 *) s));
+static_always_inline u32
+clib_crc32c_u32 (u32 last, u32 data)
+{
+  return _mm_crc32_u32 (last, data);
+}
 
-  return v;
+static_always_inline u32
+clib_crc32c_u64 (u32 last, u64 data)
+{
+  return _mm_crc32_u64 (last, data);
 }
+#endif
 
-#elif __ARM_FEATURE_CRC32
+#if __ARM_FEATURE_CRC32
 #define clib_crc32c_uses_intrinsics
 #include <arm_acle.h>
+static_always_inline u32
+clib_crc32c_u8 (u32 last, u8 data)
+{
+  return __crc32cd (last, data);
+}
 
+static_always_inline u32
+clib_crc32c_u16 (u32 last, u16 data)
+{
+  return __crc32ch (last, data);
+}
 
-#define crc32_u64 __crc32cd
-#define crc32_u32 __crc32cw
+static_always_inline u32
+clib_crc32c_u32 (u32 last, u32 data)
+{
+  return __crc32cw (last, data);
+}
 
 static_always_inline u32
-clib_crc32c (u8 * s, int len)
+clib_crc32c_u64 (u32 last, u64 data)
 {
-  u32 v = 0;
+  return __crc32cd (last, data);
+}
+#endif
 
+#ifdef clib_crc32c_uses_intrinsics
+static_always_inline u32
+clib_crc32c_with_init (u8 *s, int len, u32 last)
+{
   for (; len >= 8; len -= 8, s += 8)
-    v = __crc32cd (v, *((u64 *) s));
+    last = clib_crc32c_u64 (last, *((u64u *) s));
 
   for (; len >= 4; len -= 4, s += 4)
-    v = __crc32cw (v, *((u32 *) s));
+    last = clib_crc32c_u32 (last, *((u32u *) s));
 
   for (; len >= 2; len -= 2, s += 2)
-    v = __crc32ch (v, *((u16 *) s));
+    last = clib_crc32c_u16 (last, *((u16u *) s));
 
   for (; len >= 1; len -= 1, s += 1)
-    v = __crc32cb (v, *((u8 *) s));
+    last = clib_crc32c_u8 (last, *((u8 *) s));
 
-  return v;
+  return last;
 }
 
+static_always_inline u32
+clib_crc32c (u8 *s, int len)
+{
+  return clib_crc32c_with_init (s, len, 0);
+}
 #endif
+
 #endif /* __included_crc32_h__ */
 
 /*