Commit 112bd4e2 authored by Fritz Koenig's avatar Fritz Koenig
Browse files

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
Showing with 30 additions and 30 deletions
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%include "vpx_ports/x86_abi_support.asm" %include "vpx_ports/x86_abi_support.asm"
;void idct_dequant_0_2x_sse2 ;void vp8_idct_dequant_0_2x_sse2
; ( ; (
; short *qcoeff - 0 ; short *qcoeff - 0
; short *dequant - 1 ; short *dequant - 1
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
; int blk_stride - 5 ; int blk_stride - 5
; ) ; )
global sym(idct_dequant_0_2x_sse2) global sym(vp8_idct_dequant_0_2x_sse2)
sym(idct_dequant_0_2x_sse2): sym(vp8_idct_dequant_0_2x_sse2):
push rbp push rbp
mov rbp, rsp mov rbp, rsp
SHADOW_ARGS_TO_STACK 6 SHADOW_ARGS_TO_STACK 6
...@@ -97,8 +97,8 @@ sym(idct_dequant_0_2x_sse2): ...@@ -97,8 +97,8 @@ sym(idct_dequant_0_2x_sse2):
pop rbp pop rbp
ret ret
global sym(idct_dequant_full_2x_sse2) global sym(vp8_idct_dequant_full_2x_sse2)
sym(idct_dequant_full_2x_sse2): sym(vp8_idct_dequant_full_2x_sse2):
push rbp push rbp
mov rbp, rsp mov rbp, rsp
SHADOW_ARGS_TO_STACK 7 SHADOW_ARGS_TO_STACK 7
...@@ -353,7 +353,7 @@ sym(idct_dequant_full_2x_sse2): ...@@ -353,7 +353,7 @@ sym(idct_dequant_full_2x_sse2):
pop rbp pop rbp
ret ret
;void idct_dequant_dc_0_2x_sse2 ;void vp8_idct_dequant_dc_0_2x_sse2
; ( ; (
; short *qcoeff - 0 ; short *qcoeff - 0
; short *dequant - 1 ; short *dequant - 1
...@@ -362,8 +362,8 @@ sym(idct_dequant_full_2x_sse2): ...@@ -362,8 +362,8 @@ sym(idct_dequant_full_2x_sse2):
; int dst_stride - 4 ; int dst_stride - 4
; short *dc - 5 ; short *dc - 5
; ) ; )
global sym(idct_dequant_dc_0_2x_sse2) global sym(vp8_idct_dequant_dc_0_2x_sse2)
sym(idct_dequant_dc_0_2x_sse2): sym(vp8_idct_dequant_dc_0_2x_sse2):
push rbp push rbp
mov rbp, rsp mov rbp, rsp
SHADOW_ARGS_TO_STACK 7 SHADOW_ARGS_TO_STACK 7
...@@ -438,8 +438,8 @@ sym(idct_dequant_dc_0_2x_sse2): ...@@ -438,8 +438,8 @@ sym(idct_dequant_dc_0_2x_sse2):
pop rbp pop rbp
ret ret
global sym(idct_dequant_dc_full_2x_sse2) global sym(vp8_idct_dequant_dc_full_2x_sse2)
sym(idct_dequant_dc_full_2x_sse2): sym(vp8_idct_dequant_dc_full_2x_sse2):
push rbp push rbp
mov rbp, rsp mov rbp, rsp
SHADOW_ARGS_TO_STACK 7 SHADOW_ARGS_TO_STACK 7
......
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.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, (short *q, short *dq, unsigned char *pre,
unsigned char *dst, int dst_stride, short *dc); 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, (short *q, short *dq, unsigned char *pre,
unsigned char *dst, int dst_stride, short *dc); 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, (short *q, short *dq ,unsigned char *pre,
unsigned char *dst, int dst_stride, int blk_stride); 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, (short *q, short *dq ,unsigned char *pre,
unsigned char *dst, int dst_stride, int blk_stride); unsigned char *dst, int dst_stride, int blk_stride);
...@@ -35,14 +35,14 @@ void vp8_dequant_dc_idct_add_y_block_sse2 ...@@ -35,14 +35,14 @@ void vp8_dequant_dc_idct_add_y_block_sse2
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (((short *)(eobs))[0] & 0xfefe) 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 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) 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 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; q += 64;
dc += 4; dc += 4;
...@@ -61,14 +61,14 @@ void vp8_dequant_idct_add_y_block_sse2 ...@@ -61,14 +61,14 @@ void vp8_dequant_idct_add_y_block_sse2
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (((short *)(eobs))[0] & 0xfefe) 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 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) 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 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; q += 64;
pre += 64; pre += 64;
...@@ -82,33 +82,33 @@ void vp8_dequant_idct_add_uv_block_sse2 ...@@ -82,33 +82,33 @@ void vp8_dequant_idct_add_uv_block_sse2
unsigned char *dstu, unsigned char *dstv, int stride, char *eobs) unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
{ {
if (((short *)(eobs))[0] & 0xfefe) 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 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; q += 32;
pre += 32; pre += 32;
dstu += stride*4; dstu += stride*4;
if (((short *)(eobs))[1] & 0xfefe) 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 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; q += 32;
pre += 32; pre += 32;
if (((short *)(eobs))[2] & 0xfefe) 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 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; q += 32;
pre += 32; pre += 32;
dstv += stride*4; dstv += stride*4;
if (((short *)(eobs))[3] & 0xfefe) 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 else
idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8); vp8_idct_dequant_0_2x_sse2 (q, dq, pre, dstv, stride, 8);
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment