diff options
author | Nils Wallménius <nils@rockbox.org> | 2013-08-31 17:01:07 +0200 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2013-08-31 17:57:33 +0200 |
commit | 516f7fbd6c60eb153a0ba9d82e9b911e2f9732ab (patch) | |
tree | 491918103a44cae3c0577622ac49d676bc9545f7 | |
parent | b592a7a8a52bc2b61108570afff943b7e9afdc3d (diff) | |
download | rockbox-516f7fbd6c60eb153a0ba9d82e9b911e2f9732ab.tar.gz rockbox-516f7fbd6c60eb153a0ba9d82e9b911e2f9732ab.zip |
Add cf asm inline for multiplication commonly used in silk.
Speeds up decoding a 16kbps test file by 4.9MHz on h300.
Change-Id: I8c25431c98dfa9a1c3806a84055e0847eb77a9f1
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/cf/macros_cf.h | 50 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/macros.h | 4 |
2 files changed, 54 insertions, 0 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/cf/macros_cf.h b/lib/rbcodec/codecs/libopus/silk/cf/macros_cf.h new file mode 100644 index 0000000000..157e1aebc5 --- /dev/null +++ b/lib/rbcodec/codecs/libopus/silk/cf/macros_cf.h | |||
@@ -0,0 +1,50 @@ | |||
1 | /*********************************************************************** | ||
2 | Copyright (C) 2013 Xiph.Org Foundation and contributors. | ||
3 | Redistribution and use in source and binary forms, with or without | ||
4 | modification, are permitted provided that the following conditions | ||
5 | are met: | ||
6 | - Redistributions of source code must retain the above copyright notice, | ||
7 | this list of conditions and the following disclaimer. | ||
8 | - Redistributions in binary form must reproduce the above copyright | ||
9 | notice, this list of conditions and the following disclaimer in the | ||
10 | documentation and/or other materials provided with the distribution. | ||
11 | - Neither the name of Internet Society, IETF or IETF Trust, nor the | ||
12 | names of specific contributors, may be used to endorse or promote | ||
13 | products derived from this software without specific prior written | ||
14 | permission. | ||
15 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
16 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
17 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
18 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
19 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
20 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
21 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
22 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
23 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
24 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
25 | POSSIBILITY OF SUCH DAMAGE. | ||
26 | ***********************************************************************/ | ||
27 | |||
28 | #ifndef SILK_MACROS_CF_H | ||
29 | #define SILK_MACROS_CF_H | ||
30 | |||
31 | /* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ | ||
32 | #undef silk_SMULWB | ||
33 | static inline int32_t silk_SMULWB_cf(int32_t a, int16_t b) | ||
34 | { | ||
35 | int32_t r; | ||
36 | asm volatile ("mac.l %[a], %[b], %%acc0;" | ||
37 | "movclr.l %%acc0, %[r];" | ||
38 | : [r] "=r" (r) | ||
39 | : [a] "r" (a), [b] "r" (b<<15) | ||
40 | : "cc"); | ||
41 | return r; | ||
42 | } | ||
43 | |||
44 | #define silk_SMULWB(a, b) (silk_SMULWB_cf(a, b)) | ||
45 | |||
46 | /* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */ | ||
47 | #undef silk_SMLAWB | ||
48 | #define silk_SMLAWB(a, b, c) ((a) + silk_SMULWB(b, c)) | ||
49 | |||
50 | #endif /* SILK_MACROS_CF_H */ | ||
diff --git a/lib/rbcodec/codecs/libopus/silk/macros.h b/lib/rbcodec/codecs/libopus/silk/macros.h index 8aba9bb85f..97f03c886a 100644 --- a/lib/rbcodec/codecs/libopus/silk/macros.h +++ b/lib/rbcodec/codecs/libopus/silk/macros.h | |||
@@ -108,5 +108,9 @@ static inline opus_int32 silk_CLZ32(opus_int32 in32) | |||
108 | #include "arm/macros_armv5e.h" | 108 | #include "arm/macros_armv5e.h" |
109 | #endif | 109 | #endif |
110 | 110 | ||
111 | #ifdef CF_ASM | ||
112 | #include "cf/macros_cf.h" | ||
113 | #endif | ||
114 | |||
111 | #endif /* SILK_MACROS_H */ | 115 | #endif /* SILK_MACROS_H */ |
112 | 116 | ||