From 112bd4e2b48317a85ba93c513ef79528aca1bb71 Mon Sep 17 00:00:00 2001 From: Fritz Koenig Date: Wed, 24 Aug 2011 10:19:46 -0700 Subject: [PATCH] Fix naming of sse2 idct functions. Prepend idct function names with vp8_ so that under profiling they show up associated with libvpx. Change-Id: I4fe357b50236cb7730a4cc00164c0a3487a1d8b4 --- vp8/common/x86/idctllm_sse2.asm | 20 ++++++++--------- vp8/decoder/x86/idct_blk_sse2.c | 40 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/vp8/common/x86/idctllm_sse2.asm b/vp8/common/x86/idctllm_sse2.asm index 34a7e18ae..83d3765ff 100644 --- a/vp8/common/x86/idctllm_sse2.asm +++ b/vp8/common/x86/idctllm_sse2.asm @@ -11,7 +11,7 @@ %include "vpx_ports/x86_abi_support.asm" -;void idct_dequant_0_2x_sse2 +;void vp8_idct_dequant_0_2x_sse2 ; ( ; short *qcoeff - 0 ; short *dequant - 1 @@ -21,8 +21,8 @@ ; int blk_stride - 5 ; ) -global sym(idct_dequant_0_2x_sse2) -sym(idct_dequant_0_2x_sse2): +global sym(vp8_idct_dequant_0_2x_sse2) +sym(vp8_idct_dequant_0_2x_sse2): push rbp mov rbp, rsp SHADOW_ARGS_TO_STACK 6 @@ -97,8 +97,8 @@ sym(idct_dequant_0_2x_sse2): pop rbp ret -global sym(idct_dequant_full_2x_sse2) -sym(idct_dequant_full_2x_sse2): +global sym(vp8_idct_dequant_full_2x_sse2) +sym(vp8_idct_dequant_full_2x_sse2): push rbp mov rbp, rsp SHADOW_ARGS_TO_STACK 7 @@ -353,7 +353,7 @@ sym(idct_dequant_full_2x_sse2): pop rbp ret -;void idct_dequant_dc_0_2x_sse2 +;void vp8_idct_dequant_dc_0_2x_sse2 ; ( ; short *qcoeff - 0 ; short *dequant - 1 @@ -362,8 +362,8 @@ sym(idct_dequant_full_2x_sse2): ; int dst_stride - 4 ; short *dc - 5 ; ) -global sym(idct_dequant_dc_0_2x_sse2) -sym(idct_dequant_dc_0_2x_sse2): +global sym(vp8_idct_dequant_dc_0_2x_sse2) +sym(vp8_idct_dequant_dc_0_2x_sse2): push rbp mov rbp, rsp SHADOW_ARGS_TO_STACK 7 @@ -438,8 +438,8 @@ sym(idct_dequant_dc_0_2x_sse2): pop rbp ret -global sym(idct_dequant_dc_full_2x_sse2) -sym(idct_dequant_dc_full_2x_sse2): +global sym(vp8_idct_dequant_dc_full_2x_sse2) +sym(vp8_idct_dequant_dc_full_2x_sse2): push rbp mov rbp, rsp SHADOW_ARGS_TO_STACK 7 diff --git a/vp8/decoder/x86/idct_blk_sse2.c b/vp8/decoder/x86/idct_blk_sse2.c index 4c88db474..3a4806862 100644 --- a/vp8/decoder/x86/idct_blk_sse2.c +++ b/vp8/decoder/x86/idct_blk_sse2.c @@ -12,17 +12,17 @@ #include "vp8/common/idct.h" #include "vp8/decoder/dequantize.h" -void idct_dequant_dc_0_2x_sse2 +void vp8_idct_dequant_dc_0_2x_sse2 (short *q, short *dq, unsigned char *pre, unsigned char *dst, int dst_stride, short *dc); -void idct_dequant_dc_full_2x_sse2 +void vp8_idct_dequant_dc_full_2x_sse2 (short *q, short *dq, unsigned char *pre, unsigned char *dst, int dst_stride, short *dc); -void idct_dequant_0_2x_sse2 +void vp8_idct_dequant_0_2x_sse2 (short *q, short *dq ,unsigned char *pre, unsigned char *dst, int dst_stride, int blk_stride); -void idct_dequant_full_2x_sse2 +void vp8_idct_dequant_full_2x_sse2 (short *q, short *dq ,unsigned char *pre, unsigned char *dst, int dst_stride, int blk_stride); @@ -35,14 +35,14 @@ void vp8_dequant_dc_idct_add_y_block_sse2 for (i = 0; i < 4; i++) { if (((short *)(eobs))[0] & 0xfefe) - idct_dequant_dc_full_2x_sse2 (q, dq, pre, dst, stride, dc); + vp8_idct_dequant_dc_full_2x_sse2 (q, dq, pre, dst, stride, dc); else - idct_dequant_dc_0_2x_sse2 (q, dq, pre, dst, stride, dc); + vp8_idct_dequant_dc_0_2x_sse2 (q, dq, pre, dst, stride, dc); if (((short *)(eobs))[1] & 0xfefe) - idct_dequant_dc_full_2x_sse2 (q+32, dq, pre+8, dst+8, stride, dc+2); + vp8_idct_dequant_dc_full_2x_sse2 (q+32, dq, pre+8, dst+8, stride, dc+2); else - idct_dequant_dc_0_2x_sse2 (q+32, dq, pre+8, dst+8, stride, dc+2); + vp8_idct_dequant_dc_0_2x_sse2 (q+32, dq, pre+8, dst+8, stride, dc+2); q += 64; dc += 4; @@ -61,14 +61,14 @@ void vp8_dequant_idct_add_y_block_sse2 for (i = 0; i < 4; i++) { if (((short *)(eobs))[0] & 0xfefe) - idct_dequant_full_2x_sse2 (q, dq, pre, dst, stride, 16); + vp8_idct_dequant_full_2x_sse2 (q, dq, pre, dst, stride, 16); else - idct_dequant_0_2x_sse2 (q, dq, pre, dst, stride, 16); + vp8_idct_dequant_0_2x_sse2 (q, dq, pre, dst, stride, 16); if (((short *)(eobs))[1] & 0xfefe) - idct_dequant_full_2x_sse2 (q+32, dq, pre+8, dst+8, stride, 16); + vp8_idct_dequant_full_2x_sse2 (q+32, dq, pre+8, dst+8, stride, 16); else - idct_dequant_0_2x_sse2 (q+32, dq, pre+8, dst+8, stride, 16); + vp8_idct_dequant_0_2x_sse2 (q+32, dq, pre+8, dst+8, stride, 16); q += 64; pre += 64; @@ -82,33 +82,33 @@ void vp8_dequant_idct_add_uv_block_sse2 unsigned char *dstu, unsigned char *dstv, int stride, char *eobs) { if (((short *)(eobs))[0] & 0xfefe) - idct_dequant_full_2x_sse2 (q, dq, pre, dstu, stride, 8); + vp8_idct_dequant_full_2x_sse2 (q, dq, pre, dstu, stride, 8); else - idct_dequant_0_2x_sse2 (q, dq, pre, dstu, stride, 8); + vp8_idct_dequant_0_2x_sse2 (q, dq, pre, dstu, stride, 8); q += 32; pre += 32; dstu += stride*4; if (((short *)(eobs))[1] & 0xfefe) - idct_dequant_full_2x_sse2 (q, dq, pre, dstu, stride, 8); + vp8_idct_dequant_full_2x_sse2 (q, dq, pre, dstu, stride, 8); else - idct_dequant_0_2x_sse2 (q, dq, pre, dstu, stride, 8); + vp8_idct_dequant_0_2x_sse2 (q, dq, pre, dstu, stride, 8); q += 32; pre += 32; if (((short *)(eobs))[2] & 0xfefe) - idct_dequant_full_2x_sse2 (q, dq, pre, dstv, stride, 8); + vp8_idct_dequant_full_2x_sse2 (q, dq, pre, dstv, stride, 8); else - idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8); + vp8_idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8); q += 32; pre += 32; dstv += stride*4; if (((short *)(eobs))[3] & 0xfefe) - idct_dequant_full_2x_sse2 (q, dq, pre, dstv, stride, 8); + vp8_idct_dequant_full_2x_sse2 (q, dq, pre, dstv, stride, 8); else - idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8); + vp8_idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8); } -- 2.40.0