SIMD: Change the way we declare constants for x86

We need to use macros because MSVC is a crappy C compiler.

Change-Id: Ieb48f7c0dd0e4e0fb35efffd153b8af62d34ebdf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Thiago Macieira 2018-06-25 16:27:48 -07:00
parent 5219c37f7c
commit 12cf0dbfe5
2 changed files with 120 additions and 126 deletions

View File

@ -21,201 +21,199 @@
QT_BEGIN_NAMESPACE
// Macros for QT_FUNCTION_TARGET (for Clang and GCC)
#define QT_FUNCTION_TARGET_STRING_SSE2 "sse2"
#define QT_FUNCTION_TARGET_STRING_SSE3 "sse3"
#define QT_FUNCTION_TARGET_STRING_SSSE3 "ssse3"
#define QT_FUNCTION_TARGET_STRING_FMA "fma"
#define QT_FUNCTION_TARGET_STRING_SSE4_1 "sse4.1"
#define QT_FUNCTION_TARGET_STRING_SSE4_2 "sse4.2"
#define QT_FUNCTION_TARGET_STRING_MOVBE "movbe"
#define QT_FUNCTION_TARGET_STRING_POPCNT "popcnt"
#define QT_FUNCTION_TARGET_STRING_AES "aes,sse4.2"
#define QT_FUNCTION_TARGET_STRING_AVX "avx"
#define QT_FUNCTION_TARGET_STRING_F16C "f16c"
#define QT_FUNCTION_TARGET_STRING_RDRND "rdrnd"
#define QT_FUNCTION_TARGET_STRING_BMI "bmi"
#define QT_FUNCTION_TARGET_STRING_HLE "hle"
#define QT_FUNCTION_TARGET_STRING_AVX2 "avx2"
#define QT_FUNCTION_TARGET_STRING_BMI2 "bmi2"
#define QT_FUNCTION_TARGET_STRING_RTM "rtm"
#define QT_FUNCTION_TARGET_STRING_AVX512F "avx512f"
#define QT_FUNCTION_TARGET_STRING_AVX512DQ "avx512dq"
#define QT_FUNCTION_TARGET_STRING_RDSEED "rdseed"
#define QT_FUNCTION_TARGET_STRING_AVX512IFMA "avx512ifma"
#define QT_FUNCTION_TARGET_STRING_AVX512PF "avx512pf"
#define QT_FUNCTION_TARGET_STRING_AVX512ER "avx512er"
#define QT_FUNCTION_TARGET_STRING_AVX512CD "avx512cd"
#define QT_FUNCTION_TARGET_STRING_SHA "sha"
#define QT_FUNCTION_TARGET_STRING_AVX512BW "avx512bw"
#define QT_FUNCTION_TARGET_STRING_AVX512VL "avx512vl"
#define QT_FUNCTION_TARGET_STRING_AVX512VBMI "avx512vbmi"
#define QT_FUNCTION_TARGET_STRING_AVX512VBMI2 "avx512vbmi2"
#define QT_FUNCTION_TARGET_STRING_GFNI "gfni"
#define QT_FUNCTION_TARGET_STRING_VAES "vaes"
#define QT_FUNCTION_TARGET_STRING_AVX512VNNI "avx512vnni"
#define QT_FUNCTION_TARGET_STRING_AVX512BITALG "avx512bitalg"
#define QT_FUNCTION_TARGET_STRING_AVX512VPOPCNTDQ "avx512vpopcntdq"
#define QT_FUNCTION_TARGET_STRING_AVX5124NNIW "avx5124nniw"
#define QT_FUNCTION_TARGET_STRING_AVX5124FMAPS "avx5124fmaps"
// used only to indicate that the CPU detection was initialized
static const quint64 QSimdInitialized = Q_UINT64_C(1) << 0;
#define QSimdInitialized (Q_UINT64_C(1) << 0)
// in CPUID Leaf 1, EDX:
static const quint64 CpuFeatureSSE2 = Q_UINT64_C(1) << 1;
#define CpuFeatureSSE2 (Q_UINT64_C(1) << 1)
#define QT_FUNCTION_TARGET_STRING_SSE2 "sse2"
// in CPUID Leaf 1, ECX:
static const quint64 CpuFeatureSSE3 = Q_UINT64_C(1) << 2;
static const quint64 CpuFeatureSSSE3 = Q_UINT64_C(1) << 3;
static const quint64 CpuFeatureFMA = Q_UINT64_C(1) << 4;
static const quint64 CpuFeatureSSE4_1 = Q_UINT64_C(1) << 5;
static const quint64 CpuFeatureSSE4_2 = Q_UINT64_C(1) << 6;
static const quint64 CpuFeatureMOVBE = Q_UINT64_C(1) << 7;
static const quint64 CpuFeaturePOPCNT = Q_UINT64_C(1) << 8;
static const quint64 CpuFeatureAES = Q_UINT64_C(1) << 9;
static const quint64 CpuFeatureAVX = Q_UINT64_C(1) << 10;
static const quint64 CpuFeatureF16C = Q_UINT64_C(1) << 11;
static const quint64 CpuFeatureRDRND = Q_UINT64_C(1) << 12;
#define CpuFeatureSSE3 (Q_UINT64_C(1) << 2)
#define QT_FUNCTION_TARGET_STRING_SSE3 "sse3"
#define CpuFeatureSSSE3 (Q_UINT64_C(1) << 3)
#define QT_FUNCTION_TARGET_STRING_SSSE3 "ssse3"
#define CpuFeatureFMA (Q_UINT64_C(1) << 4)
#define QT_FUNCTION_TARGET_STRING_FMA "fma"
#define CpuFeatureSSE4_1 (Q_UINT64_C(1) << 5)
#define QT_FUNCTION_TARGET_STRING_SSE4_1 "sse4.1"
#define CpuFeatureSSE4_2 (Q_UINT64_C(1) << 6)
#define QT_FUNCTION_TARGET_STRING_SSE4_2 "sse4.2"
#define CpuFeatureMOVBE (Q_UINT64_C(1) << 7)
#define QT_FUNCTION_TARGET_STRING_MOVBE "movbe"
#define CpuFeaturePOPCNT (Q_UINT64_C(1) << 8)
#define QT_FUNCTION_TARGET_STRING_POPCNT "popcnt"
#define CpuFeatureAES (Q_UINT64_C(1) << 9)
#define QT_FUNCTION_TARGET_STRING_AES "aes,sse4.2"
#define CpuFeatureAVX (Q_UINT64_C(1) << 10)
#define QT_FUNCTION_TARGET_STRING_AVX "avx"
#define CpuFeatureF16C (Q_UINT64_C(1) << 11)
#define QT_FUNCTION_TARGET_STRING_F16C "f16c"
#define CpuFeatureRDRND (Q_UINT64_C(1) << 12)
#define QT_FUNCTION_TARGET_STRING_RDRND "rdrnd"
// in CPUID Leaf 7, Sub-leaf 0, EBX:
static const quint64 CpuFeatureBMI = Q_UINT64_C(1) << 13;
static const quint64 CpuFeatureHLE = Q_UINT64_C(1) << 14;
static const quint64 CpuFeatureAVX2 = Q_UINT64_C(1) << 15;
static const quint64 CpuFeatureBMI2 = Q_UINT64_C(1) << 16;
static const quint64 CpuFeatureRTM = Q_UINT64_C(1) << 17;
static const quint64 CpuFeatureAVX512F = Q_UINT64_C(1) << 18;
static const quint64 CpuFeatureAVX512DQ = Q_UINT64_C(1) << 19;
static const quint64 CpuFeatureRDSEED = Q_UINT64_C(1) << 20;
static const quint64 CpuFeatureAVX512IFMA = Q_UINT64_C(1) << 21;
static const quint64 CpuFeatureAVX512PF = Q_UINT64_C(1) << 22;
static const quint64 CpuFeatureAVX512ER = Q_UINT64_C(1) << 23;
static const quint64 CpuFeatureAVX512CD = Q_UINT64_C(1) << 24;
static const quint64 CpuFeatureSHA = Q_UINT64_C(1) << 25;
static const quint64 CpuFeatureAVX512BW = Q_UINT64_C(1) << 26;
static const quint64 CpuFeatureAVX512VL = Q_UINT64_C(1) << 27;
#define CpuFeatureBMI (Q_UINT64_C(1) << 13)
#define QT_FUNCTION_TARGET_STRING_BMI "bmi"
#define CpuFeatureHLE (Q_UINT64_C(1) << 14)
#define QT_FUNCTION_TARGET_STRING_HLE "hle"
#define CpuFeatureAVX2 (Q_UINT64_C(1) << 15)
#define QT_FUNCTION_TARGET_STRING_AVX2 "avx2"
#define CpuFeatureBMI2 (Q_UINT64_C(1) << 16)
#define QT_FUNCTION_TARGET_STRING_BMI2 "bmi2"
#define CpuFeatureRTM (Q_UINT64_C(1) << 17)
#define QT_FUNCTION_TARGET_STRING_RTM "rtm"
#define CpuFeatureAVX512F (Q_UINT64_C(1) << 18)
#define QT_FUNCTION_TARGET_STRING_AVX512F "avx512f"
#define CpuFeatureAVX512DQ (Q_UINT64_C(1) << 19)
#define QT_FUNCTION_TARGET_STRING_AVX512DQ "avx512dq"
#define CpuFeatureRDSEED (Q_UINT64_C(1) << 20)
#define QT_FUNCTION_TARGET_STRING_RDSEED "rdseed"
#define CpuFeatureAVX512IFMA (Q_UINT64_C(1) << 21)
#define QT_FUNCTION_TARGET_STRING_AVX512IFMA "avx512ifma"
#define CpuFeatureAVX512PF (Q_UINT64_C(1) << 22)
#define QT_FUNCTION_TARGET_STRING_AVX512PF "avx512pf"
#define CpuFeatureAVX512ER (Q_UINT64_C(1) << 23)
#define QT_FUNCTION_TARGET_STRING_AVX512ER "avx512er"
#define CpuFeatureAVX512CD (Q_UINT64_C(1) << 24)
#define QT_FUNCTION_TARGET_STRING_AVX512CD "avx512cd"
#define CpuFeatureSHA (Q_UINT64_C(1) << 25)
#define QT_FUNCTION_TARGET_STRING_SHA "sha"
#define CpuFeatureAVX512BW (Q_UINT64_C(1) << 26)
#define QT_FUNCTION_TARGET_STRING_AVX512BW "avx512bw"
#define CpuFeatureAVX512VL (Q_UINT64_C(1) << 27)
#define QT_FUNCTION_TARGET_STRING_AVX512VL "avx512vl"
// in CPUID Leaf 7, Sub-leaf 0, ECX:
static const quint64 CpuFeatureAVX512VBMI = Q_UINT64_C(1) << 28;
static const quint64 CpuFeatureAVX512VBMI2 = Q_UINT64_C(1) << 29;
static const quint64 CpuFeatureGFNI = Q_UINT64_C(1) << 30;
static const quint64 CpuFeatureVAES = Q_UINT64_C(1) << 31;
static const quint64 CpuFeatureAVX512VNNI = Q_UINT64_C(1) << 32;
static const quint64 CpuFeatureAVX512BITALG = Q_UINT64_C(1) << 33;
static const quint64 CpuFeatureAVX512VPOPCNTDQ = Q_UINT64_C(1) << 34;
#define CpuFeatureAVX512VBMI (Q_UINT64_C(1) << 28)
#define QT_FUNCTION_TARGET_STRING_AVX512VBMI "avx512vbmi"
#define CpuFeatureAVX512VBMI2 (Q_UINT64_C(1) << 29)
#define QT_FUNCTION_TARGET_STRING_AVX512VBMI2 "avx512vbmi2"
#define CpuFeatureGFNI (Q_UINT64_C(1) << 30)
#define QT_FUNCTION_TARGET_STRING_GFNI "gfni"
#define CpuFeatureVAES (Q_UINT64_C(1) << 31)
#define QT_FUNCTION_TARGET_STRING_VAES "vaes"
#define CpuFeatureAVX512VNNI (Q_UINT64_C(1) << 32)
#define QT_FUNCTION_TARGET_STRING_AVX512VNNI "avx512vnni"
#define CpuFeatureAVX512BITALG (Q_UINT64_C(1) << 33)
#define QT_FUNCTION_TARGET_STRING_AVX512BITALG "avx512bitalg"
#define CpuFeatureAVX512VPOPCNTDQ (Q_UINT64_C(1) << 34)
#define QT_FUNCTION_TARGET_STRING_AVX512VPOPCNTDQ "avx512vpopcntdq"
// in CPUID Leaf 7, Sub-leaf 0, EDX:
static const quint64 CpuFeatureAVX5124NNIW = Q_UINT64_C(1) << 35;
static const quint64 CpuFeatureAVX5124FMAPS = Q_UINT64_C(1) << 36;
#define CpuFeatureAVX5124NNIW (Q_UINT64_C(1) << 35)
#define QT_FUNCTION_TARGET_STRING_AVX5124NNIW "avx5124nniw"
#define CpuFeatureAVX5124FMAPS (Q_UINT64_C(1) << 36)
#define QT_FUNCTION_TARGET_STRING_AVX5124FMAPS "avx5124fmaps"
static const quint64 qCompilerCpuFeatures = 0
#ifdef __SSE2__
| (Q_UINT64_C(1) << 1) // CpuFeatureSSE2
| CpuFeatureSSE2
#endif
#ifdef __SSE3__
| (Q_UINT64_C(1) << 2) // CpuFeatureSSE3
| CpuFeatureSSE3
#endif
#ifdef __SSSE3__
| (Q_UINT64_C(1) << 3) // CpuFeatureSSSE3
| CpuFeatureSSSE3
#endif
#ifdef __FMA__
| (Q_UINT64_C(1) << 4) // CpuFeatureFMA
| CpuFeatureFMA
#endif
#ifdef __SSE4_1__
| (Q_UINT64_C(1) << 5) // CpuFeatureSSE4_1
| CpuFeatureSSE4_1
#endif
#ifdef __SSE4_2__
| (Q_UINT64_C(1) << 6) // CpuFeatureSSE4_2
| CpuFeatureSSE4_2
#endif
#ifdef __MOVBE__
| (Q_UINT64_C(1) << 7) // CpuFeatureMOVBE
| CpuFeatureMOVBE
#endif
#ifdef __POPCNT__
| (Q_UINT64_C(1) << 8) // CpuFeaturePOPCNT
| CpuFeaturePOPCNT
#endif
#ifdef __AES__
| (Q_UINT64_C(1) << 9) // CpuFeatureAES
| CpuFeatureAES
#endif
#ifdef __AVX__
| (Q_UINT64_C(1) << 10) // CpuFeatureAVX
| CpuFeatureAVX
#endif
#ifdef __F16C__
| (Q_UINT64_C(1) << 11) // CpuFeatureF16C
| CpuFeatureF16C
#endif
#ifdef __RDRND__
| (Q_UINT64_C(1) << 12) // CpuFeatureRDRND
| CpuFeatureRDRND
#endif
#ifdef __BMI__
| (Q_UINT64_C(1) << 13) // CpuFeatureBMI
| CpuFeatureBMI
#endif
#ifdef __HLE__
| (Q_UINT64_C(1) << 14) // CpuFeatureHLE
| CpuFeatureHLE
#endif
#ifdef __AVX2__
| (Q_UINT64_C(1) << 15) // CpuFeatureAVX2
| CpuFeatureAVX2
#endif
#ifdef __BMI2__
| (Q_UINT64_C(1) << 16) // CpuFeatureBMI2
| CpuFeatureBMI2
#endif
#ifdef __RTM__
| (Q_UINT64_C(1) << 17) // CpuFeatureRTM
| CpuFeatureRTM
#endif
#ifdef __AVX512F__
| (Q_UINT64_C(1) << 18) // CpuFeatureAVX512F
| CpuFeatureAVX512F
#endif
#ifdef __AVX512DQ__
| (Q_UINT64_C(1) << 19) // CpuFeatureAVX512DQ
| CpuFeatureAVX512DQ
#endif
#ifdef __RDSEED__
| (Q_UINT64_C(1) << 20) // CpuFeatureRDSEED
| CpuFeatureRDSEED
#endif
#ifdef __AVX512IFMA__
| (Q_UINT64_C(1) << 21) // CpuFeatureAVX512IFMA
| CpuFeatureAVX512IFMA
#endif
#ifdef __AVX512PF__
| (Q_UINT64_C(1) << 22) // CpuFeatureAVX512PF
| CpuFeatureAVX512PF
#endif
#ifdef __AVX512ER__
| (Q_UINT64_C(1) << 23) // CpuFeatureAVX512ER
| CpuFeatureAVX512ER
#endif
#ifdef __AVX512CD__
| (Q_UINT64_C(1) << 24) // CpuFeatureAVX512CD
| CpuFeatureAVX512CD
#endif
#ifdef __SHA__
| (Q_UINT64_C(1) << 25) // CpuFeatureSHA
| CpuFeatureSHA
#endif
#ifdef __AVX512BW__
| (Q_UINT64_C(1) << 26) // CpuFeatureAVX512BW
| CpuFeatureAVX512BW
#endif
#ifdef __AVX512VL__
| (Q_UINT64_C(1) << 27) // CpuFeatureAVX512VL
| CpuFeatureAVX512VL
#endif
#ifdef __AVX512VBMI__
| (Q_UINT64_C(1) << 28) // CpuFeatureAVX512VBMI
| CpuFeatureAVX512VBMI
#endif
#ifdef __AVX512VBMI2__
| (Q_UINT64_C(1) << 29) // CpuFeatureAVX512VBMI2
| CpuFeatureAVX512VBMI2
#endif
#ifdef __GFNI__
| (Q_UINT64_C(1) << 30) // CpuFeatureGFNI
| CpuFeatureGFNI
#endif
#ifdef __VAES__
| (Q_UINT64_C(1) << 31) // CpuFeatureVAES
| CpuFeatureVAES
#endif
#ifdef __AVX512VNNI__
| (Q_UINT64_C(1) << 32) // CpuFeatureAVX512VNNI
| CpuFeatureAVX512VNNI
#endif
#ifdef __AVX512BITALG__
| (Q_UINT64_C(1) << 33) // CpuFeatureAVX512BITALG
| CpuFeatureAVX512BITALG
#endif
#ifdef __AVX512VPOPCNTDQ__
| (Q_UINT64_C(1) << 34) // CpuFeatureAVX512VPOPCNTDQ
| CpuFeatureAVX512VPOPCNTDQ
#endif
#ifdef __AVX5124NNIW__
| (Q_UINT64_C(1) << 35) // CpuFeatureAVX5124NNIW
| CpuFeatureAVX5124NNIW
#endif
#ifdef __AVX5124FMAPS__
| (Q_UINT64_C(1) << 36) // CpuFeatureAVX5124FMAPS
| CpuFeatureAVX5124FMAPS
#endif
;

