Add std/deflate many_big_read benchmarks

This commit is contained in:
Nigel Tao committed 2019-01-13 10:08:40 +11:00
1 parent cf52415f9f
commit 109d6f04bc
2 files changed
+100 -48

No files matched your search

+70 -38
View File
@@ -37,7 +37,11 @@ const char* mimic_deflate_zlib_decode(wuffs_base__io_buffer* dst,
uint64_t wlimit,
uint64_t rlimit,
bool deflate_instead_of_zlib) {
// TODO: don't ignore wlimit and rlimit.
if (wlimit || rlimit) {
// Supporting this would probably mean using tinfl_decompress instead of
// the simpler tinfl_decompress_mem_to_mem function.
return "unsupported I/O limit";
}
int flags = 0;
if (!deflate_instead_of_zlib) {
flags |= TINFL_FLAG_PARSE_ZLIB_HEADER;
@@ -83,14 +87,19 @@ const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
uint8_t* ptr = src->data.ptr + src->meta.ri;
size_t len = src->meta.wi - src->meta.ri;
if (len > 0x7FFFFFFF) {
return "src length is too large";
global_mimiclib_deflate_unused_u32 = 0;
while (src->meta.ri < src->meta.wi) {
uint8_t* ptr = src->data.ptr + src->meta.ri;
size_t len = src->meta.wi - src->meta.ri;
if (len > 0x7FFFFFFF) {
return "src length is too large";
} else if ((len > rlimit) && (rlimit > 0)) {
len = rlimit;
}
global_mimiclib_deflate_unused_u32 =
adler32(global_mimiclib_deflate_unused_u32, ptr, len);
src->meta.ri += len;
}
global_mimiclib_deflate_unused_u32 = adler32(0L, ptr, len);
src->meta.ri = src->meta.wi;
return NULL;
}
@@ -98,14 +107,19 @@ const char* mimic_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
uint8_t* ptr = src->data.ptr + src->meta.ri;
size_t len = src->meta.wi - src->meta.ri;
if (len > 0x7FFFFFFF) {
return "src length is too large";
global_mimiclib_deflate_unused_u32 = 0;
while (src->meta.ri < src->meta.wi) {
uint8_t* ptr = src->data.ptr + src->meta.ri;
size_t len = src->meta.wi - src->meta.ri;
if (len > 0x7FFFFFFF) {
return "src length is too large";
} else if ((len > rlimit) && (rlimit > 0)) {
len = rlimit;
}
global_mimiclib_deflate_unused_u32 =
crc32(global_mimiclib_deflate_unused_u32, ptr, len);
src->meta.ri += len;
}
global_mimiclib_deflate_unused_u32 = crc32(0L, ptr, len);
src->meta.ri = src->meta.wi;
return NULL;
}
@@ -120,8 +134,15 @@ const char* mimic_deflate_gzip_zlib_decode(wuffs_base__io_buffer* dst,
uint64_t wlimit,
uint64_t rlimit,
zlib_flavor flavor) {
// TODO: don't ignore wlimit and rlimit.
const char* ret = NULL;
if (dst->data.len > UINT_MAX) {
ret = "dst length is too large";
goto cleanup0;
}
if (src->data.len > UINT_MAX) {
ret = "src length is too large";
goto cleanup0;
}
// See inflateInit2 in the zlib manual, or in zlib.h, for details about how
// the window_bits int also encodes the wire format wrapper.
@@ -147,32 +168,43 @@ const char* mimic_deflate_gzip_zlib_decode(wuffs_base__io_buffer* dst,
goto cleanup0;
}
z.avail_in = src->meta.wi - src->meta.ri;
z.next_in = src->data.ptr + src->meta.ri;
z.avail_out = dst->data.len - dst->meta.wi;
z.next_out = dst->data.ptr + dst->meta.wi;
while (true) {
z.next_in = src->data.ptr + src->meta.ri;
z.avail_in = src->meta.wi - src->meta.ri;
if ((z.avail_in > rlimit) && (rlimit > 0)) {
z.avail_in = rlimit;
}
uInt initial_avail_in = z.avail_in;
int i_err = inflate(&z, Z_NO_FLUSH);
if (i_err != Z_STREAM_END) {
ret = "inflate failed";
goto cleanup1;
}
z.next_out = dst->data.ptr + dst->meta.wi;
z.avail_out = dst->data.len - dst->meta.wi;
if ((z.avail_out > wlimit) && (wlimit > 0)) {
z.avail_out = wlimit;
}
uInt initial_avail_out = z.avail_out;
size_t readable = src->meta.wi - src->meta.ri;
size_t r_remaining = z.avail_in;
if (readable < r_remaining) {
ret = "inconsistent avail_in";
goto cleanup1;
}
src->meta.ri += readable - r_remaining;
// TODO: s/Z_NO_FLUSH/Z_SYNC_FLUSH/ more closely matches Wuffs' behavior.
int i_err = inflate(&z, Z_NO_FLUSH);
size_t writable = dst->data.len - dst->meta.wi;
size_t w_remaining = z.avail_out;
if (writable < w_remaining) {
ret = "inconsistent avail_out";
goto cleanup1;
if (initial_avail_in < z.avail_in) {
ret = "inconsistent avail_in";
goto cleanup1;
}
src->meta.ri += initial_avail_in - z.avail_in;
if (initial_avail_out < z.avail_out) {
ret = "inconsistent avail_out";
goto cleanup1;
}
dst->meta.wi += initial_avail_out - z.avail_out;
if (i_err == Z_STREAM_END) {
break;
} else if (i_err != Z_OK) {
ret = "inflate failed";
goto cleanup1;
}
}
dst->meta.wi += writable - w_remaining;
cleanup1:;
int ie_err = inflateEnd(&z);
+30 -10
View File
@@ -616,11 +616,16 @@ const char* test_mimic_deflate_decode_midsummer() {
return do_test_io_buffers(mimic_deflate_decode, &deflate_midsummer_gt, 0, 0);
}
const char* test_mimic_deflate_decode_pi() {
const char* test_mimic_deflate_decode_pi_just_one_read() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(mimic_deflate_decode, &deflate_pi_gt, 0, 0);
}
const char* test_mimic_deflate_decode_pi_many_big_reads() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(mimic_deflate_decode, &deflate_pi_gt, 0, 4096);
}
const char* test_mimic_deflate_decode_romeo() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(mimic_deflate_decode, &deflate_romeo_gt, 0, 0);
@@ -648,12 +653,18 @@ const char* bench_wuffs_deflate_decode_10k() {
&deflate_midsummer_gt, 0, 0, 300);
}
const char* bench_wuffs_deflate_decode_100k() {
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);
}
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);
}
// ---------------- Mimic Benches
#ifdef WUFFS_MIMIC
@@ -670,12 +681,18 @@ const char* bench_mimic_deflate_decode_10k() {
&deflate_midsummer_gt, 0, 0, 300);
}
const char* bench_mimic_deflate_decode_100k() {
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);
}
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,
4096, 30);
}
#endif // WUFFS_MIMIC
// ---------------- Manifest
@@ -704,7 +721,8 @@ proc tests[] = {
test_mimic_deflate_decode_deflate_backref_crosses_blocks, //
test_mimic_deflate_decode_deflate_distance_32768, //
test_mimic_deflate_decode_midsummer, //
test_mimic_deflate_decode_pi, //
test_mimic_deflate_decode_pi_just_one_read, //
test_mimic_deflate_decode_pi_many_big_reads, //
test_mimic_deflate_decode_romeo, //
test_mimic_deflate_decode_romeo_fixed, //
@@ -716,15 +734,17 @@ 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_100k, //
bench_wuffs_deflate_decode_1k, //
bench_wuffs_deflate_decode_10k, //
bench_wuffs_deflate_decode_100k_just_one_read, //
bench_wuffs_deflate_decode_100k_many_big_reads, //
#ifdef WUFFS_MIMIC
bench_mimic_deflate_decode_1k, //
bench_mimic_deflate_decode_10k, //
bench_mimic_deflate_decode_100k, //
bench_mimic_deflate_decode_1k, //
bench_mimic_deflate_decode_10k, //
bench_mimic_deflate_decode_100k_just_one_read, //
bench_mimic_deflate_decode_100k_many_big_reads, //
#endif // WUFFS_MIMIC