[x265] [PATCH 146 of 307] x86: Fix crash in 32 bit main10 build from chroma_hps code

mythreyi at multicorewareinc.com mythreyi at multicorewareinc.com
Sat Apr 7 04:32:24 CEST 2018


# HG changeset patch
# User Vignesh Vijayakumar
# Date 1509681036 -19800
#      Fri Nov 03 09:20:36 2017 +0530
# Node ID 84dc38e191366e8b737d2a6014793afe830f3b35
# Parent  d3a1db4790b662306a3f1222cde66c006e10f604
x86: Fix crash in 32 bit main10 build from chroma_hps code

diff -r d3a1db4790b6 -r 84dc38e19136 source/common/x86/ipfilter16.asm
--- a/source/common/x86/ipfilter16.asm	Thu Nov 02 14:10:18 2017 +0530
+++ b/source/common/x86/ipfilter16.asm	Fri Nov 03 09:20:36 2017 +0530
@@ -6447,9 +6447,9 @@
     movu            [r2],      m6
 %endmacro
 
+%macro IPFILTER_CHROMA_PS_AVX512_32xN 1
+%if ARCH_X86_64 == 1
 INIT_ZMM avx512
-%if ARCH_X86_64 == 1
-%macro IPFILTER_CHROMA_PS_AVX512_32xN 1
 cglobal interp_4tap_horiz_ps_32x%1, 4,7,9
     add             r1d, r1d
     add             r3d, r3d
@@ -6486,8 +6486,8 @@
     sub             r6d, 2
     jnz             .loop
     RET
+%endif
 %endmacro
-%endif
 
 IPFILTER_CHROMA_PS_AVX512_32xN 8
 IPFILTER_CHROMA_PS_AVX512_32xN 16
@@ -6645,9 +6645,9 @@
     movu            [r2 + mmsize],        m6
 %endmacro
 
+%macro IPFILTER_CHROMA_PS_AVX512_64xN 1
+%if ARCH_X86_64 == 1
 INIT_ZMM avx512
-%if ARCH_X86_64 == 1
-%macro IPFILTER_CHROMA_PS_AVX512_64xN 1
 cglobal interp_4tap_horiz_ps_64x%1, 4,7,9
     add             r1d, r1d
     add             r3d, r3d
@@ -6683,8 +6683,8 @@
     sub             r6d, 2
     jnz             .loop
     RET
+%endif
 %endmacro
-%endif
 
 IPFILTER_CHROMA_PS_AVX512_64xN 16
 IPFILTER_CHROMA_PS_AVX512_64xN 32
@@ -6750,10 +6750,9 @@
     movu            [r2],       ym6
 %endmacro
 
-
+%macro IPFILTER_CHROMA_PS_AVX512_16xN 1
+%if ARCH_X86_64 == 1
 INIT_ZMM avx512
-%if ARCH_X86_64 == 1
-%macro IPFILTER_CHROMA_PS_AVX512_16xN 1
 cglobal interp_4tap_horiz_ps_16x%1, 4,7,9
     add             r1d, r1d
     add             r3d, r3d
@@ -6789,8 +6788,8 @@
     sub             r6d, 2
     jnz             .loop
     RET
+%endif
 %endmacro
-%endif
 
 IPFILTER_CHROMA_PS_AVX512_16xN 4
 IPFILTER_CHROMA_PS_AVX512_16xN 8
@@ -6934,8 +6933,8 @@
     movu            [r2 + mmsize],       ym6
 %endmacro
 
+%if ARCH_X86_64 == 1
 INIT_ZMM avx512
-%if ARCH_X86_64 == 1
 cglobal interp_4tap_horiz_ps_48x64, 4,7,9
     add             r1d, r1d
     add             r3d, r3d


More information about the x265-devel mailing list