Have "x86_avx2" require PCLMUL, POPCNT and SSE4.2

The std/crc32 benchmark numbers get worse. The benches still run AVX2
code, but it runs slower for an unknown reason. The std/gzip and std/png
benchmark numbers are mixed.

Still, it's cleaner for Wuffs' "x86_avx2" to be a superset of
"x86_sse42" (and apart from PCLMUL, they're now similar to Clang 12 and
GCC 11's "x86-64-v3" and "x86-64-v2" micro-architecture feature levels).
Maybe future compiler versions can claw back the std/crc32 performance.

On a mid-range x86_64 laptop (2016, Skylake):

name                                                               old speed      new speed      delta

wuffs_crc32_ieee_10k/clang9                                        8.07GB/s ± 0%  7.61GB/s ± 1%   -5.72%  (p=0.000 n=8+8)
wuffs_crc32_ieee_100k/clang9                                       11.0GB/s ± 1%   9.7GB/s ± 3%  -11.45%  (p=0.000 n=7+8)

wuffs_crc32_ieee_10k/gcc10                                         9.77GB/s ± 1%  7.72GB/s ± 1%  -21.00%  (p=0.000 n=10+9)
wuffs_crc32_ieee_100k/gcc10                                        12.7GB/s ± 2%  11.9GB/s ± 2%   -5.84%  (p=0.000 n=9+9)

wuffs_gzip_decode_10k/clang9                                        217MB/s ± 2%   221MB/s ± 0%   +1.80%  (p=0.000 n=10+8)
wuffs_gzip_decode_100k/clang9                                       280MB/s ± 1%   283MB/s ± 0%   +1.38%  (p=0.000 n=9+8)

wuffs_gzip_decode_10k/gcc10                                         215MB/s ± 1%   220MB/s ± 1%   +2.52%  (p=0.000 n=10+9)
wuffs_gzip_decode_100k/gcc10                                        272MB/s ± 0%   274MB/s ± 1%   +0.74%  (p=0.000 n=9+10)

wuffs_png_decode_image_19k_8bpp/clang9                              136MB/s ± 0%   142MB/s ± 0%   +3.95%  (p=0.000 n=8+8)
wuffs_png_decode_image_40k_24bpp/clang9                             171MB/s ± 1%   172MB/s ± 0%   +0.84%  (p=0.000 n=10+8)
wuffs_png_decode_image_77k_8bpp/clang9                              492MB/s ± 3%   501MB/s ± 2%   +1.88%  (p=0.009 n=10+10)
wuffs_png_decode_image_552k_32bpp_ignore_checksum/clang9            456MB/s ± 1%   461MB/s ± 1%   +1.04%  (p=0.000 n=9+9)
wuffs_png_decode_image_552k_32bpp_verify_checksum/clang9            439MB/s ± 1%   440MB/s ± 3%     ~     (p=0.173 n=8+10)
wuffs_png_decode_image_4002k_24bpp/clang9                           172MB/s ± 1%   174MB/s ± 1%   +1.29%  (p=0.005 n=10+10)

wuffs_png_decode_image_19k_8bpp/gcc10                               152MB/s ± 0%   149MB/s ± 1%   -1.92%  (p=0.000 n=9+9)
wuffs_png_decode_image_40k_24bpp/gcc10                              184MB/s ± 0%   186MB/s ± 1%   +1.37%  (p=0.000 n=8+9)
wuffs_png_decode_image_77k_8bpp/gcc10                               550MB/s ± 1%   542MB/s ± 2%   -1.46%  (p=0.000 n=10+10)
wuffs_png_decode_image_552k_32bpp_ignore_checksum/gcc10             473MB/s ± 1%   478MB/s ± 1%   +1.23%  (p=0.000 n=9+10)
wuffs_png_decode_image_552k_32bpp_verify_checksum/gcc10             453MB/s ± 1%   458MB/s ± 1%   +0.91%  (p=0.000 n=9+10)
wuffs_png_decode_image_4002k_24bpp/gcc10                            185MB/s ± 2%   188MB/s ± 0%   +1.82%  (p=0.000 n=9+8)
This commit is contained in:
Nigel Tao committed 2021-06-22 13:27:25 +10:00
1 parent ec32eb3eb7
commit 08797bc713
3 files changed
+47 -10

No files matched your search

+20 -2
View File
@@ -115,6 +115,8 @@ extern "C" {
// Similarly, "cpu_arch >= x86_sse42" requires SSE4.2 but also PCLMUL and
// POPCNT. This is checked at runtime via cpuid, not at compile time.
//
// Likewise, "cpu_arch >= x86_avx2" also requires PCLMUL, POPCNT and SSE4.2.
#if defined(__x86_64__)
#include <cpuid.h>
#include <x86intrin.h>
@@ -193,6 +195,11 @@ wuffs_base__cpu_arch__have_x86_avx2() {
// GCC defines these macros but MSVC does not.
// - bit_AVX2 = (1 << 5)
const unsigned int avx2_ebx7 = 0x00000020;
// GCC defines these macros but MSVC does not.
// - bit_PCLMUL = (1 << 1)
// - bit_POPCNT = (1 << 23)
// - bit_SSE4_2 = (1 << 20)
const unsigned int avx2_ecx1 = 0x00900002;
// clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).
#if defined(__GNUC__)
@@ -202,13 +209,24 @@ wuffs_base__cpu_arch__have_x86_avx2() {
unsigned int edx7 = 0;
if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) &&
((ebx7 & avx2_ebx7) == avx2_ebx7)) {
return true;
unsigned int eax1 = 0;
unsigned int ebx1 = 0;
unsigned int ecx1 = 0;
unsigned int edx1 = 0;
if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1) &&
((ecx1 & avx2_ecx1) == avx2_ecx1)) {
return true;
}
}
#elif defined(_MSC_VER) // defined(__GNUC__)
int x7[4];
__cpuidex(x7, 7, 0);
if ((((unsigned int)(x7[1])) & avx2_ebx7) == avx2_ebx7) {
return true;
int x1[4];
__cpuid(x1, 1);
if ((((unsigned int)(x1[2])) & avx2_ecx1) == avx2_ecx1) {
return true;
}
}
#else
#error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler"