mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +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
+30
-32
@@ -2170,25 +2170,23 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
|
||||
32767);
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
while (true) {
|
||||
v_table_entry = self->private_impl.f_huffs[1][v_bits & v_dmask];
|
||||
v_table_entry_n_bits = (v_table_entry & 15);
|
||||
if (v_n_bits >= v_table_entry_n_bits) {
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
goto label_1_break;
|
||||
}
|
||||
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_6 = *b_rptr_src++;
|
||||
v_bits |= (((uint32_t)(t_6)) << v_n_bits);
|
||||
}
|
||||
v_n_bits += 8;
|
||||
{
|
||||
uint8_t t_7 = *b_rptr_src++;
|
||||
v_bits |= (((uint32_t)(t_7)) << v_n_bits);
|
||||
}
|
||||
v_n_bits += 8;
|
||||
} else {
|
||||
}
|
||||
label_1_break:;
|
||||
v_table_entry = self->private_impl.f_huffs[1][v_bits & v_dmask];
|
||||
v_table_entry_n_bits = (v_table_entry & 15);
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
if ((v_table_entry >> 28) == 1) {
|
||||
v_redir_top = ((v_table_entry >> 8) & 65535);
|
||||
v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1);
|
||||
@@ -2205,19 +2203,19 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
|
||||
if (v_n_bits >= v_table_entry_n_bits) {
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
goto label_2_break;
|
||||
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_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;
|
||||
}
|
||||
label_2_break:;
|
||||
label_1_break:;
|
||||
if ((v_table_entry >> 31) != 0) {
|
||||
status =
|
||||
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
|
||||
@@ -2237,12 +2235,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(5);
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
|
||||
if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) {
|
||||
goto short_read_src;
|
||||
}
|
||||
uint8_t t_8 = *b_rptr_src++;
|
||||
v_bits |= (((uint32_t)(t_8)) << v_n_bits);
|
||||
uint8_t t_9 = *b_rptr_src++;
|
||||
v_bits |= (((uint32_t)(t_9)) << v_n_bits);
|
||||
}
|
||||
v_n_bits += 8;
|
||||
}
|
||||
@@ -2295,19 +2293,19 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
|
||||
v_hlen);
|
||||
if (v_hlen <= v_n_copied) {
|
||||
v_hlen = 0;
|
||||
goto label_3_break;
|
||||
goto label_2_break;
|
||||
}
|
||||
if (v_n_copied > 0) {
|
||||
v_hlen -= v_n_copied;
|
||||
v_hdist = ((v_hdist + v_n_copied) & 32767);
|
||||
if (v_hdist == 0) {
|
||||
goto label_3_break;
|
||||
goto label_2_break;
|
||||
}
|
||||
}
|
||||
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
|
||||
}
|
||||
label_3_break:;
|
||||
label_2_break:;
|
||||
if (v_hlen > 0) {
|
||||
while (true) {
|
||||
v_n_copied = puffs_base__writer1__copy_from_slice32(
|
||||
@@ -2319,14 +2317,14 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
|
||||
v_hlen);
|
||||
if (v_hlen <= v_n_copied) {
|
||||
v_hlen = 0;
|
||||
goto label_4_break;
|
||||
goto label_3_break;
|
||||
}
|
||||
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(7);
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
|
||||
}
|
||||
label_4_break:;
|
||||
label_3_break:;
|
||||
}
|
||||
if (v_length == 0) {
|
||||
goto label_0_continue;
|
||||
@@ -2337,18 +2335,18 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast(
|
||||
v_length);
|
||||
if (v_length <= v_n_copied) {
|
||||
v_length = 0;
|
||||
goto label_5_break;
|
||||
goto label_4_break;
|
||||
}
|
||||
v_length -= v_n_copied;
|
||||
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
|
||||
}
|
||||
label_5_break:;
|
||||
label_4_break:;
|
||||
}
|
||||
label_0_break:;
|
||||
while (v_n_bits >= 8) {
|
||||
v_n_bits -= 8;
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
|
||||
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
|
||||
if (b_rptr_src == b_rstart_src) {
|
||||
status = PUFFS_FLATE__ERROR_INVALID_I_O_OPERATION;
|
||||
goto exit;
|
||||
|
||||
@@ -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