Don't suspend for read_u8 if data is available.

It's not obvious why the benchmarks get worse when the code looks
better, but the long term goal is for all of decode_huffman_fast to not
suspend, and this is one step along that path.

name                           old speed      new speed      delta

puffs_adler32_10k/clang        2.40GB/s ± 1%  2.40GB/s ± 1%     ~     (p=0.841 n=5+5)
puffs_adler32_100k/clang       2.40GB/s ± 1%  2.39GB/s ± 2%     ~     (p=0.421 n=5+5)
puffs_flate_decode_1k/clang     131MB/s ± 1%   128MB/s ± 0%   -2.51%  (p=0.008 n=5+5)
puffs_flate_decode_10k/clang    171MB/s ± 1%   167MB/s ± 2%   -2.86%  (p=0.008 n=5+5)
puffs_flate_decode_100k/clang   202MB/s ± 0%   193MB/s ± 2%   -4.64%  (p=0.016 n=4+5)
puffs_zlib_decode_10k/clang     159MB/s ± 1%   157MB/s ± 0%   -1.65%  (p=0.008 n=5+5)
puffs_zlib_decode_100k/clang    185MB/s ± 1%   180MB/s ± 1%   -3.11%  (p=0.008 n=5+5)

puffs_adler32_10k/gcc          3.26GB/s ± 0%  3.26GB/s ± 0%     ~     (p=0.421 n=5+5)
puffs_adler32_100k/gcc         3.27GB/s ± 0%  3.26GB/s ± 0%     ~     (p=0.151 n=5+5)
puffs_flate_decode_1k/gcc       132MB/s ± 0%   129MB/s ± 0%   -2.29%  (p=0.008 n=5+5)
puffs_flate_decode_10k/gcc      170MB/s ± 0%   164MB/s ± 0%   -3.13%  (p=0.008 n=5+5)
puffs_flate_decode_100k/gcc     207MB/s ± 0%   185MB/s ± 0%  -10.45%  (p=0.016 n=5+4)
puffs_zlib_decode_10k/gcc       162MB/s ± 0%   157MB/s ± 0%   -2.95%  (p=0.008 n=5+5)
puffs_zlib_decode_100k/gcc      194MB/s ± 0%   175MB/s ± 0%   -9.78%  (p=0.016 n=5+4)
This commit is contained in:
Nigel Tao committed 2017-11-05 08:03:21 +11:00
1 parent cf61ca11c3
commit 55e0bc513b
4 files changed
+107 -54

No files matched your search

+10 -18
View File
@@ -2039,19 +2039,11 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
while (((uint64_t)(b_rend_src - b_rptr_src)) >= 6) {
if (v_n_bits < 15) {
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_0 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
}
v_n_bits += 8;
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint8_t t_1 = *b_rptr_src++;
v_bits |= (((uint32_t)(t_1)) << v_n_bits);
}
@@ -2063,7 +2055,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
if ((v_table_entry >> 31) != 0) {
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
goto suspend;
@@ -2093,7 +2085,7 @@ 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(2);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -2104,7 +2096,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
}
label_1_break:;
if ((v_table_entry >> 31) != 0) {
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
goto suspend;
@@ -2139,7 +2131,7 @@ 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(4);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -2162,7 +2154,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
goto label_2_break;
}
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -2191,7 +2183,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
goto label_3_break;
}
{
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -2220,7 +2212,7 @@ 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(9);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
@@ -2288,7 +2280,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(10);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
}
label_4_break:;
if (v_hlen > 0) {
@@ -2307,7 +2299,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(11);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
}
label_5_break:;
}
@@ -2324,7 +2316,7 @@ 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(12);
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
}
label_6_break:;
}