geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: use cpufeatures to support SDL_HasNEON() (thanks, Sylvain!). 

Fixes Bugzilla #4406.
Ryan C. Gordon 2018-12-01 12:19:11 -05:00
parent 1e4acca851
commit 3323b355c9
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@ -75,6 +75,8 @@ ifeq ($(NDK_DEBUG),1)
cmd-strip := cmd-strip :=
endif endif
LOCAL_STATIC_LIBRARIES := cpufeatures
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
########################### ###########################
@ -124,3 +126,6 @@ LOCAL_MODULE := libhidapi
LOCAL_LDLIBS := -llog LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/cpufeatures)

24
src/cpuinfo/SDL_cpuinfo.c
View File

@ -78,6 +78,12 @@
#endif #endif
#endif #endif
#if defined(__ANDROID__) && defined(__ARM_ARCH) && !defined(HAVE_GETAUXVAL)
#if __ARM_ARCH < 8
#include <cpu-features.h>
#endif
#endif
#define CPU_HAS_RDTSC (1 << 0) #define CPU_HAS_RDTSC (1 << 0)
#define CPU_HAS_ALTIVEC (1 << 1) #define CPU_HAS_ALTIVEC (1 << 1)
#define CPU_HAS_MMX (1 << 2) #define CPU_HAS_MMX (1 << 2)
@ -320,7 +326,7 @@ CPU_haveAltiVec(void)
return altivec; return altivec;
} }
#if (defined(__LINUX__) || defined(__ANDROID__)) && defined(__ARM_ARCH) && !defined(HAVE_GETAUXVAL) #if defined(__LINUX__) && defined(__ARM_ARCH) && !defined(HAVE_GETAUXVAL)
static int static int
readProcAuxvForNeon(void) readProcAuxvForNeon(void)
{ {
@ -359,8 +365,20 @@ CPU_haveNEON(void)
return SYSPAGE_ENTRY(cpuinfo)->flags & ARM_CPU_FLAG_NEON; return SYSPAGE_ENTRY(cpuinfo)->flags & ARM_CPU_FLAG_NEON;
#elif (defined(__LINUX__) || defined(__ANDROID__)) && defined(HAVE_GETAUXVAL) #elif (defined(__LINUX__) || defined(__ANDROID__)) && defined(HAVE_GETAUXVAL)
return ((getauxval(AT_HWCAP) & HWCAP_NEON) == HWCAP_NEON); return ((getauxval(AT_HWCAP) & HWCAP_NEON) == HWCAP_NEON);
#elif (defined(__LINUX__) || defined(__ANDROID__)) #elif defined(__LINUX__)
return readProcAuxvForNeon(); /* Android offers a static library for this, but it just parses /proc/self/auxv */ return readProcAuxvForNeon();
#elif defined(__ANDROID__)
/* Use NDK cpufeatures to read either /proc/self/auxv or /proc/cpuinfo */
{
AndroidCpuFamily cpu_family = android_getCpuFamily();
if (cpu_family == ANDROID_CPU_FAMILY_ARM) {
uint64_t cpu_features = android_getCpuFeatures();
if ((cpu_features & ANDROID_CPU_ARM_FEATURE_NEON) != 0) {
return 1;
}
}
return 0;
}
#elif (defined(__WINDOWS__) || defined(__WINRT__)) && defined(_M_ARM) #elif (defined(__WINDOWS__) || defined(__WINRT__)) && defined(_M_ARM)
/* All WinRT ARM devices are required to support NEON, but just in case. */ /* All WinRT ARM devices are required to support NEON, but just in case. */
return IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) != 0; return IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) != 0;