Optimize deflate Huffman; remove unnecessary if

name                             old speed     new speed     delta
wuffs_deflate_decode_1k/clang    150MB/s ± 0%  148MB/s ± 0%  -1.50%  (p=0.008 n=5+5)
wuffs_deflate_decode_10k/clang   223MB/s ± 0%  228MB/s ± 1%  +1.92%  (p=0.008 n=5+5)
wuffs_deflate_decode_100k/clang  243MB/s ± 0%  253MB/s ± 0%  +4.50%  (p=0.008 n=5+5)
wuffs_deflate_decode_1k/gcc      157MB/s ± 0%  158MB/s ± 1%  +0.67%  (p=0.008 n=5+5)
wuffs_deflate_decode_10k/gcc     265MB/s ± 0%  265MB/s ± 0%    ~     (p=0.095 n=5+5)
wuffs_deflate_decode_100k/gcc    299MB/s ± 0%  300MB/s ± 0%    ~     (p=0.056 n=5+5)
This commit is contained in:
Nigel Tao committed 2018-10-07 17:57:02 +11:00
1 parent c89833331c
commit 0181537d0d
2 files changed
+27 -31

No files matched your search

+15 -17
View File
@@ -256,25 +256,23 @@ pri func decoder.decode_huffman_fast!??(dst base.io_writer, src base.io_reader)
// undoing that bias makes proving (dist_minus_1 + 1) > 0 trivial.
var dist_minus_1 base.u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF
table_entry_n_bits = (table_entry >> 4) & 0x0F
if table_entry_n_bits > 0 {
// 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 |= (args.src.peek_u8() as base.u32) << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
}
// Once again, redundant but explicit assertions.
// 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 |= (args.src.peek_u8() as base.u32) << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
bits |= (args.src.peek_u8() as base.u32) << n_bits
args.src.skip_fast!(actual:1, worst_case:1)
n_bits += 8
assert n_bits >= 15
dist_minus_1 = (dist_minus_1 + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF
bits >>= table_entry_n_bits
n_bits -= table_entry_n_bits
}
// Once again, redundant but explicit assertions.
assert n_bits >= 15
dist_minus_1 = (dist_minus_1 + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF
bits >>= table_entry_n_bits
n_bits -= table_entry_n_bits
var n_copied base.u32
// The "while true { etc; break }" is a redundant version of "etc", but