johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-28 07:23:37 +02:00
Code Issues Releases Wiki Activity

Add x86 missing feature detections for ndk_compat (#58)

Browse Source 
One more step towards #47.
This commit is contained in:
Guillaume Chatelet 2019-01-22 13:19:42 +01:00 committed by GitHub
parent 5911e96bbd
commit d395dfa026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/cpuinfo_x86.h
View File

@ -20,6 +20,7 @@
CPU_FEATURES_START_CPP_NAMESPACE CPU_FEATURES_START_CPP_NAMESPACE
// See https://en.wikipedia.org/wiki/CPUID for a list of x86 cpu features. // See https://en.wikipedia.org/wiki/CPUID for a list of x86 cpu features.
// The field names are based on the short name provided in the wikipedia tables.
typedef struct { typedef struct {
int aes : 1; int aes : 1;
int erms : 1; int erms : 1;
@ -55,6 +56,10 @@ typedef struct {
int smx : 1; int smx : 1;
int sgx : 1; int sgx : 1;
int cx16 : 1; // aka. CMPXCHG16B int cx16 : 1; // aka. CMPXCHG16B
int sha : 1;
int popcnt : 1;
int movbe : 1;
int rdrnd : 1;
// Make sure to update X86FeaturesEnum below if you add a field here. // Make sure to update X86FeaturesEnum below if you add a field here.
} X86Features; } X86Features;
@ -140,6 +145,10 @@ typedef enum {
X86_SMX, X86_SMX,
X86_SGX, X86_SGX,
X86_CX16, X86_CX16,
X86_SHA,
X86_POPCNT,
X86_MOVBE,
X86_RDRND,
X86_LAST_, X86_LAST_,
} X86FeaturesEnum; } X86FeaturesEnum;

10
ndk_compat/cpu-features.c
View File

@ -124,15 +124,15 @@ static void android_cpuInit(void) {
#elif defined(CPU_FEATURES_ARCH_X86) #elif defined(CPU_FEATURES_ARCH_X86)
X86Info info = GetX86Info(); X86Info info = GetX86Info();
if (info.features.ssse3) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSSE3; if (info.features.ssse3) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSSE3;
if (info.features.popcnt) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_POPCNT;
if (info.features.movbe) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_MOVBE;
if (info.features.sse4_1) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSE4_1; if (info.features.sse4_1) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSE4_1;
if (info.features.sse4_2) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSE4_2; if (info.features.sse4_2) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSE4_2;
if (info.features.aes) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_AES_NI;
if (info.features.avx) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_AVX; if (info.features.avx) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_AVX;
if (info.features.rdrnd) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_RDRAND;
if (info.features.avx2) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_AVX2; if (info.features.avx2) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_AVX2;
// if (info.features.) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_MOVBE; if (info.features.sha) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SHA_NI;
// if (info.features.) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_AES_NI;
// if (info.features.) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_RDRAND;
// if (info.features.) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_POPCNT;
// if (info.features.) g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SHA_NI;
#elif defined(CPU_FEATURES_ARCH_MIPS) #elif defined(CPU_FEATURES_ARCH_MIPS)
MipsInfo info = GetMipsInfo(); MipsInfo info = GetMipsInfo();
if (info.features.r6) g_cpuFeatures |= ANDROID_CPU_MIPS_FEATURE_R6; if (info.features.r6) g_cpuFeatures |= ANDROID_CPU_MIPS_FEATURE_R6;

20
src/cpuinfo_x86.c
View File

@ -145,12 +145,16 @@ static void ParseCpuId(const uint32_t max_cpuid_leaf, X86Info* info) {
features->smx = IsBitSet(leaf_1.ecx, 6); features->smx = IsBitSet(leaf_1.ecx, 6);
features->cx16 = IsBitSet(leaf_1.ecx, 13); features->cx16 = IsBitSet(leaf_1.ecx, 13);
features->movbe = IsBitSet(leaf_1.ecx, 22);
features->popcnt = IsBitSet(leaf_1.ecx, 23);
features->aes = IsBitSet(leaf_1.ecx, 25); features->aes = IsBitSet(leaf_1.ecx, 25);
features->f16c = IsBitSet(leaf_1.ecx, 29); features->f16c = IsBitSet(leaf_1.ecx, 29);
features->rdrnd = IsBitSet(leaf_1.ecx, 30);
features->sgx = IsBitSet(leaf_7.ebx, 2); features->sgx = IsBitSet(leaf_7.ebx, 2);
features->bmi1 = IsBitSet(leaf_7.ebx, 3); features->bmi1 = IsBitSet(leaf_7.ebx, 3);
features->bmi2 = IsBitSet(leaf_7.ebx, 8); features->bmi2 = IsBitSet(leaf_7.ebx, 8);
features->erms = IsBitSet(leaf_7.ebx, 9); features->erms = IsBitSet(leaf_7.ebx, 9);
features->sha = IsBitSet(leaf_7.ebx, 29);
features->vpclmulqdq = IsBitSet(leaf_7.ecx, 10); features->vpclmulqdq = IsBitSet(leaf_7.ecx, 10);
if (have_sse_os_support) { if (have_sse_os_support) {
@ -370,6 +374,14 @@ int GetX86FeaturesEnumValue(const X86Features* features,
return features->sgx; return features->sgx;
case X86_CX16: case X86_CX16:
return features->cx16; return features->cx16;
case X86_SHA:
return features->sha;
case X86_POPCNT:
return features->popcnt;
case X86_MOVBE:
return features->movbe;
case X86_RDRND:
return features->rdrnd;
case X86_LAST_: case X86_LAST_:
break; break;
} }
@ -438,6 +450,14 @@ const char* GetX86FeaturesEnumName(X86FeaturesEnum value) {
return "sgx"; return "sgx";
case X86_CX16: case X86_CX16:
return "cx16"; return "cx16";
case X86_SHA:
return "sha";
case X86_POPCNT:
return "popcnt";
case X86_MOVBE:
return "movbe";
case X86_RDRND:
return "rdrnd";
case X86_LAST_: case X86_LAST_:
break; break;
} }

4
test/cpuinfo_x86_test.cc
View File

@ -90,6 +90,10 @@ TEST(CpuidX86Test, SandyBridge) {
EXPECT_TRUE(features.sse4_1); EXPECT_TRUE(features.sse4_1);
EXPECT_TRUE(features.sse4_2); EXPECT_TRUE(features.sse4_2);
EXPECT_TRUE(features.avx); EXPECT_TRUE(features.avx);
EXPECT_FALSE(features.sha);
EXPECT_TRUE(features.popcnt);
EXPECT_FALSE(features.movbe);
EXPECT_FALSE(features.rdrnd);
} }
TEST(CpuidX86Test, SandyBridgeTestOsSupport) { TEST(CpuidX86Test, SandyBridgeTestOsSupport) {