Re: [libav-devel] [PATCH 8/8] x86inc: Various minor backports from x264
Quoting Henrik Gramner (2015-08-01 17:27:38) --- libavutil/x86/x86inc.asm | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d70a5f9..0e2f447 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1,7 +1,7 @@ ;* ;* x86inc.asm: x264asm abstraction layer ;* -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2015 x264 project ;* ;* Authors: Loren Merritt lor...@u.washington.edu ;* Anton Mitrofanov bugmas...@narod.ru @@ -740,7 +740,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, ; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default. %if FORMAT_ELF -[section .note.GNU-stack noalloc noexec nowrite progbits] +[SECTION .note.GNU-stack noalloc noexec nowrite progbits] %endif ; cpuflags @@ -759,8 +759,8 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %assign cpuflags_avx (111)| cpuflags_sse42 %assign cpuflags_xop (112)| cpuflags_avx %assign cpuflags_fma4 (113)| cpuflags_avx -%assign cpuflags_avx2 (114)| cpuflags_avx -%assign cpuflags_fma3 (115)| cpuflags_avx +%assign cpuflags_fma3 (114)| cpuflags_avx +%assign cpuflags_avx2 (115)| cpuflags_fma3 %assign cpuflags_cache32 (116) %assign cpuflags_cache64 (117) @@ -809,7 +809,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %endif %endif -%if cpuflag(sse2) +%if ARCH_X86_64 || cpuflag(sse2) %ifdef __NASM_VER__ ALIGNMODE k8 %else -- 1.8.3.2 The last hunk does not apply cleanly without 7/8. Could you please rebase it? -- Anton Khirnov ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
Re: [libav-devel] [PATCH 8/8] x86inc: Various minor backports from x264
On 02/08/15 5:42 PM, Henrik Gramner wrote: On Sat, Aug 1, 2015 at 9:34 PM, James Almer jamr...@gmail.com wrote: The same could be done in av_parse_cpu_flags(). It doesn't affect this patch, and can be done separately. Just throwing the idea out there. Yeah, I guess. What about bmi/bmi2, for that matter? What about them? AVX2 implies BMI2 just like it implies FMA3, and FMA3 implies BMI. Figured it could also be handled like this. To give an example within x264, it would let you do in cabac-a.asm the same thing you did in mc-a2.asm. This patch can go in like this, anyway. This also was just an idea to consider. ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
Re: [libav-devel] [PATCH 8/8] x86inc: Various minor backports from x264
On Sat, Aug 1, 2015 at 9:34 PM, James Almer jamr...@gmail.com wrote: The same could be done in av_parse_cpu_flags(). It doesn't affect this patch, and can be done separately. Just throwing the idea out there. Yeah, I guess. What about bmi/bmi2, for that matter? What about them? ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
[libav-devel] [PATCH 8/8] x86inc: Various minor backports from x264
--- libavutil/x86/x86inc.asm | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d70a5f9..0e2f447 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1,7 +1,7 @@ ;* ;* x86inc.asm: x264asm abstraction layer ;* -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2015 x264 project ;* ;* Authors: Loren Merritt lor...@u.washington.edu ;* Anton Mitrofanov bugmas...@narod.ru @@ -740,7 +740,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, ; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default. %if FORMAT_ELF -[section .note.GNU-stack noalloc noexec nowrite progbits] +[SECTION .note.GNU-stack noalloc noexec nowrite progbits] %endif ; cpuflags @@ -759,8 +759,8 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %assign cpuflags_avx (111)| cpuflags_sse42 %assign cpuflags_xop (112)| cpuflags_avx %assign cpuflags_fma4 (113)| cpuflags_avx -%assign cpuflags_avx2 (114)| cpuflags_avx -%assign cpuflags_fma3 (115)| cpuflags_avx +%assign cpuflags_fma3 (114)| cpuflags_avx +%assign cpuflags_avx2 (115)| cpuflags_fma3 %assign cpuflags_cache32 (116) %assign cpuflags_cache64 (117) @@ -809,7 +809,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %endif %endif -%if cpuflag(sse2) +%if ARCH_X86_64 || cpuflag(sse2) %ifdef __NASM_VER__ ALIGNMODE k8 %else -- 1.8.3.2 ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
Re: [libav-devel] [PATCH 8/8] x86inc: Various minor backports from x264
On 01/08/15 12:27 PM, Henrik Gramner wrote: ; cpuflags @@ -759,8 +759,8 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %assign cpuflags_avx (111)| cpuflags_sse42 %assign cpuflags_xop (112)| cpuflags_avx %assign cpuflags_fma4 (113)| cpuflags_avx -%assign cpuflags_avx2 (114)| cpuflags_avx -%assign cpuflags_fma3 (115)| cpuflags_avx +%assign cpuflags_fma3 (114)| cpuflags_avx +%assign cpuflags_avx2 (115)| cpuflags_fma3 The same could be done in av_parse_cpu_flags(). It doesn't affect this patch, and can be done separately. Just throwing the idea out there. What about bmi/bmi2, for that matter? ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
