Skip to content

Commit

Permalink
Zlib: Update zlib to v1.2.13, intel-zlib to v1.2.13_jtk (#84602)
Browse files Browse the repository at this point in the history
  • Loading branch information
GrabYourPitchforks authored Apr 13, 2023
1 parent fbcb1e7 commit 6875ba0
Show file tree
Hide file tree
Showing 47 changed files with 720 additions and 535 deletions.
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ https://github.com/madler/zlib
https://zlib.net/zlib_license.html

/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.12, March 27th, 2022
version 1.2.13, October 13th, 2022

Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ https://github.com/madler/zlib
https://zlib.net/zlib_license.html

/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.12, March 27th, 2022
version 1.2.13, October 13th, 2022

Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

Expand Down
6 changes: 3 additions & 3 deletions src/native/external/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/madler/zlib",
"CommitHash": "21767c654d31d2dccdde4330529775c6c5fd5389"
"CommitHash": "04f42ceca40f73e2978b50e93806c2a18c1281fc"
}
},
"DevelopmentDependency": false
Expand All @@ -55,8 +55,8 @@
"Component": {
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/jtkukunas/zlib",
"CommitHash": "bf55d56b068467329f5a6f29bee31bc80d694023"
"RepositoryUrl": "https://github.com/intel/zlib",
"CommitHash": "6160a8f20c3626aec2f8b0fda5bf2e65bfe31781"
}
},
"DevelopmentDependency": false
Expand Down
21 changes: 11 additions & 10 deletions src/native/external/zlib-intel-version.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
v1.2.12_jtk.1
(bf55d56b068467329f5a6f29bee31bc80d694023)
v1.2.13_jtk
(6160a8f20c3626aec2f8b0fda5bf2e65bfe31781)

https://github.com/jtkukunas/zlib/releases/tag/v1.2.12_jtk.1
https://github.com/intel/zlib/releases/tag/v1.2.13_jtk

Note: This library does not use a standard release lifecycle.
We're pointing to the latest available tagged version at the time we forked the code.

We have also cherry-picked into our local copy:
https://github.com/madler/zlib/commit/7ecf7c7458578d05a20fa481436dd5c58db112f7

And applied by hand the deflate_quick.c change from this commit:
https://github.com/dotnet/runtime/commit/60f6129b3eaef088f4b1ddc30d3320a68f396d85
We're pointing to the latest available tagged version as of this writing.

We do not pull in every file from the intel/zlib repo. Instead, some years ago,
somebody determined what they believed was the minimum set that needed to be
copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.
6 changes: 3 additions & 3 deletions src/native/external/zlib-intel/compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
Z_STREAM_ERROR if the level parameter is invalid.
*/
int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
Expand Down Expand Up @@ -65,7 +65,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)

/* ===========================================================================
*/
int ZEXPORT compress (dest, destLen, source, sourceLen)
int ZEXPORT compress(dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
Expand All @@ -78,7 +78,7 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
If the default memLevel or windowBits for deflateInit() is changed, then
this function needs to be updated.
*/
uLong ZEXPORT compressBound (sourceLen)
uLong ZEXPORT compressBound(sourceLen)
uLong sourceLen;
{
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
Expand Down
21 changes: 15 additions & 6 deletions src/native/external/zlib-intel/crc32.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,22 @@
# endif
#endif

/* If available, use the ARM processor CRC32 instruction. */
#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
# define ARMCRC32
#endif

/* Local functions. */
local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));

/* If available, use the ARM processor CRC32 instruction. */
#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
# define ARMCRC32
#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
local z_word_t byte_swap OF((z_word_t word));
#endif

#if defined(W) && !defined(ARMCRC32)
local z_crc_t crc_word OF((z_word_t data));
local z_word_t crc_word_big OF((z_word_t data));
#endif

#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
Expand Down Expand Up @@ -645,8 +654,8 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
len &= 7;

/* Do three interleaved CRCs to realize the throughput of one crc32x
instruction per cycle. Each CRC is calcuated on Z_BATCH words. The three
CRCs are combined into a single CRC after each set of batches. */
instruction per cycle. Each CRC is calculated on Z_BATCH words. The
three CRCs are combined into a single CRC after each set of batches. */
while (num >= 3 * Z_BATCH) {
crc1 = 0;
crc2 = 0;
Expand Down Expand Up @@ -1107,7 +1116,7 @@ uLong ZEXPORT crc32_combine_gen(len2)
}

/* ========================================================================= */
uLong crc32_combine_op(crc1, crc2, op)
uLong ZEXPORT crc32_combine_op(crc1, crc2, op)
uLong crc1;
uLong crc2;
uLong op;
Expand Down
Loading

0 comments on commit 6875ba0

Please sign in to comment.