libvpx: Pull from upstream

source/libvpx/vpx_dsp/x86/sad_sse3.asm

 ;
 ;  Copyright (c) 2010 The WebM 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.
 ;
 
 %include "vpx_ports/x86_abi_support.asm"
 
 %macro STACK_FRAME_CREATE_X3 0
 %if ABI_IS_32BIT
   %define     src_ptr       rsi
   %define     src_stride    rax
   %define     ref_ptr       rdi
   %define     ref_stride    rdx
   %define     end_ptr       rcx
   %define     ret_var       rbx
   %define     result_ptr    arg(4)
-  %define     max_err       arg(4)
   %define     height        dword ptr arg(4)
     push        rbp
     mov         rbp,        rsp
     push        rsi
     push        rdi
     push        rbx
 
     mov         rsi,        arg(0)              ; src_ptr
     mov         rdi,        arg(2)              ; ref_ptr
 
     movsxd      rax,        dword ptr arg(1)    ; src_stride
     movsxd      rdx,        dword ptr arg(3)    ; ref_stride
 %else
   %if LIBVPX_YASM_WIN64
     SAVE_XMM 7, u
     %define     src_ptr     rcx
     %define     src_stride  rdx
     %define     ref_ptr     r8
     %define     ref_stride  r9
     %define     end_ptr     r10
     %define     ret_var     r11
     %define     result_ptr  [rsp+xmm_stack_space+8+4*8]
-    %define     max_err     [rsp+xmm_stack_space+8+4*8]
     %define     height      dword ptr [rsp+xmm_stack_space+8+4*8]
   %else
     %define     src_ptr     rdi
     %define     src_stride  rsi
     %define     ref_ptr     rdx
     %define     ref_stride  rcx
     %define     end_ptr     r9
     %define     ret_var     r10
     %define     result_ptr  r8
-    %define     max_err     r8
     %define     height      r8
   %endif
 %endif
 
 %endmacro
 
 %macro STACK_FRAME_DESTROY_X3 0
   %define     src_ptr
   %define     src_stride
   %define     ref_ptr
   %define     ref_stride
   %define     end_ptr
   %define     ret_var
   %define     result_ptr
-  %define     max_err
   %define     height
 
 %if ABI_IS_32BIT
     pop         rbx
     pop         rdi
     pop         rsi
     pop         rbp
 %else
   %if LIBVPX_YASM_WIN64
     RESTORE_XMM
@@ skipping 81 matching lines @@
 
         psadbw          mm1,       mm0
         psadbw          mm2,       mm0
         psadbw          mm3,       mm0
 
         paddw           mm5,       mm1
         paddw           mm6,       mm2
         paddw           mm7,       mm3
 %endmacro
 
-;void int vp9_sad16x16x3_sse3(
+;void int vpx_sad16x16x3_sse3(
 ;    unsigned char *src_ptr,
 ;    int  src_stride,
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vp9_sad16x16x3_sse3) PRIVATE
-sym(vp9_sad16x16x3_sse3):
+global sym(vpx_sad16x16x3_sse3) PRIVATE
+sym(vpx_sad16x16x3_sse3):
 
     STACK_FRAME_CREATE_X3
 
         PROCESS_16X2X3 0, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
@@ skipping 14 matching lines @@
         movd            [rcx+4],    xmm0
 ;-
         movq            xmm0,       xmm7
         psrldq          xmm7,       8
 
         paddw           xmm0,       xmm7
         movd            [rcx+8],    xmm0
 
     STACK_FRAME_DESTROY_X3
 
-;void int vp9_sad16x8x3_sse3(
+;void int vpx_sad16x8x3_sse3(
 ;    unsigned char *src_ptr,
 ;    int  src_stride,
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vp9_sad16x8x3_sse3) PRIVATE
-sym(vp9_sad16x8x3_sse3):
+global sym(vpx_sad16x8x3_sse3) PRIVATE
+sym(vpx_sad16x8x3_sse3):
 
     STACK_FRAME_CREATE_X3
 
         PROCESS_16X2X3 0, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_16X2X3 2, src_ptr, ref_ptr, src_stride, ref_stride
 
         mov             rcx,        result_ptr
 
@@ skipping 10 matching lines @@
         movd            [rcx+4],    xmm0
 ;-
         movq            xmm0,       xmm7
         psrldq          xmm7,       8
 
         paddw           xmm0,       xmm7
         movd            [rcx+8],    xmm0
 
     STACK_FRAME_DESTROY_X3
 
-;void int vp9_sad8x16x3_sse3(
+;void int vpx_sad8x16x3_sse3(
 ;    unsigned char *src_ptr,
 ;    int  src_stride,
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vp9_sad8x16x3_sse3) PRIVATE
-sym(vp9_sad8x16x3_sse3):
+global sym(vpx_sad8x16x3_sse3) PRIVATE
+sym(vpx_sad8x16x3_sse3):
 
     STACK_FRAME_CREATE_X3
 
         PROCESS_8X2X3 0, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 2, src_ptr, ref_ptr, src_stride, ref_stride
 
         mov             rcx,        result_ptr
 
         punpckldq       mm5,        mm6
 
         movq            [rcx],      mm5
         movd            [rcx+8],    mm7
 
     STACK_FRAME_DESTROY_X3
 
-;void int vp9_sad8x8x3_sse3(
+;void int vpx_sad8x8x3_sse3(
 ;    unsigned char *src_ptr,
 ;    int  src_stride,
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vp9_sad8x8x3_sse3) PRIVATE
-sym(vp9_sad8x8x3_sse3):
+global sym(vpx_sad8x8x3_sse3) PRIVATE
+sym(vpx_sad8x8x3_sse3):
 
     STACK_FRAME_CREATE_X3
 
         PROCESS_8X2X3 0, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 1, src_ptr, ref_ptr, src_stride, ref_stride
         PROCESS_8X2X3 2, src_ptr, ref_ptr, src_stride, ref_stride
 
         mov             rcx,        result_ptr
 
         punpckldq       mm5,        mm6
 
         movq            [rcx],      mm5
         movd            [rcx+8],    mm7
 
     STACK_FRAME_DESTROY_X3
 
-;void int vp9_sad4x4x3_sse3(
+;void int vpx_sad4x4x3_sse3(
 ;    unsigned char *src_ptr,
 ;    int  src_stride,
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vp9_sad4x4x3_sse3) PRIVATE
-sym(vp9_sad4x4x3_sse3):
+global sym(vpx_sad4x4x3_sse3) PRIVATE
+sym(vpx_sad4x4x3_sse3):
 
     STACK_FRAME_CREATE_X3
 
         movd            mm0,        DWORD PTR [src_ptr]
         movd            mm1,        DWORD PTR [ref_ptr]
 
         movd            mm2,        DWORD PTR [src_ptr+src_stride]
         movd            mm3,        DWORD PTR [ref_ptr+ref_stride]
 
         punpcklbw       mm0,        mm2
@@ skipping 45 matching lines @@
         paddw           mm7,        mm5
 
         mov             rcx,        result_ptr
 
         punpckldq       mm1,        mm3
 
         movq            [rcx],      mm1
         movd            [rcx+8],    mm7
 
     STACK_FRAME_DESTROY_X3