Remove some if's from deflate.decode_huffman_fast

name                             old speed     new speed     delta

wuffs_deflate_decode_1k/clang    145MB/s ± 0%  151MB/s ± 1%  +4.54%  (p=0.008 n=5+5)
wuffs_deflate_decode_10k/clang   234MB/s ± 0%  230MB/s ± 0%  -1.75%  (p=0.008 n=5+5)
wuffs_deflate_decode_100k/clang  263MB/s ± 0%  276MB/s ± 1%  +5.17%  (p=0.008 n=5+5)

wuffs_deflate_decode_1k/gcc      157MB/s ± 1%  157MB/s ± 0%    ~     (p=0.421 n=5+5)
wuffs_deflate_decode_10k/gcc     265MB/s ± 0%  259MB/s ± 0%  -2.16%  (p=0.008 n=5+5)
wuffs_deflate_decode_100k/gcc    313MB/s ± 0%  315MB/s ± 0%  +0.39%  (p=0.016 n=5+5)

wuffs_gzip_decode_10k/clang      216MB/s ± 0%  212MB/s ± 0%  -1.69%  (p=0.016 n=5+4)
wuffs_gzip_decode_100k/clang     241MB/s ± 0%  252MB/s ± 0%  +4.67%  (p=0.016 n=5+4)

wuffs_gzip_decode_10k/gcc        251MB/s ± 1%  248MB/s ± 1%  -1.05%  (p=0.008 n=5+5)
wuffs_gzip_decode_100k/gcc       285MB/s ± 1%  291MB/s ± 0%  +2.16%  (p=0.008 n=5+5)

wuffs_zlib_decode_10k/clang      213MB/s ± 0%  210MB/s ± 0%  -1.18%  (p=0.008 n=5+5)
wuffs_zlib_decode_100k/clang     239MB/s ± 0%  247MB/s ± 0%  +3.08%  (p=0.008 n=5+5)

wuffs_zlib_decode_10k/gcc        244MB/s ± 0%  247MB/s ± 0%  +1.15%  (p=0.008 n=5+5)
wuffs_zlib_decode_100k/gcc       282MB/s ± 0%  291MB/s ± 0%  +2.90%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2018-12-01 10:26:09 +11:00
1 parent 776e82d542
commit 3e70383c6c
6 files changed
+52 -55

No files matched your search

+16 -24
View File
@@ -4885,11 +4885,11 @@ static const uint8_t wuffs_deflate__reverse8[256] = {
};
static const uint32_t wuffs_deflate__lcode_magic_numbers[32] = {
1073742592, 1073742848, 1073743104, 1073743360, 1073743616, 1073743872,
1073744128, 1073744384, 1073744656, 1073745168, 1073745680, 1073746192,
1073746720, 1073747744, 1073748768, 1073749792, 1073750832, 1073752880,
1073754928, 1073756976, 1073759040, 1073763136, 1073767232, 1073771328,
1073775440, 1073783632, 1073791824, 1073800016, 1073807872, 134217728,
1073741824, 1073742080, 1073742336, 1073742592, 1073742848, 1073743104,
1073743360, 1073743616, 1073743888, 1073744400, 1073744912, 1073745424,
1073745952, 1073746976, 1073748000, 1073749024, 1073750064, 1073752112,
1073754160, 1073756208, 1073758272, 1073762368, 1073766464, 1073770560,
1073774672, 1073782864, 1073791056, 1073799248, 1073807104, 134217728,
134217728, 134217728,
};
@@ -6147,7 +6147,7 @@ label_0_continue:;
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
}
v_length = ((v_table_entry >> 8) & 32767);
v_length = (((v_table_entry >> 8) & 255) + 3);
v_table_entry_n_bits = ((v_table_entry >> 4) & 15);
if (v_table_entry_n_bits > 0) {
if (v_n_bits < 15) {
@@ -6160,18 +6160,14 @@ label_0_continue:;
} else {
}
v_length =
((v_length +
((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) &
32767);
(((v_length + 253 +
((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) &
255) +
3);
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
} else {
}
if (v_length > 258) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
}
if (v_n_bits < 15) {
v_bits |= (((uint32_t)(wuffs_base__load_u8be(iop_a_src))) << v_n_bits);
(iop_a_src += 1, wuffs_base__return_empty_struct());
@@ -6254,11 +6250,6 @@ label_0_continue:;
if (v_length > v_hdist) {
v_length -= v_hdist;
v_hlen = v_hdist;
if (v_length > 258) {
status =
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
}
} else {
v_hlen = v_length;
v_length = 0;
@@ -6543,7 +6534,7 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state;
goto exit;
}
v_length = ((v_table_entry >> 8) & 32767);
v_length = (((v_table_entry >> 8) & 255) + 3);
v_table_entry_n_bits = ((v_table_entry >> 4) & 15);
if (v_table_entry_n_bits > 0) {
while (v_n_bits < v_table_entry_n_bits) {
@@ -6559,10 +6550,11 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
v_bits |= (v_b2 << v_n_bits);
v_n_bits += 8;
}
v_length =
((v_length +
((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) &
32767);
v_length = (((v_length + 253 +
((v_bits)&WUFFS_BASE__LOW_BITS_MASK__U32(
v_table_entry_n_bits))) &
255) +
3);
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
}