Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

* commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191':
  x86: lpc: simd av_evaluate_lls

Conflicts:
	libavutil/x86/lls.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavutil/x86/lls.asm
index 59398b4,92b7f95..ae18f3a
--- 1/libavutil/x86/lls.asm
--- 2/libavutil/x86/lls.asm
+++ b/libavutil/x86/lls.asm
@@@ -195,4 -194,41 +195,41 @@@ cglobal update_lls, 3,6,8, ctx, var, co
      jle .loop2x1
  .ret:
      REP_RET
 -
 +%endif
+ 
+ INIT_XMM sse2
+ cglobal evaluate_lls, 2,4,2, ctx, var, order, i
+     ; This function is often called on the same buffer as update_lls, but with
+     ; an offset. They can't both be aligned.
+     ; Load halves rather than movu to avoid store-forwarding stalls, since the
+     ; input was initialized immediately prior to this function using scalar math.
+     %define coefsq ctxq
+     mov     id, orderd
+     imul    orderd, MAX_VARS
+     lea     coefsq, [ctxq + LLSModel.coeff + orderq*8]
+     movsd   m0, [varq]
+     movhpd  m0, [varq + 8]
+     mulpd   m0, [coefsq]
+     lea coefsq, [coefsq + iq*8]
+     lea   varq, [varq + iq*8]
+     neg     iq
+     add     iq, 2
+ .loop:
+     movsd   m1, [varq + iq*8]
+     movhpd  m1, [varq + iq*8 + 8]
+     mulpd   m1, [coefsq + iq*8]
+     addpd   m0, m1
+     add     iq, 2
+     jl .loop
+     jg .skip1
+     movsd   m1, [varq + iq*8]
+     mulsd   m1, [coefsq + iq*8]
+     addpd   m0, m1
+ .skip1:
+     movhlps m1, m0
+     addsd   m0, m1
+ %if ARCH_X86_32
+     movsd  r0m, m0
+     fld   qword r0m
+ %endif
+     RET

diff --cc libavutil/x86/lls_init.c
index 0c7b75d,888bc54..eb57042
--- 1/libavutil/x86/lls_init.c
--- 2/libavutil/x86/lls_init.c
+++ b/libavutil/x86/lls_init.c
@@@ -31,8 -32,10 +32,10 @@@ av_cold void ff_init_lls_x86(LLSModel *
      int cpu_flags = av_get_cpu_flags();
      if (EXTERNAL_SSE2(cpu_flags)) {
          m->update_lls = ff_update_lls_sse2;
+         if (m->indep_count >= 4)
+             m->evaluate_lls = ff_evaluate_lls_sse2;
      }
 -    if (EXTERNAL_AVX(cpu_flags)) {
 +    if (EXTERNAL_AVX(cpu_flags) && 0) {
          m->update_lls = ff_update_lls_avx;
      }
  }