facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed ZBUFF_* by ZSTD_*Stream() within fullbench,

Browse Source 
in anticipation of future deprecation of ZBUFF_*.
This commit is contained in:
Yann Collet 2016-10-28 15:17:38 -07:00
parent b9550d6d43
commit 589f011761
2 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Makefile
View File

@ -79,10 +79,10 @@ zstd32:
zstd_nolegacy: zstd_nolegacy:
$(MAKE) -C $(PRGDIR) $@ $(MAKE) -C $(PRGDIR) $@
fullbench : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c fullbench.c fullbench : $(ZSTD_FILES) $(PRGDIR)/datagen.c fullbench.c
$(CC) $(FLAGS) $^ -o $@$(EXT) $(CC) $(FLAGS) $^ -o $@$(EXT)
fullbench32 : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c fullbench.c fullbench32 : $(ZSTD_FILES) $(PRGDIR)/datagen.c fullbench.c
$(CC) -m32 $(FLAGS) $^ -o $@$(EXT) $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
fuzzer : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder fuzzer : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder

57
tests/fullbench.c
View File

@ -22,7 +22,6 @@
#include "zstd.h" /* ZSTD_VERSION_STRING */ #include "zstd.h" /* ZSTD_VERSION_STRING */
#define FSE_STATIC_LINKING_ONLY /* FSE_DTABLE_SIZE_U32 */ #define FSE_STATIC_LINKING_ONLY /* FSE_DTABLE_SIZE_U32 */
#include "fse.h" #include "fse.h"
#include "zbuff.h"
#include "datagen.h" #include "datagen.h"
@ -130,29 +129,39 @@ size_t local_ZSTD_decodeSeqHeaders(void* dst, size_t dstSize, void* buff2, const
} }
static ZBUFF_CCtx* g_zbcc = NULL; static ZSTD_CStream* g_cstream= NULL;
size_t local_ZBUFF_compress(void* dst, size_t dstCapacity, void* buff2, const void* src, size_t srcSize) size_t local_ZSTD_compressStream(void* dst, size_t dstCapacity, void* buff2, const void* src, size_t srcSize)
{ {
size_t compressedSize; ZSTD_outBuffer buffOut;
size_t srcRead = srcSize, dstWritten = dstCapacity; ZSTD_inBuffer buffIn;
(void)buff2; (void)buff2;
ZBUFF_compressInit(g_zbcc, 1); ZSTD_initCStream(g_cstream, 1);
ZBUFF_compressContinue(g_zbcc, dst, &dstWritten, src, &srcRead); buffOut.dst = dst;
compressedSize = dstWritten; buffOut.size = dstCapacity;
dstWritten = dstCapacity-compressedSize; buffOut.pos = 0;
ZBUFF_compressEnd(g_zbcc, ((char*)dst)+compressedSize, &dstWritten); buffIn.src = src;
compressedSize += dstWritten; buffIn.size = srcSize;
return compressedSize; buffIn.pos = 0;
ZSTD_compressStream(g_cstream, &buffOut, &buffIn);
ZSTD_endStream(g_cstream, &buffOut);
return buffOut.pos;
} }
static ZBUFF_DCtx* g_zbdc = NULL; static ZSTD_DStream* g_dstream= NULL;
static size_t local_ZBUFF_decompress(void* dst, size_t dstCapacity, void* buff2, const void* src, size_t srcSize) static size_t local_ZSTD_decompressStream(void* dst, size_t dstCapacity, void* buff2, const void* src, size_t srcSize)
{ {
size_t srcRead = g_cSize, dstWritten = dstCapacity; ZSTD_outBuffer buffOut;
ZSTD_inBuffer buffIn;
(void)src; (void)srcSize; (void)src; (void)srcSize;
ZBUFF_decompressInit(g_zbdc); ZSTD_initDStream(g_dstream);
ZBUFF_decompressContinue(g_zbdc, dst, &dstWritten, buff2, &srcRead); buffOut.dst = dst;
return dstWritten; buffOut.size = dstCapacity;
buffOut.pos = 0;
buffIn.src = buff2;
buffIn.size = g_cSize;
buffIn.pos = 0;
ZSTD_decompressStream(g_dstream, &buffOut, &buffIn);
return buffOut.pos;
} }
static ZSTD_CCtx* g_zcc = NULL; static ZSTD_CCtx* g_zcc = NULL;
@ -220,10 +229,10 @@ static size_t benchMem(const void* src, size_t srcSize, U32 benchNb)
benchFunction = local_ZSTD_decodeSeqHeaders; benchName = "ZSTD_decodeSeqHeaders"; benchFunction = local_ZSTD_decodeSeqHeaders; benchName = "ZSTD_decodeSeqHeaders";
break; break;
case 41: case 41:
benchFunction = local_ZBUFF_compress; benchName = "ZBUFF_compressContinue"; benchFunction = local_ZSTD_compressStream; benchName = "ZSTD_compressStream";
break; break;
case 42: case 42:
benchFunction = local_ZBUFF_decompress; benchName = "ZBUFF_decompressContinue"; benchFunction = local_ZSTD_decompressStream; benchName = "ZSTD_decompressStream";
break; break;
default : default :
return 0; return 0;
@ -296,10 +305,10 @@ static size_t benchMem(const void* src, size_t srcSize, U32 benchNb)
break; break;
} }
case 41 : case 41 :
if (g_zbcc==NULL) g_zbcc = ZBUFF_createCCtx(); if (g_cstream==NULL) g_cstream = ZSTD_createCStream();
break; break;
case 42 : case 42 :
if (g_zbdc==NULL) g_zbdc = ZBUFF_createDCtx(); if (g_dstream==NULL) g_dstream = ZSTD_createDStream();
g_cSize = ZSTD_compress(buff2, dstBuffSize, src, srcSize, 1); g_cSize = ZSTD_compress(buff2, dstBuffSize, src, srcSize, 1);
break; break;
@ -331,7 +340,7 @@ static size_t benchMem(const void* src, size_t srcSize, U32 benchNb)
averageTime = (((double)BMK_clockSpan(clockStart)) / CLOCKS_PER_SEC) / nbRounds; averageTime = (((double)BMK_clockSpan(clockStart)) / CLOCKS_PER_SEC) / nbRounds;
if (averageTime < bestTime) bestTime = averageTime; if (averageTime < bestTime) bestTime = averageTime;
DISPLAY("%2i- %-30.30s : %7.1f MB/s (%9u)\r", loopNb, benchName, (double)srcSize / (1 MB) / bestTime, (U32)benchResult); DISPLAY("%2i- %-30.30s : %7.1f MB/s (%9u)\r", loopNb, benchName, (double)srcSize / (1 MB) / bestTime, (U32)benchResult);
}} } }
DISPLAY("%2u\n", benchNb); DISPLAY("%2u\n", benchNb);
_cleanOut: _cleanOut:
@ -466,7 +475,7 @@ int main(int argc, const char** argv)
switch(argument[0]) switch(argument[0])
{ {
/* Display help on usage */ /* Display help on usage */
case 'h' : case 'h':
case 'H': return usage_advanced(exename); case 'H': return usage_advanced(exename);
/* Pause at the end (hidden option) */ /* Pause at the end (hidden option) */