d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: remove compatibility build defines

Browse Source 
As announced in the deprecation note, remove all compatibility build
defines from previous make/meson versions and use only the standardized
ones - RTE_LIB_<name> for libraries, and RTE_<CLASS>_<NAME> for drivers.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Bruce Richardson 2020-12-09 17:14:20 +00:00 committed by Thomas Monjalon
parent d559d2048e
commit 762bfccc8a
29 changed files with 9 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/meson.build
View File

@ -278,7 +278,7 @@ endif
# set the install path for the drivers
dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
install_headers(['rte_config.h', 'rte_compatibility_defines.h'],
install_headers(['rte_config.h'],
subdir: get_option('include_subdir_arch'))
# enable VFIO only if it is linux OS

129
config/rte_compatibility_defines.h
View File

@ -1,129 +0,0 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2017 Intel Corporation
*/
#ifndef _RTE_CONFIG_H_
#error "This file should only be included via rte_config.h"
#endif
/*
* NOTE: these defines are for compatibility only and will be removed in a
* future DPDK release.
*/
#ifdef RTE_LIBRTE_BITRATESTATS
#define RTE_LIBRTE_BITRATE
#endif
#ifdef RTE_LIBRTE_LATENCYSTATS
#define RTE_LIBRTE_LATENCY_STATS
#endif
#ifdef RTE_LIBRTE_DPAAX_COMMON
#define RTE_LIBRTE_COMMON_DPAAX
#endif
#ifdef RTE_LIBRTE_VMBUS_BUS
#define RTE_LIBRTE_VMBUS
#endif
#ifdef RTE_LIBRTE_BUCKET_MEMPOOL
#define RTE_DRIVER_MEMPOOL_BUCKET
#endif
#ifdef RTE_LIBRTE_RING_MEMPOOL
#define RTE_DRIVER_MEMPOOL_RING
#endif
#ifdef RTE_LIBRTE_STACK_MEMPOOL
#define RTE_DRIVER_MEMPOOL_STACK
#endif
#ifdef RTE_LIBRTE_AF_PACKET_PMD
#define RTE_LIBRTE_PMD_AF_PACKET
#endif
#ifdef RTE_LIBRTE_AF_XDP_PMD
#define RTE_LIBRTE_PMD_AF_XDP
#endif
#ifdef RTE_LIBRTE_BOND_PMD
#define RTE_LIBRTE_PMD_BOND
#endif
#ifdef RTE_LIBRTE_E1000_PMD
#define RTE_LIBRTE_EM_PMD
#endif
#ifdef RTE_LIBRTE_E1000_PMD
#define RTE_LIBRTE_IGB_PMD
#endif
#ifdef RTE_LIBRTE_FAILSAFE_PMD
#define RTE_LIBRTE_PMD_FAILSAFE
#endif
#ifdef RTE_LIBRTE_KNI_PMD
#define RTE_LIBRTE_PMD_KNI
#endif
#ifdef RTE_LIBRTE_LIQUIDIO_PMD
#define RTE_LIBRTE_LIO_PMD
#endif
#ifdef RTE_LIBRTE_MEMIF_PMD
#define RTE_LIBRTE_PMD_MEMIF
#endif
#ifdef RTE_LIBRTE_NULL_PMD
#define RTE_LIBRTE_PMD_NULL
#endif
#ifdef RTE_LIBRTE_PCAP_PMD
#define RTE_LIBRTE_PMD_PCAP
#endif
#ifdef RTE_LIBRTE_RING_PMD
#define RTE_LIBRTE_PMD_RING
#endif
#ifdef RTE_LIBRTE_SFC_PMD
#define RTE_LIBRTE_SFC_EFX_PMD
#endif
#ifdef RTE_LIBRTE_SOFTNIC_PMD
#define RTE_LIBRTE_PMD_SOFTNIC
#endif
#ifdef RTE_LIBRTE_SZEDATA2_PMD
#define RTE_LIBRTE_PMD_SZEDATA2
#endif
#ifdef RTE_LIBRTE_TAP_PMD
#define RTE_LIBRTE_PMD_TAP
#endif
#ifdef RTE_LIBRTE_THUNDERX_PMD
#define RTE_LIBRTE_THUNDERX_NICVF_PMD
#endif
#ifdef RTE_LIBRTE_VHOST_PMD
#define RTE_LIBRTE_PMD_VHOST
#endif
#ifdef RTE_LIBRTE_PMD_ARMV8
#define RTE_LIBRTE_PMD_ARMV8_CRYPTO
#endif
#ifdef RTE_LIBRTE_PMD_MVSAM
#define RTE_LIBRTE_PMD_MVSAM_CRYPTO
#endif
#ifdef RTE_LIBRTE_PMD_OCTEONTX_COMPRESS
#define RTE_LIBRTE_PMD_OCTEONTX_ZIPVF
#endif
#ifdef RTE_LIBRTE_PMD_OCTEONTX_EVENTDEV
#define RTE_LIBRTE_PMD_OCTEONTX_SSOVF
#endif

1
config/rte_config.h
View File

@ -13,7 +13,6 @@
#define _RTE_CONFIG_H_
#include <rte_build_config.h>
#include "rte_compatibility_defines.h"
/* legacy defines */
#ifdef RTE_EXEC_ENV_LINUX

8
doc/guides/rel_notes/deprecation.rst
View File

@ -11,14 +11,6 @@ here.
Deprecation Notices
-------------------
* build: The macros defined to indicate which DPDK libraries and drivers
are included in the meson build are changing to a standardized format of
``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is the
upper-case component name, e.g. EAL, ETHDEV, IXGBE, and ``CLASS`` is the
upper-case name of the device class to which a driver belongs e.g.
``NET``, ``CRYPTO``, ``VDPA``. The old macros are deprecated and will be
removed in a future release.
* kvargs: The function ``rte_kvargs_process`` will get a new parameter
for returning key match count. It will ease handling of no-match case.

7
doc/guides/rel_notes/release_21_02.rst
View File

@ -155,6 +155,13 @@ API Changes
Also, make sure to start the actual text at the margin.
=======================================================
* config: Removed the old macros, included in ``rte_config.h``,
to indicate which DPDK libraries and drivers are built.
The new macros are generated by meson in a standardized format:
``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is
the upper-case component name, e.g. ``EAL``, ``ETHDEV``, ``VIRTIO``,
and ``CLASS`` is the upper-case driver class, e.g. ``NET``, ``CRYPTO``.
* cryptodev: The structure ``rte_cryptodev`` has been updated with pointers
for adding enqueue and dequeue callbacks.

2
drivers/baseband/meson.build
View File

@ -6,5 +6,3 @@ if is_windows
endif
drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec', 'acc100']
config_flag_fmt = 'RTE_LIBRTE_PMD_BBDEV_@0@'

1
drivers/bus/meson.build
View File

@ -3,4 +3,3 @@
drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus']
std_deps = ['eal']
config_flag_fmt = 'RTE_LIBRTE_@0@_BUS'

1
drivers/common/meson.build
View File

@ -7,4 +7,3 @@ endif
std_deps = ['eal']
drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx']
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'

1
drivers/common/mlx5/meson.build
View File

@ -7,7 +7,6 @@ if not (is_linux or (is_windows and is_ms_linker))
subdir_done()
endif
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']
sources += files(
'mlx5_devx_cmds.c',

2
drivers/common/qat/meson.build
View File

@ -1,8 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2018 Intel Corporation
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
qat_crypto = true
qat_crypto_path = 'crypto/qat'
qat_crypto_relpath = '../../' + qat_crypto_path

1
drivers/compress/meson.build
View File

@ -8,4 +8,3 @@ endif
drivers = ['isal', 'octeontx', 'zlib']
std_deps = ['compressdev'] # compressdev pulls in all other needed deps
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'

1
drivers/compress/octeontx/meson.build
View File

@ -1,7 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Cavium, Inc
fmt_name = 'octeontx_compress'
sources = files('otx_zip.c', 'otx_zip_pmd.c')
includes += include_directories('include')
deps += ['mempool_octeontx', 'bus_pci']

1
drivers/crypto/meson.build
View File

@ -26,4 +26,3 @@ drivers = ['aesni_gcm',
'zuc']
std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'

1
drivers/crypto/null/meson.build
View File

@ -2,5 +2,4 @@
# Copyright(c) 2017 Intel Corporation
deps += 'bus_vdev'
fmt_name = 'null_crypto'
sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c')

1
drivers/crypto/octeontx/meson.build
View File

@ -7,7 +7,6 @@ endif
deps += ['bus_pci']
deps += ['common_cpt']
fmt_name = 'octeontx_crypto'
sources = files('otx_cryptodev.c',
'otx_cryptodev_capabilities.c',

1
drivers/crypto/octeontx2/meson.build
View File

@ -13,7 +13,6 @@ deps += ['common_octeontx2']
deps += ['ethdev']
deps += ['eventdev']
deps += ['security']
fmt_name = 'octeontx2_crypto'
sources = files('otx2_cryptodev.c',
'otx2_cryptodev_capabilities.c',

1
drivers/crypto/scheduler/meson.build
View File

@ -2,7 +2,6 @@
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
deps += ['bus_vdev', 'reorder']
fmt_name = 'crypto_scheduler'
sources = files(
'rte_cryptodev_scheduler.c',
'scheduler_failover.c',

1
drivers/crypto/virtio/meson.build
View File

@ -3,6 +3,5 @@
includes += include_directories('../../../lib/librte_vhost')
deps += 'bus_pci'
fmt_name = 'virtio_crypto'
sources = files('virtio_cryptodev.c', 'virtio_pci.c',
'virtio_rxtx.c', 'virtqueue.c')

1
drivers/event/meson.build
View File

@ -12,4 +12,3 @@ if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and
drivers += 'octeontx'
endif
std_deps = ['eventdev', 'kvargs']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_EVENTDEV'

1
drivers/mempool/meson.build
View File

@ -3,4 +3,3 @@
drivers = ['bucket', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', 'stack']
std_deps = ['mempool']
config_flag_fmt = 'RTE_LIBRTE_@0@_MEMPOOL'

23
drivers/meson.build
View File

@ -32,7 +32,6 @@ endif
foreach subpath:subdirs
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
# subpath can be either "class" or "class/driver"
if subpath.contains('/')
@ -58,7 +57,6 @@ foreach subpath:subdirs
build = true # set to false to disable, e.g. missing deps
reason = '<unknown reason>' # set if build == false to explain
name = drv
fmt_name = ''
sources = []
headers = []
objs = []
@ -114,27 +112,6 @@ foreach subpath:subdirs
lib_name = '_'.join(['rte', class, name])
dpdk_conf.set(lib_name.to_upper(), 1)
if fmt_name == ''
fmt_name = name
endif
dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro
# for driver compatibility, since we changed the
# default to match that of make. Remove in future release
# after following deprecation process
if config_flag_fmt.contains('_PMD_@0@') and (class == 'crypto'
or class == 'compress'
or class == 'event')
alt_flag_fmt = '_@0@_PMD'.join(
config_flag_fmt.split('_PMD_@0@'))
if config_flag_fmt.contains('EVENTDEV')
alt_flag_fmt = '_@0@_EVENTDEV_PMD'.join(
config_flag_fmt.split('_PMD_@0@_EVENTDEV'))
endif
dpdk_conf.set(alt_flag_fmt.format(
fmt_name.to_upper()), 1)
endif
dpdk_extra_ldflags += pkgconfig_extra_libs
install_headers(headers)

1
drivers/net/meson.build
View File

@ -57,4 +57,3 @@ drivers = ['af_packet',
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std
std_deps += ['bus_vdev'] # same with vdev bus
config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'

1
drivers/raw/meson.build
View File

@ -11,4 +11,3 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
'octeontx2_ep',
'skeleton']
std_deps = ['rawdev']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'

1
drivers/regex/meson.build
View File

@ -3,4 +3,3 @@
drivers = ['mlx5', 'octeontx2']
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'

1
drivers/regex/mlx5/meson.build
View File

@ -7,7 +7,6 @@ if not is_linux
subdir_done()
endif
fmt_name = 'mlx5_regex'
deps += ['common_mlx5', 'eal', 'regexdev']
sources = files(
'mlx5_regex.c',

1
drivers/regex/octeontx2/meson.build
View File

@ -22,7 +22,6 @@ sources = files('otx2_regexdev.c',
'otx2_regexdev_compiler.c'
)
fmt_name = 'octeontx2_regex'
deps += ['bus_pci', 'common_octeontx2', 'regexdev']
includes += include_directories('../../common/octeontx2')

1
drivers/vdpa/meson.build
View File

@ -9,4 +9,3 @@ drivers = ['ifc',
'mlx5',]
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'

1
drivers/vdpa/mlx5/meson.build
View File

@ -7,7 +7,6 @@ if not is_linux
subdir_done()
endif
fmt_name = 'mlx5_vdpa'
deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched']
sources = files(
'mlx5_vdpa.c',

3
lib/meson.build
View File

@ -101,8 +101,7 @@ foreach l:libraries
set_variable(name.underscorify() + '_disable_reason', reason)
else
enabled_libs += name
dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro
dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro
dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
install_headers(headers)
libname = 'rte_' + name