aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-08-23 06:45:13 +0000
committerXin Li <delphij@google.com>2019-08-23 06:45:13 +0000
commit82be1f23b9a6663b4e99a22cccfd5dcad67b9f8c (patch)
treee5714b2c79d812728cfeaabd8faf95a2e9e248ef
parent3fb3bd92e3299abd9e67da0315ced609600114ba (diff)
parentf52454f858828fddd6b45b478ed4081dadcc8ac4 (diff)
downloadlibopus-82be1f23b9a6663b4e99a22cccfd5dcad67b9f8c.tar.gz
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-mastertemp_140451723
Bug: 139893257 Change-Id: Ida2361eb8b3842f52876c465dbbe0d8ad86f7204
-rw-r--r--libopus_blacklist.txt20
-rw-r--r--silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c2
2 files changed, 21 insertions, 1 deletions
diff --git a/libopus_blacklist.txt b/libopus_blacklist.txt
index a789961e..fd3f398d 100644
--- a/libopus_blacklist.txt
+++ b/libopus_blacklist.txt
@@ -23,6 +23,26 @@ fun:ec_decode_bin
src:*/celt/kiss_fft.c
+# assembly optimizations that know what they are doing
+fun:silk_SMULWB_armv4
+fun:silk_SMULWT_armv4
+fun:silk_SMULWW_armv4
+fun:silk_SMLAWW_armv4
+#
+fun:silk_SMULWB_armv5e
+fun:silk_SMLAWB_armv5e
+fun:silk_SMULWT_armv5e
+fun:silk_SMLAWT_armv5e
+fun:silk_SMULBB_armv5e
+fun:silk_SMLABB_armv5e
+fun:silk_SMULBT_armv5e
+fun:silk_SMLABT_armv5e
+fun:silk_ADD_SAT32_armv5e
+fun:silk_SUB_SAT32_armv5e
+fun:silk_CLZ16_armv5
+fun:silk_CLZ32_armv5
+
+
# Performance related
fun:exp_rotation1
fun:haar1
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
index 00a70cb5..ee06f986 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
@@ -172,7 +172,7 @@ void silk_warped_autocorrelation_FIX_neon(
state_QS_s32x4[ 0 ][ 1 ] = calc_state( state_QS_s32x4[ 0 ][ 1 ], state_QS_s32x4[ 2 ][ 1 ], state_QS_s32x4[ 1 ][ 1 ], warping_Q16_s32x4 );
state_QS_s32x4[ 1 ][ 0 ] = state_QS_s32x4[ 2 ][ 0 ];
state_QS_s32x4[ 1 ][ 1 ] = state_QS_s32x4[ 2 ][ 1 ];
- } while( ++n < ( length + order ) );
+ } while( ++n < ( length + order - 3) );
in = state;
o -= 8;
} while( o > 4 );