From d0c028608a7538a80e7a0ead31eab7e629aee400 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 29 Dec 2020 22:31:41 +1100 Subject: [PATCH] Optimize png.decoder.filter_1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wuffs_png_decode_19k_8bpp/clang9 95.7MB/s ± 0% 95.8MB/s ± 1% ~ (p=0.151 n=5+5) wuffs_png_decode_40k_24bpp/clang9 110MB/s ± 0% 112MB/s ± 0% +1.91% (p=0.008 n=5+5) wuffs_png_decode_77k_8bpp/clang9 358MB/s ± 0% 358MB/s ± 0% ~ (p=0.730 n=5+4) wuffs_png_decode_552k_32bpp/clang9 136MB/s ± 0% 143MB/s ± 0% +5.63% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/clang9 111MB/s ± 0% 114MB/s ± 0% +1.99% (p=0.008 n=5+5) wuffs_png_decode_filter_1_sub/clang9 646MB/s ± 0% 1018MB/s ± 0% +57.63% (p=0.008 n=5+5) wuffs_png_decode_filter_2_up/clang9 13.1GB/s ± 0% 13.5GB/s ± 0% +3.38% (p=0.008 n=5+5) wuffs_png_decode_filter_3_average/clang9 481MB/s ± 0% 491MB/s ± 0% +2.06% (p=0.008 n=5+5) wuffs_png_decode_filter_4_paeth/clang9 65.3MB/s ± 0% 75.5MB/s ± 0% +15.65% (p=0.008 n=5+5) wuffs_png_decode_19k_8bpp/gcc10 98.0MB/s ± 0% 99.4MB/s ± 0% +1.41% (p=0.008 n=5+5) wuffs_png_decode_40k_24bpp/gcc10 118MB/s ± 0% 116MB/s ± 0% -1.87% (p=0.008 n=5+5) wuffs_png_decode_77k_8bpp/gcc10 317MB/s ± 0% 321MB/s ± 0% +1.05% (p=0.008 n=5+5) wuffs_png_decode_552k_32bpp/gcc10 159MB/s ± 0% 159MB/s ± 0% +0.55% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/gcc10 118MB/s ± 0% 117MB/s ± 0% -0.92% (p=0.008 n=5+5) wuffs_png_decode_filter_1_sub/gcc10 931MB/s ± 0% 1119MB/s ± 0% +20.20% (p=0.008 n=5+5) wuffs_png_decode_filter_2_up/gcc10 11.4GB/s ± 0% 11.3GB/s ± 0% -0.91% (p=0.016 n=5+4) wuffs_png_decode_filter_3_average/gcc10 643MB/s ± 0% 644MB/s ± 0% ~ (p=0.151 n=5+5) wuffs_png_decode_filter_4_paeth/gcc10 83.6MB/s ± 0% 83.8MB/s ± 0% ~ (p=0.151 n=5+5) --- release/c/wuffs-unsupported-snapshot.c | 18 +++++++++++------- std/png/decode_png.wuffs | 24 +++++++++++++++--------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index a79fa07f..a81ed391 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -31021,17 +31021,21 @@ wuffs_png__decoder__filter_1( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr) { uint64_t v_filter_distance = 0; + uint8_t v_fa = 0; + uint64_t v_i_start = 0; uint64_t v_i = 0; v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance)); - v_i = v_filter_distance; - while (v_i < ((uint64_t)(a_curr.len))) { - if (v_i >= v_filter_distance) { - if ((v_i - v_filter_distance) < ((uint64_t)(a_curr.len))) { - a_curr.ptr[v_i] += a_curr.ptr[(v_i - v_filter_distance)]; - } + v_i_start = 0; + while (v_i_start < v_filter_distance) { + v_fa = 0; + v_i = v_i_start; + while (v_i < ((uint64_t)(a_curr.len))) { + a_curr.ptr[v_i] += v_fa; + v_fa = a_curr.ptr[v_i]; + v_i += v_filter_distance; } - v_i += 1; + v_i_start += 1; } return wuffs_base__make_empty_struct(); } diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 0e9b4cb1..5c1e6a45 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -463,18 +463,24 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice pri func decoder.filter_1!(curr: slice base.u8) { var filter_distance : base.u64[..= 8] + var fa : base.u8 + var i_start : base.u64 var i : base.u64 filter_distance = this.filter_distance as base.u64 - i = filter_distance - while i < args.curr.length() { - assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length()) - if i >= filter_distance { - if (i - filter_distance) < args.curr.length() { - args.curr[i] ~mod+= args.curr[i - filter_distance] - } - } - i += 1 + i_start = 0 + while i_start < filter_distance { + assert i_start < 8 via "a < b: a < c; c <= b"(c: filter_distance) + fa = 0 + i = i_start + while i < args.curr.length(), + inv i_start < 8, + { + args.curr[i] ~mod+= fa + fa = args.curr[i] + i ~mod+= filter_distance + } endwhile + i_start += 1 } endwhile }