Remove some suspensions from decode_huffman_fast.

name                           old speed      new speed      delta

puffs_adler32_10k/clang        2.39GB/s ± 1%  2.46GB/s ± 0%  +2.88%  (p=0.000 n=8+9)
puffs_adler32_100k/clang       2.40GB/s ± 1%  2.46GB/s ± 0%  +2.18%  (p=0.000 n=9+10)
puffs_flate_decode_1k/clang     129MB/s ± 4%   132MB/s ± 0%  +2.31%  (p=0.000 n=10+10)
puffs_flate_decode_10k/clang    164MB/s ± 1%   167MB/s ± 0%  +1.89%  (p=0.000 n=10+8)
puffs_flate_decode_100k/clang   194MB/s ± 1%   205MB/s ± 0%  +5.49%  (p=0.000 n=9+9)
puffs_zlib_decode_10k/clang     153MB/s ± 1%   156MB/s ± 0%  +1.73%  (p=0.000 n=9+9)
puffs_zlib_decode_100k/clang    180MB/s ± 1%   189MB/s ± 0%  +5.09%  (p=0.000 n=8+8)

puffs_adler32_10k/gcc          3.21GB/s ± 1%  3.18GB/s ± 3%    ~     (p=0.203 n=8+10)
puffs_adler32_100k/gcc         3.22GB/s ± 0%  3.22GB/s ± 1%    ~     (p=0.931 n=9+9)
puffs_flate_decode_1k/gcc       124MB/s ± 1%   125MB/s ± 1%  +1.41%  (p=0.001 n=9+9)
puffs_flate_decode_10k/gcc      179MB/s ± 1%   177MB/s ± 1%  -0.77%  (p=0.006 n=10+9)
puffs_flate_decode_100k/gcc     192MB/s ± 0%   203MB/s ± 1%  +5.57%  (p=0.000 n=10+10)
puffs_zlib_decode_10k/gcc       169MB/s ± 1%   168MB/s ± 0%  -0.45%  (p=0.011 n=10+10)
puffs_zlib_decode_100k/gcc      180MB/s ± 1%   190MB/s ± 1%  +5.37%  (p=0.000 n=10+9)
This commit is contained in:
Nigel Tao committed 2017-11-05 21:11:24 +11:00
1 parent 465b4e1815
commit 7e33a2cc14
2 files changed
+36 -28

No files matched your search

+22 -20
View File
@@ -2150,19 +2150,21 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_length = ((v_table_entry >> 8) & 32767);
v_table_entry_n_bits = ((v_table_entry >> 4) & 15);
while (v_n_bits < v_table_entry_n_bits) {
if (v_n_bits < 15) {
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_4 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_4)) << v_n_bits);
}
v_n_bits += 8;
{
uint8_t t_5 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_5)) << v_n_bits);
}
v_n_bits += 8;
} else {
}
v_length = ((v_table_entry >> 8) & 32767);
v_table_entry_n_bits = ((v_table_entry >> 4) & 15);
v_length =
((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) &
32767);
@@ -2177,12 +2179,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
goto label_1_break;
}
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_5 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_5)) << v_n_bits);
uint8_t t_6 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_6)) << v_n_bits);
}
v_n_bits += 8;
}
@@ -2206,12 +2208,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
goto label_2_break;
}
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_6 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_6)) << v_n_bits);
uint8_t t_7 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_7)) << v_n_bits);
}
v_n_bits += 8;
}
@@ -2235,12 +2237,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
v_table_entry_n_bits = ((v_table_entry >> 4) & 15);
while (v_n_bits < v_table_entry_n_bits) {
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_7 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_7)) << v_n_bits);
uint8_t t_8 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_8)) << v_n_bits);
}
v_n_bits += 8;
}
@@ -2303,7 +2305,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
}
}
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
}
label_3_break:;
if (v_hlen > 0) {
@@ -2322,7 +2324,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
v_hlen -= v_n_copied;
v_hdist = ((v_hdist + (v_n_copied & 32767)) & 32767);
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
}
label_4_break:;
}
@@ -2339,14 +2341,14 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
}
v_length -= v_n_copied;
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
}
label_5_break:;
}
label_0_break:;
while (v_n_bits >= 8) {
v_n_bits -= 8;
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
if (b_rptr_src == b_rstart_src) {
status = PUFFS_FLATE__ERROR_INVALID_I_O_OPERATION;
goto exit;
+14 -8
View File
@@ -151,19 +151,25 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
return error "internal error: inconsistent Huffman decoder state"
}
// 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() >= 6
}
// Once again, redundant but explicit assertions.
assert in.src.available() >= 8
assert in.src.available() >= 6
assert n_bits >= 15
// length = base number + extra bits.
var length u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF
table_entry_n_bits = (table_entry >> 4) & 0x0F
while n_bits < table_entry_n_bits,
post n_bits >= table_entry_n_bits,
{
assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits)
bits |= (in.src.read_u8?() as u32) << n_bits
n_bits += 8
}
length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF
bits >>= table_entry_n_bits
n_bits -= table_entry_n_bits