diff --git a/_lzbench/compressors.cpp b/_lzbench/compressors.cpp index 741b49482156e961d58f8511c2d71b5eb67bab57..527457a5fe2d96ec3d1f3db191cea7ff9681a060 100644 --- a/_lzbench/compressors.cpp +++ b/_lzbench/compressors.cpp @@ -1710,8 +1710,8 @@ int64_t lzbench_zstd_compress(char *inbuf, size_t insize, char *outbuf, size_t o zstd_params->zparams.cParams.windowLog = windowLog; zstd_params->zparams.cParams.chainLog = windowLog + ((zstd_params->zparams.cParams.strategy == ZSTD_btlazy2) || (zstd_params->zparams.cParams.strategy == ZSTD_btopt) || (zstd_params->zparams.cParams.strategy == ZSTD_btultra)); } - res = ZSTD_compress_advanced(zstd_params->cctx, outbuf, outsize, inbuf, insize, NULL, 0, zstd_params->zparams); -// res = ZSTD_compressCCtx(zstd_params->cctx, outbuf, outsize, inbuf, insize, level); + // res = ZSTD_compress_advanced(zstd_params->cctx, outbuf, outsize, inbuf, insize, NULL, 0, zstd_params->zparams); + res = ZSTD_compressCCtx(zstd_params->cctx, outbuf, outsize, inbuf, insize, level); #else if (!zstd_params->cdict) return 0; res = ZSTD_compress_usingCDict(zstd_params->cctx, outbuf, outsize, inbuf, insize, zstd_params->cdict); @@ -1858,6 +1858,17 @@ int64_t lzbench_zstd_stream_decompress(char *inbuf, size_t insize, char *outbuf, ZSTD_freeDStream(zstdDStream); return dSize; } + +int64_t lzbench_zstd_simple_compress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t level, size_t, char*) +{ + return ZSTD_compress(outbuf, outsize, inbuf, insize, level); +} + +int64_t lzbench_zstd_simple_decompress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t, size_t, char*) +{ + return ZSTD_decompress(outbuf, outsize, inbuf, insize); +} + #endif diff --git a/_lzbench/compressors.h b/_lzbench/compressors.h index a4fa6bc5baed4893323725a1e80edacad4c5d6a3..476f4e4e041bc6ebce9b757b917f904275178ca5 100644 --- a/_lzbench/compressors.h +++ b/_lzbench/compressors.h @@ -480,6 +480,8 @@ int64_t lzbench_return_0(char *inbuf, size_t insize, char *outbuf, size_t outsiz int64_t lzbench_zstd_LDM_compress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t, size_t, char*); int64_t lzbench_zstd_stream_compress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t level, size_t, char*); int64_t lzbench_zstd_stream_decompress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t, size_t, char*); + int64_t lzbench_zstd_simple_compress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t level, size_t, char*); + int64_t lzbench_zstd_simple_decompress(char *inbuf, size_t insize, char *outbuf, size_t outsize, size_t, size_t, char*); #else #define lzbench_zstd_init NULL #define lzbench_zstd_deinit NULL diff --git a/_lzbench/lzbench.h b/_lzbench/lzbench.h index a1a4777325405b822bc4abaacee064d74b6773e0..80320e5e4b1eb3507417767a3c1092e40f2094fd 100644 --- a/_lzbench/lzbench.h +++ b/_lzbench/lzbench.h @@ -136,7 +136,7 @@ typedef struct -#define LZBENCH_COMPRESSOR_COUNT 74 +#define LZBENCH_COMPRESSOR_COUNT 75 static const compressor_desc_t comp_desc[LZBENCH_COMPRESSOR_COUNT] = { @@ -155,7 +155,7 @@ static const compressor_desc_t comp_desc[LZBENCH_COMPRESSOR_COUNT] = { "gipfeli", "2016-07-13", 0, 0, 0, 0, lzbench_gipfeli_compress, lzbench_gipfeli_decompress, NULL, NULL }, { "glza", "0.8", 0, 0, 0, 0, lzbench_glza_compress, lzbench_glza_decompress, NULL, NULL }, { "libdeflate", "1.9", 1, 12, 0, 0, lzbench_libdeflate_compress, lzbench_libdeflate_decompress, NULL, NULL }, - { "lz4", "1.9.4", 0, 0, 0, 0, lzbench_lz4_compress, lzbench_lz4_decompress, NULL, NULL }, + { "lz4", "1.9.4", 0, 0, 0, 0, lzbench_lz4_compress, lzbench_lz4_decompress, NULL, NULL }, { "lz4fast", "1.9.4", 1, 99, 0, 0, lzbench_lz4fast_compress, lzbench_lz4_decompress, NULL, NULL }, { "lz4hc", "1.9.4", 1, 12, 0, 0, lzbench_lz4hc_compress, lzbench_lz4_decompress, NULL, NULL }, { "lz4frame", "1.9.4", 1, 1, 0, 0, lzbench_lz4frame_compress, lzbench_lz4frame_decompress, NULL, NULL }, @@ -211,6 +211,7 @@ static const compressor_desc_t comp_desc[LZBENCH_COMPRESSOR_COUNT] = { "zstd22LDM", "1.5.5", 1, 22, 22, 0, lzbench_zstd_LDM_compress, lzbench_zstd_decompress, lzbench_zstd_LDM_init, lzbench_zstd_deinit }, { "zstd24LDM", "1.5.5", 1, 22, 24, 0, lzbench_zstd_LDM_compress, lzbench_zstd_decompress, lzbench_zstd_LDM_init, lzbench_zstd_deinit }, { "zstd_stream", "1.5.2", 1, 4, 0, 0, lzbench_zstd_stream_compress, lzbench_zstd_stream_decompress, NULL, NULL }, + { "zstd_simple", "1.5.2", 1, 4, 0, 0, lzbench_zstd_simple_compress, lzbench_zstd_simple_decompress, NULL, NULL }, { "nakamichi", "okamigan", 0, 0, 0, 0, lzbench_nakamichi_compress, lzbench_nakamichi_decompress, NULL, NULL }, { "cudaMemcpy", "", 0, 0, 0, 0, lzbench_cuda_return_0, lzbench_cuda_memcpy, lzbench_cuda_init, lzbench_cuda_deinit }, { "nvcomp_lz4", "1.2.2", 0, 5, 0, 0, lzbench_nvcomp_compress, lzbench_nvcomp_decompress, lzbench_nvcomp_init, lzbench_nvcomp_deinit },