Use the workbuf instead of lzw.decoder.suffixes

This commit will soon be followed by a rollback, but it is committed
anyway so that we can refer to these numbers in the git log.

name                                     old speed      new speed      delta

wuffs_lzw_decode_20k/clang5               255MB/s ± 0%   241MB/s ± 0%   -5.63%  (p=0.008 n=5+5)
wuffs_lzw_decode_100k/clang5              418MB/s ± 1%   401MB/s ± 1%   -4.02%  (p=0.008 n=5+5)

wuffs_lzw_decode_20k/gcc7                 255MB/s ± 1%   235MB/s ± 0%   -7.88%  (p=0.008 n=5+5)
wuffs_lzw_decode_100k/gcc7                444MB/s ± 1%   382MB/s ± 0%  -13.90%  (p=0.008 n=5+5)

wuffs_gif_decode_1k_bw/clang5             239MB/s ± 2%   235MB/s ± 1%   -1.89%  (p=0.016 n=5+5)
wuffs_gif_decode_1k_color/clang5          135MB/s ± 0%   132MB/s ± 0%   -1.86%  (p=0.008 n=5+5)
wuffs_gif_decode_10k_bgra/clang5          692MB/s ± 1%   678MB/s ± 0%   -2.08%  (p=0.008 n=5+5)
wuffs_gif_decode_10k_indexed/clang5       186MB/s ± 0%   181MB/s ± 0%   -2.58%  (p=0.008 n=5+5)
wuffs_gif_decode_20k/clang5               237MB/s ± 1%   226MB/s ± 0%   -4.46%  (p=0.008 n=5+5)
wuffs_gif_decode_100k_artificial/clang5   536MB/s ± 0%   506MB/s ± 0%   -5.53%  (p=0.008 n=5+5)
wuffs_gif_decode_100k_realistic/clang5    219MB/s ± 0%   203MB/s ± 1%   -7.11%  (p=0.008 n=5+5)
wuffs_gif_decode_1000k/clang5             222MB/s ± 0%   206MB/s ± 0%   -7.25%  (p=0.008 n=5+5)
wuffs_gif_decode_anim_screencap/clang5   1.07GB/s ± 0%  1.04GB/s ± 1%   -3.11%  (p=0.008 n=5+5)

wuffs_gif_decode_1k_bw/gcc7               262MB/s ± 0%   255MB/s ± 1%   -2.63%  (p=0.008 n=5+5)
wuffs_gif_decode_1k_color/gcc7            142MB/s ± 1%   137MB/s ± 1%   -3.38%  (p=0.008 n=5+5)
wuffs_gif_decode_10k_bgra/gcc7            596MB/s ± 1%   593MB/s ± 0%     ~     (p=0.151 n=5+5)
wuffs_gif_decode_10k_indexed/gcc7         185MB/s ± 0%   182MB/s ± 2%   -1.63%  (p=0.008 n=5+5)
wuffs_gif_decode_20k/gcc7                 230MB/s ± 0%   226MB/s ± 0%   -1.78%  (p=0.008 n=5+5)
wuffs_gif_decode_100k_artificial/gcc7     490MB/s ± 1%   488MB/s ± 0%     ~     (p=0.095 n=5+5)
wuffs_gif_decode_100k_realistic/gcc7      203MB/s ± 1%   203MB/s ± 0%     ~     (p=0.421 n=5+5)
wuffs_gif_decode_1000k/gcc7               207MB/s ± 0%   207MB/s ± 0%     ~     (p=1.000 n=5+5)
wuffs_gif_decode_anim_screencap/gcc7     1.04GB/s ± 0%  1.03GB/s ± 0%   -0.83%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2019-02-03 14:57:34 +11:00
1 parent d1f1340d47
commit f877fb2c59
7 files changed
+109 -59

No files matched your search

