Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
7bcd060a
Commit
7bcd060a
authored
Oct 07, 2017
by
Debargha Mukherjee
Browse files
Add guard for neon convolve with ext-partition
Change-Id: I599f8fbdd3c19ec67d9a2118a41d735e11dd3f07
parent
0b3ef733
Changes
2
Hide whitespace changes
Inline
Side-by-side
aom_dsp/aom_dsp.cmake
View file @
7bcd060a
...
...
@@ -80,11 +80,16 @@ if (NOT CONFIG_PARALLEL_DEBLOCKING)
"
${
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 @@ if (NOT CONFIG_PARALLEL_DEBLOCKING)
"
${
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 @@ if (NOT CONFIG_PARALLEL_DEBLOCKING)
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
View file @
7bcd060a
...
...
@@ -126,6 +126,7 @@ DSP_SRCS-$(HAVE_AVX2) += x86/highbd_convolve_avx2.c
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_avg_neon.c
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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment