diff options
author | qyearsley <qyearsley@chromium.org> | 2014-10-24 16:09:39 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 23:10:06 +0000 |
commit | 5d38e0bd32f9a7e4766b877711c710df986d74ed (patch) | |
tree | 76641d41813a53040628145a4a5cafd4fd0d1571 /third_party/zlib/deflate.h | |
parent | a80eaa5750457121159f84c03b00079a9403dd59 (diff) | |
download | chromium_src-5d38e0bd32f9a7e4766b877711c710df986d74ed.zip chromium_src-5d38e0bd32f9a7e4766b877711c710df986d74ed.tar.gz chromium_src-5d38e0bd32f9a7e4766b877711c710df986d74ed.tar.bz2 |
Revert of Reland "Integrate SIMD optimisations for zlib" (patchset #2 id:40001 of https://codereview.chromium.org/677713002/)
Reason for revert:
Speculatively reverting because XP Tests (1) is having failures.
https://build.chromium.org/p/chromium.win/builders/XP%20Tests%20(1)
Original issue's description:
> Reland "Integrate SIMD optimisations for zlib"
>
> This reland adds an MSan suppression entry to work around gaps in MSan's
> support for some of the intrinsics this patch uses. This version also inlines
> the insert_string_sse function as it uses inline assembly and therefore does
> not need to be in the static library.
>
> Original CL: https://codereview.chromium.org/552123005
>
> These optimisations have been published on zlib mailing list and at
> https://github.com/jtkukunas/zlib/
>
> This change merges the following optimisation patches:
> - "For x86, add CPUID check."
> - "Adds SSE2 optimized hash shifting to fill_window."
> - "add SSE4.2 optimized hash function"
> - "add PCLMULQDQ optimized CRC folding"
>
> From Jim Kukunas <james.t.kukunas@linux.intel.com>; and adapts them to the
> current zlib version in Chromium.
>
> The optimisations are enabled at runtime if all the necessary CPU features are
> present. As the optimisations require extra cflags to enable the compiler to
> use the instructions the optimisations are held in their own static library
> with a stub implementation to allow linking on other platforms.
>
> TEST=net_unittests(GZipUnitTest) passes, Chrome functions and performance
> improvement seen on RoboHornet benchmark on Linux Desktop
> BUG=401517
>
> Committed: https://crrev.com/a5022d5eab6f77889aceed6ab0ccaf44a657ffc4
> Cr-Commit-Position: refs/heads/master@{#301162}
TBR=agl@chromium.org,hans@chromium.org,robert.bradford@intel.com
NOTREECHECKS=true
NOTRY=true
BUG=401517
Review URL: https://codereview.chromium.org/665203006
Cr-Commit-Position: refs/heads/master@{#301221}
Diffstat (limited to 'third_party/zlib/deflate.h')
-rw-r--r-- | third_party/zlib/deflate.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/third_party/zlib/deflate.h b/third_party/zlib/deflate.h index d15f2b5..2fe6fd6 100644 --- a/third_party/zlib/deflate.h +++ b/third_party/zlib/deflate.h @@ -107,8 +107,6 @@ typedef struct internal_state { Byte method; /* STORED (for zip only) or DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ - unsigned zalign(16) crc0[4 * 5]; - /* used by deflate.c: */ uInt w_size; /* LZ77 window size (32K by default) */ @@ -346,14 +344,4 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, flush = _tr_tally(s, distance, length) #endif -/* Functions that are SIMD optimised on x86 */ -void ZLIB_INTERNAL crc_fold_init(deflate_state* const s); -void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s, - unsigned char* dst, - const unsigned char* src, - long len); -unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s); - -void ZLIB_INTERNAL fill_window_sse(deflate_state* s); - #endif /* DEFLATE_H */ |