Split benchmarks for full / partial initialization

This commit is contained in:
Nigel Tao committed 2019-02-24 16:54:19 +11:00
1 parent 2276be64e9
commit ffeb2bff63
12 files changed
+196 -106

No files matched your search

+8
View File
@@ -22,6 +22,7 @@
const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
return "miniz does not independently compute Adler32";
@@ -29,6 +30,7 @@ const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
const char* mimic_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
return "miniz does not implement CRC32/IEEE";
@@ -36,6 +38,7 @@ const char* mimic_bench_crc32_ieee(wuffs_base__io_buffer* dst,
const char* mimic_deflate_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit,
bool deflate_instead_of_zlib) {
@@ -87,6 +90,7 @@ uint32_t global_mimiclib_deflate_unused_u32;
const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
global_mimiclib_deflate_unused_u32 = 0;
@@ -107,6 +111,7 @@ const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
const char* mimic_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
global_mimiclib_deflate_unused_u32 = 0;
@@ -223,6 +228,7 @@ cleanup0:;
const char* mimic_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit,
@@ -231,6 +237,7 @@ const char* mimic_deflate_decode(wuffs_base__io_buffer* dst,
const char* mimic_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit,
@@ -239,6 +246,7 @@ const char* mimic_gzip_decode(wuffs_base__io_buffer* dst,
const char* mimic_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit,
+1
View File
@@ -30,6 +30,7 @@ int mimic_gif_read_func(GifFileType* f, GifByteType* ptr, int len) {
}
const char* mimic_gif_decode(wuffs_base__io_buffer* dst,
uint32_t wuffs_initialize_flags,
wuffs_base__pixel_format pixfmt,
wuffs_base__io_buffer* src) {
const char* ret = NULL;
+14 -10
View File
@@ -226,6 +226,7 @@ uint32_t global_wuffs_adler32_unused_u32;
const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
uint64_t len = src->meta.wi - src->meta.ri;
@@ -234,8 +235,7 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
}
wuffs_adler32__hasher checksum;
const char* status = wuffs_adler32__hasher__initialize(
&checksum, sizeof checksum, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED);
&checksum, sizeof checksum, WUFFS_VERSION, wuffs_initialize_flags);
if (status) {
return status;
}
@@ -250,14 +250,18 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
const char* bench_wuffs_adler32_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_bench_adler32, tc_src, &adler32_midsummer_gt,
0, 0, 1500);
return do_bench_io_buffers(
wuffs_bench_adler32,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
&adler32_midsummer_gt, 0, 0, 1500);
}
const char* bench_wuffs_adler32_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_bench_adler32, tc_src, &adler32_pi_gt, 0, 0,
150);
return do_bench_io_buffers(
wuffs_bench_adler32,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
&adler32_pi_gt, 0, 0, 150);
}
// ---------------- Mimic Benches
@@ -266,14 +270,14 @@ const char* bench_wuffs_adler32_100k() {
const char* bench_mimic_adler32_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_adler32, tc_src, &adler32_midsummer_gt,
0, 0, 1500);
return do_bench_io_buffers(mimic_bench_adler32, 0, tc_src,
&adler32_midsummer_gt, 0, 0, 1500);
}
const char* bench_mimic_adler32_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_adler32, tc_src, &adler32_pi_gt, 0, 0,
150);
return do_bench_io_buffers(mimic_bench_adler32, 0, tc_src, &adler32_pi_gt, 0,
0, 150);
}
#endif // WUFFS_MIMIC
+13 -9
View File
@@ -261,6 +261,7 @@ uint32_t global_wuffs_crc32_unused_u32;
const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
uint64_t len = src->meta.wi - src->meta.ri;
@@ -269,8 +270,7 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
}
wuffs_crc32__ieee_hasher checksum;
const char* status = wuffs_crc32__ieee_hasher__initialize(
&checksum, sizeof checksum, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED);
&checksum, sizeof checksum, WUFFS_VERSION, wuffs_initialize_flags);
if (status) {
return status;
}
@@ -285,14 +285,18 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
const char* bench_wuffs_crc32_ieee_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_bench_crc32_ieee, tc_src,
&crc32_midsummer_gt, 0, 0, 1500);
return do_bench_io_buffers(
wuffs_bench_crc32_ieee,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
&crc32_midsummer_gt, 0, 0, 1500);
}
const char* bench_wuffs_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_bench_crc32_ieee, tc_src, &crc32_pi_gt, 0, 0,
150);
return do_bench_io_buffers(
wuffs_bench_crc32_ieee,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_src,
&crc32_pi_gt, 0, 0, 150);
}
// ---------------- Mimic Benches
@@ -301,14 +305,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, tc_src,
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tc_src,
&crc32_midsummer_gt, 0, 0, 1500);
}
const char* bench_mimic_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_bench_crc32_ieee, tc_src, &crc32_pi_gt, 0, 0,
150);
return do_bench_io_buffers(mimic_bench_crc32_ieee, 0, tc_src, &crc32_pi_gt, 0,
0, 150);
}
#endif // WUFFS_MIMIC
+43 -19
View File
@@ -137,12 +137,12 @@ golden_test deflate_romeo_fixed_gt = {
const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_deflate__decoder dec;
const char* status = wuffs_deflate__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED);
&dec, sizeof dec, WUFFS_VERSION, wuffs_initialize_flags);
if (status) {
RETURN_FAIL("initialize: \"%s\"", status);
}
@@ -680,28 +680,50 @@ const char* test_mimic_deflate_decode_romeo_fixed() {
// ---------------- Deflate Benches
const char* bench_wuffs_deflate_decode_1k() {
const char* bench_wuffs_deflate_decode_1k_full_init() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_deflate_decode, tc_dst, &deflate_romeo_gt, 0,
0, 2000);
return do_bench_io_buffers(wuffs_deflate_decode,
WUFFS_INITIALIZE__DEFAULT_OPTIONS, tc_dst,
&deflate_romeo_gt, 0, 0, 2000);
}
const char* bench_wuffs_deflate_decode_10k() {
const char* bench_wuffs_deflate_decode_1k_part_init() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_deflate_decode, tc_dst,
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
&deflate_romeo_gt, 0, 0, 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,
&deflate_midsummer_gt, 0, 0, 300);
}
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,
&deflate_midsummer_gt, 0, 0, 300);
}
const char* bench_wuffs_deflate_decode_100k_just_one_read() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_deflate_decode, tc_dst, &deflate_pi_gt, 0, 0,
30);
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
&deflate_pi_gt, 0, 0, 30);
}
const char* bench_wuffs_deflate_decode_100k_many_big_reads() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_deflate_decode, tc_dst, &deflate_pi_gt, 0,
4096, 30);
return do_bench_io_buffers(
wuffs_deflate_decode,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED, tc_dst,
&deflate_pi_gt, 0, 4096, 30);
}
// ---------------- Mimic Benches
@@ -710,25 +732,25 @@ 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, tc_dst, &deflate_romeo_gt, 0,
0, 2000);
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst, &deflate_romeo_gt,
0, 0, 2000);
}
const char* bench_mimic_deflate_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, tc_dst,
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst,
&deflate_midsummer_gt, 0, 0, 300);
}
const char* bench_mimic_deflate_decode_100k_just_one_read() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, tc_dst, &deflate_pi_gt, 0, 0,
30);
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst, &deflate_pi_gt, 0,
0, 30);
}
const char* bench_mimic_deflate_decode_100k_many_big_reads() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_deflate_decode, tc_dst, &deflate_pi_gt, 0,
return do_bench_io_buffers(mimic_deflate_decode, 0, tc_dst, &deflate_pi_gt, 0,
4096, 30);
}
@@ -775,8 +797,10 @@ proc tests[] = {
// The empty comments forces clang-format to place one element per line.
proc benches[] = {
bench_wuffs_deflate_decode_1k, //
bench_wuffs_deflate_decode_10k, //
bench_wuffs_deflate_decode_1k_full_init, //
bench_wuffs_deflate_decode_1k_part_init, //
bench_wuffs_deflate_decode_10k_full_init, //
bench_wuffs_deflate_decode_10k_part_init, //
bench_wuffs_deflate_decode_100k_just_one_read, //
bench_wuffs_deflate_decode_100k_many_big_reads, //
+75 -46
View File
@@ -193,12 +193,12 @@ const char* test_basic_sub_struct_initializer() {
// ---------------- GIF Tests
const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
uint32_t wuffs_initialize_flags,
wuffs_base__pixel_format pixfmt,
wuffs_base__io_buffer* src) {
wuffs_gif__decoder dec;
const char* status = wuffs_gif__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED);
&dec, sizeof dec, WUFFS_VERSION, wuffs_initialize_flags);
if (status) {
return status;
}
@@ -1402,7 +1402,7 @@ const char* do_test_mimic_gif_decode(const char* filename) {
.data = global_got_slice,
});
status = wuffs_gif_decode(
&got, WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, &src);
&got, 0, WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, &src);
if (status) {
return status;
}
@@ -1412,7 +1412,7 @@ const char* do_test_mimic_gif_decode(const char* filename) {
.data = global_want_slice,
});
status = mimic_gif_decode(
&want, WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, &src);
&want, 0, WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, &src);
if (status) {
return status;
}
@@ -1499,8 +1499,10 @@ const char* test_mimic_gif_decode_pjw_thumbnail() {
const char* do_bench_gif_decode(
const char* (*decode_func)(wuffs_base__io_buffer*,
uint32_t wuffs_initialize_flags,
wuffs_base__pixel_format,
wuffs_base__io_buffer*),
uint32_t wuffs_initialize_flags,
const char* filename,
wuffs_base__pixel_format pixfmt,
uint64_t iters_unscaled) {
@@ -1523,7 +1525,7 @@ const char* do_bench_gif_decode(
for (i = 0; i < iters; i++) {
got.meta.wi = 0;
src.meta.ri = 0;
status = decode_func(&got, pixfmt, &src);
status = decode_func(&got, wuffs_initialize_flags, pixfmt, &src);
if (status) {
return status;
}
@@ -1535,63 +1537,88 @@ const char* do_bench_gif_decode(
const char* bench_wuffs_gif_decode_1k_bw() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode, "test/data/pjw-thumbnail.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
2000);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/pjw-thumbnail.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 2000);
}
const char* bench_wuffs_gif_decode_1k_color() {
const char* bench_wuffs_gif_decode_1k_color_full_init() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(
wuffs_gif_decode, "test/data/hippopotamus.regular.gif",
wuffs_gif_decode, WUFFS_INITIALIZE__DEFAULT_OPTIONS,
"test/data/hippopotamus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1000);
}
const char* bench_wuffs_gif_decode_1k_color_part_init() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/hippopotamus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1000);
}
const char* bench_wuffs_gif_decode_10k_bgra() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode, "test/data/hat.gif",
WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, 100);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/hat.gif", WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, 100);
}
const char* bench_wuffs_gif_decode_10k_indexed() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode, "test/data/hat.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
100);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/hat.gif", WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 100);
}
const char* bench_wuffs_gif_decode_20k() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode, "test/data/bricks-gray.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
50);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/bricks-gray.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 50);
}
const char* bench_wuffs_gif_decode_100k_artificial() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(
wuffs_gif_decode, "test/data/hibiscus.primitive.gif",
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/hibiscus.primitive.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 15);
}
const char* bench_wuffs_gif_decode_100k_realistic() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode, "test/data/hibiscus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
10);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/hibiscus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 10);
}
const char* bench_wuffs_gif_decode_1000k() {
const char* bench_wuffs_gif_decode_1000k_full_init() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode, "test/data/harvesters.gif",
return do_bench_gif_decode(wuffs_gif_decode,
WUFFS_INITIALIZE__DEFAULT_OPTIONS,
"test/data/harvesters.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1);
}
const char* bench_wuffs_gif_decode_1000k_part_init() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/harvesters.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1);
}
const char* bench_wuffs_gif_decode_anim_screencap() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(wuffs_gif_decode,
"test/data/gifplayer-muybridge.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1);
return do_bench_gif_decode(
wuffs_gif_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
"test/data/gifplayer-muybridge.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1);
}
// ---------------- Mimic Benches
@@ -1600,7 +1627,7 @@ const char* bench_wuffs_gif_decode_anim_screencap() {
const char* bench_mimic_gif_decode_1k_bw() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(mimic_gif_decode, "test/data/pjw-thumbnail.gif",
return do_bench_gif_decode(mimic_gif_decode, 0, "test/data/pjw-thumbnail.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
2000);
}
@@ -1608,20 +1635,20 @@ const char* bench_mimic_gif_decode_1k_bw() {
const char* bench_mimic_gif_decode_1k_color() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(
mimic_gif_decode, "test/data/hippopotamus.regular.gif",
mimic_gif_decode, 0, "test/data/hippopotamus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1000);
}
const char* bench_mimic_gif_decode_10k_indexed() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(mimic_gif_decode, "test/data/hat.gif",
return do_bench_gif_decode(mimic_gif_decode, 0, "test/data/hat.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
100);
}
const char* bench_mimic_gif_decode_20k() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(mimic_gif_decode, "test/data/bricks-gray.gif",
return do_bench_gif_decode(mimic_gif_decode, 0, "test/data/bricks-gray.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
50);
}
@@ -1629,26 +1656,26 @@ const char* bench_mimic_gif_decode_20k() {
const char* bench_mimic_gif_decode_100k_artificial() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(
mimic_gif_decode, "test/data/hibiscus.primitive.gif",
mimic_gif_decode, 0, "test/data/hibiscus.primitive.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 15);
}
const char* bench_mimic_gif_decode_100k_realistic() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(mimic_gif_decode, "test/data/hibiscus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
10);
return do_bench_gif_decode(
mimic_gif_decode, 0, "test/data/hibiscus.regular.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 10);
}
const char* bench_mimic_gif_decode_1000k() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(mimic_gif_decode, "test/data/harvesters.gif",
return do_bench_gif_decode(mimic_gif_decode, 0, "test/data/harvesters.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1);
}
const char* bench_mimic_gif_decode_anim_screencap() {
CHECK_FOCUS(__func__);
return do_bench_gif_decode(mimic_gif_decode,
return do_bench_gif_decode(mimic_gif_decode, 0,
"test/data/gifplayer-muybridge.gif",
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY, 1);
}
@@ -1719,15 +1746,17 @@ proc tests[] = {
// The empty comments forces clang-format to place one element per line.
proc benches[] = {
bench_wuffs_gif_decode_1k_bw, //
bench_wuffs_gif_decode_1k_color, //
bench_wuffs_gif_decode_10k_bgra, //
bench_wuffs_gif_decode_10k_indexed, //
bench_wuffs_gif_decode_20k, //
bench_wuffs_gif_decode_100k_artificial, //
bench_wuffs_gif_decode_100k_realistic, //
bench_wuffs_gif_decode_1000k, //
bench_wuffs_gif_decode_anim_screencap, //
bench_wuffs_gif_decode_1k_bw, //
bench_wuffs_gif_decode_1k_color_full_init, //
bench_wuffs_gif_decode_1k_color_part_init, //
bench_wuffs_gif_decode_10k_bgra, //
bench_wuffs_gif_decode_10k_indexed, //
bench_wuffs_gif_decode_20k, //
bench_wuffs_gif_decode_100k_artificial, //
bench_wuffs_gif_decode_100k_realistic, //
bench_wuffs_gif_decode_1000k_full_init, //
bench_wuffs_gif_decode_1000k_part_init, //
bench_wuffs_gif_decode_anim_screencap, //
#ifdef WUFFS_MIMIC
+12 -8
View File
@@ -85,12 +85,12 @@ golden_test gzip_pi_gt = {
const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_gzip__decoder dec;
const char* status = wuffs_gzip__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED);
&dec, sizeof dec, WUFFS_VERSION, wuffs_initialize_flags);
if (status) {
return status;
}
@@ -234,13 +234,16 @@ const char* test_mimic_gzip_decode_pi() {
const char* bench_wuffs_gzip_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_gzip_decode, tc_dst, &gzip_midsummer_gt, 0,
0, 300);
return do_bench_io_buffers(
wuffs_gzip_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &gzip_midsummer_gt, 0, 0, 300);
}
const char* bench_wuffs_gzip_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_gzip_decode, tc_dst, &gzip_pi_gt, 0, 0, 30);
return do_bench_io_buffers(
wuffs_gzip_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &gzip_pi_gt, 0, 0, 30);
}
// ---------------- Mimic Benches
@@ -249,13 +252,14 @@ 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, tc_dst, &gzip_midsummer_gt, 0,
0, 300);
return do_bench_io_buffers(mimic_gzip_decode, 0, tc_dst, &gzip_midsummer_gt,
0, 0, 300);
}
const char* bench_mimic_gzip_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_gzip_decode, tc_dst, &gzip_pi_gt, 0, 0, 30);
return do_bench_io_buffers(mimic_gzip_decode, 0, tc_dst, &gzip_pi_gt, 0, 0,
30);
}
#endif // WUFFS_MIMIC
+12 -8
View File
@@ -85,12 +85,12 @@ golden_test zlib_pi_gt = {
const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint32_t wuffs_initialize_flags,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_zlib__decoder dec;
const char* status = wuffs_zlib__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED);
&dec, sizeof dec, WUFFS_VERSION, wuffs_initialize_flags);
if (status) {
return status;
}
@@ -233,13 +233,16 @@ const char* test_mimic_zlib_decode_pi() {
const char* bench_wuffs_zlib_decode_10k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_zlib_decode, tc_dst, &zlib_midsummer_gt, 0,
0, 300);
return do_bench_io_buffers(
wuffs_zlib_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &zlib_midsummer_gt, 0, 0, 300);
}
const char* bench_wuffs_zlib_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(wuffs_zlib_decode, tc_dst, &zlib_pi_gt, 0, 0, 30);
return do_bench_io_buffers(
wuffs_zlib_decode, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_dst, &zlib_pi_gt, 0, 0, 30);
}
// ---------------- Mimic Benches
@@ -248,13 +251,14 @@ 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, tc_dst, &zlib_midsummer_gt, 0,
0, 300);
return do_bench_io_buffers(mimic_zlib_decode, 0, tc_dst, &zlib_midsummer_gt,
0, 0, 300);
}
const char* bench_mimic_zlib_decode_100k() {
CHECK_FOCUS(__func__);
return do_bench_io_buffers(mimic_zlib_decode, tc_dst, &zlib_pi_gt, 0, 0, 30);
return do_bench_io_buffers(mimic_zlib_decode, 0, tc_dst, &zlib_pi_gt, 0, 0,
30);
}
#endif // WUFFS_MIMIC
+12 -4
View File
@@ -586,8 +586,10 @@ typedef enum {
const char* proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
uint32_t,
uint64_t,
uint64_t),
uint32_t wuffs_initialize_flags,
throughput_counter tc,
golden_test* gt,
uint64_t wlimit,
@@ -638,7 +640,8 @@ const char* proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
for (i = 0; i < iters; i++) {
got.meta.wi = 0;
src.meta.ri = gt->src_offset0;
const char* status = codec_func(&got, &src, wlimit, rlimit);
const char* status =
codec_func(&got, &src, wuffs_initialize_flags, wlimit, rlimit);
if (status) {
return status;
}
@@ -672,25 +675,30 @@ const char* proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
const char* do_bench_io_buffers(
const char* (*codec_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
uint32_t,
uint64_t,
uint64_t),
uint32_t wuffs_initialize_flags,
throughput_counter tc,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t iters_unscaled) {
return proc_io_buffers(codec_func, tc, gt, wlimit, rlimit,
iters_unscaled * iterscale, true);
return proc_io_buffers(codec_func, wuffs_initialize_flags, tc, gt, wlimit,
rlimit, iters_unscaled * iterscale, true);
}
const char* do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
uint32_t,
uint64_t,
uint64_t),
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit) {
return proc_io_buffers(codec_func, tc_neither, gt, wlimit, rlimit, 1, false);
return proc_io_buffers(codec_func,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED,
tc_neither, gt, wlimit, rlimit, 1, false);
}
#endif // WUFFS_INCLUDE_GUARD