diff --git a/test/c/std/flate.c b/test/c/std/flate.c index 2f8095d6..63cb7d67 100644 --- a/test/c/std/flate.c +++ b/test/c/std/flate.c @@ -249,17 +249,17 @@ void test_mimic_zlib_decode_pi() { void bench_puffs_flate_decode_1k() { proc_funcname = __func__; - bench_buf1_buf1(puffs_flate_decode, &flate_romeo_gt, 200000); + bench_buf1_buf1(puffs_flate_decode, tc_dst, &flate_romeo_gt, 200000); } void bench_puffs_flate_decode_10k() { proc_funcname = __func__; - bench_buf1_buf1(puffs_flate_decode, &flate_midsummer_gt, 30000); + bench_buf1_buf1(puffs_flate_decode, tc_dst, &flate_midsummer_gt, 30000); } void bench_puffs_flate_decode_100k() { proc_funcname = __func__; - bench_buf1_buf1(puffs_flate_decode, &flate_pi_gt, 3000); + bench_buf1_buf1(puffs_flate_decode, tc_dst, &flate_pi_gt, 3000); } // ---------------- Mimic Benches @@ -268,57 +268,57 @@ void bench_puffs_flate_decode_100k() { void bench_mimic_adler32_10k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_adler32, &checksum_midsummer_gt, 30000); + bench_buf1_buf1(mimic_adler32, tc_src, &checksum_midsummer_gt, 30000); } void bench_mimic_adler32_100k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_adler32, &checksum_pi_gt, 3000); + bench_buf1_buf1(mimic_adler32, tc_src, &checksum_pi_gt, 3000); } void bench_mimic_crc32_10k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_crc32, &checksum_midsummer_gt, 30000); + bench_buf1_buf1(mimic_crc32, tc_src, &checksum_midsummer_gt, 30000); } void bench_mimic_crc32_100k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_crc32, &checksum_pi_gt, 3000); + bench_buf1_buf1(mimic_crc32, tc_src, &checksum_pi_gt, 3000); } void bench_mimic_flate_decode_1k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_flate_decode, &flate_romeo_gt, 200000); + bench_buf1_buf1(mimic_flate_decode, tc_dst, &flate_romeo_gt, 200000); } void bench_mimic_flate_decode_10k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_flate_decode, &flate_midsummer_gt, 30000); + bench_buf1_buf1(mimic_flate_decode, tc_dst, &flate_midsummer_gt, 30000); } void bench_mimic_flate_decode_100k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_flate_decode, &flate_pi_gt, 3000); + bench_buf1_buf1(mimic_flate_decode, tc_dst, &flate_pi_gt, 3000); } void bench_mimic_gzip_decode_10k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_gzip_decode, &gzip_midsummer_gt, 30000); + bench_buf1_buf1(mimic_gzip_decode, tc_dst, &gzip_midsummer_gt, 30000); } void bench_mimic_gzip_decode_100k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_gzip_decode, &gzip_pi_gt, 3000); + bench_buf1_buf1(mimic_gzip_decode, tc_dst, &gzip_pi_gt, 3000); } void bench_mimic_zlib_decode_10k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_zlib_decode, &zlib_midsummer_gt, 30000); + bench_buf1_buf1(mimic_zlib_decode, tc_dst, &zlib_midsummer_gt, 30000); } void bench_mimic_zlib_decode_100k() { proc_funcname = __func__; - bench_buf1_buf1(mimic_zlib_decode, &zlib_pi_gt, 3000); + bench_buf1_buf1(mimic_zlib_decode, tc_dst, &zlib_pi_gt, 3000); } #endif // PUFFS_MIMIC diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index e8befe91..ae1966f9 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -268,8 +268,19 @@ bool buf1s_equal(const char* prefix, return false; } +// throughput_counter is whether to count dst or src bytes, or neither, when +// calculating a benchmark's MB/s throughput number. +// +// Decoders typically use tc_dst. Encoders and hashes typically use tc_src. +typedef enum { + tc_neither = 0, + tc_dst = 1, + tc_src = 2, +} throughput_counter; + void proc_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, puffs_base_buf1*), + throughput_counter tc, golden_test* gt, uint64_t reps, bool bench) { @@ -317,7 +328,16 @@ void proc_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, FAIL("%s", s); return; } - n_bytes += got.wi; + switch (tc) { + case tc_neither: + break; + case tc_dst: + n_bytes += got.wi; + break; + case tc_src: + n_bytes += src.ri - gt->src_offset0; + break; + } } if (bench) { bench_finish(reps, n_bytes); @@ -336,15 +356,16 @@ void proc_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, void bench_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, puffs_base_buf1*), + throughput_counter tc, golden_test* gt, uint64_t reps) { - proc_buf1_buf1(codec_func, gt, reps, true); + proc_buf1_buf1(codec_func, tc, gt, reps, true); } void test_buf1_buf1(const char* (*codec_func)(puffs_base_buf1*, puffs_base_buf1*), golden_test* gt) { - proc_buf1_buf1(codec_func, gt, 1, false); + proc_buf1_buf1(codec_func, 0, gt, 1, false); } #endif // PUFFS_BASE_HEADER_H