admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WebRtcSpl_ScaleAndAddVectorsWithRoundNeon

Browse Source 
This function isn't used anymore. The file and header are also removed.

BUG=4002,3273
R=andrew@webrtc.org

Change-Id: I4b65dec57e6adc2ac2253031501f3b6de6937fac

Review URL: https://webrtc-codereview.appspot.com/35519004

Patch from Yang Zhang <yang.zhang@arm.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8019 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2015-01-07 21:34:23 +00:00
parent 59062d5aef
commit d730b288c8
4 changed files with 0 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/common_audio/BUILD.gn
View File

@ -196,7 +196,6 @@ if (rtc_build_armv7_neon) {
"signal_processing/cross_correlation_neon.S",
"signal_processing/downsample_fast_neon.S",
"signal_processing/min_max_operations_neon.S",
"signal_processing/vector_scaling_operations_neon.S",
]
configs += [ "..:common_config" ]

1
webrtc/common_audio/common_audio.gyp
View File

@ -200,7 +200,6 @@
'signal_processing/cross_correlation_neon.S',
'signal_processing/downsample_fast_neon.S',
'signal_processing/min_max_operations_neon.S',
'signal_processing/vector_scaling_operations_neon.S',
],
'conditions': [
# Disable LTO in common_audio_neon target due to compiler bug

9
webrtc/common_audio/signal_processing/include/signal_processing_library.h
View File

@ -383,15 +383,6 @@ int WebRtcSpl_ScaleAndAddVectorsWithRoundC(const int16_t* in_vector1,
int right_shifts,
int16_t* out_vector,
int length);
#if (defined WEBRTC_DETECT_ARM_NEON) || (defined WEBRTC_ARCH_ARM_NEON)
int WebRtcSpl_ScaleAndAddVectorsWithRoundNeon(const int16_t* in_vector1,
int16_t in_vector1_scale,
const int16_t* in_vector2,
int16_t in_vector2_scale,
int right_shifts,
int16_t* out_vector,
int length);
#endif
#if defined(MIPS_DSP_R1_LE)
int WebRtcSpl_ScaleAndAddVectorsWithRound_mips(const int16_t* in_vector1,
int16_t in_vector1_scale,

82
webrtc/common_audio/signal_processing/vector_scaling_operations_neon.S
View File

@ -1,82 +0,0 @@
@
@ Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
@
@ Use of this source code is governed by a BSD-style license
@ that can be found in the LICENSE file in the root of the source
@ tree. An additional intellectual property rights grant can be found
@ in the file PATENTS. All contributing project authors may
@ be found in the AUTHORS file in the root of the source tree.
@
@ vector_scaling_operations_neon.s
@ This file contains the function WebRtcSpl_ScaleAndAddVectorsWithRoundNeon(),
@ optimized for ARM Neon platform. Output is bit-exact with the reference
@ C code in vector_scaling_operations.c.
#include "webrtc/system_wrappers/interface/asm_defines.h"
GLOBAL_FUNCTION WebRtcSpl_ScaleAndAddVectorsWithRoundNeon
.align 2
DEFINE_FUNCTION WebRtcSpl_ScaleAndAddVectorsWithRoundNeon
push {r4-r9}
ldr r4, [sp, #32] @ length
ldr r5, [sp, #28] @ out_vector
ldrsh r6, [sp, #24] @ right_shifts
cmp r4, #0
ble END @ Return if length <= 0.
cmp r4, #8
blt SET_ROUND_VALUE
vdup.16 d26, r1 @ in_vector1_scale
vdup.16 d27, r3 @ in_vector2_scale
@ Neon instructions can only right shift by an immediate value. To shift right
@ by a register value, we have to do a left shift left by the negative value.
rsb r7, r6, #0
vdup.16 q12, r7 @ -right_shifts
bic r7, r4, #7 @ Counter for LOOP_UNROLLED_BY_8: length / 8 * 8.
LOOP_UNROLLED_BY_8:
vld1.16 {d28, d29}, [r0]! @ in_vector1[]
vld1.16 {d30, d31}, [r2]! @ in_vector2[]
vmull.s16 q0, d28, d26
vmull.s16 q1, d29, d26
vmull.s16 q2, d30, d27
vmull.s16 q3, d31, d27
vadd.s32 q0, q2
vadd.s32 q1, q3
vrshl.s32 q0, q12 @ Round shift right by right_shifts.
vrshl.s32 q1, q12
vmovn.i32 d0, q0 @ Cast to 16 bit values.
vmovn.i32 d1, q1
subs r7, #8
vst1.16 {d0, d1}, [r5]!
bgt LOOP_UNROLLED_BY_8
ands r4, #0xFF @ Counter for LOOP_NO_UNROLLING: length % 8.
beq END
SET_ROUND_VALUE:
mov r9, #1
lsl r9, r6
lsr r9, #1
LOOP_NO_UNROLLING:
ldrh r7, [r0], #2
ldrh r8, [r2], #2
smulbb r7, r7, r1
smulbb r8, r8, r3
subs r4, #1
add r7, r9
add r7, r8
asr r7, r6
strh r7, [r5], #2
bne LOOP_NO_UNROLLING
END:
pop {r4-r9}
bx lr