commit 074424a4ac5b093331df2c92e7a5bcbfff136b71
author Jason Sams <jsams@google.com> Thu May 22 13:30:03 2014 -0700
committer Jason Sams <jsams@google.com> Thu May 22 13:53:23 2014 -0700
tree e608959d5221816533f653c3684730a487592ae1
parent f981663b7e4568dea18ea1e9988dd0ee0e48a24e

Enable ARM64 intrinsics.

This also moves ARM intrinsic ifdefs behing ARCH_ARM_USE_INTRINSICS instead of ARCH_ARM_HAVE_VFP.

Change-Id: I48d3d55c77feb931e22288828247e281db43d32b

cpu_ref/Android.mk

diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index bfb9183..a4fbf3a 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -39,23 +39,22 @@
 	rsCpuIntrinsicResize.cpp \
 	rsCpuIntrinsicLUT.cpp
 
-#LOCAL_CFLAGS_arm64 += -DARCH_ARM_HAVE_NEON
-LOCAL_ASFLAGS_arm64 += -no-integrated-as
+LOCAL_CFLAGS_arm64 += -DARCH_ARM_USE_INTRINSICS -DARCH_ARM64_USE_INTRINSICS
 
-#LOCAL_SRC_FILES_arm64 += \
-#    rsCpuIntrinsics_advsimd_3DLUT.S \
+LOCAL_SRC_FILES_arm64 += \
+    rsCpuIntrinsics_advsimd_3DLUT.S \
+    rsCpuIntrinsics_advsimd_Convolve.S \
+    rsCpuIntrinsics_advsimd_Blur.S \
+    rsCpuIntrinsics_advsimd_ColorMatrix.S \
+    rsCpuIntrinsics_advsimd_YuvToRGB.S
 #    rsCpuIntrinsics_advsimd_Blend.S \
-#    rsCpuIntrinsics_advsimd_Blur.S \
-#    rsCpuIntrinsics_advsimd_Convolve.S \
-#    rsCpuIntrinsics_advsimd_ColorMatrix.S \
-#    rsCpuIntrinsics_advsimd_YuvToRGB.S
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
     LOCAL_CFLAGS_arm += -DARCH_ARM_HAVE_NEON
 endif
 
 ifeq ($(ARCH_ARM_HAVE_VFP),true)
-    LOCAL_CFLAGS_arm += -DARCH_ARM_HAVE_VFP
+    LOCAL_CFLAGS_arm += -DARCH_ARM_HAVE_VFP -DARCH_ARM_USE_INTRINSICS
     LOCAL_SRC_FILES_arm += \
     rsCpuIntrinsics_neon_3DLUT.S \
     rsCpuIntrinsics_neon_Blend.S \