RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

x86/tx_float: remove HAVE_AVX2_EXTERNAL checks

Browse Source 
It'll always be enabled.
Thanks, nasm.
This commit is contained in:
Lynne 2024-10-06 01:09:22 +02:00
parent b17a240c8d
commit 892f64ad9b
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/x86/tx_float.asm
View File

@ -1517,11 +1517,9 @@ FFT_SPLIT_RADIX_FN avx, 0
FFT_SPLIT_RADIX_FN avx, 1 FFT_SPLIT_RADIX_FN avx, 1
FFT_SPLIT_RADIX_FN fma3, 0 FFT_SPLIT_RADIX_FN fma3, 0
FFT_SPLIT_RADIX_FN fma3, 1 FFT_SPLIT_RADIX_FN fma3, 1
%if HAVE_AVX2_EXTERNAL
FFT_SPLIT_RADIX_FN avx2, 0 FFT_SPLIT_RADIX_FN avx2, 0
FFT_SPLIT_RADIX_FN avx2, 1 FFT_SPLIT_RADIX_FN avx2, 1
%endif %endif
%endif
%macro FFT15_FN 2 %macro FFT15_FN 2
INIT_YMM avx2 INIT_YMM avx2
@ -1581,7 +1579,7 @@ cglobal fft15_ %+ %2, 4, 10, 16, ctx, out, in, stride, len, lut, tmp, tgt5, stri
RET RET
%endmacro %endmacro
%if ARCH_X86_64 && HAVE_AVX2_EXTERNAL %if ARCH_X86_64
FFT15_FN 0, float FFT15_FN 0, float
FFT15_FN 1, ns_float FFT15_FN 1, ns_float
%endif %endif

2
libavutil/x86/tx_float_init.c
View File

@ -282,7 +282,6 @@ const FFTXCodelet * const ff_tx_codelet_list_float_x86[] = {
TX_DEF(fft_sr_ns, FFT, 64, 2097152, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE, TX_DEF(fft_sr_ns, FFT, 64, 2097152, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE,
AV_CPU_FLAG_AVXSLOW), AV_CPU_FLAG_AVXSLOW),
#if HAVE_AVX2_EXTERNAL
TX_DEF(fft15, FFT, 15, 15, 15, 0, 320, factor_init, avx2, AVX2, TX_DEF(fft15, FFT, 15, 15, 15, 0, 320, factor_init, avx2, AVX2,
AV_TX_INPLACE, AV_CPU_FLAG_AVXSLOW), AV_TX_INPLACE, AV_CPU_FLAG_AVXSLOW),
TX_DEF(fft15_ns, FFT, 15, 15, 15, 0, 384, factor_init, avx2, AVX2, TX_DEF(fft15_ns, FFT, 15, 15, 15, 0, 384, factor_init, avx2, AVX2,
@ -304,7 +303,6 @@ const FFTXCodelet * const ff_tx_codelet_list_float_x86[] = {
TX_DEF(mdct_inv, MDCT, 16, TX_LEN_UNLIMITED, 2, TX_FACTOR_ANY, 384, m_inv_init, avx2, AVX2, TX_DEF(mdct_inv, MDCT, 16, TX_LEN_UNLIMITED, 2, TX_FACTOR_ANY, 384, m_inv_init, avx2, AVX2,
FF_TX_INVERSE_ONLY, AV_CPU_FLAG_AVXSLOW | AV_CPU_FLAG_SLOW_GATHER), FF_TX_INVERSE_ONLY, AV_CPU_FLAG_AVXSLOW | AV_CPU_FLAG_SLOW_GATHER),
#endif
#endif #endif
NULL, NULL,