History

x86/tx_float: remove HAVE_AVX2_EXTERNAL checks

It'll always be enabled. Thanks, nasm.

Lynne committed 2 years ago

Commit 892f64a1 parent b17a2402 files · +1 −5Browse files

Unified · Split

2 files
  1. libavutil/x86/tx_float.asm +1 −3
  2. libavutil/x86/tx_float_init.c +0 −2
libavutil/x86/tx_float.asm+1−3
@@ -1517,11 +1517,9 @@ FFT_SPLIT_RADIX_FN avx, 0 · 1516 unmodified lines
15171517 FFT_SPLIT_RADIX_FN avx, 1
15181518 FFT_SPLIT_RADIX_FN fma3, 0
15191519 FFT_SPLIT_RADIX_FN fma3, 1
1520−%if HAVE_AVX2_EXTERNAL
15211520 FFT_SPLIT_RADIX_FN avx2, 0
15221521 FFT_SPLIT_RADIX_FN avx2, 1
15231522 %endif
1524−%endif
15251523
15261524 %macro FFT15_FN 2
15271525 INIT_YMM avx2
@@ -1581,7 +1579,7 @@ cglobal fft15_ %+ %2, 4, 10, 16, ctx, out, in, stride, len, lut, tmp, tgt5, stri · 53 unmodified lines
15811579 RET
15821580 %endmacro
15831581
1584−%if ARCH_X86_64 && HAVE_AVX2_EXTERNAL
1582+%if ARCH_X86_64
15851583 FFT15_FN 0, float
15861584 FFT15_FN 1, ns_float
15871585 %endif
libavutil/x86/tx_float_init.c+0−2
@@ -282,7 +282,6 @@ const FFTXCodelet * const ff_tx_codelet_list_float_x86[] = { · 281 unmodified lines
282282 TX_DEF(fft_sr_ns, FFT, 64, 2097152, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE,
283283 AV_CPU_FLAG_AVXSLOW),
284284
285−#if HAVE_AVX2_EXTERNAL
286285 TX_DEF(fft15, FFT, 15, 15, 15, 0, 320, factor_init, avx2, AVX2,
287286 AV_TX_INPLACE, AV_CPU_FLAG_AVXSLOW),
288287 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[] = { · 15 unmodified lines
304303
305304 TX_DEF(mdct_inv, MDCT, 16, TX_LEN_UNLIMITED, 2, TX_FACTOR_ANY, 384, m_inv_init, avx2, AVX2,
306305 FF_TX_INVERSE_ONLY, AV_CPU_FLAG_AVXSLOW | AV_CPU_FLAG_SLOW_GATHER),
307−#endif
308306 #endif
309307
310308 NULL,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t