diff options
| author | Timothy B. Terriberry <tterribe@xiph.org> | 2013-11-18 22:30:13 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-18 22:41:17 +0400 |
| commit | 39386e0b85ec0f978aa104d312604badb9047d58 (patch) | |
| tree | e1171628bb638ec1b770b049e39609d7a268c584 /Makefile.am | |
| parent | 530198f955e49571b3f890b4da4d933a4cd5df4e (diff) | |
Adds Neon assembly for correlation/convolution
Optimizing celt_pitch_xcorr()/xcorr_kernel() which also speeds up
FIRs, IIRs and auto-correlations
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 20286f84..7a2dca33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,13 @@ endif if CPU_ARM CELT_SOURCES += $(CELT_SOURCES_ARM) +SILK_SOURCES += $(SILK_SOURCES_ARM) +if OPUS_ARM_EXTERNAL_ASM +CELT_SOURCES += $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) +BUILT_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \ + $(CELT_AM_SOURCES_ARM_ASM:.s.in=.s) \ + $(CELT_AM_SOURCES_ARM_ASM.s.in=-gnu.S) +endif endif include celt_headers.mk @@ -106,11 +113,12 @@ endif endif EXTRA_DIST = version.mk \ - opus.pc.in \ + opus.pc.in \ opus-uninstalled.pc.in \ opus.m4 \ Makefile.unix \ tests/run_vectors.sh \ + celt/arm/arm2gnu.pl \ win32/VS2010/silk_float.vcxproj \ win32/VS2010/celt.vcxproj.filters \ win32/VS2010/opus.vcxproj \ @@ -206,3 +214,14 @@ dist-hook: .PHONY: opus check-opus install-opus docs install-docs + +# automake doesn't do dependency tracking for asm files, that I can tell +$(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): celt/arm/armopts-gnu.S +$(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl + +# convert ARM asm to GNU as format +%-gnu.S: $(top_srcdir)/%.s + $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@ +# For autoconf-modified sources (e.g., armopts.s) +%-gnu.S: %.s + $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@ |