Change some more s/sse128/sse42/

This commit is contained in:
Nigel Tao committed 2021-01-24 22:04:53 +11:00
1 parent 5941e7e5cc
commit 73d95387f5
7 files changed
+125 -125

No files matched your search

+11 -11
View File
@@ -70,12 +70,12 @@
// WUFFS_BASE__CPU_ARCH__X86_64__ETC are bits returned by
// wuffs_base__cpu_arch__x86_64__capabilities.
// - "SSE128" means all of SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2 and POPCNT.
// - "AVX256" means all of AVX and AVX2.
// - "SSE42" means all of SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2 and POPCNT.
// - "AVX2" means all of AVX and AVX2.
// - "AVX512ETC" is reserved, pending need. Note that AVX-512 consists of
// multiple extensions that may be implemented independently.
#define WUFFS_BASE__CPU_ARCH__X86_64__SSE128 0x01
#define WUFFS_BASE__CPU_ARCH__X86_64__AVX256 0x02
#define WUFFS_BASE__CPU_ARCH__X86_64__SSE42 0x01
#define WUFFS_BASE__CPU_ARCH__X86_64__AVX2 0x02
static inline uint32_t //
wuffs_base__cpu_arch__x86_64__capabilities() {
@@ -87,9 +87,9 @@ wuffs_base__cpu_arch__x86_64__capabilities() {
unsigned int ecx1 = 0;
unsigned int edx1 = 0;
if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1)) {
const unsigned int sse128_ecx1 = bit_SSE4_2 | bit_POPCNT;
if ((ecx1 & sse128_ecx1) == sse128_ecx1) {
ret |= WUFFS_BASE__CPU_ARCH__X86_64__SSE128;
const unsigned int sse42_ecx1 = bit_SSE4_2 | bit_POPCNT;
if ((ecx1 & sse42_ecx1) == sse42_ecx1) {
ret |= WUFFS_BASE__CPU_ARCH__X86_64__SSE42;
}
}
@@ -100,7 +100,7 @@ wuffs_base__cpu_arch__x86_64__capabilities() {
if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) {
const unsigned int avx256_ebx7 = bit_AVX2;
if ((ebx7 & avx256_ebx7) == avx256_ebx7) {
ret |= WUFFS_BASE__CPU_ARCH__X86_64__AVX256;
ret |= WUFFS_BASE__CPU_ARCH__X86_64__AVX2;
}
}
@@ -111,15 +111,15 @@ wuffs_base__cpu_arch__x86_64__capabilities() {
}
static inline bool //
wuffs_base__cpu_arch__have_sse128() {
wuffs_base__cpu_arch__have_sse42() {
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
unsigned int eax1 = 0;
unsigned int ebx1 = 0;
unsigned int ecx1 = 0;
unsigned int edx1 = 0;
if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1)) {
const unsigned int sse128_ecx1 = bit_SSE4_2 | bit_POPCNT;
return (ecx1 & sse128_ecx1) == sse128_ecx1;
const unsigned int sse42_ecx1 = bit_SSE4_2 | bit_POPCNT;
return (ecx1 & sse42_ecx1) == sse42_ecx1;
}
#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64)
return false;
+24 -24
View File
@@ -535,12 +535,12 @@ wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr,
__attribute__((target("sse4.2")))
#endif
static uint64_t //
wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse128(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__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;
@@ -1744,12 +1744,12 @@ wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr,
__attribute__((target("sse4.2")))
#endif
static uint64_t //
wuffs_base__pixel_swizzler__bgrw__rgb__sse128(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__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;
@@ -2122,12 +2122,12 @@ wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over(
__attribute__((target("sse4.2")))
#endif
static uint64_t //
wuffs_base__pixel_swizzler__xxxx__y__sse128(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__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;
@@ -2254,8 +2254,8 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p,
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
case WUFFS_BASE__PIXEL_FORMAT__RGBX:
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
if (wuffs_base__cpu_arch__have_sse128()) {
return wuffs_base__pixel_swizzler__xxxx__y__sse128;
if (wuffs_base__cpu_arch__have_sse42()) {
return wuffs_base__pixel_swizzler__xxxx__y__sse42;
}
#endif
return wuffs_base__pixel_swizzler__xxxx__y;
@@ -2559,8 +2559,8 @@ wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p,
case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
case WUFFS_BASE__PIXEL_FORMAT__BGRX:
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
if (wuffs_base__cpu_arch__have_sse128()) {
return wuffs_base__pixel_swizzler__bgrw__rgb__sse128;
if (wuffs_base__cpu_arch__have_sse42()) {
return wuffs_base__pixel_swizzler__bgrw__rgb__sse42;
}
#endif
return wuffs_base__pixel_swizzler__bgrw__rgb;
@@ -2606,8 +2606,8 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
switch (blend) {
case WUFFS_BASE__PIXEL_BLEND__SRC:
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
if (wuffs_base__cpu_arch__have_sse128()) {
return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse128;
if (wuffs_base__cpu_arch__have_sse42()) {
return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__sse42;
}
#endif
return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;