commit 7bcd060ad9245dfe5e1b90e22041d3e05e41c91e
author Debargha Mukherjee <debargha@google.com> Sat Oct 07 04:48:31 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sun Oct 08 17:04:46 2017 +0000
tree 44fe6743274435840ce80d183154a634aa96d785
parent 0b3ef7334b31b8c68ed30dcee637ddafc6e7037d

Add guard for neon convolve with ext-partition

Change-Id: I599f8fbdd3c19ec67d9a2118a41d735e11dd3f07

aom_dsp/aom_dsp.cmake

diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 2a5f544..ab2e36f 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -80,11 +80,16 @@
       "${AOM_ROOT}/aom_dsp/x86/loopfilter_avx2.c")
 endif ()
 
+if (NOT CONFIG_EXT_PARTITION)
+  set(AOM_DSP_COMMON_ASM_NEON
+      "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_avg_neon_asm.asm"
+      "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_asm.asm"
+      "${AOM_ROOT}/aom_dsp/arm/aom_convolve_avg_neon_asm.asm"
+      "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon_asm.asm")
+endif ()
+
 set(AOM_DSP_COMMON_ASM_NEON
-    "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_avg_neon_asm.asm"
-    "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_asm.asm"
-    "${AOM_ROOT}/aom_dsp/arm/aom_convolve_avg_neon_asm.asm"
-    "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon_asm.asm"
+    ${AOM_DSP_COMMON_ASM_NEON}
     "${AOM_ROOT}/aom_dsp/arm/idct16x16_1_add_neon.asm"
     "${AOM_ROOT}/aom_dsp/arm/idct16x16_add_neon.asm"
     "${AOM_ROOT}/aom_dsp/arm/idct32x32_1_add_neon.asm"
@@ -105,8 +110,13 @@
       "${AOM_ROOT}/aom_dsp/arm/loopfilter_mb_neon.asm")
 endif ()
 
+if (NOT CONFIG_EXT_PARTITION)
+  set(AOM_DSP_COMMON_INTRIN_NEON
+      "${AOM_ROOT}/aom_dsp/arm/aom_convolve_neon.c")
+endif ()
+
 set(AOM_DSP_COMMON_INTRIN_NEON
-    "${AOM_ROOT}/aom_dsp/arm/aom_convolve_neon.c"
+    ${AOM_DSP_COMMON_INTRIN_NEON}
     "${AOM_ROOT}/aom_dsp/arm/avg_neon.c"
     "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c"
     "${AOM_ROOT}/aom_dsp/arm/hadamard_neon.c"
@@ -125,12 +135,17 @@
 endif ()
 
 if ("${AOM_TARGET_CPU}" STREQUAL "arm64")
+  if (NOT CONFIG_EXT_PARTITION)
+    set(AOM_DSP_COMMON_INTRIN_NEON
+        ${AOM_DSP_COMMON_INTRIN_NEON}
+        "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_avg_neon.c"
+        "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
+        "${AOM_ROOT}/aom_dsp/arm/aom_convolve_avg_neon.c"
+        "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c")
+  endif ()
+
   set(AOM_DSP_COMMON_INTRIN_NEON
       ${AOM_DSP_COMMON_INTRIN_NEON}
-      "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_avg_neon.c"
-      "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
-      "${AOM_ROOT}/aom_dsp/arm/aom_convolve_avg_neon.c"
-      "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
       "${AOM_ROOT}/aom_dsp/arm/idct16x16_1_add_neon.c"
       "${AOM_ROOT}/aom_dsp/arm/idct16x16_add_neon.c"
       "${AOM_ROOT}/aom_dsp/arm/idct32x32_1_add_neon.c"

aom_dsp/aom_dsp.mk

diff --git a/aom_dsp/aom_dsp.mk b/aom_dsp/aom_dsp.mk
index f1eb57d..e85c9e3 100644
--- a/aom_dsp/aom_dsp.mk
+++ b/aom_dsp/aom_dsp.mk
@@ -126,6 +126,7 @@
 endif
 DSP_SRCS-$(HAVE_SSE2)  += x86/aom_convolve_copy_sse2.asm
 
+ifneq ($(CONFIG_EXT_PARTITION),yes)
 ifeq ($(HAVE_NEON_ASM),yes)
 DSP_SRCS-yes += arm/aom_convolve_copy_neon_asm$(ASM)
 DSP_SRCS-yes += arm/aom_convolve8_avg_neon_asm$(ASM)
@@ -141,6 +142,7 @@
 DSP_SRCS-yes += arm/aom_convolve_neon.c
 endif  # HAVE_NEON
 endif  # HAVE_NEON_ASM
+endif  # CONFIG_EXT_PARTITION
 
 # common (msa)
 DSP_SRCS-$(HAVE_MSA) += mips/aom_convolve8_avg_horiz_msa.c