Support for armv8 arch only devices (#994)

Recent pixel devices do not report armv7 arch support and only arm64-v8a. This causes benchmark test to exit early with message stating "Not an ARMv7 and not an X86 SSSE3 CPU !\n". This update includes check for `ANDROID_CPU_FAMILY_ARM64` along with subsequent cmake and gradle updates for running the test app.
android · May 3, 2024 · 1cb6518 · 1cb6518
1 parent 9ae3781
commit 1cb6518
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/hello-neon/app/build.gradle b/hello-neon/app/build.gradle
@@ -12,7 +12,7 @@ android {
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
-        ndk.abiFilters 'x86', 'x86_64', 'armeabi-v7a'
+        ndk.abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
     }
     buildTypes {
         release {

diff --git a/hello-neon/app/src/main/cpp/CMakeLists.txt b/hello-neon/app/src/main/cpp/CMakeLists.txt
@@ -27,8 +27,12 @@ elseif (${ANDROID_ABI} STREQUAL "x86")
                    -Wno-constant-conversion \
                    -Wno-static-in-inline")
     add_definitions(-DHAVE_NEON_X86=1 -DHAVE_NEON=1)
+elseif (${ANDROID_ABI} STREQUAL "x86_64")
+    set(neon_SRCS helloneon-intrinsics.c)
+    add_definitions(-DHAVE_NEON_X86=1 -DHAVE_NEON=1)
 else ()
-  set(neon_SRCS)
+    set(neon_SRCS helloneon-intrinsics.c)
+    add_definitions("-DHAVE_NEON=1")
 endif ()
 
 add_library(hello-neon SHARED helloneon.c ${neon_SRCS})

diff --git a/hello-neon/app/src/main/cpp/helloneon.c b/hello-neon/app/src/main/cpp/helloneon.c
@@ -113,13 +113,6 @@ jstring Java_com_example_helloneon_HelloNeon_stringFromJNI(JNIEnv* env,
 
   strlcat(buffer, "Neon version   : ", sizeof buffer);
 
-  family = android_getCpuFamily();
-  if ((family != ANDROID_CPU_FAMILY_ARM) &&
-      (family != ANDROID_CPU_FAMILY_X86)) {
-    strlcat(buffer, "Not an ARM and not an X86 CPU !\n", sizeof buffer);
-    goto EXIT;
-  }
-
   features = android_getCpuFeatures();
   if (((features & ANDROID_CPU_ARM_FEATURE_ARMv7) == 0) &&
       ((features & ANDROID_CPU_X86_FEATURE_SSSE3) == 0)) {