From 989614df88febedf863900be083e00e90b68c539 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 8 Nov 2017 17:08:36 +1100 Subject: [PATCH] Remove some redundant decode_huffman_xxx code. 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.40GB/s ± 1% 2.45GB/s ± 0% +2.08% (p=0.008 n=5+5) puffs_adler32_100k/clang 2.41GB/s ± 1% 2.45GB/s ± 0% +1.54% (p=0.008 n=5+5) puffs_flate_decode_1k/clang 140MB/s ± 0% 142MB/s ± 0% +1.64% (p=0.016 n=4+5) puffs_flate_decode_10k/clang 186MB/s ± 1% 190MB/s ± 0% +2.32% (p=0.008 n=5+5) puffs_flate_decode_100k/clang 209MB/s ± 1% 225MB/s ± 0% +7.60% (p=0.008 n=5+5) puffs_zlib_decode_10k/clang 173MB/s ± 1% 176MB/s ± 0% +2.04% (p=0.008 n=5+5) puffs_zlib_decode_100k/clang 193MB/s ± 0% 207MB/s ± 1% +7.43% (p=0.008 n=5+5) puffs_adler32_10k/gcc 3.26GB/s ± 0% 3.21GB/s ± 1% -1.48% (p=0.008 n=5+5) puffs_adler32_100k/gcc 3.25GB/s ± 0% 3.21GB/s ± 2% -1.24% (p=0.008 n=5+5) puffs_flate_decode_1k/gcc 142MB/s ± 0% 139MB/s ± 1% -2.27% (p=0.008 n=5+5) puffs_flate_decode_10k/gcc 232MB/s ± 1% 232MB/s ± 0% ~ (p=0.548 n=5+5) puffs_flate_decode_100k/gcc 259MB/s ± 2% 257MB/s ± 1% ~ (p=0.151 n=5+5) puffs_zlib_decode_10k/gcc 216MB/s ± 2% 215MB/s ± 1% ~ (p=0.222 n=5+5) puffs_zlib_decode_100k/gcc 241MB/s ± 1% 235MB/s ± 1% -2.50% (p=0.008 n=5+5) --- gen/c/std/flate.c | 10 ---------- std/flate/decode_huffman_fast.puffs | 5 ----- std/flate/decode_huffman_slow.puffs | 5 ----- 3 files changed, 20 deletions(-) diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 0b88e2d3..d78feb33 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2170,11 +2170,6 @@ label_0_continue:; 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) { - status = - PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; - } } else { } if ((v_table_entry >> 24) != 64) { @@ -2561,11 +2556,6 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_slow( v_n_bits += 8; } label_4_break:; - if ((v_table_entry >> 31) != 0) { - status = - PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; - goto exit; - } } if ((v_table_entry >> 24) != 64) { if ((v_table_entry >> 24) == 8) { diff --git a/std/flate/decode_huffman_fast.puffs b/std/flate/decode_huffman_fast.puffs index 46d39aed..f9b7c019 100644 --- a/std/flate/decode_huffman_fast.puffs +++ b/std/flate/decode_huffman_fast.puffs @@ -218,11 +218,6 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { table_entry_n_bits = table_entry & 0x0F bits >>= table_entry_n_bits n_bits -= table_entry_n_bits - - // TODO: redundant? - if (table_entry >> 31) != 0 { - return error "internal error: inconsistent Huffman decoder state" - } } else { assert in.src.available() >= 2 } diff --git a/std/flate/decode_huffman_slow.puffs b/std/flate/decode_huffman_slow.puffs index 550ef0c4..22acbf60 100644 --- a/std/flate/decode_huffman_slow.puffs +++ b/std/flate/decode_huffman_slow.puffs @@ -145,11 +145,6 @@ pri func flate_decoder.decode_huffman_slow?(dst writer1, src reader1)() { bits |= (in.src.read_u8?() as u32) << n_bits n_bits += 8 } - - // TODO: redundant? - if (table_entry >> 31) != 0 { - return error "internal error: inconsistent Huffman decoder state" - } } // For H-D, all symbols should be base number + extra bits.