Integrate SIMD optimisations for zlib

third_party/zlib/crc32.c

 /* crc32.c -- compute the CRC-32 of a data stream
  * Copyright (C) 1995-2006, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
  * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
  * tables for updating the shift register in one step with three exclusive-ors
  * instead of four steps with four exclusive-ors.  This results in about a
  * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
  */
@@ skipping 422 matching lines @@
     return crc32_combine_(crc1, crc2, len2);
 }
 
 uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
     uLong crc1;
     uLong crc2;
     z_off64_t len2;
 {
     return crc32_combine_(crc1, crc2, len2);
 }
+
+#include "deflate.h"

[agl, 2014/09/23 21:41:39]

don't #include in the middle of the file if it can be avoided.

+
+#ifdef HAVE_PCLMULQDQ
+#include "x86.h"
+extern void ZLIB_INTERNAL crc_fold_init(deflate_state *const s);
+extern void ZLIB_INTERNAL crc_fold_copy(deflate_state *const s,
+        unsigned char *dst, const unsigned char *src, long len);
+extern unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s);
+#endif
+
+ZLIB_INTERNAL void crc_reset(deflate_state *const s)
+{
+#ifdef HAVE_PCLMULQDQ
+    if (x86_cpu_has_pclmulqdq) {
+        crc_fold_init(s);
+        return;
+    }
+#endif
+    s->strm->adler = crc32(0L, Z_NULL, 0);
+}
+
+ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
+{
+#ifdef HAVE_PCLMULQDQ
+    if (x86_cpu_has_pclmulqdq)
+        s->strm->adler = crc_fold_512to32(s);
+#endif
+}
+
+ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
+{
+#ifdef HAVE_PCLMULQDQ
+    if (x86_cpu_has_pclmulqdq) {
+        crc_fold_copy(strm->state, dst, strm->next_in, size);
+        return;
+    }
+#endif
+    zmemcpy(dst, strm->next_in, size);
+    strm->adler = crc32(strm->adler, dst, size);
+}
+

[agl, 2014/09/23 21:41:39]

no blank line at end of file.