mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 08:47:28 +01:00
Re-order some decode_huffman checks.
name old speed new speed delta puffs_flate_decode_1k/clang 112MB/s ± 1% 123MB/s ± 0% +10.03% (p=0.008 n=5+5) puffs_flate_decode_10k/clang 135MB/s ± 0% 146MB/s ± 0% +7.81% (p=0.008 n=5+5) puffs_flate_decode_100k/clang 154MB/s ± 0% 166MB/s ± 0% +7.61% (p=0.016 n=5+4) puffs_zlib_decode_10k/clang 128MB/s ± 0% 138MB/s ± 0% +7.79% (p=0.008 n=5+5) puffs_zlib_decode_100k/clang 145MB/s ± 0% 156MB/s ± 0% +7.33% (p=0.016 n=5+4) puffs_flate_decode_1k/gcc 119MB/s ± 0% 128MB/s ± 0% +7.49% (p=0.029 n=4+4) puffs_flate_decode_10k/gcc 138MB/s ± 1% 146MB/s ± 0% +6.18% (p=0.016 n=5+4) puffs_flate_decode_100k/gcc 153MB/s ± 0% 164MB/s ± 0% +6.92% (p=0.029 n=4+4) puffs_zlib_decode_10k/gcc 132MB/s ± 0% 140MB/s ± 0% +6.13% (p=0.016 n=5+4) puffs_zlib_decode_100k/gcc 147MB/s ± 0% 156MB/s ± 0% +6.48% (p=0.016 n=5+4)
This commit is contained in:
1 parent
b3c7360907
commit
76f7621221
2 files changed
+68
-37
No files matched your search
@@ -248,8 +248,18 @@ pri func flate_decoder.decode_huffman?(dst writer1, src reader1)() {
|
||||
bits |= (in.src.read_u8?() as u32) << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
// Check for a redirect.
|
||||
if (table_entry >> 28) == 1 {
|
||||
|
||||
if (table_entry >> 31) != 0 {
|
||||
// Literal.
|
||||
in.dst.write_u8?(x:(table_entry >> 8) & 0xFF)
|
||||
continue
|
||||
} else if (table_entry >> 30) != 0 {
|
||||
// No-op; code continues past the if-else chain.
|
||||
} else if (table_entry >> 29) != 0 {
|
||||
// End of block.
|
||||
break
|
||||
} 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 {
|
||||
@@ -267,21 +277,25 @@ pri func flate_decoder.decode_huffman?(dst writer1, src reader1)() {
|
||||
bits |= (in.src.read_u8?() as u32) << n_bits
|
||||
n_bits += 8
|
||||
}
|
||||
if (table_entry >> 28) == 1 {
|
||||
|
||||
if (table_entry >> 31) != 0 {
|
||||
// Literal.
|
||||
in.dst.write_u8?(x:(table_entry >> 8) & 0xFF)
|
||||
continue
|
||||
} else if (table_entry >> 30) != 0 {
|
||||
// No-op; code continues past the if-else chain.
|
||||
} else if (table_entry >> 29) != 0 {
|
||||
// End of block.
|
||||
break
|
||||
} else if (table_entry >> 28) != 0 {
|
||||
return error "internal error: inconsistent Huffman decoder state"
|
||||
} else if (table_entry >> 27) != 0 {
|
||||
return error "bad Huffman code"
|
||||
} else {
|
||||
return error "internal error: inconsistent Huffman decoder state"
|
||||
}
|
||||
}
|
||||
|
||||
if (table_entry >> 31) != 0 {
|
||||
// Literal.
|
||||
in.dst.write_u8?(x:(table_entry >> 8) & 0xFF)
|
||||
continue
|
||||
} else if (table_entry >> 30) != 0 {
|
||||
// No-op; code continues past the if-else chain.
|
||||
} else if (table_entry >> 29) != 0 {
|
||||
// End of block.
|
||||
break
|
||||
} else if (table_entry >> 24) == 0x08 {
|
||||
} else if (table_entry >> 27) != 0 {
|
||||
return error "bad Huffman code"
|
||||
} else {
|
||||
return error "internal error: inconsistent Huffman decoder state"
|
||||
|
||||
Reference in new issue
Block a user