zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored inline assembly code in complex_fft.c, by combining the individual __asm lines into a single block, to avoid potential register usage problems when building with different tools.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/1153004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3592 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kma@webrtc.org
2013-03-01 23:01:14 +00:00
parent 6be1e934ad
commit 7d6f11302e
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
webrtc/common_audio/signal_processing/complex_fft.c
View File

@ -234,9 +234,9 @@ int WebRtcSpl_ComplexFFT(WebRtc_Word16 frfi[], int stages, int mode)
wi = -kSinTable1024[j]; wi = -kSinTable1024[j];
#ifdef WEBRTC_ARCH_ARM_V7 #ifdef WEBRTC_ARCH_ARM_V7
WebRtc_Word32 wri; WebRtc_Word32 wri = 0;
WebRtc_Word32 frfi_r; WebRtc_Word32 frfi_r = 0;
__asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) : __asm __volatile("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) :
"r"((WebRtc_Word32)wr), "r"((WebRtc_Word32)wi)); "r"((WebRtc_Word32)wr), "r"((WebRtc_Word32)wi));
#endif #endif
@ -245,12 +245,18 @@ int WebRtcSpl_ComplexFFT(WebRtc_Word16 frfi[], int stages, int mode)
j = i + l; j = i + l;
#ifdef WEBRTC_ARCH_ARM_V7 #ifdef WEBRTC_ARCH_ARM_V7
__asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(frfi_r) : __asm __volatile(
"r"((WebRtc_Word32)frfi[2*j]), "r"((WebRtc_Word32)frfi[2*j +1])); "pkhbt %[frfi_r], %[frfi_even], %[frfi_odd], lsl #16\n\t"
__asm__("smlsd %0, %1, %2, %3" : "=r"(tr32) : "smlsd %[tr32], %[wri], %[frfi_r], %[cfftrnd]\n\t"
"r"(wri), "r"(frfi_r), "r"(CFFTRND)); "smladx %[ti32], %[wri], %[frfi_r], %[cfftrnd]\n\t"
__asm__("smladx %0, %1, %2, %3" : "=r"(ti32) : :[frfi_r]"+r"(frfi_r),
"r"(wri), "r"(frfi_r), "r"(CFFTRND)); [tr32]"=r"(tr32),
[ti32]"=r"(ti32)
:[frfi_even]"r"((WebRtc_Word32)frfi[2*j]),
[frfi_odd]"r"((WebRtc_Word32)frfi[2*j +1]),
[wri]"r"(wri),
[cfftrnd]"r"(CFFTRND)
);
#else #else
tr32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j]) tr32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j])
@ -375,9 +381,9 @@ int WebRtcSpl_ComplexIFFT(WebRtc_Word16 frfi[], int stages, int mode)
wi = kSinTable1024[j]; wi = kSinTable1024[j];
#ifdef WEBRTC_ARCH_ARM_V7 #ifdef WEBRTC_ARCH_ARM_V7
WebRtc_Word32 wri; WebRtc_Word32 wri = 0;
WebRtc_Word32 frfi_r; WebRtc_Word32 frfi_r = 0;
__asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) : __asm __volatile("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) :
"r"((WebRtc_Word32)wr), "r"((WebRtc_Word32)wi)); "r"((WebRtc_Word32)wr), "r"((WebRtc_Word32)wi));
#endif #endif
@ -386,12 +392,18 @@ int WebRtcSpl_ComplexIFFT(WebRtc_Word16 frfi[], int stages, int mode)
j = i + l; j = i + l;
#ifdef WEBRTC_ARCH_ARM_V7 #ifdef WEBRTC_ARCH_ARM_V7
__asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(frfi_r) : __asm __volatile(
"r"((WebRtc_Word32)frfi[2*j]), "r"((WebRtc_Word32)frfi[2*j +1])); "pkhbt %[frfi_r], %[frfi_even], %[frfi_odd], lsl #16\n\t"
__asm__("smlsd %0, %1, %2, %3" : "=r"(tr32) : "smlsd %[tr32], %[wri], %[frfi_r], %[cifftrnd]\n\t"
"r"(wri), "r"(frfi_r), "r"(CIFFTRND)); "smladx %[ti32], %[wri], %[frfi_r], %[cifftrnd]\n\t"
__asm__("smladx %0, %1, %2, %3" : "=r"(ti32) : :[frfi_r]"+r"(frfi_r),
"r"(wri), "r"(frfi_r), "r"(CIFFTRND)); [tr32]"=r"(tr32),
[ti32]"=r"(ti32)
:[frfi_even]"r"((WebRtc_Word32)frfi[2*j]),
[frfi_odd]"r"((WebRtc_Word32)frfi[2*j +1]),
[wri]"r"(wri),
[cifftrnd]"r"(CIFFTRND)
);
#else #else
tr32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j]) tr32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j])