RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags 

Previously there was a limit of two cpuflags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Henrik Gramner 2014-09-05 00:13:38 +02:00 committed by Michael Niedermayer
parent 4f10495055
commit 428aa14a48
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libavutil/x86/x86inc.asm
View File

@ -99,9 +99,6 @@
%endif %endif
%endmacro %endmacro
; Always use long nops (reduces 0x90 spam in disassembly on x86_32)
CPUNOP amdnop
; Macros to eliminate most code duplication between x86_32 and x86_64: ; Macros to eliminate most code duplication between x86_32 and x86_64:
; Currently this works only for leaf functions which load all their arguments ; Currently this works only for leaf functions which load all their arguments
; into registers at the start, and make no other use of the stack. Luckily that ; into registers at the start, and make no other use of the stack. Luckily that
@ -759,19 +756,26 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
%define cpuflag(x) ((cpuflags & (cpuflags_ %+ x)) == (cpuflags_ %+ x)) %define cpuflag(x) ((cpuflags & (cpuflags_ %+ x)) == (cpuflags_ %+ x))
%define notcpuflag(x) ((cpuflags & (cpuflags_ %+ x)) != (cpuflags_ %+ x)) %define notcpuflag(x) ((cpuflags & (cpuflags_ %+ x)) != (cpuflags_ %+ x))
; Takes up to 2 cpuflags from the above list. ; Takes an arbitrary number of cpuflags from the above list.
; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu. ; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu.
; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co. ; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co.
%macro INIT_CPUFLAGS 0-2 %macro INIT_CPUFLAGS 0-*
CPUNOP amdnop %xdefine SUFFIX
%undef cpuname
%assign cpuflags 0
%if %0 >= 1 %if %0 >= 1
%xdefine cpuname %1 %rep %0
%assign cpuflags cpuflags_%1 %ifdef cpuname
%if %0 >= 2 %xdefine cpuname cpuname %+ _%1
%xdefine cpuname %1_%2 %else
%assign cpuflags cpuflags | cpuflags_%2 %xdefine cpuname %1
%endif %endif
%assign cpuflags cpuflags | cpuflags_%1
%rotate 1
%endrep
%xdefine SUFFIX _ %+ cpuname %xdefine SUFFIX _ %+ cpuname
%if cpuflag(avx) %if cpuflag(avx)
%assign avx_enabled 1 %assign avx_enabled 1
%endif %endif
@ -782,16 +786,15 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
%endif %endif
%if cpuflag(aligned) %if cpuflag(aligned)
%define movu mova %define movu mova
%elifidn %1, sse3 %elif cpuflag(sse3) && notcpuflag(ssse3)
%define movu lddqu %define movu lddqu
%endif %endif
%if notcpuflag(sse2) %endif
CPUNOP basicnop
%endif %if cpuflag(sse2)
CPUNOP amdnop
%else %else
%xdefine SUFFIX CPUNOP basicnop
%undef cpuname
%undef cpuflags
%endif %endif
%endmacro %endmacro