From cefef8cde7d6dfec2a0eb44b20be24fd1cab6632 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Mon, 15 Feb 2016 07:21:54 +0100 Subject: [PATCH] Change : zstd_opt_bt => zstd_btopt --- lib/zstd_compress.c | 68 +++++++++++++++++++++---------------------- lib/zstd_static.h | 14 ++++----- programs/fuzzer.c | 2 +- programs/paramgrill.c | 6 ++-- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c index 0a71d984..02386be7 100644 --- a/lib/zstd_compress.c +++ b/lib/zstd_compress.c @@ -160,7 +160,7 @@ static unsigned ZSTD_highbit(U32 val); optimize for `srcSize` if srcSize > 0 */ void ZSTD_validateParams(ZSTD_parameters* params) { - const U32 btPlus = (params->strategy == ZSTD_btlazy2) || (params->strategy == ZSTD_opt_bt); + const U32 btPlus = (params->strategy == ZSTD_btlazy2) || (params->strategy == ZSTD_btopt); /* validate params */ if (MEM_32bits()) if (params->windowLog > 25) params->windowLog = 25; /* 32 bits mode cannot flush > 24 bits */ @@ -170,7 +170,7 @@ void ZSTD_validateParams(ZSTD_parameters* params) CLAMP(params->searchLog, ZSTD_SEARCHLOG_MIN, ZSTD_SEARCHLOG_MAX); CLAMP(params->searchLength, ZSTD_SEARCHLENGTH_MIN, ZSTD_SEARCHLENGTH_MAX); CLAMP(params->targetLength, ZSTD_TARGETLENGTH_MIN, ZSTD_TARGETLENGTH_MAX); - if ((U32)params->strategy>(U32)ZSTD_opt_bt) params->strategy = ZSTD_opt_bt; + if ((U32)params->strategy>(U32)ZSTD_btopt) params->strategy = ZSTD_btopt; /* correct params, to use less memory */ if ((params->srcSize > 0) && (params->srcSize < (1<lowLimit > (1<<30)) { - U32 btplus = (zc->params.strategy == ZSTD_btlazy2) || (zc->params.strategy == ZSTD_opt_bt); + U32 btplus = (zc->params.strategy == ZSTD_btlazy2) || (zc->params.strategy == ZSTD_btopt); U32 contentMask = (1 << (zc->params.contentLog - btplus)) - 1; U32 newLowLimit = zc->lowLimit & contentMask; /* preserve position % contentSize */ U32 correction = zc->lowLimit - newLowLimit; @@ -2055,7 +2055,7 @@ static size_t ZSTD_loadDictionaryContent(ZSTD_CCtx* zc, const void* src, size_t break; case ZSTD_btlazy2: - case ZSTD_opt_bt: + case ZSTD_btopt: ZSTD_updateTree(zc, iend-8, iend, 1 << zc->params.searchLog, zc->params.searchLength); break; @@ -2284,10 +2284,10 @@ static const ZSTD_parameters ZSTD_defaultParameters[4][ZSTD_MAX_CLEVEL+1] = { { 0, 23, 23, 23, 5, 5, 4, ZSTD_lazy2 }, /* level 15 */ { 0, 23, 22, 22, 5, 5, 4, ZSTD_btlazy2 }, /* level 16 */ { 0, 24, 24, 23, 4, 5, 4, ZSTD_btlazy2 }, /* level 17 */ - { 0, 24, 25, 24, 4, 4, 24, ZSTD_opt_bt }, /* level 18 */ - { 0, 25, 25, 24, 5, 4, 40, ZSTD_opt_bt }, /* level 19 */ - { 0, 26, 26, 25, 8, 4,256, ZSTD_opt_bt }, /* level 20 */ - { 0, 26, 27, 25, 10, 4,256, ZSTD_opt_bt }, /* level 21 */ + { 0, 24, 25, 24, 4, 4, 24, ZSTD_btopt }, /* level 18 */ + { 0, 25, 25, 24, 5, 4, 40, ZSTD_btopt }, /* level 19 */ + { 0, 26, 26, 25, 8, 4,256, ZSTD_btopt }, /* level 20 */ + { 0, 26, 27, 25, 10, 4,256, ZSTD_btopt }, /* level 21 */ }, { /* for srcSize <= 256 KB */ /* l, W, C, H, S, L, T, strat */ @@ -2305,14 +2305,14 @@ static const ZSTD_parameters ZSTD_defaultParameters[4][ZSTD_MAX_CLEVEL+1] = { { 0, 18, 17, 17, 7, 4, 4, ZSTD_lazy2 }, /* level 11 */ { 0, 18, 18, 17, 4, 4, 4, ZSTD_btlazy2 }, /* level 12 */ { 0, 18, 19, 17, 7, 4, 4, ZSTD_btlazy2 }, /* level 13.*/ - { 0, 18, 17, 19, 8, 4, 24, ZSTD_opt_bt }, /* level 14.*/ - { 0, 18, 19, 19, 8, 4, 48, ZSTD_opt_bt }, /* level 15.*/ - { 0, 18, 19, 18, 9, 4,128, ZSTD_opt_bt }, /* level 16.*/ - { 0, 18, 19, 18, 9, 4,192, ZSTD_opt_bt }, /* level 17.*/ - { 0, 18, 19, 18, 9, 4,256, ZSTD_opt_bt }, /* level 18.*/ - { 0, 18, 19, 18, 10, 4,256, ZSTD_opt_bt }, /* level 19.*/ - { 0, 18, 19, 18, 11, 4,256, ZSTD_opt_bt }, /* level 20.*/ - { 0, 18, 19, 18, 12, 4,256, ZSTD_opt_bt }, /* level 21.*/ + { 0, 18, 17, 19, 8, 4, 24, ZSTD_btopt }, /* level 14.*/ + { 0, 18, 19, 19, 8, 4, 48, ZSTD_btopt }, /* level 15.*/ + { 0, 18, 19, 18, 9, 4,128, ZSTD_btopt }, /* level 16.*/ + { 0, 18, 19, 18, 9, 4,192, ZSTD_btopt }, /* level 17.*/ + { 0, 18, 19, 18, 9, 4,256, ZSTD_btopt }, /* level 18.*/ + { 0, 18, 19, 18, 10, 4,256, ZSTD_btopt }, /* level 19.*/ + { 0, 18, 19, 18, 11, 4,256, ZSTD_btopt }, /* level 20.*/ + { 0, 18, 19, 18, 12, 4,256, ZSTD_btopt }, /* level 21.*/ }, { /* for srcSize <= 128 KB */ /* l, W, C, H, S, L, T, strat */ @@ -2330,14 +2330,14 @@ static const ZSTD_parameters ZSTD_defaultParameters[4][ZSTD_MAX_CLEVEL+1] = { { 0, 17, 17, 17, 7, 4, 4, ZSTD_lazy2 }, /* level 11 */ { 0, 17, 17, 17, 8, 4, 4, ZSTD_lazy2 }, /* level 12 */ { 0, 17, 17, 17, 9, 4, 4, ZSTD_lazy2 }, /* level 13 */ - { 0, 17, 18, 16, 5, 4, 20, ZSTD_opt_bt }, /* level 14 */ - { 0, 17, 18, 16, 9, 4, 48, ZSTD_opt_bt }, /* level 15 */ - { 0, 17, 18, 17, 7, 4,128, ZSTD_opt_bt }, /* level 16 */ - { 0, 17, 18, 17, 8, 4,128, ZSTD_opt_bt }, /* level 17 */ - { 0, 17, 18, 17, 8, 4,256, ZSTD_opt_bt }, /* level 18 */ - { 0, 17, 18, 17, 9, 4,256, ZSTD_opt_bt }, /* level 19 */ - { 0, 17, 18, 17, 10, 4,512, ZSTD_opt_bt }, /* level 20 */ - { 0, 17, 18, 17, 11, 4,512, ZSTD_opt_bt }, /* level 21 */ + { 0, 17, 18, 16, 5, 4, 20, ZSTD_btopt }, /* level 14 */ + { 0, 17, 18, 16, 9, 4, 48, ZSTD_btopt }, /* level 15 */ + { 0, 17, 18, 17, 7, 4,128, ZSTD_btopt }, /* level 16 */ + { 0, 17, 18, 17, 8, 4,128, ZSTD_btopt }, /* level 17 */ + { 0, 17, 18, 17, 8, 4,256, ZSTD_btopt }, /* level 18 */ + { 0, 17, 18, 17, 9, 4,256, ZSTD_btopt }, /* level 19 */ + { 0, 17, 18, 17, 10, 4,512, ZSTD_btopt }, /* level 20 */ + { 0, 17, 18, 17, 11, 4,512, ZSTD_btopt }, /* level 21 */ }, { /* for srcSize <= 16 KB */ @@ -2354,16 +2354,16 @@ static const ZSTD_parameters ZSTD_defaultParameters[4][ZSTD_MAX_CLEVEL+1] = { { 0, 14, 14, 14, 9, 4, 4, ZSTD_lazy2 }, /* level 9 */ { 0, 14, 14, 14, 10, 4, 4, ZSTD_lazy2 }, /* level 10 */ { 0, 14, 14, 14, 11, 4, 4, ZSTD_lazy2 }, /* level 11 */ - { 0, 14, 15, 15, 12, 4, 32, ZSTD_opt_bt }, /* level 12 */ - { 0, 14, 15, 15, 12, 4, 64, ZSTD_opt_bt }, /* level 13 */ - { 0, 14, 15, 15, 12, 4, 96, ZSTD_opt_bt }, /* level 14 */ - { 0, 14, 15, 15, 12, 4,128, ZSTD_opt_bt }, /* level 15 */ - { 0, 14, 15, 15, 12, 4,256, ZSTD_opt_bt }, /* level 16 */ - { 0, 14, 15, 15, 13, 4,256, ZSTD_opt_bt }, /* level 17 */ - { 0, 14, 15, 15, 14, 4,256, ZSTD_opt_bt }, /* level 18 */ - { 0, 14, 15, 15, 15, 4,256, ZSTD_opt_bt }, /* level 19 */ - { 0, 14, 15, 15, 16, 4,256, ZSTD_opt_bt }, /* level 20 */ - { 0, 14, 15, 15, 17, 4,256, ZSTD_opt_bt }, /* level 21 */ + { 0, 14, 15, 15, 12, 4, 32, ZSTD_btopt }, /* level 12 */ + { 0, 14, 15, 15, 12, 4, 64, ZSTD_btopt }, /* level 13 */ + { 0, 14, 15, 15, 12, 4, 96, ZSTD_btopt }, /* level 14 */ + { 0, 14, 15, 15, 12, 4,128, ZSTD_btopt }, /* level 15 */ + { 0, 14, 15, 15, 12, 4,256, ZSTD_btopt }, /* level 16 */ + { 0, 14, 15, 15, 13, 4,256, ZSTD_btopt }, /* level 17 */ + { 0, 14, 15, 15, 14, 4,256, ZSTD_btopt }, /* level 18 */ + { 0, 14, 15, 15, 15, 4,256, ZSTD_btopt }, /* level 19 */ + { 0, 14, 15, 15, 16, 4,256, ZSTD_btopt }, /* level 20 */ + { 0, 14, 15, 15, 17, 4,256, ZSTD_btopt }, /* level 21 */ }, }; diff --git a/lib/zstd_static.h b/lib/zstd_static.h index 00ac0b90..258327b1 100644 --- a/lib/zstd_static.h +++ b/lib/zstd_static.h @@ -32,9 +32,9 @@ #ifndef ZSTD_STATIC_H #define ZSTD_STATIC_H -/* The objects defined into this file shall be considered experimental. - * They are not considered stable, as their prototype may change in the future. - * You can use them for tests, provide feedback, or if you can endure risks of future changes. +/* The prototypes defined within this file are considered experimental. + * They should not be used in the context DLL as they may change in the future. + * Prefer static linking if you need them, to control breaking version changes issues. */ #if defined (__cplusplus) @@ -54,8 +54,6 @@ extern "C" { #define ZSTD_WINDOWLOG_MAX 26 #define ZSTD_WINDOWLOG_MIN 18 #define ZSTD_WINDOWLOG_ABSOLUTEMIN 11 -#define ZSTD_TARGETLENGTH_MIN 4 -#define ZSTD_TARGETLENGTH_MAX 999 #define ZSTD_CONTENTLOG_MAX (ZSTD_WINDOWLOG_MAX+1) #define ZSTD_CONTENTLOG_MIN 4 #define ZSTD_HASHLOG_MAX 28 @@ -64,9 +62,11 @@ extern "C" { #define ZSTD_SEARCHLOG_MIN 1 #define ZSTD_SEARCHLENGTH_MAX 7 #define ZSTD_SEARCHLENGTH_MIN 4 +#define ZSTD_TARGETLENGTH_MIN 4 +#define ZSTD_TARGETLENGTH_MAX 999 /* from faster to stronger */ -typedef enum { ZSTD_fast, ZSTD_greedy, ZSTD_lazy, ZSTD_lazy2, ZSTD_btlazy2, ZSTD_opt, ZSTD_opt_bt } ZSTD_strategy; +typedef enum { ZSTD_fast, ZSTD_greedy, ZSTD_lazy, ZSTD_lazy2, ZSTD_btlazy2, ZSTD_opt, ZSTD_btopt } ZSTD_strategy; typedef struct { @@ -81,7 +81,7 @@ typedef struct } ZSTD_parameters; -/* ************************************* +/*-************************************* * Advanced functions ***************************************/ ZSTDLIB_API unsigned ZSTD_maxCLevel (void); diff --git a/programs/fuzzer.c b/programs/fuzzer.c index c363dbb6..edc562be 100644 --- a/programs/fuzzer.c +++ b/programs/fuzzer.c @@ -452,7 +452,7 @@ int fuzzerTests(U32 seed, U32 nbTests, unsigned startTest, double compressibilit crcOrig = XXH64(sampleBuffer, sampleSize, 0); /* compression test */ - cLevelMod = MAX(1, 38 - (int)(MAX(9, sampleSizeLog) * 2)); /* use high compression levels with small samples, for speed */ + cLevelMod = MAX(1, 38 - (int)(MAX(9, sampleSizeLog) * 2)); /* high levels only for small samples, for manageable speed */ cLevel = (FUZ_rand(&lseed) % cLevelMod) +1; cSize = ZSTD_compressCCtx(ctx, cBuffer, cBufferSize, sampleBuffer, sampleSize, cLevel); CHECK(ZSTD_isError(cSize), "ZSTD_compressCCtx failed"); diff --git a/programs/paramgrill.c b/programs/paramgrill.c index 5e496b6b..23a54d46 100644 --- a/programs/paramgrill.c +++ b/programs/paramgrill.c @@ -407,7 +407,7 @@ const char* g_stratName[] = { "ZSTD_fast ", "ZSTD_lazy2 ", "ZSTD_btlazy2", "ZSTD_opt ", - "ZSTD_opt_bt " }; + "ZSTD_btopt " }; static void BMK_printWinner(FILE* f, U32 cLevel, BMK_result_t result, ZSTD_parameters params, size_t srcSize) { @@ -549,7 +549,7 @@ static ZSTD_parameters* sanitizeParams(ZSTD_parameters params) g_params = params; if (params.strategy == ZSTD_fast) g_params.contentLog = 0, g_params.searchLog = 0; - if ((params.strategy != ZSTD_opt) && (params.strategy != ZSTD_opt_bt)) + if ((params.strategy != ZSTD_opt) && (params.strategy != ZSTD_btopt )) g_params.targetLength = 0; return &g_params; } @@ -648,7 +648,7 @@ static void potentialRandomParams(ZSTD_parameters* p, U32 inverseChance) p->windowLog = FUZ_rand(&g_rand) % (ZSTD_WINDOWLOG_MAX+1 - ZSTD_WINDOWLOG_MIN) + ZSTD_WINDOWLOG_MIN; p->searchLength=FUZ_rand(&g_rand) % (ZSTD_SEARCHLENGTH_MAX+1 - ZSTD_SEARCHLENGTH_MIN) + ZSTD_SEARCHLENGTH_MIN; p->targetLength=FUZ_rand(&g_rand) % (ZSTD_TARGETLENGTH_MAX+1 - ZSTD_TARGETLENGTH_MIN) + ZSTD_TARGETLENGTH_MIN; - p->strategy = (ZSTD_strategy) (FUZ_rand(&g_rand) % (ZSTD_opt_bt+1)); + p->strategy = (ZSTD_strategy) (FUZ_rand(&g_rand) % (ZSTD_btopt +1)); ZSTD_validateParams(p); } }