drivers: use common AVX512 build checks

Replace per-driver checks for AVX-512 with the standard variables from
config/x86.

Signed-off-by: Bruce Richardson <[email protected]>
Acked-by: David Marchand <[email protected]>

Author: bruce-richardson

drivers/common/idpf/meson.build

@@ -16,22 +16,9 @@ sources = files(
 )
 
 if arch_subdir == 'x86'
-    idpf_avx512_cpu_support = (
-        cc.get_define('__AVX512F__', args: machine_args) != '' and
-        cc.get_define('__AVX512BW__', args: machine_args) != '' and
-        cc.get_define('__AVX512DQ__', args: machine_args) != ''
-    )
-
-    idpf_avx512_cc_support = (
-        not machine_args.contains('-mno-avx512f') and
-        cc.has_argument('-mavx512f') and
-        cc.has_argument('-mavx512bw') and
-        cc.has_argument('-mavx512dq')
-    )
-
-    if idpf_avx512_cpu_support == true or idpf_avx512_cc_support == true
+    if cc_has_avx512
         cflags += ['-DCC_AVX512_SUPPORT']
-        avx512_args = [cflags, '-mavx512f', '-mavx512bw', '-mavx512dq']
+        avx512_args = cflags + cc_avx512_flags
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
         endif

drivers/event/dlb2/meson.build

@@ -22,47 +22,19 @@ sources = files(
         'dlb2_selftest.c',
 )
 
-# compile AVX512 version if:
-# we are building 64-bit binary (checked above) AND binutils
-# can generate proper code
+if target_has_avx512
+    cflags += '-DCC_AVX512_SUPPORT'
+    sources += files('dlb2_avx512.c')
 
-if binutils_ok
-
-    # compile AVX512 version if either:
-    # a. we have AVX512VL supported in minimum instruction set
-    #    baseline
-    # b. it's not minimum instruction set, but supported by
-    #    compiler
-    #
-    # in former case, just add avx512 C file to files list
-    # in latter case, compile c file to static lib, using correct
-    # compiler flags, and then have the .o file from static lib
-    # linked into main lib.
-
-    # check if all required flags already enabled (variant a).
-    dlb2_avx512_on = false
-    if cc.get_define('__AVX512VL__', args: machine_args) != ''
-        dlb2_avx512_on = true
-    endif
-
-    if dlb2_avx512_on == true
-
-        sources += files('dlb2_avx512.c')
-        cflags += '-DCC_AVX512_SUPPORT'
-
-    elif cc.has_multi_arguments('-mavx512vl')
-
-        cflags += '-DCC_AVX512_SUPPORT'
-        avx512_tmplib = static_library('avx512_tmp',
+elif cc_has_avx512
+    cflags += '-DCC_AVX512_SUPPORT'
+    avx512_tmplib = static_library('avx512_tmp',
                                'dlb2_avx512.c',
                                dependencies: [static_rte_eal, static_rte_eventdev],
-                               c_args: cflags + ['-mavx512vl'])
-        objs += avx512_tmplib.extract_objects('dlb2_avx512.c')
-    else
-        sources += files('dlb2_sse.c')
-    endif
+                               c_args: cflags + cc_avx512_flags)
+    objs += avx512_tmplib.extract_objects('dlb2_avx512.c')
 else
-        sources += files('dlb2_sse.c')
+    sources += files('dlb2_sse.c')
 endif
 
 headers = files('rte_pmd_dlb2.h')

drivers/net/cpfl/meson.build

@@ -22,23 +22,8 @@ sources = files(
         'cpfl_rules.c',
 )
 
-if arch_subdir == 'x86'
-    cpfl_avx512_cpu_support = (
-        cc.get_define('__AVX512F__', args: machine_args) != '' and
-        cc.get_define('__AVX512BW__', args: machine_args) != '' and
-        cc.get_define('__AVX512DQ__', args: machine_args) != ''
-    )
-
-    cpfl_avx512_cc_support = (
-        not machine_args.contains('-mno-avx512f') and
-        cc.has_argument('-mavx512f') and
-        cc.has_argument('-mavx512bw') and
-        cc.has_argument('-mavx512dq')
-    )
-
-    if cpfl_avx512_cpu_support == true or cpfl_avx512_cc_support == true
-        cflags += ['-DCC_AVX512_SUPPORT']
-    endif
+if arch_subdir == 'x86' and cc_has_avx512
+    cflags += ['-DCC_AVX512_SUPPORT']
 endif
 
 if dpdk_conf.has('RTE_HAS_JANSSON')

drivers/net/i40e/meson.build

@@ -57,18 +57,9 @@ if arch_subdir == 'x86'
             c_args: [cflags, '-mavx2'])
     objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
 
