net/virtio: improve queue init error path

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

diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index 268a36b..ce3cc65 100644 (file)
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -1,35 +1,7 @@
-#   BSD LICENSE
-#
-#   Copyright(c) 2017 Intel Corporation.
-#   All rights reserved.
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions
-#   are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in
-#       the documentation and/or other materials provided with the
-#       distribution.
-#     * Neither the name of Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
 
-cflags = ['-DPF_DRIVER',
+cflags += ['-DPF_DRIVER',
        '-DVF_DRIVER',
        '-DINTEGRATED_VF',
        '-DX722_A0_SUPPORT']
@@ -45,29 +17,65 @@ sources = files(
        'i40e_fdir.c',
        'i40e_flow.c',
        'i40e_tm.c',
+       'i40e_hash.c',
+       'i40e_vf_representor.c',
        'rte_pmd_i40e.c'
        )
 
 deps += ['hash']
+includes += include_directories('base')
 
 if arch_subdir == 'x86'
-       dpdk_conf.set('RTE_LIBRTE_I40E_INC_VECTOR', 1)
        sources += files('i40e_rxtx_vec_sse.c')
 
+       if is_windows and cc.get_id() != 'clang'
+               cflags += ['-fno-asynchronous-unwind-tables']
+       endif
+
        # 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')
+       if cc.get_define('__AVX2__', args: machine_args) != ''
+               cflags += ['-DCC_AVX2_SUPPORT']
                sources += files('i40e_rxtx_vec_avx2.c')
        elif cc.has_argument('-mavx2')
+               cflags += ['-DCC_AVX2_SUPPORT']
                i40e_avx2_lib = static_library('i40e_avx2_lib',
                                'i40e_rxtx_vec_avx2.c',
-                               dependencies: static_rte_eal,
-                               c_args: '-mavx2')
+                               dependencies: [static_rte_ethdev,
+                                       static_rte_kvargs, static_rte_hash],
+                               include_directories: includes,
+                               c_args: [cflags, '-mavx2'])
                objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
        endif
-endif
 
-includes += include_directories('base')
+       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
+               cflags += ['-DCC_AVX512_SUPPORT']
+               avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+               if cc.has_argument('-march=skylake-avx512')
+                       avx512_args += '-march=skylake-avx512'
+               endif
+               i40e_avx512_lib = static_library('i40e_avx512_lib',
+                               'i40e_rxtx_vec_avx512.c',
+                               dependencies: [static_rte_ethdev,
+                                       static_rte_kvargs, static_rte_hash],
+                               include_directories: includes,
+                               c_args: avx512_args)
+               objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
+       endif
+elif arch_subdir == 'ppc'
+       sources += files('i40e_rxtx_vec_altivec.c')
+elif arch_subdir == 'arm'
+       sources += files('i40e_rxtx_vec_neon.c')
+endif
 
-install_headers('rte_pmd_i40e.h')
+headers = files('rte_pmd_i40e.h')