std/jpeg: roll back fill_bitstream inner loop

Commit 723c604a "std/jpeg: tweak decoder.fill_bitstream inner loop"
inadvertently changed "increment wi" behavior in the rare code paths.

name                                             old speed     new speed     delta

wuffs_jpeg_decode_19k_8bpp/clang11               237MB/s ± 0%  241MB/s ± 0%  +1.79%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/clang11  213MB/s ± 0%  213MB/s ± 0%  +0.36%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/clang11   384MB/s ± 0%  386MB/s ± 0%  +0.50%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/clang11              338MB/s ± 0%  341MB/s ± 0%  +0.95%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/clang11         353MB/s ± 0%  356MB/s ± 0%  +0.99%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/clang11         481MB/s ± 0%  484MB/s ± 0%  +0.61%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/clang11            359MB/s ± 0%  364MB/s ± 0%  +1.40%  (p=0.008 n=5+5)

wuffs_jpeg_decode_19k_8bpp/gcc10                 245MB/s ± 0%  234MB/s ± 0%  -4.45%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/gcc10    247MB/s ± 0%  245MB/s ± 0%  -0.59%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/gcc10     510MB/s ± 0%  500MB/s ± 0%  -1.94%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/gcc10                432MB/s ± 0%  417MB/s ± 0%  -3.62%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/gcc10           456MB/s ± 0%  442MB/s ± 0%  -3.14%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/gcc10           484MB/s ± 0%  477MB/s ± 0%  -1.49%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/gcc10              465MB/s ± 0%  450MB/s ± 0%  -3.28%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2023-06-23 16:29:16 +10:00
1 parent a00150f62f
commit 40fca0f03d
2 files changed
+16 -20

No files matched your search

+8 -10
View File
@@ -41415,22 +41415,20 @@ wuffs_jpeg__decoder__fill_bitstream(
self->private_impl.f_bitstream_wi = v_wi;
}
v_wi = self->private_impl.f_bitstream_wi;
label__0__continue:;
while ((v_wi < 2048u) && (((uint64_t)(io2_a_src - iop_a_src)) > 0u)) {
v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
self->private_data.f_bitstream_buffer[v_wi] = v_c;
v_wi += 1u;
iop_a_src += 1u;
if (v_c < 255u) {
goto label__0__continue;
} else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
iop_a_src--;
self->private_data.f_bitstream_buffer[v_wi] = v_c;
v_wi += 1u;
iop_a_src += 1u;
} else if (((uint64_t)(io2_a_src - iop_a_src)) <= 1u) {
goto label__0__break;
} else if (wuffs_base__peek_u8be__no_bounds_check(iop_a_src) > 0u) {
iop_a_src--;
} else if ((wuffs_base__peek_u16le__no_bounds_check(iop_a_src) >> 8u) > 0u) {
goto label__0__break;
} else {
iop_a_src += 1u;
self->private_data.f_bitstream_buffer[v_wi] = 255u;
v_wi += 1u;
iop_a_src += 2u;
}
}
label__0__break:;
+8 -10
View File
@@ -1495,23 +1495,21 @@ pri func decoder.fill_bitstream!(src: base.io_reader) {
wi = this.bitstream_wi
while (wi < 0x800) and (args.src.length() > 0) {
c = args.src.peek_u8()
this.bitstream_buffer[wi] = c
wi += 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
if c < 0xFF {
continue
this.bitstream_buffer[wi] = c
wi += 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
} else if args.src.length() <= 0 {
args.src.undo_byte!()
} else if args.src.length() <= 1 {
break
} else if args.src.peek_u8() > 0 {
args.src.undo_byte!()
} else if (args.src.peek_u16le() >> 8) > 0 {
break
} else {
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.bitstream_buffer[wi] = 0xFF
wi += 1
args.src.skip_u32_fast!(actual: 2, worst_case: 2)
}
} endwhile