-    i40e_avx512_cpu_support = (
-        cc.get_define('__AVX512F__', args: machine_args) != '' and
-        cc.get_define('__AVX512BW__', args: machine_args) != '')
-
-    i40e_avx512_cc_support = (
-        not machine_args.contains('-mno-avx512f') and
-        cc.has_argument('-mavx512f') and
-        cc.has_argument('-mavx512bw'))
-
-    if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
+    if cc_has_avx512
         cflags += ['-DCC_AVX512_SUPPORT']
-        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        avx512_args = cflags + cc_avx512_flags
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
         endif

drivers/net/iavf/meson.build

@@ -39,18 +39,9 @@ if arch_subdir == 'x86'
             c_args: [cflags, '-mavx2'])
     objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
 
-    iavf_avx512_cpu_support = (
-        cc.get_define('__AVX512F__', args: machine_args) != '' and
-        cc.get_define('__AVX512BW__', args: machine_args) != '')
-
-    iavf_avx512_cc_support = (
-        not machine_args.contains('-mno-avx512f') and
-        cc.has_argument('-mavx512f') and
-        cc.has_argument('-mavx512bw'))
-
-    if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
+    if cc_has_avx512
         cflags += ['-DCC_AVX512_SUPPORT']
-        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        avx512_args = cflags + cc_avx512_flags
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
         endif

drivers/net/ice/meson.build

@@ -35,20 +35,9 @@ if arch_subdir == 'x86'
             c_args: [cflags, '-mavx2'])
     objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
 
-    ice_avx512_cpu_support = (
-            cc.get_define('__AVX512F__', args: machine_args) != '' and
-                cc.get_define('__AVX512BW__', args: machine_args) != ''
-    )
-
-    ice_avx512_cc_support = (
-            not machine_args.contains('-mno-avx512f') and
-                cc.has_argument('-mavx512f') and
-                cc.has_argument('-mavx512bw')
-    )
-
-    if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
+    if cc_has_avx512
         cflags += ['-DCC_AVX512_SUPPORT']
-        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        avx512_args = cflags + cc_avx512_flags
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
         endif

drivers/net/idpf/meson.build

@@ -14,21 +14,6 @@ sources = files(
         'idpf_rxtx.c',
 )
 
-if arch_subdir == 'x86'
-    idpf_avx512_cpu_support = (
-        cc.get_define('__AVX512F__', args: machine_args) != '' and
-        cc.get_define('__AVX512BW__', args: machine_args) != '' and
-        cc.get_define('__AVX512DQ__', args: machine_args) != ''
-    )
-
-    idpf_avx512_cc_support = (
-        not machine_args.contains('-mno-avx512f') and
-        cc.has_argument('-mavx512f') and
-        cc.has_argument('-mavx512bw') and
-        cc.has_argument('-mavx512dq')
-    )
-
-    if idpf_avx512_cpu_support == true or idpf_avx512_cc_support == true
-        cflags += ['-DCC_AVX512_SUPPORT']
-    endif
+if arch_subdir == 'x86'and cc_has_avx512
+    cflags += ['-DCC_AVX512_SUPPORT']
 endif

drivers/net/virtio/meson.build

@@ -24,23 +24,21 @@ sources += files(
 deps += ['kvargs', 'bus_pci']
 
 if arch_subdir == 'x86'
-    if not machine_args.contains('-mno-avx512f')
-        if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
-            cflags += ['-DCC_AVX512_SUPPORT']
-            virtio_avx512_lib = static_library('virtio_avx512_lib',
-                          'virtio_rxtx_packed.c',
-                          dependencies: [static_rte_ethdev,
-                        static_rte_kvargs, static_rte_bus_pci],
-                          include_directories: includes,
-                          c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
-            objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
-            if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-                cflags += '-DVIRTIO_GCC_UNROLL_PRAGMA'
-            elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-                cflags += '-DVIRTIO_CLANG_UNROLL_PRAGMA'
-            elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-                cflags += '-DVIRTIO_ICC_UNROLL_PRAGMA'
-            endif
+    if cc_has_avx512
+        cflags += ['-DCC_AVX512_SUPPORT']
+        virtio_avx512_lib = static_library('virtio_avx512_lib',
+                'virtio_rxtx_packed.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_bus_pci],
+                include_directories: includes,
+                c_args: cflags + cc_avx512_flags)
+        objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
+        if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
+            cflags += '-DVIRTIO_GCC_UNROLL_PRAGMA'
+        elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
+            cflags += '-DVIRTIO_CLANG_UNROLL_PRAGMA'
+        elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
+            cflags += '-DVIRTIO_ICC_UNROLL_PRAGMA'
         endif
     endif
     sources += files('virtio_rxtx_simple_sse.c')