diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 0a71d966..56a8deef 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -303,7 +303,7 @@ void test_wuffs_lzw_decode_pi() { // ---------------- LZW Benches -bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t reps) { +bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters) { wuffs_base__io_buffer dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst); @@ -325,7 +325,7 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t reps) { bench_start(); uint64_t n_bytes = 0; uint64_t i; - for (i = 0; i < reps; i++) { + for (i = 0; i < iters; i++) { dst.wi = 0; src.ri = 1; // Skip the literal width. wuffs_gif__lzw_decoder dec; @@ -338,7 +338,7 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t reps) { } n_bytes += dst.wi; } - bench_finish(reps, n_bytes); + bench_finish(iters, n_bytes); return true; } @@ -751,7 +751,7 @@ void test_mimic_gif_decode_pjw_thumbnail() { bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__io_buffer*, wuffs_base__io_buffer*), const char* filename, - uint64_t reps) { + uint64_t iters) { wuffs_base__io_buffer dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; @@ -762,7 +762,7 @@ bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__io_buffer*, bench_start(); uint64_t n_bytes = 0; uint64_t i; - for (i = 0; i < reps; i++) { + for (i = 0; i < iters; i++) { dst.wi = 0; src.ri = 0; const char* error_msg = decode_func(&dst, &src); @@ -772,7 +772,7 @@ bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__io_buffer*, } n_bytes += dst.wi; } - bench_finish(reps, n_bytes); + bench_finish(iters, n_bytes); return true; } diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 9baad468..c29c12ee 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -147,7 +147,7 @@ void bench_start() { gettimeofday(&bench_start_tv, NULL); } -void bench_finish(uint64_t reps, uint64_t n_bytes) { +void bench_finish(uint64_t iters, uint64_t n_bytes) { struct timeval bench_finish_tv; gettimeofday(&bench_finish_tv, NULL); int64_t micros = @@ -168,11 +168,11 @@ void bench_finish(uint64_t reps, uint64_t n_bytes) { 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); + name, cc, iters, nanos / iters); } else { printf("Benchmark%s/%s\t%8" PRIu64 "\t%8" PRIu64 - " ns/op\t%8d.%03d MB/s\n", // - name, cc, reps, nanos / reps, // + " ns/op\t%8d.%03d MB/s\n", // + name, cc, iters, nanos / iters, // (int)(kb_per_s / 1000), (int)(kb_per_s % 1000)); } // Flush stdout so that "wuffs bench | tee etc" still prints its numbers as @@ -419,7 +419,7 @@ bool proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, golden_test* gt, uint64_t wlimit, uint64_t rlimit, - uint64_t reps, + uint64_t iters, bool bench) { if (!codec_func) { FAIL("NULL codec_func"); @@ -457,7 +457,7 @@ bool proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, } uint64_t n_bytes = 0; uint64_t i; - for (i = 0; i < reps; i++) { + for (i = 0; i < iters; i++) { got.wi = 0; src.ri = gt->src_offset0; const char* s = codec_func(&got, &src, wlimit, rlimit); @@ -477,7 +477,7 @@ bool proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, } } if (bench) { - bench_finish(reps, n_bytes); + bench_finish(iters, n_bytes); return true; } @@ -500,8 +500,8 @@ bool do_bench_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, golden_test* gt, uint64_t wlimit, uint64_t rlimit, - uint64_t reps) { - return proc_io_buffers(codec_func, tc, gt, wlimit, rlimit, reps, true); + uint64_t iters) { + return proc_io_buffers(codec_func, tc, gt, wlimit, rlimit, iters, true); } bool do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,