From fed3da528cce9bd329f94ad4a949d69720778c02 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 22 Jul 2023 13:23:37 +1000 Subject: [PATCH] pixconv: add pixel swizzler x86_sse42 prototypes --- .../cgen/base/pixconv-submodule-regular.c | 81 +++++++++++++------ release/c/wuffs-unsupported-snapshot.c | 81 +++++++++++++------ 2 files changed, 112 insertions(+), 50 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-regular.c b/internal/cgen/base/pixconv-submodule-regular.c index 156e5a40..7f12939f 100644 --- a/internal/cgen/base/pixconv-submodule-regular.c +++ b/internal/cgen/base/pixconv-submodule-regular.c @@ -14,6 +14,37 @@ // ---------------- Pixel Swizzler +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") +static uint64_t // +wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len); + +WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") +static uint64_t // +wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len); + +WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") +static uint64_t // +wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len); +#endif + +// -------- + static inline uint32_t // wuffs_base__swap_u32_argb_abgr(uint32_t u) { uint32_t o = u & 0xFF00FF00ul; @@ -831,12 +862,12 @@ wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr, #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // -wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42(uint8_t* dst_ptr, - size_t dst_len, - uint8_t* dst_palette_ptr, - size_t dst_palette_len, - const uint8_t* src_ptr, - size_t src_len) { +wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len) { size_t len = (dst_len < src_len ? dst_len : src_len) / 4; uint8_t* d = dst_ptr; const uint8_t* s = src_ptr; @@ -3265,12 +3296,12 @@ wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr, #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // -wuffs_base__pixel_swizzler__bgrw__rgb__sse42(uint8_t* dst_ptr, - size_t dst_len, - uint8_t* dst_palette_ptr, - size_t dst_palette_len, - const uint8_t* src_ptr, - size_t src_len) { +wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len) { size_t dst_len4 = dst_len / 4; size_t src_len3 = src_len / 3; size_t len = (dst_len4 < src_len3) ? dst_len4 : src_len3; @@ -4010,12 +4041,12 @@ wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over( #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // -wuffs_base__pixel_swizzler__xxxx__y__sse42(uint8_t* dst_ptr, - size_t dst_len, - uint8_t* dst_palette_ptr, - size_t dst_palette_len, - const uint8_t* src_ptr, - size_t src_len) { +wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len) { size_t dst_len4 = dst_len / 4; size_t len = (dst_len4 < src_len) ? dst_len4 : src_len; uint8_t* d = dst_ptr; @@ -4344,7 +4375,7 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__xxxx__y__sse42; + return wuffs_base__pixel_swizzler__xxxx__y__x86_sse42; } #endif return wuffs_base__pixel_swizzler__xxxx__y; @@ -4747,7 +4778,7 @@ wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; + return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42; } #endif return wuffs_base__pixel_swizzler__bgrw__rgb; @@ -4827,7 +4858,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; @@ -5022,7 +5053,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_premul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; @@ -5089,7 +5120,7 @@ wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__BGRX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; + return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42; } #endif return wuffs_base__pixel_swizzler__bgrw__rgb; @@ -5140,7 +5171,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; @@ -5256,7 +5287,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_premul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 19442d9d..35cf844a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -18037,6 +18037,37 @@ match: // ---------------- Pixel Swizzler +#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) +WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") +static uint64_t // +wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len); + +WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") +static uint64_t // +wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len); + +WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") +static uint64_t // +wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len); +#endif + +// -------- + static inline uint32_t // wuffs_base__swap_u32_argb_abgr(uint32_t u) { uint32_t o = u & 0xFF00FF00ul; @@ -18854,12 +18885,12 @@ wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr, #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // -wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42(uint8_t* dst_ptr, - size_t dst_len, - uint8_t* dst_palette_ptr, - size_t dst_palette_len, - const uint8_t* src_ptr, - size_t src_len) { +wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len) { size_t len = (dst_len < src_len ? dst_len : src_len) / 4; uint8_t* d = dst_ptr; const uint8_t* s = src_ptr; @@ -21288,12 +21319,12 @@ wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr, #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // -wuffs_base__pixel_swizzler__bgrw__rgb__sse42(uint8_t* dst_ptr, - size_t dst_len, - uint8_t* dst_palette_ptr, - size_t dst_palette_len, - const uint8_t* src_ptr, - size_t src_len) { +wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len) { size_t dst_len4 = dst_len / 4; size_t src_len3 = src_len / 3; size_t len = (dst_len4 < src_len3) ? dst_len4 : src_len3; @@ -22033,12 +22064,12 @@ wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over( #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2") static uint64_t // -wuffs_base__pixel_swizzler__xxxx__y__sse42(uint8_t* dst_ptr, - size_t dst_len, - uint8_t* dst_palette_ptr, - size_t dst_palette_len, - const uint8_t* src_ptr, - size_t src_len) { +wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr, + size_t dst_len, + uint8_t* dst_palette_ptr, + size_t dst_palette_len, + const uint8_t* src_ptr, + size_t src_len) { size_t dst_len4 = dst_len / 4; size_t len = (dst_len4 < src_len) ? dst_len4 : src_len; uint8_t* d = dst_ptr; @@ -22367,7 +22398,7 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__xxxx__y__sse42; + return wuffs_base__pixel_swizzler__xxxx__y__x86_sse42; } #endif return wuffs_base__pixel_swizzler__xxxx__y; @@ -22770,7 +22801,7 @@ wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; + return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42; } #endif return wuffs_base__pixel_swizzler__bgrw__rgb; @@ -22850,7 +22881,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; @@ -23045,7 +23076,7 @@ wuffs_base__pixel_swizzler__prepare__bgra_premul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; @@ -23112,7 +23143,7 @@ wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p, case WUFFS_BASE__PIXEL_FORMAT__BGRX: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__bgrw__rgb__sse42; + return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42; } #endif return wuffs_base__pixel_swizzler__bgrw__rgb; @@ -23163,7 +23194,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx; @@ -23279,7 +23310,7 @@ wuffs_base__pixel_swizzler__prepare__rgba_premul( case WUFFS_BASE__PIXEL_BLEND__SRC: #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY) if (wuffs_base__cpu_arch__have_x86_sse42()) { - return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42; + return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42; } #endif return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;