2017-08-18 23:52:05 +00:00
|
|
|
/*
|
2016-08-30 17:04:33 +00:00
|
|
|
* Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
2017-08-18 23:52:05 +00:00
|
|
|
* This source code is licensed under both the BSD-style license (found in the
|
|
|
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
|
|
|
* in the COPYING file in the root directory of this source tree).
|
2017-09-08 07:09:23 +00:00
|
|
|
* You may select, at your option, one of the above-listed licenses.
|
2016-08-30 17:04:33 +00:00
|
|
|
*/
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
|
2016-12-21 12:23:34 +00:00
|
|
|
|
2017-01-20 00:59:56 +00:00
|
|
|
/* **************************************
|
|
|
|
* Tuning parameters
|
|
|
|
****************************************/
|
|
|
|
#ifndef BMK_TIMETEST_DEFAULT_S /* default minimum time per test */
|
|
|
|
#define BMK_TIMETEST_DEFAULT_S 3
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2016-12-21 12:23:34 +00:00
|
|
|
/* **************************************
|
|
|
|
* Compiler Warnings
|
|
|
|
****************************************/
|
|
|
|
#ifdef _MSC_VER
|
2018-02-20 22:48:09 +00:00
|
|
|
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
|
2016-12-21 12:23:34 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
/* *************************************
|
2015-01-24 00:58:16 +00:00
|
|
|
* Includes
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-12-21 14:08:44 +00:00
|
|
|
#include "platform.h" /* Large Files support */
|
2016-12-21 12:23:34 +00:00
|
|
|
#include "util.h" /* UTIL_getFileSize, UTIL_sleep */
|
2015-01-24 00:58:16 +00:00
|
|
|
#include <stdlib.h> /* malloc, free */
|
|
|
|
#include <string.h> /* memset */
|
2016-12-31 02:31:26 +00:00
|
|
|
#include <stdio.h> /* fprintf, fopen */
|
2018-02-20 22:48:09 +00:00
|
|
|
#include <assert.h> /* assert */
|
2016-03-29 12:52:13 +00:00
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
#include "mem.h"
|
2016-06-04 17:47:02 +00:00
|
|
|
#define ZSTD_STATIC_LINKING_ONLY
|
|
|
|
#include "zstd.h"
|
2016-04-28 10:23:33 +00:00
|
|
|
#include "datagen.h" /* RDG_genBuffer */
|
2015-01-24 00:58:16 +00:00
|
|
|
#include "xxhash.h"
|
2018-06-04 23:32:37 +00:00
|
|
|
#include "bench.h"
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
/* *************************************
|
2015-01-24 00:58:16 +00:00
|
|
|
* Constants
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-06-22 13:42:26 +00:00
|
|
|
#ifndef ZSTD_GIT_COMMIT
|
2016-06-22 14:13:25 +00:00
|
|
|
# define ZSTD_GIT_COMMIT_STRING ""
|
|
|
|
#else
|
|
|
|
# define ZSTD_GIT_COMMIT_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_GIT_COMMIT)
|
2016-06-22 13:42:26 +00:00
|
|
|
#endif
|
|
|
|
|
2018-02-20 22:48:09 +00:00
|
|
|
#define TIMELOOP_MICROSEC (1*1000000ULL) /* 1 second */
|
|
|
|
#define TIMELOOP_NANOSEC (1*1000000000ULL) /* 1 second */
|
|
|
|
#define ACTIVEPERIOD_MICROSEC (70*TIMELOOP_MICROSEC) /* 70 seconds */
|
2016-04-28 11:16:01 +00:00
|
|
|
#define COOLPERIOD_SEC 10
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
#define KB *(1 <<10)
|
|
|
|
#define MB *(1 <<20)
|
|
|
|
#define GB *(1U<<30)
|
|
|
|
|
2016-08-25 23:43:47 +00:00
|
|
|
static const size_t maxMemory = (sizeof(size_t)==4) ? (2 GB - 64 MB) : (size_t)(1ULL << ((sizeof(size_t)*8)-31));
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
/* *************************************
|
2015-12-16 01:37:24 +00:00
|
|
|
* console display
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2015-12-16 01:37:24 +00:00
|
|
|
#define DISPLAY(...) fprintf(stderr, __VA_ARGS__)
|
2018-06-11 14:59:05 +00:00
|
|
|
#define DISPLAYLEVEL(l, ...) if (displayLevel>=l) { DISPLAY(__VA_ARGS__); }
|
|
|
|
/* 0 : no display; 1: errors; 2 : + result + interaction + warnings; 3 : + progression; 4 : + information */
|
2015-12-16 01:37:24 +00:00
|
|
|
|
2017-11-30 03:11:12 +00:00
|
|
|
static const U64 g_refreshRate = SEC_TO_MICRO / 6;
|
|
|
|
static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
|
|
|
|
|
2018-06-11 14:59:05 +00:00
|
|
|
#define DISPLAYUPDATE(l, ...) { if (displayLevel>=l) { \
|
|
|
|
if ((UTIL_clockSpanMicro(g_displayClock) > g_refreshRate) || (displayLevel>=4)) \
|
2017-11-30 03:11:12 +00:00
|
|
|
{ g_displayClock = UTIL_getTime(); DISPLAY(__VA_ARGS__); \
|
2018-06-11 14:59:05 +00:00
|
|
|
if (displayLevel>=4) fflush(stderr); } } }
|
2016-08-02 21:48:13 +00:00
|
|
|
|
2015-12-16 01:37:24 +00:00
|
|
|
|
|
|
|
/* *************************************
|
|
|
|
* Exceptions
|
|
|
|
***************************************/
|
|
|
|
#ifndef DEBUG
|
|
|
|
# define DEBUG 0
|
|
|
|
#endif
|
2017-06-19 22:23:19 +00:00
|
|
|
#define DEBUGOUTPUT(...) { if (DEBUG) DISPLAY(__VA_ARGS__); }
|
2018-06-12 19:54:43 +00:00
|
|
|
|
|
|
|
#define EXM_THROW_INT(errorNum, ...) { \
|
2017-06-19 22:23:19 +00:00
|
|
|
DEBUGOUTPUT("%s: %i: \n", __FILE__, __LINE__); \
|
2018-06-12 19:54:43 +00:00
|
|
|
DISPLAYLEVEL(1, "Error %i : ", errorNum); \
|
2018-06-11 14:59:05 +00:00
|
|
|
DISPLAYLEVEL(1, __VA_ARGS__); \
|
|
|
|
DISPLAYLEVEL(1, " \n"); \
|
2018-06-12 19:54:43 +00:00
|
|
|
return errorNum; \
|
2015-12-16 01:37:24 +00:00
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
#define EXM_THROW(errorNum, retType, ...) { \
|
|
|
|
retType r; \
|
|
|
|
memset(&r, 0, sizeof(retType)); \
|
|
|
|
DEBUGOUTPUT("%s: %i: \n", __FILE__, __LINE__); \
|
|
|
|
DISPLAYLEVEL(1, "Error %i : ", errorNum); \
|
|
|
|
DISPLAYLEVEL(1, __VA_ARGS__); \
|
|
|
|
DISPLAYLEVEL(1, " \n"); \
|
|
|
|
r.error = errorNum; \
|
|
|
|
return r; \
|
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
/* error without displaying */
|
|
|
|
#define EXM_THROW_ND(errorNum, retType, ...) { \
|
|
|
|
retType r; \
|
|
|
|
memset(&r, 0, sizeof(retType)); \
|
|
|
|
DEBUGOUTPUT("%s: %i: \n", __FILE__, __LINE__); \
|
|
|
|
DEBUGOUTPUT("Error %i : ", errorNum); \
|
|
|
|
DEBUGOUTPUT(__VA_ARGS__); \
|
|
|
|
DEBUGOUTPUT(" \n"); \
|
|
|
|
r.error = errorNum; \
|
|
|
|
return r; \
|
|
|
|
}
|
|
|
|
|
2015-10-22 14:31:46 +00:00
|
|
|
/* *************************************
|
2015-01-24 00:58:16 +00:00
|
|
|
* Benchmark Parameters
|
2015-10-22 14:31:46 +00:00
|
|
|
***************************************/
|
2016-03-23 19:30:26 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
#define BMK_LDM_PARAM_NOTSET 9999
|
2018-06-11 14:59:05 +00:00
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
BMK_advancedParams_t BMK_initAdvancedParams(void) {
|
2018-06-12 19:54:43 +00:00
|
|
|
BMK_advancedParams_t res = {
|
2018-06-14 18:46:17 +00:00
|
|
|
BMK_both, /* mode */
|
|
|
|
BMK_timeMode, /* loopMode */
|
2018-06-12 19:54:43 +00:00
|
|
|
BMK_TIMETEST_DEFAULT_S, /* nbSeconds */
|
|
|
|
0, /* blockSize */
|
|
|
|
0, /* nbWorkers */
|
|
|
|
0, /* realTime */
|
|
|
|
0, /* additionalParam */
|
|
|
|
0, /* ldmFlag */
|
|
|
|
0, /* ldmMinMatch */
|
|
|
|
0, /* ldmHashLog */
|
|
|
|
BMK_LDM_PARAM_NOTSET, /* ldmBuckSizeLog */
|
|
|
|
BMK_LDM_PARAM_NOTSET /* ldmHashEveryLog */
|
|
|
|
};
|
|
|
|
return res;
|
|
|
|
}
|
2018-06-11 14:59:05 +00:00
|
|
|
|
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
/* ********************************************************
|
|
|
|
* Bench functions
|
|
|
|
**********************************************************/
|
|
|
|
typedef struct {
|
|
|
|
const void* srcPtr;
|
|
|
|
size_t srcSize;
|
|
|
|
void* cPtr;
|
|
|
|
size_t cRoom;
|
|
|
|
size_t cSize;
|
|
|
|
void* resPtr;
|
|
|
|
size_t resSize;
|
|
|
|
} blockParam_t;
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
#undef MIN
|
|
|
|
#undef MAX
|
|
|
|
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
|
|
|
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
2018-06-11 14:59:05 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
static void BMK_initCCtx(ZSTD_CCtx* ctx,
|
|
|
|
const void* dictBuffer, size_t dictBufferSize, int cLevel,
|
|
|
|
const ZSTD_compressionParameters* comprParams, const BMK_advancedParams_t* adv) {
|
|
|
|
if (adv->nbWorkers==1) {
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_nbWorkers, 0);
|
|
|
|
} else {
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_nbWorkers, adv->nbWorkers);
|
|
|
|
}
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_compressionLevel, cLevel);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_enableLongDistanceMatching, adv->ldmFlag);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_ldmMinMatch, adv->ldmMinMatch);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_ldmHashLog, adv->ldmHashLog);
|
|
|
|
if (adv->ldmBucketSizeLog != BMK_LDM_PARAM_NOTSET) {
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_ldmBucketSizeLog, adv->ldmBucketSizeLog);
|
|
|
|
}
|
|
|
|
if (adv->ldmHashEveryLog != BMK_LDM_PARAM_NOTSET) {
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_ldmHashEveryLog, adv->ldmHashEveryLog);
|
|
|
|
}
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_windowLog, comprParams->windowLog);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_hashLog, comprParams->hashLog);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_chainLog, comprParams->chainLog);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_searchLog, comprParams->searchLog);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_minMatch, comprParams->searchLength);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_targetLength, comprParams->targetLength);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_compressionStrategy, comprParams->strategy);
|
|
|
|
ZSTD_CCtx_loadDictionary(ctx, dictBuffer, dictBufferSize);
|
2015-10-21 07:22:25 +00:00
|
|
|
}
|
|
|
|
|
2018-06-11 14:59:05 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
static void BMK_initDCtx(ZSTD_DCtx* dctx,
|
|
|
|
const void* dictBuffer, size_t dictBufferSize) {
|
|
|
|
ZSTD_DCtx_loadDictionary(dctx, dictBuffer, dictBufferSize);
|
2017-01-20 00:59:56 +00:00
|
|
|
}
|
2017-11-17 08:02:37 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
typedef struct {
|
|
|
|
ZSTD_CCtx* ctx;
|
|
|
|
const void* dictBuffer;
|
|
|
|
size_t dictBufferSize;
|
|
|
|
int cLevel;
|
|
|
|
const ZSTD_compressionParameters* comprParams;
|
|
|
|
const BMK_advancedParams_t* adv;
|
|
|
|
} BMK_initCCtxArgs;
|
|
|
|
|
|
|
|
static size_t local_initCCtx(void* payload) {
|
|
|
|
BMK_initCCtxArgs* ag = (BMK_initCCtxArgs*)payload;
|
|
|
|
BMK_initCCtx(ag->ctx, ag->dictBuffer, ag->dictBufferSize, ag->cLevel, ag->comprParams, ag->adv);
|
|
|
|
return 0;
|
2017-11-17 08:02:37 +00:00
|
|
|
}
|
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
typedef struct {
|
|
|
|
ZSTD_DCtx* dctx;
|
|
|
|
const void* dictBuffer;
|
|
|
|
size_t dictBufferSize;
|
|
|
|
} BMK_initDCtxArgs;
|
|
|
|
|
|
|
|
static size_t local_initDCtx(void* payload) {
|
|
|
|
BMK_initDCtxArgs* ag = (BMK_initDCtxArgs*)payload;
|
|
|
|
BMK_initDCtx(ag->dctx, ag->dictBuffer, ag->dictBufferSize);
|
|
|
|
return 0;
|
2017-11-17 08:22:55 +00:00
|
|
|
}
|
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
/* additional argument is just the context */
|
|
|
|
static size_t local_defaultCompress(
|
|
|
|
const void* srcBuffer, size_t srcSize,
|
|
|
|
void* dstBuffer, size_t dstSize,
|
|
|
|
void* addArgs) {
|
|
|
|
size_t moreToFlush = 1;
|
|
|
|
ZSTD_CCtx* ctx = (ZSTD_CCtx*)addArgs;
|
|
|
|
ZSTD_inBuffer in;
|
|
|
|
ZSTD_outBuffer out;
|
|
|
|
in.src = srcBuffer;
|
|
|
|
in.size = srcSize;
|
|
|
|
in.pos = 0;
|
|
|
|
out.dst = dstBuffer;
|
|
|
|
out.size = dstSize;
|
|
|
|
out.pos = 0;
|
|
|
|
while (moreToFlush) {
|
|
|
|
moreToFlush = ZSTD_compress_generic(ctx, &out, &in, ZSTD_e_end);
|
|
|
|
if (ZSTD_isError(moreToFlush)) {
|
|
|
|
return moreToFlush;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return out.pos;
|
2017-07-28 22:51:33 +00:00
|
|
|
}
|
2016-12-27 06:19:36 +00:00
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
/* additional argument is just the context */
|
2018-06-12 19:54:43 +00:00
|
|
|
static size_t local_defaultDecompress(
|
|
|
|
const void* srcBuffer, size_t srcSize,
|
|
|
|
void* dstBuffer, size_t dstSize,
|
|
|
|
void* addArgs) {
|
|
|
|
size_t moreToFlush = 1;
|
|
|
|
ZSTD_DCtx* dctx = (ZSTD_DCtx*)addArgs;
|
|
|
|
ZSTD_inBuffer in;
|
|
|
|
ZSTD_outBuffer out;
|
|
|
|
in.src = srcBuffer;
|
|
|
|
in.size = srcSize;
|
|
|
|
in.pos = 0;
|
|
|
|
out.dst = dstBuffer;
|
|
|
|
out.size = dstSize;
|
|
|
|
out.pos = 0;
|
|
|
|
while (moreToFlush) {
|
|
|
|
moreToFlush = ZSTD_decompress_generic(dctx,
|
|
|
|
&out, &in);
|
|
|
|
if (ZSTD_isError(moreToFlush)) {
|
|
|
|
return moreToFlush;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return out.pos;
|
2017-09-01 21:52:51 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
/* initFn will be measured once, bench fn will be measured x times */
|
|
|
|
/* benchFn should return error value or out Size */
|
|
|
|
/* takes # of blocks and list of size & stuff for each. */
|
2018-06-19 17:58:22 +00:00
|
|
|
/* only does iterations*/
|
|
|
|
/* note time/iter could be zero if interval too short */
|
2018-06-15 20:21:08 +00:00
|
|
|
BMK_customReturn_t BMK_benchFunction(
|
2018-06-18 19:08:51 +00:00
|
|
|
size_t (*benchFn)(const void*, size_t, void*, size_t, void*), void* benchPayload,
|
|
|
|
size_t (*initFn)(void*), void* initPayload,
|
2018-06-15 20:21:08 +00:00
|
|
|
size_t blockCount,
|
|
|
|
const void* const * const srcBlockBuffers, const size_t* srcBlockSizes,
|
|
|
|
void* const * const dstBlockBuffers, const size_t* dstBlockCapacities,
|
2018-06-19 17:58:22 +00:00
|
|
|
unsigned iter) {
|
2018-06-12 19:54:43 +00:00
|
|
|
size_t srcSize = 0, dstSize = 0, ind = 0;
|
|
|
|
unsigned toAdd = 1;
|
2018-06-19 17:58:22 +00:00
|
|
|
U64 totalTime;
|
2018-06-12 19:54:43 +00:00
|
|
|
|
|
|
|
BMK_customReturn_t retval;
|
|
|
|
UTIL_time_t clockStart;
|
|
|
|
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
for(i = 0; i < blockCount; i++) {
|
2018-06-15 20:21:08 +00:00
|
|
|
memset(dstBlockBuffers[i], 0xE5, dstBlockCapacities[i]); /* warm up and erase result buffer */
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
2017-09-03 04:10:36 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
UTIL_sleepMilli(5); /* give processor time to other processes */
|
|
|
|
UTIL_waitForNextTick();
|
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
if(!iter) {
|
2018-06-19 17:58:22 +00:00
|
|
|
EXM_THROW_ND(1, BMK_customReturn_t, "nbLoops must be nonzero \n");
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
2015-10-21 07:22:25 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
for(ind = 0; ind < blockCount; ind++) {
|
2018-06-15 20:21:08 +00:00
|
|
|
srcSize += srcBlockSizes[ind];
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
{
|
|
|
|
unsigned i, j;
|
|
|
|
clockStart = UTIL_getTime();
|
|
|
|
if(initFn != NULL) { (*initFn)(initPayload); }
|
|
|
|
for(i = 0; i < iter; i++) {
|
|
|
|
for(j = 0; j < blockCount; j++) {
|
|
|
|
size_t res = (*benchFn)(srcBlockBuffers[j], srcBlockSizes[j], dstBlockBuffers[j], dstBlockCapacities[j], benchPayload);
|
|
|
|
if(ZSTD_isError(res)) {
|
|
|
|
EXM_THROW_ND(2, BMK_customReturn_t, "Function benchmarking failed on block %u of size %u : %s \n",
|
|
|
|
j, (U32)dstBlockCapacities[j], ZSTD_getErrorName(res));
|
|
|
|
} else if(toAdd) {
|
|
|
|
dstSize += res;
|
2018-06-14 18:46:17 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-19 17:58:22 +00:00
|
|
|
toAdd = 0;
|
2018-06-14 18:46:17 +00:00
|
|
|
}
|
2018-06-19 17:58:22 +00:00
|
|
|
totalTime = UTIL_clockSpanNano(clockStart);
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
2018-06-19 17:58:22 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
retval.error = 0;
|
2018-06-19 17:58:22 +00:00
|
|
|
retval.result.nanoSecPerRun = totalTime / iter;
|
2018-06-15 20:21:08 +00:00
|
|
|
retval.result.sumOfReturn = dstSize;
|
2018-06-12 19:54:43 +00:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
/* benchMem with no allocation */
|
|
|
|
static BMK_return_t BMK_benchMemAdvancedNoAlloc(
|
|
|
|
const void ** const srcPtrs, size_t* const srcSizes,
|
|
|
|
void** const cPtrs, size_t* const cSizes,
|
|
|
|
void** const resPtrs, size_t* const resSizes,
|
|
|
|
void* resultBuffer, void* compressedBuffer,
|
|
|
|
const size_t maxCompressedSize,
|
|
|
|
|
|
|
|
const void* srcBuffer, size_t srcSize,
|
|
|
|
const size_t* fileSizes, unsigned nbFiles,
|
|
|
|
const int cLevel, const ZSTD_compressionParameters* comprParams,
|
|
|
|
const void* dictBuffer, size_t dictBufferSize,
|
|
|
|
ZSTD_CCtx* ctx, ZSTD_DCtx* dctx,
|
|
|
|
int displayLevel, const char* displayName, const BMK_advancedParams_t* adv)
|
2015-01-24 00:58:16 +00:00
|
|
|
{
|
2018-06-14 18:46:17 +00:00
|
|
|
size_t const blockSize = ((adv->blockSize>=32 && (adv->mode != BMK_decodeOnly)) ? adv->blockSize : srcSize) + (!srcSize) /* avoid div by 0 */ ;
|
2018-06-11 14:59:05 +00:00
|
|
|
BMK_return_t results;
|
2016-12-07 01:46:49 +00:00
|
|
|
size_t const loadedCompressedSize = srcSize;
|
|
|
|
size_t cSize = 0;
|
|
|
|
double ratio = 0.;
|
2016-03-20 14:46:10 +00:00
|
|
|
U32 nbBlocks;
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-11 14:59:05 +00:00
|
|
|
if(!ctx || !dctx)
|
2018-06-12 19:54:43 +00:00
|
|
|
EXM_THROW(31, BMK_return_t, "error: passed in null context");
|
2018-06-11 14:59:05 +00:00
|
|
|
|
2016-03-20 14:46:10 +00:00
|
|
|
/* init */
|
2017-04-04 22:35:06 +00:00
|
|
|
if (strlen(displayName)>17) displayName += strlen(displayName)-17; /* display last 17 characters */
|
2018-06-14 18:46:17 +00:00
|
|
|
if (adv->mode == BMK_decodeOnly) { /* benchmark only decompression : source must be already compressed */
|
2017-04-04 22:35:06 +00:00
|
|
|
const char* srcPtr = (const char*)srcBuffer;
|
|
|
|
U64 totalDSize64 = 0;
|
2016-12-07 01:46:49 +00:00
|
|
|
U32 fileNb;
|
|
|
|
for (fileNb=0; fileNb<nbFiles; fileNb++) {
|
2017-02-07 21:50:09 +00:00
|
|
|
U64 const fSize64 = ZSTD_findDecompressedSize(srcPtr, fileSizes[fileNb]);
|
2018-06-12 19:54:43 +00:00
|
|
|
if (fSize64==0) EXM_THROW(32, BMK_return_t, "Impossible to determine original size ");
|
2017-04-04 22:35:06 +00:00
|
|
|
totalDSize64 += fSize64;
|
2016-12-07 01:46:49 +00:00
|
|
|
srcPtr += fileSizes[fileNb];
|
|
|
|
}
|
2017-04-04 22:35:06 +00:00
|
|
|
{ size_t const decodedSize = (size_t)totalDSize64;
|
2016-12-07 01:46:49 +00:00
|
|
|
free(resultBuffer);
|
|
|
|
resultBuffer = malloc(decodedSize);
|
2018-06-19 17:58:22 +00:00
|
|
|
if (!resultBuffer) {
|
|
|
|
EXM_THROW(33, BMK_return_t, "not enough memory");
|
|
|
|
}
|
|
|
|
if (totalDSize64 > decodedSize) {
|
|
|
|
free(resultBuffer);
|
|
|
|
EXM_THROW(32, BMK_return_t, "original size is too large"); /* size_t overflow */
|
|
|
|
}
|
2016-12-07 01:46:49 +00:00
|
|
|
cSize = srcSize;
|
|
|
|
srcSize = decodedSize;
|
|
|
|
ratio = (double)srcSize / (double)cSize;
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
|
|
|
}
|
2016-12-07 01:46:49 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
/* Init data blocks */
|
2016-12-07 01:46:49 +00:00
|
|
|
{ const char* srcPtr = (const char*)srcBuffer;
|
2015-10-21 07:22:25 +00:00
|
|
|
char* cPtr = (char*)compressedBuffer;
|
|
|
|
char* resPtr = (char*)resultBuffer;
|
2016-03-17 18:37:33 +00:00
|
|
|
U32 fileNb;
|
2016-03-20 14:46:10 +00:00
|
|
|
for (nbBlocks=0, fileNb=0; fileNb<nbFiles; fileNb++) {
|
2015-12-16 02:01:03 +00:00
|
|
|
size_t remaining = fileSizes[fileNb];
|
2018-06-14 18:46:17 +00:00
|
|
|
U32 const nbBlocksforThisFile = (adv->mode == BMK_decodeOnly) ? 1 : (U32)((remaining + (blockSize-1)) / blockSize);
|
2016-03-17 18:37:33 +00:00
|
|
|
U32 const blockEnd = nbBlocks + nbBlocksforThisFile;
|
2016-01-30 02:14:15 +00:00
|
|
|
for ( ; nbBlocks<blockEnd; nbBlocks++) {
|
2016-03-20 14:46:10 +00:00
|
|
|
size_t const thisBlockSize = MIN(remaining, blockSize);
|
2018-06-12 19:54:43 +00:00
|
|
|
srcPtrs[nbBlocks] = (const void*)srcPtr;
|
|
|
|
srcSizes[nbBlocks] = thisBlockSize;
|
|
|
|
cPtrs[nbBlocks] = (void*)cPtr;
|
2018-06-14 18:46:17 +00:00
|
|
|
cSizes[nbBlocks] = (adv->mode == BMK_decodeOnly) ? thisBlockSize : ZSTD_compressBound(thisBlockSize);
|
2018-06-12 19:54:43 +00:00
|
|
|
resPtrs[nbBlocks] = (void*)resPtr;
|
2018-06-14 18:46:17 +00:00
|
|
|
resSizes[nbBlocks] = (adv->mode == BMK_decodeOnly) ? (size_t) ZSTD_findDecompressedSize(srcPtr, thisBlockSize) : thisBlockSize;
|
2015-12-16 01:37:24 +00:00
|
|
|
srcPtr += thisBlockSize;
|
2018-06-14 18:46:17 +00:00
|
|
|
cPtr += cSizes[nbBlocks];
|
2015-12-16 01:37:24 +00:00
|
|
|
resPtr += thisBlockSize;
|
|
|
|
remaining -= thisBlockSize;
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-10-21 07:22:25 +00:00
|
|
|
|
2015-01-24 00:58:16 +00:00
|
|
|
/* warmimg up memory */
|
2018-06-14 18:46:17 +00:00
|
|
|
if (adv->mode == BMK_decodeOnly) {
|
2018-03-05 21:50:07 +00:00
|
|
|
memcpy(compressedBuffer, srcBuffer, loadedCompressedSize);
|
|
|
|
} else {
|
|
|
|
RDG_genBuffer(compressedBuffer, maxCompressedSize, 0.10, 0.50, 1);
|
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
/* Bench */
|
2018-06-12 19:54:43 +00:00
|
|
|
{
|
2018-06-14 18:46:17 +00:00
|
|
|
U64 const crcOrig = (adv->mode == BMK_decodeOnly) ? 0 : XXH64(srcBuffer, srcSize, 0);
|
2016-08-01 11:37:17 +00:00
|
|
|
# define NB_MARKS 4
|
|
|
|
const char* const marks[NB_MARKS] = { " |", " /", " =", "\\" };
|
|
|
|
U32 markNb = 0;
|
2018-06-11 14:59:05 +00:00
|
|
|
DISPLAYLEVEL(2, "\r%79s\r", "");
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-14 18:46:17 +00:00
|
|
|
if (adv->mode != BMK_decodeOnly) {
|
|
|
|
BMK_initCCtxArgs cctxprep;
|
2018-06-12 19:54:43 +00:00
|
|
|
BMK_customReturn_t compressionResults;
|
2018-06-19 17:58:22 +00:00
|
|
|
int completed = 0;
|
|
|
|
U64 totalLoops = 0, totalTime = 0, fastest = (U64)(-1LL);
|
|
|
|
UTIL_time_t coolTime = UTIL_getTime();
|
2018-06-14 18:46:17 +00:00
|
|
|
cctxprep.ctx = ctx;
|
|
|
|
cctxprep.dictBuffer = dictBuffer;
|
|
|
|
cctxprep.dictBufferSize = dictBufferSize;
|
|
|
|
cctxprep.cLevel = cLevel;
|
|
|
|
cctxprep.comprParams = comprParams;
|
|
|
|
cctxprep.adv = adv;
|
2018-06-12 19:54:43 +00:00
|
|
|
/* Compression */
|
|
|
|
DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->\r", marks[markNb], displayName, (U32)srcSize);
|
2018-06-19 17:58:22 +00:00
|
|
|
if(adv->loopMode == BMK_timeMode) {
|
|
|
|
U64 maxTime = adv->nbSeconds * TIMELOOP_NANOSEC;
|
|
|
|
unsigned nbLoops = 1;
|
|
|
|
while(!completed) {
|
|
|
|
/* Overheat protection */
|
|
|
|
if (UTIL_clockSpanMicro(coolTime) > ACTIVEPERIOD_MICROSEC) {
|
|
|
|
DEBUGOUTPUT("\rcooling down ... \r");
|
|
|
|
UTIL_sleep(COOLPERIOD_SEC);
|
|
|
|
coolTime = UTIL_getTime();
|
|
|
|
}
|
|
|
|
|
|
|
|
compressionResults = BMK_benchFunction(&local_defaultCompress, (void*)ctx, &local_initCCtx, (void*)&cctxprep,
|
|
|
|
nbBlocks, srcPtrs, srcSizes, cPtrs, cSizes, nbLoops);
|
|
|
|
if(compressionResults.error) {
|
|
|
|
results.error = compressionResults.error;
|
|
|
|
return results;
|
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
{ U64 loopDuration = compressionResults.result.nanoSecPerRun * nbLoops;
|
|
|
|
totalLoops += nbLoops;
|
|
|
|
totalTime += loopDuration;
|
|
|
|
if (loopDuration > 0) { // nanoSec / run
|
|
|
|
fastest = MIN(fastest, compressionResults.result.nanoSecPerRun);
|
|
|
|
nbLoops = (U32)(TIMELOOP_NANOSEC / fastest) + 1;
|
|
|
|
} else {
|
|
|
|
assert(nbLoops < 40000000); /* avoid overflow */
|
|
|
|
nbLoops *= 2;
|
|
|
|
}
|
|
|
|
completed = (totalTime >= maxTime);
|
|
|
|
{
|
|
|
|
int const ratioAccuracy = (ratio < 10.) ? 3 : 2;
|
|
|
|
double const compressionSpeed = (((double)srcSize * totalLoops) / totalTime) * 1000;
|
|
|
|
int const cSpeedAccuracy = (compressionSpeed < 10.) ? 2 : 1;
|
|
|
|
results.result.cSpeed = compressionSpeed * 1000000;
|
|
|
|
results.result.cSize = compressionResults.result.sumOfReturn;
|
|
|
|
ratio = (double)srcSize / results.result.cSize;
|
|
|
|
markNb = (markNb+1) % NB_MARKS;
|
|
|
|
DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.*f),%6.*f MB/s\r",
|
|
|
|
marks[markNb], displayName, (U32)srcSize, (U32)results.result.cSize,
|
|
|
|
ratioAccuracy, ratio,
|
|
|
|
cSpeedAccuracy, compressionSpeed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
compressionResults = BMK_benchFunction(&local_defaultCompress, (void*)ctx, &local_initCCtx, (void*)&cctxprep,
|
|
|
|
nbBlocks, srcPtrs, srcSizes, cPtrs, cSizes, adv->nbSeconds);
|
|
|
|
if(compressionResults.error) {
|
|
|
|
results.error = compressionResults.error;
|
|
|
|
return results;
|
|
|
|
}
|
|
|
|
if(compressionResults.result.nanoSecPerRun == 0) {
|
|
|
|
results.result.cSpeed = 0;
|
|
|
|
} else {
|
|
|
|
results.result.cSpeed = (double)srcSize / compressionResults.result.nanoSecPerRun * TIMELOOP_NANOSEC;
|
|
|
|
}
|
|
|
|
results.result.cSize = compressionResults.result.sumOfReturn;
|
|
|
|
{
|
|
|
|
int const ratioAccuracy = (ratio < 10.) ? 3 : 2;
|
|
|
|
double const compressionSpeed = results.result.cSpeed / 1000000;
|
|
|
|
int const cSpeedAccuracy = (compressionSpeed < 10.) ? 2 : 1;
|
|
|
|
ratio = (double)srcSize / results.result.cSize;
|
|
|
|
markNb = (markNb+1) % NB_MARKS;
|
|
|
|
DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.*f),%6.*f MB/s\r",
|
|
|
|
marks[markNb], displayName, (U32)srcSize, (U32)results.result.cSize,
|
|
|
|
ratioAccuracy, ratio,
|
|
|
|
cSpeedAccuracy, compressionSpeed);
|
|
|
|
}
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
2018-06-19 17:58:22 +00:00
|
|
|
|
2018-06-14 18:46:17 +00:00
|
|
|
} /* if (adv->mode != BMK_decodeOnly) */
|
|
|
|
|
|
|
|
if(adv->mode != BMK_compressOnly) {
|
|
|
|
BMK_initDCtxArgs dctxprep;
|
2018-06-12 19:54:43 +00:00
|
|
|
BMK_customReturn_t decompressionResults;
|
2018-06-19 17:58:22 +00:00
|
|
|
U64 totalLoops = 0, totalTime = 0, fastest = (U64)(-1LL);
|
|
|
|
int completed = 0;
|
|
|
|
UTIL_time_t coolTime = UTIL_getTime();
|
2018-06-14 18:46:17 +00:00
|
|
|
dctxprep.dctx = dctx;
|
|
|
|
dctxprep.dictBuffer = dictBuffer;
|
|
|
|
dctxprep.dictBufferSize = dictBufferSize;
|
2018-06-19 17:58:22 +00:00
|
|
|
if(adv->loopMode == BMK_timeMode) {
|
|
|
|
U64 maxTime = adv->nbSeconds * TIMELOOP_NANOSEC;
|
|
|
|
unsigned nbLoops = 1;
|
|
|
|
while(!completed) {
|
|
|
|
/* Overheat protection */
|
|
|
|
if (UTIL_clockSpanMicro(coolTime) > ACTIVEPERIOD_MICROSEC) {
|
|
|
|
DEBUGOUTPUT("\rcooling down ... \r");
|
|
|
|
UTIL_sleep(COOLPERIOD_SEC);
|
|
|
|
coolTime = UTIL_getTime();
|
|
|
|
}
|
|
|
|
|
|
|
|
decompressionResults = BMK_benchFunction(
|
|
|
|
&local_defaultDecompress, (void*)(dctx),
|
|
|
|
&local_initDCtx, (void*)&dctxprep, nbBlocks,
|
|
|
|
(const void * const *)cPtrs, cSizes, resPtrs, resSizes,
|
|
|
|
nbLoops);
|
|
|
|
|
|
|
|
if(decompressionResults.error) {
|
|
|
|
results.error = decompressionResults.error;
|
|
|
|
return results;
|
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
{ U64 loopDuration = decompressionResults.result.nanoSecPerRun * nbLoops;
|
|
|
|
totalLoops += nbLoops;
|
|
|
|
totalTime += loopDuration;
|
|
|
|
if (loopDuration > 0) {
|
|
|
|
fastest = MIN(fastest, loopDuration / nbLoops);
|
|
|
|
nbLoops = (U32)(TIMELOOP_NANOSEC / fastest) + 1;
|
|
|
|
} else {
|
|
|
|
assert(nbLoops < 40000000); /* avoid overflow */
|
|
|
|
nbLoops *= 2;
|
|
|
|
}
|
|
|
|
completed = (totalTime >= maxTime);
|
|
|
|
{ int const ratioAccuracy = (ratio < 10.) ? 3 : 2;
|
|
|
|
double const compressionSpeed = results.result.cSpeed / 1000000;
|
|
|
|
int const cSpeedAccuracy = (compressionSpeed < 10.) ? 2 : 1;
|
|
|
|
double const decompressionSpeed = ((double)srcSize * totalLoops / totalTime) * 1000;
|
|
|
|
results.result.dSpeed = decompressionSpeed * 1000000;
|
|
|
|
markNb = (markNb+1) % NB_MARKS;
|
|
|
|
DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.*f),%6.*f MB/s ,%6.1f MB/s \r",
|
|
|
|
marks[markNb], displayName, (U32)srcSize, (U32)results.result.cSize,
|
|
|
|
ratioAccuracy, ratio,
|
|
|
|
cSpeedAccuracy, compressionSpeed,
|
|
|
|
decompressionSpeed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
decompressionResults = BMK_benchFunction(
|
|
|
|
&local_defaultDecompress, (void*)(dctx),
|
|
|
|
&local_initDCtx, (void*)&dctxprep, nbBlocks,
|
|
|
|
(const void * const *)cPtrs, cSizes, resPtrs, resSizes,
|
|
|
|
adv->nbSeconds);
|
|
|
|
if(decompressionResults.error) {
|
|
|
|
results.error = decompressionResults.error;
|
|
|
|
return results;
|
|
|
|
}
|
|
|
|
if(decompressionResults.result.nanoSecPerRun == 0) {
|
|
|
|
results.result.dSpeed = 0;
|
|
|
|
} else {
|
|
|
|
results.result.dSpeed = (double)srcSize / decompressionResults.result.nanoSecPerRun * TIMELOOP_NANOSEC;
|
|
|
|
}
|
|
|
|
{ int const ratioAccuracy = (ratio < 10.) ? 3 : 2;
|
|
|
|
double const compressionSpeed = results.result.cSpeed / 1000000;
|
|
|
|
int const cSpeedAccuracy = (compressionSpeed < 10.) ? 2 : 1;
|
|
|
|
double const decompressionSpeed = ((double)srcSize / decompressionResults.result.nanoSecPerRun) * 1000;
|
|
|
|
results.result.dSpeed = decompressionSpeed * 1000000;
|
|
|
|
markNb = (markNb+1) % NB_MARKS;
|
|
|
|
DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.*f),%6.*f MB/s ,%6.1f MB/s \r",
|
|
|
|
marks[markNb], displayName, (U32)srcSize, (U32)results.result.cSize,
|
|
|
|
ratioAccuracy, ratio,
|
|
|
|
cSpeedAccuracy, compressionSpeed,
|
|
|
|
decompressionSpeed);
|
|
|
|
}
|
2017-11-18 23:54:32 +00:00
|
|
|
}
|
2018-06-12 19:54:43 +00:00
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
/* CRC Checking */
|
|
|
|
{ U64 const crcCheck = XXH64(resultBuffer, srcSize, 0);
|
2018-06-14 18:46:17 +00:00
|
|
|
/* adv->mode == 0 -> compress + decompress */
|
|
|
|
if ((adv->mode == BMK_both) && (crcOrig!=crcCheck)) {
|
2018-06-12 19:54:43 +00:00
|
|
|
size_t u;
|
|
|
|
DISPLAY("!!! WARNING !!! %14s : Invalid Checksum : %x != %x \n", displayName, (unsigned)crcOrig, (unsigned)crcCheck);
|
|
|
|
for (u=0; u<srcSize; u++) {
|
|
|
|
if (((const BYTE*)srcBuffer)[u] != ((const BYTE*)resultBuffer)[u]) {
|
|
|
|
U32 segNb, bNb, pos;
|
|
|
|
size_t bacc = 0;
|
|
|
|
DISPLAY("Decoding error at pos %u ", (U32)u);
|
|
|
|
for (segNb = 0; segNb < nbBlocks; segNb++) {
|
|
|
|
if (bacc + srcSizes[segNb] > u) break;
|
|
|
|
bacc += srcSizes[segNb];
|
2016-01-21 01:21:17 +00:00
|
|
|
}
|
2018-06-12 19:54:43 +00:00
|
|
|
pos = (U32)(u - bacc);
|
|
|
|
bNb = pos / (128 KB);
|
|
|
|
DISPLAY("(sample %u, block %u, pos %u) \n", segNb, bNb, pos);
|
|
|
|
if (u>5) {
|
|
|
|
int n;
|
|
|
|
DISPLAY("origin: ");
|
|
|
|
for (n=-5; n<0; n++) DISPLAY("%02X ", ((const BYTE*)srcBuffer)[u+n]);
|
|
|
|
DISPLAY(" :%02X: ", ((const BYTE*)srcBuffer)[u]);
|
|
|
|
for (n=1; n<3; n++) DISPLAY("%02X ", ((const BYTE*)srcBuffer)[u+n]);
|
|
|
|
DISPLAY(" \n");
|
|
|
|
DISPLAY("decode: ");
|
|
|
|
for (n=-5; n<0; n++) DISPLAY("%02X ", ((const BYTE*)resultBuffer)[u+n]);
|
|
|
|
DISPLAY(" :%02X: ", ((const BYTE*)resultBuffer)[u]);
|
|
|
|
for (n=1; n<3; n++) DISPLAY("%02X ", ((const BYTE*)resultBuffer)[u+n]);
|
|
|
|
DISPLAY(" \n");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (u==srcSize-1) { /* should never happen */
|
|
|
|
DISPLAY("no difference detected\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} /* CRC Checking */
|
|
|
|
|
|
|
|
if (displayLevel == 1) { /* hidden display mode -q, used by python speed benchmark */
|
|
|
|
double const cSpeed = results.result.cSpeed / 1000000;
|
|
|
|
double const dSpeed = results.result.dSpeed / 1000000;
|
|
|
|
if (adv->additionalParam)
|
|
|
|
DISPLAY("-%-3i%11i (%5.3f) %6.2f MB/s %6.1f MB/s %s (param=%d)\n", cLevel, (int)cSize, ratio, cSpeed, dSpeed, displayName, adv->additionalParam);
|
|
|
|
else
|
|
|
|
DISPLAY("-%-3i%11i (%5.3f) %6.2f MB/s %6.1f MB/s %s\n", cLevel, (int)cSize, ratio, cSpeed, dSpeed, displayName);
|
|
|
|
}
|
|
|
|
DISPLAYLEVEL(2, "%2i#\n", cLevel);
|
2018-06-14 18:46:17 +00:00
|
|
|
} /* Bench */
|
2018-06-19 17:58:22 +00:00
|
|
|
return results;
|
|
|
|
}
|
|
|
|
|
|
|
|
BMK_return_t BMK_benchMemAdvanced(const void* srcBuffer, size_t srcSize,
|
|
|
|
const size_t* fileSizes, unsigned nbFiles,
|
|
|
|
const int cLevel, const ZSTD_compressionParameters* comprParams,
|
|
|
|
const void* dictBuffer, size_t dictBufferSize,
|
|
|
|
ZSTD_CCtx* ctx, ZSTD_DCtx* dctx,
|
|
|
|
int displayLevel, const char* displayName, const BMK_advancedParams_t* adv)
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
{
|
|
|
|
size_t const blockSize = ((adv->blockSize>=32 && (adv->mode != BMK_decodeOnly)) ? adv->blockSize : srcSize) + (!srcSize) /* avoid div by 0 */ ;
|
|
|
|
U32 const maxNbBlocks = (U32) ((srcSize + (blockSize-1)) / blockSize) + nbFiles;
|
|
|
|
|
|
|
|
/* these are the blockTable parameters, just split up */
|
|
|
|
const void ** const srcPtrs = (const void ** const)malloc(maxNbBlocks * sizeof(void*));
|
|
|
|
size_t* const srcSizes = (size_t* const)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
|
|
|
|
void ** const cPtrs = (void** const)malloc(maxNbBlocks * sizeof(void*));
|
|
|
|
size_t* const cSizes = (size_t* const)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
|
|
|
|
void ** const resPtrs = (void** const)malloc(maxNbBlocks * sizeof(void*));
|
|
|
|
size_t* const resSizes = (size_t* const)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
|
|
|
|
const size_t maxCompressedSize = ZSTD_compressBound(srcSize) + (maxNbBlocks * 1024); /* add some room for safety */
|
|
|
|
void* compressedBuffer = malloc(maxCompressedSize);
|
|
|
|
void* resultBuffer = malloc(srcSize);
|
|
|
|
|
|
|
|
BMK_return_t results;
|
|
|
|
int allocationincomplete = !compressedBuffer || !resultBuffer ||
|
|
|
|
!srcPtrs || !srcSizes || !cPtrs || !cSizes || !resPtrs || !resSizes;
|
|
|
|
if (!allocationincomplete) {
|
|
|
|
results = BMK_benchMemAdvancedNoAlloc(srcPtrs, srcSizes, cPtrs, cSizes,
|
|
|
|
resPtrs, resSizes, resultBuffer, compressedBuffer, maxCompressedSize,
|
|
|
|
srcBuffer, srcSize, fileSizes, nbFiles, cLevel, comprParams,
|
|
|
|
dictBuffer, dictBufferSize, ctx, dctx, displayLevel, displayName, adv);
|
|
|
|
}
|
2015-12-16 01:37:24 +00:00
|
|
|
/* clean up */
|
2015-01-24 00:58:16 +00:00
|
|
|
free(compressedBuffer);
|
|
|
|
free(resultBuffer);
|
2018-06-12 19:54:43 +00:00
|
|
|
|
2018-06-14 18:46:17 +00:00
|
|
|
free((void*)srcPtrs);
|
2018-06-12 19:54:43 +00:00
|
|
|
free(srcSizes);
|
|
|
|
free(cPtrs);
|
|
|
|
free(cSizes);
|
|
|
|
free(resPtrs);
|
|
|
|
free(resSizes);
|
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
if(allocationincomplete) {
|
|
|
|
EXM_THROW(31, BMK_return_t, "allocation error : not enough memory");
|
|
|
|
}
|
2018-06-12 19:54:43 +00:00
|
|
|
results.error = 0;
|
2018-06-04 23:32:37 +00:00
|
|
|
return results;
|
|
|
|
}
|
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
BMK_return_t BMK_benchMem(const void* srcBuffer, size_t srcSize,
|
|
|
|
const size_t* fileSizes, unsigned nbFiles,
|
|
|
|
const int cLevel, const ZSTD_compressionParameters* comprParams,
|
|
|
|
const void* dictBuffer, size_t dictBufferSize,
|
|
|
|
ZSTD_CCtx* ctx, ZSTD_DCtx* dctx,
|
|
|
|
int displayLevel, const char* displayName) {
|
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
const BMK_advancedParams_t adv = BMK_initAdvancedParams();
|
2018-06-12 19:54:43 +00:00
|
|
|
return BMK_benchMemAdvanced(srcBuffer, srcSize,
|
|
|
|
fileSizes, nbFiles,
|
|
|
|
cLevel, comprParams,
|
|
|
|
dictBuffer, dictBufferSize,
|
|
|
|
ctx, dctx,
|
|
|
|
displayLevel, displayName, &adv);
|
|
|
|
}
|
|
|
|
|
|
|
|
static BMK_return_t BMK_benchMemCtxless(const void* srcBuffer, size_t srcSize,
|
2018-06-11 14:59:05 +00:00
|
|
|
const size_t* fileSizes, unsigned nbFiles,
|
|
|
|
int cLevel, const ZSTD_compressionParameters* const comprParams,
|
2018-06-04 23:32:37 +00:00
|
|
|
const void* dictBuffer, size_t dictBufferSize,
|
2018-06-12 19:54:43 +00:00
|
|
|
int displayLevel, const char* displayName,
|
|
|
|
const BMK_advancedParams_t * const adv)
|
2018-06-04 23:32:37 +00:00
|
|
|
{
|
2018-06-12 19:54:43 +00:00
|
|
|
BMK_return_t res;
|
2018-06-04 23:32:37 +00:00
|
|
|
ZSTD_CCtx* ctx = ZSTD_createCCtx();
|
|
|
|
ZSTD_DCtx* dctx = ZSTD_createDCtx();
|
2018-06-11 14:59:05 +00:00
|
|
|
if(ctx == NULL || dctx == NULL) {
|
2018-06-12 19:54:43 +00:00
|
|
|
EXM_THROW(12, BMK_return_t, "not enough memory for contexts");
|
2018-06-11 14:59:05 +00:00
|
|
|
}
|
2018-06-12 19:54:43 +00:00
|
|
|
res = BMK_benchMemAdvanced(srcBuffer, srcSize,
|
2018-06-11 14:59:05 +00:00
|
|
|
fileSizes, nbFiles,
|
|
|
|
cLevel, comprParams,
|
|
|
|
dictBuffer, dictBufferSize,
|
|
|
|
ctx, dctx,
|
2018-06-12 19:54:43 +00:00
|
|
|
displayLevel, displayName, adv);
|
2015-12-18 00:26:48 +00:00
|
|
|
ZSTD_freeCCtx(ctx);
|
|
|
|
ZSTD_freeDCtx(dctx);
|
2018-06-12 19:54:43 +00:00
|
|
|
return res;
|
2015-01-24 00:58:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static size_t BMK_findMaxMem(U64 requiredMem)
|
|
|
|
{
|
2016-03-20 14:46:10 +00:00
|
|
|
size_t const step = 64 MB;
|
2015-01-24 00:58:16 +00:00
|
|
|
BYTE* testmem = NULL;
|
|
|
|
|
|
|
|
requiredMem = (((requiredMem >> 26) + 1) << 26);
|
2016-03-20 14:46:10 +00:00
|
|
|
requiredMem += step;
|
2015-11-03 08:49:30 +00:00
|
|
|
if (requiredMem > maxMemory) requiredMem = maxMemory;
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2016-03-20 14:46:10 +00:00
|
|
|
do {
|
2015-01-24 00:58:16 +00:00
|
|
|
testmem = (BYTE*)malloc((size_t)requiredMem);
|
2016-03-20 14:46:10 +00:00
|
|
|
requiredMem -= step;
|
|
|
|
} while (!testmem);
|
|
|
|
|
2015-01-24 00:58:16 +00:00
|
|
|
free(testmem);
|
2016-03-20 14:46:10 +00:00
|
|
|
return (size_t)(requiredMem);
|
2015-01-24 00:58:16 +00:00
|
|
|
}
|
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
static BMK_return_t BMK_benchCLevel(const void* srcBuffer, size_t benchedSize,
|
2015-12-18 00:26:48 +00:00
|
|
|
const size_t* fileSizes, unsigned nbFiles,
|
2018-06-15 20:21:08 +00:00
|
|
|
const int cLevel, const ZSTD_compressionParameters* comprParams,
|
2016-12-13 12:03:41 +00:00
|
|
|
const void* dictBuffer, size_t dictBufferSize,
|
2018-06-12 19:54:43 +00:00
|
|
|
int displayLevel, const char* displayName,
|
|
|
|
BMK_advancedParams_t const * const adv)
|
2015-01-24 00:58:16 +00:00
|
|
|
{
|
2018-06-15 20:21:08 +00:00
|
|
|
BMK_return_t res;
|
2016-03-14 17:10:30 +00:00
|
|
|
|
|
|
|
const char* pch = strrchr(displayName, '\\'); /* Windows */
|
2018-06-14 18:46:17 +00:00
|
|
|
|
2016-03-14 17:10:30 +00:00
|
|
|
if (!pch) pch = strrchr(displayName, '/'); /* Linux */
|
|
|
|
if (pch) displayName = pch+1;
|
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
if (adv->realTime) {
|
2018-06-11 14:59:05 +00:00
|
|
|
DISPLAYLEVEL(2, "Note : switching to real-time priority \n");
|
2017-02-07 15:48:01 +00:00
|
|
|
SET_REALTIME_PRIORITY;
|
|
|
|
}
|
2016-04-25 11:09:06 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
if (displayLevel == 1 && !adv->additionalParam)
|
|
|
|
DISPLAY("bench %s %s: input %u bytes, %u seconds, %u KB blocks\n", ZSTD_VERSION_STRING, ZSTD_GIT_COMMIT_STRING, (U32)benchedSize, adv->nbSeconds, (U32)(adv->blockSize>>10));
|
2016-03-14 17:10:30 +00:00
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
res = BMK_benchMemCtxless(srcBuffer, benchedSize,
|
|
|
|
fileSizes, nbFiles,
|
|
|
|
cLevel, comprParams,
|
|
|
|
dictBuffer, dictBufferSize,
|
|
|
|
displayLevel, displayName,
|
|
|
|
adv);
|
2018-06-11 14:59:05 +00:00
|
|
|
|
2018-06-15 20:21:08 +00:00
|
|
|
return res;
|
2015-12-16 01:37:24 +00:00
|
|
|
}
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
|
2016-03-26 00:48:27 +00:00
|
|
|
/*! BMK_loadFiles() :
|
2018-03-12 02:56:48 +00:00
|
|
|
* Loads `buffer` with content of files listed within `fileNamesTable`.
|
|
|
|
* At most, fills `buffer` entirely. */
|
2018-06-12 19:54:43 +00:00
|
|
|
static int BMK_loadFiles(void* buffer, size_t bufferSize,
|
2018-06-04 23:32:37 +00:00
|
|
|
size_t* fileSizes, const char* const * const fileNamesTable,
|
2018-06-11 14:59:05 +00:00
|
|
|
unsigned nbFiles, int displayLevel)
|
2015-12-16 01:37:24 +00:00
|
|
|
{
|
2016-04-13 08:48:04 +00:00
|
|
|
size_t pos = 0, totalSize = 0;
|
2016-03-17 18:37:33 +00:00
|
|
|
unsigned n;
|
2016-01-30 02:14:15 +00:00
|
|
|
for (n=0; n<nbFiles; n++) {
|
2016-05-20 09:24:35 +00:00
|
|
|
FILE* f;
|
2016-04-28 10:23:33 +00:00
|
|
|
U64 fileSize = UTIL_getFileSize(fileNamesTable[n]);
|
|
|
|
if (UTIL_isDirectory(fileNamesTable[n])) {
|
2018-06-11 14:59:05 +00:00
|
|
|
DISPLAYLEVEL(2, "Ignoring %s directory... \n", fileNamesTable[n]);
|
2016-04-29 13:19:40 +00:00
|
|
|
fileSizes[n] = 0;
|
2016-04-13 08:48:04 +00:00
|
|
|
continue;
|
|
|
|
}
|
2017-10-17 23:14:25 +00:00
|
|
|
if (fileSize == UTIL_FILESIZE_UNKNOWN) {
|
2018-06-11 14:59:05 +00:00
|
|
|
DISPLAYLEVEL(2, "Cannot evaluate size of %s, ignoring ... \n", fileNamesTable[n]);
|
2017-10-17 23:14:25 +00:00
|
|
|
fileSizes[n] = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2016-04-25 11:09:06 +00:00
|
|
|
f = fopen(fileNamesTable[n], "rb");
|
2018-06-12 19:54:43 +00:00
|
|
|
if (f==NULL) EXM_THROW_INT(10, "impossible to open file %s", fileNamesTable[n]);
|
2016-08-02 21:48:13 +00:00
|
|
|
DISPLAYUPDATE(2, "Loading %s... \r", fileNamesTable[n]);
|
2016-03-26 00:48:27 +00:00
|
|
|
if (fileSize > bufferSize-pos) fileSize = bufferSize-pos, nbFiles=n; /* buffer too small - stop after this file */
|
|
|
|
{ size_t const readSize = fread(((char*)buffer)+pos, 1, (size_t)fileSize, f);
|
2018-06-12 19:54:43 +00:00
|
|
|
if (readSize != (size_t)fileSize) EXM_THROW_INT(11, "could not read %s", fileNamesTable[n]);
|
2016-03-26 00:48:27 +00:00
|
|
|
pos += readSize; }
|
2015-12-16 02:12:31 +00:00
|
|
|
fileSizes[n] = (size_t)fileSize;
|
2016-04-13 08:48:04 +00:00
|
|
|
totalSize += (size_t)fileSize;
|
2015-12-16 01:37:24 +00:00
|
|
|
fclose(f);
|
2015-01-24 00:58:16 +00:00
|
|
|
}
|
2016-05-01 08:26:30 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
if (totalSize == 0) EXM_THROW_INT(12, "no data to bench");
|
|
|
|
return 0;
|
2015-12-16 01:37:24 +00:00
|
|
|
}
|
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
BMK_return_t BMK_benchFilesAdvanced(const char* const * const fileNamesTable, unsigned const nbFiles,
|
2018-06-15 20:21:08 +00:00
|
|
|
const char* const dictFileName, int const cLevel,
|
2018-06-19 17:58:22 +00:00
|
|
|
const ZSTD_compressionParameters* const compressionParams,
|
|
|
|
int displayLevel, const BMK_advancedParams_t * const adv)
|
2015-12-16 01:37:24 +00:00
|
|
|
{
|
|
|
|
void* srcBuffer;
|
|
|
|
size_t benchedSize;
|
2015-12-18 00:26:48 +00:00
|
|
|
void* dictBuffer = NULL;
|
|
|
|
size_t dictBufferSize = 0;
|
2018-06-19 17:58:22 +00:00
|
|
|
size_t* fileSizes;
|
2018-06-15 20:21:08 +00:00
|
|
|
BMK_return_t res;
|
2016-05-20 09:24:35 +00:00
|
|
|
U64 const totalSizeToLoad = UTIL_getTotalFileSize(fileNamesTable, nbFiles);
|
2015-12-16 01:37:24 +00:00
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
if(!nbFiles) {
|
|
|
|
EXM_THROW(14, BMK_return_t, "No Files to Benchmark");
|
|
|
|
}
|
2015-12-18 00:26:48 +00:00
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
if (cLevel > ZSTD_maxCLevel()) {
|
|
|
|
EXM_THROW(15, BMK_return_t, "Invalid Compression Level");
|
|
|
|
}
|
|
|
|
|
|
|
|
fileSizes = (size_t*)calloc(nbFiles, sizeof(size_t));
|
|
|
|
if (!fileSizes) EXM_THROW(12, BMK_return_t, "not enough memory for fileSizes");
|
2015-12-18 00:26:48 +00:00
|
|
|
/* Load dictionary */
|
2016-01-30 02:14:15 +00:00
|
|
|
if (dictFileName != NULL) {
|
2017-10-17 23:14:25 +00:00
|
|
|
U64 const dictFileSize = UTIL_getFileSize(dictFileName);
|
2018-06-19 17:58:22 +00:00
|
|
|
if (dictFileSize > 64 MB) {
|
|
|
|
free(fileSizes);
|
2018-06-15 20:21:08 +00:00
|
|
|
EXM_THROW(10, BMK_return_t, "dictionary file %s too large", dictFileName);
|
2018-06-19 17:58:22 +00:00
|
|
|
}
|
2015-12-18 00:26:48 +00:00
|
|
|
dictBufferSize = (size_t)dictFileSize;
|
|
|
|
dictBuffer = malloc(dictBufferSize);
|
2018-06-19 17:58:22 +00:00
|
|
|
if (dictBuffer==NULL) {
|
|
|
|
free(fileSizes);
|
2018-06-15 20:21:08 +00:00
|
|
|
EXM_THROW(11, BMK_return_t, "not enough memory for dictionary (%u bytes)",
|
2017-10-17 23:14:25 +00:00
|
|
|
(U32)dictBufferSize);
|
2018-06-19 17:58:22 +00:00
|
|
|
}
|
2018-06-12 19:54:43 +00:00
|
|
|
{
|
|
|
|
int errorCode = BMK_loadFiles(dictBuffer, dictBufferSize, fileSizes, &dictFileName, 1, displayLevel);
|
|
|
|
if(errorCode) {
|
|
|
|
res.error = errorCode;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
2015-12-18 00:26:48 +00:00
|
|
|
}
|
|
|
|
|
2015-12-16 01:37:24 +00:00
|
|
|
/* Memory allocation & restrictions */
|
|
|
|
benchedSize = BMK_findMaxMem(totalSizeToLoad * 3) / 3;
|
|
|
|
if ((U64)benchedSize > totalSizeToLoad) benchedSize = (size_t)totalSizeToLoad;
|
|
|
|
if (benchedSize < totalSizeToLoad)
|
|
|
|
DISPLAY("Not enough memory; testing %u MB only...\n", (U32)(benchedSize >> 20));
|
|
|
|
srcBuffer = malloc(benchedSize);
|
2018-06-19 17:58:22 +00:00
|
|
|
if (!srcBuffer) {
|
|
|
|
free(dictBuffer);
|
|
|
|
free(fileSizes);
|
|
|
|
EXM_THROW(12, BMK_return_t, "not enough memory");
|
|
|
|
}
|
2015-12-16 01:37:24 +00:00
|
|
|
|
|
|
|
/* Load input buffer */
|
2018-06-12 19:54:43 +00:00
|
|
|
{
|
|
|
|
int errorCode = BMK_loadFiles(srcBuffer, benchedSize, fileSizes, fileNamesTable, nbFiles, displayLevel);
|
|
|
|
if(errorCode) {
|
|
|
|
res.error = errorCode;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
2015-10-22 15:55:40 +00:00
|
|
|
/* Bench */
|
2018-06-15 20:21:08 +00:00
|
|
|
{
|
2017-11-17 08:22:55 +00:00
|
|
|
char mfName[20] = {0};
|
|
|
|
snprintf (mfName, sizeof(mfName), " %u files", nbFiles);
|
2018-06-12 19:54:43 +00:00
|
|
|
{
|
|
|
|
const char* const displayName = (nbFiles > 1) ? mfName : fileNamesTable[0];
|
2018-06-15 20:21:08 +00:00
|
|
|
res = BMK_benchCLevel(srcBuffer, benchedSize,
|
2018-06-11 14:59:05 +00:00
|
|
|
fileSizes, nbFiles,
|
2018-06-15 20:21:08 +00:00
|
|
|
cLevel, compressionParams,
|
2018-06-11 14:59:05 +00:00
|
|
|
dictBuffer, dictBufferSize,
|
2018-06-12 19:54:43 +00:00
|
|
|
displayLevel, displayName,
|
|
|
|
adv);
|
2017-11-17 08:22:55 +00:00
|
|
|
} }
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2015-10-22 15:55:40 +00:00
|
|
|
/* clean up */
|
2015-01-24 00:58:16 +00:00
|
|
|
free(srcBuffer);
|
2015-12-18 00:26:48 +00:00
|
|
|
free(dictBuffer);
|
2015-12-16 02:01:03 +00:00
|
|
|
free(fileSizes);
|
2018-06-12 19:54:43 +00:00
|
|
|
return res;
|
2015-01-24 00:58:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
BMK_return_t BMK_syntheticTest(int cLevel, double compressibility,
|
2018-06-04 23:32:37 +00:00
|
|
|
const ZSTD_compressionParameters* compressionParams,
|
2018-06-12 19:54:43 +00:00
|
|
|
int displayLevel, const BMK_advancedParams_t * const adv)
|
2015-01-24 00:58:16 +00:00
|
|
|
{
|
2015-12-16 01:37:24 +00:00
|
|
|
char name[20] = {0};
|
2015-01-24 00:58:16 +00:00
|
|
|
size_t benchedSize = 10000000;
|
2018-06-19 17:58:22 +00:00
|
|
|
void* srcBuffer;
|
2018-06-15 20:21:08 +00:00
|
|
|
BMK_return_t res;
|
2018-06-19 17:58:22 +00:00
|
|
|
|
|
|
|
if (cLevel > ZSTD_maxCLevel()) {
|
|
|
|
EXM_THROW(15, BMK_return_t, "Invalid Compression Level");
|
|
|
|
}
|
|
|
|
|
2015-01-24 00:58:16 +00:00
|
|
|
/* Memory allocation */
|
2018-06-19 17:58:22 +00:00
|
|
|
srcBuffer = malloc(benchedSize);
|
2018-06-15 20:21:08 +00:00
|
|
|
if (!srcBuffer) EXM_THROW(21, BMK_return_t, "not enough memory");
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
/* Fill input buffer */
|
2015-12-01 00:31:17 +00:00
|
|
|
RDG_genBuffer(srcBuffer, benchedSize, compressibility, 0.0, 0);
|
2015-01-24 00:58:16 +00:00
|
|
|
|
|
|
|
/* Bench */
|
2015-12-16 01:37:24 +00:00
|
|
|
snprintf (name, sizeof(name), "Synthetic %2u%%", (unsigned)(compressibility*100));
|
2018-06-15 20:21:08 +00:00
|
|
|
res = BMK_benchCLevel(srcBuffer, benchedSize,
|
2018-06-11 14:59:05 +00:00
|
|
|
&benchedSize, 1,
|
2018-06-15 20:21:08 +00:00
|
|
|
cLevel, compressionParams,
|
2018-06-11 14:59:05 +00:00
|
|
|
NULL, 0,
|
2018-06-12 19:54:43 +00:00
|
|
|
displayLevel, name, adv);
|
2015-01-24 00:58:16 +00:00
|
|
|
|
2015-12-16 01:37:24 +00:00
|
|
|
/* clean up */
|
2018-06-14 18:46:17 +00:00
|
|
|
free((void*)srcBuffer);
|
2018-06-15 20:21:08 +00:00
|
|
|
|
2018-06-12 19:54:43 +00:00
|
|
|
return res;
|
2015-01-24 00:58:16 +00:00
|
|
|
}
|
|
|
|
|
2018-06-19 17:58:22 +00:00
|
|
|
BMK_return_t BMK_benchFiles(const char* const * const fileNamesTable, unsigned const nbFiles,
|
|
|
|
const char* const dictFileName,
|
|
|
|
int const cLevel, const ZSTD_compressionParameters* const compressionParams,
|
2018-06-11 14:59:05 +00:00
|
|
|
int displayLevel) {
|
2018-06-15 20:21:08 +00:00
|
|
|
const BMK_advancedParams_t adv = BMK_initAdvancedParams();
|
|
|
|
return BMK_benchFilesAdvanced(fileNamesTable, nbFiles, dictFileName, cLevel, compressionParams, displayLevel, &adv);
|
2015-01-24 00:58:16 +00:00
|
|
|
}
|