From 43d9c604a299c80de440a4a1ebc4bcb2fd133fcb Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 11 Jun 2023 11:23:29 +1000 Subject: [PATCH] cgen: unroll 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 440MB/s ± 0% 459MB/s ± 0% +4.48% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 393MB/s ± 0% 412MB/s ± 0% +4.82% (p=0.008 n=5+5) --- internal/cgen/base/pixconv-submodule-ycck.c | 43 +++++++---- release/c/wuffs-unsupported-snapshot.c | 86 ++++++++++++++------- 2 files changed, 90 insertions(+), 39 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index 7e117f80..59179432 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -675,7 +675,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr) { uint32_t y = 0u; - while (true) { + for (; y < height; y++) { const uint8_t* src_iter0 = src_ptr0; const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; @@ -685,26 +685,43 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( 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, // + + for (; (x + 4u) <= width; x += 4u) { + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x00, // wuffs_base__color_ycc__as__color_u32( // - *src_iter0, *src_iter1, *src_iter2)); + src_iter0[0], src_iter1[0], src_iter2[0])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x04, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[1], src_iter1[1], src_iter2[1])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x08, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[2], src_iter1[2], src_iter2[2])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x0C, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[3], src_iter1[3], src_iter2[3])); + dst_iter += 16; + + src_iter0 += 4u; + src_iter1 += 4u; + src_iter2 += 4u; + } + + for (; x < width; x++) { + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x00, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[0], src_iter1[0], src_iter2[0])); 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; diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 0899a319..8994ba82 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23391,7 +23391,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr) { uint32_t y = 0u; - while (true) { + for (; y < height; y++) { const uint8_t* src_iter0 = src_ptr0; const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; @@ -23401,26 +23401,43 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( 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, // + + for (; (x + 4u) <= width; x += 4u) { + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x00, // wuffs_base__color_ycc__as__color_u32( // - *src_iter0, *src_iter1, *src_iter2)); + src_iter0[0], src_iter1[0], src_iter2[0])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x04, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[1], src_iter1[1], src_iter2[1])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x08, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[2], src_iter1[2], src_iter2[2])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x0C, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[3], src_iter1[3], src_iter2[3])); + dst_iter += 16; + + src_iter0 += 4u; + src_iter1 += 4u; + src_iter2 += 4u; + } + + for (; x < width; x++) { + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x00, // + wuffs_base__color_ycc__as__color_u32( // + src_iter0[0], src_iter1[0], src_iter2[0])); 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; @@ -23449,7 +23466,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr) { uint32_t y = 0u; - while (true) { + for (; y < height; y++) { const uint8_t* src_iter0 = src_ptr0; const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; @@ -23459,26 +23476,43 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( 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, // + + for (; (x + 4u) <= width; x += 4u) { + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x00, // wuffs_base__color_ycc__as__color_u32_abgr( - *src_iter0, *src_iter1, *src_iter2)); + src_iter0[0], src_iter1[0], src_iter2[0])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x04, // + wuffs_base__color_ycc__as__color_u32_abgr( + src_iter0[1], src_iter1[1], src_iter2[1])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x08, // + wuffs_base__color_ycc__as__color_u32_abgr( + src_iter0[2], src_iter1[2], src_iter2[2])); + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x0C, // + wuffs_base__color_ycc__as__color_u32_abgr( + src_iter0[3], src_iter1[3], src_iter2[3])); + dst_iter += 16; + + src_iter0 += 4u; + src_iter1 += 4u; + src_iter2 += 4u; + } + + for (; x < width; x++) { + wuffs_base__poke_u32le__no_bounds_check( // + dst_iter + 0x00, // + wuffs_base__color_ycc__as__color_u32_abgr( + src_iter0[0], src_iter1[0], src_iter2[0])); 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;