mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 00:47:28 +01:00
Remove some suspensions from decode_huffman_fast.
name old speed new speed delta puffs_adler32_10k/clang 2.46GB/s ± 0% 2.46GB/s ± 0% ~ (p=0.968 n=9+10) puffs_adler32_100k/clang 2.46GB/s ± 0% 2.46GB/s ± 0% ~ (p=0.579 n=10+10) puffs_flate_decode_1k/clang 132MB/s ± 0% 125MB/s ± 0% -5.22% (p=0.000 n=10+10) puffs_flate_decode_10k/clang 167MB/s ± 0% 168MB/s ± 0% +0.80% (p=0.000 n=8+9) puffs_flate_decode_100k/clang 205MB/s ± 0% 203MB/s ± 0% -0.91% (p=0.000 n=9+9) puffs_zlib_decode_10k/clang 156MB/s ± 0% 157MB/s ± 0% +0.91% (p=0.000 n=9+9) puffs_zlib_decode_100k/clang 189MB/s ± 0% 187MB/s ± 0% -0.92% (p=0.000 n=8+10) puffs_adler32_10k/gcc 3.18GB/s ± 3% 3.20GB/s ± 1% ~ (p=0.796 n=10+10) puffs_adler32_100k/gcc 3.22GB/s ± 1% 3.21GB/s ± 1% ~ (p=0.730 n=9+9) puffs_flate_decode_1k/gcc 125MB/s ± 1% 128MB/s ± 2% +2.20% (p=0.000 n=9+10) puffs_flate_decode_10k/gcc 177MB/s ± 1% 181MB/s ± 1% +1.82% (p=0.000 n=9+10) puffs_flate_decode_100k/gcc 203MB/s ± 1% 208MB/s ± 0% +2.67% (p=0.000 n=10+9) puffs_zlib_decode_10k/gcc 168MB/s ± 0% 172MB/s ± 1% +2.11% (p=0.000 n=10+10) puffs_zlib_decode_100k/gcc 190MB/s ± 1% 195MB/s ± 1% +2.36% (p=0.000 n=9+10)
This commit is contained in:
1 parent
7e33a2cc14
commit
44323f95ad
2 files changed
+48
-45
No files matched your search
@@ -71,7 +71,6 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
|
||||
} else {
|
||||
assert in.src.available() >= 10
|
||||
}
|
||||
|
||||
// These assertions are redundant, but are listed explicitly for
|
||||
// clarity. They must hold regardless of which branch was taken for the
|
||||
// if statement above.
|
||||
@@ -109,7 +108,6 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
|
||||
} else {
|
||||
assert in.src.available() >= 8
|
||||
}
|
||||
|
||||
// Once again, redundant but explicit assertions.
|
||||
assert in.src.available() >= 8
|
||||
assert n_bits >= 15
|
||||
@@ -162,7 +160,6 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
|
||||
} else {
|
||||
assert in.src.available() >= 6
|
||||
}
|
||||
|
||||
// Once again, redundant but explicit assertions.
|
||||
assert in.src.available() >= 6
|
||||
assert n_bits >= 15
|
||||
@@ -174,19 +171,27 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
|
||||
bits >>= table_entry_n_bits
|
||||
n_bits -= table_entry_n_bits
|
||||
|
||||
// Decode a dcode symbol from H-D.
|
||||
while true {
|
||||
table_entry = this.huffs[1][bits & dmask]
|
||||
table_entry_n_bits = table_entry & 15
|
||||
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() >= 4
|
||||
}
|
||||
// Once again, redundant but explicit assertions.
|
||||
assert in.src.available() >= 4
|
||||
assert n_bits >= 15
|
||||
|
||||
// Decode a dcode symbol from H-D.
|
||||
table_entry = this.huffs[1][bits & dmask]
|
||||
table_entry_n_bits = table_entry & 15
|
||||
bits >>= table_entry_n_bits
|
||||
n_bits -= table_entry_n_bits
|
||||
|
||||
// Check for a redirect.
|
||||
if (table_entry >> 28) == 1 {
|
||||
redir_top = (table_entry >> 8) & 0xFFFF
|
||||
|
||||
Reference in new issue
Block a user