From 553f67e0c1f62c06a5e9e6efc1016feb8bb7b398 Mon Sep 17 00:00:00 2001 From: Sean Purcell Date: Thu, 2 Mar 2017 15:15:31 -0800 Subject: [PATCH] Remove 'generic' inline strategy Seems to avoid performance loss for compression. Same strategy tested on decompression side, did not appear to improve speed. --- lib/compress/zstd_compress.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 5d81f8a38..6b8047206 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -576,11 +576,11 @@ void ZSTD_seqToCodes(const seqStore_t* seqStorePtr) mlCodeTable[seqStorePtr->longLengthPos] = MaxML; } - -FORCE_INLINE size_t ZSTD_compressSequences_generic (ZSTD_CCtx* zc, +MEM_STATIC size_t ZSTD_compressSequences (ZSTD_CCtx* zc, void* dst, size_t dstCapacity, - size_t srcSize, int const longOffsets) + size_t srcSize) { + const int longOffsets = zc->params.cParams.windowLog > STREAM_ACCUMULATOR_MIN; const seqStore_t* seqStorePtr = &(zc->seqStore); U32 count[MaxSeq+1]; S16 norm[MaxSeq+1]; @@ -782,17 +782,6 @@ _check_compressibility: return op - ostart; } -FORCE_INLINE size_t ZSTD_compressSequences (ZSTD_CCtx* zc, - void* dst, size_t dstCapacity, - size_t srcSize) -{ - if (zc->params.cParams.windowLog > STREAM_ACCUMULATOR_MIN) { - return ZSTD_compressSequences_generic(zc, dst, dstCapacity, srcSize, 1); - } else { - return ZSTD_compressSequences_generic(zc, dst, dstCapacity, srcSize, 0); - } -} - #if 0 /* for debug */ # define STORESEQ_DEBUG #include /* fprintf */ -- 2.47.2