From 311ea1a1f451b5a52cb619d235ff436790f8e89f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 9 Jun 2023 16:46:50 +1000 Subject: [PATCH] cgen: more optimize etc__swizzle_ycck for 444 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit name old speed new speed delta wuffs_jpeg_decode_552k_24bpp_444/clang11 356MB/s ± 0% 443MB/s ± 0% +24.62% (p=0.016 n=4+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 348MB/s ± 0% 380MB/s ± 0% +9.26% (p=0.008 n=5+5) --- internal/cgen/base/pixconv-submodule-ycck.c | 20 +++- internal/cgen/patch_pixconv.go | 62 ++++++++++ release/c/wuffs-unsupported-snapshot.c | 126 +++++++++++++++++++- 3 files changed, 204 insertions(+), 4 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index a9a51731..04d7ef5c 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -568,6 +568,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr) { + // ¡ BEGIN declare iy // Convert an inv_h or inv_v value from {1, 2, 3, 4} to {12, 6, 4, 3}. uint32_t h0_out_of_12 = 12u / inv_h0; uint32_t h1_out_of_12 = 12u / inv_h1; @@ -579,6 +580,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( uint32_t iy0 = 0u; uint32_t iy1 = 0u; uint32_t iy2 = 0u; + // ¡ END declare iy uint32_t y = 0u; while (true) { const uint8_t* src_iter0 = src_ptr0; @@ -587,9 +589,11 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( // ¡ dst_iter = etc + // ¡ BEGIN declare ix uint32_t ix0 = 0u; uint32_t ix1 = 0u; uint32_t ix2 = 0u; + // ¡ END declare ix uint32_t x = 0u; while (true) { // ¡ BEGIN set_color_u32_at @@ -603,6 +607,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( break; } x = x + 1u; + // ¡ BEGIN use ix ix0 += h0_out_of_12; if (ix0 >= 12u) { ix0 = 0u; @@ -618,12 +623,14 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( ix2 = 0u; src_iter2++; } + // ¡ END use ix } if ((y + 1u) == height) { break; } y = y + 1u; + // ¡ BEGIN use iy iy0 += v0_out_of_12; if (iy0 >= 12u) { iy0 = 0u; @@ -639,6 +646,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( iy2 = 0u; src_ptr2 += stride2; } + // ¡ END use iy } } @@ -826,12 +834,20 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter; + if ((max_incl_h | max_incl_v) == 1) { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11; + } else { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter; + } break; case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter; + if ((max_incl_h | max_incl_v) == 1) { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11; + } else { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter; + } break; } } diff --git a/internal/cgen/patch_pixconv.go b/internal/cgen/patch_pixconv.go index aacc8324..bf972a2b 100644 --- a/internal/cgen/patch_pixconv.go +++ b/internal/cgen/patch_pixconv.go @@ -47,6 +47,14 @@ func insertBasePixConvSubmoduleYcckC(buf *buffer) error { " dst_iter, wuffs_base__color_ycc__as__color_u32_FLAVOR(\n" + " *src_iter0, *src_iter1, *src_iter2));\n" + " dst_iter += 4;\n" + const useIxHv11 = "" + + " src_iter0++;\n" + + " src_iter1++;\n" + + " src_iter2++;\n" + const useIyHv11 = "" + + " src_ptr0 += stride0;\n" + + " src_ptr1 += stride1;\n" + + " src_ptr2 += stride2;\n" // ---- @@ -80,6 +88,60 @@ func insertBasePixConvSubmoduleYcckC(buf *buffer) error { // ---- + if err := patchCFunc(buf, generalBoxFilter, [][2]string{{ + "wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(\n", + "wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11(\n", + }, { + " // ¡ dst_iter = etc\n", + dstIterEtc, + }, { + " // ¡ BEGIN set_color_u32_at\n", + strings.Replace(setColorU32At, "_FLAVOR", "", 1), + }, { + " // ¡ BEGIN declare iy\n", + "", + }, { + " // ¡ BEGIN declare ix\n", + "", + }, { + " // ¡ BEGIN use ix\n", + useIxHv11, + }, { + " // ¡ BEGIN use iy\n", + useIyHv11, + }}); err != nil { + return err + } + + // ---- + + if err := patchCFunc(buf, generalBoxFilter, [][2]string{{ + "wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(\n", + "wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11(\n", + }, { + " // ¡ dst_iter = etc\n", + dstIterEtc, + }, { + " // ¡ BEGIN set_color_u32_at\n", + strings.Replace(setColorU32At, "_FLAVOR", "_abgr", 1), + }, { + " // ¡ BEGIN declare iy\n", + "", + }, { + " // ¡ BEGIN declare ix\n", + "", + }, { + " // ¡ BEGIN use ix\n", + useIxHv11, + }, { + " // ¡ BEGIN use iy\n", + useIyHv11, + }}); err != nil { + return err + } + + // ---- + stripCFuncBangComments(buf, suffix) return nil } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 6fe49fab..a883aa60 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23548,6 +23548,120 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter( } } +// Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter. +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( + wuffs_base__pixel_buffer* dst, + uint32_t width, + uint32_t height, + const uint8_t* src_ptr0, + const uint8_t* src_ptr1, + const uint8_t* src_ptr2, + uint32_t stride0, + uint32_t stride1, + uint32_t stride2, + uint32_t inv_h0, + uint32_t inv_h1, + uint32_t inv_h2, + uint32_t inv_v0, + uint32_t inv_v1, + uint32_t inv_v2, + uint32_t half_width_for_2to1, + uint32_t half_height_for_2to1, + uint8_t* scratch_buffer_2k_ptr) { + uint32_t y = 0u; + while (true) { + const uint8_t* src_iter0 = src_ptr0; + const uint8_t* src_iter1 = src_ptr1; + const uint8_t* src_iter2 = src_ptr2; + + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = + dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); + + uint32_t x = 0u; + while (true) { + wuffs_base__poke_u32le__no_bounds_check( + dst_iter, wuffs_base__color_ycc__as__color_u32( + *src_iter0, *src_iter1, *src_iter2)); + dst_iter += 4; + + if ((x + 1u) == width) { + break; + } + x = x + 1u; + src_iter0++; + src_iter1++; + src_iter2++; + } + + if ((y + 1u) == height) { + break; + } + y = y + 1u; + src_ptr0 += stride0; + src_ptr1 += stride1; + src_ptr2 += stride2; + } +} + +// Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter. +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( + wuffs_base__pixel_buffer* dst, + uint32_t width, + uint32_t height, + const uint8_t* src_ptr0, + const uint8_t* src_ptr1, + const uint8_t* src_ptr2, + uint32_t stride0, + uint32_t stride1, + uint32_t stride2, + uint32_t inv_h0, + uint32_t inv_h1, + uint32_t inv_h2, + uint32_t inv_v0, + uint32_t inv_v1, + uint32_t inv_v2, + uint32_t half_width_for_2to1, + uint32_t half_height_for_2to1, + uint8_t* scratch_buffer_2k_ptr) { + uint32_t y = 0u; + while (true) { + const uint8_t* src_iter0 = src_ptr0; + const uint8_t* src_iter1 = src_ptr1; + const uint8_t* src_iter2 = src_ptr2; + + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = + dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); + + uint32_t x = 0u; + while (true) { + wuffs_base__poke_u32le__no_bounds_check( + dst_iter, wuffs_base__color_ycc__as__color_u32_abgr( + *src_iter0, *src_iter1, *src_iter2)); + dst_iter += 4; + + if ((x + 1u) == width) { + break; + } + x = x + 1u; + src_iter0++; + src_iter1++; + src_iter2++; + } + + if ((y + 1u) == height) { + break; + } + y = y + 1u; + src_ptr0 += stride0; + src_ptr1 += stride1; + src_ptr2 += stride2; + } +} + // -------- // wuffs_base__pixel_swizzler__flattened_length is like @@ -23728,12 +23842,20 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter; + if ((max_incl_h | max_incl_v) == 1) { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11; + } else { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter; + } break; case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter; + if ((max_incl_h | max_incl_v) == 1) { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11; + } else { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter; + } break; } }