From 605b10a49229bc9ab69f313248617e377da6e96c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 23 Jul 2023 21:04:31 +1000 Subject: [PATCH] pixconv: fix cpu_arch__have_x86_avx2 copy/pasto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not sure why the benchmark numbers change, but they do. name old speed new speed delta wuffs_jpeg_decode_19k_8bpp/clang11 376MB/s ± 0% 369MB/s ± 0% -2.06% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/clang11 311MB/s ± 0% 332MB/s ± 0% +6.69% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/clang11 1.02GB/s ± 0% 1.01GB/s ± 0% -1.35% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/clang11 842MB/s ± 0% 829MB/s ± 0% -1.54% (p=0.016 n=5+4) wuffs_jpeg_decode_552k_24bpp_420/clang11 917MB/s ± 0% 902MB/s ± 0% -1.62% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/clang11 649MB/s ± 0% 649MB/s ± 0% ~ (p=0.548 n=5+5) wuffs_jpeg_decode_4002k_24bpp/clang11 921MB/s ± 0% 904MB/s ± 0% -1.82% (p=0.008 n=5+5) wuffs_jpeg_decode_19k_8bpp/gcc10 326MB/s ± 0% 322MB/s ± 0% -1.26% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/gcc10 292MB/s ± 0% 284MB/s ± 0% -2.69% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/gcc10 920MB/s ± 0% 908MB/s ± 0% -1.31% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/gcc10 742MB/s ± 0% 730MB/s ± 0% -1.62% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/gcc10 792MB/s ± 0% 785MB/s ± 0% -0.94% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 627MB/s ± 0% 625MB/s ± 0% -0.23% (p=0.029 n=4+4) wuffs_jpeg_decode_4002k_24bpp/gcc10 792MB/s ± 0% 783MB/s ± 0% -1.13% (p=0.008 n=5+5) --- internal/cgen/base/pixconv-submodule-ycck.c | 6 +++--- release/c/wuffs-unsupported-snapshot.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index 52250676..f27f434a 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -991,7 +991,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) - if (wuffs_base__cpu_arch__have_x86_sse42()) { + if (wuffs_base__cpu_arch__have_x86_avx2()) { convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2; break; @@ -1003,7 +1003,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) - if (wuffs_base__cpu_arch__have_x86_sse42()) { + if (wuffs_base__cpu_arch__have_x86_avx2()) { convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2; break; @@ -1049,7 +1049,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) { func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) - if (wuffs_base__cpu_arch__have_x86_sse42()) { + if (wuffs_base__cpu_arch__have_x86_avx2()) { upfuncs[1][1] = wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2; } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f654652c..906ebe74 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -24793,7 +24793,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) - if (wuffs_base__cpu_arch__have_x86_sse42()) { + if (wuffs_base__cpu_arch__have_x86_avx2()) { convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2; break; @@ -24805,7 +24805,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) - if (wuffs_base__cpu_arch__have_x86_sse42()) { + if (wuffs_base__cpu_arch__have_x86_avx2()) { convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2; break; @@ -24851,7 +24851,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) { func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) - if (wuffs_base__cpu_arch__have_x86_sse42()) { + if (wuffs_base__cpu_arch__have_x86_avx2()) { upfuncs[1][1] = wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2; }