From 2b6b0acb4f90bc5fd53d7af69551f7802e1aaebd Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 22 Feb 2018 11:18:16 +1100 Subject: [PATCH] Unconditionally resume local vars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit will immediately 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_deflate_decode_1k/clang 145MB/s ± 1% 141MB/s ± 1% -2.28% (p=0.000 n=19+19) wuffs_deflate_decode_10k/clang 222MB/s ± 0% 202MB/s ± 1% -9.39% (p=0.000 n=16+18) wuffs_deflate_decode_100k/clang 256MB/s ± 0% 237MB/s ± 1% -7.64% (p=0.000 n=20+20) wuffs_deflate_decode_1k/gcc 157MB/s ± 2% 158MB/s ± 1% +0.73% (p=0.001 n=20+19) wuffs_deflate_decode_10k/gcc 247MB/s ± 1% 251MB/s ± 0% +1.72% (p=0.000 n=19+18) wuffs_deflate_decode_100k/gcc 289MB/s ± 0% 286MB/s ± 0% -0.86% (p=0.000 n=17+18) wuffs_lzw_decode_20k/clang 121MB/s ± 1% 122MB/s ± 1% +1.04% (p=0.000 n=17+19) wuffs_lzw_decode_100k/clang 163MB/s ± 1% 164MB/s ± 1% +0.33% (p=0.010 n=19+18) wuffs_gif_decode_1k/clang 348MB/s ± 1% 361MB/s ± 2% +3.62% (p=0.000 n=20+20) wuffs_gif_decode_10k/clang 132MB/s ± 1% 130MB/s ± 1% -1.49% (p=0.000 n=20+19) wuffs_gif_decode_100k/clang 114MB/s ± 0% 116MB/s ± 1% +1.24% (p=0.000 n=19+20) wuffs_gif_decode_1000k/clang 117MB/s ± 0% 118MB/s ± 1% +1.16% (p=0.000 n=17+20) wuffs_lzw_decode_20k/gcc 153MB/s ± 1% 162MB/s ± 1% +6.05% (p=0.000 n=18+19) wuffs_lzw_decode_100k/gcc 216MB/s ± 1% 228MB/s ± 0% +5.29% (p=0.000 n=20+19) wuffs_gif_decode_1k/gcc 444MB/s ± 1% 388MB/s ± 1% -12.62% (p=0.000 n=19+18) wuffs_gif_decode_10k/gcc 148MB/s ± 0% 126MB/s ± 0% -14.50% (p=0.000 n=19+19) wuffs_gif_decode_100k/gcc 137MB/s ± 0% 114MB/s ± 1% -16.69% (p=0.000 n=19+18) wuffs_gif_decode_1000k/gcc 139MB/s ± 1% 117MB/s ± 0% -16.02% (p=0.000 n=20+17) wuffs_adler32_10k/clang 2.44GB/s ± 0% 2.44GB/s ± 1% ~ (p=0.258 n=18+17) wuffs_adler32_100k/clang 2.45GB/s ± 0% 2.44GB/s ± 0% -0.11% (p=0.005 n=17+16) wuffs_zlib_decode_10k/clang 204MB/s ± 0% 188MB/s ± 0% -7.82% (p=0.000 n=17+18) wuffs_zlib_decode_100k/clang 232MB/s ± 0% 218MB/s ± 0% -5.90% (p=0.000 n=19+17) wuffs_adler32_10k/gcc 3.22GB/s ± 1% 3.25GB/s ± 0% +1.01% (p=0.000 n=19+20) wuffs_adler32_100k/gcc 3.22GB/s ± 0% 3.25GB/s ± 0% +0.95% (p=0.000 n=16+18) wuffs_zlib_decode_10k/gcc 229MB/s ± 1% 233MB/s ± 0% +1.71% (p=0.000 n=18+19) wuffs_zlib_decode_100k/gcc 262MB/s ± 0% 265MB/s ± 0% +1.04% (p=0.000 n=17+18) --- cmd/wuffs-c/internal/cgen/func.go | 12 +--- cmd/wuffs-c/internal/cgen/var.go | 1 + gen/c/std/deflate.c | 91 ++++++++++++------------------- gen/c/std/gif.c | 89 ++++++++++-------------------- gen/c/std/zlib.c | 9 +-- 5 files changed, 73 insertions(+), 129 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index d87e53c3..53b228d6 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -225,18 +225,12 @@ func (g *gen) writeFuncImplHeader(b *buffer) error { func (g *gen) writeFuncImplBodyResume(b *buffer) error { if g.currFunk.suspendible { - // TODO: don't hard-code [0], and allow recursive coroutines. - b.printf("uint32_t coro_susp_point = self->private_impl.%s%s[0].coro_susp_point;\n", - cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) - b.printf("if (coro_susp_point) {\n") if err := g.writeResumeSuspend(b, g.currFunk.astFunc.Body(), false, false); err != nil { return err } - b.writes("} else {\n") - if err := g.writeResumeSuspend(b, g.currFunk.astFunc.Body(), false, true); err != nil { - return err - } - b.writes("}\n") + // TODO: don't hard-code [0], and allow recursive coroutines. + b.printf("uint32_t coro_susp_point = self->private_impl.%s%s[0].coro_susp_point;\n", + cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) // Generate a coroutine switch similiar to the technique in // https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html // diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index 4951d928..1df4e000 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -296,6 +296,7 @@ func (g *gen) visitVars(b *buffer, block []*a.Node, depth uint32, f func(*gen, * return nil } +// TODO: initBoolTypedVars is never used. func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTypedVars bool) error { local := fmt.Sprintf("%s%s", vPrefix, n.Name().Str(g.tm)) diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index dc3db144..f71e9862 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -908,14 +908,11 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( } } + v_z = self->private_impl.c_decode[0].v_z; + v_written = ((wuffs_base__slice_u8){}); + v_n_copied = self->private_impl.c_decode[0].v_n_copied; + v_already_full = self->private_impl.c_decode[0].v_already_full; uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; - if (coro_susp_point) { - v_z = self->private_impl.c_decode[0].v_z; - v_written = ((wuffs_base__slice_u8){}); - v_n_copied = self->private_impl.c_decode[0].v_n_copied; - v_already_full = self->private_impl.c_decode[0].v_already_full; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1047,13 +1044,10 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( b_rend_src = b_rptr_src + len; } + v_final = self->private_impl.c_decode_blocks[0].v_final; + v_type = self->private_impl.c_decode_blocks[0].v_type; uint32_t coro_susp_point = self->private_impl.c_decode_blocks[0].coro_susp_point; - if (coro_susp_point) { - v_final = self->private_impl.c_decode_blocks[0].v_final; - v_type = self->private_impl.c_decode_blocks[0].v_type; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1254,13 +1248,10 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( b_rend_src = b_rptr_src + len; } + v_length = self->private_impl.c_decode_uncompressed[0].v_length; + v_n_copied = self->private_impl.c_decode_uncompressed[0].v_n_copied; uint32_t coro_susp_point = self->private_impl.c_decode_uncompressed[0].coro_susp_point; - if (coro_susp_point) { - v_length = self->private_impl.c_decode_uncompressed[0].v_length; - v_n_copied = self->private_impl.c_decode_uncompressed[0].v_n_copied; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1380,12 +1371,9 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_fixed_huffman( uint32_t v_i; + v_i = self->private_impl.c_init_fixed_huffman[0].v_i; uint32_t coro_susp_point = self->private_impl.c_init_fixed_huffman[0].coro_susp_point; - if (coro_susp_point) { - v_i = self->private_impl.c_init_fixed_huffman[0].v_i; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1470,25 +1458,21 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman( b_rend_src = b_rptr_src + len; } + v_bits = self->private_impl.c_init_dynamic_huffman[0].v_bits; + v_n_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_bits; + v_n_lit = self->private_impl.c_init_dynamic_huffman[0].v_n_lit; + v_n_dist = self->private_impl.c_init_dynamic_huffman[0].v_n_dist; + v_n_clen = self->private_impl.c_init_dynamic_huffman[0].v_n_clen; + v_i = self->private_impl.c_init_dynamic_huffman[0].v_i; + v_mask = self->private_impl.c_init_dynamic_huffman[0].v_mask; + v_table_entry = self->private_impl.c_init_dynamic_huffman[0].v_table_entry; + v_table_entry_n_bits = + self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits; + v_n_extra_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits; + v_rep_symbol = self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol; + v_rep_count = self->private_impl.c_init_dynamic_huffman[0].v_rep_count; uint32_t coro_susp_point = self->private_impl.c_init_dynamic_huffman[0].coro_susp_point; - if (coro_susp_point) { - v_bits = self->private_impl.c_init_dynamic_huffman[0].v_bits; - v_n_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_bits; - v_n_lit = self->private_impl.c_init_dynamic_huffman[0].v_n_lit; - v_n_dist = self->private_impl.c_init_dynamic_huffman[0].v_n_dist; - v_n_clen = self->private_impl.c_init_dynamic_huffman[0].v_n_clen; - v_i = self->private_impl.c_init_dynamic_huffman[0].v_i; - v_mask = self->private_impl.c_init_dynamic_huffman[0].v_mask; - v_table_entry = self->private_impl.c_init_dynamic_huffman[0].v_table_entry; - v_table_entry_n_bits = - self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits; - v_n_extra_bits = - self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits; - v_rep_symbol = self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol; - v_rep_count = self->private_impl.c_init_dynamic_huffman[0].v_rep_count; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -2420,25 +2404,22 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( b_rend_src = b_rptr_src + len; } + v_bits = self->private_impl.c_decode_huffman_slow[0].v_bits; + v_n_bits = self->private_impl.c_decode_huffman_slow[0].v_n_bits; + v_table_entry = self->private_impl.c_decode_huffman_slow[0].v_table_entry; + v_table_entry_n_bits = + self->private_impl.c_decode_huffman_slow[0].v_table_entry_n_bits; + v_lmask = self->private_impl.c_decode_huffman_slow[0].v_lmask; + v_dmask = self->private_impl.c_decode_huffman_slow[0].v_dmask; + v_redir_top = self->private_impl.c_decode_huffman_slow[0].v_redir_top; + v_redir_mask = self->private_impl.c_decode_huffman_slow[0].v_redir_mask; + v_length = self->private_impl.c_decode_huffman_slow[0].v_length; + v_distance = self->private_impl.c_decode_huffman_slow[0].v_distance; + v_n_copied = self->private_impl.c_decode_huffman_slow[0].v_n_copied; + v_hlen = self->private_impl.c_decode_huffman_slow[0].v_hlen; + v_hdist = self->private_impl.c_decode_huffman_slow[0].v_hdist; uint32_t coro_susp_point = self->private_impl.c_decode_huffman_slow[0].coro_susp_point; - if (coro_susp_point) { - v_bits = self->private_impl.c_decode_huffman_slow[0].v_bits; - v_n_bits = self->private_impl.c_decode_huffman_slow[0].v_n_bits; - v_table_entry = self->private_impl.c_decode_huffman_slow[0].v_table_entry; - v_table_entry_n_bits = - self->private_impl.c_decode_huffman_slow[0].v_table_entry_n_bits; - v_lmask = self->private_impl.c_decode_huffman_slow[0].v_lmask; - v_dmask = self->private_impl.c_decode_huffman_slow[0].v_dmask; - v_redir_top = self->private_impl.c_decode_huffman_slow[0].v_redir_top; - v_redir_mask = self->private_impl.c_decode_huffman_slow[0].v_redir_mask; - v_length = self->private_impl.c_decode_huffman_slow[0].v_length; - v_distance = self->private_impl.c_decode_huffman_slow[0].v_distance; - v_n_copied = self->private_impl.c_decode_huffman_slow[0].v_n_copied; - v_hlen = self->private_impl.c_decode_huffman_slow[0].v_hlen; - v_hdist = self->private_impl.c_decode_huffman_slow[0].v_hdist; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 1986b4d6..63ba1b58 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -905,9 +905,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( uint32_t coro_susp_point = self->private_impl.c_decode_config[0].coro_susp_point; - if (coro_susp_point) { - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1057,9 +1054,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.c_decode_frame[0].coro_susp_point; - if (coro_susp_point) { - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1193,13 +1187,10 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header( b_rend_src = b_rptr_src + len; } + memcpy(v_c, self->private_impl.c_decode_header[0].v_c, sizeof(v_c)); + v_i = self->private_impl.c_decode_header[0].v_i; uint32_t coro_susp_point = self->private_impl.c_decode_header[0].coro_susp_point; - if (coro_susp_point) { - memcpy(v_c, self->private_impl.c_decode_header[0].v_c, sizeof(v_c)); - v_i = self->private_impl.c_decode_header[0].v_i; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1284,13 +1275,10 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( b_rend_src = b_rptr_src + len; } + memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, sizeof(v_c)); + v_i = self->private_impl.c_decode_lsd[0].v_i; + v_gct_size = self->private_impl.c_decode_lsd[0].v_gct_size; uint32_t coro_susp_point = self->private_impl.c_decode_lsd[0].coro_susp_point; - if (coro_susp_point) { - memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, sizeof(v_c)); - v_i = self->private_impl.c_decode_lsd[0].v_i; - v_gct_size = self->private_impl.c_decode_lsd[0].v_gct_size; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1406,12 +1394,9 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( b_rend_src = b_rptr_src + len; } + v_label = self->private_impl.c_decode_extension[0].v_label; uint32_t coro_susp_point = self->private_impl.c_decode_extension[0].coro_susp_point; - if (coro_susp_point) { - v_label = self->private_impl.c_decode_extension[0].v_label; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1524,12 +1509,9 @@ static wuffs_gif__status wuffs_gif__decoder__skip_blocks( b_rend_src = b_rptr_src + len; } + v_block_size = self->private_impl.c_skip_blocks[0].v_block_size; uint32_t coro_susp_point = self->private_impl.c_skip_blocks[0].coro_susp_point; - if (coro_susp_point) { - v_block_size = self->private_impl.c_skip_blocks[0].v_block_size; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1620,16 +1602,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( b_rend_src = b_rptr_src + len; } + v_c = self->private_impl.c_decode_ae[0].v_c; + v_block_size = self->private_impl.c_decode_ae[0].v_block_size; + v_not_animexts = self->private_impl.c_decode_ae[0].v_not_animexts; + v_not_netscape = self->private_impl.c_decode_ae[0].v_not_netscape; uint32_t coro_susp_point = self->private_impl.c_decode_ae[0].coro_susp_point; - if (coro_susp_point) { - v_c = self->private_impl.c_decode_ae[0].v_c; - v_block_size = self->private_impl.c_decode_ae[0].v_block_size; - v_not_animexts = self->private_impl.c_decode_ae[0].v_not_animexts; - v_not_netscape = self->private_impl.c_decode_ae[0].v_not_netscape; - } else { - v_not_animexts = false; - v_not_netscape = false; - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -1848,17 +1825,14 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( b_rend_src = b_rptr_src + len; } + v_flags = self->private_impl.c_decode_id[0].v_flags; + v_lct_size = self->private_impl.c_decode_id[0].v_lct_size; + v_i = self->private_impl.c_decode_id[0].v_i; + v_lw = self->private_impl.c_decode_id[0].v_lw; + v_block_size = self->private_impl.c_decode_id[0].v_block_size; + v_r = ((wuffs_base__reader1){}); + v_z = self->private_impl.c_decode_id[0].v_z; uint32_t coro_susp_point = self->private_impl.c_decode_id[0].coro_susp_point; - if (coro_susp_point) { - v_flags = self->private_impl.c_decode_id[0].v_flags; - v_lct_size = self->private_impl.c_decode_id[0].v_lct_size; - v_i = self->private_impl.c_decode_id[0].v_i; - v_lw = self->private_impl.c_decode_id[0].v_lw; - v_block_size = self->private_impl.c_decode_id[0].v_block_size; - v_r = ((wuffs_base__reader1){}); - v_z = self->private_impl.c_decode_id[0].v_z; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -2198,22 +2172,19 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( b_rend_src = b_rptr_src + len; } + v_clear_code = self->private_impl.c_decode[0].v_clear_code; + v_end_code = self->private_impl.c_decode[0].v_end_code; + v_save_code = self->private_impl.c_decode[0].v_save_code; + v_prev_code = self->private_impl.c_decode[0].v_prev_code; + v_width = self->private_impl.c_decode[0].v_width; + v_bits = self->private_impl.c_decode[0].v_bits; + v_n_bits = self->private_impl.c_decode[0].v_n_bits; + v_code = self->private_impl.c_decode[0].v_code; + v_s = self->private_impl.c_decode[0].v_s; + v_c = self->private_impl.c_decode[0].v_c; + v_expansion = ((wuffs_base__slice_u8){}); + v_n_copied = self->private_impl.c_decode[0].v_n_copied; uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; - if (coro_susp_point) { - v_clear_code = self->private_impl.c_decode[0].v_clear_code; - v_end_code = self->private_impl.c_decode[0].v_end_code; - v_save_code = self->private_impl.c_decode[0].v_save_code; - v_prev_code = self->private_impl.c_decode[0].v_prev_code; - v_width = self->private_impl.c_decode[0].v_width; - v_bits = self->private_impl.c_decode[0].v_bits; - v_n_bits = self->private_impl.c_decode[0].v_n_bits; - v_code = self->private_impl.c_decode[0].v_code; - v_s = self->private_impl.c_decode[0].v_s; - v_c = self->private_impl.c_decode[0].v_c; - v_expansion = ((wuffs_base__slice_u8){}); - v_n_copied = self->private_impl.c_decode[0].v_n_copied; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 837e41a1..c359fd21 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1008,13 +1008,10 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, b_rend_src = b_rptr_src + len; } + v_x = self->private_impl.c_decode[0].v_x; + v_checksum = self->private_impl.c_decode[0].v_checksum; + v_z = self->private_impl.c_decode[0].v_z; uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; - if (coro_susp_point) { - v_x = self->private_impl.c_decode[0].v_x; - v_checksum = self->private_impl.c_decode[0].v_checksum; - v_z = self->private_impl.c_decode[0].v_z; - } else { - } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;