summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2016-05-24 01:41:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-05-24 01:41:21 +0000
commit2dc1cd14e66f2d642f6ddb5961ebf53dfa2df616 (patch)
treefc948da5700c626d7e285e9b4e34211883321b66 /support
parentf854f15b8fa0f0d0ac11cc08712343d8d58e511a (diff)
parent94129c9a252dd12162a282ea3228af2be69c73b1 (diff)
downloadrs-2dc1cd14e66f2d642f6ddb5961ebf53dfa2df616.tar.gz
Merge "[RenderScript] Add optimized ASIMD and SSE3 instrinsics to support lib."
Diffstat (limited to 'support')
-rw-r--r--support/rs_support/Android.mk34
1 files changed, 25 insertions, 9 deletions
diff --git a/support/rs_support/Android.mk b/support/rs_support/Android.mk
index dbac81c0..de8fae01 100644
--- a/support/rs_support/Android.mk
+++ b/support/rs_support/Android.mk
@@ -142,18 +142,34 @@ LOCAL_SRC_FILES:= \
ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
LOCAL_CFLAGS_arm := -DARCH_ARM_HAVE_VFP -DARCH_ARM_USE_INTRINSICS
LOCAL_ASFLAGS_arm := -mfpu=neon
-# Clang does not support nested .irp in *_Blur.S
-LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
LOCAL_SRC_FILES_arm := \
- cpu_ref/rsCpuIntrinsics_neon_3DLUT.S \
- cpu_ref/rsCpuIntrinsics_neon_ColorMatrix.S \
- cpu_ref/rsCpuIntrinsics_neon_Blend.S \
- cpu_ref/rsCpuIntrinsics_neon_Blur.S \
- cpu_ref/rsCpuIntrinsics_neon_Convolve.S \
- cpu_ref/rsCpuIntrinsics_neon_Resize.S \
- cpu_ref/rsCpuIntrinsics_neon_YuvToRGB.S
+ cpu_ref/rsCpuIntrinsics_neon_3DLUT.S \
+ cpu_ref/rsCpuIntrinsics_neon_Blend.S \
+ cpu_ref/rsCpuIntrinsics_neon_Blur.S \
+ cpu_ref/rsCpuIntrinsics_neon_ColorMatrix.S \
+ cpu_ref/rsCpuIntrinsics_neon_Convolve.S \
+ cpu_ref/rsCpuIntrinsics_neon_Resize.S \
+ cpu_ref/rsCpuIntrinsics_neon_YuvToRGB.S
endif
+LOCAL_CFLAGS_arm64 += \
+ -DARCH_ARM_USE_INTRINSICS \
+ -DARCH_ARM64_USE_INTRINSICS \
+ -DARCH_ARM64_HAVE_NEON
+LOCAL_SRC_FILES_arm64 += \
+ cpu_ref/rsCpuIntrinsics_advsimd_3DLUT.S \
+ cpu_ref/rsCpuIntrinsics_advsimd_Blend.S \
+ cpu_ref/rsCpuIntrinsics_advsimd_Blur.S \
+ cpu_ref/rsCpuIntrinsics_advsimd_ColorMatrix.S \
+ cpu_ref/rsCpuIntrinsics_advsimd_Convolve.S \
+ cpu_ref/rsCpuIntrinsics_advsimd_Resize.S \
+ cpu_ref/rsCpuIntrinsics_advsimd_YuvToRGB.S
+
+LOCAL_CFLAGS_x86 += -DARCH_X86_HAVE_SSSE3
+LOCAL_SRC_FILES_x86 += cpu_ref/rsCpuIntrinsics_x86.cpp
+LOCAL_CFLAGS_x86_64 += -DARCH_X86_HAVE_SSSE3
+LOCAL_SRC_FILES_x86_64 += cpu_ref/rsCpuIntrinsics_x86.cpp
+
LOCAL_REQUIRED_MODULES := libblasV8
LOCAL_STATIC_LIBRARIES := libbnnmlowpV8
LOCAL_LDFLAGS += -llog -ldl -Wl,--exclude-libs,libc++_static.a