diff --git a/test/c/mimiclib/flate.c b/test/c/mimiclib/flate.c index f824e3f6..4373dbf5 100644 --- a/test/c/mimiclib/flate.c +++ b/test/c/mimiclib/flate.c @@ -3,6 +3,30 @@ #include "zlib.h" +uint32_t global_mimiclib_flate_unused_u32; + +const char* mimic_adler32(puffs_base_buf1* dst, puffs_base_buf1* src) { + uint8_t* ptr = src->ptr + src->ri; + size_t len = src->wi - src->ri; + if (len > 0x7FFFFFFF) { + return "src length is too large"; + } + global_mimiclib_flate_unused_u32 = adler32(0L, ptr, len); + src->ri = src->wi; + return NULL; +} + +const char* mimic_crc32(puffs_base_buf1* dst, puffs_base_buf1* src) { + uint8_t* ptr = src->ptr + src->ri; + size_t len = src->wi - src->ri; + if (len > 0x7FFFFFFF) { + return "src length is too large"; + } + global_mimiclib_flate_unused_u32 = crc32(0L, ptr, len); + src->ri = src->wi; + return NULL; +} + unsigned int mimic_flate_read_func(void* ctx, unsigned char** buf) { puffs_base_buf1* src = (puffs_base_buf1*)(ctx); *buf = src->ptr + src->ri; diff --git a/test/c/std/flate.c b/test/c/std/flate.c index 7f33ad81..2f8095d6 100644 --- a/test/c/std/flate.c +++ b/test/c/std/flate.c @@ -39,6 +39,14 @@ const char* proc_filename = "std/flate.c"; // // The empty comments forces clang-format to place one element per line. +golden_test checksum_midsummer_gt = { + .src_filename = "../../testdata/midsummer.txt", // +}; + +golden_test checksum_pi_gt = { + .src_filename = "../../testdata/pi.txt", // +}; + golden_test flate_256_bytes_gt = { .want_filename = "../../testdata/256.bytes", // .src_filename = "../../testdata/256.bytes.gz", // @@ -258,6 +266,26 @@ void bench_puffs_flate_decode_100k() { #ifdef PUFFS_MIMIC +void bench_mimic_adler32_10k() { + proc_funcname = __func__; + bench_buf1_buf1(mimic_adler32, &checksum_midsummer_gt, 30000); +} + +void bench_mimic_adler32_100k() { + proc_funcname = __func__; + bench_buf1_buf1(mimic_adler32, &checksum_pi_gt, 3000); +} + +void bench_mimic_crc32_10k() { + proc_funcname = __func__; + bench_buf1_buf1(mimic_crc32, &checksum_midsummer_gt, 30000); +} + +void bench_mimic_crc32_100k() { + proc_funcname = __func__; + bench_buf1_buf1(mimic_crc32, &checksum_pi_gt, 3000); +} + void bench_mimic_flate_decode_1k() { proc_funcname = __func__; bench_buf1_buf1(mimic_flate_decode, &flate_romeo_gt, 200000); @@ -337,6 +365,10 @@ proc benches[] = { #ifdef PUFFS_MIMIC // Mimic Benches + bench_mimic_adler32_10k, // + bench_mimic_adler32_100k, // + bench_mimic_crc32_10k, // + bench_mimic_crc32_100k, // bench_mimic_flate_decode_1k, // bench_mimic_flate_decode_10k, // bench_mimic_flate_decode_100k, // diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index f483e780..e8befe91 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -73,12 +73,16 @@ void bench_finish(uint64_t reps, uint64_t n_bytes) { name += 6; } if (bench_warm_up) { - printf("# (warm up) %s/%s\t%8" PRIu64 ".%06" PRIu64 " seconds\n", name, cc, - nanos / 1000000000, (nanos % 1000000000) / 1000); + printf("# (warm up) %s/%s\t%8" PRIu64 ".%06" PRIu64 " seconds\n", // + name, cc, nanos / 1000000000, (nanos % 1000000000) / 1000); + } else if (!n_bytes) { + printf("Benchmark%s/%s\t%8" PRIu64 "\t%8" PRIu64 " ns/op\n", // + name, cc, reps, nanos / reps); } else { - printf("Benchmark%s/%s\t%8" PRIu64 "\t%8" PRIu64 " ns/op\t%8d.%03d MB/s\n", - name, cc, reps, nanos / reps, (int)(kb_per_s / 1000), - (int)(kb_per_s % 1000)); + printf("Benchmark%s/%s\t%8" PRIu64 "\t%8" PRIu64 + " ns/op\t%8d.%03d MB/s\n", // + name, cc, reps, nanos / reps, // + (int)(kb_per_s / 1000), (int)(kb_per_s % 1000)); } } @@ -282,7 +286,9 @@ void proc_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, puffs_base_buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; puffs_base_buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE}; - if (!read_file(&src, gt->src_filename)) { + if (!gt->src_filename) { + src.closed = true; + } else if (!read_file(&src, gt->src_filename)) { return; } if (gt->src_offset0 || gt->src_offset1) { @@ -318,7 +324,9 @@ void proc_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, return; } - if (!read_file(&want, gt->want_filename)) { + if (!gt->want_filename) { + want.closed = true; + } else if (!read_file(&want, gt->want_filename)) { return; } if (!buf1s_equal("", &got, &want)) {