+37 -29
View File
@@ -2820,11 +2820,11 @@ extern const char* wuffs_lzw__error__bad_code;
// ---------------- Public Consts
#define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL 0
#define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL 32768
static const uint64_t //
wuffs_lzw__decoder_workbuf_len_max_incl //
WUFFS_BASE__POTENTIALLY_UNUSED = 0;
WUFFS_BASE__POTENTIALLY_UNUSED = 32768;
// ---------------- Struct Declarations
@@ -2994,11 +2994,11 @@ extern const char* wuffs_gif__error__too_much_pixel_data;
// ---------------- Public Consts
#define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL 65535
#define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL 98303
static const uint64_t //
wuffs_gif__decoder_workbuf_len_max_incl //
WUFFS_BASE__POTENTIALLY_UNUSED = 65535;
WUFFS_BASE__POTENTIALLY_UNUSED = 98303;
// ---------------- Struct Declarations
@@ -7738,7 +7738,8 @@ const char* wuffs_lzw__error__internal_error_inconsistent_i_o =
static wuffs_base__empty_struct //
wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
wuffs_base__io_reader a_src);
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_workbuf);
static wuffs_base__status //
wuffs_lzw__decoder__write_to(wuffs_lzw__decoder* self,
@@ -7853,15 +7854,23 @@ wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self,
self->private_impl.f_n_bits = 0;
self->private_impl.f_output_ri = 0;
self->private_impl.f_output_wi = 0;
if (((uint64_t)(a_workbuf.len)) < 32768) {
status = wuffs_base__error__bad_workbuf_length;
goto exit;
}
v_i = 0;
while (v_i < self->private_impl.f_clear_code) {
self->private_impl.f_lm1s[v_i] = 0;
self->private_impl.f_suffixes[((8 * v_i) + 0)] = ((uint8_t)(v_i));
a_workbuf.ptr[((uint64_t)(((8 * v_i) + 0)))] = ((uint8_t)(v_i));
v_i += 1;
}
label_0_continue:;
while (true) {
wuffs_lzw__decoder__read_from(self, a_src);
if (((uint64_t)(a_workbuf.len)) < 32768) {
status = wuffs_base__error__bad_workbuf_length;
goto exit;
}
wuffs_lzw__decoder__read_from(self, a_src, a_workbuf);
if (self->private_impl.f_output_wi > 0) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
status = wuffs_lzw__decoder__write_to(self, a_dst);
@@ -7909,7 +7918,8 @@ exit:
static wuffs_base__empty_struct //
wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
wuffs_base__io_reader a_src) {
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_workbuf) {
uint32_t v_clear_code = 0;
uint32_t v_end_code = 0;
uint32_t v_save_code = 0;
@@ -7941,6 +7951,9 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
io1_a_src = a_src.private_impl.limit;
}
if (((uint64_t)(a_workbuf.len)) < 32768) {
return ((wuffs_base__empty_struct){});
}
v_clear_code = self->private_impl.f_clear_code;
v_end_code = self->private_impl.f_end_code;
v_save_code = self->private_impl.f_save_code;
@@ -7991,16 +8004,14 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
if ((v_lm1_a % 8) != 0) {
self->private_impl.f_prefixes[v_save_code] =
self->private_impl.f_prefixes[v_prev_code];
memcpy((self->private_impl.f_suffixes) + ((8 * v_save_code)),
(self->private_impl.f_suffixes) + ((8 * v_prev_code)), 8);
self->private_impl
.f_suffixes[((8 * v_save_code) + ((uint32_t)((v_lm1_a % 8))))] =
memcpy((a_workbuf.ptr) + ((8 * v_save_code)),
(a_workbuf.ptr) + ((8 * v_prev_code)), 8);
a_workbuf.ptr[((8 * v_save_code) + ((uint32_t)((v_lm1_a % 8))))] =
((uint8_t)(v_code));
} else {
self->private_impl.f_prefixes[v_save_code] =
((uint16_t)(v_prev_code));
self->private_impl.f_suffixes[((8 * v_save_code) + 0)] =
((uint8_t)(v_code));
a_workbuf.ptr[((8 * v_save_code) + 0)] = ((uint8_t)(v_code));
}
v_save_code += 1;
if (v_width < 12) {
@@ -8030,7 +8041,7 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
v_steps = (((uint32_t)(self->private_impl.f_lm1s[v_c])) >> 3);
while (true) {
memcpy((self->private_impl.f_output) + (v_o),
(self->private_impl.f_suffixes) + ((8 * v_c)), 8);
(a_workbuf.ptr) + ((8 * v_c)), 8);
if (v_steps <= 0) {
goto label_1_break;
}
@@ -8039,7 +8050,7 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
v_c = ((uint32_t)(self->private_impl.f_prefixes[v_c]));
}
label_1_break:;
v_first_byte = self->private_impl.f_suffixes[((8 * v_c) + 0)];
v_first_byte = a_workbuf.ptr[((8 * v_c) + 0)];
if (v_code == v_save_code) {
self->private_impl.f_output[v_output_wi] = v_first_byte;
v_output_wi = ((v_output_wi + 1) & 8191);
@@ -8050,16 +8061,14 @@ wuffs_lzw__decoder__read_from(wuffs_lzw__decoder* self,
if ((v_lm1_b % 8) != 0) {
self->private_impl.f_prefixes[v_save_code] =
self->private_impl.f_prefixes[v_prev_code];
memcpy((self->private_impl.f_suffixes) + ((8 * v_save_code)),
(self->private_impl.f_suffixes) + ((8 * v_prev_code)), 8);
self->private_impl
.f_suffixes[((8 * v_save_code) + ((uint32_t)((v_lm1_b % 8))))] =
memcpy((a_workbuf.ptr) + ((8 * v_save_code)),
(a_workbuf.ptr) + ((8 * v_prev_code)), 8);
a_workbuf.ptr[((8 * v_save_code) + ((uint32_t)((v_lm1_b % 8))))] =
v_first_byte;
} else {
self->private_impl.f_prefixes[v_save_code] =
((uint16_t)(v_prev_code));
self->private_impl.f_suffixes[((8 * v_save_code) + 0)] =
((uint8_t)(v_first_byte));
a_workbuf.ptr[((8 * v_save_code) + 0)] = ((uint8_t)(v_first_byte));
}
v_save_code += 1;
if (v_width < 12) {
@@ -8509,8 +8518,8 @@ wuffs_gif__decoder__workbuf_len(const wuffs_gif__decoder* self) {
}
return wuffs_base__utility__make_range_ii_u64(
((uint64_t)(self->private_impl.f_width)),
((uint64_t)(self->private_impl.f_width)));
(32768 + ((uint64_t)(self->private_impl.f_width))),
(32768 + ((uint64_t)(self->private_impl.f_width))));
}
// -------- func gif.decoder.restart_frame
@@ -10215,11 +10224,11 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
(iop_a_src += 1, wuffs_base__return_empty_struct());
}
label_1_break:;
if (((uint64_t)(self->private_impl.f_width)) <
if ((32768 + ((uint64_t)(self->private_impl.f_width))) <
((uint64_t)(a_workbuf.len))) {
a_workbuf = wuffs_base__slice_u8__subslice_j(
a_workbuf, ((uint64_t)(self->private_impl.f_width)));
} else if (((uint64_t)(self->private_impl.f_width)) >
a_workbuf, (32768 + ((uint64_t)(self->private_impl.f_width))));
} else if ((32768 + ((uint64_t)(self->private_impl.f_width))) >
((uint64_t)(a_workbuf.len))) {
status = wuffs_base__error__bad_workbuf_length;
goto exit;
@@ -10249,8 +10258,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
u_r.meta.ri = iop_v_r - u_r.data.ptr;
wuffs_base__status t_1 = wuffs_lzw__decoder__decode_io_writer(
&self->private_impl.f_lzw,
wuffs_base__utility__null_io_writer(), v_r,
wuffs_base__utility__null_slice_u8());
wuffs_base__utility__null_io_writer(), v_r, a_workbuf);
iop_v_r = u_r.data.ptr + u_r.meta.ri;
v_lzw_status = t_1;
}