x86: Remove the option to disable AVX-512

6 files changed, 8 insertions, 18 deletions

diff --git a/meson.build b/meson.build
index 1a7c409..0ab14d8 100644
--- a/meson.build
+++ b/meson.build
@@ -410,14 +410,9 @@ if is_asm_enabled and host_machine.cpu_family().startswith('x86')
 
         out = nasm_r.stdout().strip().split()
         if out[1].to_lower() == 'version'
-            if out[2].version_compare('<2.13.02')
-                error('nasm 2.13.02 or later is required, found nasm @0@'.format(out[2]))
-            elif out[2].version_compare('<2.14') and get_option('enable_avx512')
-                error('nasm 2.14 or later is required for AVX-512 asm.\n' +
-                       'AVX-512 asm can be disabled with \'-Denable_avx512=false\'')
+            if out[2].version_compare('<2.14')
+                error('nasm 2.14 or later is required, found nasm @0@'.format(out[2]))
             endif
-            cdata.set10('HAVE_AVX512ICL', get_option('enable_avx512'))
-            cdata_asm.set10('HAVE_AVX512ICL', get_option('enable_avx512'))
         else
             error('unexpected nasm version string: @0@'.format(nasm_r.stdout()))
         endif
diff --git a/meson_options.txt b/meson_options.txt
index b9a7912..49a7998 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,11 +10,6 @@ option('enable_asm',
     value: true,
     description: 'Build asm files, if available')
 
-option('enable_avx512',
-    type: 'boolean',
-    value: true,
-    description: 'Build AVX-512 asm files, requires nasm 2.14')
-
 option('enable_tools',
     type: 'boolean',
     value: true,
diff --git a/src/x86/cdef_avx512.asm b/src/x86/cdef_avx512.asm
index af2bb6e..6ea4eac 100644
--- a/src/x86/cdef_avx512.asm
+++ b/src/x86/cdef_avx512.asm
@@ -26,7 +26,7 @@
 %include "config.asm"
 %include "ext/x86/x86inc.asm"
 
-%if HAVE_AVX512ICL && ARCH_X86_64
+%if ARCH_X86_64
 
 %macro DUP4 1-*
     %rep %0
@@ -865,4 +865,4 @@ ALIGN function_align
     CDEF_FILTER_8x8_SEC m12, m13, m14, m15
     ret
 
-%endif ; HAVE_AVX512ICL && ARCH_X86_64
+%endif ; ARCH_X86_64
diff --git a/src/x86/cdef_init_tmpl.c b/src/x86/cdef_init_tmpl.c
index 9445222..63e02b1 100644
--- a/src/x86/cdef_init_tmpl.c
+++ b/src/x86/cdef_init_tmpl.c
@@ -80,7 +80,7 @@ COLD void bitfn(dav1d_cdef_dsp_init_x86)(Dav1dCdefDSPContext *const c) {
 
     if (!(flags & DAV1D_X86_CPU_FLAG_AVX512ICL)) return;
 
-#if HAVE_AVX512ICL && BITDEPTH == 8
+#if BITDEPTH == 8
     c->fb[0] = BF(dav1d_cdef_filter_8x8, avx512icl);
     c->fb[1] = BF(dav1d_cdef_filter_4x8, avx512icl);
     c->fb[2] = BF(dav1d_cdef_filter_4x4, avx512icl);
diff --git a/src/x86/mc_avx512.asm b/src/x86/mc_avx512.asm
index 4edc108..a2011e0 100644
--- a/src/x86/mc_avx512.asm
+++ b/src/x86/mc_avx512.asm
@@ -26,7 +26,7 @@
 %include "config.asm"
 %include "ext/x86/x86inc.asm"
 
-%if HAVE_AVX512ICL && ARCH_X86_64
+%if ARCH_X86_64
 
 SECTION_RODATA 64
 
@@ -2392,4 +2392,4 @@ cglobal w_mask_444_8bpc, 4, 8, 12, dst, stride, tmp1, tmp2, w, h, mask, stride3
     jg .w128_loop
     RET
 
-%endif ; HAVE_AVX512ICL && ARCH_X86_64
+%endif ; ARCH_X86_64
diff --git a/src/x86/mc_init_tmpl.c b/src/x86/mc_init_tmpl.c
index 7e1a298..d5d2fda 100644
--- a/src/x86/mc_init_tmpl.c
+++ b/src/x86/mc_init_tmpl.c
@@ -263,7 +263,7 @@ COLD void bitfn(dav1d_mc_dsp_init_x86)(Dav1dMCDSPContext *const c) {
     if (!(flags & DAV1D_X86_CPU_FLAG_AVX512ICL))
         return;
 
-#if HAVE_AVX512ICL && BITDEPTH == 8
+#if BITDEPTH == 8
     init_mct_fn(FILTER_2D_8TAP_REGULAR,        8tap_regular,        avx512icl);
     init_mct_fn(FILTER_2D_8TAP_REGULAR_SMOOTH, 8tap_regular_smooth, avx512icl);
     init_mct_fn(FILTER_2D_8TAP_REGULAR_SHARP,  8tap_regular_sharp,  avx512icl);