[AArch64] Clean up our CPUDetect.

Drops ARMv7 feature detection.

Source/Core/Common/ArmCPUDetect.cpp

@@ -5,13 +5,13 @@
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <asm/hwcap.h>
+#include <sys/auxv.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/StringUtil.h"
 
-// Only Linux platforms have /proc/cpuinfo
-#if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
 const char procfile[] = "/proc/cpuinfo";
 
 static std::string GetCPUString()
@@ -37,111 +37,6 @@ static std::string GetCPUString()
 	return cpu_string;
 }
 
-static unsigned char GetCPUImplementer()
-{
-	const std::string marker = "CPU implementer\t: ";
-	unsigned char implementer = 0;
-
-	std::string line;
-	std::ifstream file(procfile);
-
-	if (!file)
-		return 0;
-
-	while (std::getline(file, line))
-	{
-		if (line.find(marker) != std::string::npos)
-		{
-			line = line.substr(marker.length());
-			sscanf(line.c_str(), "0x%02hhx", &implementer);
-			break;
-		}
-	}
-
-	return implementer;
-}
-
-static unsigned short GetCPUPart()
-{
-	const std::string marker = "CPU part\t: ";
-	unsigned short part = 0;
-
-	std::string line;
-	std::ifstream file(procfile);
-
-	if (!file)
-		return 0;
-
-	while (std::getline(file, line))
-	{
-		if (line.find(marker) != std::string::npos)
-		{
-			line = line.substr(marker.length());
-			sscanf(line.c_str(), "0x%03hx", &part);
-			break;
-		}
-	}
-
-	return part;
-}
-
-static bool CheckCPUFeature(const std::string& feature)
-{
-	const std::string marker = "Features\t: ";
-
-	std::string line;
-	std::ifstream file(procfile);
-
-	if (!file)
-		return 0;
-
-	while (std::getline(file, line))
-	{
-		if (line.find(marker) != std::string::npos)
-		{
-			std::stringstream line_stream(line);
-			std::string token;
-
-			while (std::getline(line_stream, token, ' '))
-			{
-				if (token == feature)
-					return true;
-			}
-		}
-	}
-
-	return false;
-}
-#endif
-
-static int GetCoreCount()
-{
-#ifdef __SYMBIAN32__
-	return 1;
-#elif defined(BLACKBERRY) || defined(IOS)
-	return 2;
-#else
-	const std::string marker = "processor\t: ";
-	int cores = 0;
-
-	std::string line;
-	std::ifstream file(procfile);
-
-	if (!file)
-		return 0;
-
-	while (std::getline(file, line))
-	{
-		if (line.find(marker) != std::string::npos)
-		{
-			++cores;
-		}
-	}
-
-	return cores;
-#endif
-}
-
 CPUInfo cpu_info;
 
 CPUInfo::CPUInfo()
@@ -155,133 +50,37 @@ void CPUInfo::Detect()
 	// Set some defaults here
 	// When ARMv8 CPUs come out, these need to be updated.
 	HTT = false;
-#ifdef _M_ARM_64
 	OS64bit = true;
 	CPU64bit = true;
 	Mode64bit = true;
-#else
-	OS64bit = false;
-	CPU64bit = false;
-	Mode64bit = false;
-#endif
 	vendor = VENDOR_ARM;
 
 	// Get the information about the CPU
-	num_cores = GetCoreCount();
+	num_cores = sysconf(_SC_NPROCESSORS_CONF);
-#if defined(__SYMBIAN32__) || defined(BLACKBERRY) || defined(IOS)
-	bool isVFP3 = false;
-	bool isVFP4 = false;
-#ifdef IOS
-	isVFP3 = true;
-	// Check for swift arch (VFP4`)
-	#ifdef __ARM_ARCH_7S__
-		isVFP4 = true;
-	#endif // #ifdef __ARM_ARCH_7S__
-#elif defined(BLACKBERRY)
-	isVFP3 = true;
-	const char cpuInfoPath[] = "/pps/services/hw_info/inventory";
-	const std::string marker = "Processor_Name::";
-	const std::string qcCPU = "MSM";
-
-	std::string line;
-	std::ifstream file(cpuInfoPath);
-
-	if (file)
-	{
-		while (std::getline(file, line))
-		{
-			if (line.find(marker) != std::string::npos)
-			{
-				std::string first_three_chars = line.substr(marker.length(), qcCPU.length());
-
-				if (first_three_chars == qcCPU)
-				{
-					isVFP4 = true;
-				}
-
-				break;
-			}
-		}
-	}
-#endif
-	// Hardcode this for now
-	bSwp = true;
-	bHalf = true;
-	bThumb = false;
-	bFastMult = true;
-	bVFP = true;
-	bEDSP = true;
-	bThumbEE = isVFP3;
-	bNEON = isVFP3;
-	bVFPv3 = isVFP3;
-	bTLS = true;
-	bVFPv4 = isVFP4;
-	bIDIVa = isVFP4;
-	bIDIVt = isVFP4;
-	bFP = false;
-	bASIMD = false;
-#else
 	strncpy(cpu_string, GetCPUString().c_str(), sizeof(cpu_string));
