Yann Collet | 4ded9e5 | 2016-08-30 10:04:33 -0700 | [diff] [blame] | 1 | /** |
| 2 | * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. |
| 3 | * All rights reserved. |
| 4 | * |
| 5 | * This source code is licensed under the BSD-style license found in the |
| 6 | * LICENSE file in the root directory of this source tree. An additional grant |
| 7 | * of patent rights can be found in the PATENTS file in the same directory. |
| 8 | */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 9 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 10 | |
Przemyslaw Skibinski | 2f6ccee | 2016-12-21 13:23:34 +0100 | [diff] [blame] | 11 | |
| 12 | /* ************************************** |
Yann Collet | 500014a | 2017-01-19 16:59:56 -0800 | [diff] [blame] | 13 | * Tuning parameters |
| 14 | ****************************************/ |
| 15 | #ifndef BMK_TIMETEST_DEFAULT_S /* default minimum time per test */ |
| 16 | #define BMK_TIMETEST_DEFAULT_S 3 |
| 17 | #endif |
| 18 | |
| 19 | |
| 20 | /* ************************************** |
Przemyslaw Skibinski | 2f6ccee | 2016-12-21 13:23:34 +0100 | [diff] [blame] | 21 | * Compiler Warnings |
| 22 | ****************************************/ |
| 23 | #ifdef _MSC_VER |
Przemyslaw Skibinski | 2f6ccee | 2016-12-21 13:23:34 +0100 | [diff] [blame] | 24 | # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ |
| 25 | #endif |
| 26 | |
| 27 | |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 28 | /* ************************************* |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 29 | * Includes |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 30 | ***************************************/ |
Przemyslaw Skibinski | 7a8a03c | 2016-12-21 15:08:44 +0100 | [diff] [blame] | 31 | #include "platform.h" /* Large Files support */ |
Przemyslaw Skibinski | 2f6ccee | 2016-12-21 13:23:34 +0100 | [diff] [blame] | 32 | #include "util.h" /* UTIL_getFileSize, UTIL_sleep */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 33 | #include <stdlib.h> /* malloc, free */ |
| 34 | #include <string.h> /* memset */ |
Yann Collet | c6a6417 | 2016-12-31 03:31:26 +0100 | [diff] [blame] | 35 | #include <stdio.h> /* fprintf, fopen */ |
Yann Collet | 7ae67bb | 2016-09-06 06:28:05 +0200 | [diff] [blame] | 36 | #include <time.h> /* clock_t, clock, CLOCKS_PER_SEC */ |
inikep | 4c12f23 | 2016-03-29 14:52:13 +0200 | [diff] [blame] | 37 | |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 38 | #include "mem.h" |
Yann Collet | d3b7f8d | 2016-06-04 19:47:02 +0200 | [diff] [blame] | 39 | #define ZSTD_STATIC_LINKING_ONLY |
| 40 | #include "zstd.h" |
inikep | 69fcd7c | 2016-04-28 12:23:33 +0200 | [diff] [blame] | 41 | #include "datagen.h" /* RDG_genBuffer */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 42 | #include "xxhash.h" |
Nick Terrell | 83c387e | 2017-01-26 15:25:32 -0800 | [diff] [blame] | 43 | #include "zstdmt_compress.h" |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 44 | |
| 45 | |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 46 | /* ************************************* |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 47 | * Constants |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 48 | ***************************************/ |
inikep | f2f59d7 | 2016-06-22 15:42:26 +0200 | [diff] [blame] | 49 | #ifndef ZSTD_GIT_COMMIT |
inikep | d7d251c | 2016-06-22 16:13:25 +0200 | [diff] [blame] | 50 | # define ZSTD_GIT_COMMIT_STRING "" |
| 51 | #else |
| 52 | # define ZSTD_GIT_COMMIT_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_GIT_COMMIT) |
inikep | f2f59d7 | 2016-06-22 15:42:26 +0200 | [diff] [blame] | 53 | #endif |
| 54 | |
inikep | 83c76b4 | 2016-04-28 13:16:01 +0200 | [diff] [blame] | 55 | #define TIMELOOP_MICROSEC 1*1000000ULL /* 1 second */ |
| 56 | #define ACTIVEPERIOD_MICROSEC 70*1000000ULL /* 70 seconds */ |
| 57 | #define COOLPERIOD_SEC 10 |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 58 | |
| 59 | #define KB *(1 <<10) |
| 60 | #define MB *(1 <<20) |
| 61 | #define GB *(1U<<30) |
| 62 | |
Yann Collet | 87c18b2 | 2016-08-26 01:43:47 +0200 | [diff] [blame] | 63 | static const size_t maxMemory = (sizeof(size_t)==4) ? (2 GB - 64 MB) : (size_t)(1ULL << ((sizeof(size_t)*8)-31)); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 64 | |
| 65 | static U32 g_compressibilityDefault = 50; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 66 | |
| 67 | |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 68 | /* ************************************* |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 69 | * console display |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 70 | ***************************************/ |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 71 | #define DISPLAY(...) fprintf(stderr, __VA_ARGS__) |
| 72 | #define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); } |
Sean Purcell | 042ba12 | 2017-03-23 11:13:52 -0700 | [diff] [blame] | 73 | static int g_displayLevel = 2; /* 0 : no display; 1: errors; 2 : + result + interaction + warnings; 3 : + progression; 4 : + information */ |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 74 | |
Yann Collet | bf2bc11 | 2016-08-02 23:48:13 +0200 | [diff] [blame] | 75 | #define DISPLAYUPDATE(l, ...) if (g_displayLevel>=l) { \ |
| 76 | if ((clock() - g_time > refreshRate) || (g_displayLevel>=4)) \ |
| 77 | { g_time = clock(); DISPLAY(__VA_ARGS__); \ |
Sean Purcell | 042ba12 | 2017-03-23 11:13:52 -0700 | [diff] [blame] | 78 | if (g_displayLevel>=4) fflush(stderr); } } |
Yann Collet | bf2bc11 | 2016-08-02 23:48:13 +0200 | [diff] [blame] | 79 | static const clock_t refreshRate = CLOCKS_PER_SEC * 15 / 100; |
| 80 | static clock_t g_time = 0; |
| 81 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 82 | |
| 83 | /* ************************************* |
| 84 | * Exceptions |
| 85 | ***************************************/ |
| 86 | #ifndef DEBUG |
| 87 | # define DEBUG 0 |
| 88 | #endif |
Yann Collet | fe234bf | 2017-06-19 15:23:19 -0700 | [diff] [blame] | 89 | #define DEBUGOUTPUT(...) { if (DEBUG) DISPLAY(__VA_ARGS__); } |
| 90 | #define EXM_THROW(error, ...) { \ |
| 91 | DEBUGOUTPUT("%s: %i: \n", __FILE__, __LINE__); \ |
| 92 | DISPLAYLEVEL(1, "Error %i : ", error); \ |
| 93 | DISPLAYLEVEL(1, __VA_ARGS__); \ |
| 94 | DISPLAYLEVEL(1, " \n"); \ |
| 95 | exit(error); \ |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 96 | } |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 97 | |
| 98 | |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 99 | /* ************************************* |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 100 | * Benchmark Parameters |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 101 | ***************************************/ |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 102 | static int g_additionalParam = 0; |
| 103 | static U32 g_decodeOnly = 0; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 104 | |
inikep | 4e26bb6 | 2016-03-14 12:48:51 +0100 | [diff] [blame] | 105 | void BMK_setNotificationLevel(unsigned level) { g_displayLevel=level; } |
| 106 | |
inikep | eaba91a | 2016-03-23 20:30:26 +0100 | [diff] [blame] | 107 | void BMK_setAdditionalParam(int additionalParam) { g_additionalParam=additionalParam; } |
| 108 | |
Yann Collet | 500014a | 2017-01-19 16:59:56 -0800 | [diff] [blame] | 109 | static U32 g_nbSeconds = BMK_TIMETEST_DEFAULT_S; |
| 110 | void BMK_setNbSeconds(unsigned nbSeconds) |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 111 | { |
Przemyslaw Skibinski | 26306fc | 2016-11-03 11:38:01 +0100 | [diff] [blame] | 112 | g_nbSeconds = nbSeconds; |
Yann Collet | 500014a | 2017-01-19 16:59:56 -0800 | [diff] [blame] | 113 | DISPLAYLEVEL(3, "- test >= %u seconds per compression / decompression - \n", g_nbSeconds); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 114 | } |
| 115 | |
Yann Collet | 500014a | 2017-01-19 16:59:56 -0800 | [diff] [blame] | 116 | static size_t g_blockSize = 0; |
| 117 | void BMK_setBlockSize(size_t blockSize) |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 118 | { |
| 119 | g_blockSize = blockSize; |
Yann Collet | 500014a | 2017-01-19 16:59:56 -0800 | [diff] [blame] | 120 | if (g_blockSize) DISPLAYLEVEL(2, "using blocks of size %u KB \n", (U32)(blockSize>>10)); |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 121 | } |
| 122 | |
Yann Collet | ab7a579 | 2016-12-28 16:11:09 +0100 | [diff] [blame] | 123 | void BMK_setDecodeOnlyMode(unsigned decodeFlag) { g_decodeOnly = (decodeFlag>0); } |
| 124 | |
Yann Collet | 500014a | 2017-01-19 16:59:56 -0800 | [diff] [blame] | 125 | static U32 g_nbThreads = 1; |
| 126 | void BMK_setNbThreads(unsigned nbThreads) { |
| 127 | #ifndef ZSTD_MULTITHREAD |
| 128 | if (nbThreads > 1) DISPLAYLEVEL(2, "Note : multi-threading is disabled \n"); |
| 129 | #endif |
| 130 | g_nbThreads = nbThreads; |
| 131 | } |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 132 | |
Yann Collet | 3d93f2f | 2016-12-27 07:19:36 +0100 | [diff] [blame] | 133 | |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 134 | /* ******************************************************** |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 135 | * Bench functions |
Yann Collet | f3eca25 | 2015-10-22 15:31:46 +0100 | [diff] [blame] | 136 | **********************************************************/ |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 137 | typedef struct { |
| 138 | const void* srcPtr; |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 139 | size_t srcSize; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 140 | void* cPtr; |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 141 | size_t cRoom; |
| 142 | size_t cSize; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 143 | void* resPtr; |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 144 | size_t resSize; |
| 145 | } blockParam_t; |
| 146 | |
Yann Collet | 9990986 | 2016-04-09 16:17:18 +0200 | [diff] [blame] | 147 | |
Sean Purcell | f876f12 | 2017-04-13 12:33:45 -0700 | [diff] [blame] | 148 | |
Sean Purcell | 42bac7f | 2017-04-13 15:35:05 -0700 | [diff] [blame] | 149 | #undef MIN |
| 150 | #undef MAX |
| 151 | #define MIN(a,b) ((a) < (b) ? (a) : (b)) |
| 152 | #define MAX(a,b) ((a) > (b) ? (a) : (b)) |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 153 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 154 | static int BMK_benchMem(const void* srcBuffer, size_t srcSize, |
inikep | 472638c | 2016-03-23 12:28:28 +0100 | [diff] [blame] | 155 | const char* displayName, int cLevel, |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 156 | const size_t* fileSizes, U32 nbFiles, |
Przemyslaw Skibinski | 897b8bb | 2016-12-13 13:03:41 +0100 | [diff] [blame] | 157 | const void* dictBuffer, size_t dictBufferSize, |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 158 | const ZSTD_compressionParameters* comprParams) |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 159 | { |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 160 | size_t const blockSize = ((g_blockSize>=32 && !g_decodeOnly) ? g_blockSize : srcSize) + (!srcSize) /* avoid div by 0 */ ; |
Yann Collet | d64f435 | 2016-03-21 00:07:42 +0100 | [diff] [blame] | 161 | U32 const maxNbBlocks = (U32) ((srcSize + (blockSize-1)) / blockSize) + nbFiles; |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 162 | blockParam_t* const blockTable = (blockParam_t*) malloc(maxNbBlocks * sizeof(blockParam_t)); |
Yann Collet | b915140 | 2016-03-26 17:18:11 +0100 | [diff] [blame] | 163 | size_t const maxCompressedSize = ZSTD_compressBound(srcSize) + (maxNbBlocks * 1024); /* add some room for safety */ |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 164 | void* const compressedBuffer = malloc(maxCompressedSize); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 165 | void* resultBuffer = malloc(srcSize); |
Yann Collet | 458c8a9 | 2017-01-19 17:44:15 -0800 | [diff] [blame] | 166 | ZSTDMT_CCtx* const mtctx = ZSTDMT_createCCtx(g_nbThreads); |
Yann Collet | 3c242e7 | 2016-07-13 14:56:24 +0200 | [diff] [blame] | 167 | ZSTD_CCtx* const ctx = ZSTD_createCCtx(); |
| 168 | ZSTD_DCtx* const dctx = ZSTD_createDCtx(); |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 169 | size_t const loadedCompressedSize = srcSize; |
| 170 | size_t cSize = 0; |
| 171 | double ratio = 0.; |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 172 | U32 nbBlocks; |
Przemyslaw Skibinski | e052c60 | 2017-02-20 11:27:11 +0100 | [diff] [blame] | 173 | UTIL_freq_t ticksPerSecond; |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 174 | |
| 175 | /* checks */ |
Yann Collet | ec224d2 | 2016-06-27 13:39:30 +0200 | [diff] [blame] | 176 | if (!compressedBuffer || !resultBuffer || !blockTable || !ctx || !dctx) |
Yann Collet | 3d2cd7f | 2016-06-27 15:12:26 +0200 | [diff] [blame] | 177 | EXM_THROW(31, "allocation error : not enough memory"); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 178 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 179 | /* init */ |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 180 | if (strlen(displayName)>17) displayName += strlen(displayName)-17; /* display last 17 characters */ |
inikep | aaaf923 | 2016-05-09 16:19:25 +0200 | [diff] [blame] | 181 | UTIL_initTimer(&ticksPerSecond); |
inikep | 4c12f23 | 2016-03-29 14:52:13 +0200 | [diff] [blame] | 182 | |
Yann Collet | 5bde4be | 2017-03-29 12:10:38 -0700 | [diff] [blame] | 183 | if (g_decodeOnly) { /* benchmark only decompression : source must be already compressed */ |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 184 | const char* srcPtr = (const char*)srcBuffer; |
| 185 | U64 totalDSize64 = 0; |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 186 | U32 fileNb; |
| 187 | for (fileNb=0; fileNb<nbFiles; fileNb++) { |
Sean Purcell | 4e70971 | 2017-02-07 13:50:09 -0800 | [diff] [blame] | 188 | U64 const fSize64 = ZSTD_findDecompressedSize(srcPtr, fileSizes[fileNb]); |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 189 | if (fSize64==0) EXM_THROW(32, "Impossible to determine original size "); |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 190 | totalDSize64 += fSize64; |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 191 | srcPtr += fileSizes[fileNb]; |
| 192 | } |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 193 | { size_t const decodedSize = (size_t)totalDSize64; |
| 194 | if (totalDSize64 > decodedSize) EXM_THROW(32, "original size is too large"); /* size_t overflow */ |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 195 | free(resultBuffer); |
| 196 | resultBuffer = malloc(decodedSize); |
| 197 | if (!resultBuffer) EXM_THROW(33, "not enough memory"); |
| 198 | cSize = srcSize; |
| 199 | srcSize = decodedSize; |
| 200 | ratio = (double)srcSize / (double)cSize; |
| 201 | } } |
| 202 | |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 203 | /* Init blockTable data */ |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 204 | { const char* srcPtr = (const char*)srcBuffer; |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 205 | char* cPtr = (char*)compressedBuffer; |
| 206 | char* resPtr = (char*)resultBuffer; |
Yann Collet | 699b14d | 2016-03-17 19:37:33 +0100 | [diff] [blame] | 207 | U32 fileNb; |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 208 | for (nbBlocks=0, fileNb=0; fileNb<nbFiles; fileNb++) { |
Yann Collet | 7061135 | 2015-12-16 03:01:03 +0100 | [diff] [blame] | 209 | size_t remaining = fileSizes[fileNb]; |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 210 | U32 const nbBlocksforThisFile = g_decodeOnly ? 1 : (U32)((remaining + (blockSize-1)) / blockSize); |
Yann Collet | 699b14d | 2016-03-17 19:37:33 +0100 | [diff] [blame] | 211 | U32 const blockEnd = nbBlocks + nbBlocksforThisFile; |
Yann Collet | fd416f1 | 2016-01-30 03:14:15 +0100 | [diff] [blame] | 212 | for ( ; nbBlocks<blockEnd; nbBlocks++) { |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 213 | size_t const thisBlockSize = MIN(remaining, blockSize); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 214 | blockTable[nbBlocks].srcPtr = (const void*)srcPtr; |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 215 | blockTable[nbBlocks].srcSize = thisBlockSize; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 216 | blockTable[nbBlocks].cPtr = (void*)cPtr; |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 217 | blockTable[nbBlocks].cRoom = g_decodeOnly ? thisBlockSize : ZSTD_compressBound(thisBlockSize); |
| 218 | blockTable[nbBlocks].cSize = blockTable[nbBlocks].cRoom; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 219 | blockTable[nbBlocks].resPtr = (void*)resPtr; |
Sean Purcell | 4e70971 | 2017-02-07 13:50:09 -0800 | [diff] [blame] | 220 | blockTable[nbBlocks].resSize = g_decodeOnly ? (size_t) ZSTD_findDecompressedSize(srcPtr, thisBlockSize) : thisBlockSize; |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 221 | srcPtr += thisBlockSize; |
| 222 | cPtr += blockTable[nbBlocks].cRoom; |
| 223 | resPtr += thisBlockSize; |
| 224 | remaining -= thisBlockSize; |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 225 | } } } |
Yann Collet | 1c00dc3 | 2015-10-21 08:22:25 +0100 | [diff] [blame] | 226 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 227 | /* warmimg up memory */ |
Yann Collet | d062f13 | 2015-12-01 01:31:17 +0100 | [diff] [blame] | 228 | RDG_genBuffer(compressedBuffer, maxCompressedSize, 0.10, 0.50, 1); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 229 | |
| 230 | /* Bench */ |
inikep | 6d157f1 | 2016-04-15 16:54:11 +0200 | [diff] [blame] | 231 | { U64 fastestC = (U64)(-1LL), fastestD = (U64)(-1LL); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 232 | U64 const crcOrig = g_decodeOnly ? 0 : XXH64(srcBuffer, srcSize, 0); |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 233 | UTIL_time_t coolTime; |
Yann Collet | 4f5350f | 2016-11-29 13:12:24 -0800 | [diff] [blame] | 234 | U64 const maxTime = (g_nbSeconds * TIMELOOP_MICROSEC) + 1; |
Yann Collet | a9febe8 | 2016-08-01 13:37:17 +0200 | [diff] [blame] | 235 | U64 totalCTime=0, totalDTime=0; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 236 | U32 cCompleted=g_decodeOnly, dCompleted=0; |
Yann Collet | a9febe8 | 2016-08-01 13:37:17 +0200 | [diff] [blame] | 237 | # define NB_MARKS 4 |
| 238 | const char* const marks[NB_MARKS] = { " |", " /", " =", "\\" }; |
| 239 | U32 markNb = 0; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 240 | |
Yann Collet | f8804d1 | 2017-01-20 17:23:19 -0800 | [diff] [blame] | 241 | UTIL_getTime(&coolTime); |
inikep | 4e26bb6 | 2016-03-14 12:48:51 +0100 | [diff] [blame] | 242 | DISPLAYLEVEL(2, "\r%79s\r", ""); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 243 | while (!cCompleted || !dCompleted) { |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 244 | |
Yann Collet | 27d3dad | 2016-03-11 13:41:20 +0100 | [diff] [blame] | 245 | /* overheat protection */ |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 246 | if (UTIL_clockSpanMicro(coolTime, ticksPerSecond) > ACTIVEPERIOD_MICROSEC) { |
Yann Collet | 235911e | 2016-07-31 01:32:48 +0200 | [diff] [blame] | 247 | DISPLAYLEVEL(2, "\rcooling down ... \r"); |
inikep | 83c76b4 | 2016-04-28 13:16:01 +0200 | [diff] [blame] | 248 | UTIL_sleep(COOLPERIOD_SEC); |
cyan4973 | 5fba09f | 2017-01-20 12:23:30 -0800 | [diff] [blame] | 249 | UTIL_getTime(&coolTime); |
Yann Collet | 27d3dad | 2016-03-11 13:41:20 +0100 | [diff] [blame] | 250 | } |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 251 | |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 252 | if (!g_decodeOnly) { |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 253 | UTIL_time_t clockStart; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 254 | /* Compression */ |
| 255 | DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->\r", marks[markNb], displayName, (U32)srcSize); |
| 256 | if (!cCompleted) memset(compressedBuffer, 0xE5, maxCompressedSize); /* warm up and erase result buffer */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 257 | |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 258 | UTIL_sleepMilli(1); /* give processor time to other processes */ |
| 259 | UTIL_waitForNextTick(ticksPerSecond); |
Yann Collet | f8804d1 | 2017-01-20 17:23:19 -0800 | [diff] [blame] | 260 | UTIL_getTime(&clockStart); |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 261 | |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 262 | if (!cCompleted) { /* still some time to do compression tests */ |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 263 | U64 const clockLoop = g_nbSeconds ? TIMELOOP_MICROSEC : 1; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 264 | U32 nbLoops = 0; |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 265 | ZSTD_CDict* cdict = NULL; |
| 266 | #ifdef ZSTD_NEWAPI |
| 267 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_nbThreads, g_nbThreads); |
| 268 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_compressionLevel, cLevel); |
| 269 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_windowLog, comprParams->windowLog); |
| 270 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_chainLog, comprParams->chainLog); |
| 271 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_searchLog, comprParams->searchLog); |
| 272 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_minMatch, comprParams->searchLength); |
| 273 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_targetLength, comprParams->targetLength); |
| 274 | ZSTD_CCtx_setParameter(ctx, ZSTD_p_compressionStrategy, comprParams->strategy); |
| 275 | ZSTD_CCtx_loadDictionary(ctx, dictBuffer, dictBufferSize); |
| 276 | #else |
| 277 | size_t const avgSize = MIN(blockSize, (srcSize / nbFiles)); |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 278 | ZSTD_parameters zparams = ZSTD_getParams(cLevel, avgSize, dictBufferSize); |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 279 | ZSTD_customMem const cmem = { NULL, NULL, NULL }; |
Przemyslaw Skibinski | 897b8bb | 2016-12-13 13:03:41 +0100 | [diff] [blame] | 280 | if (comprParams->windowLog) zparams.cParams.windowLog = comprParams->windowLog; |
| 281 | if (comprParams->chainLog) zparams.cParams.chainLog = comprParams->chainLog; |
| 282 | if (comprParams->hashLog) zparams.cParams.hashLog = comprParams->hashLog; |
| 283 | if (comprParams->searchLog) zparams.cParams.searchLog = comprParams->searchLog; |
| 284 | if (comprParams->searchLength) zparams.cParams.searchLength = comprParams->searchLength; |
| 285 | if (comprParams->targetLength) zparams.cParams.targetLength = comprParams->targetLength; |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 286 | if (comprParams->strategy) zparams.cParams.strategy = comprParams->strategy; |
Yann Collet | 7bd1a29 | 2017-06-21 11:50:33 -0700 | [diff] [blame^] | 287 | cdict = ZSTD_createCDict_advanced(dictBuffer, dictBufferSize, 1 /*byRef*/, ZSTD_dm_auto, zparams.cParams, cmem); |
Yann Collet | c200738 | 2017-04-04 15:35:06 -0700 | [diff] [blame] | 288 | if (cdict==NULL) EXM_THROW(1, "ZSTD_createCDict_advanced() allocation failure"); |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 289 | #endif |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 290 | do { |
| 291 | U32 blockNb; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 292 | for (blockNb=0; blockNb<nbBlocks; blockNb++) { |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 293 | size_t rSize; |
| 294 | #ifdef ZSTD_NEWAPI |
| 295 | ZSTD_outBuffer out = { blockTable[blockNb].cPtr, blockTable[blockNb].cRoom, 0 }; |
| 296 | ZSTD_inBuffer in = { blockTable[blockNb].srcPtr, blockTable[blockNb].srcSize, 0 }; |
| 297 | size_t cError = 1; |
| 298 | while (cError) { |
| 299 | cError = ZSTD_compress_generic(ctx, |
| 300 | &out, &in, ZSTD_e_end); |
| 301 | if (ZSTD_isError(cError)) |
| 302 | EXM_THROW(1, "ZSTD_compress_generic() error : %s", |
| 303 | ZSTD_getErrorName(cError)); |
| 304 | } |
| 305 | rSize = out.pos; |
| 306 | #else /* ! ZSTD_NEWAPI */ |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 307 | if (dictBufferSize) { |
| 308 | rSize = ZSTD_compress_usingCDict(ctx, |
| 309 | blockTable[blockNb].cPtr, blockTable[blockNb].cRoom, |
| 310 | blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize, |
| 311 | cdict); |
Yann Collet | 458c8a9 | 2017-01-19 17:44:15 -0800 | [diff] [blame] | 312 | } else { |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 313 | # ifdef ZSTD_MULTITHREAD /* note : limitation : MT single-pass does not support compression with dictionary */ |
Yann Collet | 458c8a9 | 2017-01-19 17:44:15 -0800 | [diff] [blame] | 314 | rSize = ZSTDMT_compressCCtx(mtctx, |
Yann Collet | 3d93f2f | 2016-12-27 07:19:36 +0100 | [diff] [blame] | 315 | blockTable[blockNb].cPtr, blockTable[blockNb].cRoom, |
| 316 | blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize, |
| 317 | cLevel); |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 318 | # else |
Przemyslaw Skibinski | 897b8bb | 2016-12-13 13:03:41 +0100 | [diff] [blame] | 319 | rSize = ZSTD_compress_advanced (ctx, |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 320 | blockTable[blockNb].cPtr, blockTable[blockNb].cRoom, |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 321 | blockTable[blockNb].srcPtr,blockTable[blockNb].srcSize, |
| 322 | NULL, 0, zparams); |
| 323 | # endif |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 324 | } |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 325 | if (ZSTD_isError(rSize)) |
| 326 | EXM_THROW(1, "ZSTD_compress_usingCDict() failed : %s", |
| 327 | ZSTD_getErrorName(rSize)); |
| 328 | #endif /* ZSTD_NEWAPI */ |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 329 | blockTable[blockNb].cSize = rSize; |
Przemyslaw Skibinski | 2558b4c | 2016-11-18 11:46:30 +0100 | [diff] [blame] | 330 | } |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 331 | nbLoops++; |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 332 | } while (UTIL_clockSpanMicro(clockStart, ticksPerSecond) < clockLoop); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 333 | ZSTD_freeCDict(cdict); |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 334 | { U64 const clockSpanMicro = UTIL_clockSpanMicro(clockStart, ticksPerSecond); |
Yann Collet | c6a6417 | 2016-12-31 03:31:26 +0100 | [diff] [blame] | 335 | if (clockSpanMicro < fastestC*nbLoops) fastestC = clockSpanMicro / nbLoops; |
| 336 | totalCTime += clockSpanMicro; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 337 | cCompleted = (totalCTime >= maxTime); |
| 338 | } } |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 339 | |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 340 | cSize = 0; |
| 341 | { U32 blockNb; for (blockNb=0; blockNb<nbBlocks; blockNb++) cSize += blockTable[blockNb].cSize; } |
| 342 | ratio = (double)srcSize / (double)cSize; |
| 343 | markNb = (markNb+1) % NB_MARKS; |
| 344 | DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.3f),%6.1f MB/s\r", |
| 345 | marks[markNb], displayName, (U32)srcSize, (U32)cSize, ratio, |
| 346 | (double)srcSize / fastestC ); |
| 347 | } else { /* g_decodeOnly */ |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 348 | memcpy(compressedBuffer, srcBuffer, loadedCompressedSize); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 349 | } |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 350 | |
Yann Collet | 5eb749e | 2017-01-11 18:21:25 +0100 | [diff] [blame] | 351 | #if 0 /* disable decompression test */ |
Yann Collet | 3d93f2f | 2016-12-27 07:19:36 +0100 | [diff] [blame] | 352 | dCompleted=1; |
| 353 | (void)totalDTime; (void)fastestD; (void)crcOrig; /* unused when decompression disabled */ |
| 354 | #else |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 355 | /* Decompression */ |
Yann Collet | d1733f7 | 2016-08-21 01:04:46 +0200 | [diff] [blame] | 356 | if (!dCompleted) memset(resultBuffer, 0xD6, srcSize); /* warm result buffer */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 357 | |
inikep | 83c76b4 | 2016-04-28 13:16:01 +0200 | [diff] [blame] | 358 | UTIL_sleepMilli(1); /* give processor time to other processes */ |
| 359 | UTIL_waitForNextTick(ticksPerSecond); |
Yann Collet | 7b51a29 | 2016-01-26 15:58:49 +0100 | [diff] [blame] | 360 | |
Yann Collet | a9febe8 | 2016-08-01 13:37:17 +0200 | [diff] [blame] | 361 | if (!dCompleted) { |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 362 | U64 clockLoop = g_nbSeconds ? TIMELOOP_MICROSEC : 1; |
Yann Collet | a9febe8 | 2016-08-01 13:37:17 +0200 | [diff] [blame] | 363 | U32 nbLoops = 0; |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 364 | UTIL_time_t clockStart; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 365 | ZSTD_DDict* const ddict = ZSTD_createDDict(dictBuffer, dictBufferSize); |
Yann Collet | ee1a084 | 2016-06-07 01:40:49 +0200 | [diff] [blame] | 366 | if (!ddict) EXM_THROW(2, "ZSTD_createDDict() allocation failure"); |
Yann Collet | f8804d1 | 2017-01-20 17:23:19 -0800 | [diff] [blame] | 367 | UTIL_getTime(&clockStart); |
inikep | c5e1d29 | 2016-04-19 09:37:59 +0200 | [diff] [blame] | 368 | do { |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 369 | U32 blockNb; |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 370 | for (blockNb=0; blockNb<nbBlocks; blockNb++) { |
Yann Collet | ee1a084 | 2016-06-07 01:40:49 +0200 | [diff] [blame] | 371 | size_t const regenSize = ZSTD_decompress_usingDDict(dctx, |
Yann Collet | e63c631 | 2016-12-06 17:46:49 -0800 | [diff] [blame] | 372 | blockTable[blockNb].resPtr, blockTable[blockNb].resSize, |
Yann Collet | ee1a084 | 2016-06-07 01:40:49 +0200 | [diff] [blame] | 373 | blockTable[blockNb].cPtr, blockTable[blockNb].cSize, |
| 374 | ddict); |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 375 | if (ZSTD_isError(regenSize)) { |
Yann Collet | 5eb749e | 2017-01-11 18:21:25 +0100 | [diff] [blame] | 376 | DISPLAY("ZSTD_decompress_usingDDict() failed on block %u of size %u : %s \n", |
| 377 | blockNb, (U32)blockTable[blockNb].cSize, ZSTD_getErrorName(regenSize)); |
inikep | 19bd48f | 2016-04-04 12:10:00 +0200 | [diff] [blame] | 378 | clockLoop = 0; /* force immediate test end */ |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 379 | break; |
| 380 | } |
| 381 | blockTable[blockNb].resSize = regenSize; |
inikep | c5e1d29 | 2016-04-19 09:37:59 +0200 | [diff] [blame] | 382 | } |
| 383 | nbLoops++; |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 384 | } while (UTIL_clockSpanMicro(clockStart, ticksPerSecond) < clockLoop); |
Yann Collet | ee1a084 | 2016-06-07 01:40:49 +0200 | [diff] [blame] | 385 | ZSTD_freeDDict(ddict); |
Przemyslaw Skibinski | 74dcd8d | 2017-02-21 12:22:05 +0100 | [diff] [blame] | 386 | { U64 const clockSpanMicro = UTIL_clockSpanMicro(clockStart, ticksPerSecond); |
Yann Collet | 5eb749e | 2017-01-11 18:21:25 +0100 | [diff] [blame] | 387 | if (clockSpanMicro < fastestD*nbLoops) fastestD = clockSpanMicro / nbLoops; |
| 388 | totalDTime += clockSpanMicro; |
Yann Collet | 4f5350f | 2016-11-29 13:12:24 -0800 | [diff] [blame] | 389 | dCompleted = (totalDTime >= maxTime); |
Yann Collet | 7b51a29 | 2016-01-26 15:58:49 +0100 | [diff] [blame] | 390 | } } |
| 391 | |
Yann Collet | a9febe8 | 2016-08-01 13:37:17 +0200 | [diff] [blame] | 392 | markNb = (markNb+1) % NB_MARKS; |
| 393 | DISPLAYLEVEL(2, "%2s-%-17.17s :%10u ->%10u (%5.3f),%6.1f MB/s ,%6.1f MB/s\r", |
| 394 | marks[markNb], displayName, (U32)srcSize, (U32)cSize, ratio, |
inikep | 06f793a | 2016-03-29 11:17:58 +0200 | [diff] [blame] | 395 | (double)srcSize / fastestC, |
| 396 | (double)srcSize / fastestD ); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 397 | |
| 398 | /* CRC Checking */ |
Yann Collet | e162ace | 2016-05-20 11:24:35 +0200 | [diff] [blame] | 399 | { U64 const crcCheck = XXH64(resultBuffer, srcSize, 0); |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 400 | if (!g_decodeOnly && (crcOrig!=crcCheck)) { |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 401 | size_t u; |
| 402 | DISPLAY("!!! WARNING !!! %14s : Invalid Checksum : %x != %x \n", displayName, (unsigned)crcOrig, (unsigned)crcCheck); |
| 403 | for (u=0; u<srcSize; u++) { |
| 404 | if (((const BYTE*)srcBuffer)[u] != ((const BYTE*)resultBuffer)[u]) { |
| 405 | U32 segNb, bNb, pos; |
| 406 | size_t bacc = 0; |
| 407 | DISPLAY("Decoding error at pos %u ", (U32)u); |
| 408 | for (segNb = 0; segNb < nbBlocks; segNb++) { |
| 409 | if (bacc + blockTable[segNb].srcSize > u) break; |
| 410 | bacc += blockTable[segNb].srcSize; |
| 411 | } |
| 412 | pos = (U32)(u - bacc); |
| 413 | bNb = pos / (128 KB); |
Yann Collet | c08e649 | 2017-06-19 18:25:35 -0700 | [diff] [blame] | 414 | DISPLAY("(sample %u, block %u, pos %u) \n", segNb, bNb, pos); |
Yann Collet | 736788f | 2017-01-19 12:12:50 -0800 | [diff] [blame] | 415 | if (u>5) { |
| 416 | int n; |
| 417 | for (n=-5; n<0; n++) DISPLAY("%02X ", ((const BYTE*)srcBuffer)[u+n]); |
| 418 | DISPLAY(" :%02X: ", ((const BYTE*)srcBuffer)[u]); |
| 419 | for (n=1; n<3; n++) DISPLAY("%02X ", ((const BYTE*)srcBuffer)[u+n]); |
| 420 | DISPLAY(" \n"); |
| 421 | for (n=-5; n<0; n++) DISPLAY("%02X ", ((const BYTE*)resultBuffer)[u+n]); |
| 422 | DISPLAY(" :%02X: ", ((const BYTE*)resultBuffer)[u]); |
| 423 | for (n=1; n<3; n++) DISPLAY("%02X ", ((const BYTE*)resultBuffer)[u+n]); |
| 424 | DISPLAY(" \n"); |
| 425 | } |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 426 | break; |
Yann Collet | 03a6dab | 2016-01-21 02:21:17 +0100 | [diff] [blame] | 427 | } |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 428 | if (u==srcSize-1) { /* should never happen */ |
| 429 | DISPLAY("no difference detected\n"); |
| 430 | } } |
| 431 | break; |
| 432 | } } /* CRC Checking */ |
Yann Collet | e8c6bb1 | 2015-07-26 00:23:57 +0100 | [diff] [blame] | 433 | #endif |
Przemyslaw Skibinski | 26306fc | 2016-11-03 11:38:01 +0100 | [diff] [blame] | 434 | } /* for (testNb = 1; testNb <= (g_nbSeconds + !g_nbSeconds); testNb++) */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 435 | |
inikep | 7132fb1 | 2016-08-10 14:59:18 +0200 | [diff] [blame] | 436 | if (g_displayLevel == 1) { |
| 437 | double cSpeed = (double)srcSize / fastestC; |
| 438 | double dSpeed = (double)srcSize / fastestD; |
| 439 | if (g_additionalParam) |
| 440 | DISPLAY("-%-3i%11i (%5.3f) %6.2f MB/s %6.1f MB/s %s (param=%d)\n", cLevel, (int)cSize, ratio, cSpeed, dSpeed, displayName, g_additionalParam); |
| 441 | else |
| 442 | DISPLAY("-%-3i%11i (%5.3f) %6.2f MB/s %6.1f MB/s %s\n", cLevel, (int)cSize, ratio, cSpeed, dSpeed, displayName); |
| 443 | } |
inikep | 2872b6f | 2016-03-22 14:38:34 +0100 | [diff] [blame] | 444 | DISPLAYLEVEL(2, "%2i#\n", cLevel); |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 445 | } /* Bench */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 446 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 447 | /* clean up */ |
inikep | 0bd0fae | 2016-05-05 13:10:57 +0200 | [diff] [blame] | 448 | free(blockTable); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 449 | free(compressedBuffer); |
| 450 | free(resultBuffer); |
Yann Collet | 458c8a9 | 2017-01-19 17:44:15 -0800 | [diff] [blame] | 451 | ZSTDMT_freeCCtx(mtctx); |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 452 | ZSTD_freeCCtx(ctx); |
| 453 | ZSTD_freeDCtx(dctx); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 454 | return 0; |
| 455 | } |
| 456 | |
| 457 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 458 | static size_t BMK_findMaxMem(U64 requiredMem) |
| 459 | { |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 460 | size_t const step = 64 MB; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 461 | BYTE* testmem = NULL; |
| 462 | |
| 463 | requiredMem = (((requiredMem >> 26) + 1) << 26); |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 464 | requiredMem += step; |
Yann Collet | 050efba | 2015-11-03 09:49:30 +0100 | [diff] [blame] | 465 | if (requiredMem > maxMemory) requiredMem = maxMemory; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 466 | |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 467 | do { |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 468 | testmem = (BYTE*)malloc((size_t)requiredMem); |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 469 | requiredMem -= step; |
| 470 | } while (!testmem); |
| 471 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 472 | free(testmem); |
Yann Collet | de406ee | 2016-03-20 15:46:10 +0100 | [diff] [blame] | 473 | return (size_t)(requiredMem); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 474 | } |
| 475 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 476 | static void BMK_benchCLevel(void* srcBuffer, size_t benchedSize, |
inikep | eaba91a | 2016-03-23 20:30:26 +0100 | [diff] [blame] | 477 | const char* displayName, int cLevel, int cLevelLast, |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 478 | const size_t* fileSizes, unsigned nbFiles, |
Przemyslaw Skibinski | 897b8bb | 2016-12-13 13:03:41 +0100 | [diff] [blame] | 479 | const void* dictBuffer, size_t dictBufferSize, |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 480 | ZSTD_compressionParameters *compressionParams, int setRealTimePrio) |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 481 | { |
inikep | e9554b7 | 2016-03-14 18:10:30 +0100 | [diff] [blame] | 482 | int l; |
inikep | 4e26bb6 | 2016-03-14 12:48:51 +0100 | [diff] [blame] | 483 | |
inikep | e9554b7 | 2016-03-14 18:10:30 +0100 | [diff] [blame] | 484 | const char* pch = strrchr(displayName, '\\'); /* Windows */ |
| 485 | if (!pch) pch = strrchr(displayName, '/'); /* Linux */ |
| 486 | if (pch) displayName = pch+1; |
inikep | 4e26bb6 | 2016-03-14 12:48:51 +0100 | [diff] [blame] | 487 | |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 488 | if (setRealTimePrio) { |
| 489 | DISPLAYLEVEL(2, "Note : switching to a real-time priority \n"); |
| 490 | SET_REALTIME_PRIORITY; |
| 491 | } |
inikep | ea4ee3e | 2016-04-25 13:09:06 +0200 | [diff] [blame] | 492 | |
inikep | eaba91a | 2016-03-23 20:30:26 +0100 | [diff] [blame] | 493 | if (g_displayLevel == 1 && !g_additionalParam) |
Przemyslaw Skibinski | 26306fc | 2016-11-03 11:38:01 +0100 | [diff] [blame] | 494 | DISPLAY("bench %s %s: input %u bytes, %u seconds, %u KB blocks\n", ZSTD_VERSION_STRING, ZSTD_GIT_COMMIT_STRING, (U32)benchedSize, g_nbSeconds, (U32)(g_blockSize>>10)); |
inikep | e9554b7 | 2016-03-14 18:10:30 +0100 | [diff] [blame] | 495 | |
| 496 | if (cLevelLast < cLevel) cLevelLast = cLevel; |
| 497 | |
Yann Collet | 9990986 | 2016-04-09 16:17:18 +0200 | [diff] [blame] | 498 | for (l=cLevel; l <= cLevelLast; l++) { |
inikep | e9554b7 | 2016-03-14 18:10:30 +0100 | [diff] [blame] | 499 | BMK_benchMem(srcBuffer, benchedSize, |
inikep | 472638c | 2016-03-23 12:28:28 +0100 | [diff] [blame] | 500 | displayName, l, |
inikep | e9554b7 | 2016-03-14 18:10:30 +0100 | [diff] [blame] | 501 | fileSizes, nbFiles, |
Przemyslaw Skibinski | 897b8bb | 2016-12-13 13:03:41 +0100 | [diff] [blame] | 502 | dictBuffer, dictBufferSize, compressionParams); |
inikep | 7132fb1 | 2016-08-10 14:59:18 +0200 | [diff] [blame] | 503 | } |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 504 | } |
| 505 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 506 | |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 507 | /*! BMK_loadFiles() : |
| 508 | Loads `buffer` with content of files listed within `fileNamesTable`. |
| 509 | At most, fills `buffer` entirely */ |
Yann Collet | 7061135 | 2015-12-16 03:01:03 +0100 | [diff] [blame] | 510 | static void BMK_loadFiles(void* buffer, size_t bufferSize, |
| 511 | size_t* fileSizes, |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 512 | const char** fileNamesTable, unsigned nbFiles) |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 513 | { |
inikep | c0d5f4e | 2016-04-13 10:48:04 +0200 | [diff] [blame] | 514 | size_t pos = 0, totalSize = 0; |
Yann Collet | 699b14d | 2016-03-17 19:37:33 +0100 | [diff] [blame] | 515 | unsigned n; |
Yann Collet | fd416f1 | 2016-01-30 03:14:15 +0100 | [diff] [blame] | 516 | for (n=0; n<nbFiles; n++) { |
Yann Collet | e162ace | 2016-05-20 11:24:35 +0200 | [diff] [blame] | 517 | FILE* f; |
inikep | 69fcd7c | 2016-04-28 12:23:33 +0200 | [diff] [blame] | 518 | U64 fileSize = UTIL_getFileSize(fileNamesTable[n]); |
| 519 | if (UTIL_isDirectory(fileNamesTable[n])) { |
inikep | c0d5f4e | 2016-04-13 10:48:04 +0200 | [diff] [blame] | 520 | DISPLAYLEVEL(2, "Ignoring %s directory... \n", fileNamesTable[n]); |
inikep | bab4317 | 2016-04-29 15:19:40 +0200 | [diff] [blame] | 521 | fileSizes[n] = 0; |
inikep | c0d5f4e | 2016-04-13 10:48:04 +0200 | [diff] [blame] | 522 | continue; |
| 523 | } |
inikep | ea4ee3e | 2016-04-25 13:09:06 +0200 | [diff] [blame] | 524 | f = fopen(fileNamesTable[n], "rb"); |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 525 | if (f==NULL) EXM_THROW(10, "impossible to open file %s", fileNamesTable[n]); |
Yann Collet | bf2bc11 | 2016-08-02 23:48:13 +0200 | [diff] [blame] | 526 | DISPLAYUPDATE(2, "Loading %s... \r", fileNamesTable[n]); |
Yann Collet | a5b66e3 | 2016-03-26 01:48:27 +0100 | [diff] [blame] | 527 | if (fileSize > bufferSize-pos) fileSize = bufferSize-pos, nbFiles=n; /* buffer too small - stop after this file */ |
| 528 | { size_t const readSize = fread(((char*)buffer)+pos, 1, (size_t)fileSize, f); |
| 529 | if (readSize != (size_t)fileSize) EXM_THROW(11, "could not read %s", fileNamesTable[n]); |
| 530 | pos += readSize; } |
Yann Collet | a52c98d | 2015-12-16 03:12:31 +0100 | [diff] [blame] | 531 | fileSizes[n] = (size_t)fileSize; |
inikep | c0d5f4e | 2016-04-13 10:48:04 +0200 | [diff] [blame] | 532 | totalSize += (size_t)fileSize; |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 533 | fclose(f); |
| 534 | } |
Yann Collet | 6f9c056 | 2016-05-01 10:26:30 +0200 | [diff] [blame] | 535 | |
inikep | c0d5f4e | 2016-04-13 10:48:04 +0200 | [diff] [blame] | 536 | if (totalSize == 0) EXM_THROW(12, "no data to bench"); |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 537 | } |
| 538 | |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 539 | static void BMK_benchFileTable(const char** fileNamesTable, unsigned nbFiles, const char* dictFileName, int cLevel, |
| 540 | int cLevelLast, ZSTD_compressionParameters *compressionParams, int setRealTimePrio) |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 541 | { |
| 542 | void* srcBuffer; |
| 543 | size_t benchedSize; |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 544 | void* dictBuffer = NULL; |
| 545 | size_t dictBufferSize = 0; |
| 546 | size_t* fileSizes = (size_t*)malloc(nbFiles * sizeof(size_t)); |
Yann Collet | e162ace | 2016-05-20 11:24:35 +0200 | [diff] [blame] | 547 | U64 const totalSizeToLoad = UTIL_getTotalFileSize(fileNamesTable, nbFiles); |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 548 | char mfName[20] = {0}; |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 549 | |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 550 | if (!fileSizes) EXM_THROW(12, "not enough memory for fileSizes"); |
| 551 | |
| 552 | /* Load dictionary */ |
Yann Collet | fd416f1 | 2016-01-30 03:14:15 +0100 | [diff] [blame] | 553 | if (dictFileName != NULL) { |
inikep | 69fcd7c | 2016-04-28 12:23:33 +0200 | [diff] [blame] | 554 | U64 dictFileSize = UTIL_getFileSize(dictFileName); |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 555 | if (dictFileSize > 64 MB) EXM_THROW(10, "dictionary file %s too large", dictFileName); |
| 556 | dictBufferSize = (size_t)dictFileSize; |
| 557 | dictBuffer = malloc(dictBufferSize); |
| 558 | if (dictBuffer==NULL) EXM_THROW(11, "not enough memory for dictionary (%u bytes)", (U32)dictBufferSize); |
| 559 | BMK_loadFiles(dictBuffer, dictBufferSize, fileSizes, &dictFileName, 1); |
| 560 | } |
| 561 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 562 | /* Memory allocation & restrictions */ |
| 563 | benchedSize = BMK_findMaxMem(totalSizeToLoad * 3) / 3; |
| 564 | if ((U64)benchedSize > totalSizeToLoad) benchedSize = (size_t)totalSizeToLoad; |
| 565 | if (benchedSize < totalSizeToLoad) |
| 566 | DISPLAY("Not enough memory; testing %u MB only...\n", (U32)(benchedSize >> 20)); |
| 567 | srcBuffer = malloc(benchedSize); |
| 568 | if (!srcBuffer) EXM_THROW(12, "not enough memory"); |
| 569 | |
| 570 | /* Load input buffer */ |
Yann Collet | 7061135 | 2015-12-16 03:01:03 +0100 | [diff] [blame] | 571 | BMK_loadFiles(srcBuffer, benchedSize, fileSizes, fileNamesTable, nbFiles); |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 572 | |
| 573 | /* Bench */ |
| 574 | snprintf (mfName, sizeof(mfName), " %u files", nbFiles); |
Yann Collet | e162ace | 2016-05-20 11:24:35 +0200 | [diff] [blame] | 575 | { const char* displayName = (nbFiles > 1) ? mfName : fileNamesTable[0]; |
| 576 | BMK_benchCLevel(srcBuffer, benchedSize, |
| 577 | displayName, cLevel, cLevelLast, |
| 578 | fileSizes, nbFiles, |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 579 | dictBuffer, dictBufferSize, compressionParams, setRealTimePrio); |
Yann Collet | e162ace | 2016-05-20 11:24:35 +0200 | [diff] [blame] | 580 | } |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 581 | |
Yann Collet | eeb8ba1 | 2015-10-22 16:55:40 +0100 | [diff] [blame] | 582 | /* clean up */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 583 | free(srcBuffer); |
Yann Collet | 31683c0 | 2015-12-18 01:26:48 +0100 | [diff] [blame] | 584 | free(dictBuffer); |
Yann Collet | 7061135 | 2015-12-16 03:01:03 +0100 | [diff] [blame] | 585 | free(fileSizes); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 586 | } |
| 587 | |
| 588 | |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 589 | static void BMK_syntheticTest(int cLevel, int cLevelLast, double compressibility, ZSTD_compressionParameters* compressionParams, int setRealTimePrio) |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 590 | { |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 591 | char name[20] = {0}; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 592 | size_t benchedSize = 10000000; |
Yann Collet | e162ace | 2016-05-20 11:24:35 +0200 | [diff] [blame] | 593 | void* const srcBuffer = malloc(benchedSize); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 594 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 595 | /* Memory allocation */ |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 596 | if (!srcBuffer) EXM_THROW(21, "not enough memory"); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 597 | |
| 598 | /* Fill input buffer */ |
Yann Collet | d062f13 | 2015-12-01 01:31:17 +0100 | [diff] [blame] | 599 | RDG_genBuffer(srcBuffer, benchedSize, compressibility, 0.0, 0); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 600 | |
| 601 | /* Bench */ |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 602 | snprintf (name, sizeof(name), "Synthetic %2u%%", (unsigned)(compressibility*100)); |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 603 | BMK_benchCLevel(srcBuffer, benchedSize, name, cLevel, cLevelLast, &benchedSize, 1, NULL, 0, compressionParams, setRealTimePrio); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 604 | |
Yann Collet | ed699e6 | 2015-12-16 02:37:24 +0100 | [diff] [blame] | 605 | /* clean up */ |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 606 | free(srcBuffer); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 607 | } |
| 608 | |
| 609 | |
Yann Collet | 1f57c2e | 2016-12-21 16:20:11 +0100 | [diff] [blame] | 610 | int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, const char* dictFileName, |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 611 | int cLevel, int cLevelLast, ZSTD_compressionParameters* compressionParams, int setRealTimePrio) |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 612 | { |
Yann Collet | 699b14d | 2016-03-17 19:37:33 +0100 | [diff] [blame] | 613 | double const compressibility = (double)g_compressibilityDefault / 100; |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 614 | |
Yann Collet | c1c040e | 2017-03-01 16:49:20 -0800 | [diff] [blame] | 615 | if (cLevel < 1) cLevel = 1; /* minimum compression level */ |
Przemyslaw Skibinski | fd0ac93 | 2016-11-23 21:45:29 +0100 | [diff] [blame] | 616 | if (cLevel > ZSTD_maxCLevel()) cLevel = ZSTD_maxCLevel(); |
| 617 | if (cLevelLast > ZSTD_maxCLevel()) cLevelLast = ZSTD_maxCLevel(); |
Przemyslaw Skibinski | 5ddcd9d | 2016-11-21 16:37:56 +0100 | [diff] [blame] | 618 | if (cLevelLast < cLevel) cLevelLast = cLevel; |
Yann Collet | d946501 | 2016-12-06 16:49:23 -0800 | [diff] [blame] | 619 | if (cLevelLast > cLevel) DISPLAYLEVEL(2, "Benchmarking levels from %d to %d\n", cLevel, cLevelLast); |
Przemyslaw Skibinski | 5ddcd9d | 2016-11-21 16:37:56 +0100 | [diff] [blame] | 620 | |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 621 | if (nbFiles == 0) |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 622 | BMK_syntheticTest(cLevel, cLevelLast, compressibility, compressionParams, setRealTimePrio); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 623 | else |
Przemyslaw Skibinski | d05014c | 2017-02-07 16:48:01 +0100 | [diff] [blame] | 624 | BMK_benchFileTable(fileNamesTable, nbFiles, dictFileName, cLevel, cLevelLast, compressionParams, setRealTimePrio); |
Yann Collet | 4856a00 | 2015-01-24 01:58:16 +0100 | [diff] [blame] | 625 | return 0; |
| 626 | } |