fix(ndk_compat): detect ANDROID_CPU_ARM_FEATURE_ARMv7 on ARMv8+ kerne… - #474
Merged
Merged
Conversation
…ls (info.architecture >= 7) When a 32-bit `armeabi-v7a` Android process runs on a 64-bit ARMv8+ Linux kernel (common on Android TV / Google TV devices with 64-bit kernels and 32-bit userspace), `/proc/cpuinfo` reports `CPU architecture: 8`, so `GetArmInfo()` sets `info.architecture = 8`. Previously, `android_cpuInit()` checked `if (info.architecture == 7)`, leaving `ANDROID_CPU_ARM_FEATURE_ARMv7` unset (`0`) on ARMv8+ kernels. Callers checking `(android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_ARMv7)` before dispatching to NEON routines silently fell back to scalar code. Use `if (info.architecture >= 7)` (matching `if (info.architecture >= 6)` on line 117) so 32-bit ARMv7+ processes on ARMv8+ kernels properly report `ANDROID_CPU_ARM_FEATURE_ARMv7`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…ls (info.architecture >= 7)
When a 32-bit
armeabi-v7aAndroid process runs on a 64-bit ARMv8+ Linux kernel (common on Android TV / Google TV devices with 64-bit kernels and 32-bit userspace),/proc/cpuinforeportsCPU architecture: 8, soGetArmInfo()setsinfo.architecture = 8.Previously,
android_cpuInit()checkedif (info.architecture == 7), leavingANDROID_CPU_ARM_FEATURE_ARMv7unset (0) on ARMv8+ kernels. Callers checking(android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_ARMv7)before dispatching to NEON routines silently fell back to scalar code.Use
if (info.architecture >= 7)(matchingif (info.architecture >= 6)on line 117) so 32-bit ARMv7+ processes on ARMv8+ kernels properly reportANDROID_CPU_ARM_FEATURE_ARMv7.