-	bSwp = CheckCPUFeature("swp");
+
-	bHalf = CheckCPUFeature("half");
+	unsigned long hwcaps = getauxval(AT_HWCAP);
-	bThumb = CheckCPUFeature("thumb");
+	bFP = hwcaps & HWCAP_FP;
-	bFastMult = CheckCPUFeature("fastmult");
+	bASIMD = hwcaps & HWCAP_ASIMD;
-	bVFP = CheckCPUFeature("vfp");
+	bAES = hwcaps & HWCAP_AES;
-	bEDSP = CheckCPUFeature("edsp");
+	bCRC32 = hwcaps & HWCAP_CRC32;
-	bThumbEE = CheckCPUFeature("thumbee");
+	bSHA1 = hwcaps & HWCAP_SHA1;
-	bNEON = CheckCPUFeature("neon");
+	bSHA2 = hwcaps & HWCAP_SHA2;
-	bVFPv3 = CheckCPUFeature("vfpv3");
-	bTLS = CheckCPUFeature("tls");
-	bVFPv4 = CheckCPUFeature("vfpv4");
-	bIDIVa = CheckCPUFeature("idiva");
-	bIDIVt = CheckCPUFeature("idivt");
-	// Qualcomm Krait supports IDIVA but it doesn't report it. Check for krait.
-	if (GetCPUImplementer() == 0x51 && GetCPUPart() == 0x6F) // Krait(300) is 0x6F, Scorpion is 0x4D
-		bIDIVa = bIDIVt = true;
-	// These two require ARMv8 or higher
-#ifdef _M_ARM_64
-	bFP = CheckCPUFeature("fp");
-	bASIMD = CheckCPUFeature("asimd");
-	bAES = CheckCPUFeature("aes");
-	bCRC32 = CheckCPUFeature("crc32");
-	bSHA1 = CheckCPUFeature("sha1");
-	bSHA2 = CheckCPUFeature("sha2");
-#endif
-#endif
-	// On android, we build a separate library for ARMv7 so this is fine.
-	// TODO: Check for ARMv7 on other platforms.
-#if defined(__ARM_ARCH_7A__)
-	bArmV7 = true;
-#else
-	bArmV7 = false;
-#endif
 }
 
 // Turn the CPU info into a string we can show
 std::string CPUInfo::Summarize()
 {
 	std::string sum;
-#if defined(BLACKBERRY) || defined(IOS) || defined(__SYMBIAN32__)
-	sum = StringFromFormat("%i cores", num_cores);
-#else
 	if (num_cores == 1)
 		sum = StringFromFormat("%s, %i core", cpu_string, num_cores);
 	else
 		sum = StringFromFormat("%s, %i cores", cpu_string, num_cores);
-#endif
+
-	if (bSwp) sum += ", SWP";
+	if (bAES) sum += ", AES";
-	if (bHalf) sum += ", Half";
+	if (bCRC32) sum += ", CRC32";
-	if (bThumb) sum += ", Thumb";
+	if (bSHA1) sum += ", SHA1";
-	if (bFastMult) sum += ", FastMult";
+	if (bSHA2) sum += ", SHA2";
-	if (bVFP) sum += ", VFP";
-	if (bEDSP) sum += ", EDSP";
-	if (bThumbEE) sum += ", ThumbEE";
-	if (bNEON) sum += ", NEON";
-	if (bVFPv3) sum += ", VFPv3";
-	if (bTLS) sum += ", TLS";
-	if (bVFPv4) sum += ", VFPv4";
-	if (bIDIVa) sum += ", IDIVa";
-	if (bIDIVt) sum += ", IDIVt";
 	if (CPU64bit) sum += ", 64-bit";
 
 	return sum;

Source/Core/Common/CPUDetect.h

@@ -56,22 +56,6 @@ struct CPUInfo
 	bool bLongMode;
 	bool bAtom;
 
-	// ARM specific CPUInfo
-	bool bSwp;
-	bool bHalf;
-	bool bThumb;
-	bool bFastMult;
-	bool bVFP;
-	bool bEDSP;
-	bool bThumbEE;
-	bool bNEON;
-	bool bVFPv3;
-	bool bTLS;
-	bool bVFPv4;
-	bool bIDIVa;
-	bool bIDIVt;
-	bool bArmV7;  // enable MOVT, MOVW etc
-
 	// ARMv8 specific
 	bool bFP;
 	bool bASIMD;

Source/Core/DolphinWX/MainAndroid.cpp

@@ -475,7 +475,7 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersio
 
 JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv *env, jobject obj)
 {
-	return cpu_info.bNEON || cpu_info.bASIMD;
+	return cpu_info.bASIMD;
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv *env, jobject obj)