mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Have std/deflate read 64 bits once per inner loop
On a mid-range x86_64 laptop: wuffs_deflate_decode_1k_full_init/clang9 101MB/s ± 0% 92MB/s ± 2% -9.22% (p=0.008 n=5+5) wuffs_deflate_decode_1k_part_init/clang9 117MB/s ± 0% 107MB/s ± 3% -8.00% (p=0.008 n=5+5) wuffs_deflate_decode_10k_full_init/clang9 129MB/s ± 0% 140MB/s ± 1% +8.36% (p=0.008 n=5+5) wuffs_deflate_decode_10k_part_init/clang9 131MB/s ± 0% 142MB/s ± 1% +8.59% (p=0.008 n=5+5) wuffs_deflate_decode_100k_just_one_read/clang9 158MB/s ± 0% 184MB/s ± 1% +16.29% (p=0.008 n=5+5) wuffs_deflate_decode_100k_many_big_reads/clang9 133MB/s ± 0% 155MB/s ± 1% +16.26% (p=0.008 n=5+5) wuffs_deflate_decode_1k_full_init/gcc10 98.0MB/s ± 0% 97.7MB/s ± 0% ~ (p=0.222 n=5+5) wuffs_deflate_decode_1k_part_init/gcc10 112MB/s ± 0% 111MB/s ± 0% -1.04% (p=0.008 n=5+5) wuffs_deflate_decode_10k_full_init/gcc10 138MB/s ± 0% 179MB/s ± 1% +29.91% (p=0.008 n=5+5) wuffs_deflate_decode_10k_part_init/gcc10 140MB/s ± 0% 183MB/s ± 1% +30.52% (p=0.008 n=5+5) wuffs_deflate_decode_100k_just_one_read/gcc10 188MB/s ± 0% 211MB/s ± 1% +12.32% (p=0.008 n=5+5) wuffs_deflate_decode_100k_many_big_reads/gcc10 156MB/s ± 0% 172MB/s ± 1% +10.00% (p=0.008 n=5+5) mimic_deflate_decode_1k 128MB/s ± 0% 127MB/s ± 1% -0.99% (p=0.016 n=5+5) mimic_deflate_decode_10k 143MB/s ± 0% 142MB/s ± 1% ~ (p=0.056 n=5+5) mimic_deflate_decode_100k_just_one_read 176MB/s ± 0% 174MB/s ± 1% ~ (p=0.151 n=5+5) mimic_deflate_decode_100k_many_big_reads 135MB/s ± 0% 134MB/s ± 1% ~ (p=0.151 n=5+5) wuffs_gzip_decode_10k/clang9 134MB/s ± 1% 127MB/s ± 0% -5.23% (p=0.008 n=5+5) wuffs_gzip_decode_100k/clang9 150MB/s ± 0% 162MB/s ± 0% +8.23% (p=0.008 n=5+5) wuffs_gzip_decode_10k/gcc10 131MB/s ± 0% 152MB/s ± 0% +16.36% (p=0.008 n=5+5) wuffs_gzip_decode_100k/gcc10 159MB/s ± 2% 188MB/s ± 0% +17.78% (p=0.008 n=5+5) mimic_gzip_decode_10k 121MB/s ± 0% 121MB/s ± 0% ~ (p=0.841 n=5+5) mimic_gzip_decode_100k 144MB/s ± 0% 143MB/s ± 0% -0.11% (p=0.008 n=5+5) wuffs_zlib_decode_10k/clang9 139MB/s ± 0% 135MB/s ± 0% -2.36% (p=0.008 n=5+5) wuffs_zlib_decode_100k/clang9 155MB/s ± 0% 176MB/s ± 0% +13.83% (p=0.008 n=5+5) wuffs_zlib_decode_10k/gcc10 141MB/s ± 0% 156MB/s ± 1% +10.94% (p=0.008 n=5+5) wuffs_zlib_decode_100k/gcc10 172MB/s ± 0% 193MB/s ± 1% +12.27% (p=0.016 n=4+5) mimic_zlib_decode_10k 133MB/s ± 0% 132MB/s ± 0% -1.29% (p=0.008 n=5+5) mimic_zlib_decode_100k 160MB/s ± 0% 158MB/s ± 0% -1.02% (p=0.008 n=5+5) wuffs_png_decode_image_19k_8bpp/clang9 94.7MB/s ± 0% 103.4MB/s ± 0% +9.17% (p=0.016 n=4+5) wuffs_png_decode_image_40k_24bpp/clang9 135MB/s ± 0% 146MB/s ± 0% +8.03% (p=0.008 n=5+5) wuffs_png_decode_image_77k_8bpp/clang9 351MB/s ± 0% 380MB/s ± 0% +8.48% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_ignore_checksum/clang9 320MB/s ± 1% 343MB/s ± 0% +7.20% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_verify_checksum/clang9 308MB/s ± 0% 328MB/s ± 0% +6.59% (p=0.008 n=5+5) wuffs_png_decode_image_4002k_24bpp/clang9 138MB/s ± 0% 149MB/s ± 0% +8.02% (p=0.016 n=5+4) wuffs_png_decode_image_19k_8bpp/gcc10 101MB/s ± 1% 116MB/s ± 0% +14.61% (p=0.008 n=5+5) wuffs_png_decode_image_40k_24bpp/gcc10 136MB/s ± 0% 154MB/s ± 0% +13.10% (p=0.008 n=5+5) wuffs_png_decode_image_77k_8bpp/gcc10 371MB/s ± 0% 426MB/s ± 0% +14.80% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_ignore_checksum/gcc10 333MB/s ± 0% 357MB/s ± 0% +7.31% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_verify_checksum/gcc10 318MB/s ± 0% 341MB/s ± 0% +7.27% (p=0.016 n=5+4) wuffs_png_decode_image_4002k_24bpp/gcc10 138MB/s ± 0% 157MB/s ± 0% +13.59% (p=0.008 n=5+5) mimic_png_decode_image_19k_8bpp 58.2MB/s ± 0% 58.1MB/s ± 0% ~ (p=0.841 n=5+5) mimic_png_decode_image_40k_24bpp 73.3MB/s ± 0% 73.2MB/s ± 0% -0.16% (p=0.032 n=5+5) mimic_png_decode_image_77k_8bpp 177MB/s ± 0% 177MB/s ± 0% ~ (p=0.690 n=5+5) mimic_png_decode_image_552k_32bpp_ignore_checksum skipped mimic_png_decode_image_552k_32bpp_verify_checksum 146MB/s ± 0% 146MB/s ± 0% ~ (p=0.690 n=5+5) mimic_png_decode_image_4002k_24bpp 104MB/s ± 0% 104MB/s ± 0% ~ (p=0.841 n=5+5)
This commit is contained in:
1 parent
b61a827354
commit
1a63b53e13
2 files changed
+59
-213
No files matched your search
@@ -22624,12 +22624,12 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
wuffs_base__io_buffer* a_src) {
|
||||
wuffs_base__status status = wuffs_base__make_status(NULL);
|
||||
|
||||
uint32_t v_bits = 0;
|
||||
uint64_t v_bits = 0;
|
||||
uint32_t v_n_bits = 0;
|
||||
uint32_t v_table_entry = 0;
|
||||
uint32_t v_table_entry_n_bits = 0;
|
||||
uint32_t v_lmask = 0;
|
||||
uint32_t v_dmask = 0;
|
||||
uint64_t v_lmask = 0;
|
||||
uint64_t v_dmask = 0;
|
||||
uint32_t v_redir_top = 0;
|
||||
uint32_t v_redir_mask = 0;
|
||||
uint32_t v_length = 0;
|
||||
@@ -22665,21 +22665,15 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
|
||||
goto exit;
|
||||
}
|
||||
v_bits = self->private_impl.f_bits;
|
||||
v_bits = ((uint64_t)(self->private_impl.f_bits));
|
||||
v_n_bits = self->private_impl.f_n_bits;
|
||||
v_lmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1);
|
||||
v_dmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[1]) - 1);
|
||||
v_lmask = ((((uint64_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1);
|
||||
v_dmask = ((((uint64_t)(1)) << self->private_impl.f_n_huffs_bits[1]) - 1);
|
||||
label__loop__continue:;
|
||||
while ((((uint64_t)(io2_a_dst - iop_a_dst)) >= 258) && (((uint64_t)(io2_a_src - iop_a_src)) >= 12)) {
|
||||
if (v_n_bits < 15) {
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
} else {
|
||||
}
|
||||
while ((((uint64_t)(io2_a_dst - iop_a_dst)) >= 258) && (((uint64_t)(io2_a_src - iop_a_src)) >= 8)) {
|
||||
v_bits |= (wuffs_base__peek_u64le__no_bounds_check(iop_a_src) << (v_n_bits & 63));
|
||||
iop_a_src += ((63 - (v_n_bits & 63)) >> 3);
|
||||
v_n_bits |= 56;
|
||||
v_table_entry = self->private_data.f_huffs[0][(v_bits & v_lmask)];
|
||||
v_table_entry_n_bits = (v_table_entry & 15);
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
@@ -22692,18 +22686,9 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
self->private_impl.f_end_of_block = true;
|
||||
goto label__loop__break;
|
||||
} else if ((v_table_entry >> 28) != 0) {
|
||||
if (v_n_bits < 15) {
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
} else {
|
||||
}
|
||||
v_redir_top = ((v_table_entry >> 8) & 65535);
|
||||
v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1);
|
||||
v_table_entry = self->private_data.f_huffs[0][((v_redir_top + (v_bits & v_redir_mask)) & 1023)];
|
||||
v_table_entry = self->private_data.f_huffs[0][((v_redir_top + (((uint32_t)((v_bits & 4294967295))) & v_redir_mask)) & 1023)];
|
||||
v_table_entry_n_bits = (v_table_entry & 15);
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
@@ -22734,50 +22719,21 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
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) {
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
} else {
|
||||
}
|
||||
v_length = (((v_length + 253 + ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 255) + 3);
|
||||
v_length = (((v_length + 253 + ((uint32_t)(((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U64(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_n_bits < 15) {
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
} else {
|
||||
}
|
||||
v_table_entry = self->private_data.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) {
|
||||
if (v_n_bits < 15) {
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
} else {
|
||||
}
|
||||
v_redir_top = ((v_table_entry >> 8) & 65535);
|
||||
v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1);
|
||||
v_table_entry = self->private_data.f_huffs[1][((v_redir_top + (v_bits & v_redir_mask)) & 1023)];
|
||||
v_table_entry = self->private_data.f_huffs[1][((v_redir_top + (((uint32_t)((v_bits & 4294967295))) & v_redir_mask)) & 1023)];
|
||||
v_table_entry_n_bits = (v_table_entry & 15);
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
} else {
|
||||
}
|
||||
if ((v_table_entry >> 24) != 64) {
|
||||
if ((v_table_entry >> 24) == 8) {
|
||||
@@ -22789,15 +22745,7 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
}
|
||||
v_dist_minus_1 = ((v_table_entry >> 8) & 32767);
|
||||
v_table_entry_n_bits = ((v_table_entry >> 4) & 15);
|
||||
if (v_n_bits < v_table_entry_n_bits) {
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
|
||||
iop_a_src += 1;
|
||||
v_n_bits += 8;
|
||||
}
|
||||
v_dist_minus_1 = ((v_dist_minus_1 + ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 32767);
|
||||
v_dist_minus_1 = ((v_dist_minus_1 + ((uint32_t)(((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U64(v_table_entry_n_bits))))) & 32767);
|
||||
v_bits >>= v_table_entry_n_bits;
|
||||
v_n_bits -= v_table_entry_n_bits;
|
||||
while (true) {
|
||||
@@ -22833,6 +22781,10 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
label__0__break:;
|
||||
}
|
||||
label__loop__break:;
|
||||
if (v_n_bits > 63) {
|
||||
status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
|
||||
goto exit;
|
||||
}
|
||||
while (v_n_bits >= 8) {
|
||||
v_n_bits -= 8;
|
||||
if (iop_a_src > io1_a_src) {
|
||||
@@ -22842,7 +22794,7 @@ wuffs_deflate__decoder__decode_huffman_fast(
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
self->private_impl.f_bits = (v_bits & ((((uint32_t)(1)) << v_n_bits) - 1));
|
||||
self->private_impl.f_bits = ((uint32_t)((v_bits & ((((uint64_t)(1)) << v_n_bits) - 1))));
|
||||
self->private_impl.f_n_bits = v_n_bits;
|
||||
if ((self->private_impl.f_n_bits >= 8) || ((self->private_impl.f_bits >> self->private_impl.f_n_bits) != 0)) {
|
||||
status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
|
||||
|
||||
Reference in new issue
Block a user