[x265] [PATCH 017 of 307] Backed out changeset: 5f3ebc0b5512

[mythreyi at multicorewareinc.com]

# HG changeset patch
# User Praveen Tiwari <praveen at multicorewareinc.com>
# Date 1499668844 -19800
#      Mon Jul 10 12:10:44 2017 +0530
# Node ID 6c409d2363c42f485748c5a9d3f4b209f58e6aa5
# Parent  abdbd144d5b4cdfc7f84b540d713147d9b5143fc
Backed out changeset: 5f3ebc0b5512

diff -r abdbd144d5b4 -r 6c409d2363c4 source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Fri Jul 07 12:32:37 2017 +0530
+++ b/source/common/x86/asm-primitives.cpp	Mon Jul 10 12:10:44 2017 +0530
@@ -3790,11 +3790,6 @@
         p.pu[LUMA_64x48].addAvg = PFX(addAvg_64x48_avx512);
         p.pu[LUMA_64x64].addAvg = PFX(addAvg_64x64_avx512);
 
-        p.pu[LUMA_64x16].addAvg = PFX(addAvg_64x16_avx512);
-        p.pu[LUMA_64x32].addAvg = PFX(addAvg_64x32_avx512);
-        p.pu[LUMA_64x48].addAvg = PFX(addAvg_64x48_avx512);
-        p.pu[LUMA_64x64].addAvg = PFX(addAvg_64x64_avx512);
-
     }
 #endif
 }
diff -r abdbd144d5b4 -r 6c409d2363c4 source/common/x86/mc-a.asm
--- a/source/common/x86/mc-a.asm	Fri Jul 07 12:32:37 2017 +0530
+++ b/source/common/x86/mc-a.asm	Mon Jul 10 12:10:44 2017 +0530
@@ -2951,65 +2951,6 @@
 ADDAVG_W64_H2_AVX512 48
 ADDAVG_W64_H2_AVX512 64
 
-%macro ADDAVG_W64_H2_AVX512 1
-INIT_ZMM avx512
-cglobal addAvg_64x%1, 6,7,6, pSrc0, src0, src1, dst, src0Stride, src1tride, dstStride
-    vbroadcasti32x8 m4, [pw_256]
-    vbroadcasti32x8 m5, [pw_128]
-    add             r3, r3
-    add             r4, r4
-    mov             r6d, %1/16
-
-.loop:
-%rep 8
-    movu            m0, [r0]
-    movu            m1, [r1]
-    movu            m2, [r0 + 64]
-    movu            m3, [r1 + 64]
-    paddw           m0, m1
-    pmulhrsw        m0, m4
-    paddw           m0, m5
-    paddw           m2, m3
-    pmulhrsw        m2, m4
-    paddw           m2, m5
-
-    packuswb        m0, m2
-    vpermq          m0, m0, 11011000b
-    vshufi64x2      m0, m0, 11011000b
-    movu            [r2], m0
-
-
-    movu            m0, [r0 + r3]
-    movu            m1, [r1 + r4]
-    movu            m2, [r0 + r3 + 64]
-    movu            m3, [r1 + r4 + 64]
-    paddw           m0, m1
-    pmulhrsw        m0, m4
-    paddw           m0, m5
-    paddw           m2, m3
-    pmulhrsw        m2, m4
-    paddw           m2, m5
-
-    packuswb        m0, m2
-    vpermq          m0, m0, 11011000b
-    vshufi64x2      m0, m0, 11011000b
-    movu            [r2 + r5], m0
-
-    lea             r2, [r2 + 2 * r5]
-    lea             r0, [r0 + 2 * r3]
-    lea             r1, [r1 + 2 * r4]
-%endrep
-
-    dec             r6d
-    jnz             .loop
-    RET
-%endmacro
-
-ADDAVG_W64_H2_AVX512 16
-ADDAVG_W64_H2_AVX512 32
-ADDAVG_W64_H2_AVX512 48
-ADDAVG_W64_H2_AVX512 64
-
 %macro ADDAVG_W48_H2_AVX2 1
 INIT_YMM avx2
 cglobal addAvg_48x%1, 6,7,6, pSrc0, src0, src1, dst, src0Stride, src1tride, dstStride