net/iavf: fix Rx queue buffer size alignment

[dpdk.git] / drivers / net / iavf / meson.build

diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index ce82057..f2010a8 100644 (file)
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -1,36 +1,70 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
-cflags += ['-Wno-strict-aliasing']
+if is_windows
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
+endif
 
-allow_experimental_apis = true
+cflags += ['-Wno-strict-aliasing']
 
-subdir('base')
-objs = [base_objs]
+includes += include_directories('../../common/iavf')
+deps += ['common_iavf']
 
 sources = files(
-       'iavf_ethdev.c',
-       'iavf_rxtx.c',
-       'iavf_vchnl.c',
+        'iavf_ethdev.c',
+        'iavf_rxtx.c',
+        'iavf_vchnl.c',
+        'iavf_generic_flow.c',
+        'iavf_fdir.c',
+        'iavf_hash.c',
+        'iavf_tm.c',
 )
 
 if arch_subdir == 'x86'
-       sources += files('iavf_rxtx_vec_sse.c')
-
-       # compile AVX2 version if either:
-       # a. we have AVX supported in minimum instruction set baseline
-       # b. it's not minimum instruction set, but supported by compiler
-       if dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')
-               cflags += ['-DCC_AVX2_SUPPORT']
-               sources += files('iavf_rxtx_vec_avx2.c')
-       elif cc.has_argument('-mavx2')
-               cflags += ['-DCC_AVX2_SUPPORT']
-               iavf_avx2_lib = static_library('iavf_avx2_lib',
-                               'iavf_rxtx_vec_avx2.c',
-                               dependencies: [static_rte_ethdev,
-                                       static_rte_kvargs, static_rte_hash],
-                               include_directories: includes,
-                               c_args: [cflags, '-mavx2'])
-               objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
-       endif
+    sources += files('iavf_rxtx_vec_sse.c')
+
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('iavf_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        iavf_avx2_lib = static_library('iavf_avx2_lib',
+                'iavf_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
+    endif
+
+    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
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        iavf_avx512_lib = static_library('iavf_avx512_lib',
+                'iavf_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
+    endif
 endif
+
+headers = files('rte_pmd_iavf.h')