std/jpeg: decode RGB (not just YCbCr) JPEGs

The benchmarks don't exercise the RGB code paths per se, but it does
affect the numbers. Especially for gcc, this essentially undoes the
performance impact of the previous (trivial) commit. This is all
presumably another code alignment coincidence per
https://news.ycombinator.com/item?id=23633583

name                                             old speed      new speed      delta

wuffs_jpeg_decode_19k_8bpp/clang11                376MB/s ± 0%   376MB/s ± 0%     ~     (p=1.000 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/clang11   338MB/s ± 0%   341MB/s ± 0%   +0.98%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/clang11   1.01GB/s ± 0%  1.01GB/s ± 0%   +0.35%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/clang11               841MB/s ± 0%   836MB/s ± 1%   -0.65%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/clang11          913MB/s ± 0%   912MB/s ± 0%   -0.18%  (p=0.016 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/clang11         1.11GB/s ± 0%  1.10GB/s ± 0%   -0.34%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/clang11             920MB/s ± 0%   916MB/s ± 0%   -0.42%  (p=0.008 n=5+5)

wuffs_jpeg_decode_19k_8bpp/gcc10                  349MB/s ± 0%   368MB/s ± 0%   +5.60%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/gcc10     328MB/s ± 0%   279MB/s ± 0%  -14.82%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/gcc10      925MB/s ± 0%   947MB/s ± 1%   +2.33%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/gcc10                 732MB/s ± 0%   770MB/s ± 0%   +5.23%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/gcc10            798MB/s ± 0%   838MB/s ± 0%   +4.99%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/gcc10            962MB/s ± 0%   996MB/s ± 0%   +3.54%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/gcc10               806MB/s ± 0%   847MB/s ± 0%   +5.19%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2023-08-21 16:12:21 +10:00
1 parent 748e44fe71
commit 72b9c23120
7 files changed
+429 -54

No files matched your search

+1
View File
@@ -69,6 +69,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
uint8_t v1,
uint8_t v2,
uint8_t v3,
bool is_rgb_or_cmyk,
bool triangle_filter_for_2to1,
wuffs_base__slice_u8 scratch_buffer_2k);
+47 -24
View File
@@ -86,6 +86,24 @@ typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)(
const uint8_t* up1,
const uint8_t* up2);
static void //
wuffs_base__pixel_swizzler__swizzle_rgb__convert_general(
wuffs_base__pixel_buffer* dst,
uint32_t x,
uint32_t x_end,
uint32_t y,
const uint8_t* up0,
const uint8_t* up1,
const uint8_t* up2) {
for (; x < x_end; x++) {
uint32_t color = 0xFF000000 | //
(((uint32_t)(*up0++)) << 16) | //
(((uint32_t)(*up1++)) << 8) | //
(((uint32_t)(*up2++)) << 0);
wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color);
}
}
static void //
wuffs_base__pixel_swizzler__swizzle_ycc__convert_general(
wuffs_base__pixel_buffer* dst,
@@ -778,6 +796,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
uint8_t v1,
uint8_t v2,
uint8_t v3,
bool is_rgb_or_cmyk,
bool triangle_filter_for_2to1,
wuffs_base__slice_u8 scratch_buffer_2k) {
if (!p) {
@@ -879,34 +898,38 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc = NULL;
switch (dst->pixcfg.private_impl.pixfmt.repr) {
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRX:
if (is_rgb_or_cmyk) {
convfunc = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_general;
} else {
switch (dst->pixcfg.private_impl.pixfmt.repr) {
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRX:
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
if (wuffs_base__cpu_arch__have_x86_avx2()) {
convfunc =
&wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2;
break;
}
if (wuffs_base__cpu_arch__have_x86_avx2()) {
convfunc =
&wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2;
break;
}
#endif
convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx;
break;
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBX:
convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx;
break;
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBX:
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
if (wuffs_base__cpu_arch__have_x86_avx2()) {
convfunc =
&wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2;
break;
}
if (wuffs_base__cpu_arch__have_x86_avx2()) {
convfunc =
&wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2;
break;
}
#endif
convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx;
break;
default:
convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_general;
break;
convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx;
break;
default:
convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_general;
break;
}
}
void (*func)(