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.243 n=10+9)
puffs_adler32_100k/clang       2.46GB/s ± 0%  2.46GB/s ± 0%   +0.07%  (p=0.002 n=10+9)
puffs_flate_decode_1k/clang     125MB/s ± 0%   124MB/s ± 0%   -0.58%  (p=0.000 n=10+8)
puffs_flate_decode_10k/clang    168MB/s ± 0%   165MB/s ± 0%   -2.07%  (p=0.000 n=9+8)
puffs_flate_decode_100k/clang   203MB/s ± 0%   195MB/s ± 0%   -3.85%  (p=0.000 n=9+9)
puffs_zlib_decode_10k/clang     157MB/s ± 0%   154MB/s ± 1%   -2.07%  (p=0.000 n=9+9)
puffs_zlib_decode_100k/clang    187MB/s ± 0%   181MB/s ± 0%   -3.50%  (p=0.000 n=10+10)

puffs_adler32_10k/gcc          3.20GB/s ± 1%  3.26GB/s ± 0%   +2.07%  (p=0.000 n=10+9)
puffs_adler32_100k/gcc         3.21GB/s ± 1%  3.27GB/s ± 0%   +1.71%  (p=0.000 n=9+9)
puffs_flate_decode_1k/gcc       128MB/s ± 2%   112MB/s ± 0%  -12.35%  (p=0.000 n=10+10)
puffs_flate_decode_10k/gcc      181MB/s ± 1%   155MB/s ± 0%  -14.07%  (p=0.000 n=10+10)
puffs_flate_decode_100k/gcc     208MB/s ± 0%   176MB/s ± 0%  -15.23%  (p=0.000 n=9+9)
puffs_zlib_decode_10k/gcc       172MB/s ± 1%   137MB/s ± 0%  -20.14%  (p=0.000 n=10+9)
puffs_zlib_decode_100k/gcc      195MB/s ± 1%   158MB/s ± 0%  -18.97%  (p=0.000 n=10+9)
This commit is contained in:
Nigel Tao committed 2017-11-05 21:59:59 +11:00
1 parent 44323f95ad
commit 934705a6e1
3 files changed
+61 -50

No files matched your search

+25 -14
View File
@@ -194,26 +194,37 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
// Check for a redirect.
if (table_entry >> 28) == 1 {
redir_top = (table_entry >> 8) & 0xFFFF
redir_mask = ((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[1][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() >= 2
}
// Once again, redundant but explicit assertions.
assert in.src.available() >= 2
assert n_bits >= 15
redir_top = (table_entry >> 8) & 0xFFFF
redir_mask = ((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[1][redir_top + (bits & redir_mask)]
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
}
// For H-D, all symbols should be base number + extra bits.
+2
View File
@@ -145,6 +145,8 @@ 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"
}