krak/zstd
krak/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-03-06 16:56:49 +02:00
Code Issues Releases 1 Activity

Revert "Limit ZSTD_maxCLevel to 21 for 32-bit binaries."

Browse Source
This commit is contained in:
Yann Collet 2021-12-20 11:43:14 -08:00 committed by GitHub
parent 85bd1e663b
commit a9e43b37d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/dev-short-tests.yml vendored
View File

@ -30,8 +30,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: make check on 32-bit - name: make check on 32-bit
env:
CHECK_CONSTRAINED_MEM: true
run: | run: |
sudo apt update sudo apt update
APT_PACKAGES="gcc-multilib" make apt-install APT_PACKAGES="gcc-multilib" make apt-install

2
doc/zstd_manual.html
View File

@ -40,7 +40,7 @@
functions. functions.
The library supports regular compression levels from 1 up to ZSTD_maxCLevel(), The library supports regular compression levels from 1 up to ZSTD_maxCLevel(),
which is 22 in most cases. Levels >= 20, labeled `--ultra`, should be used with which is currently 22. Levels >= 20, labeled `--ultra`, should be used with
caution, as they require more memory. The library also offers negative caution, as they require more memory. The library also offers negative
compression levels, which extend the range of speed vs. ratio preferences. compression levels, which extend the range of speed vs. ratio preferences.
The lower the level, the faster the speed (at the cost of compression). The lower the level, the faster the speed (at the cost of compression).

3
lib/compress/clevels.h
View File

@ -16,8 +16,7 @@
/*-===== Pre-defined compression levels =====-*/ /*-===== Pre-defined compression levels =====-*/
#define ZSTD_MAX_CLEVEL 22 #define ZSTD_MAX_CLEVEL 22
#define ZSTD_MAX_32BIT_CLEVEL 21
#ifdef __GNUC__ #ifdef __GNUC__
__attribute__((__unused__)) __attribute__((__unused__))

4
lib/compress/zstd_compress.c
View File

@ -6165,7 +6165,7 @@ size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
/*-===== Pre-defined compression levels =====-*/ /*-===== Pre-defined compression levels =====-*/
#include "clevels.h" #include "clevels.h"
int ZSTD_maxCLevel(void) { return MEM_32bits() ? ZSTD_MAX_32BIT_CLEVEL : ZSTD_MAX_CLEVEL; } int ZSTD_maxCLevel(void) { return ZSTD_MAX_CLEVEL; }
int ZSTD_minCLevel(void) { return (int)-ZSTD_TARGETLENGTH_MAX; } int ZSTD_minCLevel(void) { return (int)-ZSTD_TARGETLENGTH_MAX; }
int ZSTD_defaultCLevel(void) { return ZSTD_CLEVEL_DEFAULT; } int ZSTD_defaultCLevel(void) { return ZSTD_CLEVEL_DEFAULT; }
@ -6261,7 +6261,7 @@ static ZSTD_compressionParameters ZSTD_getCParams_internal(int compressionLevel,
/* row */ /* row */
if (compressionLevel == 0) row = ZSTD_CLEVEL_DEFAULT; /* 0 == default */ if (compressionLevel == 0) row = ZSTD_CLEVEL_DEFAULT; /* 0 == default */
else if (compressionLevel < 0) row = 0; /* entry 0 is baseline for fast mode */ else if (compressionLevel < 0) row = 0; /* entry 0 is baseline for fast mode */
else if (compressionLevel > ZSTD_maxCLevel()) row = ZSTD_maxCLevel(); else if (compressionLevel > ZSTD_MAX_CLEVEL) row = ZSTD_MAX_CLEVEL;
else row = compressionLevel; else row = compressionLevel;
{ ZSTD_compressionParameters cp = ZSTD_defaultCParameters[tableID][row]; { ZSTD_compressionParameters cp = ZSTD_defaultCParameters[tableID][row];

2
tests/fuzzer.c
View File

@ -1982,7 +1982,7 @@ static int basicUnitTests(U32 const seed, double compressibility)
int const rowLevelEnd = 8; int const rowLevelEnd = 8;
DISPLAYLEVEL(3, "test%3i : flat-dictionary efficiency test : \n", testNb++); DISPLAYLEVEL(3, "test%3i : flat-dictionary efficiency test : \n", testNb++);
assert(maxLevel == (MEM_32bits() ? 21 : 22)); assert(maxLevel == 22);
RDG_genBuffer(CNBuffer, flatdictSize + contentSize, compressibility, 0., seed); RDG_genBuffer(CNBuffer, flatdictSize + contentSize, compressibility, 0., seed);
DISPLAYLEVEL(4, "content hash : %016llx; dict hash : %016llx \n", DISPLAYLEVEL(4, "content hash : %016llx; dict hash : %016llx \n",
(unsigned long long)XXH64(contentStart, contentSize, 0), (unsigned long long)XXH64(contentStart, contentSize, 0),

5
tests/playTests.sh
View File

@ -1568,11 +1568,6 @@ elif [ "$longCSize19wlog23" -gt "$optCSize19wlog23" ]; then
exit 1 exit 1
fi fi
if [ -n "$CHECK_CONSTRAINED_MEM" ]; then
println "\n===> zsdt constrained memory tests "
# shellcheck disable=SC2039
(ulimit -Sv 500000 ; datagen -g2M | zstd -22 --single-thread --ultra > /dev/null)
fi
if [ "$1" != "--test-large-data" ]; then if [ "$1" != "--test-large-data" ]; then
println "Skipping large data tests" println "Skipping large data tests"