mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
Remove some suspensions from decode_huffman_fast.
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)
This commit is contained in:
1 parent
73778b0767
commit
465b4e1815
2 files changed
+77
-64
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user