facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Levels

dev
George Lu 2018-07-16 18:04:57 -07:00
parent 7b5b3d7ae3
commit 0f91b039ff
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/paramgrill.c Normal file → Executable file
View File

@ -56,7 +56,7 @@ static const int g_maxNbVariations = 64;
#define DISPLAY(...) fprintf(stderr, __VA_ARGS__) #define DISPLAY(...) fprintf(stderr, __VA_ARGS__)
#define TIMED 0 #define TIMED 0
#ifndef DEBUG #ifndef DEBUG
# define DEBUG 0 # define DEBUG 1
#endif #endif
#define DEBUGOUTPUT(...) { if (DEBUG) DISPLAY(__VA_ARGS__); } #define DEBUGOUTPUT(...) { if (DEBUG) DISPLAY(__VA_ARGS__); }
@ -2227,7 +2227,7 @@ static int nextStrategy(const int currentStrategy, const int bestStrategy) {
} }
//optimize fixed strategy. //optimize fixed strategy.
static int optimizeForSize(const char* const * const fileNamesTable, const size_t nbFiles, const char* dictFileName, constraint_t target, ZSTD_compressionParameters paramTarget) static int optimizeForSize(const char* const * const fileNamesTable, const size_t nbFiles, const char* dictFileName, constraint_t target, ZSTD_compressionParameters paramTarget, int cLevel)
{ {
size_t benchedSize; size_t benchedSize;
void* origBuff = NULL; void* origBuff = NULL;
@ -2238,7 +2238,6 @@ static int optimizeForSize(const char* const * const fileNamesTable, const size_
size_t* fileSizes = calloc(sizeof(size_t),nbFiles); size_t* fileSizes = calloc(sizeof(size_t),nbFiles);
const int varLen = variableParams(paramTarget, varArray); const int varLen = variableParams(paramTarget, varArray);
U8** allMT = NULL; U8** allMT = NULL;
g_targetConstraints = target;
g_winner.result.cSize = (size_t)-1; g_winner.result.cSize = (size_t)-1;
/* Init */ /* Init */
if(!cParamValid(paramTarget)) { if(!cParamValid(paramTarget)) {
@ -2310,6 +2309,30 @@ static int optimizeForSize(const char* const * const fileNamesTable, const size_
goto _cleanUp; goto _cleanUp;
} }
//TODO: cLevel Stuff.
if(cLevel) {
BMK_result_t candidate;
const size_t blockSize = g_blockSize ? g_blockSize : benchedSize;
ZSTD_CCtx* const ctx = ZSTD_createCCtx();
ZSTD_DCtx* const dctx = ZSTD_createDCtx();
ZSTD_compressionParameters const CParams = ZSTD_getCParams(cLevel, blockSize, dictBufferSize);
if(BMK_benchParam(&candidate, origBuff, benchedSize, fileSizes, nbFiles, ctx, dctx, CParams)) {
ZSTD_freeCCtx(ctx);
ZSTD_freeDCtx(dctx);
ret = 3;
goto _cleanUp;
}
target.cSpeed = candidate.cSpeed; //TODO: maybe have a small bit of slack here, like x.99?
target.dSpeed = candidate.dSpeed;
BMK_printWinner(stdout, cLevel, candidate, CParams, benchedSize);
ZSTD_freeCCtx(ctx);
ZSTD_freeDCtx(dctx);
}
g_targetConstraints = target;
/* bench */ /* bench */
DISPLAY("\r%79s\r", ""); DISPLAY("\r%79s\r", "");
if(nbFiles == 1) { if(nbFiles == 1) {
@ -2348,7 +2371,7 @@ static int optimizeForSize(const char* const * const fileNamesTable, const size_
BMK_result_t candidate; BMK_result_t candidate;
int feas = 0, i; int feas = 0, i;
for (i=1; i<=maxSeeds; i++) { for (i=1; i<=maxSeeds; i++) {
ZSTD_compressionParameters const CParams = ZSTD_getCParams(i, blockSize, 0); ZSTD_compressionParameters const CParams = ZSTD_getCParams(i, blockSize, dictBufferSize);
int ec = BMK_benchParam(&candidate, origBuff, benchedSize, fileSizes, nbFiles, ctx, dctx, CParams); int ec = BMK_benchParam(&candidate, origBuff, benchedSize, fileSizes, nbFiles, ctx, dctx, CParams);
BMK_printWinner(stdout, i, candidate, CParams, benchedSize); BMK_printWinner(stdout, i, candidate, CParams, benchedSize);
@ -2553,6 +2576,7 @@ int main(int argc, const char** argv)
const char* dictFileName = 0; const char* dictFileName = 0;
U32 optimizer = 0; U32 optimizer = 0;
U32 main_pause = 0; U32 main_pause = 0;
int optimizerCLevel = 0;
constraint_t target = { 0, 0, (U32)-1 }; //0 for anything unset constraint_t target = { 0, 0, (U32)-1 }; //0 for anything unset
@ -2584,6 +2608,7 @@ int main(int argc, const char** argv)
if (longCommandWArg(&argument, "compressionSpeed=") || longCommandWArg(&argument, "cSpeed=")) { target.cSpeed = readU32FromChar(&argument) * 1000000; if (argument[0]==',') { argument++; continue; } else break; } if (longCommandWArg(&argument, "compressionSpeed=") || longCommandWArg(&argument, "cSpeed=")) { target.cSpeed = readU32FromChar(&argument) * 1000000; if (argument[0]==',') { argument++; continue; } else break; }
if (longCommandWArg(&argument, "decompressionSpeed=") || longCommandWArg(&argument, "dSpeed=")) { target.dSpeed = readU32FromChar(&argument) * 1000000; if (argument[0]==',') { argument++; continue; } else break; } if (longCommandWArg(&argument, "decompressionSpeed=") || longCommandWArg(&argument, "dSpeed=")) { target.dSpeed = readU32FromChar(&argument) * 1000000; if (argument[0]==',') { argument++; continue; } else break; }
if (longCommandWArg(&argument, "compressionMemory=") || longCommandWArg(&argument, "cMem=")) { target.cMem = readU32FromChar(&argument) * 1000000; if (argument[0]==',') { argument++; continue; } else break; } if (longCommandWArg(&argument, "compressionMemory=") || longCommandWArg(&argument, "cMem=")) { target.cMem = readU32FromChar(&argument) * 1000000; if (argument[0]==',') { argument++; continue; } else break; }
//TODO: add Level;
/* in MB or MB/s */ /* in MB or MB/s */
DISPLAY("invalid optimization parameter \n"); DISPLAY("invalid optimization parameter \n");
return 1; return 1;
@ -2692,6 +2717,10 @@ int main(int argc, const char** argv)
argument++; argument++;
paramTarget.strategy = (ZSTD_strategy)readU32FromChar(&argument); paramTarget.strategy = (ZSTD_strategy)readU32FromChar(&argument);
continue; continue;
case 'L': /* level centers around a level */
argument++;
optimizerCLevel = (int)readU32FromChar(&argument);
continue;
default : ; default : ;
} }
break; break;
@ -2796,7 +2825,7 @@ int main(int argc, const char** argv)
} }
} else { } else {
if (optimizer) { if (optimizer) {
result = optimizeForSize(argv+filenamesStart, argc-filenamesStart, dictFileName, target, paramTarget); result = optimizeForSize(argv+filenamesStart, argc-filenamesStart, dictFileName, target, paramTarget, optimizerCLevel);
} else { } else {
result = benchFiles(argv+filenamesStart, argc-filenamesStart); result = benchFiles(argv+filenamesStart, argc-filenamesStart);
} } } }