From 9cd37adfe89e62a61de187cac5f905a069fa86a2 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 30 Jun 2018 08:40:24 +1000 Subject: [PATCH] Optimize some more std/gif if blocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit name old speed new speed delta wuffs_lzw_decode_20k/clang 124MB/s ± 0% 136MB/s ± 0% +9.77% (p=0.000 n=9+9) wuffs_lzw_decode_100k/clang 164MB/s ± 1% 175MB/s ± 0% +6.66% (p=0.000 n=10+9) wuffs_lzw_decode_20k/gcc 167MB/s ± 0% 168MB/s ± 0% +0.38% (p=0.000 n=8+9) wuffs_lzw_decode_100k/gcc 247MB/s ± 0% 242MB/s ± 0% -2.16% (p=0.000 n=9+10) wuffs_gif_decode_1k_bw/clang 266MB/s ± 1% 280MB/s ± 1% +5.36% (p=0.000 n=10+9) wuffs_gif_decode_1k_color/clang 122MB/s ± 0% 158MB/s ± 0% +29.46% (p=0.000 n=10+8) wuffs_gif_decode_10k/clang 115MB/s ± 1% 146MB/s ± 0% +27.00% (p=0.000 n=10+9) wuffs_gif_decode_100k/clang 113MB/s ± 0% 125MB/s ± 0% +10.46% (p=0.000 n=9+9) wuffs_gif_decode_1000k/clang 115MB/s ± 1% 128MB/s ± 0% +11.24% (p=0.000 n=9+8) wuffs_gif_decode_1k_bw/gcc 298MB/s ± 1% 323MB/s ± 1% +8.23% (p=0.000 n=9+10) wuffs_gif_decode_1k_color/gcc 163MB/s ± 1% 167MB/s ± 2% +2.10% (p=0.000 n=10+10) wuffs_gif_decode_10k/gcc 152MB/s ± 0% 151MB/s ± 0% -0.55% (p=0.000 n=9+9) wuffs_gif_decode_100k/gcc 134MB/s ± 0% 134MB/s ± 0% ~ (p=0.606 n=8+9) wuffs_gif_decode_1000k/gcc 138MB/s ± 1% 138MB/s ± 0% ~ (p=0.422 n=9+9) --- gen/c/std/lzw.c | 9 +++++---- std/lzw/decode_lzw.wuffs | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gen/c/std/lzw.c b/gen/c/std/lzw.c index 7dd27b43..eaa0c406 100644 --- a/gen/c/std/lzw.c +++ b/gen/c/std/lzw.c @@ -2202,13 +2202,14 @@ wuffs_base__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self, } } v_prev_code = v_code; - } else if (v_code == v_clear_code) { + } else if (v_code <= v_end_code) { + if (v_code == v_end_code) { + status = WUFFS_BASE__STATUS_OK; + goto ok; + } v_save_code = v_end_code; v_prev_code = 0; v_width = (v_literal_width + 1); - } else if (v_code == v_end_code) { - status = WUFFS_BASE__STATUS_OK; - goto ok; } else if (v_code <= v_save_code) { v_s = 4095; v_c = v_code; diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index e87c54d3..4dd83640 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -79,14 +79,14 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader)() { } prev_code = code - } else if code == clear_code { + } else if code <= end_code { + if code == end_code { + return + } save_code = end_code prev_code = 0 width = literal_width + 1 - } else if code == end_code { - return - } else if code <= save_code { var s base.u32[..4095] = 4095 var c base.u32[..4095] = code