View File

@ -88,20 +88,10 @@ print q{// This is a generated file. DO NOT EDIT.
QT_BEGIN_NAMESPACE
// Macros for QT_FUNCTION_TARGET (for Clang and GCC)};
# #Define the feature string names for Clang and GCC
for my $feature (@features) {
my $str = $feature->{name};
$str .= ",$feature->{depends}" if defined($feature->{depends});
printf "#define QT_FUNCTION_TARGET_STRING_%-17s \"%s\"\n",
$feature->{id}, $str;
}
// used only to indicate that the CPU detection was initialized
#define QSimdInitialized (Q_UINT64_C(1) << 0)};
# Print the enum
print q{
// used only to indicate that the CPU detection was initialized
static const quint64 QSimdInitialized = Q_UINT64_C(1) << 0;};
my $lastleaf;
for (my $i = 0; $i < scalar @features; ++$i) {
my $feature = $features[$i];
@ -111,7 +101,13 @@ for (my $i = 0; $i < scalar @features; ++$i) {
$lastleaf = $feature->{leaf};
# Feature
printf "static const quint64 CpuFeature%-13s = Q_UINT64_C(1) << %d;\n", $feature->{id}, $i + 1;
printf "#define CpuFeature%-33s (Q_UINT64_C(1) << %d)\n", $feature->{id}, $i + 1;
# Feature string names for Clang and GCC
my $str = $feature->{name};
$str .= ",$feature->{depends}" if defined($feature->{depends});
printf "#define QT_FUNCTION_TARGET_STRING_%-17s \"%s\"\n",
$feature->{id}, $str;
}
print q{
@ -122,9 +118,9 @@ for (my $i = 0; $i < scalar @features; ++$i) {
my $feature = $features[$i];
printf
"#ifdef __%s__\n" .
" | (Q_UINT64_C(1) << %d) \t// CpuFeature%s\n" .
" | CpuFeature%s\n" .
"#endif\n",
$feature->{id}, $i + 1, $feature->{id};
$feature->{id}, $feature->{id};
}
print q{ ;