Rename test/c throughput_counter enums

This commit is contained in:
Nigel Tao committed 2020-02-25 22:46:49 +11:00
1 parent 7d31462e63
commit 51b1258b61
7 files changed
+60 -59

No files matched your search

+5 -5
View File
@@ -255,7 +255,7 @@ const char* bench_wuffs_adler32_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_bench_adler32,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src,
&adler32_midsummer_gt, UINT64_MAX, UINT64_MAX, 1500);
}
@@ -263,7 +263,7 @@ const char* bench_wuffs_adler32_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_bench_adler32,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src,
&adler32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
}
@@ -273,15 +273,15 @@ const char* bench_wuffs_adler32_100k() {
const char* bench_mimic_adler32_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_adler32, 0, tc_src,
return do_bench_io_buffers(mimic_bench_adler32, 0, tcounter_src,
&adler32_midsummer_gt, UINT64_MAX, UINT64_MAX,
1500);
}
const char* bench_mimic_adler32_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_adler32, 0, tc_src, &adler32_pi_gt,
UINT64_MAX, UINT64_MAX, 150);
return do_bench_io_buffers(mimic_bench_adler32, 0, tcounter_src,
&adler32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
}
#endif // WUFFS_MIMIC
+5 -5
View File
@@ -290,7 +290,7 @@ const char* bench_wuffs_crc32_ieee_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_bench_crc32_ieee,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src,
&crc32_midsummer_gt, UINT64_MAX, UINT64_MAX, 1500);
}
@@ -298,7 +298,7 @@ const char* bench_wuffs_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_bench_crc32_ieee,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_src,
&crc32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
}
@@ -308,14 +308,14 @@ const char* bench_wuffs_crc32_ieee_100k() {
const char* bench_mimic_crc32_ieee_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tc_src,
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tcounter_src,
&crc32_midsummer_gt, UINT64_MAX, UINT64_MAX, 1500);
}
const char* bench_mimic_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tc_src, &crc32_pi_gt,
UINT64_MAX, UINT64_MAX, 150);
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tcounter_src,
&crc32_pi_gt, UINT64_MAX, UINT64_MAX, 150);
}
#endif // WUFFS_MIMIC
+13 -13
View File
@@ -754,7 +754,7 @@ const char* test_mimic_deflate_decode_romeo_fixed() {
const char* bench_wuffs_deflate_decode_1k_full_init() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_deflate_decode,
WUFFS_INITIALIZE__DEFAULT_OPTIONS, tc_dst,
WUFFS_INITIALIZE__DEFAULT_OPTIONS, tcounter_dst,
&deflate_romeo_gt, UINT64_MAX, UINT64_MAX, 2000);
}
@@ -762,14 +762,14 @@ const char* bench_wuffs_deflate_decode_1k_part_init() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_dst,
&deflate_romeo_gt, UINT64_MAX, UINT64_MAX, 2000);
}
const char* bench_wuffs_deflate_decode_10k_full_init() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_deflate_decode, WUFFS_INITIALIZE__DEFAULT_OPTIONS, tc_dst,
wuffs_deflate_decode, WUFFS_INITIALIZE__DEFAULT_OPTIONS, tcounter_dst,
&deflate_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
}
@@ -777,7 +777,7 @@ const char* bench_wuffs_deflate_decode_10k_part_init() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_dst,
&deflate_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
}
@@ -785,7 +785,7 @@ const char* bench_wuffs_deflate_decode_100k_just_one_read() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_dst,
&deflate_pi_gt, UINT64_MAX, UINT64_MAX, 30);
}
@@ -793,7 +793,7 @@ const char* bench_wuffs_deflate_decode_100k_many_big_reads() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tcounter_dst,
&deflate_pi_gt, UINT64_MAX, 4096, 30);
}
@@ -803,27 +803,27 @@ const char* bench_wuffs_deflate_decode_100k_many_big_reads() {
const char* bench_mimic_deflate_decode_1k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst, &deflate_romeo_gt,
UINT64_MAX, UINT64_MAX, 2000);
return do_bench_io_buffers(mimic_deflate_decode, 0, tcounter_dst,
&deflate_romeo_gt, UINT64_MAX, UINT64_MAX, 2000);
}
const char* bench_mimic_deflate_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst,
return do_bench_io_buffers(mimic_deflate_decode, 0, tcounter_dst,
&deflate_midsummer_gt, UINT64_MAX, UINT64_MAX,
300);
}
const char* bench_mimic_deflate_decode_100k_just_one_read() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst, &deflate_pi_gt,
UINT64_MAX, UINT64_MAX, 30);
return do_bench_io_buffers(mimic_deflate_decode, 0, tcounter_dst,
&deflate_pi_gt, UINT64_MAX, UINT64_MAX, 30);
}
const char* bench_mimic_deflate_decode_100k_many_big_reads() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst, &deflate_pi_gt,
UINT64_MAX, 4096, 30);
return do_bench_io_buffers(mimic_deflate_decode, 0, tcounter_dst,
&deflate_pi_gt, UINT64_MAX, 4096, 30);
}
#endif // WUFFS_MIMIC
+5 -5
View File
@@ -245,14 +245,14 @@ const char* bench_wuffs_gzip_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_gzip_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &gzip_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
tcounter_dst, &gzip_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
}
const char* bench_wuffs_gzip_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_gzip_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &gzip_pi_gt, UINT64_MAX, UINT64_MAX, 30);
tcounter_dst, &gzip_pi_gt, UINT64_MAX, UINT64_MAX, 30);
}
// ---------------- Mimic Benches
@@ -261,13 +261,13 @@ const char* bench_wuffs_gzip_decode_100k() {
const char* bench_mimic_gzip_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_gzip_decode, 0, tc_dst, &gzip_midsummer_gt,
UINT64_MAX, UINT64_MAX, 300);
return do_bench_io_buffers(mimic_gzip_decode, 0, tcounter_dst,
&gzip_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
}
const char* bench_mimic_gzip_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_gzip_decode, 0, tc_dst, &gzip_pi_gt,
return do_bench_io_buffers(mimic_gzip_decode, 0, tcounter_dst, &gzip_pi_gt,
UINT64_MAX, UINT64_MAX, 30);
}
+4 -4
View File
@@ -407,28 +407,28 @@ const char* bench_wuffs_json_decode_1k() {
CHECK_FOCUS(__func__);
return do_bench_token_decoder(
wuffs_json_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_src, &json_github_tags_gt, UINT64_MAX, UINT64_MAX, 10000);
tcounter_src, &json_github_tags_gt, UINT64_MAX, UINT64_MAX, 10000);
}
const char* bench_wuffs_json_decode_21k_formatted() {
CHECK_FOCUS(__func__);
return do_bench_token_decoder(
wuffs_json_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_src, &json_file_sizes_gt, UINT64_MAX, UINT64_MAX, 300);
tcounter_src, &json_file_sizes_gt, UINT64_MAX, UINT64_MAX, 300);
}
const char* bench_wuffs_json_decode_26k_compact() {
CHECK_FOCUS(__func__);
return do_bench_token_decoder(
wuffs_json_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_src, &json_australian_abc_gt, UINT64_MAX, UINT64_MAX, 250);
tcounter_src, &json_australian_abc_gt, UINT64_MAX, UINT64_MAX, 250);
}
const char* bench_wuffs_json_decode_217k_stringy() {
CHECK_FOCUS(__func__);
return do_bench_token_decoder(
wuffs_json_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_src, &json_nobel_prizes_gt, UINT64_MAX, UINT64_MAX, 20);
tcounter_src, &json_nobel_prizes_gt, UINT64_MAX, UINT64_MAX, 20);
}
// ---------------- Mimic Benches
+5 -5
View File
@@ -322,14 +322,14 @@ const char* bench_wuffs_zlib_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_zlib_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &zlib_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
tcounter_dst, &zlib_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
}
const char* bench_wuffs_zlib_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(
wuffs_zlib_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &zlib_pi_gt, UINT64_MAX, UINT64_MAX, 30);
tcounter_dst, &zlib_pi_gt, UINT64_MAX, UINT64_MAX, 30);
}
// ---------------- Mimic Benches
@@ -338,13 +338,13 @@ const char* bench_wuffs_zlib_decode_100k() {
const char* bench_mimic_zlib_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_zlib_decode, 0, tc_dst, &zlib_midsummer_gt,
UINT64_MAX, UINT64_MAX, 300);
return do_bench_io_buffers(mimic_zlib_decode, 0, tcounter_dst,
&zlib_midsummer_gt, UINT64_MAX, UINT64_MAX, 300);
}
const char* bench_mimic_zlib_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_zlib_decode, 0, tc_dst, &zlib_pi_gt,
return do_bench_io_buffers(mimic_zlib_decode, 0, tcounter_dst, &zlib_pi_gt,
UINT64_MAX, UINT64_MAX, 30);
}
+23 -22
View File
@@ -671,11 +671,12 @@ const char* check_io_buffers_equal(const char* prefix,
// 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.
// Decoders typically use tcounter_dst. Encoders and hashes typically use
// tcounter_src.
typedef enum {
tc_neither = 0,
tc_dst = 1,
tc_src = 2,
tcounter_neither = 0,
tcounter_dst = 1,
tcounter_src = 2,
} throughput_counter;
const char* proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
@@ -684,7 +685,7 @@ const char* proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
uint64_t,
uint64_t),
uint32_t wuffs_initialize_flags,
throughput_counter tc,
throughput_counter tcounter,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
@@ -739,13 +740,13 @@ const char* proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
if (status) {
return status;
}
switch (tc) {
case tc_neither:
switch (tcounter) {
case tcounter_neither:
break;
case tc_dst:
case tcounter_dst:
n_bytes += have.meta.wi;
break;
case tc_src:
case tcounter_src:
n_bytes += src.meta.ri - gt->src_offset0;
break;
}
@@ -773,7 +774,7 @@ const char* proc_token_decoder(
uint64_t,
uint64_t),
uint32_t wuffs_initialize_flags,
throughput_counter tc,
throughput_counter tcounter,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
@@ -825,13 +826,13 @@ const char* proc_token_decoder(
if (status) {
return status;
}
switch (tc) {
case tc_neither:
switch (tcounter) {
case tcounter_neither:
break;
case tc_dst:
RETURN_FAIL("cannot use tc_dst for token decoders");
case tcounter_dst:
RETURN_FAIL("cannot use tcounter_dst for token decoders");
break;
case tc_src:
case tcounter_src:
n_bytes += src.meta.ri - gt->src_offset0;
break;
}
@@ -849,13 +850,13 @@ const char* do_bench_io_buffers(
uint64_t,
uint64_t),
uint32_t wuffs_initialize_flags,
throughput_counter tc,
throughput_counter tcounter,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t iters_unscaled) {
return proc_io_buffers(codec_func, wuffs_initialize_flags, tc, gt, wlimit,
rlimit, iters_unscaled * iterscale, true);
return proc_io_buffers(codec_func, wuffs_initialize_flags, tcounter, gt,
wlimit, rlimit, iters_unscaled * iterscale, true);
}
const char* do_bench_token_decoder(
@@ -865,13 +866,13 @@ const char* do_bench_token_decoder(
uint64_t,
uint64_t),
uint32_t wuffs_initialize_flags,
throughput_counter tc,
throughput_counter tcounter,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t iters_unscaled) {
return proc_token_decoder(codec_func, wuffs_initialize_flags, tc, gt, wlimit,
rlimit, iters_unscaled * iterscale, true);
return proc_token_decoder(codec_func, wuffs_initialize_flags, tcounter, gt,
wlimit, rlimit, iters_unscaled * iterscale, true);
}
const char* do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
@@ -884,7 +885,7 @@ const char* do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
uint64_t rlimit) {
return proc_io_buffers(codec_func,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_neither, gt, wlimit, rlimit, 1, false);
tcounter_neither, gt, wlimit, rlimit, 1, false);
}
// --------