2017-08-18 23:52:05 +00:00
|
|
|
/*
|
2017-09-08 07:09:23 +00:00
|
|
|
* Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
|
2016-08-30 17:04:33 +00:00
|
|
|
* 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-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-************************************
|
|
|
|
* Dependencies
|
2015-10-25 23:06:36 +00:00
|
|
|
**************************************/
|
2016-07-13 14:45:24 +00:00
|
|
|
#include "util.h" /* Compiler options, UTIL_GetFileSize */
|
|
|
|
#include <stdlib.h> /* malloc */
|
|
|
|
#include <stdio.h> /* fprintf, fopen, ftello64 */
|
|
|
|
#include <string.h> /* strcmp */
|
|
|
|
#include <math.h> /* log */
|
2017-11-30 03:11:12 +00:00
|
|
|
#include <time.h>
|
2018-05-12 00:32:26 +00:00
|
|
|
#include <assert.h>
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
#include "mem.h"
|
2016-07-11 01:12:17 +00:00
|
|
|
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_parameters, ZSTD_estimateCCtxSize */
|
2016-06-04 17:47:02 +00:00
|
|
|
#include "zstd.h"
|
2015-10-25 23:06:36 +00:00
|
|
|
#include "datagen.h"
|
|
|
|
#include "xxhash.h"
|
2017-11-30 03:11:12 +00:00
|
|
|
#include "util.h"
|
2018-06-04 23:32:37 +00:00
|
|
|
#include "bench.h"
|
2018-07-16 23:16:31 +00:00
|
|
|
#include "zstd_errors.h"
|
|
|
|
#include "zstd_internal.h"
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-************************************
|
2015-10-25 23:06:36 +00:00
|
|
|
* Constants
|
|
|
|
**************************************/
|
2016-04-28 12:40:45 +00:00
|
|
|
#define PROGRAM_DESCRIPTION "ZSTD parameters tester"
|
2015-10-25 23:06:36 +00:00
|
|
|
#define AUTHOR "Yann Collet"
|
2018-05-12 00:32:26 +00:00
|
|
|
#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s ***\n", PROGRAM_DESCRIPTION, ZSTD_VERSION_STRING, (int)(sizeof(void*)*8), AUTHOR
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
#define TIMELOOP_NANOSEC (1*1000000000ULL) /* 1 second */
|
|
|
|
|
2015-10-26 01:45:19 +00:00
|
|
|
#define NBLOOPS 2
|
2017-11-30 03:11:12 +00:00
|
|
|
#define TIMELOOP (2 * SEC_TO_MICRO)
|
2018-05-14 00:25:53 +00:00
|
|
|
#define NB_LEVELS_TRACKED 22 /* ensured being >= ZSTD_maxCLevel() in BMK_init_level_constraints() */
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2015-11-27 16:52:57 +00:00
|
|
|
static const size_t maxMemory = (sizeof(size_t)==4) ? (2 GB - 64 MB) : (size_t)(1ULL << ((sizeof(size_t)*8)-31));
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
#define COMPRESSIBILITY_DEFAULT 0.50
|
|
|
|
|
2017-11-30 03:11:12 +00:00
|
|
|
static const U64 g_maxVariationTime = 60 * SEC_TO_MICRO;
|
2015-10-27 11:18:00 +00:00
|
|
|
static const int g_maxNbVariations = 64;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-************************************
|
2015-10-25 23:06:36 +00:00
|
|
|
* Macros
|
|
|
|
**************************************/
|
|
|
|
#define DISPLAY(...) fprintf(stderr, __VA_ARGS__)
|
2018-07-13 00:30:39 +00:00
|
|
|
#define TIMED 0
|
|
|
|
#ifndef DEBUG
|
2018-07-20 21:35:09 +00:00
|
|
|
# define DEBUG 0
|
2018-07-13 00:30:39 +00:00
|
|
|
#endif
|
|
|
|
#define DEBUGOUTPUT(...) { if (DEBUG) DISPLAY(__VA_ARGS__); }
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2017-04-18 00:57:35 +00:00
|
|
|
#undef MIN
|
|
|
|
#undef MAX
|
|
|
|
#define MIN(a,b) ( (a) < (b) ? (a) : (b) )
|
|
|
|
#define MAX(a,b) ( (a) > (b) ? (a) : (b) )
|
2018-06-04 23:32:37 +00:00
|
|
|
#define CUSTOM_LEVEL 99
|
2018-08-13 23:38:51 +00:00
|
|
|
#define BASE_CLEVEL 1
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-06-06 23:19:09 +00:00
|
|
|
/* indices for each of the variables */
|
2018-07-20 21:35:09 +00:00
|
|
|
typedef enum {
|
|
|
|
wlog_ind = 0,
|
|
|
|
clog_ind = 1,
|
|
|
|
hlog_ind = 2,
|
|
|
|
slog_ind = 3,
|
|
|
|
slen_ind = 4,
|
2018-07-31 18:13:44 +00:00
|
|
|
tlen_ind = 5,
|
|
|
|
strt_ind = 6
|
2018-07-20 21:35:09 +00:00
|
|
|
} varInds_t;
|
|
|
|
|
2018-07-31 18:13:44 +00:00
|
|
|
#define NUM_PARAMS 7
|
2018-07-30 18:30:38 +00:00
|
|
|
/* just don't use strategy as a param. */
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
#undef ZSTD_WINDOWLOG_MAX
|
|
|
|
#define ZSTD_WINDOWLOG_MAX 27 //no long range stuff for now.
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
#define ZSTD_TARGETLENGTH_MIN 0
|
|
|
|
#define ZSTD_TARGETLENGTH_MAX 999
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
#define WLOG_RANGE (ZSTD_WINDOWLOG_MAX - ZSTD_WINDOWLOG_MIN + 1)
|
|
|
|
#define CLOG_RANGE (ZSTD_CHAINLOG_MAX - ZSTD_CHAINLOG_MIN + 1)
|
|
|
|
#define HLOG_RANGE (ZSTD_HASHLOG_MAX - ZSTD_HASHLOG_MIN + 1)
|
|
|
|
#define SLOG_RANGE (ZSTD_SEARCHLOG_MAX - ZSTD_SEARCHLOG_MIN + 1)
|
|
|
|
#define SLEN_RANGE (ZSTD_SEARCHLENGTH_MAX - ZSTD_SEARCHLENGTH_MIN + 1)
|
2018-07-20 21:35:09 +00:00
|
|
|
#define TLEN_RANGE 17
|
2018-07-31 18:13:44 +00:00
|
|
|
#define STRT_RANGE (ZSTD_btultra - ZSTD_fast + 1)
|
2018-07-20 21:35:09 +00:00
|
|
|
/* TLEN_RANGE picked manually */
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-31 18:13:44 +00:00
|
|
|
static const int rangetable[NUM_PARAMS] = { WLOG_RANGE, CLOG_RANGE, HLOG_RANGE, SLOG_RANGE, SLEN_RANGE, TLEN_RANGE, STRT_RANGE };
|
2018-07-20 21:35:09 +00:00
|
|
|
static const U32 tlen_table[TLEN_RANGE] = { 0, 1, 2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 256, 512, 999 };
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-************************************
|
2018-07-31 00:42:46 +00:00
|
|
|
* Benchmark Parameters/Global Variables
|
2015-10-25 23:06:36 +00:00
|
|
|
**************************************/
|
2018-06-04 23:32:37 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
typedef BYTE U8;
|
|
|
|
|
2018-06-04 23:32:37 +00:00
|
|
|
static double g_grillDuration_s = 99999; /* about 27 hours */
|
2015-10-30 14:49:48 +00:00
|
|
|
static U32 g_nbIterations = NBLOOPS;
|
2015-10-25 23:06:36 +00:00
|
|
|
static double g_compressibility = COMPRESSIBILITY_DEFAULT;
|
|
|
|
static U32 g_blockSize = 0;
|
2015-10-26 14:45:58 +00:00
|
|
|
static U32 g_rand = 1;
|
2015-10-27 01:59:12 +00:00
|
|
|
static U32 g_singleRun = 0;
|
2018-07-27 21:19:55 +00:00
|
|
|
static U32 g_optimizer = 0;
|
2015-10-27 11:18:00 +00:00
|
|
|
static U32 g_target = 0;
|
2015-10-27 12:12:25 +00:00
|
|
|
static U32 g_noSeed = 0;
|
2018-08-13 23:38:51 +00:00
|
|
|
static ZSTD_compressionParameters g_params; /* Initialized at the beginning of main w/ emptyParams() function */
|
2018-07-10 01:37:54 +00:00
|
|
|
static UTIL_time_t g_time; /* to be used to compare solution finding speeds to compare to original */
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-25 18:37:20 +00:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
BMK_result_t result;
|
|
|
|
ZSTD_compressionParameters params;
|
|
|
|
} winnerInfo_t;
|
|
|
|
|
|
|
|
typedef struct {
|
2018-07-27 18:47:14 +00:00
|
|
|
U32 cSpeed; /* bytes / sec */
|
2018-07-25 18:37:20 +00:00
|
|
|
U32 dSpeed;
|
|
|
|
U32 cMem; /* bytes */
|
|
|
|
} constraint_t;
|
|
|
|
|
2018-07-27 23:49:33 +00:00
|
|
|
typedef struct winner_ll_node winner_ll_node;
|
|
|
|
struct winner_ll_node {
|
2018-07-25 18:37:20 +00:00
|
|
|
winnerInfo_t res;
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* next;
|
2018-07-25 18:37:20 +00:00
|
|
|
};
|
|
|
|
|
2018-07-27 23:49:33 +00:00
|
|
|
static winner_ll_node* g_winners; /* linked list sorted ascending by cSize & cSpeed */
|
2018-07-25 18:37:20 +00:00
|
|
|
static BMK_result_t g_lvltarget;
|
2018-07-27 18:47:14 +00:00
|
|
|
static int g_optmode = 0;
|
|
|
|
|
|
|
|
static U32 g_speedMultiplier = 1;
|
|
|
|
static U32 g_ratioMultiplier = 1;
|
|
|
|
|
|
|
|
/* g_mode? */
|
2018-07-25 18:37:20 +00:00
|
|
|
|
2018-07-27 15:20:31 +00:00
|
|
|
/* range 0 - 99, measure of how strict */
|
|
|
|
#define DEFAULT_STRICTNESS 99999
|
|
|
|
static U32 g_strictness = DEFAULT_STRICTNESS;
|
2018-07-25 18:37:20 +00:00
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
void BMK_SetNbIterations(int nbLoops)
|
|
|
|
{
|
2015-10-30 14:49:48 +00:00
|
|
|
g_nbIterations = nbLoops;
|
|
|
|
DISPLAY("- %u iterations -\n", g_nbIterations);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
/*
|
|
|
|
* Additional Global Variables (Defined Above Use)
|
|
|
|
* g_stratName
|
|
|
|
* g_level_constraint
|
|
|
|
* g_alreadyTested
|
|
|
|
* g_maxTries
|
|
|
|
*/
|
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-*******************************************************
|
2015-10-25 23:06:36 +00:00
|
|
|
* Private functions
|
|
|
|
*********************************************************/
|
|
|
|
|
2017-05-16 00:15:46 +00:00
|
|
|
/* accuracy in seconds only, span can be multiple years */
|
|
|
|
static double BMK_timeSpan(time_t tStart) { return difftime(time(NULL), tStart); }
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
static size_t BMK_findMaxMem(U64 requiredMem)
|
|
|
|
{
|
2016-07-13 14:45:24 +00:00
|
|
|
size_t const step = 64 MB;
|
|
|
|
void* testmem = NULL;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
requiredMem = (((requiredMem >> 26) + 1) << 26);
|
2015-11-27 16:52:57 +00:00
|
|
|
if (requiredMem > maxMemory) requiredMem = maxMemory;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
requiredMem += 2*step;
|
2016-02-10 12:37:52 +00:00
|
|
|
while (!testmem) {
|
2015-10-25 23:06:36 +00:00
|
|
|
requiredMem -= step;
|
2016-07-13 14:45:24 +00:00
|
|
|
testmem = malloc ((size_t)requiredMem);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free (testmem);
|
|
|
|
return (size_t) (requiredMem - step);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-04-04 22:35:06 +00:00
|
|
|
static U32 FUZ_rotl32(U32 x, U32 r)
|
|
|
|
{
|
|
|
|
return ((x << r) | (x >> (32 - r)));
|
|
|
|
}
|
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
U32 FUZ_rand(U32* src)
|
|
|
|
{
|
|
|
|
const U32 prime1 = 2654435761U;
|
|
|
|
const U32 prime2 = 2246822519U;
|
|
|
|
U32 rand32 = *src;
|
|
|
|
rand32 *= prime1;
|
|
|
|
rand32 += prime2;
|
|
|
|
rand32 = FUZ_rotl32(rand32, 13);
|
|
|
|
*src = rand32;
|
|
|
|
return rand32 >> 5;
|
|
|
|
}
|
|
|
|
|
2018-06-01 19:39:39 +00:00
|
|
|
/** longCommandWArg() :
|
|
|
|
* check if *stringPtr is the same as longCommand.
|
|
|
|
* If yes, @return 1 and advances *stringPtr to the position which immediately follows longCommand.
|
|
|
|
* @return 0 and doesn't modify *stringPtr otherwise.
|
|
|
|
* from zstdcli.c
|
|
|
|
*/
|
|
|
|
static unsigned longCommandWArg(const char** stringPtr, const char* longCommand)
|
|
|
|
{
|
|
|
|
size_t const comSize = strlen(longCommand);
|
|
|
|
int const result = !strncmp(*stringPtr, longCommand, comSize);
|
|
|
|
if (result) *stringPtr += comSize;
|
|
|
|
return result;
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
static U64 g_clockGranularity = 100000000ULL;
|
|
|
|
|
|
|
|
static void findClockGranularity(void) {
|
|
|
|
UTIL_time_t clockStart = UTIL_getTime();
|
|
|
|
U64 el1 = 0, el2 = 0;
|
|
|
|
int i = 0;
|
|
|
|
do {
|
|
|
|
el1 = el2;
|
|
|
|
el2 = UTIL_clockSpanNano(clockStart);
|
|
|
|
if(el1 < el2) {
|
|
|
|
U64 iv = el2 - el1;
|
|
|
|
if(g_clockGranularity > iv) {
|
|
|
|
g_clockGranularity = iv;
|
|
|
|
i = 0;
|
|
|
|
} else {
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while(i < 10);
|
2018-07-13 00:30:39 +00:00
|
|
|
DEBUGOUTPUT("Granularity: %llu\n", (unsigned long long)g_clockGranularity);
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-06-06 23:19:09 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
#define CLAMPCHECK(val,min,max) { \
|
|
|
|
if (val && (((val)<(min)) | ((val)>(max)))) { \
|
|
|
|
DISPLAY("INVALID PARAMETER CONSTRAINTS\n"); \
|
|
|
|
return 0; \
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
|
|
|
/* Like ZSTD_checkCParams() but allows 0's */
|
|
|
|
/* no check on targetLen? */
|
|
|
|
static int cParamValid(ZSTD_compressionParameters paramTarget) {
|
|
|
|
CLAMPCHECK(paramTarget.hashLog, ZSTD_HASHLOG_MIN, ZSTD_HASHLOG_MAX);
|
|
|
|
CLAMPCHECK(paramTarget.searchLog, ZSTD_SEARCHLOG_MIN, ZSTD_SEARCHLOG_MAX);
|
|
|
|
CLAMPCHECK(paramTarget.searchLength, ZSTD_SEARCHLENGTH_MIN, ZSTD_SEARCHLENGTH_MAX);
|
|
|
|
CLAMPCHECK(paramTarget.windowLog, ZSTD_WINDOWLOG_MIN, ZSTD_WINDOWLOG_MAX);
|
|
|
|
CLAMPCHECK(paramTarget.chainLog, ZSTD_CHAINLOG_MIN, ZSTD_CHAINLOG_MAX);
|
2018-07-13 00:30:39 +00:00
|
|
|
if(paramTarget.targetLength > ZSTD_TARGETLENGTH_MAX) {
|
|
|
|
DISPLAY("INVALID PARAMETER CONSTRAINTS\n");
|
|
|
|
return 0;
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
if(paramTarget.strategy > ZSTD_btultra) {
|
|
|
|
DISPLAY("INVALID PARAMETER CONSTRAINTS\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cParamZeroMin(ZSTD_compressionParameters* paramTarget) {
|
|
|
|
paramTarget->windowLog = paramTarget->windowLog ? paramTarget->windowLog : ZSTD_WINDOWLOG_MIN;
|
|
|
|
paramTarget->searchLog = paramTarget->searchLog ? paramTarget->searchLog : ZSTD_SEARCHLOG_MIN;
|
|
|
|
paramTarget->chainLog = paramTarget->chainLog ? paramTarget->chainLog : ZSTD_CHAINLOG_MIN;
|
|
|
|
paramTarget->hashLog = paramTarget->hashLog ? paramTarget->hashLog : ZSTD_HASHLOG_MIN;
|
|
|
|
paramTarget->searchLength = paramTarget->searchLength ? paramTarget->searchLength : ZSTD_SEARCHLENGTH_MIN;
|
2018-07-13 00:30:39 +00:00
|
|
|
paramTarget->targetLength = paramTarget->targetLength ? paramTarget->targetLength : 0;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
static void BMK_translateAdvancedParams(const ZSTD_compressionParameters params)
|
2018-06-18 18:59:45 +00:00
|
|
|
{
|
|
|
|
DISPLAY("--zstd=windowLog=%u,chainLog=%u,hashLog=%u,searchLog=%u,searchLength=%u,targetLength=%u,strategy=%u \n",
|
|
|
|
params.windowLog, params.chainLog, params.hashLog, params.searchLog, params.searchLength, params.targetLength, (U32)(params.strategy));
|
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
/* checks results are feasible */
|
|
|
|
static int feasible(const BMK_result_t results, const constraint_t target) {
|
2018-07-27 18:47:14 +00:00
|
|
|
return (results.cSpeed >= target.cSpeed) && (results.dSpeed >= target.dSpeed) && (results.cMem <= target.cMem) && (!g_optmode || results.cSize <= g_lvltarget.cSize);
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* hill climbing value for part 1 */
|
2018-08-07 01:00:36 +00:00
|
|
|
/* Scoring here is a linear reward for all set constraints normalized between 0 to 1
|
|
|
|
* (with 0 at 0 and 1 being fully fulfilling the constraint), summed with a logarithmic
|
|
|
|
* bonus to exceeding the constraint value. We also give linear ratio for compression ratio.
|
|
|
|
* The constant factors are experimental.
|
|
|
|
*/
|
2018-07-13 00:30:39 +00:00
|
|
|
static double resultScore(const BMK_result_t res, const size_t srcSize, const constraint_t target) {
|
|
|
|
double cs = 0., ds = 0., rt, cm = 0.;
|
|
|
|
const double r1 = 1, r2 = 0.1, rtr = 0.5;
|
|
|
|
double ret;
|
|
|
|
if(target.cSpeed) { cs = res.cSpeed / (double)target.cSpeed; }
|
|
|
|
if(target.dSpeed) { ds = res.dSpeed / (double)target.dSpeed; }
|
|
|
|
if(target.cMem != (U32)-1) { cm = (double)target.cMem / res.cMem; }
|
|
|
|
rt = ((double)srcSize / res.cSize);
|
|
|
|
|
|
|
|
ret = (MIN(1, cs) + MIN(1, ds) + MIN(1, cm))*r1 + rt * rtr +
|
|
|
|
(MAX(0, log(cs))+ MAX(0, log(ds))+ MAX(0, log(cm))) * r2;
|
2018-07-27 18:47:14 +00:00
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-07-25 18:55:09 +00:00
|
|
|
/* calculates normalized squared euclidean distance of result1 if it is in the first quadrant relative to lvlRes */
|
2018-07-25 00:26:21 +00:00
|
|
|
static double resultDistLvl(const BMK_result_t result1, const BMK_result_t lvlRes) {
|
2018-07-25 18:37:20 +00:00
|
|
|
double normalizedCSpeedGain1 = (result1.cSpeed / lvlRes.cSpeed) - 1;
|
|
|
|
double normalizedRatioGain1 = ((double)lvlRes.cSize / result1.cSize) - 1;
|
|
|
|
if(normalizedRatioGain1 < 0 || normalizedCSpeedGain1 < 0) {
|
2018-07-25 00:26:21 +00:00
|
|
|
return 0.0;
|
|
|
|
}
|
2018-07-27 18:47:14 +00:00
|
|
|
return normalizedRatioGain1 * g_ratioMultiplier + normalizedCSpeedGain1 * g_speedMultiplier;
|
2018-07-25 00:26:21 +00:00
|
|
|
}
|
|
|
|
|
2018-07-25 18:37:20 +00:00
|
|
|
/* return true if r2 strictly better than r1 */
|
|
|
|
static int compareResultLT(const BMK_result_t result1, const BMK_result_t result2, const constraint_t target, size_t srcSize) {
|
|
|
|
if(feasible(result1, target) && feasible(result2, target)) {
|
2018-07-27 18:47:14 +00:00
|
|
|
if(g_optmode) {
|
|
|
|
return resultDistLvl(result1, g_lvltarget) < resultDistLvl(result2, g_lvltarget);
|
|
|
|
} else {
|
2018-07-25 18:37:20 +00:00
|
|
|
return (result1.cSize > result2.cSize) || (result1.cSize == result2.cSize && result2.cSpeed > result1.cSpeed)
|
|
|
|
|| (result1.cSize == result2.cSize && result2.cSpeed == result1.cSpeed && result2.dSpeed > result1.dSpeed);
|
|
|
|
}
|
2018-07-25 00:26:21 +00:00
|
|
|
}
|
2018-07-25 18:37:20 +00:00
|
|
|
return feasible(result2, target) || (!feasible(result1, target) && (resultScore(result1, srcSize, target) < resultScore(result2, srcSize, target)));
|
2018-07-25 00:26:21 +00:00
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
static constraint_t relaxTarget(constraint_t target) {
|
|
|
|
target.cMem = (U32)-1;
|
2018-07-27 23:49:33 +00:00
|
|
|
target.cSpeed *= ((double)g_strictness) / 100;
|
|
|
|
target.dSpeed *= ((double)g_strictness) / 100;
|
2018-07-13 00:30:39 +00:00
|
|
|
return target;
|
|
|
|
}
|
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
/*-*******************************************************
|
2015-10-25 23:06:36 +00:00
|
|
|
* Bench functions
|
|
|
|
*********************************************************/
|
|
|
|
|
2018-06-04 23:32:37 +00:00
|
|
|
const char* g_stratName[ZSTD_btultra+1] = {
|
|
|
|
"(none) ", "ZSTD_fast ", "ZSTD_dfast ",
|
|
|
|
"ZSTD_greedy ", "ZSTD_lazy ", "ZSTD_lazy2 ",
|
|
|
|
"ZSTD_btlazy2 ", "ZSTD_btopt ", "ZSTD_btultra "};
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
static ZSTD_compressionParameters emptyParams(void) {
|
|
|
|
ZSTD_compressionParameters p = { 0, 0, 0, 0, 0, 0, (ZSTD_strategy)0 };
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
static winnerInfo_t initWinnerInfo(ZSTD_compressionParameters p) {
|
|
|
|
winnerInfo_t w1;
|
|
|
|
w1.result.cSpeed = 0.;
|
|
|
|
w1.result.dSpeed = 0.;
|
|
|
|
w1.result.cMem = (size_t)-1;
|
|
|
|
w1.result.cSize = (size_t)-1;
|
|
|
|
w1.params = p;
|
|
|
|
return w1;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
2018-08-07 01:00:36 +00:00
|
|
|
void* srcBuffer;
|
2018-07-20 21:35:09 +00:00
|
|
|
size_t srcSize;
|
2018-08-07 01:00:36 +00:00
|
|
|
const void** srcPtrs;
|
2018-07-20 21:35:09 +00:00
|
|
|
size_t* srcSizes;
|
|
|
|
void** dstPtrs;
|
|
|
|
size_t* dstCapacities;
|
|
|
|
size_t* dstSizes;
|
|
|
|
void** resPtrs;
|
|
|
|
size_t* resSizes;
|
|
|
|
size_t nbBlocks;
|
|
|
|
} buffers_t;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
size_t dictSize;
|
|
|
|
void* dictBuffer;
|
|
|
|
ZSTD_CCtx* cctx;
|
|
|
|
ZSTD_DCtx* dctx;
|
|
|
|
} contexts_t;
|
|
|
|
|
2018-07-16 23:16:31 +00:00
|
|
|
/*-*******************************************************
|
|
|
|
* From Paramgrill
|
|
|
|
*********************************************************/
|
|
|
|
|
|
|
|
static void BMK_initCCtx(ZSTD_CCtx* ctx,
|
2018-08-07 01:37:55 +00:00
|
|
|
const void* dictBuffer, const size_t dictBufferSize, const int cLevel,
|
2018-07-16 23:16:31 +00:00
|
|
|
const ZSTD_compressionParameters* comprParams, const BMK_advancedParams_t* adv) {
|
2018-07-20 21:35:09 +00:00
|
|
|
ZSTD_CCtx_reset(ctx);
|
|
|
|
ZSTD_CCtx_resetParameters(ctx);
|
2018-07-16 23:16:31 +00:00
|
|
|
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);
|
|
|
|
ZSTD_CCtx_setParameter(ctx, ZSTD_p_ldmBucketSizeLog, adv->ldmBucketSizeLog);
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void BMK_initDCtx(ZSTD_DCtx* dctx,
|
2018-08-07 01:37:55 +00:00
|
|
|
const void* dictBuffer, const size_t dictBufferSize) {
|
2018-07-20 21:35:09 +00:00
|
|
|
ZSTD_DCtx_reset(dctx);
|
2018-07-16 23:16:31 +00:00
|
|
|
ZSTD_DCtx_loadDictionary(dctx, dictBuffer, dictBufferSize);
|
|
|
|
}
|
|
|
|
|
|
|
|
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) {
|
2018-08-07 01:37:55 +00:00
|
|
|
const BMK_initCCtxArgs* ag = (const BMK_initCCtxArgs*)payload;
|
2018-07-16 23:16:31 +00:00
|
|
|
BMK_initCCtx(ag->ctx, ag->dictBuffer, ag->dictBufferSize, ag->cLevel, ag->comprParams, ag->adv);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ZSTD_DCtx* dctx;
|
|
|
|
const void* dictBuffer;
|
|
|
|
size_t dictBufferSize;
|
|
|
|
} BMK_initDCtxArgs;
|
|
|
|
|
|
|
|
static size_t local_initDCtx(void* payload) {
|
2018-08-07 01:37:55 +00:00
|
|
|
const BMK_initDCtxArgs* ag = (const BMK_initDCtxArgs*)payload;
|
2018-07-16 23:16:31 +00:00
|
|
|
BMK_initDCtx(ag->dctx, ag->dictBuffer, ag->dictBufferSize);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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;
|
2018-07-20 21:35:09 +00:00
|
|
|
assert(dstSize == ZSTD_compressBound(srcSize)); /* specific to this version, which is only used in paramgrill */
|
2018-07-16 23:16:31 +00:00
|
|
|
while (moreToFlush) {
|
|
|
|
if(out.pos == out.size) {
|
|
|
|
return (size_t)-ZSTD_error_dstSize_tooSmall;
|
|
|
|
}
|
|
|
|
moreToFlush = ZSTD_compress_generic(ctx, &out, &in, ZSTD_e_end);
|
|
|
|
if (ZSTD_isError(moreToFlush)) {
|
|
|
|
return moreToFlush;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return out.pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* additional argument is just the context */
|
|
|
|
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) {
|
|
|
|
if(out.pos == out.size) {
|
|
|
|
return (size_t)-ZSTD_error_dstSize_tooSmall;
|
|
|
|
}
|
|
|
|
moreToFlush = ZSTD_decompress_generic(dctx,
|
|
|
|
&out, &in);
|
|
|
|
if (ZSTD_isError(moreToFlush)) {
|
|
|
|
return moreToFlush;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return out.pos;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-*******************************************************
|
|
|
|
* From Paramgrill End
|
|
|
|
*********************************************************/
|
|
|
|
|
2018-07-27 21:19:55 +00:00
|
|
|
static void freeBuffers(const buffers_t b) {
|
|
|
|
if(b.srcPtrs != NULL) {
|
|
|
|
free(b.srcBuffer);
|
|
|
|
}
|
|
|
|
free(b.srcPtrs);
|
|
|
|
free(b.srcSizes);
|
|
|
|
|
|
|
|
if(b.dstPtrs != NULL) {
|
|
|
|
free(b.dstPtrs[0]);
|
|
|
|
}
|
|
|
|
free(b.dstPtrs);
|
|
|
|
free(b.dstCapacities);
|
|
|
|
free(b.dstSizes);
|
|
|
|
|
|
|
|
if(b.resPtrs != NULL) {
|
|
|
|
free(b.resPtrs[0]);
|
|
|
|
}
|
|
|
|
free(b.resPtrs);
|
2018-08-13 23:38:51 +00:00
|
|
|
free(b.resSizes);
|
2018-07-27 21:19:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* allocates buffer's arguments. returns success / failuere */
|
|
|
|
static int createBuffers(buffers_t* buff, const char* const * const fileNamesTable,
|
|
|
|
const size_t nbFiles)
|
|
|
|
{
|
|
|
|
size_t pos = 0;
|
|
|
|
size_t n;
|
|
|
|
U64 const totalSizeToLoad = UTIL_getTotalFileSize(fileNamesTable, (U32)nbFiles);
|
2018-08-13 23:38:51 +00:00
|
|
|
const size_t benchedSize = MIN(BMK_findMaxMem(totalSizeToLoad * 3) / 3, totalSizeToLoad);
|
2018-07-31 00:42:46 +00:00
|
|
|
const size_t blockSize = g_blockSize ? g_blockSize : totalSizeToLoad;
|
2018-07-27 21:19:55 +00:00
|
|
|
U32 const maxNbBlocks = (U32) ((totalSizeToLoad + (blockSize-1)) / blockSize) + (U32)nbFiles;
|
|
|
|
U32 blockNb = 0;
|
|
|
|
|
|
|
|
buff->srcPtrs = (const void**)calloc(maxNbBlocks, sizeof(void*));
|
|
|
|
buff->srcSizes = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
|
|
|
|
buff->dstPtrs = (void**)calloc(maxNbBlocks, sizeof(void*));
|
|
|
|
buff->dstCapacities = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
buff->dstSizes = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
|
|
|
|
buff->resPtrs = (void**)calloc(maxNbBlocks, sizeof(void*));
|
|
|
|
buff->resSizes = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
|
|
|
|
if(!buff->srcPtrs || !buff->srcSizes || !buff->dstPtrs || !buff->dstCapacities || !buff->dstSizes || !buff->resPtrs || !buff->resSizes) {
|
|
|
|
DISPLAY("alloc error\n");
|
|
|
|
freeBuffers(*buff);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
buff->srcBuffer = malloc(benchedSize);
|
|
|
|
buff->srcPtrs[0] = (const void*)buff->srcBuffer;
|
|
|
|
buff->dstPtrs[0] = malloc(ZSTD_compressBound(benchedSize) + (maxNbBlocks * 1024));
|
|
|
|
buff->resPtrs[0] = malloc(benchedSize);
|
|
|
|
|
|
|
|
if(!buff->srcPtrs[0] || !buff->dstPtrs[0] || !buff->resPtrs[0]) {
|
|
|
|
DISPLAY("alloc error\n");
|
|
|
|
freeBuffers(*buff);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(n = 0; n < nbFiles; n++) {
|
|
|
|
FILE* f;
|
|
|
|
U64 fileSize = UTIL_getFileSize(fileNamesTable[n]);
|
|
|
|
if (UTIL_isDirectory(fileNamesTable[n])) {
|
|
|
|
DISPLAY("Ignoring %s directory... \n", fileNamesTable[n]);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (fileSize == UTIL_FILESIZE_UNKNOWN) {
|
|
|
|
DISPLAY("Cannot evaluate size of %s, ignoring ... \n", fileNamesTable[n]);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
f = fopen(fileNamesTable[n], "rb");
|
|
|
|
if (f==NULL) {
|
|
|
|
DISPLAY("impossible to open file %s\n", fileNamesTable[n]);
|
|
|
|
freeBuffers(*buff);
|
|
|
|
fclose(f);
|
|
|
|
return 10;
|
|
|
|
}
|
|
|
|
|
|
|
|
DISPLAY("Loading %s... \r", fileNamesTable[n]);
|
|
|
|
|
|
|
|
if (fileSize + pos > benchedSize) fileSize = benchedSize - pos, n=nbFiles; /* buffer too small - stop after this file */
|
|
|
|
{
|
|
|
|
char* buffer = (char*)(buff->srcBuffer);
|
|
|
|
size_t const readSize = fread((buffer)+pos, 1, (size_t)fileSize, f);
|
|
|
|
size_t blocked = 0;
|
|
|
|
while(blocked < readSize) {
|
|
|
|
buff->srcPtrs[blockNb] = (const void*)((buffer) + (pos + blocked));
|
|
|
|
buff->srcSizes[blockNb] = blockSize;
|
|
|
|
blocked += blockSize;
|
|
|
|
blockNb++;
|
|
|
|
}
|
|
|
|
if(readSize > 0) { buff->srcSizes[blockNb - 1] = ((readSize - 1) % blockSize) + 1; }
|
|
|
|
|
|
|
|
if (readSize != (size_t)fileSize) {
|
|
|
|
DISPLAY("could not read %s", fileNamesTable[n]);
|
|
|
|
freeBuffers(*buff);
|
|
|
|
fclose(f);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos += readSize;
|
|
|
|
|
|
|
|
}
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
buff->dstCapacities[0] = ZSTD_compressBound(buff->srcSizes[0]);
|
|
|
|
buff->dstSizes[0] = buff->dstCapacities[0];
|
|
|
|
buff->resSizes[0] = buff->srcSizes[0];
|
|
|
|
|
|
|
|
for(n = 1; n < blockNb; n++) {
|
|
|
|
buff->dstPtrs[n] = ((char*)buff->dstPtrs[n-1]) + buff->dstCapacities[n-1];
|
|
|
|
buff->resPtrs[n] = ((char*)buff->resPtrs[n-1]) + buff->resSizes[n-1];
|
|
|
|
buff->dstCapacities[n] = ZSTD_compressBound(buff->srcSizes[n]);
|
|
|
|
buff->dstSizes[n] = buff->dstCapacities[n];
|
|
|
|
buff->resSizes[n] = buff->srcSizes[n];
|
|
|
|
}
|
|
|
|
buff->srcSize = pos;
|
|
|
|
buff->nbBlocks = blockNb;
|
|
|
|
|
|
|
|
if (pos == 0) { DISPLAY("\nno data to bench\n"); return 1; }
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void freeContexts(const contexts_t ctx) {
|
|
|
|
free(ctx.dictBuffer);
|
|
|
|
ZSTD_freeCCtx(ctx.cctx);
|
|
|
|
ZSTD_freeDCtx(ctx.dctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int createContexts(contexts_t* ctx, const char* dictFileName) {
|
|
|
|
FILE* f;
|
|
|
|
size_t readSize;
|
|
|
|
ctx->cctx = ZSTD_createCCtx();
|
|
|
|
ctx->dctx = ZSTD_createDCtx();
|
|
|
|
if(dictFileName == NULL) {
|
|
|
|
ctx->dictSize = 0;
|
|
|
|
ctx->dictBuffer = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ctx->dictSize = UTIL_getFileSize(dictFileName);
|
|
|
|
ctx->dictBuffer = malloc(ctx->dictSize);
|
|
|
|
|
|
|
|
f = fopen(dictFileName, "rb");
|
|
|
|
|
|
|
|
if(!f) {
|
|
|
|
DISPLAY("unable to open file\n");
|
|
|
|
fclose(f);
|
|
|
|
freeContexts(*ctx);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ctx->dictSize > 64 MB || !(ctx->dictBuffer)) {
|
|
|
|
DISPLAY("dictionary too large\n");
|
|
|
|
fclose(f);
|
|
|
|
freeContexts(*ctx);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
readSize = fread(ctx->dictBuffer, 1, ctx->dictSize, f);
|
|
|
|
if(readSize != ctx->dictSize) {
|
|
|
|
DISPLAY("unable to read file\n");
|
|
|
|
fclose(f);
|
|
|
|
freeContexts(*ctx);
|
|
|
|
return 1;
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
fclose(f);
|
2018-07-27 21:19:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-08-09 18:38:09 +00:00
|
|
|
/* Replicate functionality of benchMemAdvanced, but with pre-split src / dst buffers */
|
|
|
|
/* The purpose is so that sufficient information is returned so that a decompression call to benchMemInvertible is possible */
|
2018-07-20 21:35:09 +00:00
|
|
|
/* BMK_benchMemAdvanced(srcBuffer,srcSize, dstBuffer, dstSize, fileSizes, nbFiles, 0, &cParams, dictBuffer, dictSize, ctx, dctx, 0, "File", &adv); */
|
2018-07-16 23:16:31 +00:00
|
|
|
/* nbSeconds used in same way as in BMK_advancedParams_t, as nbIters when in iterMode */
|
|
|
|
|
|
|
|
/* if in decodeOnly, then srcPtr's will be compressed blocks, and uncompressedBlocks will be written to dstPtrs? */
|
|
|
|
/* dictionary nullable, nothing else though. */
|
2018-08-09 18:38:09 +00:00
|
|
|
static BMK_return_t BMK_benchMemInvertible(const buffers_t buf, const contexts_t ctx,
|
2018-07-16 23:16:31 +00:00
|
|
|
const int cLevel, const ZSTD_compressionParameters* comprParams,
|
|
|
|
const BMK_mode_t mode, const BMK_loopMode_t loopMode, const unsigned nbSeconds) {
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-07-16 23:16:31 +00:00
|
|
|
U32 i;
|
|
|
|
BMK_return_t results = { { 0, 0., 0., 0 }, 0 } ;
|
2018-07-20 21:35:09 +00:00
|
|
|
const void *const *const srcPtrs = (const void *const *const)buf.srcPtrs;
|
|
|
|
size_t const *const srcSizes = buf.srcSizes;
|
2018-08-09 18:38:09 +00:00
|
|
|
void** const dstPtrs = buf.dstPtrs;
|
|
|
|
size_t const *const dstCapacities = buf.dstCapacities;
|
|
|
|
size_t* const dstSizes = buf.dstSizes;
|
|
|
|
void** const resPtrs = buf.resPtrs;
|
|
|
|
size_t const *const resSizes = buf.resSizes;
|
2018-07-20 21:35:09 +00:00
|
|
|
const void* dictBuffer = ctx.dictBuffer;
|
|
|
|
const size_t dictBufferSize = ctx.dictSize;
|
|
|
|
const size_t nbBlocks = buf.nbBlocks;
|
|
|
|
const size_t srcSize = buf.srcSize;
|
|
|
|
ZSTD_CCtx* cctx = ctx.cctx;
|
|
|
|
ZSTD_DCtx* dctx = ctx.dctx;
|
2018-07-16 23:16:31 +00:00
|
|
|
|
|
|
|
BMK_advancedParams_t adv = BMK_initAdvancedParams();
|
|
|
|
adv.mode = mode;
|
|
|
|
adv.loopMode = loopMode;
|
|
|
|
adv.nbSeconds = nbSeconds;
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* warmimg up memory */
|
|
|
|
/* can't do this if decode only */
|
|
|
|
for(i = 0; i < buf.nbBlocks; i++) {
|
|
|
|
if(mode != BMK_decodeOnly) {
|
|
|
|
RDG_genBuffer(dstPtrs[i], dstCapacities[i], 0.10, 0.50, 1);
|
|
|
|
} else {
|
|
|
|
RDG_genBuffer(resPtrs[i], resSizes[i], 0.10, 0.50, 1);
|
|
|
|
}
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* Bench */
|
|
|
|
|
2018-07-16 23:16:31 +00:00
|
|
|
{
|
2018-07-20 21:35:09 +00:00
|
|
|
/* init args */
|
|
|
|
BMK_initCCtxArgs cctxprep;
|
|
|
|
BMK_initDCtxArgs dctxprep;
|
|
|
|
cctxprep.ctx = cctx;
|
|
|
|
cctxprep.dictBuffer = dictBuffer;
|
|
|
|
cctxprep.dictBufferSize = dictBufferSize;
|
|
|
|
cctxprep.cLevel = cLevel;
|
|
|
|
cctxprep.comprParams = comprParams;
|
|
|
|
cctxprep.adv = &adv;
|
|
|
|
dctxprep.dctx = dctx;
|
|
|
|
dctxprep.dictBuffer = dictBuffer;
|
|
|
|
dctxprep.dictBufferSize = dictBufferSize;
|
|
|
|
|
|
|
|
if(loopMode == BMK_timeMode) {
|
|
|
|
BMK_customTimedReturn_t intermediateResultCompress;
|
|
|
|
BMK_customTimedReturn_t intermediateResultDecompress;
|
|
|
|
BMK_timedFnState_t* timeStateCompress = BMK_createTimeState(nbSeconds);
|
|
|
|
BMK_timedFnState_t* timeStateDecompress = BMK_createTimeState(nbSeconds);
|
|
|
|
if(mode == BMK_compressOnly) {
|
|
|
|
intermediateResultCompress.completed = 0;
|
|
|
|
intermediateResultDecompress.completed = 1;
|
|
|
|
} else if (mode == BMK_decodeOnly) {
|
|
|
|
intermediateResultCompress.completed = 1;
|
|
|
|
intermediateResultDecompress.completed = 0;
|
|
|
|
} else { /* both */
|
|
|
|
intermediateResultCompress.completed = 0;
|
|
|
|
intermediateResultDecompress.completed = 0;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
while(!intermediateResultCompress.completed) {
|
|
|
|
intermediateResultCompress = BMK_benchFunctionTimed(timeStateCompress, &local_defaultCompress, (void*)cctx, &local_initCCtx, (void*)&cctxprep,
|
|
|
|
nbBlocks, srcPtrs, srcSizes, dstPtrs, dstCapacities, dstSizes);
|
|
|
|
|
|
|
|
if(intermediateResultCompress.result.error) {
|
|
|
|
results.error = intermediateResultCompress.result.error;
|
|
|
|
BMK_freeTimeState(timeStateCompress);
|
|
|
|
BMK_freeTimeState(timeStateDecompress);
|
|
|
|
return results;
|
|
|
|
}
|
2018-08-07 01:37:55 +00:00
|
|
|
results.result.cSpeed = (srcSize * TIMELOOP_NANOSEC) / intermediateResultCompress.result.result.nanoSecPerRun;
|
2018-07-20 21:35:09 +00:00
|
|
|
results.result.cSize = intermediateResultCompress.result.result.sumOfReturn;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
while(!intermediateResultDecompress.completed) {
|
|
|
|
intermediateResultDecompress = BMK_benchFunctionTimed(timeStateDecompress, &local_defaultDecompress, (void*)(dctx), &local_initDCtx, (void*)&dctxprep,
|
|
|
|
nbBlocks, (const void* const*)dstPtrs, dstSizes, resPtrs, resSizes, NULL);
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(intermediateResultDecompress.result.error) {
|
|
|
|
results.error = intermediateResultDecompress.result.error;
|
|
|
|
BMK_freeTimeState(timeStateCompress);
|
|
|
|
BMK_freeTimeState(timeStateDecompress);
|
|
|
|
return results;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
2018-08-07 01:37:55 +00:00
|
|
|
results.result.dSpeed = (srcSize * TIMELOOP_NANOSEC) / intermediateResultDecompress.result.result.nanoSecPerRun;
|
2018-07-20 21:35:09 +00:00
|
|
|
}
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
BMK_freeTimeState(timeStateCompress);
|
|
|
|
BMK_freeTimeState(timeStateDecompress);
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
} else { /* iterMode; */
|
2018-07-20 21:35:09 +00:00
|
|
|
if(mode != BMK_decodeOnly) {
|
|
|
|
|
|
|
|
BMK_customReturn_t compressionResults = BMK_benchFunction(&local_defaultCompress, (void*)cctx, &local_initCCtx, (void*)&cctxprep,
|
|
|
|
nbBlocks, srcPtrs, srcSizes, dstPtrs, dstCapacities, dstSizes, nbSeconds);
|
|
|
|
if(compressionResults.error) {
|
|
|
|
results.error = compressionResults.error;
|
|
|
|
return results;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
if(compressionResults.result.nanoSecPerRun == 0) {
|
|
|
|
results.result.cSpeed = 0;
|
|
|
|
} else {
|
2018-08-07 01:37:55 +00:00
|
|
|
results.result.cSpeed = srcSize * TIMELOOP_NANOSEC / compressionResults.result.nanoSecPerRun;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
results.result.cSize = compressionResults.result.sumOfReturn;
|
|
|
|
}
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(mode != BMK_compressOnly) {
|
|
|
|
BMK_customReturn_t decompressionResults;
|
|
|
|
decompressionResults = BMK_benchFunction(
|
|
|
|
&local_defaultDecompress, (void*)(dctx),
|
|
|
|
&local_initDCtx, (void*)&dctxprep, nbBlocks,
|
|
|
|
(const void* const*)dstPtrs, dstSizes, resPtrs, resSizes, NULL,
|
|
|
|
nbSeconds);
|
|
|
|
|
|
|
|
if(decompressionResults.error) {
|
|
|
|
results.error = decompressionResults.error;
|
|
|
|
return results;
|
|
|
|
}
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(decompressionResults.result.nanoSecPerRun == 0) {
|
|
|
|
results.result.dSpeed = 0;
|
|
|
|
} else {
|
2018-08-07 01:37:55 +00:00
|
|
|
results.result.dSpeed = srcSize * TIMELOOP_NANOSEC / decompressionResults.result.nanoSecPerRun;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
/* Bench */
|
|
|
|
results.result.cMem = (1 << (comprParams->windowLog)) + ZSTD_sizeof_CCtx(cctx);
|
2018-07-16 23:16:31 +00:00
|
|
|
return results;
|
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
static int BMK_benchParam(BMK_result_t* resultPtr,
|
|
|
|
buffers_t buf, contexts_t ctx,
|
|
|
|
const ZSTD_compressionParameters cParams) {
|
2018-08-13 23:38:51 +00:00
|
|
|
BMK_return_t res = BMK_benchMemInvertible(buf, ctx, BASE_CLEVEL, &cParams, BMK_both, BMK_timeMode, 3);
|
2018-07-31 00:42:46 +00:00
|
|
|
*resultPtr = res.result;
|
|
|
|
return res.error;
|
|
|
|
}
|
|
|
|
|
2018-07-25 00:26:21 +00:00
|
|
|
/* comparison function: */
|
|
|
|
/* strictly better, strictly worse, equal, speed-side adv, size-side adv */
|
|
|
|
//Maybe use compress_only for benchmark first run?
|
|
|
|
#define WORSE_RESULT 0
|
|
|
|
#define BETTER_RESULT 1
|
|
|
|
#define ERROR_RESULT 2
|
|
|
|
|
|
|
|
#define SPEED_RESULT 4
|
|
|
|
#define SIZE_RESULT 5
|
2018-07-25 18:55:09 +00:00
|
|
|
/* maybe have epsilon-eq to limit table size? */
|
2018-07-25 00:26:21 +00:00
|
|
|
static int speedSizeCompare(BMK_result_t r1, BMK_result_t r2) {
|
2018-08-13 23:38:51 +00:00
|
|
|
if(r1.cSpeed < r2.cSpeed) {
|
2018-07-25 00:26:21 +00:00
|
|
|
if(r1.cSize >= r2.cSize) {
|
|
|
|
return BETTER_RESULT;
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
return SPEED_RESULT; /* r2 is smaller but not faster. */
|
|
|
|
} else {
|
|
|
|
if(r1.cSize <= r2.cSize) {
|
|
|
|
return WORSE_RESULT;
|
|
|
|
}
|
|
|
|
return SIZE_RESULT; /* r2 is faster but not smaller */
|
2018-07-25 00:26:21 +00:00
|
|
|
}
|
|
|
|
}
|
2018-07-27 23:49:33 +00:00
|
|
|
|
|
|
|
/* 0 for insertion, 1 for no insert */
|
2018-07-25 00:26:21 +00:00
|
|
|
/* maintain invariant speedSizeCompare(n, n->next) = SPEED_RESULT */
|
2018-07-27 23:49:33 +00:00
|
|
|
static int insertWinner(winnerInfo_t w, constraint_t targetConstraints) {
|
2018-07-25 00:26:21 +00:00
|
|
|
BMK_result_t r = w.result;
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* cur_node = g_winners;
|
2018-07-25 00:26:21 +00:00
|
|
|
/* first node to insert */
|
2018-07-27 23:49:33 +00:00
|
|
|
if(!feasible(r, targetConstraints)) {
|
2018-07-25 00:26:21 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(g_winners == NULL) {
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* first_node = malloc(sizeof(winner_ll_node));
|
2018-07-25 00:26:21 +00:00
|
|
|
if(first_node == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
first_node->next = NULL;
|
|
|
|
first_node->res = w;
|
|
|
|
g_winners = first_node;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
while(cur_node->next != NULL) {
|
2018-08-13 23:38:51 +00:00
|
|
|
switch(speedSizeCompare(cur_node->res.result, r)) {
|
|
|
|
case WORSE_RESULT:
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
|
|
|
return 1; /* never insert if better */
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
case BETTER_RESULT:
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* tmp;
|
2018-07-25 00:26:21 +00:00
|
|
|
cur_node->res = cur_node->next->res;
|
|
|
|
tmp = cur_node->next;
|
|
|
|
cur_node->next = cur_node->next->next;
|
|
|
|
free(tmp);
|
|
|
|
break;
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
case SIZE_RESULT:
|
2018-07-25 18:37:20 +00:00
|
|
|
{
|
2018-07-25 00:26:21 +00:00
|
|
|
cur_node = cur_node->next;
|
2018-07-25 18:37:20 +00:00
|
|
|
break;
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
case SPEED_RESULT: /* insert after first size result, then return */
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* newnode = malloc(sizeof(winner_ll_node));
|
2018-07-25 00:26:21 +00:00
|
|
|
if(newnode == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
newnode->res = cur_node->res;
|
|
|
|
cur_node->res = w;
|
|
|
|
newnode->next = cur_node->next;
|
|
|
|
cur_node->next = newnode;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
assert(cur_node->next == NULL);
|
2018-08-13 23:38:51 +00:00
|
|
|
switch(speedSizeCompare(cur_node->res.result, r)) {
|
|
|
|
case WORSE_RESULT:
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
|
|
|
return 1; /* never insert if better */
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
case BETTER_RESULT:
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
|
|
|
cur_node->res = w;
|
|
|
|
return 0;
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
case SIZE_RESULT:
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* newnode = malloc(sizeof(winner_ll_node));
|
2018-07-25 00:26:21 +00:00
|
|
|
if(newnode == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
newnode->res = w;
|
|
|
|
newnode->next = NULL;
|
|
|
|
cur_node->next = newnode;
|
|
|
|
return 0;
|
|
|
|
}
|
2018-08-13 23:38:51 +00:00
|
|
|
case SPEED_RESULT: /* insert before first size result, then return */
|
2018-07-25 00:26:21 +00:00
|
|
|
{
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* newnode = malloc(sizeof(winner_ll_node));
|
2018-07-25 00:26:21 +00:00
|
|
|
if(newnode == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
newnode->res = cur_node->res;
|
|
|
|
cur_node->res = w;
|
|
|
|
newnode->next = cur_node->next;
|
|
|
|
cur_node->next = newnode;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-27 21:19:55 +00:00
|
|
|
/* Writes to f the results of a parameter benchmark */
|
|
|
|
/* when used with --optimize, will only print results better than previously discovered */
|
2018-07-13 00:30:39 +00:00
|
|
|
static void BMK_printWinner(FILE* f, const U32 cLevel, const BMK_result_t result, const ZSTD_compressionParameters params, const size_t srcSize)
|
|
|
|
{
|
2018-08-07 01:37:55 +00:00
|
|
|
char lvlstr[15] = "Custom Level";
|
|
|
|
const U64 time = UTIL_clockSpanNano(g_time);
|
|
|
|
const U64 minutes = time / (60ULL * TIMELOOP_NANOSEC);
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-07-27 23:49:33 +00:00
|
|
|
fprintf(f, "\r%79s\r", "");
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
fprintf(f," {%3u,%3u,%3u,%3u,%3u,%3u, %s }, ",
|
|
|
|
params.windowLog, params.chainLog, params.hashLog, params.searchLog, params.searchLength,
|
|
|
|
params.targetLength, g_stratName[(U32)(params.strategy)]);
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
if(cLevel != CUSTOM_LEVEL) {
|
|
|
|
snprintf(lvlstr, 15, " Level %2u ", cLevel);
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
fprintf(f,
|
|
|
|
"/* %s */ /* R:%5.3f at %5.1f MB/s - %5.1f MB/s */",
|
2018-07-27 21:19:55 +00:00
|
|
|
lvlstr, (double)srcSize / result.cSize, (double)result.cSpeed / (1 MB), (double)result.dSpeed / (1 MB));
|
2018-08-07 01:37:55 +00:00
|
|
|
|
|
|
|
if(TIMED) { fprintf(f, " - %1lu:%2lu:%05.2f", (unsigned long) minutes / 60,(unsigned long) minutes % 60, (double)(time - minutes * TIMELOOP_NANOSEC * 60ULL)/TIMELOOP_NANOSEC); }
|
|
|
|
fprintf(f, "\n");
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
static void BMK_printWinnerOpt(FILE* f, const U32 cLevel, const BMK_result_t result, const ZSTD_compressionParameters params, const constraint_t targetConstraints, const size_t srcSize)
|
|
|
|
{
|
|
|
|
/* global winner used for constraints */
|
|
|
|
static winnerInfo_t g_winner = { { 0, 0, (size_t)-1, (size_t)-1 } , { 0, 0, 0, 0, 0, 0, ZSTD_fast } };
|
2018-07-25 00:26:21 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
if(DEBUG || compareResultLT(g_winner.result, result, targetConstraints, srcSize)) {
|
|
|
|
if(DEBUG && compareResultLT(g_winner.result, result, targetConstraints, srcSize)) {
|
|
|
|
DISPLAY("New Winner: \n");
|
|
|
|
}
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinner(f, cLevel, result, params, srcSize);
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
if(compareResultLT(g_winner.result, result, targetConstraints, srcSize)) {
|
2018-07-13 00:30:39 +00:00
|
|
|
BMK_translateAdvancedParams(params);
|
|
|
|
g_winner.result = result;
|
|
|
|
g_winner.params = params;
|
|
|
|
}
|
|
|
|
}
|
2018-07-25 18:37:20 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
//prints out tradeoff table if using lvloptimize
|
2018-07-27 21:19:55 +00:00
|
|
|
if(g_optmode && g_optimizer) {
|
2018-07-25 18:37:20 +00:00
|
|
|
winnerInfo_t w;
|
2018-07-27 23:49:33 +00:00
|
|
|
winner_ll_node* n;
|
2018-07-25 18:37:20 +00:00
|
|
|
w.result = result;
|
|
|
|
w.params = params;
|
2018-07-27 23:49:33 +00:00
|
|
|
insertWinner(w, targetConstraints);
|
2018-07-25 18:37:20 +00:00
|
|
|
|
|
|
|
if(!DEBUG) { fprintf(f, "\033c"); }
|
|
|
|
fprintf(f, "\n");
|
2018-07-25 18:55:09 +00:00
|
|
|
|
2018-07-25 18:37:20 +00:00
|
|
|
/* the table */
|
|
|
|
fprintf(f, "================================\n");
|
|
|
|
for(n = g_winners; n != NULL; n = n->next) {
|
2018-07-27 23:49:33 +00:00
|
|
|
fprintf(f, "\r%79s\r", "");
|
2018-07-25 18:37:20 +00:00
|
|
|
|
|
|
|
fprintf(f," {%3u,%3u,%3u,%3u,%3u,%3u, %s }, ",
|
|
|
|
n->res.params.windowLog, n->res.params.chainLog, n->res.params.hashLog, n->res.params.searchLog, n->res.params.searchLength,
|
|
|
|
n->res.params.targetLength, g_stratName[(U32)(n->res.params.strategy)]);
|
|
|
|
fprintf(f,
|
|
|
|
" /* R:%5.3f at %5.1f MB/s - %5.1f MB/s */\n",
|
2018-07-27 21:19:55 +00:00
|
|
|
(double)srcSize / n->res.result.cSize, (double)n->res.result.cSpeed / (1 MB), (double)n->res.result.dSpeed / (1 MB));
|
2018-07-25 18:37:20 +00:00
|
|
|
}
|
|
|
|
fprintf(f, "================================\n");
|
2018-07-25 18:55:09 +00:00
|
|
|
fprintf(f, "Level Bounds: R: > %.3f AND C: < %.1f MB/s \n\n",
|
2018-07-27 21:19:55 +00:00
|
|
|
(double)srcSize / g_lvltarget.cSize, (double)g_lvltarget.cSpeed / (1 MB));
|
2018-07-25 18:55:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
fprintf(f, "Overall Winner: \n");
|
|
|
|
fprintf(f," {%3u,%3u,%3u,%3u,%3u,%3u, %s }, ",
|
|
|
|
g_winner.params.windowLog, g_winner.params.chainLog, g_winner.params.hashLog, g_winner.params.searchLog, g_winner.params.searchLength,
|
|
|
|
g_winner.params.targetLength, g_stratName[(U32)(g_winner.params.strategy)]);
|
|
|
|
fprintf(f,
|
|
|
|
" /* R:%5.3f at %5.1f MB/s - %5.1f MB/s */\n",
|
2018-07-27 21:19:55 +00:00
|
|
|
(double)srcSize / g_winner.result.cSize, (double)g_winner.result.cSpeed / (1 MB), (double)g_winner.result.dSpeed / (1 MB));
|
2018-07-25 18:55:09 +00:00
|
|
|
|
2018-07-27 21:19:55 +00:00
|
|
|
BMK_translateAdvancedParams(g_winner.params);
|
2018-07-25 18:55:09 +00:00
|
|
|
|
|
|
|
fprintf(f, "Latest BMK: \n");
|
|
|
|
fprintf(f," {%3u,%3u,%3u,%3u,%3u,%3u, %s }, ",
|
|
|
|
params.windowLog, params.chainLog, params.hashLog, params.searchLog, params.searchLength,
|
|
|
|
params.targetLength, g_stratName[(U32)(params.strategy)]);
|
|
|
|
fprintf(f,
|
|
|
|
" /* R:%5.3f at %5.1f MB/s - %5.1f MB/s */\n",
|
2018-07-27 21:19:55 +00:00
|
|
|
(double)srcSize / result.cSize, (double)result.cSpeed / (1 MB), (double)result.dSpeed / (1 MB));
|
2018-07-25 18:55:09 +00:00
|
|
|
|
2018-07-25 18:37:20 +00:00
|
|
|
}
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
|
|
|
|
2015-10-27 01:59:12 +00:00
|
|
|
static void BMK_printWinners2(FILE* f, const winnerInfo_t* winners, size_t srcSize)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
2016-07-27 13:09:11 +00:00
|
|
|
int cLevel;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2015-11-27 16:46:14 +00:00
|
|
|
fprintf(f, "\n /* Proposed configurations : */ \n");
|
2016-03-30 18:42:19 +00:00
|
|
|
fprintf(f, " /* W, C, H, S, L, T, strat */ \n");
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-05-14 00:25:53 +00:00
|
|
|
for (cLevel=0; cLevel <= NB_LEVELS_TRACKED; cLevel++)
|
2015-10-26 14:45:58 +00:00
|
|
|
BMK_printWinner(f, cLevel, winners[cLevel].result, winners[cLevel].params, srcSize);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2015-10-27 01:59:12 +00:00
|
|
|
|
|
|
|
static void BMK_printWinners(FILE* f, const winnerInfo_t* winners, size_t srcSize)
|
|
|
|
{
|
|
|
|
fseek(f, 0, SEEK_SET);
|
|
|
|
BMK_printWinners2(f, winners, srcSize);
|
2015-10-28 13:05:37 +00:00
|
|
|
fflush(f);
|
2015-10-27 01:59:12 +00:00
|
|
|
BMK_printWinners2(stdout, winners, srcSize);
|
|
|
|
}
|
|
|
|
|
2018-05-12 02:43:08 +00:00
|
|
|
|
|
|
|
typedef struct {
|
2018-08-07 00:13:36 +00:00
|
|
|
U64 cSpeed_min;
|
|
|
|
U64 dSpeed_min;
|
2018-05-12 02:43:08 +00:00
|
|
|
U32 windowLog_max;
|
|
|
|
ZSTD_strategy strategy_max;
|
|
|
|
} level_constraints_t;
|
|
|
|
|
2018-05-14 00:25:53 +00:00
|
|
|
static level_constraints_t g_level_constraint[NB_LEVELS_TRACKED+1];
|
2018-05-12 02:43:08 +00:00
|
|
|
|
|
|
|
static void BMK_init_level_constraints(int bytePerSec_level1)
|
|
|
|
{
|
2018-05-14 00:25:53 +00:00
|
|
|
assert(NB_LEVELS_TRACKED >= ZSTD_maxCLevel());
|
2018-05-12 02:43:08 +00:00
|
|
|
memset(g_level_constraint, 0, sizeof(g_level_constraint));
|
|
|
|
g_level_constraint[1].cSpeed_min = bytePerSec_level1;
|
|
|
|
g_level_constraint[1].dSpeed_min = 0.;
|
|
|
|
g_level_constraint[1].windowLog_max = 19;
|
|
|
|
g_level_constraint[1].strategy_max = ZSTD_fast;
|
|
|
|
|
|
|
|
/* establish speed objectives (relative to level 1) */
|
|
|
|
{ int l;
|
2018-05-14 00:25:53 +00:00
|
|
|
for (l=2; l<=NB_LEVELS_TRACKED; l++) {
|
2018-05-12 16:40:04 +00:00
|
|
|
g_level_constraint[l].cSpeed_min = (g_level_constraint[l-1].cSpeed_min * 49) / 64;
|
2018-05-12 02:43:08 +00:00
|
|
|
g_level_constraint[l].dSpeed_min = 0.;
|
2018-05-12 16:40:04 +00:00
|
|
|
g_level_constraint[l].windowLog_max = (l<20) ? 23 : l+5; /* only --ultra levels >= 20 can use windowlog > 23 */
|
2018-05-12 02:43:08 +00:00
|
|
|
g_level_constraint[l].strategy_max = (l<19) ? ZSTD_btopt : ZSTD_btultra; /* level 19 is allowed to use btultra */
|
|
|
|
} }
|
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
static int BMK_seed(winnerInfo_t* winners, const ZSTD_compressionParameters params,
|
|
|
|
buffers_t buf, contexts_t ctx)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
|
|
|
BMK_result_t testResult;
|
|
|
|
int better = 0;
|
2016-07-27 13:09:11 +00:00
|
|
|
int cLevel;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_benchParam(&testResult, buf, ctx, params);
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-05-12 02:43:08 +00:00
|
|
|
|
2018-05-14 00:25:53 +00:00
|
|
|
for (cLevel = 1; cLevel <= NB_LEVELS_TRACKED; cLevel++) {
|
2018-05-12 02:43:08 +00:00
|
|
|
if (testResult.cSpeed < g_level_constraint[cLevel].cSpeed_min)
|
|
|
|
continue; /* not fast enough for this level */
|
|
|
|
if (testResult.dSpeed < g_level_constraint[cLevel].dSpeed_min)
|
2015-10-28 14:56:48 +00:00
|
|
|
continue; /* not fast enough for this level */
|
2018-05-12 02:43:08 +00:00
|
|
|
if (params.windowLog > g_level_constraint[cLevel].windowLog_max)
|
|
|
|
continue; /* too much memory for this level */
|
|
|
|
if (params.strategy > g_level_constraint[cLevel].strategy_max)
|
|
|
|
continue; /* forbidden strategy for this level */
|
2016-02-10 12:37:52 +00:00
|
|
|
if (winners[cLevel].result.cSize==0) {
|
2015-10-28 14:56:48 +00:00
|
|
|
/* first solution for this cLevel */
|
|
|
|
winners[cLevel].result = testResult;
|
|
|
|
winners[cLevel].params = params;
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_printWinner(stdout, cLevel, testResult, params, buf.srcSize);
|
2015-10-28 14:56:48 +00:00
|
|
|
better = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2015-10-28 11:32:25 +00:00
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
if ((double)testResult.cSize <= ((double)winners[cLevel].result.cSize * (1. + (0.02 / cLevel))) ) {
|
2015-10-28 11:32:25 +00:00
|
|
|
/* Validate solution is "good enough" */
|
2018-07-31 00:42:46 +00:00
|
|
|
double W_ratio = (double)buf.srcSize / testResult.cSize;
|
|
|
|
double O_ratio = (double)buf.srcSize / winners[cLevel].result.cSize;
|
2015-10-28 14:56:48 +00:00
|
|
|
double W_ratioNote = log (W_ratio);
|
|
|
|
double O_ratioNote = log (O_ratio);
|
2015-10-28 11:32:25 +00:00
|
|
|
size_t W_DMemUsed = (1 << params.windowLog) + (16 KB);
|
|
|
|
size_t O_DMemUsed = (1 << winners[cLevel].params.windowLog) + (16 KB);
|
2015-10-28 18:07:05 +00:00
|
|
|
double W_DMemUsed_note = W_ratioNote * ( 40 + 9*cLevel) - log((double)W_DMemUsed);
|
|
|
|
double O_DMemUsed_note = O_ratioNote * ( 40 + 9*cLevel) - log((double)O_DMemUsed);
|
2015-10-28 11:32:25 +00:00
|
|
|
|
2017-09-24 23:47:02 +00:00
|
|
|
size_t W_CMemUsed = (1 << params.windowLog) + ZSTD_estimateCCtxSize_usingCParams(params);
|
|
|
|
size_t O_CMemUsed = (1 << winners[cLevel].params.windowLog) + ZSTD_estimateCCtxSize_usingCParams(winners[cLevel].params);
|
2015-10-28 14:56:48 +00:00
|
|
|
double W_CMemUsed_note = W_ratioNote * ( 50 + 13*cLevel) - log((double)W_CMemUsed);
|
|
|
|
double O_CMemUsed_note = O_ratioNote * ( 50 + 13*cLevel) - log((double)O_CMemUsed);
|
2015-10-28 11:32:25 +00:00
|
|
|
|
2016-07-13 14:45:24 +00:00
|
|
|
double W_CSpeed_note = W_ratioNote * ( 30 + 10*cLevel) + log(testResult.cSpeed);
|
|
|
|
double O_CSpeed_note = O_ratioNote * ( 30 + 10*cLevel) + log(winners[cLevel].result.cSpeed);
|
2015-10-28 13:05:37 +00:00
|
|
|
|
2016-07-13 14:45:24 +00:00
|
|
|
double W_DSpeed_note = W_ratioNote * ( 20 + 2*cLevel) + log(testResult.dSpeed);
|
|
|
|
double O_DSpeed_note = O_ratioNote * ( 20 + 2*cLevel) + log(winners[cLevel].result.dSpeed);
|
2015-10-28 13:05:37 +00:00
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
if (W_DMemUsed_note < O_DMemUsed_note) {
|
2015-10-28 14:56:48 +00:00
|
|
|
/* uses too much Decompression memory for too little benefit */
|
|
|
|
if (W_ratio > O_ratio)
|
|
|
|
DISPLAY ("Decompression Memory : %5.3f @ %4.1f MB vs %5.3f @ %4.1f MB : not enough for level %i\n",
|
|
|
|
W_ratio, (double)(W_DMemUsed) / 1024 / 1024,
|
|
|
|
O_ratio, (double)(O_DMemUsed) / 1024 / 1024, cLevel);
|
|
|
|
continue;
|
|
|
|
}
|
2016-02-10 12:37:52 +00:00
|
|
|
if (W_CMemUsed_note < O_CMemUsed_note) {
|
2015-10-28 14:56:48 +00:00
|
|
|
/* uses too much memory for compression for too little benefit */
|
|
|
|
if (W_ratio > O_ratio)
|
|
|
|
DISPLAY ("Compression Memory : %5.3f @ %4.1f MB vs %5.3f @ %4.1f MB : not enough for level %i\n",
|
|
|
|
W_ratio, (double)(W_CMemUsed) / 1024 / 1024,
|
|
|
|
O_ratio, (double)(O_CMemUsed) / 1024 / 1024, cLevel);
|
|
|
|
continue;
|
|
|
|
}
|
2016-02-10 12:37:52 +00:00
|
|
|
if (W_CSpeed_note < O_CSpeed_note ) {
|
2015-10-28 14:56:48 +00:00
|
|
|
/* too large compression speed difference for the compression benefit */
|
|
|
|
if (W_ratio > O_ratio)
|
|
|
|
DISPLAY ("Compression Speed : %5.3f @ %4.1f MB/s vs %5.3f @ %4.1f MB/s : not enough for level %i\n",
|
2018-07-27 21:19:55 +00:00
|
|
|
W_ratio, (double)testResult.cSpeed / (1 MB),
|
|
|
|
O_ratio, (double)winners[cLevel].result.cSpeed / (1 MB), cLevel);
|
2015-10-28 14:56:48 +00:00
|
|
|
continue;
|
|
|
|
}
|
2016-02-10 12:37:52 +00:00
|
|
|
if (W_DSpeed_note < O_DSpeed_note ) {
|
2015-10-28 14:56:48 +00:00
|
|
|
/* too large decompression speed difference for the compression benefit */
|
|
|
|
if (W_ratio > O_ratio)
|
|
|
|
DISPLAY ("Decompression Speed : %5.3f @ %4.1f MB/s vs %5.3f @ %4.1f MB/s : not enough for level %i\n",
|
2018-07-27 21:19:55 +00:00
|
|
|
W_ratio, (double)testResult.dSpeed / (1 MB),
|
|
|
|
O_ratio, (double)winners[cLevel].result.dSpeed / (1 MB), cLevel);
|
2015-10-28 14:56:48 +00:00
|
|
|
continue;
|
|
|
|
}
|
2015-10-28 11:32:25 +00:00
|
|
|
|
2015-10-28 14:56:48 +00:00
|
|
|
if (W_ratio < O_ratio)
|
|
|
|
DISPLAY("Solution %4.3f selected over %4.3f at level %i, due to better secondary statistics \n", W_ratio, O_ratio, cLevel);
|
2015-10-28 11:32:25 +00:00
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
winners[cLevel].result = testResult;
|
|
|
|
winners[cLevel].params = params;
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_printWinner(stdout, cLevel, testResult, params, buf.srcSize);
|
2015-10-28 14:56:48 +00:00
|
|
|
|
|
|
|
better = 1;
|
2016-02-10 12:37:52 +00:00
|
|
|
} }
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2015-10-26 14:45:58 +00:00
|
|
|
return better;
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
/* bounds check in sanitize too? */
|
|
|
|
#define CLAMP(var, lo, hi) { \
|
|
|
|
var = MAX(MIN(var, hi), lo); \
|
|
|
|
}
|
|
|
|
|
2015-11-09 11:07:44 +00:00
|
|
|
/* nullified useless params, to ensure count stats */
|
2018-06-18 18:59:45 +00:00
|
|
|
/* no point in windowLog < chainLog (no point 2x chainLog for bt) */
|
|
|
|
/* now with built in bounds-checking */
|
|
|
|
/* no longer does anything with sanitizeVarArray + clampcheck */
|
|
|
|
static ZSTD_compressionParameters sanitizeParams(ZSTD_compressionParameters params)
|
2015-11-09 11:07:44 +00:00
|
|
|
{
|
2015-11-11 12:43:58 +00:00
|
|
|
if (params.strategy == ZSTD_fast)
|
2018-07-20 21:35:09 +00:00
|
|
|
params.chainLog = 0, params.searchLog = 0;
|
2016-07-13 09:49:05 +00:00
|
|
|
if (params.strategy == ZSTD_dfast)
|
2018-07-20 21:35:09 +00:00
|
|
|
params.searchLog = 0;
|
2018-06-18 18:59:45 +00:00
|
|
|
if (params.strategy != ZSTD_btopt && params.strategy != ZSTD_btultra && params.strategy != ZSTD_fast)
|
2018-07-20 21:35:09 +00:00
|
|
|
params.targetLength = 0;
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
return params;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* new length */
|
|
|
|
/* keep old array, will need if iter over strategy. */
|
2018-07-20 21:35:09 +00:00
|
|
|
static int sanitizeVarArray(varInds_t* varNew, const int varLength, const varInds_t* varArray, const ZSTD_strategy strat) {
|
2018-06-18 18:59:45 +00:00
|
|
|
int i, j = 0;
|
|
|
|
for(i = 0; i < varLength; i++) {
|
2018-07-20 21:35:09 +00:00
|
|
|
if( !((varArray[i] == clog_ind && strat == ZSTD_fast)
|
2018-07-31 18:13:44 +00:00
|
|
|
|| (varArray[i] == slog_ind && strat == ZSTD_fast)
|
2018-07-20 21:35:09 +00:00
|
|
|
|| (varArray[i] == slog_ind && strat == ZSTD_dfast)
|
2018-07-31 18:13:44 +00:00
|
|
|
|| (varArray[i] == tlen_ind && strat != ZSTD_btopt && strat != ZSTD_btultra && strat != ZSTD_fast)
|
|
|
|
/* || varArray[i] == strt_ind */ )) {
|
2018-06-18 18:59:45 +00:00
|
|
|
varNew[j] = varArray[i];
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return j;
|
|
|
|
|
2015-11-09 11:07:44 +00:00
|
|
|
}
|
|
|
|
|
2018-06-06 23:19:09 +00:00
|
|
|
/* res should be NUM_PARAMS size */
|
2018-06-18 18:59:45 +00:00
|
|
|
/* constructs varArray from ZSTD_compressionParameters style parameter */
|
2018-07-20 21:35:09 +00:00
|
|
|
static int variableParams(const ZSTD_compressionParameters paramConstraints, varInds_t* res) {
|
2018-06-06 23:19:09 +00:00
|
|
|
int j = 0;
|
|
|
|
if(!paramConstraints.windowLog) {
|
2018-07-20 21:35:09 +00:00
|
|
|
res[j] = wlog_ind;
|
2018-06-06 23:19:09 +00:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
if(!paramConstraints.chainLog) {
|
2018-07-20 21:35:09 +00:00
|
|
|
res[j] = clog_ind;
|
2018-06-06 23:19:09 +00:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
if(!paramConstraints.hashLog) {
|
2018-07-20 21:35:09 +00:00
|
|
|
res[j] = hlog_ind;
|
2018-06-06 23:19:09 +00:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
if(!paramConstraints.searchLog) {
|
2018-07-20 21:35:09 +00:00
|
|
|
res[j] = slog_ind;
|
2018-06-06 23:19:09 +00:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
if(!paramConstraints.searchLength) {
|
2018-07-20 21:35:09 +00:00
|
|
|
res[j] = slen_ind;
|
2018-06-06 23:19:09 +00:00
|
|
|
j++;
|
|
|
|
}
|
|
|
|
if(!paramConstraints.targetLength) {
|
2018-07-20 21:35:09 +00:00
|
|
|
res[j] = tlen_ind;
|
2018-06-06 23:19:09 +00:00
|
|
|
j++;
|
|
|
|
}
|
2018-07-31 18:13:44 +00:00
|
|
|
if(!paramConstraints.strategy) {
|
|
|
|
res[j] = strt_ind;
|
|
|
|
j++;
|
|
|
|
}
|
2018-06-06 23:19:09 +00:00
|
|
|
return j;
|
|
|
|
}
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* bin-search on tlen_table for correct index. */
|
|
|
|
static int tlen_inv(U32 x) {
|
|
|
|
int lo = 0;
|
|
|
|
int hi = TLEN_RANGE;
|
|
|
|
while(lo < hi) {
|
|
|
|
int mid = (lo + hi) / 2;
|
|
|
|
if(tlen_table[mid] < x) {
|
|
|
|
lo = mid + 1;
|
|
|
|
} if(tlen_table[mid] == x) {
|
|
|
|
return mid;
|
|
|
|
} else {
|
|
|
|
hi = mid;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return lo;
|
|
|
|
}
|
|
|
|
|
2018-06-06 23:19:09 +00:00
|
|
|
/* amt will probably always be \pm 1? */
|
|
|
|
/* slight change from old paramVariation, targetLength can only take on powers of 2 now (999 ~= 1024?) */
|
2018-06-18 18:59:45 +00:00
|
|
|
/* take max/min bounds into account as well? */
|
2018-07-20 21:35:09 +00:00
|
|
|
static void paramVaryOnce(const varInds_t paramIndex, const int amt, ZSTD_compressionParameters* ptr) {
|
2018-06-06 23:19:09 +00:00
|
|
|
switch(paramIndex)
|
|
|
|
{
|
2018-07-20 21:35:09 +00:00
|
|
|
case wlog_ind: ptr->windowLog += amt; break;
|
|
|
|
case clog_ind: ptr->chainLog += amt; break;
|
|
|
|
case hlog_ind: ptr->hashLog += amt; break;
|
|
|
|
case slog_ind: ptr->searchLog += amt; break;
|
|
|
|
case slen_ind: ptr->searchLength += amt; break;
|
|
|
|
case tlen_ind:
|
|
|
|
ptr->targetLength = tlen_table[MAX(0, MIN(TLEN_RANGE - 1, tlen_inv(ptr->targetLength) + amt))];
|
2018-06-06 23:19:09 +00:00
|
|
|
break;
|
2018-07-31 18:13:44 +00:00
|
|
|
case strt_ind: ptr->strategy += amt; break;
|
2018-06-06 23:19:09 +00:00
|
|
|
default: break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
/* varies ptr by nbChanges respecting varyParams*/
|
2018-07-20 21:35:09 +00:00
|
|
|
static void paramVariation(ZSTD_compressionParameters* ptr, const varInds_t* varyParams, const int varyLen, const U32 nbChanges)
|
2015-11-27 16:46:14 +00:00
|
|
|
{
|
2016-03-30 18:42:19 +00:00
|
|
|
ZSTD_compressionParameters p;
|
|
|
|
U32 validated = 0;
|
|
|
|
while (!validated) {
|
2018-06-18 18:59:45 +00:00
|
|
|
U32 i;
|
2016-03-30 18:42:19 +00:00
|
|
|
p = *ptr;
|
2018-06-18 18:59:45 +00:00
|
|
|
for (i = 0 ; i < nbChanges ; i++) {
|
|
|
|
const U32 changeID = FUZ_rand(&g_rand) % (varyLen << 1);
|
2018-06-06 23:19:09 +00:00
|
|
|
paramVaryOnce(varyParams[changeID >> 1], ((changeID & 1) << 1) - 1, &p);
|
2015-11-27 16:46:14 +00:00
|
|
|
}
|
2018-07-31 18:13:44 +00:00
|
|
|
validated = !ZSTD_isError(ZSTD_checkCParams(p)) && p.strategy > 0;
|
2015-11-27 16:46:14 +00:00
|
|
|
}
|
2018-07-30 18:30:38 +00:00
|
|
|
*ptr = p;
|
2015-11-27 16:46:14 +00:00
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
/* length of memo table given free variables */
|
2018-07-20 21:35:09 +00:00
|
|
|
static size_t memoTableLen(const varInds_t* varyParams, const int varyLen) {
|
2018-06-18 18:59:45 +00:00
|
|
|
size_t arrayLen = 1;
|
|
|
|
int i;
|
|
|
|
for(i = 0; i < varyLen; i++) {
|
2018-07-31 18:13:44 +00:00
|
|
|
if(varyParams[i] != strt_ind) {
|
|
|
|
arrayLen *= rangetable[varyParams[i]];
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
return arrayLen;
|
|
|
|
}
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* returns unique index in memotable of compression parameters */
|
2018-07-20 21:35:09 +00:00
|
|
|
static unsigned memoTableInd(const ZSTD_compressionParameters* ptr, const varInds_t* varyParams, const int varyLen) {
|
2018-06-18 18:59:45 +00:00
|
|
|
int i;
|
|
|
|
unsigned ind = 0;
|
|
|
|
for(i = 0; i < varyLen; i++) {
|
|
|
|
switch(varyParams[i]) {
|
2018-08-07 01:37:55 +00:00
|
|
|
case wlog_ind: ind *= WLOG_RANGE; ind += ptr->windowLog
|
|
|
|
- ZSTD_WINDOWLOG_MIN ; break;
|
|
|
|
case clog_ind: ind *= CLOG_RANGE; ind += ptr->chainLog
|
|
|
|
- ZSTD_CHAINLOG_MIN ; break;
|
|
|
|
case hlog_ind: ind *= HLOG_RANGE; ind += ptr->hashLog
|
|
|
|
- ZSTD_HASHLOG_MIN ; break;
|
|
|
|
case slog_ind: ind *= SLOG_RANGE; ind += ptr->searchLog
|
|
|
|
- ZSTD_SEARCHLOG_MIN ; break;
|
|
|
|
case slen_ind: ind *= SLEN_RANGE; ind += ptr->searchLength
|
|
|
|
- ZSTD_SEARCHLENGTH_MIN; break;
|
|
|
|
case tlen_ind: ind *= TLEN_RANGE; ind += tlen_inv(ptr->targetLength)
|
|
|
|
- ZSTD_TARGETLENGTH_MIN; break;
|
2018-07-31 18:13:44 +00:00
|
|
|
case strt_ind: break;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ind;
|
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
/* inverse of above function (from index to parameters) */
|
2018-07-20 21:35:09 +00:00
|
|
|
static void memoTableIndInv(ZSTD_compressionParameters* ptr, const varInds_t* varyParams, const int varyLen, size_t ind) {
|
2018-06-18 18:59:45 +00:00
|
|
|
int i;
|
|
|
|
for(i = varyLen - 1; i >= 0; i--) {
|
|
|
|
switch(varyParams[i]) {
|
2018-08-07 18:56:14 +00:00
|
|
|
case wlog_ind: ptr->windowLog = ind % WLOG_RANGE + ZSTD_WINDOWLOG_MIN;
|
|
|
|
ind /= WLOG_RANGE; break;
|
|
|
|
case clog_ind: ptr->chainLog = ind % CLOG_RANGE + ZSTD_CHAINLOG_MIN;
|
|
|
|
ind /= CLOG_RANGE; break;
|
|
|
|
case hlog_ind: ptr->hashLog = ind % HLOG_RANGE + ZSTD_HASHLOG_MIN;
|
|
|
|
ind /= HLOG_RANGE; break;
|
|
|
|
case slog_ind: ptr->searchLog = ind % SLOG_RANGE + ZSTD_SEARCHLOG_MIN;
|
|
|
|
ind /= SLOG_RANGE; break;
|
|
|
|
case slen_ind: ptr->searchLength = ind % SLEN_RANGE + ZSTD_SEARCHLENGTH_MIN;
|
|
|
|
ind /= SLEN_RANGE; break;
|
|
|
|
case tlen_ind: ptr->targetLength = tlen_table[(ind % TLEN_RANGE)];
|
|
|
|
ind /= TLEN_RANGE; break;
|
2018-07-31 18:13:44 +00:00
|
|
|
case strt_ind: break;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
/* Initialize memoization table, which tracks and prevents repeated benchmarking
|
|
|
|
* of the same set of parameters. In addition, it is also used to immediately mark
|
|
|
|
* redundant / obviously non-optimal parameter configurations (e.g. wlog - 1 larger)
|
|
|
|
* than srcSize, clog > wlog, ...
|
|
|
|
*/
|
|
|
|
static void initMemoTable(U8* memoTable, ZSTD_compressionParameters paramConstraints, const constraint_t target, const varInds_t* varyParams, const int varyLen, const size_t srcSize) {
|
2018-06-18 18:59:45 +00:00
|
|
|
size_t i;
|
|
|
|
size_t arrayLen = memoTableLen(varyParams, varyLen);
|
|
|
|
int cwFixed = !paramConstraints.chainLog || !paramConstraints.windowLog;
|
|
|
|
int scFixed = !paramConstraints.searchLog || !paramConstraints.chainLog;
|
2018-07-20 21:35:09 +00:00
|
|
|
int whFixed = !paramConstraints.windowLog || !paramConstraints.hashLog;
|
2018-07-09 20:44:01 +00:00
|
|
|
int wFixed = !paramConstraints.windowLog;
|
2018-06-18 18:59:45 +00:00
|
|
|
int j = 0;
|
2018-08-07 01:37:55 +00:00
|
|
|
assert(memoTable != NULL);
|
2018-06-18 18:59:45 +00:00
|
|
|
memset(memoTable, 0, arrayLen);
|
2018-07-09 20:44:01 +00:00
|
|
|
cParamZeroMin(¶mConstraints);
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
for(i = 0; i < arrayLen; i++) {
|
|
|
|
memoTableIndInv(¶mConstraints, varyParams, varyLen, i);
|
2018-07-16 23:16:31 +00:00
|
|
|
if(ZSTD_estimateCStreamSize_usingCParams(paramConstraints) > (size_t)target.cMem) {
|
2018-06-18 18:59:45 +00:00
|
|
|
memoTable[i] = 255;
|
|
|
|
j++;
|
|
|
|
}
|
2018-08-07 01:37:55 +00:00
|
|
|
if(wFixed && (1ULL << (paramConstraints.windowLog - 1)) > srcSize) {
|
2018-07-09 20:44:01 +00:00
|
|
|
memoTable[i] = 255;
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
/* nil out parameter sets equivalent to others. */
|
|
|
|
if(cwFixed/* at most least 1 param fixed. */) {
|
|
|
|
if(paramConstraints.strategy == ZSTD_btlazy2 || paramConstraints.strategy == ZSTD_btopt || paramConstraints.strategy == ZSTD_btultra) {
|
|
|
|
if(paramConstraints.chainLog > paramConstraints.windowLog + 1) {
|
|
|
|
if(memoTable[i] != 255) { j++; }
|
|
|
|
memoTable[i] = 255;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if(paramConstraints.chainLog > paramConstraints.windowLog) {
|
|
|
|
if(memoTable[i] != 255) { j++; }
|
|
|
|
memoTable[i] = 255;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
if(scFixed) {
|
|
|
|
if(paramConstraints.searchLog > paramConstraints.chainLog) {
|
|
|
|
if(memoTable[i] != 255) { j++; }
|
|
|
|
memoTable[i] = 255;
|
|
|
|
}
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
if(whFixed) {
|
|
|
|
if(paramConstraints.hashLog > paramConstraints.windowLog + 1) {
|
|
|
|
if(memoTable[i] != 255) { j++; }
|
|
|
|
memoTable[i] = 255;
|
|
|
|
}
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-13 00:30:39 +00:00
|
|
|
DEBUGOUTPUT("%d / %d Invalid\n", j, (int)i);
|
|
|
|
if((int)i == j) {
|
|
|
|
DEBUGOUTPUT("!!!Strategy %d totally infeasible\n", (int)paramConstraints.strategy)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* frees all allocated memotables */
|
2018-08-07 01:37:55 +00:00
|
|
|
static void freeMemoTableArray(U8** mtAll) {
|
2018-07-20 21:35:09 +00:00
|
|
|
int i;
|
|
|
|
if(mtAll == NULL) { return; }
|
|
|
|
for(i = 1; i <= (int)ZSTD_btultra; i++) {
|
|
|
|
free(mtAll[i]);
|
|
|
|
}
|
|
|
|
free(mtAll);
|
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
/* inits memotables for all (including mallocs), all strategies */
|
|
|
|
/* takes unsanitized varyParams */
|
2018-07-27 15:49:25 +00:00
|
|
|
static U8** createMemoTableArray(ZSTD_compressionParameters paramConstraints, constraint_t target, const varInds_t* varyParams, const int varyLen, const size_t srcSize) {
|
2018-07-20 21:35:09 +00:00
|
|
|
varInds_t varNew[NUM_PARAMS];
|
2018-08-13 23:38:51 +00:00
|
|
|
U8** mtAll = (U8**)calloc(sizeof(U8*),(ZSTD_btultra + 1));
|
2018-07-13 00:30:39 +00:00
|
|
|
int i;
|
|
|
|
if(mtAll == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2018-07-27 15:49:25 +00:00
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
for(i = 1; i <= (int)ZSTD_btultra; i++) {
|
2018-07-27 15:49:25 +00:00
|
|
|
const int varLenNew = sanitizeVarArray(varNew, varyLen, varyParams, i);
|
2018-07-13 00:30:39 +00:00
|
|
|
mtAll[i] = malloc(sizeof(U8) * memoTableLen(varNew, varLenNew));
|
|
|
|
if(mtAll[i] == NULL) {
|
2018-08-07 01:37:55 +00:00
|
|
|
freeMemoTableArray(mtAll);
|
2018-07-13 00:30:39 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2018-08-07 01:37:55 +00:00
|
|
|
initMemoTable(mtAll[i], paramConstraints, target, varNew, varLenNew, srcSize);
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
2018-07-27 15:49:25 +00:00
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
return mtAll;
|
|
|
|
}
|
|
|
|
|
2018-08-13 23:38:51 +00:00
|
|
|
static ZSTD_compressionParameters overwriteParams(ZSTD_compressionParameters base, ZSTD_compressionParameters mask) {
|
2018-07-31 00:42:46 +00:00
|
|
|
base.windowLog = mask.windowLog ? mask.windowLog : base.windowLog;
|
|
|
|
base.chainLog = mask.chainLog ? mask.chainLog : base.chainLog;
|
|
|
|
base.hashLog = mask.hashLog ? mask.hashLog : base.hashLog;
|
|
|
|
base.searchLog = mask.searchLog ? mask.searchLog : base.searchLog;
|
|
|
|
base.searchLength = mask.searchLength ? mask.searchLength : base.searchLength;
|
|
|
|
base.targetLength = mask.targetLength ? mask.targetLength : base.targetLength;
|
|
|
|
base.strategy = mask.strategy ? mask.strategy : base.strategy;
|
|
|
|
return base;
|
|
|
|
}
|
|
|
|
|
2015-11-09 10:39:48 +00:00
|
|
|
#define PARAMTABLELOG 25
|
|
|
|
#define PARAMTABLESIZE (1<<PARAMTABLELOG)
|
|
|
|
#define PARAMTABLEMASK (PARAMTABLESIZE-1)
|
|
|
|
static BYTE g_alreadyTested[PARAMTABLESIZE] = {0}; /* init to zero */
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
/*
|
2015-10-26 14:45:58 +00:00
|
|
|
#define NB_TESTS_PLAYED(p) \
|
2018-06-18 18:59:45 +00:00
|
|
|
g_alreadyTested[(XXH64(((void*)&sanitizeParams(p), sizeof(p), 0) >> 3) & PARAMTABLEMASK] */
|
2015-11-09 10:39:48 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
static BYTE* NB_TESTS_PLAYED(ZSTD_compressionParameters p) {
|
|
|
|
ZSTD_compressionParameters p2 = sanitizeParams(p);
|
|
|
|
return &g_alreadyTested[(XXH64((void*)&p2, sizeof(p2), 0) >> 3) & PARAMTABLEMASK];
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2015-10-26 14:45:58 +00:00
|
|
|
static void playAround(FILE* f, winnerInfo_t* winners,
|
2016-03-30 18:42:19 +00:00
|
|
|
ZSTD_compressionParameters params,
|
2018-07-31 00:42:46 +00:00
|
|
|
buffers_t buf, contexts_t ctx)
|
2015-10-26 14:45:58 +00:00
|
|
|
{
|
|
|
|
int nbVariations = 0;
|
2017-11-30 03:11:12 +00:00
|
|
|
UTIL_time_t const clockStart = UTIL_getTime();
|
2018-07-31 18:13:44 +00:00
|
|
|
const U32 unconstrained[NUM_PARAMS] = { 0, 1, 2, 3, 4, 5, 6 };
|
2018-06-06 23:19:09 +00:00
|
|
|
|
2015-10-27 12:12:25 +00:00
|
|
|
|
2017-11-30 03:11:12 +00:00
|
|
|
while (UTIL_clockSpanMicro(clockStart) < g_maxVariationTime) {
|
2016-03-30 18:42:19 +00:00
|
|
|
ZSTD_compressionParameters p = params;
|
2018-06-18 18:59:45 +00:00
|
|
|
BYTE* b;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2015-11-27 16:46:14 +00:00
|
|
|
if (nbVariations++ > g_maxNbVariations) break;
|
2018-07-31 18:13:44 +00:00
|
|
|
paramVariation(&p, unconstrained, NUM_PARAMS, 4);
|
2015-10-26 14:45:58 +00:00
|
|
|
|
|
|
|
/* exclude faster if already played params */
|
2018-06-18 18:59:45 +00:00
|
|
|
if (FUZ_rand(&g_rand) & ((1 << *NB_TESTS_PLAYED(p))-1))
|
2015-11-01 13:32:59 +00:00
|
|
|
continue;
|
2015-10-26 14:45:58 +00:00
|
|
|
|
|
|
|
/* test */
|
2018-06-18 18:59:45 +00:00
|
|
|
b = NB_TESTS_PLAYED(p);
|
|
|
|
(*b)++;
|
2018-07-31 00:42:46 +00:00
|
|
|
if (!BMK_seed(winners, p, buf, ctx)) continue;
|
2015-10-26 14:45:58 +00:00
|
|
|
|
|
|
|
/* improvement found => search more */
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_printWinners(f, winners, buf.srcSize);
|
|
|
|
playAround(f, winners, p, buf, ctx);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 14:45:58 +00:00
|
|
|
}
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* Completely random parameter selection */
|
2016-06-01 16:59:55 +00:00
|
|
|
static ZSTD_compressionParameters randomParams(void)
|
2015-11-27 16:46:14 +00:00
|
|
|
{
|
2016-06-01 16:59:55 +00:00
|
|
|
ZSTD_compressionParameters p;
|
2016-03-30 18:42:19 +00:00
|
|
|
U32 validated = 0;
|
|
|
|
while (!validated) {
|
2015-11-27 16:46:14 +00:00
|
|
|
/* totally random entry */
|
2018-08-07 18:56:14 +00:00
|
|
|
p.chainLog = (FUZ_rand(&g_rand) % (ZSTD_CHAINLOG_MAX+1 - ZSTD_CHAINLOG_MIN))
|
|
|
|
+ ZSTD_CHAINLOG_MIN;
|
|
|
|
p.hashLog = (FUZ_rand(&g_rand) % (ZSTD_HASHLOG_MAX+1 - ZSTD_HASHLOG_MIN))
|
|
|
|
+ ZSTD_HASHLOG_MIN;
|
|
|
|
p.searchLog = (FUZ_rand(&g_rand) % (ZSTD_SEARCHLOG_MAX+1 - ZSTD_SEARCHLOG_MIN))
|
|
|
|
+ ZSTD_SEARCHLOG_MIN;
|
|
|
|
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;
|
2018-06-07 22:49:01 +00:00
|
|
|
p.targetLength=(FUZ_rand(&g_rand) % (512));
|
2018-08-07 18:56:14 +00:00
|
|
|
|
2017-03-09 19:44:25 +00:00
|
|
|
p.strategy = (ZSTD_strategy) (FUZ_rand(&g_rand) % (ZSTD_btultra +1));
|
2018-08-07 18:56:14 +00:00
|
|
|
|
2018-07-09 20:44:01 +00:00
|
|
|
validated = !ZSTD_isError(ZSTD_checkCParams(p));
|
2015-11-27 16:46:14 +00:00
|
|
|
}
|
2016-06-01 16:59:55 +00:00
|
|
|
return p;
|
2015-11-27 16:46:14 +00:00
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
/* Sets pc to random unmeasured set of parameters */
|
2018-07-20 21:35:09 +00:00
|
|
|
static void randomConstrainedParams(ZSTD_compressionParameters* pc, varInds_t* varArray, int varLen, U8* memoTable)
|
2018-06-06 23:19:09 +00:00
|
|
|
{
|
2018-07-30 18:30:38 +00:00
|
|
|
size_t tries = memoTableLen(varArray, varLen);
|
2018-06-18 18:59:45 +00:00
|
|
|
const size_t maxSize = memoTableLen(varArray, varLen);
|
|
|
|
size_t ind;
|
|
|
|
do {
|
|
|
|
ind = (FUZ_rand(&g_rand)) % maxSize;
|
|
|
|
tries--;
|
|
|
|
} while(memoTable[ind] > 0 && tries > 0);
|
|
|
|
|
|
|
|
memoTableIndInv(pc, varArray, varLen, (unsigned)ind);
|
2018-06-06 23:19:09 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 14:45:58 +00:00
|
|
|
static void BMK_selectRandomStart(
|
|
|
|
FILE* f, winnerInfo_t* winners,
|
2018-07-31 00:42:46 +00:00
|
|
|
buffers_t buf, contexts_t ctx)
|
2015-10-26 14:45:58 +00:00
|
|
|
{
|
2018-05-14 00:25:53 +00:00
|
|
|
U32 const id = FUZ_rand(&g_rand) % (NB_LEVELS_TRACKED+1);
|
2016-02-10 12:37:52 +00:00
|
|
|
if ((id==0) || (winners[id].params.windowLog==0)) {
|
2018-05-12 00:32:26 +00:00
|
|
|
/* use some random entry */
|
2018-07-31 00:42:46 +00:00
|
|
|
ZSTD_compressionParameters const p = ZSTD_adjustCParams(randomParams(), buf.srcSize, 0);
|
|
|
|
playAround(f, winners, p, buf, ctx);
|
2018-05-12 00:32:26 +00:00
|
|
|
} else {
|
2018-07-31 00:42:46 +00:00
|
|
|
playAround(f, winners, winners[id].params, buf, ctx);
|
2018-05-12 00:32:26 +00:00
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
static void BMK_benchFullTable(buffers_t buf, contexts_t ctx, const size_t maxBlockSize)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
2016-03-30 18:42:19 +00:00
|
|
|
ZSTD_compressionParameters params;
|
2018-05-14 00:25:53 +00:00
|
|
|
winnerInfo_t winners[NB_LEVELS_TRACKED+1];
|
2016-07-13 14:45:24 +00:00
|
|
|
const char* const rfName = "grillResults.txt";
|
2016-07-12 11:42:10 +00:00
|
|
|
FILE* const f = fopen(rfName, "w");
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2016-07-13 14:45:24 +00:00
|
|
|
/* init */
|
2018-05-12 02:43:08 +00:00
|
|
|
assert(g_singleRun==0);
|
2016-07-13 14:45:24 +00:00
|
|
|
memset(winners, 0, sizeof(winners));
|
|
|
|
if (f==NULL) { DISPLAY("error opening %s \n", rfName); exit(1); }
|
|
|
|
|
2018-05-12 00:32:26 +00:00
|
|
|
if (g_target) {
|
2018-07-27 21:19:55 +00:00
|
|
|
BMK_init_level_constraints(g_target * (1 MB));
|
2018-05-12 00:32:26 +00:00
|
|
|
} else {
|
2015-11-05 17:16:59 +00:00
|
|
|
/* baseline config for level 1 */
|
2018-07-31 00:42:46 +00:00
|
|
|
ZSTD_compressionParameters const l1params = ZSTD_getCParams(1, maxBlockSize, ctx.dictSize); //is dictionary ever even useful here?
|
2015-10-28 11:32:25 +00:00
|
|
|
BMK_result_t testResult;
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_benchParam(&testResult, buf, ctx, l1params);
|
2018-05-12 02:43:08 +00:00
|
|
|
BMK_init_level_constraints((int)((testResult.cSpeed * 31) / 32));
|
2016-07-13 14:45:24 +00:00
|
|
|
}
|
2015-10-26 14:45:58 +00:00
|
|
|
|
|
|
|
/* populate initial solution */
|
2016-07-12 11:42:10 +00:00
|
|
|
{ const int maxSeeds = g_noSeed ? 1 : ZSTD_maxCLevel();
|
|
|
|
int i;
|
|
|
|
for (i=0; i<=maxSeeds; i++) {
|
2018-07-31 00:42:46 +00:00
|
|
|
params = ZSTD_getCParams(i, maxBlockSize, 0);
|
|
|
|
BMK_seed(winners, params, buf, ctx);
|
2016-07-12 11:42:10 +00:00
|
|
|
} }
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_printWinners(f, winners, buf.srcSize);
|
2015-10-26 14:45:58 +00:00
|
|
|
|
|
|
|
/* start tests */
|
2016-07-13 14:45:24 +00:00
|
|
|
{ const time_t grillStart = time(NULL);
|
2016-02-10 12:37:52 +00:00
|
|
|
do {
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_selectRandomStart(f, winners, buf, ctx);
|
2016-07-13 14:45:24 +00:00
|
|
|
} while (BMK_timeSpan(grillStart) < g_grillDuration_s);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* end summary */
|
2018-07-31 00:42:46 +00:00
|
|
|
BMK_printWinners(f, winners, buf.srcSize);
|
2015-10-27 11:18:00 +00:00
|
|
|
DISPLAY("grillParams operations completed \n");
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
/* clean up*/
|
2015-10-26 14:45:58 +00:00
|
|
|
fclose(f);
|
2018-05-12 00:32:26 +00:00
|
|
|
}
|
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
static int benchSample(void)
|
|
|
|
{
|
2018-05-12 00:32:26 +00:00
|
|
|
const char* const name = "Sample 10MB";
|
2018-07-27 21:19:55 +00:00
|
|
|
size_t const benchedSize = 10 MB;
|
2018-07-31 00:42:46 +00:00
|
|
|
U32 blockSize = g_blockSize ? g_blockSize : benchedSize;
|
|
|
|
U32 const maxNbBlocks = (U32) ((benchedSize + (blockSize-1)) / blockSize) + 1;
|
|
|
|
size_t splitSize = 0;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
buffers_t buf;
|
|
|
|
contexts_t ctx;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
buf.srcPtrs = (const void**)calloc(maxNbBlocks, sizeof(void*));
|
|
|
|
buf.dstPtrs = (void**)calloc(maxNbBlocks, sizeof(void*));
|
|
|
|
buf.resPtrs = (void**)calloc(maxNbBlocks, sizeof(void*));
|
|
|
|
buf.srcSizes = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
buf.dstSizes = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
buf.dstCapacities = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
buf.resSizes = (size_t*)malloc(maxNbBlocks * sizeof(size_t));
|
|
|
|
buf.srcSize = benchedSize;
|
|
|
|
|
|
|
|
if(!buf.srcPtrs || !buf.dstPtrs || !buf.resPtrs || !buf.srcSizes || !buf.dstSizes || !buf.dstCapacities || !buf.resSizes) {
|
|
|
|
DISPLAY("Allocation Error\n");
|
|
|
|
freeBuffers(buf);
|
|
|
|
return 1;
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
buf.srcBuffer = malloc(benchedSize);
|
|
|
|
buf.srcPtrs[0] = (const void*)buf.srcBuffer;
|
|
|
|
buf.dstPtrs[0] = malloc(ZSTD_compressBound(benchedSize) + 1024 * maxNbBlocks);
|
|
|
|
buf.resPtrs[0] = malloc(benchedSize);
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
if(!buf.srcPtrs[0] || !buf.dstPtrs[0] || !buf.resPtrs[0]) {
|
|
|
|
DISPLAY("Allocation Error\n");
|
|
|
|
freeBuffers(buf);
|
|
|
|
return 1;
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
splitSize = MIN(benchedSize, blockSize);
|
|
|
|
buf.srcSizes[0] = splitSize;
|
|
|
|
buf.dstCapacities[0] = ZSTD_compressBound(splitSize);
|
|
|
|
buf.resSizes[0] = splitSize;
|
2018-07-27 21:19:55 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
for(buf.nbBlocks = 1; splitSize < benchedSize; buf.nbBlocks++) {
|
|
|
|
const size_t i = buf.nbBlocks;
|
|
|
|
const size_t nextBlockSize = MIN(benchedSize - splitSize, blockSize);
|
|
|
|
buf.srcSizes[i] = nextBlockSize;
|
|
|
|
buf.dstCapacities[i] = ZSTD_compressBound(nextBlockSize);
|
|
|
|
buf.resSizes[i] = nextBlockSize;
|
|
|
|
buf.srcPtrs[i] = (const void*)(((const char*)buf.srcPtrs[i-1]) + buf.srcSizes[i-1]);
|
|
|
|
buf.dstPtrs[i] = (void*)(((char*)buf.dstPtrs[i-1]) + buf.dstSizes[i-1]);
|
|
|
|
buf.resPtrs[i] = (void*)(((char*)buf.resPtrs[i-1]) + buf.resSizes[i-1]);
|
|
|
|
splitSize += nextBlockSize;
|
2018-07-27 21:19:55 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
if(createContexts(&ctx, NULL)) {
|
|
|
|
DISPLAY("Context Creation Error\n");
|
2018-07-27 21:19:55 +00:00
|
|
|
freeBuffers(buf);
|
2018-07-31 00:42:46 +00:00
|
|
|
return 1;
|
2018-07-27 21:19:55 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
RDG_genBuffer(buf.srcBuffer, benchedSize, g_compressibility, 0.0, 0);
|
|
|
|
|
|
|
|
/* bench */
|
|
|
|
DISPLAY("\r%79s\r", "");
|
|
|
|
DISPLAY("using %s %i%%: \n", name, (int)(g_compressibility*100));
|
|
|
|
|
|
|
|
BMK_benchFullTable(buf, ctx, MIN(blockSize, benchedSize));
|
|
|
|
|
|
|
|
freeBuffers(buf);
|
|
|
|
freeContexts(ctx);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-27 21:19:55 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
|
|
|
|
static int benchOnce(buffers_t buf, contexts_t ctx) {
|
|
|
|
BMK_result_t testResult;
|
2018-07-27 21:19:55 +00:00
|
|
|
|
|
|
|
if(BMK_benchParam(&testResult, buf, ctx, g_params)) {
|
|
|
|
DISPLAY("Error during benchmarking\n");
|
2018-07-31 00:42:46 +00:00
|
|
|
return 1;
|
2018-07-27 21:19:55 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 18:13:44 +00:00
|
|
|
BMK_printWinner(stdout, CUSTOM_LEVEL, testResult, g_params, buf.srcSize);
|
2018-07-27 21:19:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-05-12 00:32:26 +00:00
|
|
|
/* benchFiles() :
|
|
|
|
* note: while this function takes a table of filenames,
|
|
|
|
* in practice, only the first filename will be used */
|
2018-07-31 00:42:46 +00:00
|
|
|
int benchFiles(const char** fileNamesTable, int nbFiles, const char* dictFileName, int cLevel)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
2018-07-31 00:42:46 +00:00
|
|
|
buffers_t buf;
|
|
|
|
contexts_t ctx;
|
|
|
|
size_t maxBlockSize = 0, i;
|
|
|
|
int ret = 0;
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
if(createBuffers(&buf, fileNamesTable, nbFiles)) {
|
|
|
|
DISPLAY("unable to load files\n");
|
|
|
|
return 1;
|
2018-07-27 21:19:55 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
if(createContexts(&ctx, dictFileName)) {
|
|
|
|
DISPLAY("unable to load dictionary\n");
|
|
|
|
freeBuffers(buf);
|
|
|
|
return 2;
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
for(i = 0; i < buf.nbBlocks; i++) {
|
|
|
|
maxBlockSize = MAX(maxBlockSize, buf.srcSizes[i]);
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
DISPLAY("\r%79s\r", "");
|
|
|
|
if(nbFiles == 1) {
|
|
|
|
DISPLAY("using %s : \n", fileNamesTable[0]);
|
|
|
|
} else {
|
|
|
|
DISPLAY("using %d Files : \n", nbFiles);
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-08-13 23:38:51 +00:00
|
|
|
g_params = ZSTD_adjustCParams(overwriteParams(ZSTD_getCParams(cLevel, maxBlockSize, ctx.dictSize), g_params), maxBlockSize, ctx.dictSize);
|
2016-07-12 11:42:10 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
if(g_singleRun) {
|
|
|
|
ret = benchOnce(buf, ctx);
|
|
|
|
} else {
|
|
|
|
BMK_benchFullTable(buf, ctx, maxBlockSize);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
freeBuffers(buf);
|
|
|
|
freeContexts(ctx);
|
|
|
|
return ret;
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* Benchmarking which stops when we are sufficiently sure the solution is infeasible / worse than the winner */
|
2018-07-31 18:13:44 +00:00
|
|
|
#define VARIANCE 1.2
|
2018-07-20 21:35:09 +00:00
|
|
|
static int allBench(BMK_result_t* resultPtr,
|
2018-08-09 18:38:09 +00:00
|
|
|
const buffers_t buf, const contexts_t ctx,
|
2018-07-20 21:35:09 +00:00
|
|
|
const ZSTD_compressionParameters cParams,
|
|
|
|
const constraint_t target,
|
|
|
|
BMK_result_t* winnerResult, int feas) {
|
2018-06-18 18:59:45 +00:00
|
|
|
BMK_return_t benchres;
|
2018-07-20 21:35:09 +00:00
|
|
|
BMK_result_t resultMax;
|
2018-06-18 18:59:45 +00:00
|
|
|
U64 loopDurationC = 0, loopDurationD = 0;
|
|
|
|
double uncertaintyConstantC, uncertaintyConstantD;
|
2018-07-20 21:35:09 +00:00
|
|
|
double winnerRS;
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* initial benchmarking, gives exact ratio and memory, warms up future runs */
|
2018-08-13 23:38:51 +00:00
|
|
|
benchres = BMK_benchMemInvertible(buf, ctx, BASE_CLEVEL, &cParams, BMK_both, BMK_iterMode, 1);
|
2018-06-06 23:19:09 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
winnerRS = resultScore(*winnerResult, buf.srcSize, target);
|
|
|
|
DEBUGOUTPUT("WinnerScore: %f\n ", winnerRS);
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(benchres.error) {
|
|
|
|
DEBUGOUTPUT("Benchmarking failed\n");
|
|
|
|
return ERROR_RESULT;
|
|
|
|
}
|
|
|
|
*resultPtr = benchres.result;
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* calculate uncertainty in compression / decompression runs */
|
2018-08-07 00:13:36 +00:00
|
|
|
if(benchres.result.cSpeed) {
|
|
|
|
loopDurationC = ((buf.srcSize * TIMELOOP_NANOSEC) / benchres.result.cSpeed);
|
|
|
|
uncertaintyConstantC = ((loopDurationC + (double)(2 * g_clockGranularity))/loopDurationC) * VARIANCE;
|
|
|
|
} else {
|
2018-07-20 21:35:09 +00:00
|
|
|
loopDurationC = 0;
|
|
|
|
uncertaintyConstantC = 3;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-08-07 00:13:36 +00:00
|
|
|
if(benchres.result.dSpeed) {
|
|
|
|
loopDurationD = ((buf.srcSize * TIMELOOP_NANOSEC) / benchres.result.dSpeed);
|
|
|
|
uncertaintyConstantD = ((loopDurationD + (double)(2 * g_clockGranularity))/loopDurationD) * VARIANCE;
|
|
|
|
} else {
|
2018-07-20 21:35:09 +00:00
|
|
|
loopDurationD = 0;
|
|
|
|
uncertaintyConstantD = 3;
|
2018-07-16 23:16:31 +00:00
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* anything with worse ratio in feas is definitely worse, discard */
|
2018-07-27 18:47:14 +00:00
|
|
|
if(feas && benchres.result.cSize < winnerResult->cSize && !g_optmode) {
|
2018-07-25 18:37:20 +00:00
|
|
|
return WORSE_RESULT;
|
2018-07-20 21:35:09 +00:00
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* second run, if first run is too short, gives approximate cSpeed + dSpeed */
|
|
|
|
if(loopDurationC < TIMELOOP_NANOSEC / 10) {
|
2018-08-13 23:38:51 +00:00
|
|
|
BMK_return_t benchres2 = BMK_benchMemInvertible(buf, ctx, BASE_CLEVEL, &cParams, BMK_compressOnly, BMK_iterMode, 1);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(benchres2.error) {
|
|
|
|
return ERROR_RESULT;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
benchres = benchres2;
|
|
|
|
}
|
|
|
|
if(loopDurationD < TIMELOOP_NANOSEC / 10) {
|
2018-08-13 23:38:51 +00:00
|
|
|
BMK_return_t benchres2 = BMK_benchMemInvertible(buf, ctx, BASE_CLEVEL, &cParams, BMK_decodeOnly, BMK_iterMode, 1);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(benchres2.error) {
|
|
|
|
return ERROR_RESULT;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
benchres.result.dSpeed = benchres2.result.dSpeed;
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
*resultPtr = benchres.result;
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
/* optimistic assumption of benchres.result */
|
|
|
|
resultMax = benchres.result;
|
|
|
|
resultMax.cSpeed *= uncertaintyConstantC;
|
|
|
|
resultMax.dSpeed *= uncertaintyConstantD;
|
|
|
|
|
|
|
|
/* disregard infeasible results in feas mode */
|
|
|
|
/* disregard if resultMax < winner in infeas mode */
|
2018-07-25 18:37:20 +00:00
|
|
|
if((feas && !feasible(resultMax, target)) ||
|
|
|
|
(!feas && (winnerRS > resultScore(resultMax, buf.srcSize, target)))) {
|
2018-07-20 21:35:09 +00:00
|
|
|
return WORSE_RESULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Final full run if estimates are unclear */
|
|
|
|
if(loopDurationC < TIMELOOP_NANOSEC) {
|
2018-08-13 23:38:51 +00:00
|
|
|
BMK_return_t benchres2 = BMK_benchMemInvertible(buf, ctx, BASE_CLEVEL, &cParams, BMK_compressOnly, BMK_timeMode, 1);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(benchres2.error) {
|
|
|
|
return ERROR_RESULT;
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
benchres.result.cSpeed = benchres2.result.cSpeed;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(loopDurationD < TIMELOOP_NANOSEC) {
|
2018-08-13 23:38:51 +00:00
|
|
|
BMK_return_t benchres2 = BMK_benchMemInvertible(buf, ctx, BASE_CLEVEL, &cParams, BMK_decodeOnly, BMK_timeMode, 1);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(benchres2.error) {
|
|
|
|
return ERROR_RESULT;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
benchres.result.dSpeed = benchres2.result.dSpeed;
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
*resultPtr = benchres.result;
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
/* compare by resultScore when in infeas */
|
|
|
|
/* compare by compareResultLT when in feas */
|
2018-07-25 18:37:20 +00:00
|
|
|
if((!feas && (resultScore(benchres.result, buf.srcSize, target) > resultScore(*winnerResult, buf.srcSize, target))) ||
|
|
|
|
(feas && (compareResultLT(*winnerResult, benchres.result, target, buf.srcSize))) ) {
|
|
|
|
return BETTER_RESULT;
|
|
|
|
} else {
|
|
|
|
return WORSE_RESULT;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define INFEASIBLE_THRESHOLD 200
|
2018-07-30 18:30:38 +00:00
|
|
|
|
|
|
|
/* Memoized benchmarking, won't benchmark anything which has already been benchmarked before. */
|
2018-07-20 21:35:09 +00:00
|
|
|
static int benchMemo(BMK_result_t* resultPtr,
|
2018-08-09 18:38:09 +00:00
|
|
|
const buffers_t buf, const contexts_t ctx,
|
2018-07-20 21:35:09 +00:00
|
|
|
const ZSTD_compressionParameters cParams,
|
|
|
|
const constraint_t target,
|
2018-08-09 18:38:09 +00:00
|
|
|
BMK_result_t* winnerResult, U8* const memoTable,
|
|
|
|
const varInds_t* varyParams, const int varyLen, const int feas) {
|
2018-07-20 21:35:09 +00:00
|
|
|
static int bmcount = 0;
|
2018-06-18 18:59:45 +00:00
|
|
|
size_t memind = memoTableInd(&cParams, varyParams, varyLen);
|
2018-07-20 21:35:09 +00:00
|
|
|
int res;
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(memoTable[memind] >= INFEASIBLE_THRESHOLD) { return WORSE_RESULT; }
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
res = allBench(resultPtr, buf, ctx, cParams, target, winnerResult, feas);
|
|
|
|
|
|
|
|
if(DEBUG && !(bmcount % 250)) {
|
|
|
|
DISPLAY("Count: %d\n", bmcount);
|
|
|
|
bmcount++;
|
|
|
|
}
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, *resultPtr, cParams, target, buf.srcSize);
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
if(res == BETTER_RESULT || feas) {
|
|
|
|
memoTable[memind] = 255;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
return res;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
2018-07-25 18:37:20 +00:00
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* One iteration of hill climbing. Specifically, it first tries all
|
|
|
|
* valid parameter configurations w/ manhattan distance 1 and picks the best one
|
|
|
|
* failing that, it progressively tries candidates further and further away (up to #dim + 2)
|
|
|
|
* if it finds a candidate exceeding winnerInfo, it will repeat. Otherwise, it will stop the
|
|
|
|
* current stage of hill climbing.
|
|
|
|
* Each iteration of hill climbing proceeds in 2 'phases'. Phase 1 climbs according to
|
|
|
|
* the resultScore function, which is effectively a linear increase in reward until it reaches
|
|
|
|
* the constraint-satisfying value, it which point any excess results in only logarithmic reward.
|
|
|
|
* This aims to find some constraint-satisfying point.
|
|
|
|
* Phase 2 optimizes in accordance with what the original function sets out to maximize, with
|
|
|
|
* all feasible solutions valued over all infeasible solutions.
|
|
|
|
*/
|
2018-07-25 18:37:20 +00:00
|
|
|
|
|
|
|
/* sanitize all params here.
|
|
|
|
* all generation after random should be sanitized. (maybe sanitize random)
|
|
|
|
*/
|
2018-07-13 00:30:39 +00:00
|
|
|
static winnerInfo_t climbOnce(const constraint_t target,
|
2018-07-31 18:13:44 +00:00
|
|
|
const varInds_t* varArray, const int varLen, ZSTD_strategy strat,
|
|
|
|
U8** memoTableArray,
|
|
|
|
buffers_t buf, contexts_t ctx,
|
2018-07-13 00:30:39 +00:00
|
|
|
const ZSTD_compressionParameters init) {
|
2018-07-30 18:30:38 +00:00
|
|
|
/*
|
|
|
|
* cparam - currently considered 'center'
|
|
|
|
* candidate - params to benchmark/results
|
|
|
|
* winner - best option found so far.
|
|
|
|
*/
|
2018-06-18 18:59:45 +00:00
|
|
|
ZSTD_compressionParameters cparam = init;
|
|
|
|
winnerInfo_t candidateInfo, winnerInfo;
|
|
|
|
int better = 1;
|
2018-07-20 21:35:09 +00:00
|
|
|
int feas = 0;
|
2018-07-31 18:13:44 +00:00
|
|
|
varInds_t varNew[NUM_PARAMS];
|
|
|
|
int varLenNew = sanitizeVarArray(varNew, varLen, varArray, strat);
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
winnerInfo = initWinnerInfo(init);
|
|
|
|
candidateInfo = winnerInfo;
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
{
|
2018-07-20 21:35:09 +00:00
|
|
|
winnerInfo_t bestFeasible1 = initWinnerInfo(cparam);
|
2018-07-25 18:55:09 +00:00
|
|
|
DEBUGOUTPUT("Climb Part 1\n");
|
2018-06-18 18:59:45 +00:00
|
|
|
while(better) {
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
int i, dist, offset;
|
2018-06-18 18:59:45 +00:00
|
|
|
better = 0;
|
2018-07-13 00:30:39 +00:00
|
|
|
DEBUGOUTPUT("Start\n");
|
2018-06-18 18:59:45 +00:00
|
|
|
cparam = winnerInfo.params;
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, winnerInfo.result, winnerInfo.params, target, buf.srcSize);
|
2018-06-18 18:59:45 +00:00
|
|
|
candidateInfo.params = cparam;
|
2018-07-30 18:30:38 +00:00
|
|
|
/* all dist-1 candidates */
|
2018-06-18 18:59:45 +00:00
|
|
|
for(i = 0; i < varLen; i++) {
|
2018-07-20 21:35:09 +00:00
|
|
|
for(offset = -1; offset <= 1; offset += 2) {
|
|
|
|
candidateInfo.params = cparam;
|
2018-07-30 18:30:38 +00:00
|
|
|
paramVaryOnce(varArray[i], offset, &candidateInfo.params);
|
2018-07-31 18:13:44 +00:00
|
|
|
|
|
|
|
if(!ZSTD_isError(ZSTD_checkCParams(candidateInfo.params)) && candidateInfo.params.strategy > 0) {
|
|
|
|
int res;
|
|
|
|
if(strat != candidateInfo.params.strategy) { /* maybe only try strategy switching after exhausting non-switching solutions? */
|
|
|
|
strat = candidateInfo.params.strategy;
|
|
|
|
varLenNew = sanitizeVarArray(varNew, varLen, varArray, strat);
|
|
|
|
}
|
|
|
|
res = benchMemo(&candidateInfo.result,
|
2018-07-20 21:35:09 +00:00
|
|
|
buf, ctx,
|
2018-07-31 18:13:44 +00:00
|
|
|
sanitizeParams(candidateInfo.params), target, &winnerInfo.result, memoTableArray[strat],
|
|
|
|
varNew, varLenNew, feas);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(res == BETTER_RESULT) { /* synonymous with better when called w/ infeasibleBM */
|
|
|
|
winnerInfo = candidateInfo;
|
2018-07-31 18:13:44 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, winnerInfo.result, sanitizeParams(winnerInfo.params), target, buf.srcSize);
|
2018-07-20 21:35:09 +00:00
|
|
|
better = 1;
|
|
|
|
if(compareResultLT(bestFeasible1.result, winnerInfo.result, target, buf.srcSize)) {
|
|
|
|
bestFeasible1 = winnerInfo;
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(better) {
|
|
|
|
continue;
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
for(dist = 2; dist < varLen + 2; dist++) { /* varLen is # dimensions */
|
2018-07-31 18:13:44 +00:00
|
|
|
for(i = 0; i < (1 << varLen) / varLen + 2; i++) {
|
2018-06-18 18:59:45 +00:00
|
|
|
int res;
|
|
|
|
candidateInfo.params = cparam;
|
|
|
|
/* param error checking already done here */
|
2018-07-20 21:35:09 +00:00
|
|
|
paramVariation(&candidateInfo.params, varArray, varLen, dist);
|
2018-07-31 18:13:44 +00:00
|
|
|
|
|
|
|
if(strat != candidateInfo.params.strategy) {
|
|
|
|
strat = candidateInfo.params.strategy;
|
|
|
|
varLenNew = sanitizeVarArray(varNew, varLen, varArray, strat);
|
|
|
|
}
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
res = benchMemo(&candidateInfo.result,
|
|
|
|
buf, ctx,
|
2018-07-31 18:13:44 +00:00
|
|
|
sanitizeParams(candidateInfo.params), target, &winnerInfo.result, memoTableArray[strat],
|
|
|
|
varNew, varLenNew, feas);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(res == BETTER_RESULT) { /* synonymous with better in this case*/
|
2018-06-18 18:59:45 +00:00
|
|
|
winnerInfo = candidateInfo;
|
2018-07-31 18:13:44 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, winnerInfo.result, sanitizeParams(winnerInfo.params), target, buf.srcSize);
|
2018-06-18 18:59:45 +00:00
|
|
|
better = 1;
|
2018-07-20 21:35:09 +00:00
|
|
|
if(compareResultLT(bestFeasible1.result, winnerInfo.result, target, buf.srcSize)) {
|
2018-07-13 00:30:39 +00:00
|
|
|
bestFeasible1 = winnerInfo;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-31 18:13:44 +00:00
|
|
|
break;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
if(better) {
|
2018-07-20 21:35:09 +00:00
|
|
|
break;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
if(!better) { /* infeas -> feas -> stop */
|
2018-07-20 21:35:09 +00:00
|
|
|
if(feas) { return winnerInfo; }
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
feas = 1;
|
|
|
|
better = 1;
|
|
|
|
winnerInfo = bestFeasible1; /* note with change, bestFeasible may not necessarily be feasible, but if one has been benchmarked, it will be. */
|
2018-07-25 18:55:09 +00:00
|
|
|
DEBUGOUTPUT("Climb Part 2\n");
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
winnerInfo = bestFeasible1;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-16 23:16:31 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
return winnerInfo;
|
|
|
|
}
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* Optimizes for a fixed strategy */
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* flexible parameters: iterations of (failed?) climbing (or if we do non-random, maybe this is when everything is close to visitied)
|
|
|
|
weight more on visit for bad results, less on good results/more on later results / ones with more failures.
|
|
|
|
allocate memoTable here.
|
|
|
|
only real use for paramTarget is to get the fixed values, right?
|
|
|
|
maybe allow giving it a first init?
|
|
|
|
*/
|
2018-06-18 18:59:45 +00:00
|
|
|
static winnerInfo_t optimizeFixedStrategy(
|
2018-08-09 18:38:09 +00:00
|
|
|
const buffers_t buf, const contexts_t ctx,
|
2018-07-20 21:35:09 +00:00
|
|
|
const constraint_t target, ZSTD_compressionParameters paramTarget,
|
|
|
|
const ZSTD_strategy strat,
|
|
|
|
const varInds_t* varArray, const int varLen,
|
2018-07-31 18:13:44 +00:00
|
|
|
U8** memoTableArray, const int tries) {
|
2018-07-13 00:30:39 +00:00
|
|
|
int i = 0;
|
2018-07-20 21:35:09 +00:00
|
|
|
varInds_t varNew[NUM_PARAMS];
|
|
|
|
int varLenNew = sanitizeVarArray(varNew, varLen, varArray, strat);
|
2018-07-31 18:13:44 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
ZSTD_compressionParameters init;
|
|
|
|
winnerInfo_t winnerInfo, candidateInfo;
|
2018-07-20 21:35:09 +00:00
|
|
|
winnerInfo = initWinnerInfo(emptyParams());
|
2018-06-18 18:59:45 +00:00
|
|
|
/* so climb is given the right fixed strategy */
|
|
|
|
paramTarget.strategy = strat;
|
|
|
|
/* to pass ZSTD_checkCParams */
|
|
|
|
|
2018-07-09 20:44:01 +00:00
|
|
|
cParamZeroMin(¶mTarget);
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
init = paramTarget;
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
while(i < tries) {
|
2018-07-16 23:16:31 +00:00
|
|
|
DEBUGOUTPUT("Restart\n");
|
2018-07-31 18:13:44 +00:00
|
|
|
randomConstrainedParams(&init, varNew, varLenNew, memoTableArray[strat]);
|
|
|
|
candidateInfo = climbOnce(target, varArray, varLen, strat, memoTableArray, buf, ctx, init);
|
2018-07-20 21:35:09 +00:00
|
|
|
if(compareResultLT(winnerInfo.result, candidateInfo.result, target, buf.srcSize)) {
|
2018-06-18 18:59:45 +00:00
|
|
|
winnerInfo = candidateInfo;
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, winnerInfo.result, winnerInfo.params, target, buf.srcSize);
|
2018-07-10 01:37:54 +00:00
|
|
|
i = 0;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-25 18:37:20 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return winnerInfo;
|
|
|
|
}
|
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* goes best, best-1, best+1, best-2, ... */
|
|
|
|
/* return 0 if nothing remaining */
|
2018-07-13 00:30:39 +00:00
|
|
|
static int nextStrategy(const int currentStrategy, const int bestStrategy) {
|
|
|
|
if(bestStrategy <= currentStrategy) {
|
|
|
|
int candidate = 2 * bestStrategy - currentStrategy - 1;
|
|
|
|
if(candidate < 1) {
|
|
|
|
candidate = currentStrategy + 1;
|
|
|
|
if(candidate > (int)ZSTD_btultra) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return candidate;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
return candidate;
|
|
|
|
}
|
|
|
|
} else { /* bestStrategy >= currentStrategy */
|
|
|
|
int candidate = 2 * bestStrategy - currentStrategy;
|
|
|
|
if(candidate > (int)ZSTD_btultra) {
|
|
|
|
candidate = currentStrategy - 1;
|
|
|
|
if(candidate < 1) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return candidate;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
return candidate;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-26 23:45:00 +00:00
|
|
|
/* experiment with playing with this and decay value */
|
2018-07-27 15:20:31 +00:00
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
/* main fn called when using --optimize */
|
|
|
|
/* Does strategy selection by benchmarking default compression levels
|
|
|
|
* then optimizes by strategy, starting with the best one and moving
|
2018-08-07 18:56:14 +00:00
|
|
|
* progressively moving further away by number
|
|
|
|
* args:
|
|
|
|
* fileNamesTable - list of files to benchmark
|
|
|
|
* nbFiles - length of fileNamesTable
|
|
|
|
* dictFileName - name of dictionary file if one, else NULL
|
|
|
|
* target - performance constraints (cSpeed, dSpeed, cMem)
|
|
|
|
* paramTarget - parameter constraints (i.e. restriction search space to where strategy = ZSTD_fast)
|
|
|
|
* cLevel - compression level to exceed (all solutions must be > lvl in cSpeed + ratio)
|
|
|
|
*/
|
2018-07-26 23:45:00 +00:00
|
|
|
|
2018-07-27 23:49:33 +00:00
|
|
|
static int g_maxTries = 5;
|
2018-07-27 15:20:31 +00:00
|
|
|
#define TRY_DECAY 1
|
|
|
|
|
2018-07-17 01:04:57 +00:00
|
|
|
static int optimizeForSize(const char* const * const fileNamesTable, const size_t nbFiles, const char* dictFileName, constraint_t target, ZSTD_compressionParameters paramTarget, int cLevel)
|
2018-06-18 18:59:45 +00:00
|
|
|
{
|
2018-07-20 21:35:09 +00:00
|
|
|
varInds_t varArray [NUM_PARAMS];
|
2018-07-13 00:30:39 +00:00
|
|
|
int ret = 0;
|
|
|
|
const int varLen = variableParams(paramTarget, varArray);
|
2018-07-20 21:35:09 +00:00
|
|
|
winnerInfo_t winner = initWinnerInfo(emptyParams());
|
2018-07-13 00:30:39 +00:00
|
|
|
U8** allMT = NULL;
|
2018-07-20 21:35:09 +00:00
|
|
|
size_t k;
|
|
|
|
size_t maxBlockSize = 0;
|
|
|
|
contexts_t ctx;
|
|
|
|
buffers_t buf;
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
g_time = UTIL_getTime();
|
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
/* Init */
|
|
|
|
if(!cParamValid(paramTarget)) {
|
2018-07-20 21:35:09 +00:00
|
|
|
return 1;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
2018-07-10 01:37:54 +00:00
|
|
|
/* load dictionary*/
|
2018-07-27 15:49:25 +00:00
|
|
|
if(createBuffers(&buf, fileNamesTable, nbFiles)) {
|
2018-07-20 21:35:09 +00:00
|
|
|
DISPLAY("unable to load files\n");
|
|
|
|
return 1;
|
|
|
|
}
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-07-27 15:49:25 +00:00
|
|
|
if(createContexts(&ctx, dictFileName)) {
|
2018-07-20 21:35:09 +00:00
|
|
|
DISPLAY("unable to load dictionary\n");
|
|
|
|
freeBuffers(buf);
|
|
|
|
return 2;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
2018-07-10 01:37:54 +00:00
|
|
|
if(nbFiles == 1) {
|
|
|
|
DISPLAY("Loading %s... \r", fileNamesTable[0]);
|
|
|
|
} else {
|
2018-07-13 00:30:39 +00:00
|
|
|
DISPLAY("Loading %lu Files... \r", (unsigned long)nbFiles);
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
for(k = 0; k < buf.nbBlocks; k++) {
|
|
|
|
maxBlockSize = MAX(buf.srcSizes[k], maxBlockSize);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if strategy is fixed, only init that part of memotable */
|
|
|
|
if(paramTarget.strategy) {
|
|
|
|
varInds_t varNew[NUM_PARAMS];
|
|
|
|
int varLenNew = sanitizeVarArray(varNew, varLen, varArray, paramTarget.strategy);
|
|
|
|
allMT = calloc(sizeof(U8), (ZSTD_btultra + 1));
|
|
|
|
if(allMT == NULL) {
|
|
|
|
ret = 57;
|
2018-07-13 00:30:39 +00:00
|
|
|
goto _cleanUp;
|
2018-07-10 01:37:54 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
allMT[paramTarget.strategy] = malloc(sizeof(U8) * memoTableLen(varNew, varLenNew));
|
|
|
|
|
|
|
|
if(allMT[paramTarget.strategy] == NULL) {
|
|
|
|
ret = 58;
|
2018-07-13 00:30:39 +00:00
|
|
|
goto _cleanUp;
|
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
initMemoTable(allMT[paramTarget.strategy], paramTarget, target, varNew, varLenNew, maxBlockSize);
|
2018-07-20 21:35:09 +00:00
|
|
|
} else {
|
2018-07-27 15:49:25 +00:00
|
|
|
allMT = createMemoTableArray(paramTarget, target, varArray, varLen, maxBlockSize);
|
2018-06-06 23:19:09 +00:00
|
|
|
}
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
if(!allMT) {
|
2018-07-20 21:35:09 +00:00
|
|
|
DISPLAY("MemoTable Init Error\n");
|
2018-07-13 00:30:39 +00:00
|
|
|
ret = 2;
|
|
|
|
goto _cleanUp;
|
|
|
|
}
|
2018-07-17 01:22:04 +00:00
|
|
|
|
2018-07-27 15:20:31 +00:00
|
|
|
/* default strictness = Maximum for */
|
|
|
|
if(g_strictness == DEFAULT_STRICTNESS) {
|
2018-07-27 18:47:14 +00:00
|
|
|
if(g_optmode) {
|
2018-07-27 15:20:31 +00:00
|
|
|
g_strictness = 99;
|
|
|
|
} else {
|
|
|
|
g_strictness = 90;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if(0 >= g_strictness || g_strictness > 100) {
|
|
|
|
DISPLAY("Strictness Outside of Bounds\n");
|
|
|
|
ret = 4;
|
|
|
|
goto _cleanUp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-25 00:26:21 +00:00
|
|
|
/* use level'ing mode instead of normal target mode */
|
2018-07-27 23:49:33 +00:00
|
|
|
/* Should lvl be parameter-masked here? */
|
2018-07-27 18:47:14 +00:00
|
|
|
if(g_optmode) {
|
2018-07-20 21:35:09 +00:00
|
|
|
winner.params = ZSTD_getCParams(cLevel, maxBlockSize, ctx.dictSize);
|
|
|
|
if(BMK_benchParam(&winner.result, buf, ctx, winner.params)) {
|
2018-07-17 01:04:57 +00:00
|
|
|
ret = 3;
|
|
|
|
goto _cleanUp;
|
|
|
|
}
|
2018-07-27 23:49:33 +00:00
|
|
|
|
2018-07-25 18:37:20 +00:00
|
|
|
g_lvltarget = winner.result;
|
2018-07-27 23:49:33 +00:00
|
|
|
g_lvltarget.cSpeed *= ((double)g_strictness) / 100;
|
|
|
|
g_lvltarget.dSpeed *= ((double)g_strictness) / 100;
|
|
|
|
g_lvltarget.cSize /= ((double)g_strictness) / 100;
|
|
|
|
|
|
|
|
target.cSpeed = (U32)g_lvltarget.cSpeed;
|
2018-07-31 00:42:46 +00:00
|
|
|
target.dSpeed = (U32)g_lvltarget.dSpeed; //See if this is reasonable.
|
2018-07-25 00:26:21 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, cLevel, winner.result, winner.params, target, buf.srcSize);
|
2018-07-17 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
/* bench */
|
|
|
|
DISPLAY("\r%79s\r", "");
|
2018-07-10 01:37:54 +00:00
|
|
|
if(nbFiles == 1) {
|
|
|
|
DISPLAY("optimizing for %s", fileNamesTable[0]);
|
|
|
|
} else {
|
2018-07-13 00:30:39 +00:00
|
|
|
DISPLAY("optimizing for %lu Files", (unsigned long)nbFiles);
|
2018-07-10 01:37:54 +00:00
|
|
|
}
|
2018-07-31 00:42:46 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(target.cSpeed != 0) { DISPLAY(" - limit compression speed %u MB/s", target.cSpeed >> 20); }
|
|
|
|
if(target.dSpeed != 0) { DISPLAY(" - limit decompression speed %u MB/s", target.dSpeed >> 20); }
|
|
|
|
if(target.cMem != (U32)-1) { DISPLAY(" - limit memory %u MB", target.cMem >> 20); }
|
|
|
|
|
2018-06-18 18:59:45 +00:00
|
|
|
DISPLAY("\n");
|
|
|
|
findClockGranularity();
|
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
{
|
2018-07-27 15:20:31 +00:00
|
|
|
ZSTD_compressionParameters CParams;
|
2018-06-18 18:59:45 +00:00
|
|
|
|
|
|
|
/* find best solution from default params */
|
2018-07-13 00:30:39 +00:00
|
|
|
{
|
|
|
|
/* strategy selection */
|
|
|
|
const int maxSeeds = g_noSeed ? 1 : ZSTD_maxCLevel();
|
|
|
|
DEBUGOUTPUT("Strategy Selection\n");
|
2018-07-26 23:45:00 +00:00
|
|
|
if(paramTarget.strategy == 0) {
|
2018-07-13 00:30:39 +00:00
|
|
|
BMK_result_t candidate;
|
2018-07-20 21:35:09 +00:00
|
|
|
int i;
|
2018-07-13 00:30:39 +00:00
|
|
|
for (i=1; i<=maxSeeds; i++) {
|
2018-07-20 21:35:09 +00:00
|
|
|
int ec;
|
2018-08-13 23:38:51 +00:00
|
|
|
CParams = overwriteParams(ZSTD_getCParams(i, maxBlockSize, ctx.dictSize), paramTarget);
|
2018-07-20 21:35:09 +00:00
|
|
|
ec = BMK_benchParam(&candidate, buf, ctx, CParams);
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, i, candidate, CParams, target, buf.srcSize);
|
2018-07-20 21:35:09 +00:00
|
|
|
|
|
|
|
if(!ec && compareResultLT(winner.result, candidate, relaxTarget(target), buf.srcSize)) {
|
|
|
|
winner.result = candidate;
|
|
|
|
winner.params = CParams;
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
2018-07-26 23:45:00 +00:00
|
|
|
|
|
|
|
/* if the current params are too slow, just stop. */
|
2018-07-27 23:49:33 +00:00
|
|
|
if(target.cSpeed > candidate.cSpeed * 3 / 2) { break; }
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-18 18:59:45 +00:00
|
|
|
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, winner.result, winner.params, target, buf.srcSize);
|
2018-06-18 18:59:45 +00:00
|
|
|
BMK_translateAdvancedParams(winner.params);
|
2018-07-13 00:30:39 +00:00
|
|
|
DEBUGOUTPUT("Real Opt\n");
|
|
|
|
/* start 'real' tests */
|
2018-06-18 18:59:45 +00:00
|
|
|
{
|
2018-07-13 00:30:39 +00:00
|
|
|
int bestStrategy = (int)winner.params.strategy;
|
2018-06-18 18:59:45 +00:00
|
|
|
if(paramTarget.strategy == 0) {
|
2018-07-13 00:30:39 +00:00
|
|
|
int st = (int)winner.params.strategy;
|
2018-07-27 23:49:33 +00:00
|
|
|
int tries = g_maxTries;
|
2018-07-13 00:30:39 +00:00
|
|
|
|
|
|
|
{
|
2018-07-27 15:20:31 +00:00
|
|
|
/* one iterations of hill climbing with the level-defined parameters. */
|
2018-07-31 18:13:44 +00:00
|
|
|
winnerInfo_t w1 = climbOnce(target, varArray, varLen, st, allMT,
|
2018-07-20 21:35:09 +00:00
|
|
|
buf, ctx, winner.params);
|
|
|
|
if(compareResultLT(winner.result, w1.result, target, buf.srcSize)) {
|
2018-07-13 00:30:39 +00:00
|
|
|
winner = w1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-27 15:20:31 +00:00
|
|
|
while(st && tries > 0) {
|
2018-07-27 21:19:55 +00:00
|
|
|
winnerInfo_t wc;
|
2018-07-25 18:55:09 +00:00
|
|
|
DEBUGOUTPUT("StrategySwitch: %s\n", g_stratName[st]);
|
2018-07-27 23:49:33 +00:00
|
|
|
|
2018-07-27 21:19:55 +00:00
|
|
|
wc = optimizeFixedStrategy(buf, ctx, target, paramTarget,
|
2018-07-31 18:13:44 +00:00
|
|
|
st, varArray, varLen, allMT, tries);
|
2018-07-27 15:20:31 +00:00
|
|
|
|
2018-07-20 21:35:09 +00:00
|
|
|
if(compareResultLT(winner.result, wc.result, target, buf.srcSize)) {
|
2018-06-18 18:59:45 +00:00
|
|
|
winner = wc;
|
2018-07-27 23:49:33 +00:00
|
|
|
tries = g_maxTries;
|
2018-07-27 15:20:31 +00:00
|
|
|
bestStrategy = st;
|
|
|
|
} else {
|
|
|
|
st = nextStrategy(st, bestStrategy);
|
|
|
|
tries -= TRY_DECAY;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2018-07-20 21:35:09 +00:00
|
|
|
winner = optimizeFixedStrategy(buf, ctx, target, paramTarget, paramTarget.strategy,
|
2018-07-31 18:13:44 +00:00
|
|
|
varArray, varLen, allMT, g_maxTries);
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no solution found */
|
|
|
|
if(winner.result.cSize == (size_t)-1) {
|
2018-07-20 21:35:09 +00:00
|
|
|
ret = 1;
|
2018-06-18 18:59:45 +00:00
|
|
|
DISPLAY("No feasible solution found\n");
|
2018-07-20 21:35:09 +00:00
|
|
|
goto _cleanUp;
|
2018-06-18 18:59:45 +00:00
|
|
|
}
|
|
|
|
/* end summary */
|
2018-08-07 01:37:55 +00:00
|
|
|
BMK_printWinnerOpt(stdout, CUSTOM_LEVEL, winner.result, winner.params, target, buf.srcSize);
|
2018-06-18 18:59:45 +00:00
|
|
|
BMK_translateAdvancedParams(winner.params);
|
|
|
|
DISPLAY("grillParams size - optimizer completed \n");
|
|
|
|
|
2018-07-13 00:30:39 +00:00
|
|
|
}
|
|
|
|
_cleanUp:
|
2018-07-20 21:35:09 +00:00
|
|
|
freeContexts(ctx);
|
|
|
|
freeBuffers(buf);
|
2018-08-07 01:37:55 +00:00
|
|
|
freeMemoTableArray(allMT);
|
2018-07-13 00:30:39 +00:00
|
|
|
return ret;
|
2015-11-27 16:46:14 +00:00
|
|
|
}
|
|
|
|
|
2018-05-12 19:34:34 +00:00
|
|
|
static void errorOut(const char* msg)
|
|
|
|
{
|
|
|
|
DISPLAY("%s \n", msg); exit(1);
|
|
|
|
}
|
|
|
|
|
2018-05-12 00:32:26 +00:00
|
|
|
/*! readU32FromChar() :
|
|
|
|
* @return : unsigned integer value read from input in `char` format.
|
|
|
|
* allows and interprets K, KB, KiB, M, MB and MiB suffix.
|
|
|
|
* Will also modify `*stringPtr`, advancing it to position where it stopped reading.
|
|
|
|
* Note : function will exit() program if digit sequence overflows */
|
|
|
|
static unsigned readU32FromChar(const char** stringPtr)
|
|
|
|
{
|
2018-05-12 19:34:34 +00:00
|
|
|
const char errorMsg[] = "error: numeric value too large";
|
2018-05-12 00:32:26 +00:00
|
|
|
unsigned result = 0;
|
|
|
|
while ((**stringPtr >='0') && (**stringPtr <='9')) {
|
|
|
|
unsigned const max = (((unsigned)(-1)) / 10) - 1;
|
2018-05-12 19:34:34 +00:00
|
|
|
if (result > max) errorOut(errorMsg);
|
2018-05-12 00:32:26 +00:00
|
|
|
result *= 10, result += **stringPtr - '0', (*stringPtr)++ ;
|
|
|
|
}
|
|
|
|
if ((**stringPtr=='K') || (**stringPtr=='M')) {
|
|
|
|
unsigned const maxK = ((unsigned)(-1)) >> 10;
|
2018-05-12 19:34:34 +00:00
|
|
|
if (result > maxK) errorOut(errorMsg);
|
2018-05-12 00:32:26 +00:00
|
|
|
result <<= 10;
|
|
|
|
if (**stringPtr=='M') {
|
2018-05-12 19:34:34 +00:00
|
|
|
if (result > maxK) errorOut(errorMsg);
|
2018-05-12 00:32:26 +00:00
|
|
|
result <<= 10;
|
|
|
|
}
|
|
|
|
(*stringPtr)++; /* skip `K` or `M` */
|
|
|
|
if (**stringPtr=='i') (*stringPtr)++;
|
|
|
|
if (**stringPtr=='B') (*stringPtr)++;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2015-11-27 16:46:14 +00:00
|
|
|
|
2016-07-12 11:42:10 +00:00
|
|
|
static int usage(const char* exename)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
|
|
|
DISPLAY( "Usage :\n");
|
|
|
|
DISPLAY( " %s [arg] file\n", exename);
|
|
|
|
DISPLAY( "Arguments :\n");
|
2015-11-23 16:10:19 +00:00
|
|
|
DISPLAY( " file : path to the file used as reference (if none, generates a compressible sample)\n");
|
2015-10-25 23:06:36 +00:00
|
|
|
DISPLAY( " -H/-h : Help (this text + advanced options)\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-02-11 05:23:24 +00:00
|
|
|
static int usage_advanced(void)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
|
|
|
DISPLAY( "\nAdvanced options :\n");
|
2018-07-20 21:35:09 +00:00
|
|
|
DISPLAY( " -T# : set level 1 speed objective \n");
|
|
|
|
DISPLAY( " -B# : cut input into blocks of size # (default : single block) \n");
|
|
|
|
DISPLAY( " -i# : iteration loops (default : %i) \n", NBLOOPS);
|
|
|
|
DISPLAY( " --optimize= : same as -O with more verbose syntax (see README.md)\n");
|
|
|
|
DISPLAY( " -S : Single run \n");
|
|
|
|
DISPLAY( " --zstd : Single run, parameter selection same as zstdcli \n");
|
|
|
|
DISPLAY( " -P# : generated sample compressibility (default : %.1f%%) \n", COMPRESSIBILITY_DEFAULT * 100);
|
|
|
|
DISPLAY( " -t# : Caps runtime of operation in seconds (default : %u seconds (%.1f hours)) \n", (U32)g_grillDuration_s, g_grillDuration_s / 3600);
|
|
|
|
DISPLAY( " -v : Prints Benchmarking output\n");
|
|
|
|
DISPLAY( " -D : Next argument dictionary file\n");
|
2018-07-31 00:42:46 +00:00
|
|
|
DISPLAY( " -s : Seperate Files\n");
|
2015-10-25 23:06:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-12 11:42:10 +00:00
|
|
|
static int badusage(const char* exename)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
|
|
|
DISPLAY("Wrong parameters\n");
|
|
|
|
usage(exename);
|
2015-10-27 01:59:12 +00:00
|
|
|
return 1;
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
|
2018-08-07 18:56:14 +00:00
|
|
|
#define PARSE_SUB_ARGS(stringLong, stringShort, variable) { if (longCommandWArg(&argument, stringLong) || longCommandWArg(&argument, stringShort)) { variable = readU32FromChar(&argument); if (argument[0]==',') { argument++; continue; } else break; } }
|
2018-07-25 18:37:20 +00:00
|
|
|
#define PARSE_CPARAMS(variable) \
|
|
|
|
{ \
|
2018-07-31 18:13:44 +00:00
|
|
|
PARSE_SUB_ARGS("windowLog=", "wlog=", variable.windowLog); \
|
|
|
|
PARSE_SUB_ARGS("chainLog=" , "clog=", variable.chainLog); \
|
|
|
|
PARSE_SUB_ARGS("hashLog=", "hlog=", variable.hashLog); \
|
|
|
|
PARSE_SUB_ARGS("searchLog=" , "slog=", variable.searchLog); \
|
|
|
|
PARSE_SUB_ARGS("searchLength=", "slen=", variable.searchLength); \
|
|
|
|
PARSE_SUB_ARGS("targetLength=" , "tlen=", variable.targetLength); \
|
|
|
|
PARSE_SUB_ARGS("strategy=", "strat=", variable.strategy); \
|
2018-08-07 18:56:14 +00:00
|
|
|
}
|
|
|
|
|
2016-07-12 11:42:10 +00:00
|
|
|
int main(int argc, const char** argv)
|
2015-10-25 23:06:36 +00:00
|
|
|
{
|
|
|
|
int i,
|
|
|
|
filenamesStart=0,
|
|
|
|
result;
|
2016-07-12 11:42:10 +00:00
|
|
|
const char* exename=argv[0];
|
2018-07-20 21:35:09 +00:00
|
|
|
const char* input_filename = NULL;
|
|
|
|
const char* dictFileName = NULL;
|
2015-10-25 23:06:36 +00:00
|
|
|
U32 main_pause = 0;
|
2018-07-31 00:42:46 +00:00
|
|
|
int cLevel = 0;
|
|
|
|
int seperateFiles = 0;
|
2018-06-06 23:19:09 +00:00
|
|
|
|
2018-07-30 18:30:38 +00:00
|
|
|
constraint_t target = { 0, 0, (U32)-1 };
|
2018-07-25 00:26:21 +00:00
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
ZSTD_compressionParameters paramTarget = emptyParams();
|
|
|
|
g_params = emptyParams();
|
2018-07-13 00:30:39 +00:00
|
|
|
|
2018-07-27 23:49:33 +00:00
|
|
|
assert(argc>=1); /* for exename */
|
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
/* Welcome message */
|
|
|
|
DISPLAY(WELCOME_MESSAGE);
|
|
|
|
|
2016-04-08 00:02:12 +00:00
|
|
|
for(i=1; i<argc; i++) {
|
2016-07-12 11:42:10 +00:00
|
|
|
const char* argument = argv[i];
|
2018-07-27 23:49:33 +00:00
|
|
|
DEBUGOUTPUT("%d: ", i);
|
|
|
|
DEBUGOUTPUT("%s\n", argument);
|
2018-07-20 21:35:09 +00:00
|
|
|
|
2018-05-12 00:32:26 +00:00
|
|
|
assert(argument != NULL);
|
2015-10-27 12:12:25 +00:00
|
|
|
|
|
|
|
if(!strcmp(argument,"--no-seed")) { g_noSeed = 1; continue; }
|
2015-10-25 23:06:36 +00:00
|
|
|
|
2018-06-06 23:19:09 +00:00
|
|
|
if (longCommandWArg(&argument, "--optimize=")) {
|
2018-07-27 21:19:55 +00:00
|
|
|
g_optimizer = 1;
|
2018-06-06 23:19:09 +00:00
|
|
|
for ( ; ;) {
|
2018-08-07 18:56:14 +00:00
|
|
|
PARSE_CPARAMS(paramTarget);
|
|
|
|
PARSE_SUB_ARGS("compressionSpeed=" , "cSpeed=", target.cSpeed);
|
|
|
|
PARSE_SUB_ARGS("decompressionSpeed=", "dSpeed=", target.dSpeed);
|
|
|
|
PARSE_SUB_ARGS("compressionMemory=" , "cMem=", target.cMem);
|
2018-07-25 18:37:20 +00:00
|
|
|
PARSE_SUB_ARGS("strict=", "stc=", g_strictness);
|
2018-07-27 18:47:14 +00:00
|
|
|
PARSE_SUB_ARGS("preferSpeed=", "prfSpd=", g_speedMultiplier);
|
|
|
|
PARSE_SUB_ARGS("preferRatio=", "prfRto=", g_ratioMultiplier);
|
2018-07-31 00:42:46 +00:00
|
|
|
PARSE_SUB_ARGS("maxTries=", "tries=", g_maxTries);
|
2018-08-13 23:38:51 +00:00
|
|
|
if (longCommandWArg(&argument, "level=") || longCommandWArg(&argument, "lvl=")) { cLevel = readU32FromChar(&argument); g_optmode = 1; if (argument[0]==',') { argument++; continue; } else break; }
|
2018-07-27 18:47:14 +00:00
|
|
|
|
2018-06-06 23:19:09 +00:00
|
|
|
DISPLAY("invalid optimization parameter \n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argument[0] != 0) {
|
|
|
|
DISPLAY("invalid --optimize= format\n");
|
|
|
|
return 1; /* check the end of string */
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
} else if (longCommandWArg(&argument, "--zstd=")) {
|
2015-10-26 14:45:58 +00:00
|
|
|
/* Decode command (note : aggregated commands are allowed) */
|
2018-06-01 19:39:39 +00:00
|
|
|
g_singleRun = 1;
|
2018-07-31 00:42:46 +00:00
|
|
|
cLevel = 2;
|
2018-06-01 19:39:39 +00:00
|
|
|
for ( ; ;) {
|
2018-08-07 18:56:14 +00:00
|
|
|
PARSE_CPARAMS(g_params)
|
2018-07-31 00:42:46 +00:00
|
|
|
if (longCommandWArg(&argument, "level=") || longCommandWArg(&argument, "lvl=")) { cLevel = readU32FromChar(&argument); g_params = emptyParams(); if (argument[0]==',') { argument++; continue; } else break; }
|
|
|
|
|
2018-06-01 19:39:39 +00:00
|
|
|
DISPLAY("invalid compression parameter \n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-06-01 20:54:08 +00:00
|
|
|
if (argument[0] != 0) {
|
2018-06-01 21:27:53 +00:00
|
|
|
DISPLAY("invalid --zstd= format\n");
|
2018-06-01 20:54:08 +00:00
|
|
|
return 1; /* check the end of string */
|
|
|
|
}
|
2018-06-06 23:19:09 +00:00
|
|
|
continue;
|
2018-06-04 23:32:37 +00:00
|
|
|
/* if not return, success */
|
2018-06-01 19:39:39 +00:00
|
|
|
} else if (argument[0]=='-') {
|
2015-10-27 01:59:12 +00:00
|
|
|
argument++;
|
|
|
|
|
2016-02-10 12:37:52 +00:00
|
|
|
while (argument[0]!=0) {
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
switch(argument[0])
|
|
|
|
{
|
|
|
|
/* Display help on usage */
|
|
|
|
case 'h' :
|
|
|
|
case 'H': usage(exename); usage_advanced(); return 0;
|
|
|
|
|
|
|
|
/* Pause at the end (hidden option) */
|
2015-10-27 01:59:12 +00:00
|
|
|
case 'p': main_pause = 1; argument++; break;
|
2015-10-25 23:06:36 +00:00
|
|
|
/* Modify Nb Iterations */
|
2018-06-04 23:32:37 +00:00
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
case 'i':
|
2015-10-27 01:59:12 +00:00
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_nbIterations = readU32FromChar(&argument);
|
2015-10-25 23:06:36 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Sample compressibility (when no file provided) */
|
|
|
|
case 'P':
|
2015-10-27 01:59:12 +00:00
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
{ U32 const proba32 = readU32FromChar(&argument);
|
2015-10-25 23:06:36 +00:00
|
|
|
g_compressibility = (double)proba32 / 100.;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2015-10-27 01:59:12 +00:00
|
|
|
/* Run Single conf */
|
|
|
|
case 'S':
|
2015-10-30 14:49:48 +00:00
|
|
|
g_singleRun = 1;
|
|
|
|
argument++;
|
2016-03-30 18:42:19 +00:00
|
|
|
g_params = ZSTD_getCParams(2, g_blockSize, 0);
|
2016-02-10 12:37:52 +00:00
|
|
|
for ( ; ; ) {
|
2015-10-30 14:49:48 +00:00
|
|
|
switch(*argument)
|
|
|
|
{
|
|
|
|
case 'w':
|
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_params.windowLog = readU32FromChar(&argument);
|
2015-10-30 14:49:48 +00:00
|
|
|
continue;
|
|
|
|
case 'c':
|
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_params.chainLog = readU32FromChar(&argument);
|
2015-10-30 14:49:48 +00:00
|
|
|
continue;
|
|
|
|
case 'h':
|
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_params.hashLog = readU32FromChar(&argument);
|
2015-10-30 14:49:48 +00:00
|
|
|
continue;
|
|
|
|
case 's':
|
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_params.searchLog = readU32FromChar(&argument);
|
2015-10-30 14:49:48 +00:00
|
|
|
continue;
|
2015-11-01 11:40:22 +00:00
|
|
|
case 'l': /* search length */
|
2015-10-30 14:49:48 +00:00
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_params.searchLength = readU32FromChar(&argument);
|
2015-10-30 14:49:48 +00:00
|
|
|
continue;
|
2016-02-11 05:23:24 +00:00
|
|
|
case 't': /* target length */
|
2015-11-01 11:40:22 +00:00
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_params.targetLength = readU32FromChar(&argument);
|
2016-02-11 05:23:24 +00:00
|
|
|
continue;
|
|
|
|
case 'S': /* strategy */
|
|
|
|
argument++;
|
2018-05-12 02:43:08 +00:00
|
|
|
g_params.strategy = (ZSTD_strategy)readU32FromChar(&argument);
|
2015-11-01 11:40:22 +00:00
|
|
|
continue;
|
2015-10-30 14:49:48 +00:00
|
|
|
case 'L':
|
2018-08-13 23:15:34 +00:00
|
|
|
{ argument++;
|
2018-07-31 00:42:46 +00:00
|
|
|
cLevel = readU32FromChar(&argument);
|
|
|
|
g_params = emptyParams();
|
2015-10-30 14:49:48 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
default : ;
|
|
|
|
}
|
2015-10-27 01:59:12 +00:00
|
|
|
break;
|
|
|
|
}
|
2018-06-01 19:39:39 +00:00
|
|
|
|
2015-10-30 14:49:48 +00:00
|
|
|
break;
|
2015-10-27 01:59:12 +00:00
|
|
|
|
2015-11-05 17:16:59 +00:00
|
|
|
/* target level1 speed objective, in MB/s */
|
2015-10-27 11:18:00 +00:00
|
|
|
case 'T':
|
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_target = readU32FromChar(&argument);
|
2015-10-27 11:18:00 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* cut input into blocks */
|
|
|
|
case 'B':
|
2016-04-08 00:02:12 +00:00
|
|
|
argument++;
|
2018-05-12 00:32:26 +00:00
|
|
|
g_blockSize = readU32FromChar(&argument);
|
2016-04-08 00:02:12 +00:00
|
|
|
DISPLAY("using %u KB block size \n", g_blockSize>>10);
|
2015-10-27 11:18:00 +00:00
|
|
|
break;
|
|
|
|
|
2018-06-04 23:32:37 +00:00
|
|
|
/* caps runtime (in seconds) */
|
|
|
|
case 't':
|
|
|
|
argument++;
|
|
|
|
g_grillDuration_s = (double)readU32FromChar(&argument);
|
|
|
|
break;
|
|
|
|
|
2018-07-31 00:42:46 +00:00
|
|
|
case 's':
|
|
|
|
seperateFiles = 1;
|
|
|
|
break;
|
|
|
|
|
2018-07-10 01:37:54 +00:00
|
|
|
/* load dictionary file (only applicable for optimizer rn) */
|
|
|
|
case 'D':
|
2018-07-30 18:30:38 +00:00
|
|
|
if(i == argc - 1) { /* last argument, return error. */
|
2018-07-20 21:35:09 +00:00
|
|
|
DISPLAY("Dictionary file expected but not given : %d\n", i);
|
2018-07-10 01:37:54 +00:00
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
i++;
|
|
|
|
dictFileName = argv[i];
|
2018-07-20 21:35:09 +00:00
|
|
|
argument += strlen(argument);
|
2018-07-10 01:37:54 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2015-10-25 23:06:36 +00:00
|
|
|
/* Unknown command */
|
2015-10-27 01:59:12 +00:00
|
|
|
default : return badusage(exename);
|
2015-10-25 23:06:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
continue;
|
2016-04-08 00:02:12 +00:00
|
|
|
} /* if (argument[0]=='-') */
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
/* first provided filename is input */
|
|
|
|
if (!input_filename) { input_filename=argument; filenamesStart=i; continue; }
|
|
|
|
}
|
2018-05-12 02:43:08 +00:00
|
|
|
if (filenamesStart==0) {
|
2018-07-27 21:19:55 +00:00
|
|
|
if (g_optimizer) {
|
2018-06-04 20:38:37 +00:00
|
|
|
DISPLAY("Optimizer Expects File\n");
|
2018-06-02 01:02:56 +00:00
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
result = benchSample();
|
|
|
|
}
|
2018-05-12 02:43:08 +00:00
|
|
|
} else {
|
2018-07-31 00:42:46 +00:00
|
|
|
if(seperateFiles) {
|
|
|
|
for(i = 0; i < argc - filenamesStart; i++) {
|
|
|
|
if (g_optimizer) {
|
|
|
|
result = optimizeForSize(argv+filenamesStart + i, 1, dictFileName, target, paramTarget, cLevel);
|
|
|
|
if(result) { DISPLAY("Error on File %d", i); return result; }
|
|
|
|
} else {
|
|
|
|
result = benchFiles(argv+filenamesStart + i, 1, dictFileName, cLevel);
|
|
|
|
if(result) { DISPLAY("Error on File %d", i); return result; }
|
|
|
|
}
|
|
|
|
}
|
2018-05-12 02:43:08 +00:00
|
|
|
} else {
|
2018-07-31 00:42:46 +00:00
|
|
|
if (g_optimizer) {
|
|
|
|
result = optimizeForSize(argv+filenamesStart, argc-filenamesStart, dictFileName, target, paramTarget, cLevel);
|
|
|
|
} else {
|
|
|
|
result = benchFiles(argv+filenamesStart, argc-filenamesStart, dictFileName, cLevel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-10-25 23:06:36 +00:00
|
|
|
|
|
|
|
if (main_pause) { int unused; printf("press enter...\n"); unused = getchar(); (void)unused; }
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|