diff options
| author | Miao Wang <miaowang@google.com> | 2016-05-24 01:52:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-24 01:52:46 +0000 |
| commit | b67eda37903835f44c4155246f85c03ddce9de5b (patch) | |
| tree | cca9570414afeb027ec619bf679745fcb5436703 /support | |
| parent | c4a0727a6fc7b6f6108b0e3e1b93ea029d91a611 (diff) | |
| parent | 2dc1cd14e66f2d642f6ddb5961ebf53dfa2df616 (diff) | |
| download | rs-b67eda37903835f44c4155246f85c03ddce9de5b.tar.gz | |
Merge "[RenderScript] Add optimized ASIMD and SSE3 instrinsics to support lib." am: 1104198acf
am: d907ea54dd
* commit 'd907ea54dd6ece044a8812f0f1fe9c821b3e093c':
[RenderScript] Add optimized ASIMD and SSE3 instrinsics to support lib.
Change-Id: I34f9e6125f4c61503c8119a138d5151c6a28a869
Diffstat (limited to 'support')
| -rw-r--r-- | support/rs_support/Android.mk | 34 |
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 |