Merge branch 'dev' into benchfn

diff --cc programs/benchzstd.c
index 09f39cef51a8a1f8ba970b7a58cf94a5befd230e,4bd42cfe739bb982832598c0f5b79706c28aa7e9..8f3511919bc31ecf383708fd98fd5b1880ae8581
--- 1/programs/benchzstd.c
--- 2/programs/benchzstd.c
+++ b/programs/benchzstd.c
@@@ -178,12 -175,13 +179,13 @@@ BMK_initCCtx(ZSTD_CCtx* ctx
      CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_ldmHashLog, adv->ldmHashLog));
      CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_ldmBucketSizeLog, adv->ldmBucketSizeLog));
      CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_ldmHashRateLog, adv->ldmHashRateLog));
 -    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_windowLog, comprParams->windowLog));
 -    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_hashLog, comprParams->hashLog));
 -    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_chainLog, comprParams->chainLog));
 -    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_searchLog, comprParams->searchLog));
 -    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_minMatch, comprParams->minMatch));
 -    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_targetLength, comprParams->targetLength));
 +    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_windowLog, (int)comprParams->windowLog));
 +    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_hashLog, (int)comprParams->hashLog));
 +    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_chainLog, (int)comprParams->chainLog));
 +    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_searchLog, (int)comprParams->searchLog));
 +    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_minMatch, (int)comprParams->minMatch));
 +    CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_targetLength, (int)comprParams->targetLength));
+     CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_literalCompressionMode, (int)adv->literalCompressionMode));
      CHECK_Z(ZSTD_CCtx_setParameter(ctx, ZSTD_c_strategy, comprParams->strategy));
      CHECK_Z(ZSTD_CCtx_loadDictionary(ctx, dictBuffer, dictBufferSize));
  }

diff --cc programs/benchzstd.h
index fd7c54f5a54424cdf4eb37d25813b80ccb92acf7,d6f5486ab1f2d7bf8066017fc0360503261a214b..376a80a90a06c672ed16b5a6588662e3427b18d1
--- 1/programs/benchzstd.h
--- 2/programs/benchzstd.h
+++ b/programs/benchzstd.h
@@@ -105,17 -105,18 +105,18 @@@ typedef enum 
  } BMK_mode_t;
  
  typedef struct {
 -    BMK_mode_t mode;            /* 0: all, 1: compress only 2: decode only */
 -    unsigned nbSeconds;         /* default timing is in nbSeconds */
 -    size_t blockSize;           /* Maximum size of each block*/
 -    unsigned nbWorkers;         /* multithreading */
 -    unsigned realTime;          /* real time priority */
 -    int additionalParam;        /* used by python speed benchmark */
 -    unsigned ldmFlag;           /* enables long distance matching */
 -    unsigned ldmMinMatch;       /* below: parameters for long distance matching, see zstd.1.md */
 -    unsigned ldmHashLog;
 -    unsigned ldmBucketSizeLog;
 -    unsigned ldmHashRateLog;
 +    BMK_mode_t mode;        /* 0: all, 1: compress only 2: decode only */
 +    unsigned nbSeconds;     /* default timing is in nbSeconds */
 +    size_t blockSize;       /* Maximum size of each block*/
 +    int nbWorkers;          /* multithreading */
 +    unsigned realTime;      /* real time priority */
 +    int additionalParam;    /* used by python speed benchmark */
 +    int ldmFlag;            /* enables long distance matching */
 +    int ldmMinMatch;        /* below: parameters for long distance matching, see zstd.1.md */
 +    int ldmHashLog;
 +    int ldmBucketSizeLog;
 +    int ldmHashRateLog;
+     ZSTD_literalCompressionMode_e literalCompressionMode;
  } BMK_advancedParams_t;
  
  /* returns default parameters used by nonAdvanced functions */

diff --cc programs/zstdcli.c
Simple merge