From 465b4e18158a1804dff36dc7fc6c38f6c2424a14 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 5 Nov 2017 20:50:58 +1100 Subject: [PATCH] Remove some suspensions from decode_huffman_fast. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit name old speed new speed delta puffs_adler32_10k/clang 2.45GB/s ± 0% 2.39GB/s ± 1% -2.74% (p=0.000 n=10+8) puffs_adler32_100k/clang 2.46GB/s ± 0% 2.40GB/s ± 1% -2.13% (p=0.000 n=10+9) puffs_flate_decode_1k/clang 132MB/s ± 0% 129MB/s ± 4% -2.25% (p=0.000 n=10+10) puffs_flate_decode_10k/clang 174MB/s ± 0% 164MB/s ± 1% -5.78% (p=0.000 n=10+10) puffs_flate_decode_100k/clang 208MB/s ± 0% 194MB/s ± 1% -6.45% (p=0.000 n=10+9) puffs_zlib_decode_10k/clang 162MB/s ± 0% 153MB/s ± 1% -5.46% (p=0.000 n=9+9) puffs_zlib_decode_100k/clang 192MB/s ± 0% 180MB/s ± 1% -6.02% (p=0.000 n=9+8) puffs_adler32_10k/gcc 3.26GB/s ± 0% 3.21GB/s ± 1% -1.58% (p=0.000 n=10+8) puffs_adler32_100k/gcc 3.27GB/s ± 0% 3.22GB/s ± 0% -1.42% (p=0.000 n=8+9) puffs_flate_decode_1k/gcc 106MB/s ± 0% 124MB/s ± 1% +17.14% (p=0.000 n=10+9) puffs_flate_decode_10k/gcc 140MB/s ± 0% 179MB/s ± 1% +27.45% (p=0.000 n=9+10) puffs_flate_decode_100k/gcc 150MB/s ± 0% 192MB/s ± 0% +27.77% (p=0.000 n=10+10) puffs_zlib_decode_10k/gcc 120MB/s ± 0% 169MB/s ± 1% +40.32% (p=0.000 n=9+10) puffs_zlib_decode_100k/gcc 134MB/s ± 0% 180MB/s ± 1% +34.56% (p=0.000 n=8+10) --- gen/c/std/flate.c | 97 ++++++++++++++--------------- std/flate/decode_huffman_fast.puffs | 44 ++++++++----- 2 files changed, 77 insertions(+), 64 deletions(-) diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index fec01c28..26e8654c 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2093,36 +2093,33 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( self->private_impl.f_end_of_block = true; goto label_0_break; } else if ((v_table_entry >> 28) != 0) { - v_redir_top = ((v_table_entry >> 8) & 65535); - v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); - while (true) { - if ((v_redir_top + (v_bits & v_redir_mask)) >= 1234) { - status = - PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; - } - v_table_entry = - self->private_impl - .f_huffs[0][v_redir_top + (v_bits & v_redir_mask)]; - v_table_entry_n_bits = (v_table_entry & 15); - if (v_n_bits >= v_table_entry_n_bits) { - v_bits >>= v_table_entry_n_bits; - v_n_bits -= v_table_entry_n_bits; - goto label_1_break; - } + if (v_n_bits < 15) { { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { - goto short_read_src; - } uint8_t t_2 = *b_rptr_src++; v_bits |= (((uint32_t)(t_2)) << v_n_bits); } v_n_bits += 8; + { + uint8_t t_3 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_3)) << v_n_bits); + } + v_n_bits += 8; + } else { } - label_1_break:; + v_redir_top = ((v_table_entry >> 8) & 65535); + v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); + if ((v_redir_top + (v_bits & v_redir_mask)) >= 1234) { + status = + PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; + goto exit; + } + v_table_entry = self->private_impl + .f_huffs[0][v_redir_top + (v_bits & v_redir_mask)]; + v_table_entry_n_bits = (v_table_entry & 15); + v_bits >>= v_table_entry_n_bits; + v_n_bits -= v_table_entry_n_bits; if ((v_table_entry >> 31) != 0) { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (b_wptr_dst == b_wend_dst) { status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; goto suspend; @@ -2157,12 +2154,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_table_entry_n_bits = ((v_table_entry >> 4) & 15); while (v_n_bits < v_table_entry_n_bits) { { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_3 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_3)) << v_n_bits); + uint8_t t_4 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_4)) << v_n_bits); } v_n_bits += 8; } @@ -2177,19 +2174,19 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( if (v_n_bits >= v_table_entry_n_bits) { v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; - goto label_2_break; + goto label_1_break; } { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_4 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_4)) << v_n_bits); + uint8_t t_5 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_5)) << v_n_bits); } v_n_bits += 8; } - label_2_break:; + label_1_break:; if ((v_table_entry >> 28) == 1) { v_redir_top = ((v_table_entry >> 8) & 65535); v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); @@ -2206,19 +2203,19 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( if (v_n_bits >= v_table_entry_n_bits) { v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; - goto label_3_break; + goto label_2_break; } { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_5 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_5)) << v_n_bits); + uint8_t t_6 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_6)) << v_n_bits); } v_n_bits += 8; } - label_3_break:; + label_2_break:; if ((v_table_entry >> 31) != 0) { status = PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; @@ -2238,12 +2235,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_table_entry_n_bits = ((v_table_entry >> 4) & 15); while (v_n_bits < v_table_entry_n_bits) { { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_6 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_6)) << v_n_bits); + uint8_t t_7 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_7)) << v_n_bits); } v_n_bits += 8; } @@ -2296,19 +2293,19 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_hlen); if (v_hlen <= v_n_copied) { v_hlen = 0; - goto label_4_break; + goto label_3_break; } if (v_n_copied > 0) { v_hlen -= v_n_copied; v_hdist = ((v_hdist + v_n_copied) & 32767); if (v_hdist == 0) { - goto label_4_break; + goto label_3_break; } } status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); } - label_4_break:; + label_3_break:; if (v_hlen > 0) { while (true) { v_n_copied = puffs_base__writer1__copy_from_slice32( @@ -2320,14 +2317,14 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_hlen); if (v_hlen <= v_n_copied) { v_hlen = 0; - goto label_5_break; + goto label_4_break; } v_hlen -= v_n_copied; v_hdist = ((v_hdist + (v_n_copied & 32767)) & 32767); status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); } - label_5_break:; + label_4_break:; } if (v_length == 0) { goto label_0_continue; @@ -2338,18 +2335,18 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_length); if (v_length <= v_n_copied) { v_length = 0; - goto label_6_break; + goto label_5_break; } v_length -= v_n_copied; status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9); } - label_6_break:; + label_5_break:; } label_0_break:; while (v_n_bits >= 8) { v_n_bits -= 8; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); if (b_rptr_src == b_rstart_src) { status = PUFFS_FLATE__ERROR_INVALID_I_O_OPERATION; goto exit; diff --git a/std/flate/decode_huffman_fast.puffs b/std/flate/decode_huffman_fast.puffs index d1ab3fc3..3d1d1799 100644 --- a/std/flate/decode_huffman_fast.puffs +++ b/std/flate/decode_huffman_fast.puffs @@ -90,30 +90,40 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { continue:loop } else if (table_entry >> 30) != 0 { // No-op; code continues past the if-else chain. + assert in.src.available() >= 8 } else if (table_entry >> 29) != 0 { // End of block. this.end_of_block = true break:loop } else if (table_entry >> 28) != 0 { // Redirect. - var redir_top u32[..0xFFFF] = (table_entry >> 8) & 0xFFFF - var redir_mask u32[..0x7FFF] = ((1 as u32) << ((table_entry >> 4) & 0x0F)) - 1 - while true { - if (redir_top + (bits & redir_mask)) >= 1234 { - return error "internal error: inconsistent Huffman decoder state" - } - table_entry = this.huffs[0][redir_top + (bits & redir_mask)] - table_entry_n_bits = table_entry & 0x0F - if n_bits >= table_entry_n_bits { - bits >>= table_entry_n_bits - n_bits -= table_entry_n_bits - break - } - assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits) + + // Ensure that we have at least 15 bits of input. + if n_bits < 15 { + assert n_bits >= 0 // TODO: this shouldn't be necessary. bits |= (in.src.read_u8?() as u32) << n_bits n_bits += 8 + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + assert n_bits >= 15 + } else { + assert in.src.available() >= 8 } + // Once again, redundant but explicit assertions. + assert in.src.available() >= 8 + assert n_bits >= 15 + + var redir_top u32[..0xFFFF] = (table_entry >> 8) & 0xFFFF + var redir_mask u32[..0x7FFF] = ((1 as u32) << ((table_entry >> 4) & 0x0F)) - 1 + if (redir_top + (bits & redir_mask)) >= 1234 { + return error "internal error: inconsistent Huffman decoder state" + } + table_entry = this.huffs[0][redir_top + (bits & redir_mask)] + table_entry_n_bits = table_entry & 0x0F + bits >>= table_entry_n_bits + n_bits -= table_entry_n_bits + if (table_entry >> 31) != 0 { // Literal. in.dst.write_u8?(x:(table_entry >> 8) & 0xFF) @@ -132,12 +142,18 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { return error "internal error: inconsistent Huffman decoder state" } + // Once again, redundant but explicit assertions. + assert in.src.available() >= 8 + } else if (table_entry >> 27) != 0 { return error "bad Huffman code" } else { return error "internal error: inconsistent Huffman decoder state" } + // Once again, redundant but explicit assertions. + assert in.src.available() >= 8 + // length = base number + extra bits. var length u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF table_entry_n_bits = (table_entry >> 4) & 0x0F