diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2020-05-23 20:37:33 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2020-05-23 20:37:33 +0000 |
| commit | bc64b5ce191d48b503e4fad8c0cefb774a2fa969 (patch) | |
| tree | 9b41925d7159f1f57c1b59a1a5f887c80a57e999 /programs/benchzstd.c | |
| parent | ea68403922c3b53b00fc999fcb3eaef1feb50177 (diff) | |
Notes
Diffstat (limited to 'programs/benchzstd.c')
| -rw-r--r-- | programs/benchzstd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/programs/benchzstd.c b/programs/benchzstd.c index 7439677c7f3ec..77056203d55ea 100644 --- a/programs/benchzstd.c +++ b/programs/benchzstd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. + * Copyright (c) 2016-2020, Yann Collet, Facebook, Inc. * All rights reserved. * * This source code is licensed under both the BSD-style license (found in the @@ -30,13 +30,13 @@ #include "timefn.h" /* UTIL_time_t */ #include "benchfn.h" -#include "mem.h" +#include "../lib/common/mem.h" #define ZSTD_STATIC_LINKING_ONLY -#include "zstd.h" +#include "../lib/zstd.h" #include "datagen.h" /* RDG_genBuffer */ -#include "xxhash.h" +#include "../lib/common/xxhash.h" #include "benchzstd.h" -#include "zstd_errors.h" +#include "../lib/common/zstd_errors.h" /* ************************************* @@ -375,7 +375,6 @@ BMK_benchMemAdvancedNoAlloc( resPtr += thisBlockSize; remaining -= thisBlockSize; if (adv->mode == BMK_decodeOnly) { - assert(nbBlocks==0); cSizes[nbBlocks] = thisBlockSize; benchResult.cSize = thisBlockSize; } @@ -483,7 +482,7 @@ BMK_benchMemAdvancedNoAlloc( { int const ratioAccuracy = (ratio < 10.) ? 3 : 2; DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.*f),%6.*f MB/s ,%6.1f MB/s \r", marks[markNb], displayName, - (unsigned)srcSize, (unsigned)benchResult.cSize, + (unsigned)srcSize, (unsigned)cSize, ratioAccuracy, ratio, benchResult.cSpeed < (10 MB) ? 2 : 1, (double)benchResult.cSpeed / MB_UNIT, (double)benchResult.dSpeed / MB_UNIT); |