diff --git a/tools/CompressionBenchmark.cpp b/tools/CompressionBenchmark.cpp index 3dd4e101..b003faa7 100644 --- a/tools/CompressionBenchmark.cpp +++ b/tools/CompressionBenchmark.cpp @@ -166,19 +166,26 @@ int main(int argc, char **argv) { x.MaskChipEdges(false); x.Compression(JFJochProtoBuf::NO_COMPRESSION); - std::cout << "None (geom transform) " << CheckCompression(x, nimages, image, nthreads); + for (int i = 0; i < 3; i++) + CheckCompression(x, nimages, image, nthreads); - x.Compression(JFJochProtoBuf::BSHUF_LZ4); - std::cout << "BSHUF/LZ4 " << CheckCompression(x, nimages, image, nthreads); + for (int i = 0; i <3; i++) { + x.Compression(JFJochProtoBuf::NO_COMPRESSION).Mode(DetectorMode::Raw); + std::cout << "None (memcpy) " << CheckCompression(x, nimages, image, nthreads); + x.Compression(JFJochProtoBuf::NO_COMPRESSION).Mode(DetectorMode::Conversion); - x.Compression(JFJochProtoBuf::BSHUF_ZSTD); - std::cout << "BSHUF/ZSTD (0) " << CheckCompression(x, nimages, image, nthreads); + std::cout << "None (geom transform) " << CheckCompression(x, nimages, image, nthreads); - x.Compression(JFJochProtoBuf::BSHUF_ZSTD_RLE); - std::cout << "BSHUF/ZSTD (RLE) " << CheckCompression(x, nimages, image, nthreads); + x.Compression(JFJochProtoBuf::BSHUF_LZ4); + std::cout << "BSHUF/LZ4 " << CheckCompression(x, nimages, image, nthreads); - x.Compression(JFJochProtoBuf::NO_COMPRESSION); - std::cout << "None (geom transform) " << CheckCompression(x, nimages, image, nthreads); + x.Compression(JFJochProtoBuf::BSHUF_ZSTD); + std::cout << "BSHUF/ZSTD (0) " << CheckCompression(x, nimages, image, nthreads); + + x.Compression(JFJochProtoBuf::BSHUF_ZSTD_RLE); + std::cout << "BSHUF/ZSTD (RLE) " << CheckCompression(x, nimages, image, nthreads); + std::cout << std::endl; + } std::cout << std::endl << std::endl << "Decompression" << std::endl << std::endl;