Remove driver-specific build instructions for the AVX2 and AVX-512 code,
and rely instead on the generic driver build file.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
drivers/net/intel/i40e/meson.build | 26 ++------------------------
drivers/net/intel/iavf/meson.build | 25 ++-----------------------
drivers/net/intel/ice/meson.build | 25 ++-----------------------
drivers/net/intel/idpf/meson.build | 25 ++-----------------------
4 files changed, 8 insertions(+), 93 deletions(-)
diff --git a/drivers/net/intel/i40e/meson.build
b/drivers/net/intel/i40e/meson.build
index 15993393fb..dae61222cf 100644
--- a/drivers/net/intel/i40e/meson.build
+++ b/drivers/net/intel/i40e/meson.build
@@ -40,31 +40,9 @@ includes += include_directories('base')
if arch_subdir == 'x86'
sources += files('i40e_rxtx_vec_sse.c')
+ sources_avx2 += files('i40e_rxtx_vec_avx2.c')
+ sources_avx512 += files('i40e_rxtx_vec_avx512.c')
- i40e_avx2_lib = static_library('i40e_avx2_lib',
- 'i40e_rxtx_vec_avx2.c',
- dependencies: [static_rte_ethdev, static_rte_kvargs,
static_rte_hash],
- include_directories: includes,
- c_args: [cflags, cc_avx2_flags])
- objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
-
- if cc_has_avx512
- cflags += ['-DCC_AVX512_SUPPORT']
- avx512_args = cflags + cc_avx512_flags
- if cc.has_argument('-march=skylake-avx512')
- avx512_args += '-march=skylake-avx512'
- if cc.has_argument('-Wno-overriding-option')
- avx512_args += '-Wno-overriding-option'
- endif
- 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'
diff --git a/drivers/net/intel/iavf/meson.build
b/drivers/net/intel/iavf/meson.build
index 833a63e6c8..1ca500c43c 100644
--- a/drivers/net/intel/iavf/meson.build
+++ b/drivers/net/intel/iavf/meson.build
@@ -28,30 +28,9 @@ includes += include_directories('base')
if arch_subdir == 'x86'
sources += files('iavf_rxtx_vec_sse.c')
+ sources_avx2 += files('iavf_rxtx_vec_avx2.c')
+ sources_avx512 += files('iavf_rxtx_vec_avx512.c')
- iavf_avx2_lib = static_library('iavf_avx2_lib',
- 'iavf_rxtx_vec_avx2.c',
- dependencies: [static_rte_ethdev],
- include_directories: includes,
- c_args: [cflags, cc_avx2_flags])
- objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
-
- if cc_has_avx512
- cflags += ['-DCC_AVX512_SUPPORT']
- avx512_args = cflags + cc_avx512_flags
- if cc.has_argument('-march=skylake-avx512')
- avx512_args += '-march=skylake-avx512'
- if cc.has_argument('-Wno-overriding-option')
- avx512_args += '-Wno-overriding-option'
- endif
- endif
- iavf_avx512_lib = static_library('iavf_avx512_lib',
- 'iavf_rxtx_vec_avx512.c',
- dependencies: [static_rte_ethdev],
- include_directories: includes,
- c_args: avx512_args)
- objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
- endif
elif arch_subdir == 'arm'
sources += files('iavf_rxtx_vec_neon.c')
endif
diff --git a/drivers/net/intel/ice/meson.build
b/drivers/net/intel/ice/meson.build
index 4d8f71cd4a..fa6c505450 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -34,30 +34,9 @@ endif
if arch_subdir == 'x86'
sources += files('ice_rxtx_vec_sse.c')
+ sources_avx2 += files('ice_rxtx_vec_avx2.c')
+ sources_avx512 += files('ice_rxtx_vec_avx512.c')
- ice_avx2_lib = static_library('ice_avx2_lib',
- 'ice_rxtx_vec_avx2.c',
- dependencies: [static_rte_ethdev, static_rte_hash],
- include_directories: includes,
- c_args: [cflags, cc_avx2_flags])
- objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
-
- if cc_has_avx512
- cflags += ['-DCC_AVX512_SUPPORT']
- avx512_args = cflags + cc_avx512_flags
- if cc.has_argument('-march=skylake-avx512')
- avx512_args += '-march=skylake-avx512'
- if cc.has_argument('-Wno-overriding-option')
- avx512_args += '-Wno-overriding-option'
- endif
- endif
- ice_avx512_lib = static_library('ice_avx512_lib',
- 'ice_rxtx_vec_avx512.c',
- dependencies: [static_rte_ethdev, static_rte_hash],
- include_directories: includes,
- c_args: avx512_args)
- objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
- endif
endif
sources += files(
diff --git a/drivers/net/intel/idpf/meson.build
b/drivers/net/intel/idpf/meson.build
index 4b272d02b1..f579ffae46 100644
--- a/drivers/net/intel/idpf/meson.build
+++ b/drivers/net/intel/idpf/meson.build
@@ -19,29 +19,8 @@ sources = files(
)
if arch_subdir == 'x86' and dpdk_conf.get('RTE_IOVA_IN_MBUF') == 1
- idpf_avx2_lib = static_library('idpf_avx2_lib',
- 'idpf_common_rxtx_avx2.c',
- dependencies: [static_rte_ethdev, static_rte_hash],
- include_directories: includes,
- c_args: [cflags, cc_avx2_flags])
- objs += idpf_avx2_lib.extract_objects('idpf_common_rxtx_avx2.c')
-
- if cc_has_avx512
- cflags += ['-DCC_AVX512_SUPPORT']
- avx512_args = cflags + cc_avx512_flags
- if cc.has_argument('-march=skylake-avx512')
- avx512_args += '-march=skylake-avx512'
- if cc.has_argument('-Wno-overriding-option')
- avx512_args += '-Wno-overriding-option'
- endif
- endif
- idpf_common_avx512_lib = static_library('idpf_common_avx512_lib',
- 'idpf_common_rxtx_avx512.c',
- dependencies: static_rte_mbuf,
- include_directories: includes,
- c_args: avx512_args)
- objs +=
idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c')
- endif
+ sources_avx2 += files('idpf_common_rxtx_avx2.c')
+ sources_avx512 += files('idpf_common_rxtx_avx512.c')
endif
subdir('base')
--
2.43.0
