From 3a23c449c7223c8bb3833ec3e1d3884ad144dd6f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 6 Jul 2019 22:25:50 +1000 Subject: [PATCH] Tweak io_{reader,writer}.since to use io0_etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit name old speed new speed delta wuffs_deflate_decode_1k_full_init/clang5 155MB/s ± 0% 155MB/s ± 1% ~ (p=0.222 n=5+5) wuffs_deflate_decode_1k_part_init/clang5 191MB/s ± 0% 191MB/s ± 1% ~ (p=0.421 n=5+5) wuffs_deflate_decode_10k_full_init/clang5 255MB/s ± 0% 248MB/s ± 0% -2.81% (p=0.008 n=5+5) wuffs_deflate_decode_10k_part_init/clang5 262MB/s ± 0% 256MB/s ± 0% -2.59% (p=0.008 n=5+5) wuffs_deflate_decode_100k_just_one_read/clang5 292MB/s ± 0% 282MB/s ± 0% -3.42% (p=0.008 n=5+5) wuffs_deflate_decode_100k_many_big_reads/clang5 249MB/s ± 0% 237MB/s ± 0% -4.65% (p=0.008 n=5+5) wuffs_deflate_decode_1k_full_init/gcc7 157MB/s ± 0% 156MB/s ± 2% ~ (p=0.095 n=5+5) wuffs_deflate_decode_1k_part_init/gcc7 194MB/s ± 0% 194MB/s ± 0% ~ (p=0.548 n=5+5) wuffs_deflate_decode_10k_full_init/gcc7 268MB/s ± 0% 267MB/s ± 0% -0.50% (p=0.016 n=5+5) wuffs_deflate_decode_10k_part_init/gcc7 276MB/s ± 0% 276MB/s ± 0% ~ (p=1.000 n=5+5) wuffs_deflate_decode_100k_just_one_read/gcc7 321MB/s ± 0% 324MB/s ± 0% +0.75% (p=0.008 n=5+5) wuffs_deflate_decode_100k_many_big_reads/gcc7 261MB/s ± 0% 257MB/s ± 0% -1.21% (p=0.008 n=5+5) wuffs_zlib_decode_10k/clang5 235MB/s ± 1% 230MB/s ± 0% -2.31% (p=0.008 n=5+5) wuffs_zlib_decode_100k/clang5 260MB/s ± 0% 253MB/s ± 1% -2.77% (p=0.008 n=5+5) wuffs_zlib_decode_10k/gcc7 226MB/s ± 0% 249MB/s ± 0% +10.18% (p=0.008 n=5+5) wuffs_zlib_decode_100k/gcc7 263MB/s ± 0% 287MB/s ± 0% +9.22% (p=0.008 n=5+5) --- internal/cgen/builtin.go | 6 +++--- release/c/wuffs-unsupported-snapshot.c | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 74903fe6..17d0e104 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -163,9 +163,9 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args [] if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { return err } - b.printf(", ((uint64_t)(iop_%s%s - %s%s->data.ptr)), %s%s->data.ptr)"+ + b.printf(", ((uint64_t)(iop_%s%s - %s%s)), %s%s)"+ ": wuffs_base__make_slice_u8(NULL, 0))", - prefix, name, prefix, name, prefix, name) + prefix, name, io0Prefix, name, io0Prefix, name) return nil case t.IDSkipFast: @@ -270,7 +270,7 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args [] if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil { return err } - b.printf(", ((uint64_t)(iop_a_dst - a_dst->data.ptr)), a_dst->data.ptr)" + + b.printf(", ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst)" + ": wuffs_base__make_slice_u8(NULL, 0))") return nil } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c831e4d0..6c1136a7 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6440,8 +6440,7 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, } v_written = (a_dst ? wuffs_base__io__since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr)), - a_dst->data.ptr) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) : wuffs_base__make_slice_u8(NULL, 0)); if (((uint64_t)(v_written.len)) >= 32768) { v_written = wuffs_base__slice_u8__suffix(v_written, 32768); @@ -11488,8 +11487,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, v_checksum_got = wuffs_crc32__ieee_hasher__update( &self->private_data.f_checksum, (a_dst ? wuffs_base__io__since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr)), - a_dst->data.ptr) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) : wuffs_base__make_slice_u8(NULL, 0))); v_decoded_length_got += ((uint32_t)( ((a_dst ? wuffs_base__io__count_since( @@ -11852,8 +11850,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, v_checksum_got = wuffs_adler32__hasher__update( &self->private_data.f_checksum, (a_dst ? wuffs_base__io__since( - v_mark, ((uint64_t)(iop_a_dst - a_dst->data.ptr)), - a_dst->data.ptr) + v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst) : wuffs_base__make_slice_u8(NULL, 0))); } if (wuffs_base__status__is_ok(v_status)) {