* [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK
@ 2020-08-07 12:29 Ciara Power
2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles Ciara Power
` (25 more replies)
0 siblings, 26 replies; 300+ messages in thread
From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw)
To: dev; +Cc: bruce.richardson, thomas, Ciara Power
As previously decided [1] and communicated via deprecation notice [2], the
make build system is to be removed in the 20.11 release.
This patchset removes support for compiling DPDK with the legacy make
build system. Some make support is maintained for example applications,
where pkg-config is used rather than the legacy make method.
References to the make build system are removed from all documentation,
please review to see if replacement meson instructions are needed in some cases.
[1] https://mails.dpdk.org/archives/dev/2020-April/162839.html
[2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673
Ciara Power (19):
examples: remove legacy sections of makefiles
build: remove makefiles and mk directory
config: remove all config files used by make
buildtools: remove all scripts for use with make
doc: remove references to make in bbdev guides
doc: remove references to make in compressdev guides
doc: remove references to make in contributing guides
doc: remove references to make in cryptodev guides
doc: remove references to make in eventdev guides
doc: remove references to make in FreeBSD gsg guide
doc: remove references to make in howto guides
doc: remove references to make in Linux gsg guides
doc: remove references to make in mempool guides
doc: remove references to make in NIC guides
doc: remove references to make in platform guides
doc: remove references to make in prog guides
doc: remove references to make in rawdev guides
doc: remove references to make in sample app guides
doc: remove references to make in vdpadevs guides
GNUmakefile | 17 -
Makefile | 4 -
app/Makefile | 34 -
app/pdump/Makefile | 18 -
app/proc-info/Makefile | 14 -
app/test-acl/Makefile | 17 -
app/test-bbdev/Makefile | 30 -
app/test-cmdline/Makefile | 24 -
app/test-compress-perf/Makefile | 19 -
app/test-crypto-perf/Makefile | 28 -
app/test-eventdev/Makefile | 32 -
app/test-fib/Makefile | 18 -
app/test-flow-perf/Makefile | 26 -
app/test-pipeline/Makefile | 33 -
app/test-pmd/Makefile | 73 --
app/test-regex/Makefile | 13 -
app/test-sad/Makefile | 17 -
app/test/Makefile | 310 -----
buildtools/Makefile | 9 -
buildtools/auto-config-h.sh | 108 --
buildtools/gen-build-mk.sh | 23 -
buildtools/gen-config-h.sh | 15 -
buildtools/pmdinfogen/Makefile | 20 -
buildtools/relpath.sh | 76 --
config/common_armv8a_linux | 43 -
config/common_base | 1154 -----------------
config/common_freebsd | 15 -
config/common_linux | 68 -
config/defconfig_arm-armv7a-linux-gcc | 1 -
config/defconfig_arm-armv7a-linuxapp-gcc | 49 -
config/defconfig_arm64-armada-linux-gcc | 1 -
config/defconfig_arm64-armada-linuxapp-gcc | 41 -
config/defconfig_arm64-armv8a-linux-clang | 1 -
config/defconfig_arm64-armv8a-linux-gcc | 1 -
config/defconfig_arm64-armv8a-linuxapp-clang | 8 -
config/defconfig_arm64-armv8a-linuxapp-gcc | 9 -
config/defconfig_arm64-bluefield-linux-gcc | 1 -
config/defconfig_arm64-bluefield-linuxapp-gcc | 18 -
config/defconfig_arm64-dpaa-linux-gcc | 1 -
config/defconfig_arm64-dpaa-linuxapp-gcc | 31 -
config/defconfig_arm64-emag-linux-gcc | 1 -
config/defconfig_arm64-emag-linuxapp-gcc | 11 -
config/defconfig_arm64-n1sdp-linux-gcc | 1 -
config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 -
config/defconfig_arm64-octeontx2-linux-gcc | 1 -
config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 -
config/defconfig_arm64-stingray-linux-gcc | 1 -
config/defconfig_arm64-stingray-linuxapp-gcc | 14 -
config/defconfig_arm64-thunderx-linux-gcc | 1 -
config/defconfig_arm64-thunderx-linuxapp-gcc | 17 -
config/defconfig_arm64-thunderx2-linux-gcc | 1 -
config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 -
config/defconfig_arm64-xgene1-linux-gcc | 1 -
config/defconfig_arm64-xgene1-linuxapp-gcc | 8 -
config/defconfig_i686-native-linux-gcc | 1 -
config/defconfig_i686-native-linux-icc | 1 -
config/defconfig_i686-native-linuxapp-gcc | 66 -
config/defconfig_i686-native-linuxapp-icc | 66 -
config/defconfig_ppc_64-power8-linux-gcc | 1 -
config/defconfig_ppc_64-power8-linuxapp-gcc | 35 -
config/defconfig_x86_64-native-bsdapp-clang | 14 -
config/defconfig_x86_64-native-bsdapp-gcc | 14 -
config/defconfig_x86_64-native-freebsd-clang | 1 -
config/defconfig_x86_64-native-freebsd-gcc | 1 -
config/defconfig_x86_64-native-linux-clang | 1 -
config/defconfig_x86_64-native-linux-gcc | 1 -
config/defconfig_x86_64-native-linux-icc | 1 -
config/defconfig_x86_64-native-linuxapp-clang | 14 -
config/defconfig_x86_64-native-linuxapp-gcc | 14 -
config/defconfig_x86_64-native-linuxapp-icc | 29 -
config/defconfig_x86_x32-native-linux-gcc | 1 -
config/defconfig_x86_x32-native-linuxapp-gcc | 46 -
doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +-
doc/guides/bbdevs/fpga_lte_fec.rst | 5 +-
doc/guides/bbdevs/turbo_sw.rst | 15 -
doc/guides/compressdevs/isal.rst | 4 -
doc/guides/compressdevs/octeontx.rst | 16 -
doc/guides/compressdevs/zlib.rst | 4 -
doc/guides/contributing/coding_style.rst | 46 +-
doc/guides/contributing/design.rst | 127 +-
doc/guides/contributing/documentation.rst | 27 +-
doc/guides/contributing/patches.rst | 45 -
doc/guides/cryptodevs/aesni_gcm.rst | 2 -
doc/guides/cryptodevs/aesni_mb.rst | 2 -
doc/guides/cryptodevs/armv8.rst | 3 -
doc/guides/cryptodevs/caam_jr.rst | 30 -
doc/guides/cryptodevs/ccp.rst | 8 +-
doc/guides/cryptodevs/dpaa2_sec.rst | 25 -
doc/guides/cryptodevs/dpaa_sec.rst | 25 -
doc/guides/cryptodevs/kasumi.rst | 9 -
doc/guides/cryptodevs/mvsam.rst | 8 -
doc/guides/cryptodevs/nitrox.rst | 7 -
doc/guides/cryptodevs/octeontx.rst | 8 -
doc/guides/cryptodevs/octeontx2.rst | 4 -
doc/guides/cryptodevs/openssl.rst | 4 +-
doc/guides/cryptodevs/qat.rst | 52 +-
doc/guides/cryptodevs/scheduler.rst | 8 -
doc/guides/cryptodevs/snow3g.rst | 8 -
doc/guides/cryptodevs/virtio.rst | 8 -
doc/guides/cryptodevs/zuc.rst | 8 -
doc/guides/eventdevs/dpaa.rst | 20 -
doc/guides/eventdevs/dpaa2.rst | 20 -
doc/guides/eventdevs/octeontx.rst | 24 -
doc/guides/eventdevs/octeontx2.rst | 8 -
doc/guides/freebsd_gsg/intro.rst | 4 +-
doc/guides/howto/packet_capture_framework.rst | 17 +-
doc/guides/howto/pvp_reference_benchmark.rst | 26 -
doc/guides/linux_gsg/build_dpdk.rst | 58 -
doc/guides/linux_gsg/build_sample_apps.rst | 16 +-
.../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -
doc/guides/linux_gsg/enable_func.rst | 3 -
doc/guides/linux_gsg/intro.rst | 2 +-
doc/guides/linux_gsg/linux_drivers.rst | 2 -
doc/guides/linux_gsg/sys_reqs.rst | 4 -
doc/guides/mempool/octeontx.rst | 28 -
doc/guides/mempool/octeontx2.rst | 8 -
doc/guides/nics/ark.rst | 26 -
doc/guides/nics/atlantic.rst | 4 -
doc/guides/nics/axgbe.rst | 15 -
doc/guides/nics/bnx2x.rst | 27 -
doc/guides/nics/bnxt.rst | 3 -
doc/guides/nics/cxgbe.rst | 13 -
doc/guides/nics/dpaa.rst | 25 -
doc/guides/nics/dpaa2.rst | 24 -
doc/guides/nics/ena.rst | 16 -
doc/guides/nics/enic.rst | 9 -
doc/guides/nics/fail_safe.rst | 12 -
doc/guides/nics/fm10k.rst | 4 -
doc/guides/nics/hinic.rst | 9 -
doc/guides/nics/hns3.rst | 10 -
doc/guides/nics/i40e.rst | 28 +-
doc/guides/nics/ice.rst | 17 -
doc/guides/nics/igc.rst | 14 -
doc/guides/nics/intel_vf.rst | 14 +-
doc/guides/nics/ionic.rst | 8 -
doc/guides/nics/ipn3ke.rst | 8 -
doc/guides/nics/liquidio.rst | 27 -
doc/guides/nics/mlx4.rst | 51 -
doc/guides/nics/mlx5.rst | 58 -
doc/guides/nics/mvneta.rst | 19 +-
doc/guides/nics/mvpp2.rst | 29 +-
doc/guides/nics/nfb.rst | 17 +-
doc/guides/nics/nfp.rst | 4 -
doc/guides/nics/null.rst | 6 +-
doc/guides/nics/octeontx.rst | 19 +-
doc/guides/nics/octeontx2.rst | 11 -
doc/guides/nics/pcap_ring.rst | 22 +-
doc/guides/nics/qede.rst | 17 +-
doc/guides/nics/sfc_efx.rst | 15 -
doc/guides/nics/softnic.rst | 9 -
doc/guides/nics/szedata2.rst | 18 +-
doc/guides/nics/thunderx.rst | 20 -
doc/guides/nics/vdev_netvsc.rst | 6 -
doc/guides/platform/bluefield.rst | 15 -
doc/guides/platform/octeontx.rst | 33 +-
doc/guides/platform/octeontx2.rst | 24 -
doc/guides/prog_guide/build_app.rst | 46 +-
.../prog_guide/dev_kit_build_system.rst | 218 +---
.../prog_guide/dev_kit_root_make_help.rst | 188 ---
.../prog_guide/env_abstraction_layer.rst | 17 +-
.../prog_guide/ext_app_lib_make_help.rst | 25 +-
doc/guides/prog_guide/graph_lib.rst | 6 +-
doc/guides/prog_guide/intro.rst | 2 +-
.../prog_guide/ip_fragment_reassembly_lib.rst | 5 -
.../link_bonding_poll_mode_drv_lib.rst | 5 -
doc/guides/prog_guide/lto.rst | 13 +-
doc/guides/prog_guide/mbuf_lib.rst | 4 +-
doc/guides/prog_guide/mempool_lib.rst | 7 +-
doc/guides/prog_guide/overview.rst | 12 +-
doc/guides/prog_guide/profile_app.rst | 15 +-
doc/guides/prog_guide/qos_framework.rst | 10 +-
doc/guides/prog_guide/rcu_lib.rst | 7 +-
doc/guides/prog_guide/source_org.rst | 23 +-
doc/guides/prog_guide/trace_lib.rst | 3 +-
.../prog_guide/writing_efficient_code.rst | 3 +-
doc/guides/rawdevs/dpaa2_cmdif.rst | 21 -
doc/guides/rawdevs/dpaa2_qdma.rst | 21 -
doc/guides/rawdevs/ifpga.rst | 10 -
doc/guides/rawdevs/ioat.rst | 5 -
doc/guides/rawdevs/ntb.rst | 6 -
doc/guides/rawdevs/octeontx2_dma.rst | 12 -
doc/guides/rawdevs/octeontx2_ep.rst | 8 -
doc/guides/sample_app_ug/bbdev_app.rst | 11 +-
doc/guides/sample_app_ug/compiling.rst | 29 +-
.../sample_app_ug/l3_forward_access_ctrl.rst | 2 +-
.../sample_app_ug/performance_thread.rst | 3 +-
doc/guides/sample_app_ug/qos_scheduler.rst | 2 +-
doc/guides/sample_app_ug/rxtx_callbacks.rst | 7 -
doc/guides/sample_app_ug/service_cores.rst | 11 +-
doc/guides/sample_app_ug/tep_termination.rst | 15 +-
doc/guides/sample_app_ug/test_pipeline.rst | 2 +-
doc/guides/sample_app_ug/vhost.rst | 2 +-
.../sample_app_ug/vm_power_management.rst | 22 +-
.../sample_app_ug/vmdq_dcb_forwarding.rst | 4 +-
doc/guides/sample_app_ug/vmdq_forwarding.rst | 4 +-
doc/guides/vdpadevs/mlx5.rst | 40 +-
drivers/Makefile | 34 -
drivers/baseband/Makefile | 18 -
drivers/baseband/fpga_5gnr_fec/Makefile | 28 -
drivers/baseband/fpga_lte_fec/Makefile | 25 -
drivers/baseband/null/Makefile | 21 -
drivers/baseband/turbo_sw/Makefile | 52 -
drivers/bus/Makefile | 15 -
drivers/bus/dpaa/Makefile | 48 -
drivers/bus/fslmc/Makefile | 47 -
drivers/bus/ifpga/Makefile | 28 -
drivers/bus/pci/Makefile | 33 -
drivers/bus/pci/bsd/Makefile | 4 -
drivers/bus/pci/linux/Makefile | 6 -
drivers/bus/vdev/Makefile | 27 -
drivers/bus/vmbus/Makefile | 33 -
drivers/bus/vmbus/linux/Makefile | 3 -
drivers/common/Makefile | 39 -
drivers/common/cpt/Makefile | 24 -
drivers/common/dpaax/Makefile | 30 -
drivers/common/iavf/Makefile | 27 -
drivers/common/mlx5/Makefile | 404 ------
drivers/common/mvep/Makefile | 35 -
drivers/common/octeontx/Makefile | 22 -
drivers/common/octeontx2/Makefile | 39 -
drivers/common/qat/Makefile | 74 --
drivers/compress/Makefile | 10 -
drivers/compress/isal/Makefile | 27 -
drivers/compress/octeontx/Makefile | 26 -
drivers/compress/zlib/Makefile | 25 -
drivers/crypto/Makefile | 31 -
drivers/crypto/aesni_gcm/Makefile | 43 -
drivers/crypto/aesni_mb/Makefile | 42 -
drivers/crypto/armv8/Makefile | 36 -
drivers/crypto/caam_jr/Makefile | 39 -
drivers/crypto/ccp/Makefile | 32 -
drivers/crypto/dpaa2_sec/Makefile | 45 -
drivers/crypto/dpaa_sec/Makefile | 38 -
drivers/crypto/kasumi/Makefile | 42 -
drivers/crypto/mvsam/Makefile | 40 -
drivers/crypto/nitrox/Makefile | 30 -
drivers/crypto/null/Makefile | 27 -
drivers/crypto/octeontx/Makefile | 36 -
drivers/crypto/octeontx2/Makefile | 49 -
drivers/crypto/openssl/Makefile | 26 -
drivers/crypto/scheduler/Makefile | 34 -
drivers/crypto/snow3g/Makefile | 43 -
drivers/crypto/virtio/Makefile | 33 -
drivers/crypto/zuc/Makefile | 42 -
drivers/event/Makefile | 20 -
drivers/event/dpaa/Makefile | 39 -
drivers/event/dpaa2/Makefile | 41 -
drivers/event/dsw/Makefile | 26 -
drivers/event/octeontx/Makefile | 51 -
drivers/event/octeontx2/Makefile | 47 -
drivers/event/opdl/Makefile | 29 -
drivers/event/skeleton/Makefile | 24 -
drivers/event/sw/Makefile | 29 -
drivers/mempool/Makefile | 18 -
drivers/mempool/bucket/Makefile | 25 -
drivers/mempool/dpaa/Makefile | 30 -
drivers/mempool/dpaa2/Makefile | 31 -
drivers/mempool/octeontx/Makefile | 39 -
drivers/mempool/octeontx2/Makefile | 40 -
drivers/mempool/ring/Makefile | 19 -
drivers/mempool/stack/Makefile | 22 -
drivers/net/Makefile | 84 --
drivers/net/af_packet/Makefile | 27 -
drivers/net/af_xdp/Makefile | 26 -
drivers/net/ark/Makefile | 39 -
drivers/net/atlantic/Makefile | 34 -
drivers/net/avp/Makefile | 29 -
drivers/net/axgbe/Makefile | 33 -
drivers/net/bnx2x/Makefile | 33 -
drivers/net/bnxt/Makefile | 63 -
drivers/net/bnxt/hcapi/Makefile | 5 -
drivers/net/bnxt/tf_core/Makefile | 31 -
drivers/net/bnxt/tf_ulp/Makefile | 20 -
drivers/net/bonding/Makefile | 36 -
drivers/net/cxgbe/Makefile | 57 -
drivers/net/dpaa/Makefile | 41 -
drivers/net/dpaa2/Makefile | 47 -
drivers/net/e1000/Makefile | 79 --
drivers/net/ena/Makefile | 30 -
drivers/net/enetc/Makefile | 23 -
drivers/net/enic/Makefile | 68 -
drivers/net/failsafe/Makefile | 43 -
drivers/net/fm10k/Makefile | 77 --
drivers/net/hinic/Makefile | 67 -
drivers/net/hns3/Makefile | 42 -
drivers/net/i40e/Makefile | 112 --
drivers/net/iavf/Makefile | 54 -
drivers/net/ice/Makefile | 96 --
drivers/net/igc/Makefile | 40 -
drivers/net/ionic/Makefile | 31 -
drivers/net/ipn3ke/Makefile | 38 -
drivers/net/ixgbe/Makefile | 110 --
drivers/net/kni/Makefile | 30 -
drivers/net/liquidio/Makefile | 30 -
drivers/net/memif/Makefile | 26 -
drivers/net/mlx4/Makefile | 142 --
drivers/net/mlx5/Makefile | 82 --
drivers/net/mvneta/Makefile | 39 -
drivers/net/mvpp2/Makefile | 42 -
drivers/net/netvsc/Makefile | 21 -
drivers/net/nfb/Makefile | 40 -
drivers/net/nfp/Makefile | 41 -
drivers/net/null/Makefile | 24 -
drivers/net/octeontx/Makefile | 53 -
drivers/net/octeontx2/Makefile | 63 -
drivers/net/pcap/Makefile | 32 -
drivers/net/pfe/Makefile | 31 -
drivers/net/qede/Makefile | 109 --
drivers/net/ring/Makefile | 29 -
drivers/net/sfc/Makefile | 133 --
drivers/net/softnic/Makefile | 54 -
drivers/net/szedata2/Makefile | 30 -
drivers/net/tap/Makefile | 97 --
drivers/net/thunderx/Makefile | 41 -
drivers/net/vdev_netvsc/Makefile | 30 -
drivers/net/vhost/Makefile | 31 -
drivers/net/virtio/Makefile | 82 --
drivers/net/vmxnet3/Makefile | 53 -
drivers/raw/Makefile | 18 -
drivers/raw/dpaa2_cmdif/Makefile | 35 -
drivers/raw/dpaa2_qdma/Makefile | 36 -
drivers/raw/ifpga/Makefile | 39 -
drivers/raw/ifpga/base/Makefile | 32 -
drivers/raw/ioat/Makefile | 28 -
drivers/raw/ntb/Makefile | 28 -
drivers/raw/octeontx2_dma/Makefile | 34 -
drivers/raw/octeontx2_ep/Makefile | 42 -
drivers/raw/skeleton/Makefile | 26 -
drivers/regex/Makefile | 8 -
drivers/regex/mlx5/Makefile | 41 -
drivers/vdpa/Makefile | 12 -
drivers/vdpa/ifc/Makefile | 33 -
drivers/vdpa/mlx5/Makefile | 58 -
examples/Makefile | 90 --
examples/bbdev_app/Makefile | 23 +-
examples/bond/Makefile | 34 +-
examples/cmdline/Makefile | 29 +-
examples/distributor/Makefile | 30 +-
examples/ethtool/Makefile | 23 -
examples/ethtool/ethtool-app/Makefile | 32 -
examples/ethtool/lib/Makefile | 37 -
examples/eventdev_pipeline/Makefile | 23 +-
examples/fips_validation/Makefile | 34 +-
examples/flow_classify/Makefile | 29 +-
examples/flow_filtering/Makefile | 23 +-
examples/helloworld/Makefile | 23 +-
examples/ioat/Makefile | 22 +-
examples/ip_fragmentation/Makefile | 29 +-
examples/ip_pipeline/Makefile | 36 +-
examples/ip_reassembly/Makefile | 29 +-
examples/ipsec-secgw/Makefile | 36 +-
examples/ipv4_multicast/Makefile | 29 +-
examples/kni/Makefile | 27 +-
examples/l2fwd-cat/Makefile | 38 +-
examples/l2fwd-crypto/Makefile | 28 +-
examples/l2fwd-event/Makefile | 22 +-
examples/l2fwd-jobstats/Makefile | 23 +-
examples/l2fwd-keepalive/Makefile | 23 +-
examples/l2fwd-keepalive/ka-agent/Makefile | 22 -
examples/l2fwd/Makefile | 23 +-
examples/l3fwd-acl/Makefile | 28 +-
examples/l3fwd-graph/Makefile | 23 +-
examples/l3fwd-power/Makefile | 36 +-
examples/l3fwd/Makefile | 23 +-
examples/link_status_interrupt/Makefile | 22 +-
examples/multi_process/Makefile | 18 -
.../multi_process/client_server_mp/Makefile | 16 -
.../client_server_mp/mp_client/Makefile | 21 -
.../client_server_mp/mp_server/Makefile | 34 -
examples/multi_process/hotplug_mp/Makefile | 23 -
examples/multi_process/simple_mp/Makefile | 23 -
examples/multi_process/symmetric_mp/Makefile | 23 -
examples/ntb/Makefile | 32 +-
examples/packet_ordering/Makefile | 22 +-
examples/performance-thread/Makefile | 21 -
examples/performance-thread/common/common.mk | 21 -
.../performance-thread/l3fwd-thread/Makefile | 24 -
.../performance-thread/pthread_shim/Makefile | 33 -
examples/ptpclient/Makefile | 28 +-
examples/qos_meter/Makefile | 28 +-
examples/qos_sched/Makefile | 31 +-
examples/rxtx_callbacks/Makefile | 31 +-
examples/server_node_efd/Makefile | 16 -
examples/server_node_efd/node/Makefile | 21 -
examples/server_node_efd/server/Makefile | 30 -
examples/service_cores/Makefile | 28 +-
examples/skeleton/Makefile | 29 +-
examples/tep_termination/Makefile | 27 +-
examples/timer/Makefile | 28 +-
examples/vdpa/Makefile | 32 +-
examples/vhost/Makefile | 30 +-
examples/vhost_blk/Makefile | 31 +-
examples/vhost_crypto/Makefile | 31 +-
examples/vm_power_manager/Makefile | 65 -
examples/vm_power_manager/guest_cli/Makefile | 29 -
examples/vmdq/Makefile | 23 +-
examples/vmdq_dcb/Makefile | 31 +-
kernel/Makefile | 9 -
kernel/freebsd/Makefile | 9 -
kernel/freebsd/contigmem/Makefile | 24 -
kernel/freebsd/nic_uio/Makefile | 24 -
kernel/linux/Makefile | 9 -
kernel/linux/igb_uio/Makefile | 25 -
kernel/linux/kni/Makefile | 34 -
lib/Makefile | 138 --
lib/librte_acl/Makefile | 65 -
lib/librte_bbdev/Makefile | 25 -
lib/librte_bitratestats/Makefile | 20 -
lib/librte_bpf/Makefile | 40 -
lib/librte_cfgfile/Makefile | 26 -
lib/librte_cmdline/Makefile | 34 -
lib/librte_compressdev/Makefile | 27 -
lib/librte_cryptodev/Makefile | 30 -
lib/librte_distributor/Makefile | 28 -
lib/librte_eal/Makefile | 12 -
lib/librte_eal/freebsd/Makefile | 104 --
lib/librte_eal/include/Makefile | 19 -
lib/librte_eal/linux/Makefile | 112 --
lib/librte_efd/Makefile | 21 -
lib/librte_ethdev/Makefile | 46 -
lib/librte_eventdev/Makefile | 47 -
lib/librte_fib/Makefile | 22 -
lib/librte_flow_classify/Makefile | 23 -
lib/librte_graph/Makefile | 28 -
lib/librte_gro/Makefile | 23 -
lib/librte_gso/Makefile | 25 -
lib/librte_hash/Makefile | 31 -
lib/librte_ip_frag/Makefile | 27 -
lib/librte_ipsec/Makefile | 29 -
lib/librte_jobstats/Makefile | 21 -
lib/librte_kni/Makefile | 20 -
lib/librte_kvargs/Makefile | 21 -
lib/librte_latencystats/Makefile | 22 -
lib/librte_lpm/Makefile | 29 -
lib/librte_mbuf/Makefile | 26 -
lib/librte_member/Makefile | 22 -
lib/librte_mempool/Makefile | 24 -
lib/librte_meter/Makefile | 27 -
lib/librte_metrics/Makefile | 30 -
lib/librte_net/Makefile | 25 -
lib/librte_node/Makefile | 33 -
lib/librte_pci/Makefile | 19 -
lib/librte_pdump/Makefile | 20 -
lib/librte_pipeline/Makefile | 28 -
lib/librte_port/Makefile | 59 -
lib/librte_power/Makefile | 24 -
lib/librte_rawdev/Makefile | 24 -
lib/librte_rcu/Makefile | 20 -
lib/librte_regexdev/Makefile | 32 -
lib/librte_reorder/Makefile | 21 -
lib/librte_rib/Makefile | 22 -
lib/librte_ring/Makefile | 30 -
lib/librte_sched/Makefile | 29 -
lib/librte_security/Makefile | 24 -
lib/librte_stack/Makefile | 27 -
lib/librte_table/Makefile | 59 -
lib/librte_telemetry/Makefile | 30 -
lib/librte_timer/Makefile | 20 -
lib/librte_vhost/Makefile | 54 -
mk/arch/arm/rte.vars.mk | 16 -
mk/arch/arm64/rte.vars.mk | 37 -
mk/arch/i686/rte.vars.mk | 36 -
mk/arch/ppc_64/rte.vars.mk | 17 -
mk/arch/x86_64/rte.vars.mk | 36 -
mk/arch/x86_x32/rte.vars.mk | 40 -
mk/exec-env/bsdapp | 1 -
mk/exec-env/freebsd/rte.app.mk | 8 -
mk/exec-env/freebsd/rte.vars.mk | 36 -
mk/exec-env/linux/rte.app.mk | 8 -
mk/exec-env/linux/rte.vars.mk | 44 -
mk/exec-env/linuxapp | 1 -
mk/internal/rte.build-post.mk | 34 -
mk/internal/rte.build-pre.mk | 7 -
mk/internal/rte.clean-post.mk | 34 -
mk/internal/rte.clean-pre.mk | 4 -
mk/internal/rte.compile-post.mk | 5 -
mk/internal/rte.compile-pre.mk | 164 ---
mk/internal/rte.extvars.mk | 55 -
mk/internal/rte.install-post.mk | 71 -
mk/internal/rte.install-pre.mk | 32 -
mk/machine/armv7a/rte.vars.mk | 36 -
mk/machine/armv8a/rte.vars.mk | 31 -
mk/machine/default/rte.vars.mk | 30 -
mk/machine/dpaa/rte.vars.mk | 37 -
mk/machine/emag/rte.vars.mk | 32 -
mk/machine/hsw/rte.vars.mk | 30 -
mk/machine/ivb/rte.vars.mk | 30 -
mk/machine/n1sdp/rte.vars.mk | 34 -
mk/machine/native/rte.vars.mk | 39 -
mk/machine/nhm/rte.vars.mk | 30 -
mk/machine/octeontx2/rte.vars.mk | 34 -
mk/machine/power8/rte.vars.mk | 30 -
mk/machine/silvermont/rte.vars.mk | 30 -
mk/machine/snb/rte.vars.mk | 30 -
mk/machine/thunderx/rte.vars.mk | 31 -
mk/machine/thunderx2/rte.vars.mk | 34 -
mk/machine/wsm/rte.vars.mk | 30 -
mk/machine/xgene1/rte.vars.mk | 31 -
mk/rte.app.mk | 509 --------
mk/rte.bsdmodule.mk | 89 --
mk/rte.combinedlib.mk | 30 -
mk/rte.cpuflags.mk | 124 --
mk/rte.extapp.mk | 24 -
mk/rte.extlib.mk | 26 -
mk/rte.extobj.mk | 24 -
mk/rte.extshared.mk | 26 -
mk/rte.extsubdir.mk | 39 -
mk/rte.gnuconfigure.mk | 44 -
mk/rte.helper.mk | 10 -
mk/rte.hostapp.mk | 93 --
mk/rte.hostlib.mk | 86 --
mk/rte.install.mk | 28 -
mk/rte.lib.mk | 156 ---
mk/rte.module.mk | 86 --
mk/rte.obj.mk | 82 --
mk/rte.sdkbuild.mk | 77 --
mk/rte.sdkconfig.mk | 142 --
mk/rte.sdkdepdirs.mk | 9 -
mk/rte.sdkdoc.mk | 104 --
mk/rte.sdkexamples.mk | 50 -
mk/rte.sdkgcov.mk | 39 -
mk/rte.sdkinstall.mk | 152 ---
mk/rte.sdkroot.mk | 115 --
mk/rte.sdktest.mk | 76 --
mk/rte.shared.mk | 108 --
mk/rte.subdir.mk | 65 -
mk/rte.vars.mk | 102 --
mk/target/generic/rte.app.mk | 13 -
mk/target/generic/rte.vars.mk | 132 --
mk/toolchain/clang/rte.toolchain-compat.mk | 22 -
mk/toolchain/clang/rte.vars.mk | 60 -
mk/toolchain/gcc/rte.toolchain-compat.mk | 120 --
mk/toolchain/gcc/rte.vars.mk | 109 --
mk/toolchain/icc/rte.toolchain-compat.mk | 58 -
mk/toolchain/icc/rte.vars.mk | 62 -
535 files changed, 256 insertions(+), 18894 deletions(-)
delete mode 100644 GNUmakefile
delete mode 100644 Makefile
delete mode 100644 app/Makefile
delete mode 100644 app/pdump/Makefile
delete mode 100644 app/proc-info/Makefile
delete mode 100644 app/test-acl/Makefile
delete mode 100644 app/test-bbdev/Makefile
delete mode 100644 app/test-cmdline/Makefile
delete mode 100644 app/test-compress-perf/Makefile
delete mode 100644 app/test-crypto-perf/Makefile
delete mode 100644 app/test-eventdev/Makefile
delete mode 100644 app/test-fib/Makefile
delete mode 100644 app/test-flow-perf/Makefile
delete mode 100644 app/test-pipeline/Makefile
delete mode 100644 app/test-pmd/Makefile
delete mode 100644 app/test-regex/Makefile
delete mode 100644 app/test-sad/Makefile
delete mode 100644 app/test/Makefile
delete mode 100644 buildtools/Makefile
delete mode 100755 buildtools/auto-config-h.sh
delete mode 100755 buildtools/gen-build-mk.sh
delete mode 100755 buildtools/gen-config-h.sh
delete mode 100644 buildtools/pmdinfogen/Makefile
delete mode 100755 buildtools/relpath.sh
delete mode 100644 config/common_armv8a_linux
delete mode 100644 config/common_base
delete mode 100644 config/common_freebsd
delete mode 100644 config/common_linux
delete mode 120000 config/defconfig_arm-armv7a-linux-gcc
delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-armada-linux-gcc
delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-armv8a-linux-clang
delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc
delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang
delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc
delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc
delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-emag-linux-gcc
delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc
delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc
delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-stingray-linux-gcc
delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc
delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc
delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc
delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc
delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc
delete mode 120000 config/defconfig_i686-native-linux-gcc
delete mode 120000 config/defconfig_i686-native-linux-icc
delete mode 100644 config/defconfig_i686-native-linuxapp-gcc
delete mode 100644 config/defconfig_i686-native-linuxapp-icc
delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc
delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc
delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang
delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc
delete mode 120000 config/defconfig_x86_64-native-freebsd-clang
delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc
delete mode 120000 config/defconfig_x86_64-native-linux-clang
delete mode 120000 config/defconfig_x86_64-native-linux-gcc
delete mode 120000 config/defconfig_x86_64-native-linux-icc
delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang
delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc
delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc
delete mode 120000 config/defconfig_x86_x32-native-linux-gcc
delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc
delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst
delete mode 100644 drivers/Makefile
delete mode 100644 drivers/baseband/Makefile
delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile
delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile
delete mode 100644 drivers/baseband/null/Makefile
delete mode 100644 drivers/baseband/turbo_sw/Makefile
delete mode 100644 drivers/bus/Makefile
delete mode 100644 drivers/bus/dpaa/Makefile
delete mode 100644 drivers/bus/fslmc/Makefile
delete mode 100644 drivers/bus/ifpga/Makefile
delete mode 100644 drivers/bus/pci/Makefile
delete mode 100644 drivers/bus/pci/bsd/Makefile
delete mode 100644 drivers/bus/pci/linux/Makefile
delete mode 100644 drivers/bus/vdev/Makefile
delete mode 100644 drivers/bus/vmbus/Makefile
delete mode 100644 drivers/bus/vmbus/linux/Makefile
delete mode 100644 drivers/common/Makefile
delete mode 100644 drivers/common/cpt/Makefile
delete mode 100644 drivers/common/dpaax/Makefile
delete mode 100644 drivers/common/iavf/Makefile
delete mode 100644 drivers/common/mlx5/Makefile
delete mode 100644 drivers/common/mvep/Makefile
delete mode 100644 drivers/common/octeontx/Makefile
delete mode 100644 drivers/common/octeontx2/Makefile
delete mode 100644 drivers/common/qat/Makefile
delete mode 100644 drivers/compress/Makefile
delete mode 100644 drivers/compress/isal/Makefile
delete mode 100644 drivers/compress/octeontx/Makefile
delete mode 100644 drivers/compress/zlib/Makefile
delete mode 100644 drivers/crypto/Makefile
delete mode 100644 drivers/crypto/aesni_gcm/Makefile
delete mode 100644 drivers/crypto/aesni_mb/Makefile
delete mode 100644 drivers/crypto/armv8/Makefile
delete mode 100644 drivers/crypto/caam_jr/Makefile
delete mode 100644 drivers/crypto/ccp/Makefile
delete mode 100644 drivers/crypto/dpaa2_sec/Makefile
delete mode 100644 drivers/crypto/dpaa_sec/Makefile
delete mode 100644 drivers/crypto/kasumi/Makefile
delete mode 100644 drivers/crypto/mvsam/Makefile
delete mode 100644 drivers/crypto/nitrox/Makefile
delete mode 100644 drivers/crypto/null/Makefile
delete mode 100644 drivers/crypto/octeontx/Makefile
delete mode 100644 drivers/crypto/octeontx2/Makefile
delete mode 100644 drivers/crypto/openssl/Makefile
delete mode 100644 drivers/crypto/scheduler/Makefile
delete mode 100644 drivers/crypto/snow3g/Makefile
delete mode 100644 drivers/crypto/virtio/Makefile
delete mode 100644 drivers/crypto/zuc/Makefile
delete mode 100644 drivers/event/Makefile
delete mode 100644 drivers/event/dpaa/Makefile
delete mode 100644 drivers/event/dpaa2/Makefile
delete mode 100644 drivers/event/dsw/Makefile
delete mode 100644 drivers/event/octeontx/Makefile
delete mode 100644 drivers/event/octeontx2/Makefile
delete mode 100644 drivers/event/opdl/Makefile
delete mode 100644 drivers/event/skeleton/Makefile
delete mode 100644 drivers/event/sw/Makefile
delete mode 100644 drivers/mempool/Makefile
delete mode 100644 drivers/mempool/bucket/Makefile
delete mode 100644 drivers/mempool/dpaa/Makefile
delete mode 100644 drivers/mempool/dpaa2/Makefile
delete mode 100644 drivers/mempool/octeontx/Makefile
delete mode 100644 drivers/mempool/octeontx2/Makefile
delete mode 100644 drivers/mempool/ring/Makefile
delete mode 100644 drivers/mempool/stack/Makefile
delete mode 100644 drivers/net/Makefile
delete mode 100644 drivers/net/af_packet/Makefile
delete mode 100644 drivers/net/af_xdp/Makefile
delete mode 100644 drivers/net/ark/Makefile
delete mode 100644 drivers/net/atlantic/Makefile
delete mode 100644 drivers/net/avp/Makefile
delete mode 100644 drivers/net/axgbe/Makefile
delete mode 100644 drivers/net/bnx2x/Makefile
delete mode 100644 drivers/net/bnxt/Makefile
delete mode 100644 drivers/net/bnxt/hcapi/Makefile
delete mode 100644 drivers/net/bnxt/tf_core/Makefile
delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile
delete mode 100644 drivers/net/bonding/Makefile
delete mode 100644 drivers/net/cxgbe/Makefile
delete mode 100644 drivers/net/dpaa/Makefile
delete mode 100644 drivers/net/dpaa2/Makefile
delete mode 100644 drivers/net/e1000/Makefile
delete mode 100644 drivers/net/ena/Makefile
delete mode 100644 drivers/net/enetc/Makefile
delete mode 100644 drivers/net/enic/Makefile
delete mode 100644 drivers/net/failsafe/Makefile
delete mode 100644 drivers/net/fm10k/Makefile
delete mode 100644 drivers/net/hinic/Makefile
delete mode 100644 drivers/net/hns3/Makefile
delete mode 100644 drivers/net/i40e/Makefile
delete mode 100644 drivers/net/iavf/Makefile
delete mode 100644 drivers/net/ice/Makefile
delete mode 100644 drivers/net/igc/Makefile
delete mode 100644 drivers/net/ionic/Makefile
delete mode 100644 drivers/net/ipn3ke/Makefile
delete mode 100644 drivers/net/ixgbe/Makefile
delete mode 100644 drivers/net/kni/Makefile
delete mode 100644 drivers/net/liquidio/Makefile
delete mode 100644 drivers/net/memif/Makefile
delete mode 100644 drivers/net/mlx4/Makefile
delete mode 100644 drivers/net/mlx5/Makefile
delete mode 100644 drivers/net/mvneta/Makefile
delete mode 100644 drivers/net/mvpp2/Makefile
delete mode 100644 drivers/net/netvsc/Makefile
delete mode 100644 drivers/net/nfb/Makefile
delete mode 100644 drivers/net/nfp/Makefile
delete mode 100644 drivers/net/null/Makefile
delete mode 100644 drivers/net/octeontx/Makefile
delete mode 100644 drivers/net/octeontx2/Makefile
delete mode 100644 drivers/net/pcap/Makefile
delete mode 100644 drivers/net/pfe/Makefile
delete mode 100644 drivers/net/qede/Makefile
delete mode 100644 drivers/net/ring/Makefile
delete mode 100644 drivers/net/sfc/Makefile
delete mode 100644 drivers/net/softnic/Makefile
delete mode 100644 drivers/net/szedata2/Makefile
delete mode 100644 drivers/net/tap/Makefile
delete mode 100644 drivers/net/thunderx/Makefile
delete mode 100644 drivers/net/vdev_netvsc/Makefile
delete mode 100644 drivers/net/vhost/Makefile
delete mode 100644 drivers/net/virtio/Makefile
delete mode 100644 drivers/net/vmxnet3/Makefile
delete mode 100644 drivers/raw/Makefile
delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile
delete mode 100644 drivers/raw/dpaa2_qdma/Makefile
delete mode 100644 drivers/raw/ifpga/Makefile
delete mode 100644 drivers/raw/ifpga/base/Makefile
delete mode 100644 drivers/raw/ioat/Makefile
delete mode 100644 drivers/raw/ntb/Makefile
delete mode 100644 drivers/raw/octeontx2_dma/Makefile
delete mode 100644 drivers/raw/octeontx2_ep/Makefile
delete mode 100644 drivers/raw/skeleton/Makefile
delete mode 100644 drivers/regex/Makefile
delete mode 100644 drivers/regex/mlx5/Makefile
delete mode 100644 drivers/vdpa/Makefile
delete mode 100644 drivers/vdpa/ifc/Makefile
delete mode 100644 drivers/vdpa/mlx5/Makefile
delete mode 100644 examples/Makefile
delete mode 100644 examples/ethtool/Makefile
delete mode 100644 examples/ethtool/ethtool-app/Makefile
delete mode 100644 examples/ethtool/lib/Makefile
delete mode 100644 examples/l2fwd-keepalive/ka-agent/Makefile
delete mode 100644 examples/multi_process/Makefile
delete mode 100644 examples/multi_process/client_server_mp/Makefile
delete mode 100644 examples/multi_process/client_server_mp/mp_client/Makefile
delete mode 100644 examples/multi_process/client_server_mp/mp_server/Makefile
delete mode 100644 examples/multi_process/hotplug_mp/Makefile
delete mode 100644 examples/multi_process/simple_mp/Makefile
delete mode 100644 examples/multi_process/symmetric_mp/Makefile
delete mode 100644 examples/performance-thread/Makefile
delete mode 100644 examples/performance-thread/common/common.mk
delete mode 100644 examples/performance-thread/l3fwd-thread/Makefile
delete mode 100644 examples/performance-thread/pthread_shim/Makefile
delete mode 100644 examples/server_node_efd/Makefile
delete mode 100644 examples/server_node_efd/node/Makefile
delete mode 100644 examples/server_node_efd/server/Makefile
delete mode 100644 examples/vm_power_manager/Makefile
delete mode 100644 examples/vm_power_manager/guest_cli/Makefile
delete mode 100644 kernel/Makefile
delete mode 100644 kernel/freebsd/Makefile
delete mode 100644 kernel/freebsd/contigmem/Makefile
delete mode 100644 kernel/freebsd/nic_uio/Makefile
delete mode 100644 kernel/linux/Makefile
delete mode 100644 kernel/linux/igb_uio/Makefile
delete mode 100644 kernel/linux/kni/Makefile
delete mode 100644 lib/Makefile
delete mode 100644 lib/librte_acl/Makefile
delete mode 100644 lib/librte_bbdev/Makefile
delete mode 100644 lib/librte_bitratestats/Makefile
delete mode 100644 lib/librte_bpf/Makefile
delete mode 100644 lib/librte_cfgfile/Makefile
delete mode 100644 lib/librte_cmdline/Makefile
delete mode 100644 lib/librte_compressdev/Makefile
delete mode 100644 lib/librte_cryptodev/Makefile
delete mode 100644 lib/librte_distributor/Makefile
delete mode 100644 lib/librte_eal/Makefile
delete mode 100644 lib/librte_eal/freebsd/Makefile
delete mode 100644 lib/librte_eal/include/Makefile
delete mode 100644 lib/librte_eal/linux/Makefile
delete mode 100644 lib/librte_efd/Makefile
delete mode 100644 lib/librte_ethdev/Makefile
delete mode 100644 lib/librte_eventdev/Makefile
delete mode 100644 lib/librte_fib/Makefile
delete mode 100644 lib/librte_flow_classify/Makefile
delete mode 100644 lib/librte_graph/Makefile
delete mode 100644 lib/librte_gro/Makefile
delete mode 100644 lib/librte_gso/Makefile
delete mode 100644 lib/librte_hash/Makefile
delete mode 100644 lib/librte_ip_frag/Makefile
delete mode 100644 lib/librte_ipsec/Makefile
delete mode 100644 lib/librte_jobstats/Makefile
delete mode 100644 lib/librte_kni/Makefile
delete mode 100644 lib/librte_kvargs/Makefile
delete mode 100644 lib/librte_latencystats/Makefile
delete mode 100644 lib/librte_lpm/Makefile
delete mode 100644 lib/librte_mbuf/Makefile
delete mode 100644 lib/librte_member/Makefile
delete mode 100644 lib/librte_mempool/Makefile
delete mode 100644 lib/librte_meter/Makefile
delete mode 100644 lib/librte_metrics/Makefile
delete mode 100644 lib/librte_net/Makefile
delete mode 100644 lib/librte_node/Makefile
delete mode 100644 lib/librte_pci/Makefile
delete mode 100644 lib/librte_pdump/Makefile
delete mode 100644 lib/librte_pipeline/Makefile
delete mode 100644 lib/librte_port/Makefile
delete mode 100644 lib/librte_power/Makefile
delete mode 100644 lib/librte_rawdev/Makefile
delete mode 100644 lib/librte_rcu/Makefile
delete mode 100644 lib/librte_regexdev/Makefile
delete mode 100644 lib/librte_reorder/Makefile
delete mode 100644 lib/librte_rib/Makefile
delete mode 100644 lib/librte_ring/Makefile
delete mode 100644 lib/librte_sched/Makefile
delete mode 100644 lib/librte_security/Makefile
delete mode 100644 lib/librte_stack/Makefile
delete mode 100644 lib/librte_table/Makefile
delete mode 100644 lib/librte_telemetry/Makefile
delete mode 100644 lib/librte_timer/Makefile
delete mode 100644 lib/librte_vhost/Makefile
delete mode 100644 mk/arch/arm/rte.vars.mk
delete mode 100644 mk/arch/arm64/rte.vars.mk
delete mode 100644 mk/arch/i686/rte.vars.mk
delete mode 100644 mk/arch/ppc_64/rte.vars.mk
delete mode 100644 mk/arch/x86_64/rte.vars.mk
delete mode 100644 mk/arch/x86_x32/rte.vars.mk
delete mode 120000 mk/exec-env/bsdapp
delete mode 100644 mk/exec-env/freebsd/rte.app.mk
delete mode 100644 mk/exec-env/freebsd/rte.vars.mk
delete mode 100644 mk/exec-env/linux/rte.app.mk
delete mode 100644 mk/exec-env/linux/rte.vars.mk
delete mode 120000 mk/exec-env/linuxapp
delete mode 100644 mk/internal/rte.build-post.mk
delete mode 100644 mk/internal/rte.build-pre.mk
delete mode 100644 mk/internal/rte.clean-post.mk
delete mode 100644 mk/internal/rte.clean-pre.mk
delete mode 100644 mk/internal/rte.compile-post.mk
delete mode 100644 mk/internal/rte.compile-pre.mk
delete mode 100644 mk/internal/rte.extvars.mk
delete mode 100644 mk/internal/rte.install-post.mk
delete mode 100644 mk/internal/rte.install-pre.mk
delete mode 100644 mk/machine/armv7a/rte.vars.mk
delete mode 100644 mk/machine/armv8a/rte.vars.mk
delete mode 100644 mk/machine/default/rte.vars.mk
delete mode 100644 mk/machine/dpaa/rte.vars.mk
delete mode 100644 mk/machine/emag/rte.vars.mk
delete mode 100644 mk/machine/hsw/rte.vars.mk
delete mode 100644 mk/machine/ivb/rte.vars.mk
delete mode 100644 mk/machine/n1sdp/rte.vars.mk
delete mode 100644 mk/machine/native/rte.vars.mk
delete mode 100644 mk/machine/nhm/rte.vars.mk
delete mode 100644 mk/machine/octeontx2/rte.vars.mk
delete mode 100644 mk/machine/power8/rte.vars.mk
delete mode 100644 mk/machine/silvermont/rte.vars.mk
delete mode 100644 mk/machine/snb/rte.vars.mk
delete mode 100644 mk/machine/thunderx/rte.vars.mk
delete mode 100644 mk/machine/thunderx2/rte.vars.mk
delete mode 100644 mk/machine/wsm/rte.vars.mk
delete mode 100644 mk/machine/xgene1/rte.vars.mk
delete mode 100644 mk/rte.app.mk
delete mode 100644 mk/rte.bsdmodule.mk
delete mode 100644 mk/rte.combinedlib.mk
delete mode 100644 mk/rte.cpuflags.mk
delete mode 100644 mk/rte.extapp.mk
delete mode 100644 mk/rte.extlib.mk
delete mode 100644 mk/rte.extobj.mk
delete mode 100644 mk/rte.extshared.mk
delete mode 100644 mk/rte.extsubdir.mk
delete mode 100644 mk/rte.gnuconfigure.mk
delete mode 100644 mk/rte.helper.mk
delete mode 100644 mk/rte.hostapp.mk
delete mode 100644 mk/rte.hostlib.mk
delete mode 100644 mk/rte.install.mk
delete mode 100644 mk/rte.lib.mk
delete mode 100644 mk/rte.module.mk
delete mode 100644 mk/rte.obj.mk
delete mode 100644 mk/rte.sdkbuild.mk
delete mode 100644 mk/rte.sdkconfig.mk
delete mode 100644 mk/rte.sdkdepdirs.mk
delete mode 100644 mk/rte.sdkdoc.mk
delete mode 100644 mk/rte.sdkexamples.mk
delete mode 100644 mk/rte.sdkgcov.mk
delete mode 100644 mk/rte.sdkinstall.mk
delete mode 100644 mk/rte.sdkroot.mk
delete mode 100644 mk/rte.sdktest.mk
delete mode 100644 mk/rte.shared.mk
delete mode 100644 mk/rte.subdir.mk
delete mode 100644 mk/rte.vars.mk
delete mode 100644 mk/target/generic/rte.app.mk
delete mode 100644 mk/target/generic/rte.vars.mk
delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk
delete mode 100644 mk/toolchain/clang/rte.vars.mk
delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk
delete mode 100644 mk/toolchain/gcc/rte.vars.mk
delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk
delete mode 100644 mk/toolchain/icc/rte.vars.mk
--
2.17.1
^ permalink raw reply [flat|nested] 300+ messages in thread* [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-12 16:38 ` Bruce Richardson 2020-08-14 10:29 ` Bruce Richardson 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory Ciara Power ` (24 subsequent siblings) 25 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power The example app makefiles contained sections using the legacy method of compiling with make. These are no longer needed, and are removed, leaving only the section that uses pkg-config for the make build. Signed-off-by: Ciara Power <ciara.power@intel.com> --- examples/bbdev_app/Makefile | 23 ++------------- examples/bond/Makefile | 34 ++-------------------- examples/cmdline/Makefile | 29 ++----------------- examples/distributor/Makefile | 30 ++----------------- examples/eventdev_pipeline/Makefile | 23 ++------------- examples/fips_validation/Makefile | 34 ++-------------------- examples/flow_classify/Makefile | 29 ++----------------- examples/flow_filtering/Makefile | 23 ++------------- examples/helloworld/Makefile | 23 ++------------- examples/ioat/Makefile | 22 ++------------ examples/ip_fragmentation/Makefile | 29 ++----------------- examples/ip_pipeline/Makefile | 36 ++--------------------- examples/ip_reassembly/Makefile | 29 ++----------------- examples/ipsec-secgw/Makefile | 36 ++--------------------- examples/ipv4_multicast/Makefile | 29 ++----------------- examples/kni/Makefile | 27 ++---------------- examples/l2fwd-cat/Makefile | 38 ++----------------------- examples/l2fwd-crypto/Makefile | 28 ++---------------- examples/l2fwd-event/Makefile | 22 ++------------ examples/l2fwd-jobstats/Makefile | 23 ++------------- examples/l2fwd-keepalive/Makefile | 23 ++------------- examples/l2fwd/Makefile | 23 ++------------- examples/l3fwd-acl/Makefile | 28 ++---------------- examples/l3fwd-graph/Makefile | 23 ++------------- examples/l3fwd-power/Makefile | 36 ++--------------------- examples/l3fwd/Makefile | 23 ++------------- examples/link_status_interrupt/Makefile | 22 ++------------ examples/ntb/Makefile | 32 ++------------------- examples/packet_ordering/Makefile | 22 ++------------ examples/ptpclient/Makefile | 28 ++---------------- examples/qos_meter/Makefile | 28 ++---------------- examples/qos_sched/Makefile | 31 ++------------------ examples/rxtx_callbacks/Makefile | 31 ++------------------ examples/service_cores/Makefile | 28 ++---------------- examples/skeleton/Makefile | 29 ++----------------- examples/tep_termination/Makefile | 27 ++---------------- examples/timer/Makefile | 28 ++---------------- examples/vdpa/Makefile | 32 ++------------------- examples/vhost/Makefile | 30 ++----------------- examples/vhost_blk/Makefile | 31 ++------------------ examples/vhost_crypto/Makefile | 31 ++------------------ examples/vmdq/Makefile | 23 ++------------- examples/vmdq_dcb/Makefile | 31 ++------------------ 43 files changed, 129 insertions(+), 1078 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 3c8eb75a4e..9675c6d096 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -8,7 +8,9 @@ APP = bbdev SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 4e4289e151..cec55dd879 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -8,7 +8,9 @@ APP = bond_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,33 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -LDLIBS += -lrte_pmd_bond -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 7325097722..96dde832cf 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -8,7 +8,9 @@ APP = cmdline SRCS-y := main.c commands.c parse_obj_list.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = cmdline - -# all source are stored in SRCS-y -SRCS-y := main.c commands.c parse_obj_list.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 6e3fef9813..0dd23762e5 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -8,7 +8,9 @@ APP = distributor_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,29 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 95a8d0884a..bbcf694fd0 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -10,7 +10,9 @@ SRCS-y += pipeline_worker_generic.c SRCS-y += pipeline_worker_tx.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index b44ca2ee62..fddb56ca15 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -18,7 +18,9 @@ SRCS-y += fips_validation_xts.c SRCS-y += main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -47,33 +49,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -INC += $(sort $(wildcard *.h)) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 161d576b60..7402487dcf 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -8,7 +8,9 @@ APP = flow_classify SRCS-y := flow_classify.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 010a1383e2..3a3b243884 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -6,7 +6,9 @@ APP = flow SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -35,22 +37,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 94a1074cf6..d3784c11f3 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -8,7 +8,9 @@ APP = helloworld SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile index 86308854ea..ee03337ca4 100644 --- a/examples/ioat/Makefile +++ b/examples/ioat/Makefile @@ -8,7 +8,9 @@ APP = ioatfwd SRCS-y := ioatfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 3f4db3f59d..e3baedc18e 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -9,7 +9,9 @@ APP = ip_fragmentation SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 1116bb6c18..e4e86830a6 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -21,7 +21,9 @@ SRCS-y += tmgr.c SRCS-y += cryptodev.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -57,35 +59,3 @@ build: clean: rm -f build/$(APP)* build/*.o test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -INC += $(sort $(wildcard *.h)) - -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := $(SRCS-y) - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index be9e541bd6..1350de9ebe 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -9,7 +9,9 @@ APP = ip_reassembly SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index b5ccbca858..5f85dbbc02 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -23,7 +23,9 @@ SRCS-y += flow.c CFLAGS += -gdwarf-2 # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -54,35 +56,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -$(error "RTE_LIBRTE_IPSEC is required to build ipsec-secgw") -endif -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -gdwarf-2 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_sa.o += -diag-disable=vec -endif - -ifeq ($(DEBUG),1) -CFLAGS += -DIPSEC_DEBUG -fstack-protector-all -O0 -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index 0ed78c1cc2..aa2fda5e8a 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -9,7 +9,9 @@ APP = ipv4_multicast SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 8fcb67c619..71402fa744 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -8,7 +8,9 @@ APP = kni SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,26 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index d767a10d7d..4dce18226c 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-cat SRCS-y := l2fwd-cat.c cat.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,37 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -ifeq ($(PQOS_INSTALL_PATH),) -$(error "Please define PQOS_INSTALL_PATH environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -CFLAGS += -I$(PQOS_INSTALL_PATH)/../include - -LDLIBS += -L$(PQOS_INSTALL_PATH) -LDLIBS += -lpqos - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index cdbb91a1e6..b008f887cb 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-crypto SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile index ddee388ae6..a7249995c7 100644 --- a/examples/l2fwd-event/Makefile +++ b/examples/l2fwd-event/Makefile @@ -14,7 +14,9 @@ SRCS-y += l2fwd_event_generic.c SRCS-y += l2fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -43,21 +45,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index bdb83c3e1c..292f35bee7 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-jobstats SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 9fd9db4974..26b50263aa 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-keepalive SRCS-y := main.c shm.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 15105ac57e..6a74c7464a 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -8,7 +8,9 @@ APP = l2fwd SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Add flag to allow experimental API as l2fwd uses rte_ethdev_set_ptype API -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 6644a2cf1e..a095408f51 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-acl SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-graph/Makefile b/examples/l3fwd-graph/Makefile index f3cf275ece..782a261d6b 100644 --- a/examples/l3fwd-graph/Makefile +++ b/examples/l3fwd-graph/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-graph SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index ac1ccdcf61..29635b325a 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-power SRCS-y := main.c perf_core.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,35 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lm -lrte_telemetry - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -endif diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index b25a515813..52403b2bb4 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c SRCS-y += l3fwd_event_generic.c l3fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,22 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index f16916faa9..da2e328d68 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -8,7 +8,9 @@ APP = link_status_interrupt SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile index 81ec6017f5..ccec63c125 100644 --- a/examples/ntb/Makefile +++ b/examples/ntb/Makefile @@ -8,8 +8,9 @@ APP = ntb_fwd SRCS-y := ntb_fwd.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,30 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared rmdir --ignore-fail-on-non-empty build - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) -$(info This application can only operate in a linuxapp environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -O2 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index f99b69dc25..480495eeba 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -8,7 +8,9 @@ APP = packet_ordering SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index a9555fc66a..501bc67173 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -8,7 +8,9 @@ APP = ptpclient SRCS-y := ptpclient.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 165e07ee25..8eabb8f8c9 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -8,7 +8,9 @@ APP = qos_meter SRCS-y := main.c rte_policer.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,27 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 0dd7d91055..7961c60120 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -8,7 +8,9 @@ APP = qos_sched SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index 10e5f14d5c..3e982665c8 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -8,7 +8,9 @@ APP = rxtx_callbacks SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# rte_eth_read_clock is experimental -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index e742d88f61..456981afa5 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -8,7 +8,9 @@ APP = service_cores SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index 5f5acf7159..059dc2112b 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -8,7 +8,9 @@ APP = basicfwd SRCS-y := basicfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 548ca3cee3..65218c504a 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -8,7 +8,9 @@ APP = tep_termination SRCS-y := main.c vxlan_setup.c vxlan.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,26 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/timer/Makefile b/examples/timer/Makefile index b40b65995e..64c4016aa6 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -8,7 +8,9 @@ APP = timer SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index bc0b6793e6..8dfa0ceff2 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,31 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -D_GNU_SOURCE -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # linuxapp - -endif # pkg-config diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index ef6f3550f3..98f13176dd 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -8,7 +8,9 @@ APP = vhost-switch SRCS-y := main.c virtio_net.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile index 3952791784..6caa40c674 100644 --- a/examples/vhost_blk/Makefile +++ b/examples/vhost_blk/Makefile @@ -8,8 +8,9 @@ APP = vhost-blk SRCS-y := blk.c vhost_blk.c vhost_blk_compat.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index 28e3e4de74..d93c1dd424 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,30 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # Linux - -endif # pkg-config diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index b73373d3f5..c162e7c4e1 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -8,7 +8,9 @@ APP = vmdq_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -EXTRA_CFLAGS += -O3 - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 8d8baf729b..e9b29e2abd 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -8,7 +8,9 @@ APP = vmdq_dcb_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) + $(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_main.o += -diag-disable=vec -endif -EXTRA_CFLAGS += -O3 -g - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles Ciara Power @ 2020-08-12 16:38 ` Bruce Richardson 2020-08-13 14:29 ` Power, Ciara 2020-08-14 10:29 ` Bruce Richardson 1 sibling, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-12 16:38 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:29:51PM +0100, Ciara Power wrote: > The example app makefiles contained sections using the legacy method of > compiling with make. These are no longer needed, and are removed, > leaving only the section that uses pkg-config for the make build. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > examples/bbdev_app/Makefile | 23 ++------------- > examples/bond/Makefile | 34 ++-------------------- > examples/cmdline/Makefile | 29 ++----------------- > examples/distributor/Makefile | 30 ++----------------- > examples/eventdev_pipeline/Makefile | 23 ++------------- > examples/fips_validation/Makefile | 34 ++-------------------- > examples/flow_classify/Makefile | 29 ++----------------- > examples/flow_filtering/Makefile | 23 ++------------- > examples/helloworld/Makefile | 23 ++------------- > examples/ioat/Makefile | 22 ++------------ > examples/ip_fragmentation/Makefile | 29 ++----------------- > examples/ip_pipeline/Makefile | 36 ++--------------------- > examples/ip_reassembly/Makefile | 29 ++----------------- > examples/ipsec-secgw/Makefile | 36 ++--------------------- > examples/ipv4_multicast/Makefile | 29 ++----------------- > examples/kni/Makefile | 27 ++---------------- > examples/l2fwd-cat/Makefile | 38 ++----------------------- > examples/l2fwd-crypto/Makefile | 28 ++---------------- > examples/l2fwd-event/Makefile | 22 ++------------ > examples/l2fwd-jobstats/Makefile | 23 ++------------- > examples/l2fwd-keepalive/Makefile | 23 ++------------- > examples/l2fwd/Makefile | 23 ++------------- > examples/l3fwd-acl/Makefile | 28 ++---------------- > examples/l3fwd-graph/Makefile | 23 ++------------- > examples/l3fwd-power/Makefile | 36 ++--------------------- > examples/l3fwd/Makefile | 23 ++------------- > examples/link_status_interrupt/Makefile | 22 ++------------ > examples/ntb/Makefile | 32 ++------------------- > examples/packet_ordering/Makefile | 22 ++------------ > examples/ptpclient/Makefile | 28 ++---------------- > examples/qos_meter/Makefile | 28 ++---------------- > examples/qos_sched/Makefile | 31 ++------------------ > examples/rxtx_callbacks/Makefile | 31 ++------------------ > examples/service_cores/Makefile | 28 ++---------------- > examples/skeleton/Makefile | 29 ++----------------- > examples/tep_termination/Makefile | 27 ++---------------- > examples/timer/Makefile | 28 ++---------------- > examples/vdpa/Makefile | 32 ++------------------- > examples/vhost/Makefile | 30 ++----------------- > examples/vhost_blk/Makefile | 31 ++------------------ > examples/vhost_crypto/Makefile | 31 ++------------------ > examples/vmdq/Makefile | 23 ++------------- > examples/vmdq_dcb/Makefile | 31 ++------------------ > 43 files changed, 129 insertions(+), 1078 deletions(-) > There are still references to the old build system in the examples makefiles. Running "find examples/ -name Makefile | xargs grep RTE_SDK" shows quite a few references to the old builds. /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles 2020-08-12 16:38 ` Bruce Richardson @ 2020-08-13 14:29 ` Power, Ciara 0 siblings, 0 replies; 300+ messages in thread From: Power, Ciara @ 2020-08-13 14:29 UTC (permalink / raw) To: Richardson, Bruce; +Cc: dev, thomas >-----Original Message----- >From: Bruce Richardson <bruce.richardson@intel.com> >Sent: Wednesday 12 August 2020 17:39 >To: Power, Ciara <ciara.power@intel.com> >Cc: dev@dpdk.org; thomas@monjalon.net >Subject: Re: [PATCH 20.11 01/19] examples: remove legacy sections of >makefiles > >On Fri, Aug 07, 2020 at 01:29:51PM +0100, Ciara Power wrote: >> The example app makefiles contained sections using the legacy method >> of compiling with make. These are no longer needed, and are removed, >> leaving only the section that uses pkg-config for the make build. >> >> Signed-off-by: Ciara Power <ciara.power@intel.com> >> --- <snip> >> > >There are still references to the old build system in the examples makefiles. >Running "find examples/ -name Makefile | xargs grep RTE_SDK" >shows quite a few references to the old builds. > >/Bruce Hi Bruce, The Makefiles that still have references to the old build system after this patch are removed completely in the next patch. There is an open to convert these Makefiles to use pkg-config instead, any and all help is appreciated here. Thanks, Ciara ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles Ciara Power 2020-08-12 16:38 ` Bruce Richardson @ 2020-08-14 10:29 ` Bruce Richardson 1 sibling, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-14 10:29 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:29:51PM +0100, Ciara Power wrote: > The example app makefiles contained sections using the legacy method of > compiling with make. These are no longer needed, and are removed, > leaving only the section that uses pkg-config for the make build. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > examples/bbdev_app/Makefile | 23 ++------------- <snip> > examples/vmdq/Makefile | 23 ++------------- > examples/vmdq_dcb/Makefile | 31 ++------------------ > 43 files changed, 129 insertions(+), 1078 deletions(-) > > diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile > index 3c8eb75a4e..9675c6d096 100644 > --- a/examples/bbdev_app/Makefile > +++ b/examples/bbdev_app/Makefile > @@ -8,7 +8,9 @@ APP = bbdev > SRCS-y := main.c > > # Build using pkg-config variables if possible > -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) > +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) > + $(error "no installation of DPDK found") > +endif > Unfortunately make is whitespace sensitive, so you can't indent here without getting a syntax error in the case that dpdk is not installed. Instead of the error message you get e.g.: Makefile:12: *** recipe commences before first target. Stop. This applies to all makefiles in this patch, I think. /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-07 12:45 ` Bruce Richardson 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 03/19] config: remove all config files used by make Ciara Power ` (23 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power It was decided [1] to no longer support Make in DPDK, this patch removes all Makefiles that do not make use of pkg-config, along with the mk directory previously used by make. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html Signed-off-by: Ciara Power <ciara.power@intel.com> --- GNUmakefile | 17 - Makefile | 4 - app/Makefile | 34 -- app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 -- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 - app/test-eventdev/Makefile | 32 -- app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 - app/test-pipeline/Makefile | 33 -- app/test-pmd/Makefile | 73 --- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ----------- buildtools/Makefile | 9 - buildtools/pmdinfogen/Makefile | 20 - drivers/Makefile | 34 -- drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 - drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 -- drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 -- drivers/bus/fslmc/Makefile | 47 -- drivers/bus/ifpga/Makefile | 28 - drivers/bus/pci/Makefile | 33 -- drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/vdev/Makefile | 27 - drivers/bus/vmbus/Makefile | 33 -- drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 -- drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 -- drivers/common/iavf/Makefile | 27 - drivers/common/mlx5/Makefile | 404 -------------- drivers/common/mvep/Makefile | 35 -- drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 -- drivers/common/qat/Makefile | 74 --- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 - drivers/compress/octeontx/Makefile | 26 - drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 -- drivers/crypto/aesni_gcm/Makefile | 43 -- drivers/crypto/aesni_mb/Makefile | 42 -- drivers/crypto/armv8/Makefile | 36 -- drivers/crypto/caam_jr/Makefile | 39 -- drivers/crypto/ccp/Makefile | 32 -- drivers/crypto/dpaa2_sec/Makefile | 45 -- drivers/crypto/dpaa_sec/Makefile | 38 -- drivers/crypto/kasumi/Makefile | 42 -- drivers/crypto/mvsam/Makefile | 40 -- drivers/crypto/nitrox/Makefile | 30 -- drivers/crypto/null/Makefile | 27 - drivers/crypto/octeontx/Makefile | 36 -- drivers/crypto/octeontx2/Makefile | 49 -- drivers/crypto/openssl/Makefile | 26 - drivers/crypto/scheduler/Makefile | 34 -- drivers/crypto/snow3g/Makefile | 43 -- drivers/crypto/virtio/Makefile | 33 -- drivers/crypto/zuc/Makefile | 42 -- drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 -- drivers/event/dpaa2/Makefile | 41 -- drivers/event/dsw/Makefile | 26 - drivers/event/octeontx/Makefile | 51 -- drivers/event/octeontx2/Makefile | 47 -- drivers/event/opdl/Makefile | 29 - drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 - drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 -- drivers/mempool/dpaa2/Makefile | 31 -- drivers/mempool/octeontx/Makefile | 39 -- drivers/mempool/octeontx2/Makefile | 40 -- drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 --- drivers/net/af_packet/Makefile | 27 - drivers/net/af_xdp/Makefile | 26 - drivers/net/ark/Makefile | 39 -- drivers/net/atlantic/Makefile | 34 -- drivers/net/avp/Makefile | 29 - drivers/net/axgbe/Makefile | 33 -- drivers/net/bnx2x/Makefile | 33 -- drivers/net/bnxt/Makefile | 63 --- drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 -- drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 -- drivers/net/cxgbe/Makefile | 57 -- drivers/net/dpaa/Makefile | 41 -- drivers/net/dpaa2/Makefile | 47 -- drivers/net/e1000/Makefile | 79 --- drivers/net/ena/Makefile | 30 -- drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 --- drivers/net/failsafe/Makefile | 43 -- drivers/net/fm10k/Makefile | 77 --- drivers/net/hinic/Makefile | 67 --- drivers/net/hns3/Makefile | 42 -- drivers/net/i40e/Makefile | 112 ---- drivers/net/iavf/Makefile | 54 -- drivers/net/ice/Makefile | 96 ---- drivers/net/igc/Makefile | 40 -- drivers/net/ionic/Makefile | 31 -- drivers/net/ipn3ke/Makefile | 38 -- drivers/net/ixgbe/Makefile | 110 ---- drivers/net/kni/Makefile | 30 -- drivers/net/liquidio/Makefile | 30 -- drivers/net/memif/Makefile | 26 - drivers/net/mlx4/Makefile | 142 ----- drivers/net/mlx5/Makefile | 82 --- drivers/net/mvneta/Makefile | 39 -- drivers/net/mvpp2/Makefile | 42 -- drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 -- drivers/net/nfp/Makefile | 41 -- drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 -- drivers/net/octeontx2/Makefile | 63 --- drivers/net/pcap/Makefile | 32 -- drivers/net/pfe/Makefile | 31 -- drivers/net/qede/Makefile | 109 ---- drivers/net/ring/Makefile | 29 - drivers/net/sfc/Makefile | 133 ----- drivers/net/softnic/Makefile | 54 -- drivers/net/szedata2/Makefile | 30 -- drivers/net/tap/Makefile | 97 ---- drivers/net/thunderx/Makefile | 41 -- drivers/net/vdev_netvsc/Makefile | 30 -- drivers/net/vhost/Makefile | 31 -- drivers/net/virtio/Makefile | 82 --- drivers/net/vmxnet3/Makefile | 53 -- drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 -- drivers/raw/dpaa2_qdma/Makefile | 36 -- drivers/raw/ifpga/Makefile | 39 -- drivers/raw/ifpga/base/Makefile | 32 -- drivers/raw/ioat/Makefile | 28 - drivers/raw/ntb/Makefile | 28 - drivers/raw/octeontx2_dma/Makefile | 34 -- drivers/raw/octeontx2_ep/Makefile | 42 -- drivers/raw/skeleton/Makefile | 26 - drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 -- drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 -- drivers/vdpa/mlx5/Makefile | 58 -- examples/Makefile | 90 ---- examples/ethtool/Makefile | 23 - examples/ethtool/ethtool-app/Makefile | 32 -- examples/ethtool/lib/Makefile | 37 -- examples/l2fwd-keepalive/ka-agent/Makefile | 22 - examples/multi_process/Makefile | 18 - .../multi_process/client_server_mp/Makefile | 16 - .../client_server_mp/mp_client/Makefile | 21 - .../client_server_mp/mp_server/Makefile | 34 -- examples/multi_process/hotplug_mp/Makefile | 23 - examples/multi_process/simple_mp/Makefile | 23 - examples/multi_process/symmetric_mp/Makefile | 23 - examples/performance-thread/Makefile | 21 - examples/performance-thread/common/common.mk | 21 - .../performance-thread/l3fwd-thread/Makefile | 24 - .../performance-thread/pthread_shim/Makefile | 33 -- examples/server_node_efd/Makefile | 16 - examples/server_node_efd/node/Makefile | 21 - examples/server_node_efd/server/Makefile | 30 -- examples/vm_power_manager/Makefile | 65 --- examples/vm_power_manager/guest_cli/Makefile | 29 - kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 -- lib/Makefile | 138 ----- lib/librte_acl/Makefile | 65 --- lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 -- lib/librte_cfgfile/Makefile | 26 - lib/librte_cmdline/Makefile | 34 -- lib/librte_compressdev/Makefile | 27 - lib/librte_cryptodev/Makefile | 30 -- lib/librte_distributor/Makefile | 28 - lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 ---- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 ---- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 -- lib/librte_eventdev/Makefile | 47 -- lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 - lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 -- lib/librte_ip_frag/Makefile | 27 - lib/librte_ipsec/Makefile | 29 - lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 - lib/librte_mbuf/Makefile | 26 - lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_meter/Makefile | 27 - lib/librte_metrics/Makefile | 30 -- lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 -- lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 - lib/librte_port/Makefile | 59 -- lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 -- lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 -- lib/librte_sched/Makefile | 29 - lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 - lib/librte_table/Makefile | 59 -- lib/librte_telemetry/Makefile | 30 -- lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 -- mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 -- mk/arch/i686/rte.vars.mk | 36 -- mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 -- mk/arch/x86_x32/rte.vars.mk | 40 -- mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 -- mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 -- mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 -- mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 -- mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 ------ mk/internal/rte.extvars.mk | 55 -- mk/internal/rte.install-post.mk | 71 --- mk/internal/rte.install-pre.mk | 32 -- mk/machine/armv7a/rte.vars.mk | 36 -- mk/machine/armv8a/rte.vars.mk | 31 -- mk/machine/default/rte.vars.mk | 30 -- mk/machine/dpaa/rte.vars.mk | 37 -- mk/machine/emag/rte.vars.mk | 32 -- mk/machine/hsw/rte.vars.mk | 30 -- mk/machine/ivb/rte.vars.mk | 30 -- mk/machine/n1sdp/rte.vars.mk | 34 -- mk/machine/native/rte.vars.mk | 39 -- mk/machine/nhm/rte.vars.mk | 30 -- mk/machine/octeontx2/rte.vars.mk | 34 -- mk/machine/power8/rte.vars.mk | 30 -- mk/machine/silvermont/rte.vars.mk | 30 -- mk/machine/snb/rte.vars.mk | 30 -- mk/machine/thunderx/rte.vars.mk | 31 -- mk/machine/thunderx2/rte.vars.mk | 34 -- mk/machine/wsm/rte.vars.mk | 30 -- mk/machine/xgene1/rte.vars.mk | 31 -- mk/rte.app.mk | 509 ------------------ mk/rte.bsdmodule.mk | 89 --- mk/rte.combinedlib.mk | 30 -- mk/rte.cpuflags.mk | 124 ----- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 - mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 - mk/rte.extsubdir.mk | 39 -- mk/rte.gnuconfigure.mk | 44 -- mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 ---- mk/rte.hostlib.mk | 86 --- mk/rte.install.mk | 28 - mk/rte.lib.mk | 156 ------ mk/rte.module.mk | 86 --- mk/rte.obj.mk | 82 --- mk/rte.sdkbuild.mk | 77 --- mk/rte.sdkconfig.mk | 142 ----- mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 ---- mk/rte.sdkexamples.mk | 50 -- mk/rte.sdkgcov.mk | 39 -- mk/rte.sdkinstall.mk | 152 ------ mk/rte.sdkroot.mk | 115 ---- mk/rte.sdktest.mk | 76 --- mk/rte.shared.mk | 108 ---- mk/rte.subdir.mk | 65 --- mk/rte.vars.mk | 102 ---- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 ----- mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 --- mk/toolchain/gcc/rte.toolchain-compat.mk | 120 ----- mk/toolchain/gcc/rte.vars.mk | 109 ---- mk/toolchain/icc/rte.toolchain-compat.mk | 58 -- mk/toolchain/icc/rte.vars.mk | 62 --- 316 files changed, 13524 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 Makefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 examples/ethtool/Makefile delete mode 100644 examples/ethtool/ethtool-app/Makefile delete mode 100644 examples/ethtool/lib/Makefile delete mode 100644 examples/l2fwd-keepalive/ka-agent/Makefile delete mode 100644 examples/multi_process/Makefile delete mode 100644 examples/multi_process/client_server_mp/Makefile delete mode 100644 examples/multi_process/client_server_mp/mp_client/Makefile delete mode 100644 examples/multi_process/client_server_mp/mp_server/Makefile delete mode 100644 examples/multi_process/hotplug_mp/Makefile delete mode 100644 examples/multi_process/simple_mp/Makefile delete mode 100644 examples/multi_process/symmetric_mp/Makefile delete mode 100644 examples/performance-thread/Makefile delete mode 100644 examples/performance-thread/common/common.mk delete mode 100644 examples/performance-thread/l3fwd-thread/Makefile delete mode 100644 examples/performance-thread/pthread_shim/Makefile delete mode 100644 examples/server_node_efd/Makefile delete mode 100644 examples/server_node_efd/node/Makefile delete mode 100644 examples/server_node_efd/server/Makefile delete mode 100644 examples/vm_power_manager/Makefile delete mode 100644 examples/vm_power_manager/guest_cli/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index e8de422df8..0000000000 --- a/GNUmakefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# Head Makefile for compiling rte SDK -# - -RTE_SDK := $(CURDIR) -export RTE_SDK - -# -# directory list -# - -ROOTDIRS-y := buildtools lib kernel drivers app - -include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/Makefile b/Makefile deleted file mode 100644 index 571277aa5a..0000000000 --- a/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -.error Error please compile using GNU Make (gmake) diff --git a/app/Makefile b/app/Makefile deleted file mode 100644 index 453c4fed6d..0000000000 --- a/app/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_APP_TEST) += test -DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd -DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib -DIRS-$(CONFIG_RTE_TEST_FLOW_PERF) += test-flow-perf -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += test-sad -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += test-regex - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -DIRS-$(CONFIG_RTE_APP_COMPRESS_PERF) += test-compress-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_APP_CRYPTO_PERF) += test-crypto-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -DIRS-$(CONFIG_RTE_APP_EVENTDEV) += test-eventdev -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/app/pdump/Makefile b/app/pdump/Makefile deleted file mode 100644 index e6b9eea91b..0000000000 --- a/app/pdump/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) - -APP = dpdk-pdump - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/proc-info/Makefile b/app/proc-info/Makefile deleted file mode 100644 index 214f3f54a1..0000000000 --- a/app/proc-info/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-procinfo - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-acl/Makefile b/app/test-acl/Makefile deleted file mode 100644 index 5f26294cf1..0000000000 --- a/app/test-acl/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) - -APP = testacl - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile deleted file mode 100644 index dc29557f37..0000000000 --- a/app/test-bbdev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -APP = testbbdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_TEST_BBDEV) += main.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c - -LDLIBS += -lm -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_5gnr_fec -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-cmdline/Makefile b/app/test-cmdline/Makefile deleted file mode 100644 index 3e7421906b..0000000000 --- a/app/test-cmdline/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y) - -# -# library name -# -APP = cmdline_test - -# -# all sources are stored in SRCS-y -# -SRCS-y += cmdline_test.c -SRCS-y += commands.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-compress-perf/Makefile b/app/test-compress-perf/Makefile deleted file mode 100644 index 2bff531836..0000000000 --- a/app/test-compress-perf/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-compress-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += comp_perf_options_parse.c -SRCS-y += comp_perf_test_verify.c -SRCS-y += comp_perf_test_throughput.c -SRCS-y += comp_perf_test_cyclecount.c -SRCS-y += comp_perf_test_common.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-crypto-perf/Makefile b/app/test-crypto-perf/Makefile deleted file mode 100644 index 0dced790f0..0000000000 --- a/app/test-crypto-perf/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -APP = dpdk-test-crypto-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += cperf_ops.c -SRCS-y += cperf_options_parsing.c -SRCS-y += cperf_test_vectors.c -SRCS-y += cperf_test_throughput.c -SRCS-y += cperf_test_latency.c -SRCS-y += cperf_test_pmd_cyclecount.c -SRCS-y += cperf_test_verify.c -SRCS-y += cperf_test_vector_parsing.c -SRCS-y += cperf_test_common.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-eventdev/Makefile b/app/test-eventdev/Makefile deleted file mode 100644 index e600e21c41..0000000000 --- a/app/test-eventdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-eventdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := evt_main.c -SRCS-y += evt_options.c -SRCS-y += evt_test.c -SRCS-y += parser.c - -SRCS-y += test_order_common.c -SRCS-y += test_order_queue.c -SRCS-y += test_order_atq.c - -SRCS-y += test_perf_common.c -SRCS-y += test_perf_queue.c -SRCS-y += test_perf_atq.c - -SRCS-y += test_pipeline_common.c -SRCS-y += test_pipeline_queue.c -SRCS-y += test_pipeline_atq.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-fib/Makefile b/app/test-fib/Makefile deleted file mode 100644 index 2ea799c0e9..0000000000 --- a/app/test-fib/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_FIB),y) - -APP = testfib - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-flow-perf/Makefile b/app/test-flow-perf/Makefile deleted file mode 100644 index 4f2db75910..0000000000 --- a/app/test-flow-perf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_FLOW_PERF),y) - -# -# library name -# -APP = dpdk-test-flow-perf - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y += actions_gen.c -SRCS-y += flow_gen.c -SRCS-y += items_gen.c -SRCS-y += main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pipeline/Makefile b/app/test-pipeline/Makefile deleted file mode 100644 index fc3a504409..0000000000 --- a/app/test-pipeline/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PIPELINE),y) - -# -# library name -# -APP = testpipeline - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := main.c -SRCS-y += config.c -SRCS-y += init.c -SRCS-y += runtime.c -SRCS-y += pipeline_stub.c -SRCS-y += pipeline_hash.c -SRCS-y += pipeline_lpm.c -SRCS-y += pipeline_lpm_ipv6.c - -# include ACL lib if available -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += pipeline_acl.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile deleted file mode 100644 index e739797f8a..0000000000 --- a/app/test-pmd/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_PMD),y) - -# -# library name -# -APP = testpmd - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -# -# all source are stored in SRCS-y -# -SRCS-y := testpmd.c -SRCS-y += parameters.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_tm.c -SRCS-y += config.c -SRCS-y += iofwd.c -SRCS-y += macfwd.c -SRCS-y += macswap.c -SRCS-y += flowgen.c -SRCS-y += rxonly.c -SRCS-y += txonly.c -SRCS-y += csumonly.c -SRCS-y += icmpecho.c -SRCS-y += noisy_vnf.c -SRCS-y += 5tswap.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c -SRCS-y += util.c - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS)$(CONFIG_RTE_LIBRTE_DPAA_PMD),yy) -LDLIBS += -lrte_pmd_dpaa -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC),y) -LDLIBS += -lrte_pmd_softnic -endif - -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-regex/Makefile b/app/test-regex/Makefile deleted file mode 100644 index bb8f150871..0000000000 --- a/app/test-regex/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-regex - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-sad/Makefile b/app/test-sad/Makefile deleted file mode 100644 index 9b5a7ddc61..0000000000 --- a/app/test-sad/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) - -APP = testsad - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test/Makefile b/app/test/Makefile deleted file mode 100644 index f4065271e4..0000000000 --- a/app/test/Makefile +++ /dev/null @@ -1,310 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_APP_TEST),y) - -# default rule -all: - -# Define an externally linked resource. A linked resource is an arbitrary -# file that is linked into the test binary. The application refers to this -# resource by name. The linked generates identifiers beg_<name> and end_<name> -# for referencing by the C code. -# -# Parameters: <unique name>, <file to be linked> -define linked_resource -SRCS-y += $(1).res.o -$(1).res.o: $(2) - @ echo ' MKRES $$@' - $Q [ "$$(<D)" = . ] || ln -fs $$< - $Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \ - --rename-section \ - .data=.rodata,alloc,load,data,contents,readonly \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1) \ - $$(<F) $$@ -endef - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -define linked_tar_resource -$(1).tar: $(2) - @ echo ' TAR $$@' - $Q tar -C $$(dir $$<) -cf $$@ $$(notdir $$<) -$(call linked_resource,$(1),$(1).tar) -endef -else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR -linked_tar_resource = -endif # CONFIG_RTE_APP_TEST_RESOURCE_TAR - -# -# library name -# -APP = test - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c -SRCS-y += test.c -SRCS-y += resource.c -SRCS-y += test_resource.c -test_resource.res: test_resource.c - @ cp $< $@ -$(eval $(call linked_resource,test_resource_c,test_resource.res)) -$(eval $(call linked_tar_resource,test_resource_tar,test_resource.c)) -SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_cfgfile.c -$(eval $(call linked_tar_resource,test_cfgfiles,test_cfgfiles)) -SRCS-y += test_prefetch.c -SRCS-y += test_byteorder.c -SRCS-y += test_per_lcore.c -SRCS-y += test_atomic.c -SRCS-y += test_barrier.c -SRCS-y += test_malloc.c -SRCS-y += test_cycles.c -SRCS-y += test_mcslock.c -SRCS-y += test_spinlock.c -SRCS-y += test_ticketlock.c -SRCS-y += test_memory.c -SRCS-y += test_memzone.c -SRCS-y += test_bitmap.c -SRCS-y += test_bitops.c -SRCS-y += test_reciprocal_division.c -SRCS-y += test_reciprocal_division_perf.c -SRCS-y += test_fbarray.c -SRCS-y += test_external_mem.c -SRCS-y += test_rand_perf.c - -SRCS-y += test_ring.c -SRCS-y += test_ring_mpmc_stress.c -SRCS-y += test_ring_hts_stress.c -SRCS-y += test_ring_perf.c -SRCS-y += test_ring_mt_peek_stress.c -SRCS-y += test_ring_rts_stress.c -SRCS-y += test_ring_st_peek_stress.c -SRCS-y += test_ring_stress.c -SRCS-y += test_pmd_perf.c - -ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y) -SRCS-y += test_table.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test_table_pipeline.c -SRCS-y += test_table_tables.c -SRCS-y += test_table_ports.c -SRCS-y += test_table_combined.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_table_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += test_flow_classify.c -endif - -SRCS-y += test_rwlock.c -SRCS-y += test_lcores.c - -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack.c -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_racecond.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_secondary.c - -SRCS-y += test_mempool.c -SRCS-y += test_mempool_perf.c - -SRCS-y += test_mbuf.c -SRCS-y += test_logs.c - -SRCS-y += test_memcpy.c -SRCS-y += test_memcpy_perf.c - - -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd.c -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_thash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_functions.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += test_telemetry_json.c - -SRCS-y += test_debug.c -SRCS-y += test_errno.c -SRCS-y += test_tailq.c -SRCS-y += test_string_fns.c -SRCS-y += test_cpuflags.c -SRCS-y += test_mp_secondary.c -SRCS-y += test_eal_flags.c -SRCS-y += test_eal_fs.c -SRCS-y += test_alarm.c -SRCS-y += test_interrupts.c -SRCS-y += test_version.c -SRCS-y += test_func_reentrancy.c -SRCS-y += test_trace.c -SRCS-y += test_trace_register.c -SRCS-y += test_trace_perf.c -SRCS-y += test_service_cores.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-y += sample_packet_forward.c -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_portlist.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_lib.c - -SRCS-$(CONFIG_RTE_LIBRTE_NET) += test_crc.c - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -SRCS-y += test_red.c -SRCS-y += test_sched.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_METER) += test_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_KNI) += test_kni.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power.c test_power_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power_kvm_vm.c -SRCS-y += test_common.c - -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c - -SRCS-y += virtual_pmd.c -SRCS-y += packet_burst_generator.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_cryptodev_security_pdcp.c - -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -SRCS-y += test_eventdev.c -SRCS-y += test_event_ring.c -SRCS-y += test_event_eth_rx_adapter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c -SRCS-y += test_event_timer_adapter.c -SRCS-y += test_event_crypto_adapter.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH), y) -SRCS-y += test_graph.c -SRCS-y += test_graph_perf.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -SRCS-y += test_rawdev.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c - -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += test_bpf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RCU) += test_rcu_qsbr.c test_rcu_qsbr_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_security.c - -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec.c test_ipsec_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec_sad.c -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -LDLIBS += -lrte_ipsec -endif - -CFLAGS += -O3 -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) -LDLIBS += -lpthread -endif - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -LDLIBS += -lz -endif -endif - -# Disable VTA for memcpy test -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_test_memcpy.o += -fno-var-tracking-assignments -CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments -endif -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -LDLIBS += -lrte_pmd_null -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -LDLIBS += -lrte_pmd_ring -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -endif - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -LDLIBS += -larchive -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/buildtools/Makefile b/buildtools/Makefile deleted file mode 100644 index 7f76fd7d65..0000000000 --- a/buildtools/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += pmdinfogen - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/buildtools/pmdinfogen/Makefile b/buildtools/pmdinfogen/Makefile deleted file mode 100644 index a97a7648fe..0000000000 --- a/buildtools/pmdinfogen/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -HOSTAPP = dpdk-pmdinfogen - -# -# all sources are stored in SRCS-y -# -SRCS-y += pmdinfogen.c - -HOST_CFLAGS += $(HOST_WERROR_FLAGS) -g -HOST_CFLAGS += -I$(RTE_OUTPUT)/include - -include $(RTE_SDK)/mk/rte.hostapp.mk diff --git a/drivers/Makefile b/drivers/Makefile deleted file mode 100644 index 7f06162dc4..0000000000 --- a/drivers/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += common -DIRS-y += bus -DEPDIRS-bus := common -DIRS-y += mempool -DEPDIRS-mempool := common bus -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -DIRS-y += common/mlx5 -DEPDIRS-common/mlx5 := bus -endif -DIRS-y += net -DEPDIRS-net := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband -DEPDIRS-baseband := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto -DEPDIRS-crypto := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat -DEPDIRS-common/qat := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress -DEPDIRS-compress := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex -DEPDIRS-regex := common bus common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa -DEPDIRS-vdpa := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event -DEPDIRS-event := common bus mempool net crypto -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw -DEPDIRS-raw := common bus mempool net event - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/Makefile b/drivers/baseband/Makefile deleted file mode 100644 index dcc0969175..0000000000 --- a/drivers/baseband/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -core-libs := librte_eal librte_mbuf librte_mempool librte_ring -core-libs += librte_bbdev librte_kvargs librte_cfgfile - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null -DEPDIRS-null = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw -DEPDIRS-turbo_sw = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec -DEPDIRS-fpga_lte_fec = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += fpga_5gnr_fec -DEPDIRS-fpga_5gnr_fec = $(core-libs) - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/fpga_5gnr_fec/Makefile b/drivers/baseband/fpga_5gnr_fec/Makefile deleted file mode 100644 index 7b7017c6dc..0000000000 --- a/drivers/baseband/fpga_5gnr_fec/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_5gnr_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_5gnr_fec_version.map - -# library version -LIBABIVER := 1 - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += rte_fpga_5gnr_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC)-include += rte_pmd_fpga_5gnr_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/fpga_lte_fec/Makefile b/drivers/baseband/fpga_lte_fec/Makefile deleted file mode 100644 index 30caafe3db..0000000000 --- a/drivers/baseband/fpga_lte_fec/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_lte_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/null/Makefile b/drivers/baseband/null/Makefile deleted file mode 100644 index 0ee500166d..0000000000 --- a/drivers/baseband/null/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk -# library name -LIB = librte_pmd_bbdev_null.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_null_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += bbdev_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/turbo_sw/Makefile b/drivers/baseband/turbo_sw/Makefile deleted file mode 100644 index c2a6fe0f81..0000000000 --- a/drivers/baseband/turbo_sw/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_turbo_sw.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_turbo_sw_version.map - -# external library dependencies if available -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -ifeq ($(FLEXRAN_SDK),) -$(error "Please define FLEXRAN_SDK environment variable") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_common -CFLAGS += -I$(FLEXRAN_SDK)/lib_turbo -CFLAGS += -I$(FLEXRAN_SDK)/lib_crc -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -LDLIBS += -L$(FLEXRAN_SDK)/lib_crc -lcrc -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_common -lcommon -LDLIBS += -lstdc++ -lirc -limf -lipps -lsvml -endif - -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),n) -$(error "CONFIG_RTE_BBDEV_SDK_AVX512 requires CONFIG_RTE_BBDEV_SDK_AVX2 set") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += bbdev_turbo_software.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile deleted file mode 100644 index cea3b55e60..0000000000 --- a/drivers/bus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc -endif -DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev -DIRS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile deleted file mode 100644 index ba40b21166..0000000000 --- a/drivers/bus/dpaa/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_BUS_DPAA=$(RTE_SDK)/drivers/bus/dpaa - -# -# library name -# -LIB = librte_bus_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual -CFLAGS += -I$(RTE_BUS_DPAA)/ -CFLAGS += -I$(RTE_BUS_DPAA)/include -CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_bus_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - dpaa_bus.c - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - base/fman/fman.c \ - base/fman/fman_hw.c \ - base/fman/netcfg_layer.c \ - base/qbman/process.c \ - base/qbman/bman.c \ - base/qbman/bman_driver.c \ - base/qbman/qman.c \ - base/qbman/qman_driver.c \ - base/qbman/dpaa_alloc.c \ - base/qbman/dpaa_sys.c - -# Link Pthread -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile deleted file mode 100644 index b98d758ee0..0000000000 --- a/drivers/bus/fslmc/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_fslmc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -# versioning export map -EXPORT_MAP := rte_bus_fslmc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - qbman/qbman_portal.c \ - qbman/qbman_debug.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - mc/dpmng.c \ - mc/dpbp.c \ - mc/dpio.c \ - mc/mc_sys.c \ - mc/dpcon.c \ - mc/dpci.c \ - mc/dpdmai.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpci.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile deleted file mode 100644 index 1df369103c..0000000000 --- a/drivers/bus/ifpga/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_bus_ifpga_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_bus.c -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_common.c - -# -# Export include files -# -SYMLINK-$(CONFIG_RTE_LIBRTE_IFPGA_BUS)-include += rte_bus_ifpga.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile deleted file mode 100644 index f4102d0a7f..0000000000 --- a/drivers/bus/pci/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_pci.a -EXPORT_MAP := rte_bus_pci_version.map - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -SYSTEM := bsd -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_pci -lrte_kvargs - -include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI_BUS)-include += rte_bus_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/bsd/Makefile b/drivers/bus/pci/bsd/Makefile deleted file mode 100644 index c1b54c05ef..0000000000 --- a/drivers/bus/pci/bsd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c diff --git a/drivers/bus/pci/linux/Makefile b/drivers/bus/pci/linux/Makefile deleted file mode 100644 index 90404468b0..0000000000 --- a/drivers/bus/pci/linux/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c -SRCS += pci_uio.c -SRCS += pci_vfio.c diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile deleted file mode 100644 index 01747f03a4..0000000000 --- a/drivers/bus/vdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_vdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_bus_vdev_version.map - -SRCS-y += vdev.c -SRCS-y += vdev_params.c - -LDLIBS += -lrte_eal -lrte_kvargs - -# -# Export include files -# -SYMLINK-y-include += rte_bus_vdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/Makefile b/drivers/bus/vmbus/Makefile deleted file mode 100644 index 335df6a0ba..0000000000 --- a/drivers/bus/vmbus/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_vmbus.a -EXPORT_MAP := rte_bus_vmbus_version.map - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -$(error "VMBUS not implemented for BSD yet") -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev - -include $(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_channel.c vmbus_bufring.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_bus_vmbus.h -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_vmbus_reg.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/linux/Makefile b/drivers/bus/vmbus/linux/Makefile deleted file mode 100644 index ef0d30b2d3..0000000000 --- a/drivers/bus/vmbus/linux/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -SRCS += vmbus_bus.c vmbus_uio.c diff --git a/drivers/common/Makefile b/drivers/common/Makefile deleted file mode 100644 index cfb6b4dc88..0000000000 --- a/drivers/common/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifneq (,$(findstring y,$(CPT-y))) -DIRS-y += cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -DIRS-y += octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -DIRS-y += octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -DIRS-y += mvep -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y) -DIRS-y += dpaax -endif - -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifneq (,$(findstring y,$(IAVF-y))) -DIRS-y += iavf -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/cpt/Makefile b/drivers/common/cpt/Makefile deleted file mode 100644 index cab9da73c8..0000000000 --- a/drivers/common/cpt/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_cpt.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -EXPORT_MAP := rte_common_cpt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += cpt_fpm_tables.c -SRCS-y += cpt_pmd_ops_helper.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile deleted file mode 100644 index 2f4b924fda..0000000000 --- a/drivers/common/dpaax/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_dpaax.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib - -# versioning export map -EXPORT_MAP := rte_common_dpaax_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/iavf/Makefile b/drivers/common/iavf/Makefile deleted file mode 100644 index f06dafd408..0000000000 --- a/drivers/common/iavf/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_iavf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -EXPORT_MAP := rte_common_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += iavf_adminq.c -SRCS-y += iavf_common.c -SRCS-y += iavf_impl.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile deleted file mode 100644 index 4edd541042..0000000000 --- a/drivers/common/mlx5/Makefile +++ /dev/null @@ -1,404 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_common_mlx5.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx5_glue.so -LIB_GLUE_VERSION = 20.02.0 - -# Sources. -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-y += linux/mlx5_glue.c -endif -SRCS-y += mlx5_devx_cmds.c -SRCS-y += mlx5_common.c -SRCS-y += linux/mlx5_common_os.c -SRCS-y += linux/mlx5_nl.c -SRCS-y += linux/mlx5_common_verbs.c -SRCS-y += mlx5_common_mp.c -SRCS-y += mlx5_common_mr.c -SRCS-y += mlx5_malloc.c -SRCS-y += mlx5_common_pci.c -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-y-lib += $(LIB_GLUE) -endif -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(SRCDIR)/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_linux/mlx5_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx5 -endif - -LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual -UPEDANTIC - -EXPORT_MAP := rte_common_mlx5_version.map - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx5_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx5_autoconf.h.new: FORCE - -mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_RELAXED_ORDERING \ - infiniband/verbs.h \ - enum IBV_ACCESS_RELAXED_ORDERING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_TUNNEL_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_MPLS_SUPPORT \ - infiniband/verbs.h \ - enum IBV_FLOW_SPEC_MPLS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAG_RX_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAG_RX_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_SWP \ - infiniband/mlx5dv.h \ - type 'struct mlx5dv_sw_parsing_caps' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_MPW \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_COMP \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_PAD \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DV_SUPPORT \ - infiniband/mlx5dv.h \ - func mlx5dv_create_flow_action_packet_reformat \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_NIC_RX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ESWITCH \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_FDB \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_VLAN \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_push_vlan \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_DEVX_PORT \ - infiniband/mlx5dv.h \ - func mlx5dv_query_devx_port \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_OBJ \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_create \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DEVX_COUNTERS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_DEFAULT_MISS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_ASYNC \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_query_async \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_QP \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_qp_query \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DEVX_UAR_OFFSET \ - infiniband/mlx5dv.h \ - field "struct mlx5dv_devx_uar.mmap_off" \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_PP_ALLOC \ - infiniband/mlx5dv.h \ - func mlx5dv_pp_alloc \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_dest_devx_tir \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_EVENT \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_get_event \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_flow_meter \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_FLOW_DUMP \ - infiniband/mlx5dv.h \ - func mlx5dv_dump_dr_domain \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD \ - infiniband/mlx5dv.h \ - enum MLX5_MMAP_GET_NC_PAGES_CMD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_VAR \ - infiniband/mlx5dv.h \ - func mlx5dv_alloc_var \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_MEM_RECLAIM \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_domain_set_reclaim_device_memory \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_ENHANCED_MPSW \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_ENHANCED_MPSW \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_SEND_EN \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_SEND_EN \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_WAIT \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_WAIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_25G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_50G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_100G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V42 \ - infiniband/verbs.h \ - type 'struct ibv_counter_set_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V45 \ - infiniband/verbs.h \ - type 'struct ibv_counters_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NL_NLDEV \ - rdma/rdma_netlink.h \ - enum RDMA_NL_NLDEV \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_PORT_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_PORT_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_NAME \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_PORT_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_PORT_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_NDEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_NUM_VF \ - linux/if_link.h \ - enum IFLA_NUM_VF \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_EXT_MASK \ - linux/if_link.h \ - enum IFLA_EXT_MASK \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_SWITCH_ID \ - linux/if_link.h \ - enum IFLA_PHYS_SWITCH_ID \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_PORT_NAME \ - linux/if_link.h \ - enum IFLA_PHYS_PORT_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_DEVLINK \ - linux/devlink.h \ - define DEVLINK_GENL_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_STATIC_ASSERT \ - /usr/include/assert.h \ - define static_assert \ - $(AUTOCONF_OUTPUT) - -# Create mlx5_autoconf.h or update it in case it differs from the new one. - -mlx5_autoconf.h: mlx5_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -$(SRCS-y:.c=.o): mlx5_autoconf.h -endif - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): linux/mlx5_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx5 - -linux/mlx5_glue.o: mlx5_autoconf.h - -endif - -clean_mlx5: FORCE - $Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new - $Q rm -f -- linux/mlx5_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx5 diff --git a/drivers/common/mvep/Makefile b/drivers/common/mvep/Makefile deleted file mode 100644 index f91d295e5c..0000000000 --- a/drivers/common/mvep/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_common_mvep.a - -# versioning export map -EXPORT_MAP := rte_common_mvep_version.map - -# external library dependencies -CFLAGS += -I$($RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_kvargs - -# library source files -SRCS-y += mvep_common.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx/Makefile b/drivers/common/octeontx/Makefile deleted file mode 100644 index 5e67df0583..0000000000 --- a/drivers/common/octeontx/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -EXPORT_MAP := rte_common_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += octeontx_mbox.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx2/Makefile b/drivers/common/octeontx2/Makefile deleted file mode 100644 index 260da8dd3e..0000000000 --- a/drivers/common/octeontx2/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_common_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += otx2_dev.c -SRCS-y += otx2_irq.c -SRCS-y += otx2_mbox.c -SRCS-y += otx2_common.c -SRCS-y += otx2_sec_idev.c - -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile deleted file mode 100644 index 85d4207099..0000000000 --- a/drivers/common/qat/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# build directories -QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat -QAT_COMPRESS_DIR := $(RTE_SDK)/drivers/compress/qat -VPATH=$(QAT_CRYPTO_DIR):$(QAT_COMPRESS_DIR) - -# external library include paths -CFLAGS += -I$(SRCDIR)/qat_adf -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(QAT_CRYPTO_DIR) -CFLAGS += -I$(QAT_COMPRESS_DIR) - - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) - LDLIBS += -lrte_compressdev - SRCS-y += qat_comp.c - SRCS-y += qat_comp_pmd.c - build_qat = yes -endif - -# library symmetric crypto source files -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto - CFLAGS += -DBUILD_QAT_ASYM - SRCS-y += qat_asym.c - SRCS-y += qat_asym_pmd.c - build_qat = yes -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) - LDLIBS += -lrte_net -endif - CFLAGS += -DBUILD_QAT_SYM - SRCS-y += qat_sym.c - SRCS-y += qat_sym_session.c - SRCS-y += qat_sym_pmd.c - build_qat = yes -endif -endif - -ifdef build_qat - - # library name - LIB = librte_pmd_qat.a - - # build flags - CFLAGS += $(WERROR_FLAGS) - CFLAGS += -O3 - - # library common source files - SRCS-y += qat_device.c - SRCS-y += qat_common.c - SRCS-y += qat_logs.c - SRCS-y += qat_qp.c - - LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool - LDLIBS += -lrte_pci -lrte_bus_pci - - # export include files - SYMLINK-y-include += - - # versioning export map - EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/Makefile b/drivers/compress/Makefile deleted file mode 100644 index 286ea6ee84..0000000000 --- a/drivers/compress/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/compress/isal/Makefile b/drivers/compress/isal/Makefile deleted file mode 100644 index 1e225ab434..0000000000 --- a/drivers/compress/isal/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_isal_comp.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# external library dependencies -LDLIBS += -lisal -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_isal_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd_ops.c - -# export include files -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/octeontx/Makefile b/drivers/compress/octeontx/Makefile deleted file mode 100644 index 9ba1db791e..0000000000 --- a/drivers/compress/octeontx/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_zip.a - -# build flags -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/compress/octeontx/include - -# external library include paths -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_compress_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/zlib/Makefile b/drivers/compress/zlib/Makefile deleted file mode 100644 index 9f695f7d9a..0000000000 --- a/drivers/compress/zlib/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium Networks - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zlib.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zlib_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lz -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile deleted file mode 100644 index 47a2a9e794..0000000000 --- a/drivers/crypto/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += zuc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += mvsam -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec -endif # CONFIG_RTE_LIBRTE_PMD_DPAA_SEC -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile deleted file mode 100644 index 01cb4fddfe..0000000000 --- a/drivers/crypto/aesni_gcm/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_gcm.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_gcm_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile deleted file mode 100644 index f0dc82f395..0000000000 --- a/drivers/crypto/aesni_mb/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_mb.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_mb_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/armv8/Makefile b/drivers/crypto/armv8/Makefile deleted file mode 100644 index 0e3bc9fb70..0000000000 --- a/drivers/crypto/armv8/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(ARMV8_CRYPTO_LIB_PATH),) -$(error "Please define ARMV8_CRYPTO_LIB_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_armv8.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_armv8_version.map - -# external library dependencies -CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH) -LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile deleted file mode 100644 index 89d3238172..0000000000 --- a/drivers/crypto/caam_jr/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_caam_jr.a - -# build flags -CFLAGS += -D _GNU_SOURCE - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_pmd_caam_jr_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_uio.c -# library dependencies - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile deleted file mode 100644 index 3f5da2adf3..0000000000 --- a/drivers/crypto/ccp/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_ccp.a - -# build flags -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += $(WERROR_FLAGS) - -# external library include paths -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_pmd_ccp_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += rte_ccp_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile deleted file mode 100644 index a0a2795575..0000000000 --- a/drivers/crypto/dpaa2_sec/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -# -# library name -# -LIB = librte_pmd_dpaa2_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -CFLAGS += -Wno-implicit-fallthrough -endif -endif - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2/ - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec_dpseci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += mc/dpseci.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile deleted file mode 100644 index ea266962a3..0000000000 --- a/drivers/crypto/dpaa_sec/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c - -# library dependencies - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/kasumi/Makefile b/drivers/crypto/kasumi/Makefile deleted file mode 100644 index a7d0d079d2..0000000000 --- a/drivers/crypto/kasumi/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_kasumi.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_kasumi_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/mvsam/Makefile b/drivers/crypto/mvsam/Makefile deleted file mode 100644 index f0641ae7d9..0000000000 --- a/drivers/crypto/mvsam/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvsam_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC - -# versioning export map -EXPORT_MAP := rte_pmd_mvsam_version.map - -# external library dependencies -LDLIBS += -L$(LIBMUSDK_PATH)/lib -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/nitrox/Makefile b/drivers/crypto/nitrox/Makefile deleted file mode 100644 index 535121196b..0000000000 --- a/drivers/crypto/nitrox/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_nitrox.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_nitrox_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_cryptodev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_device.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_reqmgr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_qp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/null/Makefile b/drivers/crypto/null/Makefile deleted file mode 100644 index 4595055f01..0000000000 --- a/drivers/crypto/null/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -# library name -LIB = librte_pmd_null_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_null_crypto_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd_ops.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx/Makefile b/drivers/crypto/octeontx/Makefile deleted file mode 100644 index 296755ee90..0000000000 --- a/drivers/crypto/octeontx/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_ops.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx2/Makefile b/drivers/crypto/octeontx2/Makefile deleted file mode 100644 index 14152c6117..0000000000 --- a/drivers/crypto/octeontx2/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx2_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_security -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt -lrte_common_octeontx2 - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx2 - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_sec.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx2_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/openssl/Makefile b/drivers/crypto/openssl/Makefile deleted file mode 100644 index b85c816551..0000000000 --- a/drivers/crypto/openssl/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_openssl.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_openssl_version.map - -# external library dependencies -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/scheduler/Makefile b/drivers/crypto/scheduler/Makefile deleted file mode 100644 index 67aac024c4..0000000000 --- a/drivers/crypto/scheduler/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_crypto_scheduler.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_kvargs -lrte_reorder -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_crypto_scheduler_version.map - -# -# Export include files -# -SYMLINK-y-include += rte_cryptodev_scheduler_operations.h -SYMLINK-y-include += rte_cryptodev_scheduler.h - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += rte_cryptodev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_roundrobin.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pkt_size_distr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_failover.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_multicore.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile deleted file mode 100644 index 469aefaa56..0000000000 --- a/drivers/crypto/snow3g/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_snow3g.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_snow3g_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile deleted file mode 100644 index 32e2e4d5e9..0000000000 --- a/drivers/crypto/virtio/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio_crypto.a - -# -# include virtio_crypto.h -# -CFLAGS += -I$(RTE_SDK)/lib/librte_vhost -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_virtio_crypto_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c - -# this lib depends upon: -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/zuc/Makefile b/drivers/crypto/zuc/Makefile deleted file mode 100644 index 529b47f25e..0000000000 --- a/drivers/crypto/zuc/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zuc.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zuc_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/Makefile b/drivers/event/Makefile deleted file mode 100644 index 86be41b9eb..0000000000 --- a/drivers/event/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += octeontx2 -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile deleted file mode 100644 index a39dc27c62..0000000000 --- a/drivers/event/dpaa/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa_event.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -LDLIBS += -lrte_pmd_dpaa_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec - -EXPORT_MAP := rte_pmd_dpaa_event_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa_eventdev.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile deleted file mode 100644 index 75cf197c5c..0000000000 --- a/drivers/event/dpaa2/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017,2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2_event.a - -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 -LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc - -LDLIBS += -lrte_pmd_dpaa2_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_hw_dpcon.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev_selftest.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile deleted file mode 100644 index f6e7dda1fd..0000000000 --- a/drivers/event/dsw/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Ericsson AB - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_dsw_event.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -Wno-format-nonliteral -endif - -LDLIBS += -lrte_eal -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool -LDLIBS += -lrte_ring -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_dsw_event_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += \ - dsw_evdev.c dsw_event.c dsw_xstats.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile deleted file mode 100644 index c1233e098d..0000000000 --- a/drivers/event/octeontx/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx_ssovf.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/ - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_ethdev - -EXPORT_MAP := rte_pmd_octeontx_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_probe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_probe.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_ssovf_worker.o += -fno-prefetch-loop-arrays -CFLAGS_timvf_worker.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -else -CFLAGS_ssovf_worker.o += -O3 -ffast-math -CFLAGS_timvf_worker.o += -O3 -ffast-math -endif - -else -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx2/Makefile b/drivers/event/octeontx2/Makefile deleted file mode 100644 index 9d67b00c69..0000000000 --- a/drivers/event/octeontx2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2_event.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/event/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_event_version.map - -# -# all source are stored in SRCS-y -# - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker_dual.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_adptr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_irq.c - -LDLIBS += -lrte_eal -lrte_bus_pci -lrte_pci -lrte_kvargs -LDLIBS += -lrte_mempool -lrte_eventdev -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile deleted file mode 100644 index 71713b00ae..0000000000 --- a/drivers/event/opdl/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_opdl_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_pmd_opdl_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_init.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_test.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/skeleton/Makefile b/drivers/event/skeleton/Makefile deleted file mode 100644 index dc85ad3c4b..0000000000 --- a/drivers/event/skeleton/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_skeleton_event.a - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_skeleton_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton_eventdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/sw/Makefile b/drivers/event/sw/Makefile deleted file mode 100644 index 8ea5cceb8b..0000000000 --- a/drivers/event/sw/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_sw_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -lrte_ring -LDLIBS += -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_sw_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_selftest.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile deleted file mode 100644 index 29ef73bf44..0000000000 --- a/drivers/mempool/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += bucket -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2 -endif -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += octeontx2 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/mempool/bucket/Makefile b/drivers/mempool/bucket/Makefile deleted file mode 100644 index c766c35b2c..0000000000 --- a/drivers/mempool/bucket/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright (c) 2017-2018 Solarflare Communications Inc. -# All rights reserved. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_bucket.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_bucket_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += rte_mempool_bucket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile deleted file mode 100644 index 144969c627..0000000000 --- a/drivers/mempool/dpaa/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile deleted file mode 100644 index 04db6d27de..0000000000 --- a/drivers/mempool/dpaa2/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa2_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)-include := rte_dpaa2_mempool.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx/Makefile b/drivers/mempool/octeontx/Makefile deleted file mode 100644 index 9c840620d9..0000000000 --- a/drivers/mempool/octeontx/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ - -EXPORT_MAP := rte_mempool_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx_fpavf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += rte_mempool_octeontx.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_rte_mempool_octeontx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_rte_mempool_octeontx.o += -Ofast -else -CFLAGS_rte_mempool_octeontx.o += -O3 -ffast-math -endif - -else -CFLAGS_rte_mempool_octeontx.o += -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_bus_pci -lrte_common_octeontx - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx2/Makefile b/drivers/mempool/octeontx2/Makefile deleted file mode 100644 index 3828219b11..0000000000 --- a/drivers/mempool/octeontx2/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_mempool_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += \ - otx2_mempool_ops.c \ - otx2_mempool.c \ - otx2_mempool_irq.c \ - otx2_mempool_debug.c - -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_kvargs -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/ring/Makefile b/drivers/mempool/ring/Makefile deleted file mode 100644 index 8624502da9..0000000000 --- a/drivers/mempool/ring/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_ring_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += rte_mempool_ring.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile deleted file mode 100644 index ccfd970400..0000000000 --- a/drivers/mempool/stack/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_stack.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# Headers -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool -LDLIBS += -lrte_eal -lrte_mempool -lrte_stack - -EXPORT_MAP := rte_mempool_stack_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/Makefile b/drivers/net/Makefile deleted file mode 100644 index 361974eacf..0000000000 --- a/drivers/net/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# set in mk/toolchain/xxx/rte.toolchain-compat.mk -ifeq ($(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD),d) - $(warning thunderx pmd is not supported by old compilers) -endif - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += af_xdp -DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark -DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic -DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp -DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe -DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding -DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 -DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena -DIRS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc -DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic -DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe -DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k -DIRS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic -DIRS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3 -DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e -DIRS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf -DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice -DIRS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc -DIRS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic -DIRS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke -DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe -DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif -DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta -DIRS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mvpp2 -DIRS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += netvsc -DIRS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb -DIRS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp -DIRS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap -DIRS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe -DIRS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede -DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring -DIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += szedata2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap -DIRS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += thunderx -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc -DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3 - -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += kni -endif - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += softnic -endif # $(CONFIG_RTE_LIBRTE_SCHED) - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost -endif # $(CONFIG_RTE_LIBRTE_VHOST) - -ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y) -ifeq ($(CONFIG_RTE_LIBRTE_CFGFILE),n) -$(error "RTE_LIBRTE_CFGFILE must be enabled in configuration!") -endif -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/net/af_packet/Makefile b/drivers/net/af_packet/Makefile deleted file mode 100644 index 91dbf0a692..0000000000 --- a/drivers/net/af_packet/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 John W. Linville <linville@redhat.com> -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_packet.a - -EXPORT_MAP := rte_pmd_af_packet_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += rte_eth_af_packet.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/af_xdp/Makefile b/drivers/net/af_xdp/Makefile deleted file mode 100644 index 55db6085ac..0000000000 --- a/drivers/net/af_xdp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_xdp.a - -EXPORT_MAP := rte_pmd_af_xdp_version.map - -CFLAGS += -O3 - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libbpf || echo "-lbpf") - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += rte_eth_af_xdp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile deleted file mode 100644 index c02080bdd0..0000000000 --- a/drivers/net/ark/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2018 Atomic Rules LLC - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ark.a - -CFLAGS += -O3 -I./ -CFLAGS += $(WERROR_FLAGS) -Werror - -EXPORT_MAP := rte_pmd_ark_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ddm.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_mpu.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktchkr.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktgen.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_rqp.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c - -# this lib depends upon: -LDLIBS += -lpthread -ifdef CONFIG_RTE_EXEC_ENV_LINUX -LDLIBS += -ldl -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/atlantic/Makefile b/drivers/net/atlantic/Makefile deleted file mode 100644 index 0d0d0a502d..0000000000 --- a/drivers/net/atlantic/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Aquantia Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_atlantic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_atlantic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/hw_atl - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_hw_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_llh.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils_fw2x.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_b0.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += rte_pmd_atlantic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/avp/Makefile b/drivers/net/avp/Makefile deleted file mode 100644 index 075247b13a..0000000000 --- a/drivers/net/avp/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2017, Wind River Systems, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_avp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_avp_version.map - -# install public header files to enable compilation of the hypervisor level -# dpdk application -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_common.h -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_fifo.h - -# -# all source files are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/axgbe/Makefile b/drivers/net/axgbe/Makefile deleted file mode 100644 index e421d0da11..0000000000 --- a/drivers/net/axgbe/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_axgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_axgbe_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_ethdev -lrte_net - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_mdio.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_phy_impl.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_i2c.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx_vec_sse.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile deleted file mode 100644 index 451434cc18..0000000000 --- a/drivers/net/bnx2x/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2014 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnx2x.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DZLIB_CONST -LDLIBS += -lz -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_bnx2x_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += ecore_sp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += elink.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_vfpf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile deleted file mode 100644 index 0c5b74918d..0000000000 --- a/drivers/net/bnxt/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnxt.a - -EXPORT_MAP := rte_pmd_bnxt_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -pthread - -EXPORT_MAP := rte_pmd_bnxt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_cpr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_hwrm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_reps.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD), y) -CFLAGS += -I$(SRCDIR) -I$(SRCDIR)/tf_ulp -I$(SRCDIR)/tf_core -I$(SRCDIR)/hcapi -include $(SRCDIR)/tf_ulp/Makefile -include $(SRCDIR)/tf_core/Makefile -include $(SRCDIR)/hcapi/Makefile -endif - -# -# Export include files -# -SYMLINK-y-include += -SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include += rte_pmd_bnxt.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/hcapi/Makefile b/drivers/net/bnxt/hcapi/Makefile deleted file mode 100644 index a5bb398ad7..0000000000 --- a/drivers/net/bnxt/hcapi/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += hcapi/hcapi_cfa_p4.c diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile deleted file mode 100644 index 84840366ab..0000000000 --- a/drivers/net/bnxt/tf_core/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/bitalloc.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/rand.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/stack.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/ll.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_core.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_rm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tfp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device_p4.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_if_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_global_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_hash.c diff --git a/drivers/net/bnxt/tf_ulp/Makefile b/drivers/net/bnxt/tf_ulp/Makefile deleted file mode 100644 index abb68150d1..0000000000 --- a/drivers/net/bnxt/tf_ulp/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_class.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_act.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_rte_parser.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_matcher.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mapper.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mark_mgr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_flow_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_port_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_def_rules.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_fc_mgr.c diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile deleted file mode 100644 index 728551a846..0000000000 --- a/drivers/net/bonding/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bond.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_bond_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_8023ad.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_alb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_flow.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_bond.h -SYMLINK-y-include += rte_eth_bond_8023ad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile deleted file mode 100644 index 53b2bb56dc..0000000000 --- a/drivers/net/cxgbe/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014-2018 Chelsio Communications. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_cxgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_cxgbe_version.map - -# -# CFLAGS for gcc/clang -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += clip_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += mps_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += l2t.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += smt.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4vf_hw.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile deleted file mode 100644 index d7bbc0e158..0000000000 --- a/drivers/net/dpaa/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_pmd_dpaa_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile deleted file mode 100644 index 6f38c18b9b..0000000000 --- a/drivers/net/dpaa2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_sparser.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += dpaa2_ptp.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_PMD)-include := rte_pmd_dpaa2.h -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile deleted file mode 100644 index f186f8d0e9..0000000000 --- a/drivers/net/e1000/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_e1000.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_e1000_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 177 -diag-disable 181 -CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259 -else -# -# CFLAGS for gcc/clang -# -CFLAGS_BASE_DRIVER = -Wno-uninitialized -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-misleading-indentation -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -endif - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_base.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_80003es2lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82540.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82541.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82542.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82543.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82571.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82575.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_i210.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_api.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_ich8lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile deleted file mode 100644 index 8ccff36db7..0000000000 --- a/drivers/net/ena/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2019 Amazon.com, Inc. or its affiliates. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ena.a -CFLAGS += $(WERROR_FLAGS) -O2 -INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ena_version.map - -VPATH += $(SRCDIR)/base -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c - -CFLAGS += $(INCLUDES) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_timer - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile deleted file mode 100644 index 7276026e37..0000000000 --- a/drivers/net/enetc/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enetc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -EXPORT_MAP := rte_pmd_enetc_version.map -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile deleted file mode 100644 index d098a474a1..0000000000 --- a/drivers/net/enic/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2008-2017 Cisco Systems, Inc. All rights reserved. -# Copyright 2007 Nuova Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enic.a - -EXPORT_MAP := rte_pmd_enic_version.map - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/src - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_fm_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_cq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c - -# The current implementation assumes 64-bit pointers -CC_AVX2_SUPPORT=0 -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -# Figure out if the compiler supports avx2. The extra check using -# -march=core-avx2 is necessary to support users who build for the -# 'default' machine (corei7 which has no avx2) and run the binary on -# newer CPUs that have avx2. -# This part is verbatim from i40e makefile. -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_enic_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_enic_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile deleted file mode 100644 index 464fd0515d..0000000000 --- a/drivers/net/failsafe/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_pmd_failsafe.a - -EXPORT_MAP := rte_pmd_failsafe_version.map - -# Sources are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_eal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif - -# No exported include files - -# Basic CFLAGS: -CFLAGS += -std=gnu99 -Wextra -CFLAGS += -O3 -CFLAGS += -I. -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=700 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -CFLAGS += -pedantic -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile deleted file mode 100644 index d486389928..0000000000 --- a/drivers/net/fm10k/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_fm10k.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_fm10k_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) - -# -## CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -else -# -# CFLAGS for gcc -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of cid-fm10k.2017.01.24.tar.gz -# -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_rxtx.c - -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_tlv.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) += fm10k_rxtx_vec.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile deleted file mode 100644 index 87fd843e41..0000000000 --- a/drivers/net/hinic/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Huawei Technologies Co., Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hinic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -CFLAGS += -D__ARM64_NEON__ -else ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -CFLAGS += -D__X86_64_SSE__ -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_hinic_version.map - -# -# CFLAGS for 32-bits platforms -# -ifneq ($(CONFIG_RTE_ARCH_64),y) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS += -diag-disable 2259 -else -# -# CFLAGS for gcc -# -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -endif -endif - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_api_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cmdq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_eqs.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwif.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mgmt.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_niccfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_nicio.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_tx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hns3/Makefile b/drivers/net/hns3/Makefile deleted file mode 100644 index d7798a4706..0000000000 --- a/drivers/net/hns3/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018-2019 Hisilicon Limited. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hns3.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Experimantal APIs: -# - rte_mp_action_register -# - rte_mp_action_unregister -# - rte_mp_reply -# - rte_mp_request_sync - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_hns3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile deleted file mode 100644 index 43f10941b2..0000000000 --- a/drivers/net/i40e/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_i40e.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF -CFLAGS += -DX722_A0_SUPPORT - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_i40e_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER = -diag-disable 593 -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER = -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-format-security -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -CFLAGS_i40e_lan_hmc.o += -Wno-error -endif -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of dpdk-i40e.2016.04.18.12.tar.gz. -# -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_adminq.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_common.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_diag.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_lan_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c - -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_sse.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += rte_pmd_i40e.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_vf_representor.c - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR),y) -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_i40e_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_i40e_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_avx2.c - CFLAGS_i40e_rxtx.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_I40E_PMD)-include := rte_pmd_i40e.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/iavf/Makefile b/drivers/net/iavf/Makefile deleted file mode 100644 index 792cbb7f79..0000000000 --- a/drivers/net/iavf/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_iavf.a - -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf -CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_iavf - -EXPORT_MAP := rte_pmd_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_hash.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IAVF_PMD), y) - ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 - else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_iavf_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_iavf_rxtx_vec_avx2.o += -mavx2 - endif - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile deleted file mode 100644 index 34cd4024b3..0000000000 --- a/drivers/net/ice/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ice.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_hash -LDLIBS += -lrte_net -lrte_common_iavf -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ice_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -endif -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_controlq.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_common.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flex_pipe.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl_ctrl.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_hash.c -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_ice_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_ice_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_avx2.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_generic_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_parent.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ICE_PMD)-include := rte_pmd_ice.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/igc/Makefile b/drivers/net/igc/Makefile deleted file mode 100644 index d6d7959d2d..0000000000 --- a/drivers/net/igc/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_igc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_pmd_igc_version.map - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_base.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_i225.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_txrx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile deleted file mode 100644 index 7442e2c5cb..0000000000 --- a/drivers/net/ionic/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ionic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ionic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_mac_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_lif.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_main.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ipn3ke/Makefile b/drivers/net/ipn3ke/Makefile deleted file mode 100644 index 40696dbde8..0000000000 --- a/drivers/net/ipn3ke/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ipn3ke.a - -# -# Add the experimenatal APIs called from this PMD -# rte_eth_switch_domain_alloc() -# rte_eth_dev_create() -# rte_eth_dev_destroy() -# rte_eth_switch_domain_free() -# -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ipn3ke_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_representor.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile deleted file mode 100644 index aebf3b286c..0000000000 --- a/drivers/net/ixgbe/Makefile +++ /dev/null @@ -1,110 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ixgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ixgbe_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -CFLAGS_ixgbe_rxtx.o += -diag-disable 3656 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_ixgbe_common.o += -Wno-unused-but-set-variable -CFLAGS_ixgbe_x550.o += -Wno-unused-but-set-variable -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ixgbe_x550.o += -Wno-maybe-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 50 && echo 1), 1) -CFLAGS_ixgbe_common.o += -Wno-logical-not-parentheses -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x540.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x550.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_hv_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_flow.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_BYPASS),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_bypass.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599_bypass.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ipsec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += rte_pmd_ixgbe.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf_representor.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)-include := rte_pmd_ixgbe.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile deleted file mode 100644 index 0694ffd021..0000000000 --- a/drivers/net/kni/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_kni.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_kni_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += rte_eth_kni.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile deleted file mode 100644 index d7fda7f527..0000000000 --- a/drivers/net/liquidio/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_lio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_liquidio_version.map - -VPATH += $(RTE_SDK)/drivers/net/liquidio/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_23xx_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_mbox.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/memif/Makefile b/drivers/net/memif/Makefile deleted file mode 100644 index 3bf4ddce4c..0000000000 --- a/drivers/net/memif/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 Cisco Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_memif.a - -EXPORT_MAP := rte_pmd_memif_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs -lrte_net -LDLIBS += -lrte_hash -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += rte_eth_memif.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif_socket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile deleted file mode 100644 index 02e9b2ec07..0000000000 --- a/drivers/net/mlx4/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012 6WIND S.A. -# Copyright 2012 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx4.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx4_glue.so -LIB_GLUE_VERSION = 18.02.0 - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_flow.c -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_glue.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_utils.c - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib += $(LIB_GLUE) -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX4_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX4_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_mlx4_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx4 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx4_version.map -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX4_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX4_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx4_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS += -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx4_autoconf.h.new: FORCE - -mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q : > '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_BUF_ALLOCATORS \ - infiniband/mlx4dv.h \ - enum MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_UAR_MMAP_OFFSET \ - infiniband/mlx4dv.h \ - enum MLX4DV_QP_MASK_UAR_MMAP_OFFSET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_WQE_LSO_SEG \ - infiniband/mlx4dv.h \ - type 'struct mlx4_wqe_lso_seg' \ - $(AUTOCONF_OUTPUT) - -# Create mlx4_autoconf.h or update it in case it differs from the new one. - -mlx4_autoconf.h: mlx4_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD):.c=.o): mlx4_autoconf.h - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): mlx4_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx4 - -mlx4_glue.o: mlx4_autoconf.h - -endif - -clean_mlx4: FORCE - $Q rm -f -- mlx4_autoconf.h mlx4_autoconf.h.new - $Q rm -f -- mlx4_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx4 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile deleted file mode 100644 index 568c772415..0000000000 --- a/drivers/net/mlx5/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. -# Copyright 2015 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txpp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) \ - $(CONFIG_RTE_ARCH_PPC_64) \ - $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx_vec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxmode.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_vlan.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - diff --git a/drivers/net/mvneta/Makefile b/drivers/net/mvneta/Makefile deleted file mode 100644 index 41e50479ff..0000000000 --- a/drivers/net/mvneta/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# Copyright(c) 2018 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvneta.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvneta_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_SIZE=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta_ethdev.c mvneta_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mvpp2/Makefile b/drivers/net/mvpp2/Makefile deleted file mode 100644 index 8a3ec93a60..0000000000 --- a/drivers/net/mvpp2/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvpp2.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvpp2_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_qos.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_tm.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/netvsc/Makefile b/drivers/net/netvsc/Makefile deleted file mode 100644 index da8991584a..0000000000 --- a/drivers/net/netvsc/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_netvsc.a - -CFLAGS += -O3 $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_netvsc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rndis.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_nvs.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_vf.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vmbus - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfb/Makefile b/drivers/net/nfb/Makefile deleted file mode 100644 index e92d29dcd3..0000000000 --- a/drivers/net/nfb/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Cesnet -# Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfb.a - -INCLUDES :=-I$(SRCDIR) - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags netcope-common) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) - -EXPORT_MAP := rte_pmd_nfb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rxmode.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfp/Makefile b/drivers/net/nfp/Makefile deleted file mode 100644 index 289b3a60e3..0000000000 --- a/drivers/net/nfp/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_nfp_version.map - -VPATH += $(SRCDIR)/nfpcore - -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cppcore.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cpp_pcie_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mutex.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_resource.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mip.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nffw.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_hwinfo.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_rtsym.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_cmds.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_eth.c - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_net.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile deleted file mode 100644 index f51150c131..0000000000 --- a/drivers/net/null/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 IGEL Co.,Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_null.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_null_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx/Makefile b/drivers/net/octeontx/Makefile deleted file mode 100644 index c4db878009..0000000000 --- a/drivers/net/octeontx/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ - -EXPORT_MAP := rte_pmd_octeontx_version.map - -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkovf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkivf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_bgx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev_ops.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_octeontx_rxtx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -else -CFLAGS_octeontx_rxtx.o += -O3 -ffast-math -endif - -else -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_common_octeontx -LDLIBS += -lrte_mempool_octeontx -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile deleted file mode 100644 index 0de43e36af..0000000000 --- a/drivers/net/octeontx2/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -flax-vector-conversions -endif - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \ - otx2_rx.c \ - otx2_tx.c \ - otx2_tm.c \ - otx2_rss.c \ - otx2_mac.c \ - otx2_ptp.c \ - otx2_flow.c \ - otx2_link.c \ - otx2_vlan.c \ - otx2_stats.c \ - otx2_mcast.c \ - otx2_lookup.c \ - otx2_ethdev.c \ - otx2_flow_ctrl.c \ - otx2_flow_parse.c \ - otx2_flow_utils.c \ - otx2_ethdev_irq.c \ - otx2_ethdev_ops.c \ - otx2_ethdev_sec.c \ - otx2_ethdev_debug.c \ - otx2_ethdev_devargs.c - -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal -lrte_net -LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf -lrte_mempool -lm -LDLIBS += -lrte_cryptodev -lrte_eventdev -lrte_security - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile deleted file mode 100644 index f243d1a0fa..0000000000 --- a/drivers/net/pcap/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pcap.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpcap -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_pcap_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += rte_eth_pcap.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pfe/Makefile b/drivers/net/pfe/Makefile deleted file mode 100644 index 75d30b01aa..0000000000 --- a/drivers/net/pfe/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pfe.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK)/drivers/net/pfe/base/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -EXPORT_MAP := rte_pmd_pfe_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif_lib.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif.c - -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile deleted file mode 100644 index 0e8a67b0da..0000000000 --- a/drivers/net/qede/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_qede.a - -CFLAGS += -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_qede_version.map - -# -# OS -# -OS_TYPE := $(shell uname -s) - -# -# CFLAGS -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes -CFLAGS_BASE_DRIVER += -Wno-cast-qual -CFLAGS_BASE_DRIVER += -Wno-unused-function -CFLAGS_BASE_DRIVER += -Wno-unused-variable -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes - -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-value -ifeq ($(OS_TYPE),Linux) -ifeq ($(shell clang -Wno-shift-negative-value -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -endif -endif -endif - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -CFLAGS += -Wno-format-nonliteral -endif -CFLAGS_BASE_DRIVER += -Wno-missing-declarations -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-maybe-uninitialized -endif -CFLAGS_BASE_DRIVER += -Wno-strict-prototypes -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-visibility -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-invalid-source-encoding -CFLAGS_BASE_DRIVER += -Wno-sometimes-uninitialized -ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion -endif -else #ICC -CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant -endif - -# -# Add extra flags for base ecore driver files -# to disable warnings in them -# -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_cxt.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_l2.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sp_commands.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_fw_funcs.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_spq.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_mcp.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_int.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dcbx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += bcm_osal.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sriov.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile deleted file mode 100644 index d6a3dec350..0000000000 --- a/drivers/net/ring/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_ring_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += rte_eth_ring.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_ring.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile deleted file mode 100644 index 20bf343814..0000000000 --- a/drivers/net/sfc/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright(c) 2019-2020 Xilinx, Inc. -# Copyright(c) 2016-2019 Solarflare Communications Inc. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_sfc_efx.a - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by rte_eth_link to uint64_t casts -CFLAGS += -Wno-strict-aliasing - -# Enable extra warnings -CFLAGS += -Wextra - -# More warnings not enabled by above aggregators -CFLAGS += -Wdisabled-optimization - -# Extra CFLAGS for base driver files -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -# Compiler and version dependent flags -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wnested-externs -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wbad-function-cast -CFLAGS_BASE_DRIVER += -Wno-empty-body -else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -# Suppress ICC false positive warning on 'bulk' may be used before its -# value is set -CFLAGS_sfc_ef10_tx.o += -diag-disable 3656 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_pci - -# -# List of base driver object files for which -# special CFLAGS above should be applied -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), \ - $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -EXPORT_MAP := rte_pmd_sfc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_kvargs.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_dp.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_essb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_tx.c - -VPATH += $(SRCDIR)/base - -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_bootcfg.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_crc32.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_lic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tunnel.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += mcdi_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_image.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += hunt_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford2_nic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile deleted file mode 100644 index dabbe13a5f..0000000000 --- a/drivers/net/softnic/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_softnic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_pipeline -lrte_port -lrte_table -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_softnic_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_swq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_link.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_softnic.h - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info Softnic PMD can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -include $(RTE_SDK)/mk/rte.lib.mk - -endif diff --git a/drivers/net/szedata2/Makefile b/drivers/net/szedata2/Makefile deleted file mode 100644 index 675d0938a2..0000000000 --- a/drivers/net/szedata2/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 CESNET - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_szedata2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lsze2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_szedata2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += rte_eth_szedata2.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile deleted file mode 100644 index cbf87af401..0000000000 --- a/drivers/net/tap/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_tap.a - -EXPORT_MAP := rte_pmd_tap_version.map - -# -# TAP_MAX_QUEUES must be a power of 2 -# -ifeq ($(TAP_MAX_QUEUES),) - TAP_MAX_QUEUES = 16 -endif -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += -I. -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_vdev -lrte_gso - -CFLAGS += -DTAP_MAX_QUEUES=$(TAP_MAX_QUEUES) - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += rte_eth_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_netlink.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_tcmsgs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_bpf_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_intr.c - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up tap_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -tap_autoconf.h.new: FORCE - -tap_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_TC_FLOWER \ - linux/pkt_cls.h \ - enum TCA_FLOWER_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_VLAN_ID \ - linux/pkt_cls.h \ - enum TCA_FLOWER_KEY_VLAN_PRIO \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF \ - linux/pkt_cls.h \ - enum TCA_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF_FD \ - linux/pkt_cls.h \ - enum TCA_BPF_FD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF_FD \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_FD \ - $(AUTOCONF_OUTPUT) - -# Create tap_autoconf.h or update it in case it differs from the new one. - -tap_autoconf.h: tap_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP):.c=.o): tap_autoconf.h - -clean_tap: FORCE - $Q rm -f -- tap_autoconf.h tap_autoconf.h.new - -clean: clean_tap diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile deleted file mode 100644 index 149638a499..0000000000 --- a/drivers/net/thunderx/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_thunderx_nicvf.a - -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_thunderx_version.map - -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_bsvf.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_svf.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_nicvf_rxtx.o += -fno-prefetch-loop-arrays -endif -CFLAGS_nicvf_rxtx.o += -Ofast - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vdev_netvsc/Makefile b/drivers/net/vdev_netvsc/Makefile deleted file mode 100644 index 01d26fb798..0000000000 --- a/drivers/net/vdev_netvsc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Properties of the generated library. -LIB = librte_pmd_vdev_netvsc.a -EXPORT_MAP := rte_pmd_vdev_netvsc_version.map - -# Additional compilation flags. -CFLAGS += -O3 -CFLAGS += -g -CFLAGS += -Wall -Wextra -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += $(WERROR_FLAGS) - -# Dependencies. -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_net - -# Source files. -SRCS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vhost/Makefile b/drivers/net/vhost/Makefile deleted file mode 100644 index 0461e29f2c..0000000000 --- a/drivers/net/vhost/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vhost.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_vhost -LDLIBS += -lrte_bus_vdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_vhost_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += rte_eth_vhost.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_vhost.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile deleted file mode 100644 index 102b1deab8..0000000000 --- a/drivers/net/virtio/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -LDLIBS += -lrte_bus_vdev -endif - -EXPORT_MAP := rte_pmd_virtio_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c - -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_sse.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_altivec.c -else ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_neon.c -endif - -ifneq ($(FORCE_DISABLE_AVX512), y) - CC_AVX512_SUPPORT=\ - $(shell $(CC) -march=native -dM -E - </dev/null 2>&1 | \ - sed '/./{H;$$!d} ; x ; /AVX512F/!d; /AVX512BW/!d; /AVX512VL/!d' | \ - grep -q AVX512 && echo 1) -endif - -ifeq ($(CC_AVX512_SUPPORT), 1) -CFLAGS += -DCC_AVX512_SUPPORT -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_packed_avx.c - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVIRTIO_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVIRTIO_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVIRTIO_ICC_UNROLL_PRAGMA -endif -endif - -CFLAGS_virtio_rxtx_packed_avx.o += -mavx512f -mavx512bw -mavx512vl -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -CFLAGS_virtio_rxtx_packed_avx.o += -Wno-zero-length-bounds -endif -endif - -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_user.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/virtio_user_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user_ethdev.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile deleted file mode 100644 index 4390fedee0..0000000000 --- a/drivers/net/vmxnet3/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vmxnet3_uio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_vmxnet3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile deleted file mode 100644 index 80b043eb14..0000000000 --- a/drivers/raw/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# DIRS-$(<configuration>) += <directory> -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += octeontx2_ep - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile deleted file mode 100644 index 227ec4896e..0000000000 --- a/drivers/raw/dpaa2_cmdif/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_cmdif.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV)-include += rte_pmd_dpaa2_cmdif.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile deleted file mode 100644 index 7b2abdddb4..0000000000 --- a/drivers/raw/dpaa2_qdma/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_qdma.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -LDLIBS += -lrte_mempool -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_ring -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV)-include += rte_pmd_dpaa2_qdma.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile deleted file mode 100644 index 371e127f19..0000000000 --- a/drivers/raw/ifpga/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev -CFLAGS += -I$(RTE_SDK)/drivers/net/i40e -CFLAGS += -I$(RTE_SDK)/drivers/net/ipn3ke -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lpthread -LDLIBS += -lfdt -LDLIBS += -lrte_pmd_i40e -LDLIBS += -lrte_pmd_ipn3ke - -EXPORT_MAP := rte_rawdev_ifpga_version.map - -VPATH += $(SRCDIR)/base - -include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/base/Makefile b/drivers/raw/ifpga/base/Makefile deleted file mode 100644 index c5bbcbd5f8..0000000000 --- a/drivers/raw/ifpga/base/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -#SPDX-License-Identifier: BSD-3-Clause -#Copyright(c) 2010-2018 Intel Corporation - -ifneq ($(CONFIG_RTE_LIBRTE_EAL),) -OSDEP := osdep_rte -else -OSDEP := osdep_raw -endif - -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev/base/$(OSDEP) - -SRCS-y += ifpga_api.c -SRCS-y += ifpga_enumerate.c -SRCS-y += ifpga_feature_dev.c -SRCS-y += ifpga_fme.c -SRCS-y += ifpga_fme_iperf.c -SRCS-y += ifpga_fme_dperf.c -SRCS-y += ifpga_fme_error.c -SRCS-y += ifpga_port.c -SRCS-y += ifpga_port_error.c -SRCS-y += opae_hw_api.c -SRCS-y += opae_ifpga_hw_api.c -SRCS-y += opae_debug.c -SRCS-y += ifpga_fme_pr.c -SRCS-y += opae_spi.c -SRCS-y += opae_spi_transaction.c -SRCS-y += opae_intel_max10.c -SRCS-y += opae_i2c.c -SRCS-y += opae_at24_eeprom.c -SRCS-y += opae_eth_group.c - -SRCS-y += $(wildcard $(SRCDIR)/base/$(OSDEP)/*.c) diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile deleted file mode 100644 index 1609fe5e6c..0000000000 --- a/drivers/raw/ioat/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_ioat.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_rawdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_rawdev_ioat_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev_test.c - -# export include files -SYMLINK-y-include += rte_ioat_rawdev.h -SYMLINK-y-include += rte_ioat_spec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ntb/Makefile b/drivers/raw/ntb/Makefile deleted file mode 100644 index 8f0bff9b02..0000000000 --- a/drivers/raw/ntb/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ntb.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_rawdev - -EXPORT_MAP := rte_rawdev_ntb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb_hw_intel.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV)-include := rte_pmd_ntb.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_dma/Makefile b/drivers/raw/octeontx2_dma/Makefile deleted file mode 100644 index c64ca3497a..0000000000 --- a/drivers/raw/octeontx2_dma/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_octeontx2_dma.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_dma/ -LDLIBS += -lrte_eal -lrte_rawdev -lrte_bus_pci -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_mempool - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_dma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_ep/Makefile b/drivers/raw/octeontx2_ep/Makefile deleted file mode 100644 index 1a54bf56f0..0000000000 --- a/drivers/raw/octeontx2_ep/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_rawdev_octeontx2_ep.a - -# Build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_ep/ - -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mempool -LDLIBS += -lrte_common_octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_ep_version.map - -# -# All source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_enqdeq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_test.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_vf.c - - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile deleted file mode 100644 index 2ac66fbd45..0000000000 --- a/drivers/raw/skeleton/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_skeleton.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -EXPORT_MAP := rte_rawdev_skeleton_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/regex/Makefile b/drivers/regex/Makefile deleted file mode 100644 index 906b20546f..0000000000 --- a/drivers/regex/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/regex/mlx5/Makefile b/drivers/regex/mlx5/Makefile deleted file mode 100644 index 11e3325feb..0000000000 --- a/drivers/regex/mlx5/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_regex.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_rxp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_devx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_control.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_fastpath.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_regexdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_regex_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile deleted file mode 100644 index 6e8835948e..0000000000 --- a/drivers/vdpa/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc -endif - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/vdpa/ifc/Makefile b/drivers/vdpa/ifc/Makefile deleted file mode 100644 index b468bfdbdd..0000000000 --- a/drivers/vdpa/ifc/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ifc.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci -LDLIBS += -lrte_kvargs - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ifc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile deleted file mode 100644 index d46699fbc9..0000000000 --- a/drivers/vdpa/mlx5/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_vdpa.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_mem.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_event.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_virtq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_steer.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_lm.c - - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5_vdpa -CFLAGS += -I$(RTE_SDK)/lib/librte_sched -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lrte_eal -lrte_vhost -lrte_kvargs -lrte_pci -lrte_sched -LDLIBS += -pthread - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_vdpa_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/examples/Makefile b/examples/Makefile deleted file mode 100644 index b7e99a2f78..0000000000 --- a/examples/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 6WIND S.A. - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond -DIRS-y += cmdline -ifeq ($(CONFIG_RTE_LIBRTE_POWER),y) -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor -endif -DIRS-y += ethtool -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify -DIRS-y += flow_filtering -DIRS-y += helloworld -ifeq ($(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += ip_pipeline -ifeq ($(CONFIG_RTE_LIBRTE_LPM),y) -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_reassembly -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_fragmentation -endif -ifeq ($(CONFIG_RTE_LIBRTE_ACL)$(CONFIG_RTE_LIBRTE_HASH)$(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_SECURITY),yyyy) -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += ipsec-secgw -endif -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += ipv4_multicast -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni -DIRS-y += l2fwd -DIRS-y += l2fwd-event -ifneq ($(PQOS_INSTALL_PATH),) -DIRS-y += l2fwd-cat -endif -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += l2fwd-crypto -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += l2fwd-jobstats -DIRS-y += l2fwd-keepalive -DIRS-y += l2fwd-keepalive/ka-agent -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += l3fwd -endif -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl -ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy) -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power -endif -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH),y) -DIRS-y += l3fwd-graph -endif -DIRS-y += link_status_interrupt -DIRS-y += multi_process -DIRS-y += ntb -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -DIRS-y += performance-thread -endif -DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient -DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched -DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks -DIRS-y += service_cores -DIRS-y += skeleton -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination -endif -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vdpa vhost_blk -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto -endif -DIRS-y += vmdq -DIRS-y += vmdq_dcb -ifeq ($(CONFIG_RTE_LIBRTE_POWER), y) -ifeq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -DIRS-y += vm_power_manager -else -$(info vm_power_manager requires libvirt >= 0.9.3) -endif -endif - -DIRS-y += eventdev_pipeline - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile deleted file mode 100644 index d3b97bb50b..0000000000 --- a/examples/ethtool/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -else - -DIRS-y += lib ethtool-app -endif - -DEPDIRS-ethtool-app := lib - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile deleted file mode 100644 index 20ac0d3240..0000000000 --- a/examples/ethtool/ethtool-app/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = ethtool - -# all source are stored in SRCS-y -SRCS-y := main.c ethapp.c - -CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib -LDLIBS += -lrte_ethtool - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif -endif - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile deleted file mode 100644 index 6494741270..0000000000 --- a/examples/ethtool/lib/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -# library name -LIB = librte_ethtool.a - -LIBABIVER := 0.1 - -# all source are stored in SRC-Y -SRCS-y := rte_ethtool.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif -endif -LDLIBS += -lrte_eal -lrte_ethdev - -include $(RTE_SDK)/mk/rte.extlib.mk diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile deleted file mode 100644 index 8d5061b178..0000000000 --- a/examples/l2fwd-keepalive/ka-agent/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = ka-agent - -# all source are stored in SRCS-y -SRCS-y := main.c - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../ -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile deleted file mode 100644 index 7f7e68d912..0000000000 --- a/examples/multi_process/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile deleted file mode 100644 index fe7a8af605..0000000000 --- a/examples/multi_process/client_server_mp/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile deleted file mode 100644 index 7c447feba3..0000000000 --- a/examples/multi_process/client_server_mp/mp_client/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = mp_client - -# all source are stored in SRCS-y -SRCS-y := client.c - -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile deleted file mode 100644 index 50ebf1d7da..0000000000 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -# binary name -APP = mp_server - -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c - -INC := $(sort $(wildcard *.h)) - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared - -# for newer gcc, e.g. 4.4, no-strict-aliasing may not be necessary -# and so the next line can be removed in those cases. -EXTRA_CFLAGS += -fno-strict-aliasing - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile deleted file mode 100644 index 1fd7aa085c..0000000000 --- a/examples/multi_process/hotplug_mp/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = hotplug_mp - -# all source are stored in SRCS-y -SRCS-y := main.c commands.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile deleted file mode 100644 index f88b499bdc..0000000000 --- a/examples/multi_process/simple_mp/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = simple_mp - -# all source are stored in SRCS-y -SRCS-y := main.c mp_commands.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile deleted file mode 100644 index b7544489bb..0000000000 --- a/examples/multi_process/symmetric_mp/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = symmetric_mp - -# all source are stored in SRCS-y -SRCS-y := main.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/performance-thread/Makefile b/examples/performance-thread/Makefile deleted file mode 100644 index 08158914c3..0000000000 --- a/examples/performance-thread/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) $(CONFIG_RTE_ARCH_ARM64)),) -$(error This application is only supported for x86_64 and arm64 targets) -endif - -DIRS-y += l3fwd-thread -DIRS-y += pthread_shim - - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/performance-thread/common/common.mk b/examples/performance-thread/common/common.mk deleted file mode 100644 index 5e2b18a9ff..0000000000 --- a/examples/performance-thread/common/common.mk +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -# list the C files belonging to the lthread subsystem, these are common to all -# lthread apps. Any makefile including this should set VPATH to include this -# directory path -# - -MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))) - -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -ARCH_PATH += $(MKFILE_PATH)/arch/x86 -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -ARCH_PATH += $(MKFILE_PATH)/arch/arm64 -endif - -VPATH := $(MKFILE_PATH) $(ARCH_PATH) - -SRCS-y += lthread.c lthread_sched.c lthread_cond.c lthread_tls.c lthread_mutex.c lthread_diag.c ctx.c - -INCLUDES += -I$(MKFILE_PATH) -I$(ARCH_PATH) diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile deleted file mode 100644 index c6cf05a438..0000000000 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = l3fwd-thread - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/examples/performance-thread/common/common.mk - -CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/performance-thread/pthread_shim/Makefile b/examples/performance-thread/pthread_shim/Makefile deleted file mode 100644 index cdadf2cb77..0000000000 --- a/examples/performance-thread/pthread_shim/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = lthread_pthread_shim - -# all source are stored in SRCS-y -SRCS-y := main.c pthread_shim.c -INCLUDES := -I$(RTE_SDK)/$(RTE_TARGET)/include -I$(SRCDIR) -include $(RTE_SDK)/examples/performance-thread/common/common.mk - -CFLAGS += -g -O3 $(USER_FLAGS) $(INCLUDES) -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -LDFLAGS += -lpthread - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile deleted file mode 100644 index cc2ea8b566..0000000000 --- a/examples/server_node_efd/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/server_node_efd/node/Makefile b/examples/server_node_efd/node/Makefile deleted file mode 100644 index ecc551e1d6..0000000000 --- a/examples/server_node_efd/node/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = node - -# all source are stored in SRCS-y -SRCS-y := node.c - -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile deleted file mode 100644 index acbd12ae23..0000000000 --- a/examples/server_node_efd/server/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -# binary name -APP = server - -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c - -INC := $(sort $(wildcard *.h)) - -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile deleted file mode 100644 index 65c2ad179e..0000000000 --- a/examples/vm_power_manager/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -$(error vm_power_manager requires libvirt >= 0.9.3) -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = vm_power_mgr - -# all source are stored in SRCS-y -SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c -SRCS-y += channel_monitor.c parse.c -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -SRCS-y += oob_monitor_x86.c -else -SRCS-y += oob_monitor_nop.c -endif - -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -LDLIBS += -lvirt - -JANSSON := $(shell pkg-config --exists jansson; echo $$?) -ifeq ($(JANSSON), 0) -LDLIBS += $(shell pkg-config --libs jansson) -CFLAGS += -DUSE_JANSSON -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif - -endif - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # libvirt check diff --git a/examples/vm_power_manager/guest_cli/Makefile b/examples/vm_power_manager/guest_cli/Makefile deleted file mode 100644 index 67cf081936..0000000000 --- a/examples/vm_power_manager/guest_cli/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = guest_vm_power_mgr - -# all source are stored in SRCS-y -SRCS-y := main.c vm_power_cli_guest.c parse.c - -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/kernel/Makefile b/kernel/Makefile deleted file mode 100644 index 5d51fd94bb..0000000000 --- a/kernel/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/Makefile b/kernel/freebsd/Makefile deleted file mode 100644 index 522d3f68ff..0000000000 --- a/kernel/freebsd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += contigmem -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += nic_uio - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/contigmem/Makefile b/kernel/freebsd/contigmem/Makefile deleted file mode 100644 index 428a7edee5..0000000000 --- a/kernel/freebsd/contigmem/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = contigmem - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := contigmem.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/freebsd/nic_uio/Makefile b/kernel/freebsd/nic_uio/Makefile deleted file mode 100644 index 376ef3a3ab..0000000000 --- a/kernel/freebsd/nic_uio/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = nic_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := nic_uio.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/linux/Makefile b/kernel/linux/Makefile deleted file mode 100644 index c2c45a3e67..0000000000 --- a/kernel/linux/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EAL_IGB_UIO) += igb_uio -DIRS-$(CONFIG_RTE_KNI_KMOD) += kni - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/linux/igb_uio/Makefile b/kernel/linux/igb_uio/Makefile deleted file mode 100644 index f83bcc7c69..0000000000 --- a/kernel/linux/igb_uio/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = igb_uio -MODULE_PATH = drivers/net/igb_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=100 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := igb_uio.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile deleted file mode 100644 index 595bac2612..0000000000 --- a/kernel/linux/kni/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = rte_kni - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -MODULE_CFLAGS += -Wall -Werror - --include /etc/lsb-release - -ifeq ($(DISTRIB_ID),Ubuntu) -MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE)) -UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \ - | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1) -MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))" -endif - -# -# all source are stored in SRCS-y -# -SRCS-y := kni_misc.c -SRCS-y += kni_net.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/lib/Makefile b/lib/Makefile deleted file mode 100644 index 8f5b68a2d4..0000000000 --- a/lib/Makefile +++ /dev/null @@ -1,138 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DIRS-y += librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal -DEPDIRS-librte_eal := librte_kvargs librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci -DEPDIRS-librte_pci := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring -DEPDIRS-librte_ring := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_STACK) += librte_stack -DEPDIRS-librte_stack := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += librte_mempool -DEPDIRS-librte_mempool := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf -DEPDIRS-librte_mbuf := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer -DEPDIRS-librte_timer := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile -DEPDIRS-librte_cfgfile := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline -DEPDIRS-librte_cmdline := librte_eal librte_net -DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev -DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring -DEPDIRS-librte_ethdev += librte_mbuf -DEPDIRS-librte_ethdev += librte_kvargs -DEPDIRS-librte_ethdev += librte_meter -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev -DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev -DEPDIRS-librte_cryptodev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_cryptodev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_SECURITY) += librte_security -DEPDIRS-librte_security := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_security += librte_ethdev -DEPDIRS-librte_security += librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += librte_compressdev -DEPDIRS-librte_compressdev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_compressdev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += librte_regexdev -DEPDIRS-librte_regexdev := librte_eal librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += librte_eventdev -DEPDIRS-librte_eventdev := librte_eal librte_ring librte_ethdev librte_hash \ - librte_mempool librte_timer librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += librte_rawdev -DEPDIRS-librte_rawdev := librte_eal librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost -DEPDIRS-librte_vhost := librte_eal librte_mempool librte_mbuf librte_ethdev \ - librte_net librte_hash librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash -DEPDIRS-librte_hash := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += librte_efd -DEPDIRS-librte_efd := librte_eal librte_ring librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RIB) += librte_rib -DEPDIRS-librte_rib := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += librte_fib -DEPDIRS-librte_fib := librte_eal librte_rib -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm -DEPDIRS-librte_lpm := librte_eal librte_hash librte_rcu -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl -DEPDIRS-librte_acl := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMBER) += librte_member -DEPDIRS-librte_member := librte_eal librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_NET) += librte_net -DEPDIRS-librte_net := librte_mbuf librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += librte_ip_frag -DEPDIRS-librte_ip_frag := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_ip_frag += librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_GRO) += librte_gro -DEPDIRS-librte_gro := librte_eal librte_mbuf librte_ethdev librte_net -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += librte_jobstats -DEPDIRS-librte_jobstats := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_METRICS) += librte_metrics -DEPDIRS-librte_metrics := librte_eal librte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -DEPDIRS-librte_metrics += librte_telemetry -endif -DIRS-$(CONFIG_RTE_LIBRTE_BITRATE) += librte_bitratestats -DEPDIRS-librte_bitratestats := librte_eal librte_metrics librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += librte_latencystats -DEPDIRS-librte_latencystats := librte_eal librte_metrics librte_ethdev librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += librte_power -DEPDIRS-librte_power := librte_eal librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_METER) += librte_meter -DEPDIRS-librte_meter := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += librte_flow_classify -DEPDIRS-librte_flow_classify := librte_net librte_table librte_acl -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched -DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net -DEPDIRS-librte_sched += librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor -DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port -DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_port += librte_ip_frag librte_sched librte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DEPDIRS-librte_port += librte_kni -endif -DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table -DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_table += librte_port librte_lpm librte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -DEPDIRS-librte_table += librte_acl -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline -DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_pipeline += librte_table librte_port -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder -DEPDIRS-librte_reorder := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += librte_pdump -DEPDIRS-librte_pdump := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_GSO) += librte_gso -DEPDIRS-librte_gso := librte_eal librte_mbuf librte_ethdev librte_net -DEPDIRS-librte_gso += librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_BPF) += librte_bpf -DEPDIRS-librte_bpf := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += librte_ipsec -DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security \ - librte_net librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RCU) += librte_rcu -DEPDIRS-librte_rcu := librte_eal librte_ring - -DIRS-$(CONFIG_RTE_LIBRTE_GRAPH) += librte_graph -DEPDIRS-librte_graph := librte_eal - -DIRS-$(CONFIG_RTE_LIBRTE_NODE) += librte_node -DEPDIRS-librte_node := librte_graph librte_lpm librte_ethdev librte_mbuf - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni -endif -DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_kni += librte_pci - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile deleted file mode 100644 index f4332b0448..0000000000 --- a/lib/librte_acl/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_acl.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_acl_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += tb_mem.c - -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += rte_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_bld.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_gen.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c -CFLAGS_acl_run_neon.o += -flax-vector-conversions -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_acl_run_neon.o += -Wno-maybe-uninitialized -endif -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c -endif - -# -# If the compiler supports AVX2 instructions, -# then add support for AVX2 classify method. -# - -#check if flag for AVX2 is already on, if not set it up manually -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_acl_run_avx2.o += -march=core-avx2 - else - CFLAGS_acl_run_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_avx2.c - CFLAGS_rte_acl.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include := rte_acl_osdep.h -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include += rte_acl.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bbdev/Makefile b/lib/librte_bbdev/Makefile deleted file mode 100644 index 9d7576b358..0000000000 --- a/lib/librte_bbdev/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bbdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -# library source files -SRCS-y += rte_bbdev.c - -# export include files -SYMLINK-y-include += rte_bbdev_op.h -SYMLINK-y-include += rte_bbdev.h -SYMLINK-y-include += rte_bbdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_bbdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bitratestats/Makefile b/lib/librte_bitratestats/Makefile deleted file mode 100644 index 4862c44b83..0000000000 --- a/lib/librte_bitratestats/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bitratestats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev - -EXPORT_MAP := rte_bitratestats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) := rte_bitrate.c - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_BITRATE)-include += rte_bitrate.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bpf/Makefile b/lib/librte_bpf/Makefile deleted file mode 100644 index 3be6750432..0000000000 --- a/lib/librte_bpf/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bpf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_net -lrte_eal -LDLIBS += -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -LDLIBS += -lelf -endif - -EXPORT_MAP := rte_bpf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_exec.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_pkt.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_validate.c -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load_elf.c -endif -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_arm64.c -endif - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += bpf_def.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf_ethdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile deleted file mode 100644 index 7c10a4e56c..0000000000 --- a/lib/librte_cfgfile/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_cfgfile.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(SRCDIR)/../librte_eal/include -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_cfgfile_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CFGFILE) += rte_cfgfile.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_CFGFILE)-include += rte_cfgfile.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile deleted file mode 100644 index 619d9a2426..0000000000 --- a/lib/librte_cmdline/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cmdline.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -EXPORT_MAP := rte_cmdline_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_rdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c - -LDLIBS += -lrte_net -lrte_eal - -# install includes -INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h -INCS += cmdline_parse_etheraddr.h cmdline_parse_string.h cmdline_rdline.h -INCS += cmdline_vt100.h cmdline_socket.h cmdline_cirbuf.h cmdline_parse_portlist.h -SYMLINK-$(CONFIG_RTE_LIBRTE_CMDLINE)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_compressdev/Makefile b/lib/librte_compressdev/Makefile deleted file mode 100644 index 53679d69b8..0000000000 --- a/lib/librte_compressdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_compressdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_kvargs - -# library source files -SRCS-y += rte_compressdev.c rte_compressdev_pmd.c rte_comp.c - -# export include files -SYMLINK-y-include += rte_comp.h -SYMLINK-y-include += rte_compressdev.h -# export include files (for PMDs) -SYMLINK-y-include += rte_compressdev_pmd.h -SYMLINK-y-include += rte_compressdev_internal.h - -# versioning export map -EXPORT_MAP := rte_compressdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile deleted file mode 100644 index 73e77a27c6..0000000000 --- a/lib/librte_cryptodev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cryptodev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_kvargs - -# library source files -SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c - -# export include files -SYMLINK-y-include += rte_crypto.h -SYMLINK-y-include += rte_crypto_asym.h -SYMLINK-y-include += rte_crypto_sym.h -SYMLINK-y-include += rte_cryptodev.h -SYMLINK-y-include += rte_cryptodev_pmd.h -SYMLINK-y-include += rte_cryptodev_trace.h -SYMLINK-y-include += rte_cryptodev_trace_fp.h - -# versioning export map -EXPORT_MAP := rte_cryptodev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile deleted file mode 100644 index fc32fb3a8f..0000000000 --- a/lib/librte_distributor/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_distributor.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_distributor_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c -else -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_generic.c -endif - - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR)-include := rte_distributor.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile deleted file mode 100644 index 2fda40d230..0000000000 --- a/lib/librte_eal/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += include -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DEPDIRS-linux := include -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd -DEPDIRS-freebsd := include - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile deleted file mode 100644 index 9a89556742..0000000000 --- a/lib/librte_eal/freebsd/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lexecinfo -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry - -EXPORT_MAP := ../rte_eal_version.map - -# specific to freebsd exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -CFLAGS_eal_hpet.o += -Wno-return-type -endif - -INC := rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/include/Makefile b/lib/librte_eal/include/Makefile deleted file mode 100644 index eb99190d10..0000000000 --- a/lib/librte_eal/include/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := \ - $(sort $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/*.h))) - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include/generic := \ - $(sort $(addprefix generic/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/generic/*.h)))) - -ARCH_DIR ?= $(RTE_ARCH) -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \ - $(sort $(addprefix ../$(ARCH_DIR)/include/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include/*.h)))) - -include $(RTE_SDK)/mk/rte.install.mk diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile deleted file mode 100644 index 9939b3d147..0000000000 --- a/lib/librte_eal/linux/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -ldl -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrt -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry -ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) -LDLIBS += -lnuma -endif - -EXPORT_MAP := ../rte_eal_version.map - -# specific to linux exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio_mp_sync.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dynmem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -endif - -INC := rte_kni_common.h -INC += rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_efd/Makefile b/lib/librte_efd/Makefile deleted file mode 100644 index 2dc97132e0..0000000000 --- a/lib/librte_efd/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_efd.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring -lrte_hash - -EXPORT_MAP := rte_efd_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_EFD) := rte_efd.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_EFD)-include := rte_efd.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile deleted file mode 100644 index 47747150b2..0000000000 --- a/lib/librte_ethdev/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_ethdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_kvargs -lrte_meter -lrte_telemetry - -EXPORT_MAP := rte_ethdev_version.map - -SRCS-y += ethdev_private.c -SRCS-y += rte_ethdev.c -SRCS-y += rte_class_eth.c -SRCS-y += rte_flow.c -SRCS-y += rte_tm.c -SRCS-y += rte_mtr.c -SRCS-y += ethdev_profile.c -SRCS-y += ethdev_trace_points.c - -# -# Export include files -# -SYMLINK-y-include += rte_ethdev.h -SYMLINK-y-include += rte_ethdev_driver.h -SYMLINK-y-include += rte_ethdev_core.h -SYMLINK-y-include += rte_ethdev_pci.h -SYMLINK-y-include += rte_ethdev_trace.h -SYMLINK-y-include += rte_ethdev_trace_fp.h -SYMLINK-y-include += rte_ethdev_vdev.h -SYMLINK-y-include += rte_eth_ctrl.h -SYMLINK-y-include += rte_dev_info.h -SYMLINK-y-include += rte_flow.h -SYMLINK-y-include += rte_flow_driver.h -SYMLINK-y-include += rte_tm.h -SYMLINK-y-include += rte_tm_driver.h -SYMLINK-y-include += rte_mtr.h -SYMLINK-y-include += rte_mtr_driver.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile deleted file mode 100644 index 0715256bb4..0000000000 --- a/lib/librte_eventdev/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_eventdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif -LDLIBS += -lrte_eal -lrte_ring -lrte_ethdev -lrte_hash -lrte_mempool -lrte_timer -LDLIBS += -lrte_mbuf -lrte_cryptodev -lpthread - -# library source files -SRCS-y += rte_eventdev.c -SRCS-y += rte_event_ring.c -SRCS-y += eventdev_trace_points.c -SRCS-y += rte_event_eth_rx_adapter.c -SRCS-y += rte_event_timer_adapter.c -SRCS-y += rte_event_crypto_adapter.c -SRCS-y += rte_event_eth_tx_adapter.c - -# export include files -SYMLINK-y-include += rte_eventdev.h -SYMLINK-y-include += rte_eventdev_pmd.h -SYMLINK-y-include += rte_eventdev_pmd_pci.h -SYMLINK-y-include += rte_eventdev_pmd_vdev.h -SYMLINK-y-include += rte_eventdev_trace.h -SYMLINK-y-include += rte_eventdev_trace_fp.h -SYMLINK-y-include += rte_event_ring.h -SYMLINK-y-include += rte_event_eth_rx_adapter.h -SYMLINK-y-include += rte_event_timer_adapter.h -SYMLINK-y-include += rte_event_timer_adapter_pmd.h -SYMLINK-y-include += rte_event_crypto_adapter.h -SYMLINK-y-include += rte_event_eth_tx_adapter.h - -# versioning export map -EXPORT_MAP := rte_eventdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_fib/Makefile b/lib/librte_fib/Makefile deleted file mode 100644 index 1dd2a495b1..0000000000 --- a/lib/librte_fib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_fib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_rib - -EXPORT_MAP := rte_fib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FIB) := rte_fib.c rte_fib6.c dir24_8.c trie.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FIB)-include := rte_fib.h rte_fib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_flow_classify/Makefile b/lib/librte_flow_classify/Makefile deleted file mode 100644 index ca3cae82dd..0000000000 --- a/lib/librte_flow_classify/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_flow_classify.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) - -EXPORT_MAP := rte_flow_classify_version.map - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_net -lrte_table -lrte_acl - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify_parse.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY)-include := rte_flow_classify.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_graph/Makefile b/lib/librte_graph/Makefile deleted file mode 100644 index b66279c675..0000000000 --- a/lib/librte_graph/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_graph.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_graph_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += node.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_populate.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph.h -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph_worker.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gro/Makefile b/lib/librte_gro/Makefile deleted file mode 100644 index e848687acd..0000000000 --- a/lib/librte_gro/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gro.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net - -EXPORT_MAP := rte_gro_version.map - -# source files -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += rte_gro.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_vxlan_tcp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GRO)-include += rte_gro.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile deleted file mode 100644 index a34846e920..0000000000 --- a/lib/librte_gso/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gso.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_gso_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile deleted file mode 100644 index ec9f864992..0000000000 --- a/lib/librte_hash/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_hash.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_hash_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_HASH) := rte_cuckoo_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h -endif -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ip_frag/Makefile b/lib/librte_ip_frag/Makefile deleted file mode 100644 index 6b80d9f1f2..0000000000 --- a/lib/librte_ip_frag/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ip_frag.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_hash - -EXPORT_MAP := rte_ip_frag_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ip_frag_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += ip_frag_internal.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IP_FRAG)-include += rte_ip_frag.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ipsec/Makefile b/lib/librte_ipsec/Makefile deleted file mode 100644 index e4c69646b0..0000000000 --- a/lib/librte_ipsec/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ipsec.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_cryptodev -lrte_security -lrte_hash - -EXPORT_MAP := rte_ipsec_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_inb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_outb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += sa.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ses.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ipsec_sad.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_group.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sa.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_jobstats/Makefile b/lib/librte_jobstats/Makefile deleted file mode 100644 index b30d046829..0000000000 --- a/lib/librte_jobstats/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_jobstats.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_jobstats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_JOBSTATS) := rte_jobstats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_JOBSTATS)-include := rte_jobstats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile deleted file mode 100644 index 9d440aa135..0000000000 --- a/lib/librte_kni/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kni.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_kni_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KNI) := rte_kni.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_KNI)-include := rte_kni.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile deleted file mode 100644 index 24b1c3c5b9..0000000000 --- a/lib/librte_kvargs/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kvargs.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_kvargs_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c - -# install includes -INCS := rte_kvargs.h -SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_latencystats/Makefile b/lib/librte_latencystats/Makefile deleted file mode 100644 index b19e0b1788..0000000000 --- a/lib/librte_latencystats/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_latencystats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lm -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev -lrte_mbuf - -EXPORT_MAP := rte_latencystats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) := rte_latencystats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LATENCY_STATS)-include := rte_latencystats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile deleted file mode 100644 index 6f06c5c034..0000000000 --- a/lib/librte_lpm/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_lpm.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_hash -lrte_rcu - -EXPORT_MAP := rte_lpm_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LPM) := rte_lpm.c rte_lpm6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include := rte_lpm.h rte_lpm6.h - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile deleted file mode 100644 index 41ea5496e3..0000000000 --- a/lib/librte_mbuf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mbuf.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_mbuf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c rte_mbuf_pool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) += rte_mbuf_dyn.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_ptype.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_pool_ops.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_dyn.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_member/Makefile b/lib/librte_member/Makefile deleted file mode 100644 index ef9e2faeaf..0000000000 --- a/lib/librte_member/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_member.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_hash - -EXPORT_MAP := rte_member_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += rte_member.c rte_member_ht.c rte_member_vbf.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMBER)-include := rte_member.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile deleted file mode 100644 index 432d6217ec..0000000000 --- a/lib/librte_mempool/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mempool.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_mempool_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops_default.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += mempool_trace_points.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace_fp.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile deleted file mode 100644 index 48366e82b0..0000000000 --- a/lib/librte_meter/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_meter.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_meter_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_METER) := rte_meter.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_METER)-include := rte_meter.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_metrics/Makefile b/lib/librte_metrics/Makefile deleted file mode 100644 index 1264d3bbb0..0000000000 --- a/lib/librte_metrics/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_metrics.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_metrics_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) := rte_metrics.c - -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -SRCS-y += rte_metrics_telemetry.c -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics_telemetry.h - -LDLIBS += -lrte_ethdev -lrte_telemetry -LDLIBS += -ljansson - -CFLAGS += -I$(RTE_SDK)/lib/librte_telemetry/ -endif - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile deleted file mode 100644 index 9830e771b3..0000000000 --- a/lib/librte_net/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_net.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_mbuf -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_net_version.map -SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h rte_higig.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_gtp.h rte_vxlan.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ecpri.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_node/Makefile b/lib/librte_node/Makefile deleted file mode 100644 index 3ec02104d3..0000000000 --- a/lib/librte_node/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_node.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_graph -lrte_mbuf -lrte_lpm -lrte_ethdev -lrte_mempool - -EXPORT_MAP := rte_node_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += null.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += log.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_ctrl.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_lookup.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_rewrite.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_cls.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_drop.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_ip4_api.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_eth_api.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pci/Makefile b/lib/librte_pci/Makefile deleted file mode 100644 index 7943f30cab..0000000000 --- a/lib/librte_pci/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pci.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_pci_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PCI) += rte_pci.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI)-include += rte_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile deleted file mode 100644 index ece8aaacc1..0000000000 --- a/lib/librte_pdump/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pdump.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_pdump_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) := rte_pdump.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PDUMP)-include := rte_pdump.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile deleted file mode 100644 index cfbbd18282..0000000000 --- a/lib/librte_pipeline/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pipeline.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table -LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev - -EXPORT_MAP := rte_pipeline_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := rte_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_port_in_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_table_action.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PIPELINE)-include += rte_pipeline.h rte_port_in_action.h rte_table_action.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile deleted file mode 100644 index 57d2aedbc5..0000000000 --- a/lib/librte_port/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_port.a -ifeq ($(CONFIG_RTE_PORT_PCAP),y) -LDLIBS += -lpcap -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_ip_frag -lrte_sched -lrte_cryptodev -lrte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -LDLIBS += -lrte_kni -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_port_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ring.c -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_frag.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ras.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_fd.c -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_kni.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_source_sink.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sym_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_eventdev.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ring.h -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_frag.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ras.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sched.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_fd.h -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_kni.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_source_sink.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sym_crypto.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_eventdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile deleted file mode 100644 index 3b067b615f..0000000000 --- a/lib/librte_power/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_power.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_timer - -EXPORT_MAP := rte_power_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c power_acpi_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_kvm_vm.c guest_channel.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += rte_power_empty_poll.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_pstate_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_common.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_POWER)-include := rte_power.h rte_power_empty_poll.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rawdev/Makefile b/lib/librte_rawdev/Makefile deleted file mode 100644 index 99f5d2a471..0000000000 --- a/lib/librte_rawdev/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_telemetry - -# library source files -SRCS-y += rte_rawdev.c - -# export include files -SYMLINK-y-include += rte_rawdev.h -SYMLINK-y-include += rte_rawdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_rawdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rcu/Makefile b/lib/librte_rcu/Makefile deleted file mode 100644 index 553bca2ef4..0000000000 --- a/lib/librte_rcu/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Arm Limited - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rcu.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_rcu_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RCU) := rte_rcu_qsbr.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RCU)-include := rte_rcu_qsbr.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_regexdev/Makefile b/lib/librte_regexdev/Makefile deleted file mode 100644 index c123fcaf5c..0000000000 --- a/lib/librte_regexdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_regexdev.a - -EXPORT_MAP := rte_regex_version.map - -# library version -LIBABIVER := 1 - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf - -# library source files -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REGEXDEV) := rte_regexdev.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_driver.h - -# versioning export map -EXPORT_MAP := rte_regexdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_reorder/Makefile b/lib/librte_reorder/Makefile deleted file mode 100644 index 1914411d52..0000000000 --- a/lib/librte_reorder/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_reorder.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -EXPORT_MAP := rte_reorder_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) := rte_reorder.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_REORDER)-include := rte_reorder.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rib/Makefile b/lib/librte_rib/Makefile deleted file mode 100644 index be80ce5d3f..0000000000 --- a/lib/librte_rib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_rib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RIB) := rte_rib.c rte_rib6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_RIB)-include := rte_rib.h rte_rib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile deleted file mode 100644 index 83a9d0840e..0000000000 --- a/lib/librte_ring/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ring.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_ring_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \ - rte_ring_core.h \ - rte_ring_elem.h \ - rte_ring_generic.h \ - rte_ring_c11_mem.h \ - rte_ring_hts.h \ - rte_ring_hts_c11_mem.h \ - rte_ring_peek.h \ - rte_ring_peek_c11_mem.h \ - rte_ring_rts.h \ - rte_ring_rts_c11_mem.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile deleted file mode 100644 index aee93a1205..0000000000 --- a/lib/librte_sched/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_sched.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrt -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_timer - -EXPORT_MAP := rte_sched_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include := rte_sched.h rte_sched_common.h rte_red.h rte_approx.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_security/Makefile b/lib/librte_security/Makefile deleted file mode 100644 index 825eaeff8e..0000000000 --- a/lib/librte_security/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_security.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool - -# library source files -SRCS-y += rte_security.c - -# export include files -SYMLINK-y-include += rte_security.h -SYMLINK-y-include += rte_security_driver.h - -# versioning export map -EXPORT_MAP := rte_security_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_stack/Makefile b/lib/librte_stack/Makefile deleted file mode 100644 index 020ef102b5..0000000000 --- a/lib/librte_stack/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_stack.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_stack_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_STACK) := rte_stack.c \ - rte_stack_std.c \ - rte_stack_lf.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_STACK)-include := rte_stack.h \ - rte_stack_std.h \ - rte_stack_lf.h \ - rte_stack_lf_generic.h \ - rte_stack_lf_c11.h \ - rte_stack_lf_stubs.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_table/Makefile b/lib/librte_table/Makefile deleted file mode 100644 index 6ad8a6b17d..0000000000 --- a/lib/librte_table/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_table.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_port -LDLIBS += -lrte_lpm -lrte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -LDLIBS += -lrte_acl -endif - -EXPORT_MAP := rte_table_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm_ipv6.c -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_acl.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_cuckoo.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key8.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key16.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key32.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_ext.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_lru.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_array.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_stub.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm_ipv6.h -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_acl.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_cuckoo.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func_arm64.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_x86.h -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_arm64.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_array.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_stub.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_telemetry/Makefile b/lib/librte_telemetry/Makefile deleted file mode 100644 index c62cbd86dc..0000000000 --- a/lib/librte_telemetry/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_telemetry.a - -ARCH_DIR ?= $(RTE_ARCH) - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -CFLAGS += -I$(RTE_SDK)/lib/librte_metrics/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include -CFLAGS += -pthread - -LDLIBS += -lpthread - -EXPORT_MAP := rte_telemetry_version.map - -# library source files -SRCS-y += telemetry.c -SRCS-y += telemetry_data.c -SRCS-y += telemetry_legacy.c - -# export include files -SYMLINK-y-include := rte_telemetry.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile deleted file mode 100644 index 7e95d120c0..0000000000 --- a/lib/librte_timer/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_timer.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_timer_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) := rte_timer.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_TIMER)-include := rte_timer.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile deleted file mode 100644 index 4f2f3e47da..0000000000 --- a/lib/librte_vhost/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_vhost.a - -EXPORT_MAP := rte_vhost_version.map - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I vhost_user -CFLAGS += -fno-strict-aliasing -LDLIBS += -lpthread - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVHOST_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVHOST_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVHOST_ICC_UNROLL_PRAGMA -endif -endif - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -LDLIBS += -lnuma -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \ - vhost_user.c virtio_net.c vdpa.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h \ - rte_vdpa_dev.h rte_vhost_async.h - -# only compile vhost crypto when cryptodev is enabled -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -LDLIBS += -lrte_cryptodev -lrte_hash -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto.c -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost_crypto.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk deleted file mode 100644 index dc8c10a24c..0000000000 --- a/mk/arch/arm/rte.vars.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -ARCH ?= arm -CROSS ?= - -CPU_CFLAGS ?= -marm -munaligned-access -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-littlearm -RTE_OBJCOPY_ARCH = arm - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk deleted file mode 100644 index a75b80c222..0000000000 --- a/mk/arch/arm64/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= arm64 -# common arch dir in eal headers -ARCH_DIR := arm -CROSS ?= - -CPU_CFLAGS ?= -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-littleaarch64 -RTE_OBJCOPY_ARCH = aarch64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk deleted file mode 100644 index c867883f15..0000000000 --- a/mk/arch/i686/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= i386 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m32 -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -melf_i386 -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-i386 -RTE_OBJCOPY_ARCH = i386 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk deleted file mode 100644 index 9f7ab22f42..0000000000 --- a/mk/arch/ppc_64/rte.vars.mk +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -ARCH ?= powerpc -ARCH_DIR := ppc -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-powerpcle -RTE_OBJCOPY_ARCH = powerpc:common64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk deleted file mode 100644 index e1689be9b4..0000000000 --- a/mk/arch/x86_64/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_x32/rte.vars.mk b/mk/arch/x86_x32/rte.vars.mk deleted file mode 100644 index c59b37a2c8..0000000000 --- a/mk/arch/x86_x32/rte.vars.mk +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -mx32 -CPU_LDFLAGS ?= -melf32_x86_64 -#CPU_ASFLAGS ?= -felf64 -# x32 is supported by Linux distribution with gcc4.8 and newer in some -# cases there is backported support in gcc4.6 -ifneq ($(shell echo | $(CC) $(CPU_CFLAGS) -E - 2>/dev/null 1>/dev/null && echo 0), 0) - $(error This version of GCC does not support x32 ABI) -endif - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp deleted file mode 120000 index 69f5cba2c2..0000000000 --- a/mk/exec-env/bsdapp +++ /dev/null @@ -1 +0,0 @@ -freebsd/ \ No newline at end of file diff --git a/mk/exec-env/freebsd/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/freebsd/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk deleted file mode 100644 index 630eb55f73..0000000000 --- a/mk/exec-env/freebsd/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/include - -EXECENV_LDFLAGS = -EXECENV_LDLIBS = -lexecinfo -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -BSDMAKE=/usr/bin/make - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS diff --git a/mk/exec-env/linux/rte.app.mk b/mk/exec-env/linux/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/linux/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk deleted file mode 100644 index 41ef4195b0..0000000000 --- a/mk/exec-env/linux/rte.vars.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/include - -EXECENV_LDLIBS = -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -# For shared libraries -EXECENV_LDFLAGS += -export-dynamic -# Add library to the group to resolve symbols -EXECENV_LDLIBS += -ldl - -# EXECENV_LDLIBS-y applies to lib.so and app linking -# while EXECENV_LDLIBS applies only to app linking. -EXECENV_LDLIBS += $(EXECENV_LDLIBS-y) - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp deleted file mode 120000 index ce5e2c77b2..0000000000 --- a/mk/exec-env/linuxapp +++ /dev/null @@ -1 +0,0 @@ -linux/ \ No newline at end of file diff --git a/mk/internal/rte.build-post.mk b/mk/internal/rte.build-post.mk deleted file mode 100644 index a6b6a9a46a..0000000000 --- a/mk/internal/rte.build-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# build helper .mk - -# fast way, no need to do prebuild and postbuild -ifeq ($(PREBUILD)$(POSTBUILD),) - -_postbuild: $(_BUILD) - @touch _postbuild - -else # slower way - -_prebuild: $(PREBUILD) - @touch _prebuild - -ifneq ($(_BUILD),) -$(_BUILD): _prebuild -else -_BUILD = _prebuild -endif - -_build: $(_BUILD) - @touch _build - -ifneq ($(POSTBUILD),) -$(POSTBUILD): _build -else -POSTBUILD = _build -endif - -_postbuild: $(POSTBUILD) - @touch _postbuild -endif \ No newline at end of file diff --git a/mk/internal/rte.build-pre.mk b/mk/internal/rte.build-pre.mk deleted file mode 100644 index 137612f19b..0000000000 --- a/mk/internal/rte.build-pre.mk +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_BUILD_TARGETS := _prebuild _build _postbuild - -comma := , -linkerprefix = $(subst -Wl$(comma)-L,-L,$(addprefix -Wl$(comma),$1)) diff --git a/mk/internal/rte.clean-post.mk b/mk/internal/rte.clean-post.mk deleted file mode 100644 index 77685edd99..0000000000 --- a/mk/internal/rte.clean-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# clean helper .mk - -# fast way, no need to do preclean and postclean -ifeq ($(PRECLEAN)$(POSTCLEAN),) - -_postclean: $(_CLEAN) - @touch _postclean - -else # slower way - -_preclean: $(PRECLEAN) - @touch _preclean - -ifneq ($(_CLEAN),) -$(_CLEAN): _preclean -else -_CLEAN = _preclean -endif - -_clean: $(_CLEAN) - @touch _clean - -ifneq ($(POSTCLEAN),) -$(POSTCLEAN): _clean -else -POSTCLEAN = _clean -endif - -_postclean: $(POSTCLEAN) - @touch _postclean -endif diff --git a/mk/internal/rte.clean-pre.mk b/mk/internal/rte.clean-pre.mk deleted file mode 100644 index e21607bff9..0000000000 --- a/mk/internal/rte.clean-pre.mk +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_CLEAN_TARGETS := _preclean _clean _postclean diff --git a/mk/internal/rte.compile-post.mk b/mk/internal/rte.compile-post.mk deleted file mode 100644 index 01525bee1b..0000000000 --- a/mk/internal/rte.compile-post.mk +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# no rule no build these files -$(DEPS-y) $(CMDS-y): diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk deleted file mode 100644 index df05b55769..0000000000 --- a/mk/internal/rte.compile-pre.mk +++ /dev/null @@ -1,164 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# Common to rte.lib.mk, rte.app.mk, rte.obj.mk -# - -SRCS-all := $(SRCS-y) $(SRCS-n) $(SRCS-) - -# convert source to obj file -src2obj = $(strip $(patsubst %.c,%.o,\ - $(patsubst %.S,%_s.o,$(1)))) - -# add a dot in front of the file name -dotfile = $(strip $(foreach f,$(1),\ - $(join $(dir $f),.$(notdir $f)))) - -# convert source/obj files into dot-dep filename (does not -# include .S files) -src2dep = $(strip $(call dotfile,$(patsubst %.c,%.o.d, \ - $(patsubst %.S,,$(1))))) -obj2dep = $(strip $(call dotfile,$(patsubst %.o,%.o.d,$(1)))) - -# convert source/obj files into dot-cmd filename -src2cmd = $(strip $(call dotfile,$(patsubst %.c,%.o.cmd, \ - $(patsubst %.S,%_s.o.cmd,$(1))))) -obj2cmd = $(strip $(call dotfile,$(patsubst %.o,%.o.cmd,$(1)))) - -OBJS-y := $(call src2obj,$(SRCS-y)) -OBJS-n := $(call src2obj,$(SRCS-n)) -OBJS- := $(call src2obj,$(SRCS-)) -OBJS-all := $(filter-out $(SRCS-all),$(OBJS-y) $(OBJS-n) $(OBJS-)) - -DEPS-y := $(call src2dep,$(SRCS-y)) -DEPS-n := $(call src2dep,$(SRCS-n)) -DEPS- := $(call src2dep,$(SRCS-)) -DEPS-all := $(DEPS-y) $(DEPS-n) $(DEPS-) -DEPSTMP-all := $(DEPS-all:%.d=%.d.tmp) - -CMDS-y := $(call src2cmd,$(SRCS-y)) -CMDS-n := $(call src2cmd,$(SRCS-n)) -CMDS- := $(call src2cmd,$(SRCS-)) -CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-) - --include $(DEPS-y) $(CMDS-y) - -# command to compile a .c file to generate an object -ifeq ($(USE_HOST),1) -C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \ - $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)") -else -C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \ - $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)") -endif -CHECK_SYMBOLS_SCRIPT = $(RTE_SDK)/buildtools/check-symbols.sh -CHECK_SYMBOLS = $(CHECK_SYMBOLS_SCRIPT) $(SRCDIR)/$(EXPORT_MAP) $@ - -PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c -PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c -PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@ -PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \ - echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ - $(PMDINFO_GEN) && \ - echo "$(if $V,$(PMDINFO_CC), CC $@.pmd.o)" && \ - $(PMDINFO_CC) && \ - echo "$(if $V,$(PMDINFO_LD), LD $@)" && \ - $(PMDINFO_LD) && \ - mv -f $@.o $@; fi -C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)' -C_TO_O_DO = @set -e; \ - echo $(C_TO_O_DISP); \ - $(C_TO_O) && \ - $(PMDINFO_TO_O) && \ - $(CHECK_SYMBOLS) && \ - echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \ - sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \ - rm -f $(call obj2dep,$(@)).tmp - -# return an empty string if string are equal -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -# return a non-empty string if the dst file does not exist -file_missing = $(call compare,$(wildcard $@),$@) - -# return a non-empty string if cmdline changed -cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1))) - -# return a non-empty string if a dependency file does not exist -depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@)) - -# return an empty string if no prereq is newer than target -# - $^ -> names of all the prerequisites -# - $(wildcard $^) -> every existing prereq -# - $(filter-out $(wildcard $^),$^) -> every prereq that don't -# exist (filter-out removes existing ones from the list) -# - $? -> names of all the prerequisites newer than target -depfile_newer = $(strip $(filter-out FORCE,$? \ - $(filter-out $(wildcard $^),$^))) - -# return 1 if parameter is a non-empty string, else 0 -boolean = $(if $1,1,0) - -# -# Compile .c file if needed -# Note: dep_$$@ is from the .d file and DEP_$$@ can be specified by -# user (by default it is empty) -# -.SECONDEXPANSION: -%.o: %.c $$(wildcard $$(dep_$$@)) $$(DEP_$$(@)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer))") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(C_TO_O)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(C_TO_O_DO)) - -# command to assemble a .S file to generate an object -ifeq ($(USE_HOST),1) -S_TO_O = $(CPP) $(HOST_CPPFLAGS) $($(@)_CPPFLAGS) $(HOST_EXTRA_CPPFLAGS) $< $(@).tmp && \ - $(HOSTAS) $(HOST_ASFLAGS) $($(@)_ASFLAGS) $(HOST_EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," HOSTAS $(@)") -else -S_TO_O = $(CPP) $(CPPFLAGS) $($(@)_CPPFLAGS) $(EXTRA_CPPFLAGS) $< -o $(@).tmp && \ - $(AS) $(ASFLAGS) $($(@)_ASFLAGS) $(EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," AS $(@)") -endif - -S_TO_O_CMD = "cmd_$@ = $(S_TO_O_STR)" -S_TO_O_DO = @set -e; \ - echo $(S_TO_O_DISP); \ - $(S_TO_O) && \ - echo $(S_TO_O_CMD) > $(call obj2cmd,$(@)) - -# -# Compile .S file if needed -# Note: DEP_$$@ can be specified by user (by default it is empty) -# -%_s.o: %.S $$(DEP_$$@) FORCE - @[ ! -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(S_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(S_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(S_TO_O_DO)) diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk deleted file mode 100644 index 98c860628a..0000000000 --- a/mk/internal/rte.extvars.mk +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# directory where sources are located -# -ifdef S -ifeq ("$(origin S)", "command line") -RTE_SRCDIR := $(abspath $(S)) -endif -endif -RTE_SRCDIR ?= $(CURDIR) -export RTE_SRCDIR - -# -# Makefile to call once $(RTE_OUTPUT) is created -# -ifdef M -ifeq ("$(origin M)", "command line") -RTE_EXTMK := $(abspath $(M)) -endif -endif -RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST))) -export RTE_EXTMK - -# RTE_SDK_BIN must point to .config, include/ and lib/. -RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET) -ifeq ($(wildcard $(RTE_SDK_BIN)/.config),) -$(error Cannot find .config in $(RTE_SDK_BIN)) -endif - -# -# Output files wil go in a separate directory: default output is -# $(RTE_SRCDIR)/build -# Output dir can be given as command line using "O=" -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# if we are building an external application, include SDK -# configuration and include project configuration if any -include $(RTE_SDK_BIN)/.config -ifneq ($(wildcard $(RTE_OUTPUT)/.config),) - include $(RTE_OUTPUT)/.config -endif -# remove double-quotes from config names -RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) -RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) -RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) -RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk deleted file mode 100644 index a1aa0ca4ff..0000000000 --- a/mk/internal/rte.install-post.mk +++ /dev/null @@ -1,71 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install helper .mk - -# -# generate rules to install files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define install_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " INSTALL-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)cp -rf $$(<) $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(INSTALL-DIRS-y),\ - $(foreach file,$(INSTALL-y-$(dir)),\ - $(eval $(call install_rule,$(dir),$(file))))) - - -# -# generate rules to install symbolic links of files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define symlink_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " SYMLINK-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)ln -nsf `$(RTE_SDK)/buildtools/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \ - $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(SYMLINK-DIRS-y),\ - $(foreach file,$(SYMLINK-y-$(dir)),\ - $(eval $(call symlink_rule,$(dir),$(file))))) - - -# fast way, no need to do preinstall and postinstall -ifeq ($(PREINSTALL)$(POSTINSTALL),) - -_postinstall: $(_INSTALL) - @touch _postinstall - -else # slower way - -_preinstall: $(PREINSTALL) - @touch _preinstall - -ifneq ($(_INSTALL),) -$(_INSTALL): _preinstall -else -_INSTALL = _preinstall -endif - -_install: $(_INSTALL) - @touch _install - -ifneq ($(POSTINSTALL),) -$(POSTINSTALL): _install -else -POSTINSTALL = _install -endif - -_postinstall: $(POSTINSTALL) - @touch _postinstall -endif diff --git a/mk/internal/rte.install-pre.mk b/mk/internal/rte.install-pre.mk deleted file mode 100644 index 4786d3b28b..0000000000 --- a/mk/internal/rte.install-pre.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# get all variables starting with "INSTALL-y-", and extract the -# installation dir and path -# -INSTALL-y := $(filter INSTALL-y-%,$(.VARIABLES)) -INSTALL-n := $(filter INSTALL-n-%,$(.VARIABLES)) -INSTALL- := $(filter INSTALL--%,$(.VARIABLES)) -INSTALL-DIRS-y := $(patsubst INSTALL-y-%,%,$(INSTALL-y)) -INSTALL-FILES-y := $(foreach i,$(INSTALL-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) -INSTALL-FILES-all := $(foreach i,$(INSTALL-DIRS-y) $(INSTALL-DIRS-n) $(INSTALL-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) - -_INSTALL_TARGETS := _preinstall _install _postinstall - -# -# get all variables starting with "SYMLINK-y-", and extract the -# installation dir and path -# -SYMLINK-y := $(filter SYMLINK-y-%,$(.VARIABLES)) -SYMLINK-n := $(filter SYMLINK-n-%,$(.VARIABLES)) -SYMLINK- := $(filter SYMLINK--%,$(.VARIABLES)) -SYMLINK-DIRS-y := $(patsubst SYMLINK-y-%,%,$(SYMLINK-y)) -SYMLINK-FILES-y := $(foreach i,$(SYMLINK-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) -SYMLINK-FILES-all := $(foreach i,$(SYMLINK-DIRS-y) $(SYMLINK-DIRS-n) $(SYMLINK-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) - -_SYMLINK_TARGETS := _presymlink _symlink _postsymlink diff --git a/mk/machine/armv7a/rte.vars.mk b/mk/machine/armv7a/rte.vars.mk deleted file mode 100644 index 44ebd68dae..0000000000 --- a/mk/machine/armv7a/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv7-a - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -MACHINE_CFLAGS += -mfpu=neon diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk deleted file mode 100644 index 5e3ffc3adf..0000000000 --- a/mk/machine/armv8a/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk deleted file mode 100644 index df08d3b038..0000000000 --- a/mk/machine/default/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=corei7 diff --git a/mk/machine/dpaa/rte.vars.mk b/mk/machine/dpaa/rte.vars.mk deleted file mode 100644 index 75df626ff2..0000000000 --- a/mk/machine/dpaa/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -# To avoid TLS corruption issue. -MACHINE_CFLAGS += -mtls-dialect=trad diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk deleted file mode 100644 index 50342dfa27..0000000000 --- a/mk/machine/emag/rte.vars.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag) diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk deleted file mode 100644 index 39099e760e..0000000000 --- a/mk/machine/hsw/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx2 diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk deleted file mode 100644 index 5b6563742a..0000000000 --- a/mk/machine/ivb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx-i diff --git a/mk/machine/n1sdp/rte.vars.mk b/mk/machine/n1sdp/rte.vars.mk deleted file mode 100644 index 6d69de03c9..0000000000 --- a/mk/machine/n1sdp/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=neoverse-n1) diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk deleted file mode 100644 index 8c96e3fa04..0000000000 --- a/mk/machine/native/rte.vars.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=native - -# On FreeBSD systems, sometimes the correct CPU type is not picked up. -# To get everything to compile, we need SSE4.2 support, so check if that is -# reported by compiler. If not, check if the CPU actually supports it, and if -# so, set the compilation target to be a corei7, minimum target with SSE4.2. -SSE42_SUPPORT=$(shell $(CC) -march=native -dM -E - </dev/null | grep SSE4_2) -ifeq ($(SSE42_SUPPORT),) - MACHINE_CFLAGS = -march=corei7 -endif diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk deleted file mode 100644 index 91de5d9bed..0000000000 --- a/mk/machine/nhm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.mk deleted file mode 100644 index e209cf4920..0000000000 --- a/mk/machine/octeontx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto+lse) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2) diff --git a/mk/machine/power8/rte.vars.mk b/mk/machine/power8/rte.vars.mk deleted file mode 100644 index 00e0834b8a..0000000000 --- a/mk/machine/power8/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = diff --git a/mk/machine/silvermont/rte.vars.mk b/mk/machine/silvermont/rte.vars.mk deleted file mode 100644 index e4f3fe42bd..0000000000 --- a/mk/machine/silvermont/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=silvermont diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk deleted file mode 100644 index efe2f32d70..0000000000 --- a/mk/machine/snb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7-avx diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk deleted file mode 100644 index 047741668c..0000000000 --- a/mk/machine/thunderx/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -mcpu=thunderx diff --git a/mk/machine/thunderx2/rte.vars.mk b/mk/machine/thunderx2/rte.vars.mk deleted file mode 100644 index b80dc8680c..0000000000 --- a/mk/machine/thunderx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99) diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk deleted file mode 100644 index e9bc3f9848..0000000000 --- a/mk/machine/wsm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 -maes -mpclmul diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk deleted file mode 100644 index e632f3139b..0000000000 --- a/mk/machine/xgene1/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a diff --git a/mk/rte.app.mk b/mk/rte.app.mk deleted file mode 100644 index a544259970..0000000000 --- a/mk/rte.app.mk +++ /dev/null @@ -1,509 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation. -# Copyright(c) 2014-2015 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(APP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_INSTALL += $(RTE_OUTPUT)/app/$(APP) $(RTE_OUTPUT)/app/$(APP).map -POSTINSTALL += target-appinstall -_CLEAN = doclean -POSTCLEAN += target-appclean - -ifeq ($(NO_LDSCRIPT),) -LDSCRIPT = $(RTE_LDSCRIPT) -endif - -# Link only the libraries used in the application -LDFLAGS += --as-needed - -# default path for libs -_LDLIBS-y += -L$(RTE_SDK_BIN)/lib - -# -# Order is important: from higher level to lower level -# -_LDLIBS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += -lrte_flow_classify -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += -lrte_pipeline -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += -lrte_table -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += -lrte_port -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --no-whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PDUMP) += -lrte_pdump -_LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor -_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter -_LDLIBS-$(CONFIG_RTE_LIBRTE_FIB) += -lrte_fib -_LDLIBS-$(CONFIG_RTE_LIBRTE_RIB) += -lrte_rib -_LDLIBS-$(CONFIG_RTE_LIBRTE_LPM) += -lrte_lpm -_LDLIBS-$(CONFIG_RTE_LIBRTE_ACL) += -lrte_acl -_LDLIBS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += -lrte_jobstats -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -lrte_metrics -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -ljansson -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_BITRATE) += -lrte_bitratestats -_LDLIBS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += -lrte_latencystats -_LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power - -_LDLIBS-$(CONFIG_RTE_LIBRTE_EFD) += -lrte_efd -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lrte_bpf -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lelf -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPSEC) += -lrte_ipsec - -_LDLIBS-y += --whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE) += -lrte_cfgfile -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRO) += -lrte_gro -_LDLIBS-$(CONFIG_RTE_LIBRTE_GSO) += -lrte_gso -_LDLIBS-$(CONFIG_RTE_LIBRTE_HASH) += -lrte_hash -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lrte_member -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost -_LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs -_LDLIBS-y += -lrte_telemetry -_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf -_LDLIBS-$(CONFIG_RTE_LIBRTE_NET) += -lrte_net -_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lrte_ethdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_BBDEV) += -lrte_bbdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += -lrte_cryptodev -_LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY) += -lrte_security -_LDLIBS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += -lrte_compressdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += -lrte_regexdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += -lrte_eventdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV) += -lrte_rawdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool -_LDLIBS-$(CONFIG_RTE_LIBRTE_STACK) += -lrte_stack -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += -lrte_mempool_octeontx2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI) += -lrte_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrte_eal -_LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline -_LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -_LDLIBS-$(CONFIG_RTE_LIBRTE_RCU) += -lrte_rcu -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRAPH) += -lrte_graph -_LDLIBS-$(CONFIG_RTE_LIBRTE_NODE) += -lrte_node - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni -endif - -OTX-CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -OTX-CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OTX-CPT-y)),y) -_LDLIBS-y += -lrte_common_cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -_LDLIBS-y += -lrte_common_octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -_LDLIBS-y += -lrte_common_octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -_LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk -endif - -DPAAX-y := $(CONFIG_RTE_LIBRTE_DPAA_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_FSLMC_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_ENETC_PMD) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PFE_PMD) -ifeq ($(findstring y,$(DPAAX-y)),y) - _LDLIBS-y += -lrte_common_dpaax -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += -lrte_bus_vdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += -lrte_bus_fslmc -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# plugins (link only if static libraries) - -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += -lrte_mempool_dpaa2 -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += -lrte_pmd_af_xdp -lbpf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += -lrte_pmd_ark -_LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += -lrte_pmd_atlantic -_LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += -lrte_pmd_avp -_LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += -lrte_pmd_axgbe -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += -lrte_pmd_bnxt -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond -_LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += -lrte_pmd_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += -lrte_pmd_enetc -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic -_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += -lrte_pmd_failsafe -_LDLIBS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += -lrte_pmd_hinic -_LDLIBS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += -lrte_pmd_hns3 -_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e -_LDLIBS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += -lrte_pmd_iavf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += -lrte_pmd_ice -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifeq ($(findstring y,$(IAVF-y)),y) -_LDLIBS-y += -lrte_common_iavf -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += -lrte_pmd_igc -_LDLIBS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += -lrte_pmd_ionic -_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += -lrte_pmd_kni -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += -lrte_pmd_lio -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += -lrte_pmd_memif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4 -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -lrte_common_mlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -lrte_pmd_mlx5 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += -lrte_pmd_mlx5_vdpa -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += -lrte_pmd_mlx5_regex -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -_LDLIBS-y += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LIBS_IBVERBS_STATIC = $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -_LDLIBS-y += --no-whole-archive -_LDLIBS-y += $(LIBS_IBVERBS_STATIC) -_LDLIBS-y += --whole-archive -else -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -libverbs -lmlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs -lmlx4 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += -lrte_pmd_mvpp2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += -lrte_pmd_mvneta -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += -lrte_pmd_nfp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += -lrte_pmd_octeontx2 -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap -lpcap -_LDLIBS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += -lrte_pmd_pfe -_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += -lrte_pmd_qede -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += -lrte_pmd_softnic -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += -lrte_pmd_sfc_efx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lrte_pmd_szedata2 -lsze2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += -lrte_pmd_nfb -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += -lrte_pmd_tap -_LDLIBS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += -lrte_pmd_thunderx_nicvf -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += -lrte_pmd_vdev_netvsc -_LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += -lrte_pmd_vhost -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc -endif # $(CONFIG_RTE_EAL_VFIO) -endif # $(CONFIG_RTE_LIBRTE_VHOST) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio - -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMBUS) += -lrte_bus_vmbus -_LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += -lrte_pmd_netvsc - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += -lrte_pmd_bbdev_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += -lrte_pmd_bbdev_fpga_5gnr_fec - -# TURBO SOFTWARE PMD is dependent on the FLEXRAN library -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -# Dependency on the FLEXRAN SDK library if available -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_crc -lcrc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_common -lcommon -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lirc -limf -lstdc++ -lipps -lsvml -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif # CONFIG_RTE_BBDEV_SDK_AVX512 -endif # CONFIG_RTE_BBDEV_SDK_AVX2 -endif # CONFIG_RTE_LIBRTE_BBDEV - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lrte_pmd_aesni_mb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lrte_pmd_aesni_gcm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += -lrte_pmd_ccp -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_SYM) += -lrte_pmd_qat -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM) += -lrte_pmd_qat -lcrypto -endif # CONFIG_RTE_LIBRTE_PMD_QAT -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lrte_pmd_zuc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -lrte_pmd_armv8 -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mvsam_crypto -lmusdk -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += -lrte_pmd_nitrox -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += -lrte_pmd_octeontx_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += -lrte_pmd_octeontx2_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += -lrte_pmd_crypto_scheduler -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_pmd_dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += -lrte_pmd_dpaa_sec -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += -lrte_pmd_caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += -lrte_pmd_virtio_crypto -endif # CONFIG_RTE_LIBRTE_CRYPTODEV - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lrte_pmd_isal_comp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lisal -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += -lrte_pmd_octeontx_zip -# Link QAT driver if it has not been linked yet -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),n) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -endif # CONFIG_RTE_LIBRTE_PMD_QAT_SYM -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lrte_pmd_zlib -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lz -endif # CONFIG_RTE_LIBRTE_COMPRESSDEV - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += -lrte_pmd_skeleton_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += -lrte_pmd_sw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += -lrte_pmd_dsw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += -lrte_pmd_octeontx_ssovf -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += -lrte_pmd_dpaa_event -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += -lrte_pmd_dpaa2_event -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS - -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += -lrte_mempool_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += -lrte_pmd_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += -lrte_pmd_octeontx2_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event -endif # CONFIG_RTE_LIBRTE_EVENTDEV - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_rawdev_skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_rawdev_dpaa2_cmdif -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_rawdev_dpaa2_qdma -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga -ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += -lrte_rawdev_ifpga -lfdt -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += -lrte_pmd_ipn3ke -endif # CONFIG_RTE_LIBRTE_IFPGA_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += -lrte_rawdev_ioat -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_rawdev_ntb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += -lrte_rawdev_octeontx2_dma -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += -lrte_rawdev_octeontx2_ep -endif # CONFIG_RTE_LIBRTE_RAWDEV - -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += --no-whole-archive - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# The static libraries do not know their dependencies. -# So linking with static library requires explicit dependencies. -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrt -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lm -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_PORT_PCAP) += -lpcap -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += $(EXECENV_LDLIBS) - -LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS) $(EXTRA_LDLIBS) - -# all the words except the first one -allbutfirst = $(wordlist 2,$(words $(1)),$(1)) - -# Eliminate duplicates without sorting, only keep the last occurrence -filter-libs = \ - $(if $(1),$(strip\ - $(if \ - $(and \ - $(filter $(firstword $(1)),$(call allbutfirst,$(1))),\ - $(filter -l%,$(firstword $(1)))),\ - ,\ - $(firstword $(1))) \ - $(call filter-libs,$(call allbutfirst,$(1))))) - -LDLIBS := $(call filter-libs,$(LDLIBS)) - -MAPFLAGS = -Map=$@.map --cref - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS)) -else -O_TO_EXE = $(LD) -o $@ $(OBJS-y) \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS) -endif -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," LD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(APP).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Compile executable file if needed -# -$(APP): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(APP)) $(LDSCRIPT) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP): $(APP) - @echo " INSTALL-APP $(APP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP) $(RTE_OUTPUT)/app - -# -# install app map file in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP).map: $(APP) - @echo " INSTALL-MAP $(APP).map" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP).map $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(APP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(APP).cmd $(APP).map - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk -else -include $(RTE_SDK)/mk/target/generic/rte.app.mk -endif - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.bsdmodule.mk b/mk/rte.bsdmodule.mk deleted file mode 100644 index df8bf9ef35..0000000000 --- a/mk/rte.bsdmodule.mk +++ /dev/null @@ -1,89 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# DPDK uses a more up-to-date gcc, so clear the override here. -unexport CC -override CFLAGS = $(MODULE_CFLAGS) - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)if [ ! -f $(notdir BSDmakefile) ]; then ln -nfs $(SRCDIR)/BSDmakefile . ; fi - $(Q)MAKEFLAGS= $(BSDMAKE) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - $(Q)echo INSTALL-MODULE $(MODULE).ko - $(Q)[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - $(Q)cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - $(Q)MAKEFLAGS= $(BSDMAKE) install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - $(Q)$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - $(Q)if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.combinedlib.mk b/mk/rte.combinedlib.mk deleted file mode 100644 index 9d0f935358..0000000000 --- a/mk/rte.combinedlib.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -default: all - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXT:=.so -else -EXT:=.a -endif - -RTE_LIBNAME := dpdk -COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT) - -LIBS := $(filter-out $(COMBINEDLIB), $(sort $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT))))) - -all: FORCE - $(Q)echo "GROUP ( $(LIBS) )" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -# -# Clean all generated files -# -.PHONY: clean -clean: - $(Q)rm -f $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk deleted file mode 100644 index fa87535312..0000000000 --- a/mk/rte.cpuflags.mk +++ /dev/null @@ -1,124 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# this makefile is called from the generic rte.vars.mk and is -# used to set the RTE_CPUFLAG_* environment variables giving details -# of what instruction sets the target cpu supports. - -AUTO_CPUFLAGS := $(shell $(CC) $(MACHINE_CFLAGS) $(WERROR_FLAGS) $(EXTRA_CFLAGS) -dM -E - < /dev/null) - -# adding flags to CPUFLAGS - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE__),) -CPUFLAGS += SSE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE2__),) -CPUFLAGS += SSE2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE3__),) -CPUFLAGS += SSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSSE3__),) -CPUFLAGS += SSSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_1__),) -CPUFLAGS += SSE4_1 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_2__),) -CPUFLAGS += SSE4_2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AES__),) -CPUFLAGS += AES -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PCLMUL__),) -CPUFLAGS += PCLMULQDQ -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) -CPUFLAGS += RDRAND -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) -CPUFLAGS += RDSEED -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),) -CPUFLAGS += FSGSBASE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__F16C__),) -CPUFLAGS += F16C -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX2 -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX512),y) -CPUFLAGS += AVX512F -else -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(FORCE_DISABLE_AVX512),y) -MACHINE_CFLAGS += -mno-avx512f -endif -endif -endif - -# IBM Power CPU flags -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC64__),) -CPUFLAGS += PPC64 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC32__),) -CPUFLAGS += PPC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__vector),) -CPUFLAGS += ALTIVEC -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),) -CPUFLAGS += VSX -endif - -# ARM flags -ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),) -CPUFLAGS += NEON -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRC32),) -CPUFLAGS += CRC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRYPTO),) -CPUFLAGS += AES -CPUFLAGS += PMULL -CPUFLAGS += SHA1 -CPUFLAGS += SHA2 -endif - -MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS)) - -# To strip whitespace -comma:= , -empty:= -space:= $(empty) $(empty) -CPUFLAGSTMP1 := $(addprefix RTE_CPUFLAG_,$(CPUFLAGS)) -CPUFLAGSTMP2 := $(subst $(space),$(comma),$(CPUFLAGSTMP1)) -CPUFLAGS_LIST := -DRTE_COMPILE_TIME_CPUFLAGS=$(CPUFLAGSTMP2) diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk deleted file mode 100644 index 427bb52306..0000000000 --- a/mk/rte.extapp.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.app.mk -endif diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk deleted file mode 100644 index 977873325d..0000000000 --- a/mk/rte.extlib.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -EXTLIB_BUILD := y - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.lib.mk -endif diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk deleted file mode 100644 index c761a5de1e..0000000000 --- a/mk/rte.extobj.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.obj.mk -endif diff --git a/mk/rte.extshared.mk b/mk/rte.extshared.mk deleted file mode 100644 index 64269e1a85..0000000000 --- a/mk/rte.extshared.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - @echo $(RTE_OUTPUT)/lib must be added to /etc/ld.so.conf or \ - LD_LIBRARY_PATH variable to allow binary to link with dynamic library - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.shared.mk -endif diff --git a/mk/rte.extsubdir.mk b/mk/rte.extsubdir.mk deleted file mode 100644 index 0f8ef94c50..0000000000 --- a/mk/rte.extsubdir.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -# output directory -O ?= $(CURDIR) -BASE_OUTPUT ?= $(abspath $(O)) -CUR_SUBDIR ?= . - -.PHONY: all -all: $(DIRS-y) - -.PHONY: clean -clean: $(DIRS-y) - -.PHONY: $(DIRS-y) -$(DIRS-y): - @echo "== $@" - $(Q)$(MAKE) -C $(@) \ - M=$(CURDIR)/$(@)/Makefile \ - O=$(BASE_OUTPUT)/$(CUR_SUBDIR)/$(@)/$(RTE_TARGET) \ - BASE_OUTPUT=$(BASE_OUTPUT) \ - CUR_SUBDIR=$(CUR_SUBDIR)/$(@) \ - S=$(CURDIR)/$(@) \ - $(filter-out $(DIRS-y),$(MAKECMDGOALS)) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) diff --git a/mk/rte.gnuconfigure.mk b/mk/rte.gnuconfigure.mk deleted file mode 100644 index 72e99aafc3..0000000000 --- a/mk/rte.gnuconfigure.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.build-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) -_BUILD = configure -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -configure: - $(Q)cd $(CONFIGURE_PATH) ; \ - ./configure --prefix $(CONFIGURE_PREFIX) $(CONFIGURE_ARGS) ; \ - make ; \ - make install - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)cd $(CONFIGURE_PATH) ; make clean - $(Q)rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.build-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.helper.mk b/mk/rte.helper.mk deleted file mode 100644 index 6e7fd03d7f..0000000000 --- a/mk/rte.helper.mk +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd - -# rte_cc_has_argument -# Usage: MACHINE_CFLAGS += $(call rte_cc_has_argument, -mno-avx512f) -# Return the argument if the argument is supported by the compiler. -# -define rte_cc_has_argument - $(shell $(CC) -E $(1) -xc /dev/null 1>/dev/null 2>/dev/null && echo $(1)) -endef diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk deleted file mode 100644 index 68e32b5780..0000000000 --- a/mk/rte.hostapp.mk +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTAPP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/app/$(HOSTAPP) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_EXE = $(HOSTCC) $(HOST_LDFLAGS) $(LDFLAGS_$(@)) \ - $(EXTRA_HOST_LDFLAGS) -o $@ $(OBJS-y) $(LDLIBS) -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," HOSTLD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTAPP).cmd - -# list of .a files that are linked to this application -LDLIBS_FILES := $(sort $(wildcard \ - $(addprefix $(RTE_OUTPUT)/lib/, \ - $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))))) - -# -# Compile executable file if needed -# -$(HOSTAPP): $(OBJS-y) $(LDLIBS_FILES) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/hostapp -# -$(RTE_OUTPUT)/app/$(HOSTAPP): $(HOSTAPP) - @echo " INSTALL-HOSTAPP $(HOSTAPP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(HOSTAPP) $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTAPP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(HOSTAPP).cmd - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.hostlib.mk b/mk/rte.hostlib.mk deleted file mode 100644 index 0ccaa55f09..0000000000 --- a/mk/rte.hostlib.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTLIB) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/hostlib/$(HOSTLIB) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_A = $(AR) crus $(HOSTLIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," HOSTAR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTLIB).cmd - -# -# Archive objects in .a file if needed -# -$(HOSTLIB): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) - -# -# install lib in $(RTE_OUTPUT)/hostlib -# -$(RTE_OUTPUT)/hostlib/$(HOSTLIB): $(HOSTLIB) - @echo " INSTALL-HOSTLIB $(HOSTLIB)" - @[ -d $(RTE_OUTPUT)/hostlib ] || mkdir -p $(RTE_OUTPUT)/hostlib - $(Q)cp -f $(HOSTLIB) $(RTE_OUTPUT)/hostlib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTLIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.install.mk b/mk/rte.install.mk deleted file mode 100644 index e56daf457c..0000000000 --- a/mk/rte.install.mk +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install-only makefile (no build target) - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: _postinstall - @true - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(INSTALL-FILES-all) - @rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk deleted file mode 100644 index 229ae16814..0000000000 --- a/mk/rte.lib.mk +++ /dev/null @@ -1,156 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -EXTLIB_BUILD ?= n - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION) -SOVER := $(basename $(LIBABIVER)) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB)) -LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) -ifeq ($(EXTLIB_BUILD),n) -CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) -endif -endif - - -_BUILD = $(LIB) -PREINSTALL = $(SYMLINK-FILES-y) -_INSTALL = $(INSTALL-FILES-y) $(RTE_OUTPUT)/lib/$(LIB) -_CLEAN = doclean - -LDLIBS += $(EXECENV_LDLIBS-y) - -.PHONY: all -all: install - -.PHONY: install -ifeq ($(SYMLINK-FILES-y),) -install: build _postinstall -else -install: _preinstall build _postinstall -build: _preinstall -endif - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -# Override the definition of LD here, since we're linking with CC -LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS) -_CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -else -_CPU_LDFLAGS := $(CPU_LDFLAGS) -endif - -O_TO_A = $(AR) crDs $(LIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," AR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - -ifneq ($(CC_SUPPORTS_Z),false) -NO_UNDEFINED := -z defs -endif - -O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \ - -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -o $(LIB) -O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight -O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") -O_TO_S_DO = @set -e; \ - echo $(O_TO_S_DISP); \ - $(O_TO_S) && \ - echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) - --include .$(LIB).cmd - -# -# Archive objects in .a file if needed -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE -ifeq ($(LIBABIVER),) - @echo "Must Specify a $(LIB) ABI version" - @false -endif - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_S_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_S_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_S_DO)) - -else -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) -endif - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(LIB): $(LIB) - @echo " INSTALL-LIB $(LIB)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - $(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/') - $(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \ - ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \ - fi -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(LIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) .$(LIB).cmd $(INSTALL-FILES-all) *.pmd.c *.pmd.o - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.module.mk b/mk/rte.module.mk deleted file mode 100644 index 1ada528a00..0000000000 --- a/mk/rte.module.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - @echo INSTALL-MODULE $(MODULE).ko - @[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - @cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - modules_install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.obj.mk b/mk/rte.obj.mk deleted file mode 100644 index 1641a52e75..0000000000 --- a/mk/rte.obj.mk +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -ifneq ($(OBJ),) -_BUILD = $(OBJ) -else -_BUILD = $(OBJS-y) -endif -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -ifneq ($(OBJ),) -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_O = $(LD) -r -o $(OBJ) $(OBJS-y) -O_TO_O_STR = $(subst ','\'',$(O_TO_O)) #'# fix syntax highlight -O_TO_O_DISP = $(if $(V),"$(O_TO_O_STR)"," LD $(@)") -O_TO_O_CMD = "cmd_$@ = $(O_TO_O_STR)" -O_TO_O_DO = @set -e; \ - echo $(O_TO_O_DISP); \ - $(O_TO_O) && \ - echo $(O_TO_O_CMD) > $(call exe2cmd,$(@)) - --include .$(OBJ).cmd - -# -# Archive objects in .a file if needed -# -$(OBJ): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_O_DO)) -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(OBJ) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk deleted file mode 100644 index d1d57b6695..0000000000 --- a/mk/rte.sdkbuild.mk +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# include rte.vars.mk if config file exists -# -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif - -# allow exec-env specific targets --include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.custom.mk - -buildtools: | lib -kernel: | lib -drivers: | lib buildtools -app: | lib buildtools drivers -test: | lib buildtools drivers - -# -# build and clean targets -# - -CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-)) - -.PHONY: build -build: $(ROOTDIRS-y) - @echo "Build complete [$(RTE_TARGET)]" - @echo "==== NOTE ====" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html for instructions" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "==============" - -.PHONY: clean -clean: $(CLEANDIRS) - @rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod - @[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include - @$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean - @echo Clean complete - -.SECONDEXPANSION: -.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-) -$(ROOTDIRS-y) $(ROOTDIRS-): - @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ - @echo "== Build $@" - $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = drivers ]; then \ - $(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \ - fi - -%_clean: - @echo "== Clean $*" - $(Q)if [ -f $(RTE_SRCDIR)/$*/Makefile -a -d $(BUILDDIR)/$* ]; then \ - $(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* clean ; \ - fi - -RTE_MAKE_SUBTARGET ?= all - -%_sub: $(addsuffix _sub,$(*)) - @echo $(addsuffix _sub,$(*)) - @[ -d $(BUILDDIR)/$* ] || mkdir -p $(BUILDDIR)/$* - @echo "== Build $*" - $(Q)$(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* \ - $(RTE_MAKE_SUBTARGET) - -.PHONY: all -all: build - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk deleted file mode 100644 index f538649f22..0000000000 --- a/mk/rte.sdkconfig.mk +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -.PHONY: showversion -showversion: - @cat $(RTE_SRCDIR)/VERSION - -.PHONY: showversionum -showversionum: - @cat $(RTE_SRCDIR)/VERSION | awk -F '.' '{print $$1$$2}' - -INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ - $(filter-out %app-gcc,$(filter-out %~,\ - $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_*))))))) -INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS)) - -.PHONY: showconfigs -showconfigs: - @$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);) - -.PHONY: notemplate -notemplate: - @printf "No template specified. Use 'make defconfig' or " - @echo "use T=template from the following list:" - @$(MAKE) -rR showconfigs | sed 's,^, ,' - -.PHONY: defconfig -defconfig: - @$(MAKE) config T=$(shell \ - uname -m | awk '{ \ - if ($$0 == "aarch64") { \ - print "arm64-armv8a"} \ - else if ($$0 == "armv7l") { \ - print "arm-armv7a"} \ - else if ($$0 == "ppc64") { \ - print "ppc_64-power8"} \ - else if ($$0 == "amd64") { \ - print "x86_64-native"} \ - else { \ - printf "%s-native", $$0} }' \ - )-$(shell \ - uname | awk '{ \ - if ($$0 == "Linux") { \ - print "linux"} \ - else { \ - print "freebsd"} }' \ - )-$(shell \ - ${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \ - '{ \ - if ($$1 == "cc") { \ - print "gcc" } \ - else { \ - print $$1 } \ - }' \ - ) - -.PHONY: config -ifeq ($(RTE_CONFIG_TEMPLATE),) -config: notemplate -else -config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile - @echo "Configuration done using" \ - $(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE))) -endif - -$(RTE_OUTPUT): - $(Q)mkdir -p $@ - -ifdef NODOTCONF -$(RTE_OUTPUT)/.config: ; -else -# Generate config from template, if there are duplicates keep only the last. -# To do so the temp config is checked for duplicate keys with cut/sort/uniq -# Then for each of those identified duplicates as long as there are more than -# just one left the last match is removed. -# Part of the config includes the version information taken from "VERSION" -# in the repo. This needs to be split into the various parts using sed and awk. -# To ensure correct version comparison, we append ".99" to the version number -# so that the version of a release is higher than that of its rc's. -$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT) - $(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \ - $(CPP) -undef -P -x assembler-with-cpp \ - `cat $(RTE_SRCDIR)/VERSION | \ - sed -e 's/-rc/.-rc./' -e 's/$$/..99/' | \ - awk -F '.' '{print "-D__YEAR="int($$1), "-D__MONTH="int($$2), "-D__MINOR="int($$3), "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \ - -ffreestanding \ - -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \ - config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \ - echo "$$config" | awk -F '=' 'BEGIN {i=1} \ - /^#/ {pos[i++]=$$0} \ - !/^#/ {if (!s[$$1]) {pos[i]=$$0; s[$$1]=i++} \ - else {pos[s[$$1]]=$$0}} END \ - {for (j=1; j<i; j++) print pos[j]}' \ - > $(RTE_OUTPUT)/.config_tmp ; \ - if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config.orig ; \ - fi ; \ - rm -f $(RTE_OUTPUT)/.config_tmp ; \ - else \ - $(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \ - fi -endif - -# generate a Makefile for this build directory -# use a relative path so it will continue to work even if we move the directory -SDK_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_SRCDIR)) \ - $(abspath $(RTE_OUTPUT))) -OUTPUT_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_OUTPUT)) \ - $(abspath $(RTE_SRCDIR))) -$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT) - $(Q)$(RTE_SDK)/buildtools/gen-build-mk.sh $(SDK_RELPATH) > $@ - -# clean installed files, and generate a new config header file -# if NODOTCONF variable is defined, don't try to rebuild .config -$(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config - $(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build - $(Q)mkdir -p $(RTE_OUTPUT)/include - $(Q)$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - -# generate the rte_config.h -.PHONY: headerconfig -headerconfig: $(RTE_OUTPUT)/include/rte_config.h - @true - -# check that .config is present, and if yes, check that rte_config.h -# is up to date -.PHONY: checkconfig -checkconfig: - @if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - echo "No .config in build directory"; \ - exit 1; \ - fi - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk \ - headerconfig NODOTCONF=1 - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk deleted file mode 100644 index 7adeb0e11b..0000000000 --- a/mk/rte.sdkdepdirs.mk +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk deleted file mode 100644 index fd77e41867..0000000000 --- a/mk/rte.sdkdoc.mk +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation. -# Copyright(c) 2013-2015 6WIND S.A. - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with doc target") -endif -endif - -RTE_SPHINX_BUILD = sphinx-build -RTE_PDFLATEX_VERBOSE := --interaction=nonstopmode - -ifndef V -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif -ifeq '$V' '0' -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif - -RTE_PDF_DPI ?= 300 - -RTE_GUIDES := $(filter %/, $(wildcard $(RTE_SDK)/doc/guides/*/)) - -API_EXAMPLES := $(RTE_OUTPUT)/doc/html/examples.dox - -.PHONY: help -help: - @cat $(RTE_SDK)/doc/build-sdk-quick.txt - @$(MAKE) -rR showconfigs | sed 's,^,\t\t\t\t,' - -.PHONY: all -all: api-html guides-html guides-pdf - -.PHONY: clean -clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean - -.PHONY: api-html -api-html: $(API_EXAMPLES) - @echo 'doxygen for API...' - $(Q)mkdir -p $(RTE_OUTPUT)/doc/html - $(Q)(sed -e "s|@VERSION@|`$(MAKE) -rRs showversion`|" \ - -e "s|@API_EXAMPLES@|$(API_EXAMPLES)|" \ - -e "s|@OUTPUT@|$(RTE_OUTPUT)/doc|" \ - -e "s|@HTML_OUTPUT@|html/api|" \ - -e "s|@TOPDIR@|./|g" \ - -e "s|@STRIP_FROM_PATH@|./|g" \ - $(RTE_SDK)/doc/api/doxy-api.conf.in)| \ - doxygen - - $(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css - -.PHONY: api-html-clean -api-html-clean: - $(Q)rm -f $(API_EXAMPLES) - $(Q)rm -rf $(RTE_OUTPUT)/doc/html/api/search - $(Q)rm -f $(RTE_OUTPUT)/doc/html/api/* - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true - -$(API_EXAMPLES): api-html-clean - $(Q)mkdir -p $(@D) - $(Q)doc/api/generate_examples.sh examples $(API_EXAMPLES) - -guides-pdf-clean: guides-pdf-img-clean -guides-pdf-img-clean: - $(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf - -guides-%-clean: - $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true - -guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ; -guides-pdf-%: - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \ - $(RTE_OUTPUT)/doc/pdf/guides/$* - $(if $^,$(Q)rm -f $^) - @echo 'pdflatex processing $@...' - $(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \ - LATEXOPTS=$(RTE_PDFLATEX_VERBOSE) - $(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \ - $(RTE_OUTPUT)/doc/pdf/guides/$*.pdf - -guides-html-prepare: - $(Q)install -D -m0644 $(RTE_SDK)/doc/guides/custom.css \ - $(RTE_OUTPUT)/doc/html/guides/_static/css/custom.css - -guides-%-prepare: ; - -guides-%: guides-%-prepare - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \ - $(RTE_OUTPUT)/doc/$*/guides - -# Each PDF depends on generated images *.pdf from *.svg -$(foreach guide, $(RTE_GUIDES), $(foreach img, $(wildcard $(guide)img/*.svg), \ - $(eval guides-pdf-$(notdir $(guide:/=)): $(img:svg=pdf)))) -%.pdf: %.svg - $(Q)inkscape -d $(RTE_PDF_DPI) -D -f $< -A $@ $(RTE_INKSCAPE_VERBOSE) diff --git a/mk/rte.sdkexamples.mk b/mk/rte.sdkexamples.mk deleted file mode 100644 index 5eeec36494..0000000000 --- a/mk/rte.sdkexamples.mk +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -# examples application are seen as external applications which are -# not part of SDK. -BUILDING_RTE_SDK := -export BUILDING_RTE_SDK - -# Build directory is given with O= -O ?= $(RTE_SDK)/examples - -# Target for which examples should be built. -T ?= * - -# list all available configurations -EXAMPLES_CONFIGS := $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_$(T))) -EXAMPLES_TARGETS := $(addsuffix _examples,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples -examples: $(EXAMPLES_TARGETS) - -%_examples: - @echo ================== Build examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*); \ - fi - -EXAMPLES_CLEAN_TARGETS := $(addsuffix _examples_clean,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples_clean -examples_clean: $(EXAMPLES_CLEAN_TARGETS) - -%_examples_clean: - @echo ================== Clean examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*) clean; \ - fi diff --git a/mk/rte.sdkgcov.mk b/mk/rte.sdkgcov.mk deleted file mode 100644 index ab528b18b8..0000000000 --- a/mk/rte.sdkgcov.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with gcov target") -endif -endif - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -INPUTDIR = $(RTE_OUTPUT) -OUTPUTDIR = $(RTE_OUTPUT)/gcov - -.PHONY: gcovclean -gcovclean: - $(Q)find $(INPUTDIR)/build -name "*.gcno" -o -name "*.gcda" -exec rm {} \; - $(Q)rm -rf $(OUTPUTDIR) - -.PHONY: gcov -gcov: - $(Q)for APP in test ; do \ - mkdir -p $(OUTPUTDIR)/$$APP ; cd $(OUTPUTDIR)/$$APP ; \ - for FIC in `strings $(RTE_OUTPUT)/app/$$APP | grep gcda | sed s,gcda,o,` ; do \ - SUBDIR=`basename $$FIC`;\ - mkdir $$SUBDIR ;\ - cd $$SUBDIR ;\ - $(GCOV) $(RTE_OUTPUT)/app/$$APP -o $$FIC > gcov.log; \ - cd - >/dev/null;\ - done ; \ - cd - >/dev/null; \ - done diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk deleted file mode 100644 index 32bed5d951..0000000000 --- a/mk/rte.sdkinstall.mk +++ /dev/null @@ -1,152 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright 2015 6WIND S.A. - -# Configuration, compilation and installation can be done at once -# with make install T=<config> - -ifdef T # config, build and install combined -# The build directory is T and may be prepended with O -O ?= . -RTE_OUTPUT := $O/$T -else # standard install -# Build directory is given with O= -O ?= build -RTE_OUTPUT := $O -endif - -ifneq ($(MAKECMDGOALS),pre_install) -include $(RTE_SDK)/mk/rte.vars.mk -endif - -ifdef T # defaults with T= will install an almost flat staging tree -export prefix ?= -kerneldir ?= $(prefix)/kmod -else -ifeq ($(RTE_EXEC_ENV),linuxapp) -RTE_EXEC_ENV=linux -endif -ifeq ($(RTE_EXEC_ENV),linux) -kerneldir ?= $(RTE_KERNELDIR:/build=/extra/dpdk) -else -kerneldir ?= /boot/modules -endif -prefix ?= /usr/local -endif -exec_prefix ?= $(prefix) -bindir ?= $(exec_prefix)/bin -sbindir ?= $(exec_prefix)/sbin -libdir ?= $(exec_prefix)/lib -includedir ?= $(prefix)/include/dpdk -datarootdir ?= $(prefix)/share -docdir ?= $(datarootdir)/doc/dpdk -datadir ?= $(datarootdir)/dpdk -mandir ?= $(datarootdir)/man -sdkdir ?= $(datadir) -targetdir ?= $(datadir)/$(RTE_TARGET) - -# The install directories may be staged in DESTDIR - -# Create the directory $1 if not exists -rte_mkdir = test -d $1 || mkdir -p $1 - -# Create the relative symbolic link $2 -> $1 -# May be replaced with --relative option of ln from coreutils-8.16 -rte_symlink = ln -snf $$($(RTE_SDK)/buildtools/relpath.sh $1 $(dir $2)) $2 - -.PHONY: pre_install -pre_install: -ifdef T - $(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - else \ - if [ -f $(RTE_OUTPUT)/.config.orig ] ; then \ - tmp_build=$(RTE_OUTPUT)/.config.tmp; \ - $(MAKE) config O=$$tmp_build; \ - if ! cmp -s $(RTE_OUTPUT)/.config.orig $$tmp_build/.config ; then \ - echo "Conflict: local config and template config have both changed"; \ - exit 1; \ - fi; \ - fi; \ - echo "Using local configuration"; \ - fi - $(Q)$(MAKE) all O=$(RTE_OUTPUT) -endif - -.PHONY: install -install: -ifeq ($(DESTDIR)$(if $T,,+),) - @echo Installation cannot run with T defined and DESTDIR undefined -else - @echo ================== Installing $(DESTDIR)$(prefix)/ - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-kmod - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-doc - @echo Installation in $(DESTDIR)$(prefix)/ complete -endif - -# when installing we want recursive copies preserving timestamps only, no -# preservation of user/group ids or permissions -CP_FLAGS=-dR --preserve=timestamps -TAR_X_FLAGS=--strip-components=1 --keep-newer-files --no-same-owner --no-same-permissions - -install-runtime: - $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp $(CP_FLAGS) $O/lib/* $(DESTDIR)$(libdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $O --exclude 'app/*.map' \ - --exclude app/dpdk-pmdinfogen \ - --exclude 'app/cmdline*' --exclude app/test \ - --exclude app/testacl --exclude app/testpipeline app | \ - tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools) - $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \ - tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ - $(DESTDIR)$(sbindir)/dpdk-devbind) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-pmdinfo.py, \ - $(DESTDIR)$(bindir)/dpdk-pmdinfo) -ifneq ($(wildcard $O/doc/man/*/*.1),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man1) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1 -endif -ifneq ($(wildcard $O/doc/man/*/*.8),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man8) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.8 $(DESTDIR)$(mandir)/man8 -endif - -install-kmod: -ifneq ($(wildcard $O/kmod/*),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) - $(Q)cp $(CP_FLAGS) $O/kmod/* $(DESTDIR)$(kerneldir) -endif - -install-sdk: - $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir)) - $(Q)tar -chf - -C $O include | \ - tar -xf - -C $(DESTDIR)$(includedir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) - $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) - $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app - $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) - $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) - -install-doc: -ifneq ($(wildcard $O/doc/html),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)) - $(Q)tar -cf - -C $O/doc --exclude 'html/guides/.*' html | \ - tar -xf - -C $(DESTDIR)$(docdir) $(TAR_X_FLAGS) -endif -ifneq ($(wildcard $O/doc/*/*/*pdf),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides) - $(Q)cp $(CP_FLAGS) $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides -endif - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/examples $(DESTDIR)$(datadir) diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk deleted file mode 100644 index fbee6e96d9..0000000000 --- a/mk/rte.sdkroot.mk +++ /dev/null @@ -1,115 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif - -RTE_SRCDIR = $(CURDIR) -export RTE_SRCDIR - -BUILDING_RTE_SDK := 1 -export BUILDING_RTE_SDK - -# -# We can specify the configuration template when doing the "make -# config". For instance: make config T=x86_64-native-linux-gcc -# -RTE_CONFIG_TEMPLATE := -ifdef T -ifeq ("$(origin T)", "command line") -RTE_CONFIG_TEMPLATE := $(RTE_SRCDIR)/config/defconfig_$(T) -endif -endif -export RTE_CONFIG_TEMPLATE - -# -# Default output is $(RTE_SRCDIR)/build -# output files wil go in a separate directory -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# the directory where intermediate build files are stored, like *.o, -# *.d, *.cmd, ... -BUILDDIR = $(RTE_OUTPUT)/build -export BUILDDIR - -export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n - -.PHONY: default test-build -default test-build: all - -.PHONY: warning -warning: - @echo - @echo "=========================== WARNING ============================" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "================================================================" - @echo - @test "$(MAKE_PAUSE)" = n || ( \ - echo "This deprecation warning can be passed by adding MAKE_PAUSE=n"; \ - echo "to 'make' command line or as an exported environment variable."; \ - echo "Press enter to continue..."; read junk) - -.PHONY: config defconfig showconfigs showversion showversionum -config: warning -config defconfig showconfigs showversion showversionum: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk $@ - -.PHONY: cscope gtags tags etags -cscope gtags tags etags: - $(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T - -.PHONY: test test-fast test-perf coverage test-drivers test-dump -test test-fast test-perf coverage test-drivers test-dump: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@ - -.PHONY: install -install: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ -install-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ - -.PHONY: doc help -doc: doc-all -help: doc-help -doc-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkdoc.mk $* - -.PHONY: gcov gcovclean -gcov gcovclean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkgcov.mk $@ - -.PHONY: examples examples_clean -examples examples_clean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkexamples.mk $@ - -# all other build targets -%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkroot.mk warning - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkbuild.mk $@ diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk deleted file mode 100644 index 803018ba3a..0000000000 --- a/mk/rte.sdktest.mk +++ /dev/null @@ -1,76 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -DATE := $(shell date '+%Y%m%d-%H%M') -AUTOTEST_DIR := $(RTE_OUTPUT)/autotest-$(DATE) - -DIR := $(shell basename $(RTE_OUTPUT)) - -# -# test: launch auto-tests, very simple for now. -# -.PHONY: test test-fast test-perf test-drivers test-dump coverage - -PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\ - reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\ - barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\ - eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\ - distributor_perf,ring_pmd_perf,pmd_perf,ring_perf -DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\ - cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\ - cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\ - cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\ - cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc -DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\ - dump_log_types,dump_ring,dump_physmem,dump_memzone - -SPACESTR:= -SPACESTR+= -STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST)) -STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST)) -STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST)) - -coverage: BLACKLIST=-$(STRIPPED_PERFLIST) -test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST) -test-perf: WHITELIST=$(STRIPPED_PERFLIST) -test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST) -test-dump: WHITELIST=$(STRIPPED_DUMPLIST) - -test test-fast test-perf test-drivers test-dump: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST); \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ; \ - fi - -# this is a special target to ease the pain of running coverage tests -# this runs all the autotests, cmdline_test script and dpdk-procinfo -coverage: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \ - $(RTE_OUTPUT)/app/cmdline_test; \ - ulimit -S -n 100 ; \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST) ; \ - $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ;\ - fi diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk deleted file mode 100644 index 2b501ddb84..0000000000 --- a/mk/rte.shared.mk +++ /dev/null @@ -1,108 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(SHARED) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/lib/$(SHARED) -_CLEAN = doclean - -# Set fPIC in CFLAGS for .so generation -CFLAGS += -fPIC - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -O_TO_SO = $(CC) $(call linkerprefix,$(LDFLAGS)) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(call linkerprefix,$(LDLIBS)) -else -O_TO_SO = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(LDLIBS) -endif - -O_TO_SO_STR = $(subst ','\'',$(O_TO_SO)) #'# fix syntax highlight -O_TO_SO_DISP = $(if $(V),"$(O_TO_SO_STR)"," LD $(@)") -O_TO_SO_CMD = "cmd_$@ = $(O_TO_SO_STR)" -O_TO_SO_DO = @set -e; \ - echo $(O_TO_SO_DISP); \ - $(O_TO_SO) && \ - echo $(O_TO_SO_CMD) > $(call exe2cmd,$(@)) - --include .$(SHARED).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Archive objects in .so file if needed -# -$(SHARED): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(SHARED)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_SO_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_SO_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_SO_DO)) - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(SHARED): $(SHARED) - @echo " INSTALL-SHARED $(SHARED)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(SHARED) $(RTE_OUTPUT)/lib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(SHARED) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.subdir.mk b/mk/rte.subdir.mk deleted file mode 100644 index d6e64a2460..0000000000 --- a/mk/rte.subdir.mk +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# .mk to build subdirectories -# - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -CLEANDIRS = $(addsuffix _clean,$(DIRS-y) $(DIRS-n) $(DIRS-)) - -VPATH += $(SRCDIR) -_BUILD = $(DIRS-y) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = $(CLEANDIRS) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -.SECONDEXPANSION: -.PHONY: $(DIRS-y) -$(DIRS-y): - @[ -d $(CURDIR)/$@ ] || mkdir -p $(CURDIR)/$@ - @echo "== Build $S/$@" - @$(MAKE) S=$S/$@ -f $(SRCDIR)/$@/Makefile -C $(CURDIR)/$@ all - -.PHONY: clean -clean: _postclean - -%_clean: - @echo "== Clean $S/$*" - @if [ -f $(SRCDIR)/$*/Makefile -a -d $(CURDIR)/$* ]; then \ - $(MAKE) S=$S/$* -f $(SRCDIR)/$*/Makefile -C $(CURDIR)/$* clean ; \ - fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk deleted file mode 100644 index 07b0db127f..0000000000 --- a/mk/rte.vars.mk +++ /dev/null @@ -1,102 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# To be included at the beginning of all RTE user Makefiles. This -# .mk will define the RTE environment variables by including the -# config file of SDK. It also includes the config file from external -# application if any. -# - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif -ifeq ($(wildcard $(RTE_SDK)),) -$(error RTE_SDK variable points to an invalid location) -endif - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -# if we are building SDK, only includes SDK configuration -ifneq ($(BUILDING_RTE_SDK),) - include $(RTE_OUTPUT)/.config - # remove double-quotes from config names - RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) - RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) - RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) - RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) - RTE_SDK_BIN := $(RTE_OUTPUT) -endif - -RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN) - -ifeq ($(BUILDING_RTE_SDK),) -# if we are building an external app/lib, include internal/rte.extvars.mk that will -# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...) -include $(RTE_SDK)/mk/internal/rte.extvars.mk -endif - -CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD) -ifneq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y) - CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_EM_PMD) -endif - -ifeq ($(RTE_ARCH),) -$(error RTE_ARCH is not defined) -endif - -ifeq ($(RTE_MACHINE),) -$(error RTE_MACHINE is not defined) -endif - -ifeq ($(RTE_EXEC_ENV),) -$(error RTE_EXEC_ENV is not defined) -endif - -ifeq ($(RTE_TOOLCHAIN),) -$(error RTE_TOOLCHAIN is not defined) -endif - -# can be overridden by make command line or exported environment variable -RTE_KERNELDIR ?= /lib/modules/$(shell uname -r)/build - -export RTE_TARGET -export RTE_ARCH -export RTE_MACHINE -export RTE_EXEC_ENV -export RTE_TOOLCHAIN - -# developer build automatically enabled in a git tree -ifneq ($(wildcard $(RTE_SDK)/.git),) -RTE_DEVEL_BUILD ?= y -endif - -# SRCDIR is the current source directory -ifdef S -SRCDIR := $(abspath $(RTE_SRCDIR)/$(S)) -else -SRCDIR := $(RTE_SRCDIR) -endif - -# helper: return y if option is set to y, else return an empty string -testopt = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -# helper: return an empty string if option is set, else return y -not = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk -else -include $(RTE_SDK)/mk/target/generic/rte.vars.mk -endif diff --git a/mk/target/generic/rte.app.mk b/mk/target/generic/rte.app.mk deleted file mode 100644 index ed82656f18..0000000000 --- a/mk/target/generic/rte.app.mk +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# define Makefile targets that are specific to an environment. -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.app.mk - -.PHONY: exec-env-appinstall -target-appinstall: exec-env-appinstall - -.PHONY: exec-env-appclean -target-appclean: exec-env-appclean diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk deleted file mode 100644 index 11b0418e55..0000000000 --- a/mk/target/generic/rte.vars.mk +++ /dev/null @@ -1,132 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# This .mk is the generic target rte.var.mk ; it includes .mk for -# the specified machine, architecture, toolchain (compiler) and -# executive environment. -# - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# -ifneq ($(wildcard $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk),) -include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk -else -MACHINE_CFLAGS := -march=$(RTE_MACHINE) -endif - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk - -# Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are -# provided by Kbuild framework. -ifeq ($(KERNELRELEASE),) - -# now that the environment is mostly set up, including the machine type we will -# be passing to the compiler, set up the specific CPU flags based on that info. -include $(RTE_SDK)/mk/rte.cpuflags.mk - -# merge all CFLAGS -CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS) -CFLAGS += $(TARGET_CFLAGS) - -# merge all LDFLAGS -LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFLAGS) -LDFLAGS += $(TARGET_LDFLAGS) - -# merge all ASFLAGS -ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS) -ASFLAGS += $(TARGET_ASFLAGS) - -# add default include and lib paths -CFLAGS += -I$(RTE_OUTPUT)/include -LDFLAGS += -L$(RTE_OUTPUT)/lib - -# add in flag for supporting function versioning. The define is used in meson -# builds to ensure that the user has properly flagged the unit in question as -# using function versioning so it can be built twice - once for static lib and -# then a second time for the shared lib. Since make only builds one library -# type at a time, such precautions aren't necessary, so we can globally define -# the flag -CFLAGS += -DRTE_USE_FUNCTION_VERSIONING - -# always include rte_config.h: the one in $(RTE_OUTPUT)/include is -# the configuration of SDK when $(BUILDING_RTE_SDK) is true, or the -# configuration of the application if $(BUILDING_RTE_SDK) is not -# defined. -ifeq ($(BUILDING_RTE_SDK),1) -# building sdk -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -DALLOW_INTERNAL_API -else -# if we are building an external application, include SDK's lib and -# includes too -CFLAGS += -I$(RTE_SDK_BIN)/include -ifneq ($(wildcard $(RTE_OUTPUT)/include/rte_config.h),) -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -endif -CFLAGS += -include $(RTE_SDK_BIN)/include/rte_config.h -LDFLAGS += -L$(RTE_SDK_BIN)/lib -endif - -# always define _GNU_SOURCE -CFLAGS += -D_GNU_SOURCE - -# define __BSD_VISIBLE when building for FreeBSD -ifeq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),y) -CFLAGS += -D__BSD_VISIBLE -endif - -export CFLAGS -export LDFLAGS - -endif diff --git a/mk/toolchain/clang/rte.toolchain-compat.mk b/mk/toolchain/clang/rte.toolchain-compat.mk deleted file mode 100644 index e6189b498d..0000000000 --- a/mk/toolchain/clang/rte.toolchain-compat.mk +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out CLANG version - -CLANG_VERSION := $(shell $(CC) -v 2>&1 | \ - sed -n "s/.*version \([0-9]*\.[0-9]*\).*/\1/p") - -CLANG_MAJOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f1 -d.) - -CLANG_MINOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f2 -d.) - -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -lt 35 && echo 1), 1) - CC_SUPPORTS_Z := false -endif diff --git a/mk/toolchain/clang/rte.vars.mk b/mk/toolchain/clang/rte.vars.mk deleted file mode 100644 index d441f6d8f3..0000000000 --- a/mk/toolchain/clang/rte.vars.mk +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)clang -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = clang -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers - -# disable packed member unalign warnings -ifeq ($(shell test $(CLANG_MAJOR_VERSION) -ge 4 && echo 1), 1) -WERROR_FLAGS += -Wno-address-of-packed-member -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk deleted file mode 100644 index 98dca3e786..0000000000 --- a/mk/toolchain/gcc/rte.toolchain-compat.mk +++ /dev/null @@ -1,120 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -#find out GCC version - -GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1) -GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1) -GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(CC) -E -x c - | tail -n 1) -GCC_VERSION = $(GCC_MAJOR)$(GCC_MINOR) - -HOST_GCC_MAJOR = $(shell echo __GNUC__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_VERSION = $(HOST_GCC_MAJOR)$(HOST_GCC_MINOR) - -LD_VERSION = $(shell $(LD) -v) -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(CONFIG_RTE_ARCH_X86), y) -ifneq ($(filter 2.30%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.30. See Bug 97) -endif -endif -ifneq ($(filter 2.31%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.31. See Bug 249) -endif -endif -endif - -# if GCC is older than 4.x -ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1) - MACHINE_CFLAGS = -$(warning You are using GCC < 4.x. This is neither supported, nor tested.) - - -else -# GCC graceful degradation -# GCC 4.2.x - added support for generic target -# GCC 4.3.x - added support for core2, ssse3, sse4.1, sse4.2 -# GCC 4.4.x - added support for avx, aes, pclmul -# GCC 4.5.x - added support for atom -# GCC 4.6.x - added support for corei7, corei7-avx -# GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2 -# GCC 4.9.x - added support for armv8-a+crc -# - ifeq ($(shell test $(GCC_VERSION) -le 49 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc,-march=armv8-a+crc -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc+crypto,-march=armv8-a+crc+crypto -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -le 47 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=core-avx2,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 46 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-march=core2 -maes -mpclmul -mavx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=corei7,-march=core2 -maes -mpclmul,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 45 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=atom,-march=core2 -mssse3,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 44 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -mavx -mpclmul -maes,$(MACHINE_CFLAGS)) - ifneq ($(findstring SSE4_2, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.2 - endif - ifneq ($(findstring SSE4_1, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.1 - endif - endif - ifeq ($(shell test $(GCC_VERSION) -lt 43 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -msse% -mssse%,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core2,-march=generic,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS += -msse3 - endif - ifeq ($(shell test $(GCC_VERSION) -lt 42 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -march% -mtune% -msse%,$(MACHINE_CFLAGS)) - endif - - ifeq ($(shell test $(GCC_VERSION) -lt 74 && echo 1), 1) - CONFIG_RTE_ENABLE_LTO=n - endif - - # Disable thunderx PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable OPDL PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - - # Disable OCTEON drivers and libs for arm64 gcc < 4.8.6 - ifeq ($(RTE_ARCH), arm64) - ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d - CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX_PMD=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=d - CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=d - endif - endif - -endif diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk deleted file mode 100644 index 928f0e0830..0000000000 --- a/mk/toolchain/gcc/rte.vars.mk +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)gcc -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -ifeq ($(CONFIG_RTE_LIBRTE_GCOV),y) -TOOLCHAIN_CFLAGS += --coverage -TOOLCHAIN_LDFLAGS += --coverage -ifeq (,$(findstring -O0,$(EXTRA_CFLAGS))) - $(warning "EXTRA_CFLAGS doesn't contains -O0, coverage will be inaccurate with optimizations enabled") -endif -endif - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# There are many issues reported for strict alignment architectures -# which are not necessarily fatal. Report as warnings. -ifeq ($(CONFIG_RTE_ARCH_STRICT_ALIGN),y) -WERROR_FLAGS += -Wno-error=cast-align -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -# workaround for GCC bug 81440 -ifeq ($(shell test $(GCC_VERSION) -lt 80 && echo 1), 1) -WERROR_FLAGS += -Wno-lto-type-mismatch -endif -endif - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers -# workaround GCC bug with warning "may be used uninitialized" -ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) -WERROR_FLAGS += -Wno-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -# FIXME: Bugzilla 396 -WERROR_FLAGS += -Wno-zero-length-bounds -endif - -HOST_WERROR_FLAGS := $(WERROR_FLAGS) - -ifeq ($(shell test $(HOST_GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -HOST_WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -HOST_WERROR_FLAGS += -Wno-format-truncation -endif - -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -WERROR_FLAGS += -Wno-format-truncation -endif - -# disable packed member unalign warnings -WERROR_FLAGS += -Wno-address-of-packed-member - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk deleted file mode 100644 index 2d663b34ad..0000000000 --- a/mk/toolchain/icc/rte.toolchain-compat.mk +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out ICC version - -ICC_MAJOR_VERSION = $(shell icc -dumpversion | cut -f1 -d.) - -ifeq ($(shell test $(ICC_MAJOR_VERSION) -lt 12 && echo 1), 1) - MACHINE_CFLAGS = -xSSE4.2 -$(warning You are not using ICC 12.x or higher. This is neither supported, nor tested.) - -else -# proceed to adjust compiler flags - - ICC_MINOR_VERSION = $(shell icc -dumpversion | cut -f2 -d.) - -# replace GCC flags with ICC flags - # if icc version >= 12 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 12 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -march=atom,-xSSSE3_ATOM -march=atom,$(MACHINE_CFLAGS)) - # nehalem/westmere - MACHINE_CFLAGS := $(patsubst -march=corei7,-xSSE4.2 -march=corei7,$(MACHINE_CFLAGS)) - # sandy bridge - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-xAVX,$(MACHINE_CFLAGS)) - # ivy bridge - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-xCORE-AVX-I,$(MACHINE_CFLAGS)) - # hsw - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-xCORE-AVX2,$(MACHINE_CFLAGS)) - # remove westmere flags - MACHINE_CFLAGS := $(filter-out -mpclmul -maes,$(MACHINE_CFLAGS)) - endif - # if icc version == 12.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 12 && test $(ICC_MINOR_VERSION) -eq 0 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -xSSSE3_ATOM,-xSSE3_ATOM,$(MACHINE_CFLAGS)) - # remove march options - MACHINE_CFLAGS := $(patsubst -march=%,-xSSE3,$(MACHINE_CFLAGS)) - endif - - # Disable thunderx PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable event/opdl PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - -endif diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk deleted file mode 100644 index 1729f3d849..0000000000 --- a/mk/toolchain/icc/rte.vars.mk +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -# Warning: we do not use CROSS environment variable as icc is mainly a -# x86->x86 compiler - -CC = icc -KERNELCC = gcc -CPP = cpp -AS = nasm -AR = ar -LD = ld -OBJCOPY = objcopy -OBJDUMP = objdump -STRIP = strip -READELF = readelf - -ifeq ($(KERNELRELEASE),) -HOSTCC = icc -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = -TOOLCHAIN_ASFLAGS = - -# Turn off some ICC warnings - -# Remark #271 : trailing comma is nonstandard -# Warning #1478 : function "<func_name>" (declared at line N of "<filename>") -# error #13368: loop was not vectorized with "vector always assert" -# error #15527: loop was not vectorized: function call to fprintf cannot be vectorize -# was declared "deprecated" -# Warning #11074, 11076: to prevent "inline-max-size" warnings. -WERROR_FLAGS := -Wall -w2 -diag-disable 271 -diag-warning 1478 -WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527 -WERROR_FLAGS += -diag-disable 188 -WERROR_FLAGS += -diag-disable 11074 -diag-disable 11076 -Wdeprecated - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory Ciara Power @ 2020-08-07 12:45 ` Bruce Richardson 2020-08-07 13:19 ` Jerin Jacob 0 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-07 12:45 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > It was decided [1] to no longer support Make in DPDK, this patch > removes all Makefiles that do not make use of pkg-config, along with > the mk directory previously used by make. > > [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > GNUmakefile | 17 - > Makefile | 4 - Open question from me: Do we want to leave a dummy top-level makefile that prints instructions on build with meson and ninja - or even runs a build using them if they are installed? ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 12:45 ` Bruce Richardson @ 2020-08-07 13:19 ` Jerin Jacob 2020-08-07 13:23 ` Bruce Richardson 0 siblings, 1 reply; 300+ messages in thread From: Jerin Jacob @ 2020-08-07 13:19 UTC (permalink / raw) To: Bruce Richardson; +Cc: Ciara Power, dpdk-dev, Thomas Monjalon On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson <bruce.richardson@intel.com> wrote: > > On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > > It was decided [1] to no longer support Make in DPDK, this patch > > removes all Makefiles that do not make use of pkg-config, along with > > the mk directory previously used by make. > > > > [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > > > Signed-off-by: Ciara Power <ciara.power@intel.com> > > --- > > GNUmakefile | 17 - > > Makefile | 4 - > > Open question from me: > Do we want to leave a dummy top-level makefile that prints instructions on > build with meson and ninja - or even runs a build using them if they are > installed? Maybe we can keep "make tags" as well in top-level Makefile. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 13:19 ` Jerin Jacob @ 2020-08-07 13:23 ` Bruce Richardson 2020-08-07 13:34 ` Ferruh Yigit 0 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-07 13:23 UTC (permalink / raw) To: Jerin Jacob; +Cc: Ciara Power, dpdk-dev, Thomas Monjalon On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: > On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson > <bruce.richardson@intel.com> wrote: > > > > On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > > > It was decided [1] to no longer support Make in DPDK, this patch > > > removes all Makefiles that do not make use of pkg-config, along with > > > the mk directory previously used by make. > > > > > > [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > > > > > Signed-off-by: Ciara Power <ciara.power@intel.com> > > > --- > > > GNUmakefile | 17 - > > > Makefile | 4 - > > > > Open question from me: > > Do we want to leave a dummy top-level makefile that prints instructions on > > build with meson and ninja - or even runs a build using them if they are > > installed? > > Maybe we can keep "make tags" as well in top-level Makefile. Is it better to point people directly to the script? My concern about having a makefile is that it may confuse people as to how to build DPDK. On the other side, there is a convenience aspect to having a makefile, so I'm open to being convinced either way. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 13:23 ` Bruce Richardson @ 2020-08-07 13:34 ` Ferruh Yigit 2020-08-07 14:01 ` Jerin Jacob 0 siblings, 1 reply; 300+ messages in thread From: Ferruh Yigit @ 2020-08-07 13:34 UTC (permalink / raw) To: Bruce Richardson, Jerin Jacob; +Cc: Ciara Power, dpdk-dev, Thomas Monjalon On 8/7/2020 2:23 PM, Bruce Richardson wrote: > On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: >> On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson >> <bruce.richardson@intel.com> wrote: >>> >>> On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: >>>> It was decided [1] to no longer support Make in DPDK, this patch >>>> removes all Makefiles that do not make use of pkg-config, along with >>>> the mk directory previously used by make. >>>> >>>> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html >>>> >>>> Signed-off-by: Ciara Power <ciara.power@intel.com> >>>> --- >>>> GNUmakefile | 17 - >>>> Makefile | 4 - >>> >>> Open question from me: >>> Do we want to leave a dummy top-level makefile that prints instructions on >>> build with meson and ninja - or even runs a build using them if they are >>> installed? >> >> Maybe we can keep "make tags" as well in top-level Makefile. > > Is it better to point people directly to the script? My concern about > having a makefile is that it may confuse people as to how to build DPDK. > On the other side, there is a convenience aspect to having a makefile, so > I'm open to being convinced either way. > A dummy Makefile to print instructions may be helpful for people missed the change, I am for having it. But I am dubious on extending it, like for tags, although I found it useful I think we should integrate it to meson instead. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 13:34 ` Ferruh Yigit @ 2020-08-07 14:01 ` Jerin Jacob 2020-08-07 15:05 ` Gaëtan Rivet 0 siblings, 1 reply; 300+ messages in thread From: Jerin Jacob @ 2020-08-07 14:01 UTC (permalink / raw) To: Ferruh Yigit; +Cc: Bruce Richardson, Ciara Power, dpdk-dev, Thomas Monjalon On Fri, Aug 7, 2020 at 7:04 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote: > > On 8/7/2020 2:23 PM, Bruce Richardson wrote: > > On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: > >> On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson > >> <bruce.richardson@intel.com> wrote: > >>> > >>> On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > >>>> It was decided [1] to no longer support Make in DPDK, this patch > >>>> removes all Makefiles that do not make use of pkg-config, along with > >>>> the mk directory previously used by make. > >>>> > >>>> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > >>>> > >>>> Signed-off-by: Ciara Power <ciara.power@intel.com> > >>>> --- > >>>> GNUmakefile | 17 - > >>>> Makefile | 4 - > >>> > >>> Open question from me: > >>> Do we want to leave a dummy top-level makefile that prints instructions on > >>> build with meson and ninja - or even runs a build using them if they are > >>> installed? > >> > >> Maybe we can keep "make tags" as well in top-level Makefile. > > > > Is it better to point people directly to the script? My concern about > > having a makefile is that it may confuse people as to how to build DPDK. > > On the other side, there is a convenience aspect to having a makefile, so > > I'm open to being convinced either way. I was looking more of a convenience point of view. Can we check how other meson based projects deal with similar problems? > > > > A dummy Makefile to print instructions may be helpful for people missed the > change, I am for having it. > > But I am dubious on extending it, like for tags, although I found it useful I > think we should integrate it to meson instead. I think, we can not integrate such stuff with meson. If we can with meson, I agree we should take that path. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 14:01 ` Jerin Jacob @ 2020-08-07 15:05 ` Gaëtan Rivet 2020-08-12 15:50 ` Bruce Richardson 0 siblings, 1 reply; 300+ messages in thread From: Gaëtan Rivet @ 2020-08-07 15:05 UTC (permalink / raw) To: Jerin Jacob Cc: Ferruh Yigit, Bruce Richardson, Ciara Power, dpdk-dev, Thomas Monjalon On 07/08/20 19:31 +0530, Jerin Jacob wrote: > On Fri, Aug 7, 2020 at 7:04 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote: > > > > On 8/7/2020 2:23 PM, Bruce Richardson wrote: > > > On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: > > >> On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson > > >> <bruce.richardson@intel.com> wrote: > > >>> > > >>> On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > > >>>> It was decided [1] to no longer support Make in DPDK, this patch > > >>>> removes all Makefiles that do not make use of pkg-config, along with > > >>>> the mk directory previously used by make. > > >>>> > > >>>> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > >>>> > > >>>> Signed-off-by: Ciara Power <ciara.power@intel.com> > > >>>> --- > > >>>> GNUmakefile | 17 - > > >>>> Makefile | 4 - > > >>> > > >>> Open question from me: > > >>> Do we want to leave a dummy top-level makefile that prints instructions on > > >>> build with meson and ninja - or even runs a build using them if they are > > >>> installed? > > >> > > >> Maybe we can keep "make tags" as well in top-level Makefile. > > > > > > Is it better to point people directly to the script? My concern about > > > having a makefile is that it may confuse people as to how to build DPDK. > > > On the other side, there is a convenience aspect to having a makefile, so > > > I'm open to being convinced either way. > > I was looking more of a convenience point of view. > Can we check how other meson based projects deal with similar problems? > > > > > > > > A dummy Makefile to print instructions may be helpful for people missed the > > change, I am for having it. > > > > But I am dubious on extending it, like for tags, although I found it useful I > > think we should integrate it to meson instead. > > I think, we can not integrate such stuff with meson. If we can with meson, > I agree we should take that path. +1 to provide basic and short instructions to use meson when someone tries to use make. On the other hand I think tag generation should not be part of the build system. The only dependency of build-tags.sh on make is for `make showconfigs`, they can probably be listed without using make. The scripts seems standalone, why keep make to call it? The config target could be inferred if that's the issue? -- Gaëtan ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-07 15:05 ` Gaëtan Rivet @ 2020-08-12 15:50 ` Bruce Richardson 2020-08-12 16:12 ` Jerin Jacob 0 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-12 15:50 UTC (permalink / raw) To: Gaëtan Rivet Cc: Jerin Jacob, Ferruh Yigit, Ciara Power, dpdk-dev, Thomas Monjalon On Fri, Aug 07, 2020 at 05:05:53PM +0200, Gaëtan Rivet wrote: > On 07/08/20 19:31 +0530, Jerin Jacob wrote: > > On Fri, Aug 7, 2020 at 7:04 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote: > > > > > > On 8/7/2020 2:23 PM, Bruce Richardson wrote: > > > > On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: > > > >> On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson > > > >> <bruce.richardson@intel.com> wrote: > > > >>> > > > >>> On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > > > >>>> It was decided [1] to no longer support Make in DPDK, this patch > > > >>>> removes all Makefiles that do not make use of pkg-config, along with > > > >>>> the mk directory previously used by make. > > > >>>> > > > >>>> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > > >>>> > > > >>>> Signed-off-by: Ciara Power <ciara.power@intel.com> > > > >>>> --- > > > >>>> GNUmakefile | 17 - > > > >>>> Makefile | 4 - > > > >>> > > > >>> Open question from me: > > > >>> Do we want to leave a dummy top-level makefile that prints instructions on > > > >>> build with meson and ninja - or even runs a build using them if they are > > > >>> installed? > > > >> > > > >> Maybe we can keep "make tags" as well in top-level Makefile. > > > > > > > > Is it better to point people directly to the script? My concern about > > > > having a makefile is that it may confuse people as to how to build DPDK. > > > > On the other side, there is a convenience aspect to having a makefile, so > > > > I'm open to being convinced either way. > > > > I was looking more of a convenience point of view. > > Can we check how other meson based projects deal with similar problems? > > > > > > > > > > > > A dummy Makefile to print instructions may be helpful for people missed the > > > change, I am for having it. > > > > > > But I am dubious on extending it, like for tags, although I found it useful I > > > think we should integrate it to meson instead. > > > > I think, we can not integrate such stuff with meson. If we can with meson, > > I agree we should take that path. > > +1 to provide basic and short instructions to use meson when someone > tries to use make. > > On the other hand I think tag generation should not be part of the build > system. The only dependency of build-tags.sh on make is for `make > showconfigs`, they can probably be listed without using make. > > The scripts seems standalone, why keep make to call it? The config > target could be inferred if that's the issue? > We may not actually need to do anything if we don't want to, other than put some info in the docs. https://mesonbuild.com/Release-notes-for-0-53-0.html#source-tags-targets After running "meson build", "ninja -C build ctags" creates a tags file in the root directory of my git tree, which vim picks up and uses without problems. Admittedly this is from meson 0.53 onwards, but I'm not sure how much extra effort we need to put in to support older versions for developers. Anyone hacking the code is probably using up-to-date tools anyway, one hopes! Jerin, can you perhaps check to see if there are any problems with the meson-generated tags file or if we are missing anything major compared to the script-generated one? I would hope that it's pretty complete and that we can also drop our ctags script in future too, and avoid maintaining it. /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-12 15:50 ` Bruce Richardson @ 2020-08-12 16:12 ` Jerin Jacob 2020-08-12 16:40 ` Bruce Richardson 0 siblings, 1 reply; 300+ messages in thread From: Jerin Jacob @ 2020-08-12 16:12 UTC (permalink / raw) To: Bruce Richardson Cc: Gaëtan Rivet, Ferruh Yigit, Ciara Power, dpdk-dev, Thomas Monjalon On Wed, Aug 12, 2020 at 9:20 PM Bruce Richardson <bruce.richardson@intel.com> wrote: > > On Fri, Aug 07, 2020 at 05:05:53PM +0200, Gaėtan Rivet wrote: > > On 07/08/20 19:31 +0530, Jerin Jacob wrote: > > > On Fri, Aug 7, 2020 at 7:04 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote: > > > > > > > > On 8/7/2020 2:23 PM, Bruce Richardson wrote: > > > > > On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: > > > > >> On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson > > > > >> <bruce.richardson@intel.com> wrote: > > > > >>> > > > > >>> On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > > > > >>>> It was decided [1] to no longer support Make in DPDK, this patch > > > > >>>> removes all Makefiles that do not make use of pkg-config, along with > > > > >>>> the mk directory previously used by make. > > > > >>>> > > > > >>>> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > > > >>>> > > > > >>>> Signed-off-by: Ciara Power <ciara.power@intel.com> > > > > >>>> --- > > > > >>>> GNUmakefile | 17 - > > > > >>>> Makefile | 4 - > > > > >>> > > > > >>> Open question from me: > > > > >>> Do we want to leave a dummy top-level makefile that prints instructions on > > > > >>> build with meson and ninja - or even runs a build using them if they are > > > > >>> installed? > > > > >> > > > > >> Maybe we can keep "make tags" as well in top-level Makefile. > > > > > > > > > > Is it better to point people directly to the script? My concern about > > > > > having a makefile is that it may confuse people as to how to build DPDK. > > > > > On the other side, there is a convenience aspect to having a makefile, so > > > > > I'm open to being convinced either way. > > > > > > I was looking more of a convenience point of view. > > > Can we check how other meson based projects deal with similar problems? > > > > > > > > > > > > > > > > A dummy Makefile to print instructions may be helpful for people missed the > > > > change, I am for having it. > > > > > > > > But I am dubious on extending it, like for tags, although I found it useful I > > > > think we should integrate it to meson instead. > > > > > > I think, we can not integrate such stuff with meson. If we can with meson, > > > I agree we should take that path. > > > > +1 to provide basic and short instructions to use meson when someone > > tries to use make. > > > > On the other hand I think tag generation should not be part of the build > > system. The only dependency of build-tags.sh on make is for `make > > showconfigs`, they can probably be listed without using make. > > > > The scripts seems standalone, why keep make to call it? The config > > target could be inferred if that's the issue? > > > We may not actually need to do anything if we don't want to, > other than put some info in the docs. > > https://mesonbuild.com/Release-notes-for-0-53-0.html#source-tags-targets > > After running "meson build", "ninja -C build ctags" creates a tags file in > the root directory of my git tree, which vim picks up and uses without > problems. Admittedly this is from meson 0.53 onwards, but I'm not sure how > much extra effort we need to put in to support older versions for > developers. Anyone hacking the code is probably using up-to-date tools > anyway, one hopes! > > Jerin, can you perhaps check to see if there are any problems with the > meson-generated tags file or if we are missing anything major compared to > the script-generated one? I would hope that it's pretty complete and that > we can also drop our ctags script in future too, and avoid maintaining it. I just checked rte_pause definition for x86 build, It is picking up x86, arm, ppc definition also. so meson doesn't have that kind of tag level support like the script. But I am OK to drop the script, if that's the path we are planning to take. No strong opinion. > > /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory 2020-08-12 16:12 ` Jerin Jacob @ 2020-08-12 16:40 ` Bruce Richardson 0 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-12 16:40 UTC (permalink / raw) To: Jerin Jacob Cc: Gaëtan Rivet, Ferruh Yigit, Ciara Power, dpdk-dev, Thomas Monjalon On Wed, Aug 12, 2020 at 09:42:30PM +0530, Jerin Jacob wrote: > On Wed, Aug 12, 2020 at 9:20 PM Bruce Richardson > <bruce.richardson@intel.com> wrote: > > > > On Fri, Aug 07, 2020 at 05:05:53PM +0200, Gaėtan Rivet wrote: > > > On 07/08/20 19:31 +0530, Jerin Jacob wrote: > > > > On Fri, Aug 7, 2020 at 7:04 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote: > > > > > > > > > > On 8/7/2020 2:23 PM, Bruce Richardson wrote: > > > > > > On Fri, Aug 07, 2020 at 06:49:47PM +0530, Jerin Jacob wrote: > > > > > >> On Fri, Aug 7, 2020 at 6:15 PM Bruce Richardson > > > > > >> <bruce.richardson@intel.com> wrote: > > > > > >>> > > > > > >>> On Fri, Aug 07, 2020 at 01:29:52PM +0100, Ciara Power wrote: > > > > > >>>> It was decided [1] to no longer support Make in DPDK, this patch > > > > > >>>> removes all Makefiles that do not make use of pkg-config, along with > > > > > >>>> the mk directory previously used by make. > > > > > >>>> > > > > > >>>> [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > > > > >>>> > > > > > >>>> Signed-off-by: Ciara Power <ciara.power@intel.com> > > > > > >>>> --- > > > > > >>>> GNUmakefile | 17 - > > > > > >>>> Makefile | 4 - > > > > > >>> > > > > > >>> Open question from me: > > > > > >>> Do we want to leave a dummy top-level makefile that prints instructions on > > > > > >>> build with meson and ninja - or even runs a build using them if they are > > > > > >>> installed? > > > > > >> > > > > > >> Maybe we can keep "make tags" as well in top-level Makefile. > > > > > > > > > > > > Is it better to point people directly to the script? My concern about > > > > > > having a makefile is that it may confuse people as to how to build DPDK. > > > > > > On the other side, there is a convenience aspect to having a makefile, so > > > > > > I'm open to being convinced either way. > > > > > > > > I was looking more of a convenience point of view. > > > > Can we check how other meson based projects deal with similar problems? > > > > > > > > > > > > > > > > > > > > A dummy Makefile to print instructions may be helpful for people missed the > > > > > change, I am for having it. > > > > > > > > > > But I am dubious on extending it, like for tags, although I found it useful I > > > > > think we should integrate it to meson instead. > > > > > > > > I think, we can not integrate such stuff with meson. If we can with meson, > > > > I agree we should take that path. > > > > > > +1 to provide basic and short instructions to use meson when someone > > > tries to use make. > > > > > > On the other hand I think tag generation should not be part of the build > > > system. The only dependency of build-tags.sh on make is for `make > > > showconfigs`, they can probably be listed without using make. > > > > > > The scripts seems standalone, why keep make to call it? The config > > > target could be inferred if that's the issue? > > > > > We may not actually need to do anything if we don't want to, > > other than put some info in the docs. > > > > https://mesonbuild.com/Release-notes-for-0-53-0.html#source-tags-targets > > > > After running "meson build", "ninja -C build ctags" creates a tags file in > > the root directory of my git tree, which vim picks up and uses without > > problems. Admittedly this is from meson 0.53 onwards, but I'm not sure how > > much extra effort we need to put in to support older versions for > > developers. Anyone hacking the code is probably using up-to-date tools > > anyway, one hopes! > > > > Jerin, can you perhaps check to see if there are any problems with the > > meson-generated tags file or if we are missing anything major compared to > > the script-generated one? I would hope that it's pretty complete and that > > we can also drop our ctags script in future too, and avoid maintaining it. > > I just checked rte_pause definition for x86 build, It is picking up > x86, arm, ppc definition also. > so meson doesn't have that kind of tag level support like the script. > But I am OK to drop the script, if that's the path we are planning to take. > No strong opinion. > Well, if the script is more accurate, we should keep it for now then. /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 03/19] config: remove all config files used by make 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 04/19] buildtools: remove all scripts for use with make Ciara Power ` (22 subsequent siblings) 25 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is not supported for compiling DPDK, the config files are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - 48 files changed, 1850 deletions(-) delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux deleted file mode 100644 index e942657a0f..0000000000 --- a/config/common_armv8a_linux +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv8a" - -CONFIG_RTE_ARCH="arm64" -CONFIG_RTE_ARCH_ARM64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_FORCE_INTRINSICS=y - -# Maximum available cache line size in arm64 implementations. -# Setting to maximum available cache line size in generic config -# to address minimum DMA alignment across all arm64 implementations. -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_USE_C11_MEM_MODEL=y - -# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) -# to determine the best threshold in code. Refer to notes in source file -# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info. -CONFIG_RTE_ARCH_ARM64_MEMCPY=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048 -#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512 -# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're -# strong reasons. -#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF -#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n - -CONFIG_RTE_LIBRTE_IONIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n - -# -# NXP PFE PMD Driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=y diff --git a/config/common_base b/config/common_base deleted file mode 100644 index fbf0ee70c8..0000000000 --- a/config/common_base +++ /dev/null @@ -1,1154 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -# -# String that appears before the version number -# -CONFIG_RTE_VER_PREFIX="DPDK" - -# -# Version information completed when this file is processed for a build -# -CONFIG_RTE_VER_YEAR=__YEAR -CONFIG_RTE_VER_MONTH=__MONTH -CONFIG_RTE_VER_MINOR=__MINOR -CONFIG_RTE_VER_SUFFIX=__SUFFIX -CONFIG_RTE_VER_RELEASE=__RELEASE - -# -# define executive environment -# RTE_EXEC_ENV values are the directories in mk/exec-env/ -# -CONFIG_RTE_EXEC_ENV= - -# -# define the architecture we compile for. -# RTE_ARCH values are the directories in mk/arch/ -# -CONFIG_RTE_ARCH= - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE values are the directories in mk/machine/ -# -CONFIG_RTE_MACHINE= - -# -# The compiler we use. -# RTE_TOOLCHAIN values are the directories in mk/toolchain/ -# -CONFIG_RTE_TOOLCHAIN= - -# -# Use intrinsics or assembly code for key routines -# -CONFIG_RTE_FORCE_INTRINSICS=n - -# -# Machine forces strict alignment constraints. -# -CONFIG_RTE_ARCH_STRICT_ALIGN=n - -# -# Enable link time optimization -# -CONFIG_RTE_ENABLE_LTO=n - -# -# Compile to share library -# -CONFIG_RTE_BUILD_SHARED_LIB=n - -# -# Use newest code breaking previous ABI -# -CONFIG_RTE_NEXT_ABI=y - -# -# Machine's cache line size -# -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# -# Memory model -# -CONFIG_RTE_USE_C11_MEM_MODEL=n - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_LIBRTE_EAL=y -CONFIG_RTE_MAX_LCORE=128 -CONFIG_RTE_MAX_NUMA_NODES=8 -CONFIG_RTE_MAX_HEAPS=32 -CONFIG_RTE_MAX_MEMSEG_LISTS=64 -# each memseg list will be limited to either RTE_MAX_MEMSEG_PER_LIST pages -# or RTE_MAX_MEM_MB_PER_LIST megabytes worth of memory, whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_LIST=8192 -CONFIG_RTE_MAX_MEM_MB_PER_LIST=32768 -# a "type" is a combination of page size and NUMA node. total number of memseg -# lists per type will be limited to either RTE_MAX_MEMSEG_PER_TYPE pages (split -# over multiple lists of RTE_MAX_MEMSEG_PER_LIST pages), or -# RTE_MAX_MEM_MB_PER_TYPE megabytes of memory (split over multiple lists of -# RTE_MAX_MEM_MB_PER_LIST), whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_TYPE=32768 -CONFIG_RTE_MAX_MEM_MB_PER_TYPE=131072 -# global maximum usable amount of VA, in megabytes -CONFIG_RTE_MAX_MEM_MB=524288 -CONFIG_RTE_MAX_MEMZONE=2560 -CONFIG_RTE_MAX_TAILQ=32 -CONFIG_RTE_ENABLE_ASSERT=n -CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO -CONFIG_RTE_ENABLE_TRACE_FP=n -CONFIG_RTE_LOG_HISTORY=256 -CONFIG_RTE_BACKTRACE=y -CONFIG_RTE_LIBEAL_USE_HPET=n -CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n -CONFIG_RTE_EAL_IGB_UIO=n -CONFIG_RTE_EAL_VFIO=n -CONFIG_RTE_MAX_VFIO_GROUPS=64 -CONFIG_RTE_MAX_VFIO_CONTAINERS=64 -CONFIG_RTE_MALLOC_DEBUG=n -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_USE_LIBBSD=n -# Use WFE instructions to implement the rte_wait_for_equal_xxx APIs, -# calling these APIs put the cores in low power state while waiting -# for the memory address to become equal to the expected value. -# This is supported only by aarch64. -CONFIG_RTE_ARM_USE_WFE=n - -# -# Recognize/ignore the AVX/AVX512 CPU flags for performance/power testing. -# AVX512 is marked as experimental for now, will enable it after enough -# field test and possible optimization. -# -CONFIG_RTE_ENABLE_AVX=y -CONFIG_RTE_ENABLE_AVX512=n - -# Use ARM LSE ATOMIC instructions -CONFIG_RTE_ARM_FEATURE_ATOMICS=n - -# Default driver path (or "" to disable) -CONFIG_RTE_EAL_PMD_PATH="" - -# -# Compile Environment Abstraction Layer to support Vmware TSC map -# -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y - -# -# Compile the PCI library -# -CONFIG_RTE_LIBRTE_PCI=y - -# -# Compile the argument parser library -# -CONFIG_RTE_LIBRTE_KVARGS=y - -# -# Compile generic ethernet library -# -CONFIG_RTE_LIBRTE_ETHER=y -CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n -CONFIG_RTE_MAX_ETHPORTS=32 -CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 -CONFIG_RTE_LIBRTE_IEEE1588=n -CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16 -CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y -CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE=n - -# -# Turn off Tx preparation stage -# -# Warning: rte_eth_tx_prepare() can be safely disabled only if using a -# driver which do not implement any Tx preparation. -# -CONFIG_RTE_ETHDEV_TX_PREPARE_NOOP=n - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n - -# -# Compile the Intel FPGA bus -# -CONFIG_RTE_LIBRTE_IFPGA_BUS=y - -# -# Compile PCI bus driver -# -CONFIG_RTE_LIBRTE_PCI_BUS=y - -# -# Compile the vdev bus -# -CONFIG_RTE_LIBRTE_VDEV_BUS=y - -# -# Compile ARK PMD -# -CONFIG_RTE_LIBRTE_ARK_PMD=y -CONFIG_RTE_LIBRTE_ARK_PAD_TX=y -CONFIG_RTE_LIBRTE_ARK_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE=n - -# -# Compile Aquantia Atlantic PMD driver -# -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=y - -# -# Compile AMD PMD -# -CONFIG_RTE_LIBRTE_AXGBE_PMD=y -CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG=n - -# -# Compile burst-oriented Broadcom PMD driver -# -CONFIG_RTE_LIBRTE_BNX2X_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n -CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC=n - -# -# Compile burst-oriented Broadcom BNXT PMD driver -# -CONFIG_RTE_LIBRTE_BNXT_PMD=y - -# -# Compile burst-oriented Chelsio Terminator (CXGBE) PMD -# -CONFIG_RTE_LIBRTE_CXGBE_PMD=y - -# -# Compile burst-oriented NXP PFE PMD driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n - -# -# Compile NXP DPAA2 FSL-MC Bus -# -CONFIG_RTE_LIBRTE_FSLMC_BUS=n - -# -# Compile Support Libraries for NXP DPAA2 -# -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y - -# -# Compile burst-oriented NXP DPAA2 PMD driver -# -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n - -# -# Compile NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# -# Compile burst-oriented Amazon ENA PMD driver -# -CONFIG_RTE_LIBRTE_ENA_PMD=y -CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n - -# -# Compile burst-oriented Cisco ENIC PMD driver -# -CONFIG_RTE_LIBRTE_ENIC_PMD=y - -# -# Compile burst-oriented IGB & EM PMD drivers -# -CONFIG_RTE_LIBRTE_EM_PMD=y -CONFIG_RTE_LIBRTE_IGB_PMD=y -CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n - -# -# Compile burst-oriented HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# Compile burst-oriented HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n - -# -# Compile Pensando IONIC PMD driver -# -CONFIG_RTE_LIBRTE_IONIC_PMD=y - -# -# Compile burst-oriented IXGBE PMD driver -# -CONFIG_RTE_LIBRTE_IXGBE_PMD=y -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n -CONFIG_RTE_LIBRTE_IXGBE_BYPASS=n - -# -# Compile burst-oriented I40E PMD driver -# -CONFIG_RTE_LIBRTE_I40E_PMD=y -CONFIG_RTE_LIBRTE_I40E_DEBUG_RX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y -CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64 -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4 - -# -# Compile burst-oriented FM10K PMD -# -CONFIG_RTE_LIBRTE_FM10K_PMD=y -CONFIG_RTE_LIBRTE_FM10K_DEBUG_RX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE=y -CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y - -# -# Compile burst-oriented ICE PMD driver -# -CONFIG_RTE_LIBRTE_ICE_PMD=y -CONFIG_RTE_LIBRTE_ICE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n - -# Compile burst-oriented IAVF PMD driver -# -CONFIG_RTE_LIBRTE_IAVF_PMD=y -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC=n -CONFIG_RTE_LIBRTE_IAVF_16BYTE_RX_DESC=n -# -# Compile burst-oriented IPN3KE PMD driver -# -CONFIG_RTE_LIBRTE_IPN3KE_PMD=n - -# -# Compile burst-oriented IGC PMD drivers -# -CONFIG_RTE_LIBRTE_IGC_PMD=y -CONFIG_RTE_LIBRTE_IGC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IGC_DEBUG_TX=n - -# -# Compile burst-oriented Mellanox ConnectX-3 (MLX4) PMD -# -CONFIG_RTE_LIBRTE_MLX4_PMD=n -CONFIG_RTE_LIBRTE_MLX4_DEBUG=n - -# -# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, -# ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_PMD=n -CONFIG_RTE_LIBRTE_MLX5_DEBUG=n - -# -# Compile regex-oriented Mellanox PMD -# -CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD=n - -# -# Compile vdpa-oriented Mellanox ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=n - -# Linking method for mlx4/5 dependency on ibverbs and related libraries -# Default linking is dynamic by linker. -# Other options are: dynamic by dlopen at run-time, or statically embedded. -CONFIG_RTE_IBVERBS_LINK_DLOPEN=n -CONFIG_RTE_IBVERBS_LINK_STATIC=n - -# -# Compile burst-oriented Netronome NFP PMD driver -# -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n - -# QLogic 10G/25G/40G/50G/100G PMD -# -CONFIG_RTE_LIBRTE_QEDE_PMD=y -CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n -#Provides abs path/name of the firmware file. -#Empty string denotes driver will use default firmware -CONFIG_RTE_LIBRTE_QEDE_FW="" - -# -# Compile burst-oriented Solarflare libefx-based PMD -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=y -CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n - -# -# Compile software PMD backed by SZEDATA2 device -# -CONFIG_RTE_LIBRTE_PMD_SZEDATA2=n - -# -# Compile software PMD backed by NFB device -# -CONFIG_RTE_LIBRTE_NFB_PMD=n - -# -# Compile burst-oriented Cavium Thunderx NICVF PMD driver -# -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=y -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX=n - -# -# Compile burst-oriented Cavium LiquidIO PMD driver -# -CONFIG_RTE_LIBRTE_LIO_PMD=y -CONFIG_RTE_LIBRTE_LIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n - -# -# Compile burst-oriented Cavium OCTEONTX network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX_PMD=y - -# -# Compile burst-oriented Marvell OCTEON TX2 network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=y - -# -# Compile WRS accelerated virtual port (AVP) guest PMD driver -# -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_RX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n - -# -# Compile burst-oriented VIRTIO PMD driver -# -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n - -# -# Compile virtio device emulation inside virtio PMD driver -# -CONFIG_RTE_VIRTIO_USER=n - -# -# Compile burst-oriented VMXNET3 PMD driver -# -CONFIG_RTE_LIBRTE_VMXNET3_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n - -# -# Compile software PMD backed by AF_PACKET sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=n - -# -# Compile software PMD backed by AF_XDP sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_XDP=n - -# -# Compile Memory Interface PMD driver (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_MEMIF=n - -# -# Compile link bonding PMD library -# -CONFIG_RTE_LIBRTE_PMD_BOND=y -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n - -# -# Compile fail-safe PMD -# -CONFIG_RTE_LIBRTE_PMD_FAILSAFE=y - -# -# Compile Marvell PMD driver -# -CONFIG_RTE_LIBRTE_MVPP2_PMD=n - -# -# Compile Marvell MVNETA PMD driver -# -CONFIG_RTE_LIBRTE_MVNETA_PMD=n - -# -# Compile support for VMBus library -# -CONFIG_RTE_LIBRTE_VMBUS=n - -# -# Compile native PMD for Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_NETVSC_PMD=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_DUMP=n - -# -# Compile virtual device driver for NetVSC on Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=n - -# -# Compile null PMD -# -CONFIG_RTE_LIBRTE_PMD_NULL=y - -# -# Compile software PMD backed by PCAP files -# -CONFIG_RTE_LIBRTE_PMD_PCAP=n - -# -# Compile example software rings based PMD -# -CONFIG_RTE_LIBRTE_PMD_RING=y -CONFIG_RTE_PMD_RING_MAX_RX_RINGS=16 -CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 - -# -# Compile SOFTNIC PMD -# -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=n - -# -# Compile the TAP PMD -# It is enabled by default for Linux only. -# -CONFIG_RTE_LIBRTE_PMD_TAP=n - -# -# Do prefetch of packet data within PMD driver receive function -# -CONFIG_RTE_PMD_PACKET_PREFETCH=y - -# Compile generic wireless base band device library -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_BBDEV=y -CONFIG_RTE_LIBRTE_BBDEV_DEBUG=n -CONFIG_RTE_BBDEV_MAX_DEVS=128 -CONFIG_RTE_BBDEV_OFFLOAD_COST=y -CONFIG_RTE_BBDEV_SDK_AVX2=n -CONFIG_RTE_BBDEV_SDK_AVX512=n - -# -# Compile PMD for NULL bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL=y - -# -# Compile PMD for turbo software bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y - -# -# Compile PMD for Intel FPGA LTE FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y - -# -# Compile PMD for Intel FPGA 5GNR FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC=y - -# -# Compile generic crypto device library -# -CONFIG_RTE_LIBRTE_CRYPTODEV=y -CONFIG_RTE_CRYPTO_MAX_DEVS=64 - -# -# Compile PMD for ARMv8 Crypto device -# -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n - -# -# Compile NXP CAAM JR crypto Driver -# -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE=n - -# -# Compile NXP DPAA2 crypto sec driver for CAAM HW -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n - -# -# NXP DPAA caam - crypto driver -# -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4 - -# -# Compile PMD for Cavium OCTEON TX crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y - -# -# Compile PMD for Marvell OCTEON TX2 crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y - -# -# Compile PMD for QuickAssist based devices - see docs for details -# -CONFIG_RTE_LIBRTE_PMD_QAT=y -CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n -CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n -# -# Max. number of QuickAssist devices, which can be detected and attached -# -CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 -CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -# -# Compile PMD for virtio crypto devices -# -CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y -# -# Number of maximum virtio crypto devices -# -CONFIG_RTE_MAX_VIRTIO_CRYPTO=32 - -# -# Compile PMD for AESNI backed device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# Compile PMD for Software backed device -# -CONFIG_RTE_LIBRTE_PMD_OPENSSL=n - -# -# Compile PMD for AESNI GCM device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# Compile PMD for SNOW 3G device -# -CONFIG_RTE_LIBRTE_PMD_SNOW3G=n -CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG=n - -# -# Compile PMD for KASUMI device -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# Compile PMD for ZUC device -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# Compile PMD for Crypto Scheduler device -# -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y - -# -# Compile PMD for NULL Crypto device -# -CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=y - -# -# Compile PMD for AMD CCP crypto device -# -CONFIG_RTE_LIBRTE_PMD_CCP=n - -# -# Compile PMD for Marvell Crypto device -# -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=n - -# -# Compile PMD for NITROX crypto device -# -CONFIG_RTE_LIBRTE_PMD_NITROX=y - -# -# Compile generic security library -# -CONFIG_RTE_LIBRTE_SECURITY=y - -# -# Compile generic compression device library -# -CONFIG_RTE_LIBRTE_COMPRESSDEV=y -CONFIG_RTE_COMPRESS_MAX_DEVS=64 - -# -# Compile compressdev unit test -# -CONFIG_RTE_COMPRESSDEV_TEST=n - -# -# Compile PMD for Octeontx ZIPVF compression device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF=y - -# -# Compile PMD for ISA-L compression device -# -CONFIG_RTE_LIBRTE_PMD_ISAL=n - -# -# Compile PMD for ZLIB compression device -# -CONFIG_RTE_LIBRTE_PMD_ZLIB=n - -# -# Compile RegEx device support -# -CONFIG_RTE_LIBRTE_REGEXDEV=y -CONFIG_RTE_LIBRTE_REGEXDEV_DEBUG=n -CONFIG_RTE_MAX_REGEXDEV_DEVS=32 - -# -# Compile generic event device library -# -CONFIG_RTE_LIBRTE_EVENTDEV=y -CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n -CONFIG_RTE_EVENT_MAX_DEVS=16 -CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64 -CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32 -CONFIG_RTE_EVENT_ETH_INTR_RING_SIZE=1024 -CONFIG_RTE_EVENT_CRYPTO_ADAPTER_MAX_INSTANCE=32 -CONFIG_RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE=32 - -# -# Compile PMD for skeleton event device -# -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG=n - -# -# Compile PMD for software event device -# -CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y - -# -# Compile PMD for distributed software event device -# -CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV=y - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y - -# -# Compile PMD for octeontx2 sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=y - -# -# Compile PMD for OPDL event device -# -CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=y - -# -# Compile PMD for NXP DPAA event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n - -# -# Compile PMD for NXP DPAA2 event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n - -# -# Compile raw device support -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_RAWDEV=y -CONFIG_RTE_RAWDEV_MAX_DEVS=64 -CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV=y - -# -# Compile PMD for NXP DPAA2 CMDIF raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n - -# -# Compile PMD for NXP DPAA2 QDMA raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n - -# -# Compile PMD for Intel FPGA raw device -# -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n - -# -# Compile PMD for Intel IOAT raw device -# -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=y - -# -# Compile PMD for octeontx2 DMA raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=y - -# -# Compile PMD for octeontx2 EP raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=y - -# -# Compile PMD for NTB raw device -# -CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV=y - -# -# Compile librte_ring -# -CONFIG_RTE_LIBRTE_RING=y - -# -# Compile librte_stack -# -CONFIG_RTE_LIBRTE_STACK=y - -# -# Compile librte_mempool -# -CONFIG_RTE_LIBRTE_MEMPOOL=y -CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512 -CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n - -# -# Compile Mempool drivers -# -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET=y -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB=64 -CONFIG_RTE_DRIVER_MEMPOOL_RING=y -CONFIG_RTE_DRIVER_MEMPOOL_STACK=y - -# -# Compile PMD for octeontx fpa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=y - -# -# Compile PMD for octeontx2 npa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=y - -# -# Compile librte_mbuf -# -CONFIG_RTE_LIBRTE_MBUF=y -CONFIG_RTE_LIBRTE_MBUF_DEBUG=n -CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="ring_mp_mc" -CONFIG_RTE_MBUF_REFCNT_ATOMIC=y -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# -# Compile librte_timer -# -CONFIG_RTE_LIBRTE_TIMER=y -CONFIG_RTE_LIBRTE_TIMER_DEBUG=n - -# -# Compile librte_cfgfile -# -CONFIG_RTE_LIBRTE_CFGFILE=y - -# -# Compile librte_cmdline -# -CONFIG_RTE_LIBRTE_CMDLINE=y -CONFIG_RTE_LIBRTE_CMDLINE_DEBUG=n - -# -# Compile librte_hash -# -CONFIG_RTE_LIBRTE_HASH=y -CONFIG_RTE_LIBRTE_HASH_DEBUG=n - -# -# Compile librte_efd -# -CONFIG_RTE_LIBRTE_EFD=y - -# -# Compile librte_member -# -CONFIG_RTE_LIBRTE_MEMBER=y - -# -# Compile librte_jobstats -# -CONFIG_RTE_LIBRTE_JOBSTATS=y - -# -# Compile the device metrics library -# -CONFIG_RTE_LIBRTE_METRICS=y - -# -# Compile the bitrate statistics library -# -CONFIG_RTE_LIBRTE_BITRATE=y - -# -# Compile the latency statistics library -# -CONFIG_RTE_LIBRTE_LATENCY_STATS=y - -# -# Compile librte_telemetry legacy support -# -CONFIG_RTE_LIBRTE_TELEMETRY=n - -# -# Compile librte_rcu -# -CONFIG_RTE_LIBRTE_RCU=y -CONFIG_RTE_LIBRTE_RCU_DEBUG=n - -# -# Compile librte_rib -# -CONFIG_RTE_LIBRTE_RIB=y - -# -# Compile librte_fib -# -CONFIG_RTE_LIBRTE_FIB=y -CONFIG_RTE_LIBRTE_FIB_DEBUG=n - -# -# Compile librte_lpm -# -CONFIG_RTE_LIBRTE_LPM=y -CONFIG_RTE_LIBRTE_LPM_DEBUG=n - -# -# Compile librte_acl -# -CONFIG_RTE_LIBRTE_ACL=y -CONFIG_RTE_LIBRTE_ACL_DEBUG=n - -# -# Compile librte_power -# -CONFIG_RTE_LIBRTE_POWER=n -CONFIG_RTE_LIBRTE_POWER_DEBUG=n -CONFIG_RTE_MAX_LCORE_FREQS=64 - -# -# Compile librte_net -# -CONFIG_RTE_LIBRTE_NET=y - -# -# Compile librte_ip_frag -# -CONFIG_RTE_LIBRTE_IP_FRAG=y -CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n -CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4 -CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n - -# -# Compile GRO library -# -CONFIG_RTE_LIBRTE_GRO=y - -# -# Compile GSO library -# -CONFIG_RTE_LIBRTE_GSO=y - -# -# Compile librte_meter -# -CONFIG_RTE_LIBRTE_METER=y - -# -# Compile librte_classify -# -CONFIG_RTE_LIBRTE_FLOW_CLASSIFY=y - -# -# Compile librte_sched -# -CONFIG_RTE_LIBRTE_SCHED=y -CONFIG_RTE_SCHED_DEBUG=n -CONFIG_RTE_SCHED_RED=n -CONFIG_RTE_SCHED_COLLECT_STATS=n -CONFIG_RTE_SCHED_SUBPORT_TC_OV=n -CONFIG_RTE_SCHED_PORT_N_GRINDERS=8 -CONFIG_RTE_SCHED_VECTOR=n - -# -# Compile the distributor library -# -CONFIG_RTE_LIBRTE_DISTRIBUTOR=y - -# -# Compile the reorder library -# -CONFIG_RTE_LIBRTE_REORDER=y - -# -# Compile librte_port -# -CONFIG_RTE_LIBRTE_PORT=y -CONFIG_RTE_PORT_STATS_COLLECT=n -CONFIG_RTE_PORT_PCAP=n - -# -# Compile librte_table -# -CONFIG_RTE_LIBRTE_TABLE=y -CONFIG_RTE_TABLE_STATS_COLLECT=n - -# -# Compile librte_pipeline -# -CONFIG_RTE_LIBRTE_PIPELINE=y -CONFIG_RTE_PIPELINE_STATS_COLLECT=n - -# -# Compile librte_kni -# -CONFIG_RTE_LIBRTE_KNI=n -CONFIG_RTE_LIBRTE_PMD_KNI=n -CONFIG_RTE_KNI_KMOD=n -CONFIG_RTE_KNI_PREEMPT_DEFAULT=y - -# -# Compile the pdump library -# -CONFIG_RTE_LIBRTE_PDUMP=y - -# -# Compile vhost user library -# -CONFIG_RTE_LIBRTE_VHOST=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n -CONFIG_RTE_LIBRTE_VHOST_DEBUG=n - -# -# Compile vhost PMD -# To compile, CONFIG_RTE_LIBRTE_VHOST should be enabled. -# -CONFIG_RTE_LIBRTE_PMD_VHOST=n - -# -# Compile IFC driver -# To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO -# should be enabled. -# -CONFIG_RTE_LIBRTE_IFC_PMD=n - -# -# Compile librte_bpf -# -CONFIG_RTE_LIBRTE_BPF=y -# allow load BPF from ELF files (requires libelf) -CONFIG_RTE_LIBRTE_BPF_ELF=n - -# -# Compile librte_ipsec -# -CONFIG_RTE_LIBRTE_IPSEC=y - -# -# Compile librte_graph -# -CONFIG_RTE_LIBRTE_GRAPH=y -CONFIG_RTE_GRAPH_BURST_SIZE=256 -CONFIG_RTE_LIBRTE_GRAPH_STATS=y - -# -# Compile librte_node -# -CONFIG_RTE_LIBRTE_NODE=y - -# -# Compile the test application -# -CONFIG_RTE_APP_TEST=y -CONFIG_RTE_APP_TEST_RESOURCE_TAR=n - -# -# Compile the procinfo application -# -CONFIG_RTE_PROC_INFO=n - -# -# Compile the PMD test application -# -CONFIG_RTE_TEST_PMD=y -CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n -CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n - -# -# Compile the rte flow perf application -# -CONFIG_RTE_TEST_FLOW_PERF=y - -# -# Compile the bbdev test application -# -CONFIG_RTE_TEST_BBDEV=y - -# -# Compile the compression performance application -# -CONFIG_RTE_APP_COMPRESS_PERF=y - -# -# Compile the crypto performance application -# -CONFIG_RTE_APP_CRYPTO_PERF=y - -# -# Compile the eventdev application -# -CONFIG_RTE_APP_EVENTDEV=y diff --git a/config/common_freebsd b/config/common_freebsd deleted file mode 100644 index 456b394c4d..0000000000 --- a/config/common_freebsd +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="bsdapp" -CONFIG_RTE_EXEC_ENV_BSDAPP=y -CONFIG_RTE_EXEC_ENV_FREEBSD=y - -# -# FreeBSD contiguous memory driver settings -# -CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64 -CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2 -CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024 diff --git a/config/common_linux b/config/common_linux deleted file mode 100644 index 816810671a..0000000000 --- a/config/common_linux +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="linuxapp" -CONFIG_RTE_EXEC_ENV_LINUX=y -CONFIG_RTE_EXEC_ENV_LINUXAPP=y - -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y -CONFIG_RTE_EAL_VFIO=y -CONFIG_RTE_LIBRTE_KNI=y -CONFIG_RTE_LIBRTE_PMD_KNI=y -CONFIG_RTE_LIBRTE_VHOST=y -CONFIG_RTE_LIBRTE_VHOST_NUMA=y -CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n -CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFC_PMD=y -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y -CONFIG_RTE_LIBRTE_PMD_MEMIF=y -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y -CONFIG_RTE_LIBRTE_PMD_TAP=y -CONFIG_RTE_LIBRTE_AVP_PMD=y -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y -CONFIG_RTE_LIBRTE_NFP_PMD=y -CONFIG_RTE_LIBRTE_POWER=y -CONFIG_RTE_VIRTIO_USER=y -CONFIG_RTE_PROC_INFO=y - -CONFIG_RTE_LIBRTE_VMBUS=y -CONFIG_RTE_LIBRTE_NETVSC_PMD=y - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=y - -# NXP DPAA BUS and drivers -CONFIG_RTE_LIBRTE_DPAA_BUS=y -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y - -# NXP FSLMC BUS and DPAA2 drivers -CONFIG_RTE_LIBRTE_FSLMC_BUS=y -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA2_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y - -# -# NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=y - -# -# HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=y - -# -# Hisilicon HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=y diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc deleted file mode 120000 index 84619de43a..0000000000 --- a/config/defconfig_arm-armv7a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm-armv7a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc deleted file mode 100644 index ac91120868..0000000000 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All right reserved. - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv7a" - -CONFIG_RTE_ARCH="arm" -CONFIG_RTE_ARCH_ARM=y -CONFIG_RTE_ARCH_ARMv7=y -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a9" - -# Accelerate memcpy operations. Consider enabling for Cortex-A15. -# For Cortex-A7 and Cortex-A9, It might accelerate short data copies (< 64 B). -CONFIG_RTE_ARCH_ARM_NEON_MEMCPY=n - -CONFIG_RTE_FORCE_INTRINSICS=y -CONFIG_RTE_ARCH_STRICT_ALIGN=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# NUMA is not supported on ARM -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# ARM doesn't have support for vmware TSC map -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# KNI is not supported on 32-bit -CONFIG_RTE_LIBRTE_KNI=n - -# cannot use those on ARM -CONFIG_RTE_LIBRTE_ARK_PMD=n -CONFIG_RTE_LIBRTE_EM_PMD=n -CONFIG_RTE_LIBRTE_IGB_PMD=n -CONFIG_RTE_LIBRTE_CXGBE_PMD=n -CONFIG_RTE_LIBRTE_E1000_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_QEDE_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_arm64-armada-linux-gcc b/config/defconfig_arm64-armada-linux-gcc deleted file mode 120000 index 64ce2a5687..0000000000 --- a/config/defconfig_arm64-armada-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armada-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armada-linuxapp-gcc b/config/defconfig_arm64-armada-linuxapp-gcc deleted file mode 100644 index a49bebe374..0000000000 --- a/config/defconfig_arm64-armada-linuxapp-gcc +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Enable PMDs -CONFIG_RTE_LIBRTE_MVEP_COMMON=y -CONFIG_RTE_LIBRTE_MVPP2_PMD=y -CONFIG_RTE_LIBRTE_MVNETA_PMD=y -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y - -# Disable NXP as it is conflict with MUSDK -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n -CONFIG_RTE_LIBRTE_FSLMC_BUS=n -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n -CONFIG_RTE_LIBRTE_PFE_PMD=n -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang deleted file mode 120000 index 196808b982..0000000000 --- a/config/defconfig_arm64-armv8a-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linux-gcc b/config/defconfig_arm64-armv8a-linux-gcc deleted file mode 120000 index 0949519562..0000000000 --- a/config/defconfig_arm64-armv8a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang b/config/defconfig_arm64-armv8a-linuxapp-clang deleted file mode 100644 index d3b4dad532..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-clang +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc deleted file mode 100644 index 58c4a4029a..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_MAX_LCORE=256 diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc deleted file mode 120000 index dad37d5e79..0000000000 --- a/config/defconfig_arm64-bluefield-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-bluefield-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-bluefield-linuxapp-gcc b/config/defconfig_arm64-bluefield-linuxapp-gcc deleted file mode 100644 index b496538819..0000000000 --- a/config/defconfig_arm64-bluefield-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Mellanox BlueField -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# UMA architecture -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# PMD for ConnectX-5 -CONFIG_RTE_LIBRTE_MLX5_PMD=y diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc deleted file mode 120000 index dc05caacf3..0000000000 --- a/config/defconfig_arm64-dpaa-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-dpaa-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc deleted file mode 100644 index 4ae4cd8502..0000000000 --- a/config/defconfig_arm64-dpaa-linuxapp-gcc +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 Freescale Semiconductor, Inc. -# Copyright 2017-2019 NXP - -#include "defconfig_arm64-armv8a-linux-gcc" - -# NXP (Freescale) - Soc Architecture for DPAA or DPAA2 support -# DPAA - FMAN, QMAN & BMAN support (e.g. LS1043, LS1046) -# DPAA2 - WRIOP and QBMAN (e.g. LS1088, LS2088, LX2160 etc) -# -CONFIG_RTE_MACHINE="dpaa" -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Enable PHY mode when using VM-VFIO target -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc deleted file mode 120000 index 21894a31a8..0000000000 --- a/config/defconfig_arm64-emag-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-emag-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc deleted file mode 100644 index 1db654c899..0000000000 --- a/config/defconfig_arm64-emag-linuxapp-gcc +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="emag" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=32 diff --git a/config/defconfig_arm64-n1sdp-linux-gcc b/config/defconfig_arm64-n1sdp-linux-gcc deleted file mode 120000 index 103bbea90f..0000000000 --- a/config/defconfig_arm64-n1sdp-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-n1sdp-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-n1sdp-linuxapp-gcc b/config/defconfig_arm64-n1sdp-linuxapp-gcc deleted file mode 100644 index f9138093b5..0000000000 --- a/config/defconfig_arm64-n1sdp-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="n1sdp" -CONFIG_RTE_MAX_LCORE=4 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-octeontx2-linux-gcc b/config/defconfig_arm64-octeontx2-linux-gcc deleted file mode 120000 index e251505311..0000000000 --- a/config/defconfig_arm64-octeontx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-octeontx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc deleted file mode 100644 index 0d83becf54..0000000000 --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="octeontx2" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=36 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Max supported NIX LFs -CONFIG_RTE_MAX_VFIO_GROUPS=128 diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc deleted file mode 120000 index 829dd65f05..0000000000 --- a/config/defconfig_arm64-stingray-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-stingray-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc deleted file mode 100644 index 2a6f6cee28..0000000000 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) Broadcom 2017-2018. All rights reserved. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Broadcom - Stingray -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -CONFIG_RTE_EAL_IGB_UIO=y diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc deleted file mode 120000 index 1b9c4ad211..0000000000 --- a/config/defconfig_arm64-thunderx-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc deleted file mode 100644 index 946906b67a..0000000000 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx" - -CONFIG_RTE_USE_C11_MEM_MODEL=n -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=96 -CONFIG_RTE_MAX_VFIO_GROUPS=128 - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y diff --git a/config/defconfig_arm64-thunderx2-linux-gcc b/config/defconfig_arm64-thunderx2-linux-gcc deleted file mode 120000 index b40a760b1d..0000000000 --- a/config/defconfig_arm64-thunderx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc b/config/defconfig_arm64-thunderx2-linuxapp-gcc deleted file mode 100644 index af4a89c480..0000000000 --- a/config/defconfig_arm64-thunderx2-linuxapp-gcc +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx2" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=256 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc deleted file mode 120000 index d5e8b5e550..0000000000 --- a/config/defconfig_arm64-xgene1-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-xgene1-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-xgene1-linuxapp-gcc b/config/defconfig_arm64-xgene1-linuxapp-gcc deleted file mode 100644 index fbf576c4aa..0000000000 --- a/config/defconfig_arm64-xgene1-linuxapp-gcc +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="xgene1" -CONFIG_RTE_CACHE_LINE_SIZE=64 diff --git a/config/defconfig_i686-native-linux-gcc b/config/defconfig_i686-native-linux-gcc deleted file mode 120000 index 927141d5dd..0000000000 --- a/config/defconfig_i686-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_i686-native-linux-icc b/config/defconfig_i686-native-linux-icc deleted file mode 120000 index e6a466b3e3..0000000000 --- a/config/defconfig_i686-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc deleted file mode 100644 index 61ea1606f4..0000000000 --- a/config/defconfig_i686-native-linuxapp-gcc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc deleted file mode 100644 index 7f614d3467..0000000000 --- a/config/defconfig_i686-native-linuxapp-icc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc deleted file mode 120000 index 580c92e12e..0000000000 --- a/config/defconfig_ppc_64-power8-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_ppc_64-power8-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc deleted file mode 100644 index c917c47746..0000000000 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -#include "common_linux" - -CONFIG_RTE_MACHINE="power8" - -CONFIG_RTE_ARCH="ppc_64" -CONFIG_RTE_ARCH_PPC_64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_MAX_LCORE=1536 -CONFIG_RTE_MAX_NUMA_NODES=32 -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# Note: Power doesn't have this support -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# Note: Initially, all of the PMD drivers compilation are turned off on Power -# Will turn on them only after the successful testing on Power -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=n -CONFIG_RTE_LIBRTE_IXGBE_PMD=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang deleted file mode 100644 index 7204738e14..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc deleted file mode 100644 index b24e2e6d5a..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang deleted file mode 120000 index 76115fd5a6..0000000000 --- a/config/defconfig_x86_64-native-freebsd-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-freebsd-gcc b/config/defconfig_x86_64-native-freebsd-gcc deleted file mode 120000 index 72dd4b44be..0000000000 --- a/config/defconfig_x86_64-native-freebsd-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-clang b/config/defconfig_x86_64-native-linux-clang deleted file mode 120000 index 3bcf89d6a4..0000000000 --- a/config/defconfig_x86_64-native-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-gcc b/config/defconfig_x86_64-native-linux-gcc deleted file mode 120000 index d707965941..0000000000 --- a/config/defconfig_x86_64-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-icc b/config/defconfig_x86_64-native-linux-icc deleted file mode 120000 index a36b47131a..0000000000 --- a/config/defconfig_x86_64-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang deleted file mode 100644 index 7508c0f2da..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc deleted file mode 100644 index db67066a57..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc deleted file mode 100644 index 8aa7af7e20..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-icc +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# Solarflare PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# HINIC PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc deleted file mode 120000 index 7ea00cecb3..0000000000 --- a/config/defconfig_x86_x32-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_x32-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc deleted file mode 100644 index c188f4331c..0000000000 --- a/config/defconfig_x86_x32-native-linuxapp-gcc +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_x32" -CONFIG_RTE_ARCH_X86_X32=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 04/19] buildtools: remove all scripts for use with make 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (2 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 03/19] config: remove all config files used by make Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-12 21:54 ` Thomas Monjalon 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides Ciara Power ` (21 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, scripts used with make are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- buildtools/auto-config-h.sh | 108 ------------------------------------ buildtools/gen-build-mk.sh | 23 -------- buildtools/gen-config-h.sh | 15 ----- buildtools/relpath.sh | 76 ------------------------- 4 files changed, 222 deletions(-) delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100755 buildtools/relpath.sh diff --git a/buildtools/auto-config-h.sh b/buildtools/auto-config-h.sh deleted file mode 100755 index 5b613c35fc..0000000000 --- a/buildtools/auto-config-h.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2015 6WIND S.A. -# -# Crude script to detect whether particular types, macros and functions are -# defined by trying to compile a file with a given header. Can be used to -# perform cross-platform checks since the resulting object file is not -# executed. -# -# Set VERBOSE=1 in the environment to display compiler output and errors. -# -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS and EXTRA_CFLAGS are taken from the -# environment. -# -# AUTO_CONFIG_CFLAGS may append additional CFLAGS without modifying the -# above variables. - -file=${1:?output file name required (config.h)} -macro=${2:?output macro name required (HAVE_*)} -include=${3:?include name required (foo.h)} -type=${4:?object type required (define, enum, type, field, func)} -name=${5:?define/type/function name required} - -: ${CC:=cc} - -temp=$(mktemp -t dpdk.${0##*/}.c.XXXXXX) - -case $type in -define) - code="\ -#ifndef $name -#error $name not defined -#endif -" - ;; -enum) - code="\ -long test____ = $name; -" - ;; -type) - code="\ -$name test____; -" - ;; -field) - code="\ -void test____(void) -{ - ${name%%.*} test_____; - - (void)test_____.${name#*.}; -} -" - ;; -func) - code="\ -void (*test____)() = (void (*)())$name; -" - ;; -*) - unset error - : ${error:?unknown object type \"$type\"} - exit -esac - -if [ "${VERBOSE}" = 1 ] -then - err=2 - out=1 - eol=' -' -else - exec 3> /dev/null || - exit - err=3 - out=3 - eol=' ' -fi && -printf 'Looking for %s %s in %s.%s' \ - "${name}" "${type}" "${include}" "${eol}" && -printf "\ -#include <%s> - -%s -" "$include" "$code" > "${temp}" && -if ${CC} ${CPPFLAGS} ${EXTRA_CPPFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ - ${AUTO_CONFIG_CFLAGS} \ - -xc -c -o ${temp}.o "${temp}" 1>&${out} 2>&${err} -then - rm -f "${temp}" "${temp}.o" - printf "\ -#ifndef %s -#define %s 1 -#endif /* %s */ - -" "${macro}" "${macro}" "${macro}" >> "${file}" && - printf 'Defining %s.\n' "${macro}" -else - rm -f "${temp}" "${temp}.o" - printf "\ -/* %s is not defined. */ - -" "${macro}" >> "${file}" && - printf 'Not defining %s.\n' "${macro}" -fi - -exit diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh deleted file mode 100755 index 636920b638..0000000000 --- a/buildtools/gen-build-mk.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# Auto-generate a Makefile in build directory -# Args: -# $1: path of project src root - -echo "# Automatically generated by gen-build-mk.sh" -echo -echo "ifdef O" -echo "ifeq (\"\$(origin O)\", \"command line\")" -echo "\$(error \"Cannot specify O= as you are already in a build directory\")" -echo "endif" -echo "endif" -echo -echo "MAKEFLAGS += --no-print-directory" -echo -echo "all:" -echo " @\$(MAKE) -C $1 O=\$(CURDIR)" -echo -echo "%::" -echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@" diff --git a/buildtools/gen-config-h.sh b/buildtools/gen-config-h.sh deleted file mode 100755 index a8c2006339..0000000000 --- a/buildtools/gen-config-h.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -echo "#ifndef __RTE_CONFIG_H" -echo "#define __RTE_CONFIG_H" -grep CONFIG_ $1 | -grep -v '^[ \t]*#' | -sed 's,CONFIG_\(.*\)=y.*$,#undef \1\ -#define \1 1,' | -sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' | -sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\ -#define \1 \2,' | -sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,' -echo "#endif /* __RTE_CONFIG_H */" diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh deleted file mode 100755 index 02953837a2..0000000000 --- a/buildtools/relpath.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# print the relative path of $1 from $2 directory -# $1 and $2 MUST be absolute paths -# - -if [ $# -ne 2 ]; then - echo "Bad arguments" - echo "Usage:" - echo " $0 path1 path2" - exit 1 -fi - -# get the real absolute path, derefencing symlinks -ABS1="$(dirname $(readlink -f $1))/$(basename $1)" -ABS2=$(readlink -f $2) - -# remove leading slash -REL1=${ABS1#/} -REL2=${ABS2#/} - -left1=${REL1%%/*} -right1=${REL1#*/} -prev_right1=$REL1 -prev_left1= - -left2=${REL2%%/*} -right2=${REL2#*/} -prev_right2=$REL2 -prev_left2= - -prefix= - -while [ "${right1}" != "" -a "${right2}" != "" ]; do - - if [ "$left1" != "$left2" ]; then - break - fi - - prev_left1=$left1 - left1=$left1/${right1%%/*} - prev_right1=$right1 - right1=${prev_right1#*/} - if [ "$right1" = "$prev_right1" ]; then - right1="" - fi - - prev_left2=$left2 - left2=$left2/${right2%%/*} - prev_right2=$right2 - right2=${prev_right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -if [ "${left1}" != "${left2}" ]; then - right2=${prev_right2} - right1=${prev_right1} -fi - -while [ "${right2}" != "" ]; do - prefix=${prefix}../ - prev_right2=$right2 - right2=${right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -echo ${prefix}${right1} - -exit 0 -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 04/19] buildtools: remove all scripts for use with make 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 04/19] buildtools: remove all scripts for use with make Ciara Power @ 2020-08-12 21:54 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 21:54 UTC (permalink / raw) To: Ciara Power; +Cc: dev, bruce.richardson 07/08/2020 14:29, Ciara Power: > Make is no longer supported for compiling DPDK, scripts used with make > are no longer needed. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > buildtools/auto-config-h.sh | 108 ------------------------------------ > buildtools/gen-build-mk.sh | 23 -------- > buildtools/gen-config-h.sh | 15 ----- > buildtools/relpath.sh | 76 ------------------------- > 4 files changed, 222 deletions(-) In this patch and others, please update the file MAINTAINERS. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (3 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 04/19] buildtools: remove all scripts for use with make Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-12 21:56 ` Thomas Monjalon 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 06/19] doc: remove references to make in compressdev guides Ciara Power ` (20 subsequent siblings) 25 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +---- doc/guides/bbdevs/fpga_lte_fec.rst | 5 +---- doc/guides/bbdevs/turbo_sw.rst | 15 --------------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index 6760391e8c..76ac12cdc3 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index fdc8a76981..340ce4ff37 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..3b93157890 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -151,13 +143,6 @@ Example: export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides Ciara Power @ 2020-08-12 21:56 ` Thomas Monjalon 2020-08-18 11:46 ` Laatz, Kevin 1 sibling, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 21:56 UTC (permalink / raw) To: Ciara Power; +Cc: dev, bruce.richardson 07/08/2020 14:29, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. You won't get appropriate review if you don't Cc the right maintainers. Please use --cc-cmd devtools/get-maintainer.sh with git send-email so the maintainers are automatically Cc'ed in each relevant patch. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides Ciara Power 2020-08-12 21:56 ` Thomas Monjalon @ 2020-08-18 11:46 ` Laatz, Kevin 1 sibling, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-18 11:46 UTC (permalink / raw) To: Ciara Power, dev; +Cc: bruce.richardson, thomas On 07/08/2020 13:29, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +---- > doc/guides/bbdevs/fpga_lte_fec.rst | 5 +---- > doc/guides/bbdevs/turbo_sw.rst | 15 --------------- > 3 files changed, 2 insertions(+), 23 deletions(-) > The insmod example path needs to be updated in 'fpga_lte_fec.rst' to reflect the meson path. Apart from that, Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 06/19] doc: remove references to make in compressdev guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (4 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 07/19] doc: remove references to make in contributing guides Ciara Power ` (19 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 16 ---------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 24 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..62585847d6 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -59,18 +59,6 @@ Steps To Setup Platform Installation ------------ -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +84,6 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` cd to app/test - type the command "make" to compile run the tests with "./test" type the command "compressdev_autotest" to test diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 06/19] doc: remove references to make in compressdev guides 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 06/19] doc: remove references to make in compressdev guides Ciara Power @ 2020-08-18 11:46 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-18 11:46 UTC (permalink / raw) To: Ciara Power, dev; +Cc: bruce.richardson, thomas On 07/08/2020 13:29, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/compressdevs/isal.rst | 4 ---- > doc/guides/compressdevs/octeontx.rst | 16 ---------------- > doc/guides/compressdevs/zlib.rst | 4 ---- > 3 files changed, 24 deletions(-) <snip> > diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst > index 5924ad1fa3..62585847d6 100644 > --- a/doc/guides/compressdevs/octeontx.rst > +++ b/doc/guides/compressdevs/octeontx.rst > @@ -59,18 +59,6 @@ Steps To Setup Platform > Installation > ------------ > This section heading is no longer needed since you removed the contents below. > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the > -following ``make`` command: > - > - .. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-thunderx-linux-gcc install > - > - > Initialization > -------------- > > @@ -96,10 +84,6 @@ probed. To use the PMD in an application, user must: > .. code-block:: console > > reserve enough huge pages > - cd to the top-level DPDK directory > - export RTE_TARGET=arm64-thunderx-linux-gcc > - export RTE_SDK=`pwd` > cd to app/test > - type the command "make" to compile > run the tests with "./test" ./test needs to be changed to ./dpdk-test for meson Once the minor fixes above are made, Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 07/19] doc: remove references to make in contributing guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (5 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 06/19] doc: remove references to make in compressdev guides Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 08/19] doc: remove references to make in cryptodev guides Ciara Power ` (18 subsequent siblings) 25 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/contributing/coding_style.rst | 46 +------- doc/guides/contributing/design.rst | 127 ++-------------------- doc/guides/contributing/documentation.rst | 27 +---- doc/guides/contributing/patches.rst | 45 -------- 4 files changed, 13 insertions(+), 232 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index b55075eaa2..dc352d03ca 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -773,52 +773,16 @@ The ``pep8`` tool can be used for testing compliance with the guidelines. Integrating with the Build System --------------------------------- -DPDK supports being built in two different ways: - -* using ``make`` - or more specifically "GNU make", i.e. ``gmake`` on FreeBSD -* using the tools ``meson`` and ``ninja`` +DPDK supports being built by using the tools ``meson`` and ``ninja`` Any new library or driver to be integrated into DPDK should support being -built with both systems. While building using ``make`` is a legacy approach, and -most build-system enhancements are being done using ``meson`` and ``ninja`` -there are no plans at this time to deprecate the legacy ``make`` build system. +built with this system. -Therefore all new component additions should include both a ``Makefile`` and a -``meson.build`` file, and should be added to the component lists in both the -``Makefile`` and ``meson.build`` files in the relevant top-level directory: +Therefore all new component additions should include a ``meson.build`` file, +and should be added to the component lists in the ``meson.build`` files in the +relevant top-level directory: either ``lib`` directory or a ``driver`` subdirectory. -Makefile Contents -~~~~~~~~~~~~~~~~~ - -The ``Makefile`` for the component should be of the following format, where -``<name>`` corresponds to the name of the library in question, e.g. hash, -lpm, etc. For drivers, the same format of Makefile is used. - -.. code-block:: none - - # pull in basic DPDK definitions, including whether library is to be - # built or not - include $(RTE_SDK)/mk/rte.vars.mk - - # library name - LIB = librte_<name>.a - - # any library cflags needed. Generally add "-O3 $(WERROR_FLAGS)" - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - # the symbol version information for the library - EXPORT_MAP := rte_<name>_version.map - - # all source filenames are stored in SRCS-y - SRCS-$(CONFIG_RTE_LIBRTE_<NAME>) += rte_<name>.c - - # install includes - SYMLINK-$(CONFIG_RTE_LIBRTE_<NAME>)-include += rte_<name>.h - - # pull in rules to build the library - include $(RTE_SDK)/mk/rte.lib.mk Meson Build File Contents - Libraries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..6ce0de97ac 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,22 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. - In this case, the code is split into two separate files that are architecture or environment specific. - This should only apply inside the EAL library. - -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -73,111 +65,6 @@ Adding a new static field or flag must be an exception matching many criteria like (non exhaustive): wide usage, performance, size. -Library Statistics ------------------- - -Description -~~~~~~~~~~~ - -This document describes the guidelines for DPDK library-level statistics counter -support. This includes guidelines for turning library statistics on and off and -requirements for preventing ABI changes when implementing statistics. - - -Mechanism to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are -collected for all the instances of every object type provided by the library. -When this flag is cleared, none of the counters supported by the current library -are collected for any instance of any object type provided by the library: - -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - - -Prevention of ABI changes due to library statistics support -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The layout of data structures and prototype of functions that are part of the -library API should not be affected by whether the collection of statistics -counters is turned on or off for the current library. In practical terms, this -means that space should always be allocated in the API data structures for -statistics counters and the statistics related API functions are always built -into the code, regardless of whether the statistics counter collection is turned -on or off for the current library. - -When the collection of statistics counters for the current library is turned -off, the counters retrieved through the statistics related API functions should -have a default value of zero. - - -Motivation to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -It is highly recommended that each library provides statistics counters to allow -an application to monitor the library-level run-time events. Typical counters -are: number of packets received/dropped/transmitted, number of buffers -allocated/freed, number of occurrences for specific events, etc. - -However, the resources consumed for library-level statistics counter collection -have to be spent out of the application budget and the counters collected by -some libraries might not be relevant to the current application. In order to -avoid any unwanted waste of resources and/or performance impacts, the -application should decide at build time whether the collection of library-level -statistics counters should be turned on or off for each library individually. - -Library-level statistics counters can be relevant or not for specific -applications: - -* For Application A, counters maintained by Library X are always relevant and - the application needs to use them to implement certain features, such as traffic - accounting, logging, application-level statistics, etc. In this case, - the application requires that collection of statistics counters for Library X is - always turned on. - -* For Application B, counters maintained by Library X are only useful during the - application debug stage and are not relevant once debug phase is over. In this - case, the application may decide to turn on the collection of Library X - statistics counters during the debug phase and at a later stage turn them off. - -* For Application C, counters maintained by Library X are not relevant at all. - It might be that the application maintains its own set of statistics counters - that monitor a different set of run-time events (e.g. number of connection - requests, number of active users, etc). It might also be that the application - uses multiple libraries (Library X, Library Y, etc) and it is interested in the - statistics counters of Library Y, but not in those of Library X. In this case, - the application may decide to turn the collection of statistics counters off for - Library X and on for Library Y. - -The statistics collection consumes a certain amount of CPU resources (cycles, -cache bandwidth, memory bandwidth, etc) that depends on: - -* Number of libraries used by the current application that have statistics - counters collection turned on. - -* Number of statistics counters maintained by each library per object type - instance (e.g. per port, table, pipeline, thread, etc). - -* Number of instances created for each object type supported by each library. - -* Complexity of the statistics logic collection for each counter: when only - some occurrences of a specific event are valid, additional logic is typically - needed to decide whether the current occurrence of the event should be counted - or not. For example, in the event of packet reception, when only TCP packets - with destination port within a certain range should be recorded, conditional - branches are usually required. When processing a burst of packets that have been - validated for header integrity, counting the number of bits set in a bitmask - might be needed. - PF and VF Considerations ------------------------ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 375ea64ba8..a4b1cc5e06 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -222,25 +222,8 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: - - make doc - -* Generate the Doxygen API documentation in Html:: - - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -255,10 +238,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -743,9 +722,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index de493a901d..d86cda1a66 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -463,51 +463,6 @@ and the -r option allows the user specify a ``git log`` range. Checking Compilation -------------------- -Makefile System -~~~~~~~~~~~~~~~ - -Compilation of patches and changes should be tested using the ``test-build.sh`` script in the ``devtools`` -directory of the DPDK repo:: - - devtools/test-build.sh x86_64-native-linux-gcc+next+shared - -The script usage is:: - - test-build.sh [-h] [-jX] [-s] [config1 [config2] ...]] - -Where: - -* ``-h``: help, usage. -* ``-jX``: use X parallel jobs in "make". -* ``-s``: short test with only first config and without examples/doc. -* ``config``: default config name plus config switches delimited with a ``+`` sign. - -Examples of configs are:: - - x86_64-native-linux-gcc - x86_64-native-linux-gcc+next+shared - x86_64-native-linux-clang+shared - -The builds can be modified via the following environmental variables: - -* ``DPDK_BUILD_TEST_CONFIGS`` (target1+option1+option2 target2) -* ``DPDK_BUILD_TEST_DIR`` -* ``DPDK_DEP_CFLAGS`` -* ``DPDK_DEP_LDFLAGS`` -* ``DPDK_DEP_PCAP`` (y/[n]) -* ``DPDK_NOTIFY`` (notify-send) - -These can be set from the command line or in the config files shown above in the :ref:`contrib_checkpatch`. - -The recommended configurations and options to test compilation prior to submitting patches are:: - - x86_64-native-linux-gcc+shared+next - x86_64-native-linux-clang+shared - i686-native-linux-gcc - - export DPDK_DEP_ZLIB=y - export DPDK_DEP_PCAP=y - export DPDK_DEP_SSL=y Meson System ~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 08/19] doc: remove references to make in cryptodev guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (6 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 07/19] doc: remove references to make in contributing guides Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 09/19] doc: remove references to make in eventdev guides Ciara Power ` (17 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 2 -- doc/guides/cryptodevs/aesni_mb.rst | 2 -- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ----------------- doc/guides/cryptodevs/ccp.rst | 8 ++--- doc/guides/cryptodevs/dpaa2_sec.rst | 25 -------------- doc/guides/cryptodevs/dpaa_sec.rst | 25 -------------- doc/guides/cryptodevs/kasumi.rst | 9 ----- doc/guides/cryptodevs/mvsam.rst | 8 ----- doc/guides/cryptodevs/nitrox.rst | 7 ---- doc/guides/cryptodevs/octeontx.rst | 8 ----- doc/guides/cryptodevs/octeontx2.rst | 4 --- doc/guides/cryptodevs/openssl.rst | 4 +-- doc/guides/cryptodevs/qat.rst | 52 +++++------------------------ doc/guides/cryptodevs/scheduler.rst | 8 ----- doc/guides/cryptodevs/snow3g.rst | 8 ----- doc/guides/cryptodevs/virtio.rst | 8 ----- doc/guides/cryptodevs/zuc.rst | 8 ----- 18 files changed, 13 insertions(+), 206 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 74e0de63ad..caa0c90404 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 15388d20ab..289b762156 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index a43fe92de9..9466f2da3f 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -86,8 +84,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..45e53de98b 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..4a472f8d97 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 85f5212b64..2f0565b49e 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -33,13 +33,6 @@ Limitations * 3DES Cipher Only combination is not supported. * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..11589e7673 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index 432146db04..20620ba13a 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..d2b8c4b997 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index e5d2cf4997..616f54f205 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -660,25 +633,18 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j cd ./build/app ./test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j cd ./build/app ./test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j cd ./build/app ./test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -704,7 +670,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 7004ca431a..ee23b25b73 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..45c4d2342e 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..c2b11c4e63 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,11 +83,7 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` cd to app/test - type the command "make" to compile run the tests with "./test" type the command "cryptodev_virtio_autotest" to test @@ -96,11 +92,7 @@ The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` cd to app/test-crypto-perf - type the command "make" to compile run the tests with the following command: ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..4842a25b5a 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 08/19] doc: remove references to make in cryptodev guides 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 08/19] doc: remove references to make in cryptodev guides Ciara Power @ 2020-08-18 11:46 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-18 11:46 UTC (permalink / raw) To: Ciara Power, dev; +Cc: bruce.richardson, thomas On 07/08/2020 13:29, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/cryptodevs/aesni_gcm.rst | 2 -- > doc/guides/cryptodevs/aesni_mb.rst | 2 -- > doc/guides/cryptodevs/armv8.rst | 3 -- > doc/guides/cryptodevs/caam_jr.rst | 30 ----------------- > doc/guides/cryptodevs/ccp.rst | 8 ++--- > doc/guides/cryptodevs/dpaa2_sec.rst | 25 -------------- > doc/guides/cryptodevs/dpaa_sec.rst | 25 -------------- > doc/guides/cryptodevs/kasumi.rst | 9 ----- > doc/guides/cryptodevs/mvsam.rst | 8 ----- > doc/guides/cryptodevs/nitrox.rst | 7 ---- > doc/guides/cryptodevs/octeontx.rst | 8 ----- > doc/guides/cryptodevs/octeontx2.rst | 4 --- > doc/guides/cryptodevs/openssl.rst | 4 +-- > doc/guides/cryptodevs/qat.rst | 52 +++++------------------------ > doc/guides/cryptodevs/scheduler.rst | 8 ----- > doc/guides/cryptodevs/snow3g.rst | 8 ----- > doc/guides/cryptodevs/virtio.rst | 8 ----- > doc/guides/cryptodevs/zuc.rst | 8 ----- > 18 files changed, 13 insertions(+), 206 deletions(-) <snip> > diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst > index 09a538f816..45e53de98b 100644 > --- a/doc/guides/cryptodevs/kasumi.rst > +++ b/doc/guides/cryptodevs/kasumi.rst > @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: > > * Build the multi buffer library (explained in Installation section). > > -* Build DPDK as follows: > - > -.. code-block:: console > - > - make config T=x86_64-native-linux-gcc > - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config > - make > - Since the documentation initially has a step for building DPDK, I think we should at least link the build instructions in the GSG. There is no harm in being more explicit in docs IMO. The same comment applies for qat, snow3g and zuc below. > - > To use the PMD in an application, user must: > > * Call rte_vdev_init("crypto_kasumi") within the application. > diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst > index 399fe37a67..4a472f8d97 100644 > --- a/doc/guides/cryptodevs/mvsam.rst > +++ b/doc/guides/cryptodevs/mvsam.rst > @@ -64,14 +64,6 @@ Limitations > Installation > ------------ > > -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. > -Currently there are two driver specific compilation options in > -``config/common_base`` available: > - > -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) > - > - Toggle compilation of the librte_pmd_mvsam driver. > - > MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following > extra option must be passed to the library configuration script: > > diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst > index 85f5212b64..2f0565b49e 100644 > --- a/doc/guides/cryptodevs/nitrox.rst > +++ b/doc/guides/cryptodevs/nitrox.rst > @@ -33,13 +33,6 @@ Limitations > * 3DES Cipher Only combination is not supported. > * Session-less APIs are not supported. > > -Installation > ------------- > - > -For compiling the Nitrox crypto PMD, please check if the > -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. > - > -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` > > Initialization > -------------- > diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst > index 4fa199e3c4..11589e7673 100644 > --- a/doc/guides/cryptodevs/octeontx.rst > +++ b/doc/guides/cryptodevs/octeontx.rst > @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms > * ``RTE_CRYPTO_ASYM_XFORM_RSA`` > * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` > > -Config flags > ------------- > - > -For compiling the OCTEON TX crypto poll mode driver, please check if the > -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in > -config/common_base file. > - > -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` > > Compilation > ----------- > diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst > index 432146db04..20620ba13a 100644 > --- a/doc/guides/cryptodevs/octeontx2.rst > +++ b/doc/guides/cryptodevs/octeontx2.rst > @@ -70,10 +70,6 @@ Installation > The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or > cross-compiled on an x86 platform. > > -Enable OCTEON TX2 crypto PMD in your config file: > - > -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` > - > Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK > application. > > diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst > index 7407294813..d2b8c4b997 100644 > --- a/doc/guides/cryptodevs/openssl.rst > +++ b/doc/guides/cryptodevs/openssl.rst > @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: > Installation > ------------ > > -To compile openssl PMD, it has to be enabled in the config/common_base file > -and appropriate openssl packages have to be installed in the build environment. > +To compile openssl PMD, appropriate openssl packages have to be installed > +in the build environment. > > The newest openssl library version is supported: > > diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst > index e5d2cf4997..616f54f205 100644 > --- a/doc/guides/cryptodevs/qat.rst > +++ b/doc/guides/cryptodevs/qat.rst > @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs > Further information on configuring, building and installing DPDK is described > :doc:`here <../linux_gsg/build_dpdk>`. > > - > -Quick instructions for QAT cryptodev PMD are as follows: > - > -.. code-block:: console > - > - cd to the top-level DPDK directory > - make defconfig > - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config > - or/and > - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config > - make > - > -Quick instructions for QAT compressdev PMD are as follows: > - > -.. code-block:: console > - > - cd to the top-level DPDK directory > - make defconfig > - make > - > - > .. _building_qat_config: > > Build Configuration > @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value > > .. code-block:: console > > - CONFIG_RTE_LIBRTE_PMD_QAT=y > - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n > - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n > - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 > - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 > - > -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. > + RTE_PMD_QAT_MAX_PCI_DEVICES=48 > + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 > > Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not > -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. > +built by default. > > -The QAT compressdev PMD has no external dependencies, so needs no configuration > -options and is built by default. > +The QAT compressdev PMD has no external dependencies, so is built by default. > > The number of VFs per PF varies - see table below. If multiple QAT packages are > -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be > +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be > adjusted to the number of VFs which the QAT common code will need to handle. > > .. Note:: > > There are separate config items (not QAT-specific) for max cryptodevs > - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, > + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, > if necessary these should be adjusted to handle the total of QAT and other > devices which the process will use. In particular for crypto, where each > QAT VF may expose two crypto devices, sym and asym, it may happen that the > number of devices will be bigger than MAX_DEVS and the process will show an error > - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be > + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be > increased or -w, pci-whitelist domain:bus:devid:func option may be used. > > > QAT compression PMD needs intermediate buffers to support Deflate compression > -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE > +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE > specifies the size of a single buffer, the PMD will allocate a multiple of these, > plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are > allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. > @@ -660,25 +633,18 @@ Testing > > QAT SYM crypto PMD can be tested by running the test application:: > > - make defconfig > - make -j > cd ./build/app > ./test -l1 -n1 -w <your qat bdf> > RTE>>cryptodev_qat_autotest > > QAT ASYM crypto PMD can be tested by running the test application:: > > - make defconfig > - make -j > cd ./build/app > ./test -l1 -n1 -w <your qat bdf> > RTE>>cryptodev_qat_asym_autotest > > QAT compression PMD can be tested by running the test application:: > > - make defconfig > - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config > - make -j > cd ./build/app > ./test -l1 -n1 -w <your qat bdf> > RTE>>compressdev_autotest > @@ -704,7 +670,7 @@ the process cmdline, e.g. using any of the following:: > > The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to > RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h > - for meson build and config/common_base for gnu make. > + for meson build. > Also the dynamic global log level overrides both sets of trace, so e.g. no > QAT trace would display in this case:: > > diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst > index 7004ca431a..ee23b25b73 100644 > --- a/doc/guides/cryptodevs/scheduler.rst > +++ b/doc/guides/cryptodevs/scheduler.rst > @@ -32,14 +32,6 @@ Limitations > is enabled. > > > -Installation > ------------- > - > -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set > -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and > -recompile DPDK > - > - > Initialization > -------------- > > diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst > index e0cddc2d77..45c4d2342e 100644 > --- a/doc/guides/cryptodevs/snow3g.rst > +++ b/doc/guides/cryptodevs/snow3g.rst > @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: > > * Build the multi buffer library (explained in Installation section). > > -* Build DPDK as follows: > - > -.. code-block:: console > - > - make config T=x86_64-native-linux-gcc > - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config > - make > - > To use the PMD in an application, user must: > > * Call rte_vdev_init("crypto_snow3g") within the application. > diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst > index 2c46bda866..c2b11c4e63 100644 > --- a/doc/guides/cryptodevs/virtio.rst > +++ b/doc/guides/cryptodevs/virtio.rst > @@ -83,11 +83,7 @@ The unit test cases can be tested as below: > .. code-block:: console > > reserve enough huge pages > - cd to the top-level DPDK directory > - export RTE_TARGET=x86_64-native-linux-gcc > - export RTE_SDK=`pwd` > cd to app/test > - type the command "make" to compile > run the tests with "./test" > type the command "cryptodev_virtio_autotest" to test > > @@ -96,11 +92,7 @@ The performance can be tested as below: > .. code-block:: console > > reserve enough huge pages > - cd to the top-level DPDK directory > - export RTE_TARGET=x86_64-native-linux-gcc > - export RTE_SDK=`pwd` > cd to app/test-crypto-perf > - type the command "make" to compile > run the tests with the following command: > > ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ > diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst > index 9b51ba141d..4842a25b5a 100644 > --- a/doc/guides/cryptodevs/zuc.rst > +++ b/doc/guides/cryptodevs/zuc.rst > @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: > > * Build the multi buffer library (explained in Installation section). > > -* Build DPDK as follows: > - > -.. code-block:: console > - > - make config T=x86_64-native-linux-gcc > - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config > - make > - > To use the PMD in an application, user must: > > * Call rte_vdev_init("crypto_zuc") within the application. Throughout this patch, the following need to be updated: - 'l2fwd-crypto' need to change to 'dpdk-l2fwd-crypto' - './test' needs to change to './dpdk-test' /Kevin ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 09/19] doc: remove references to make in eventdev guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (7 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 08/19] doc: remove references to make in cryptodev guides Ciara Power @ 2020-08-07 12:29 ` Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 10/19] doc: remove references to make in FreeBSD gsg guide Ciara Power ` (16 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:29 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/eventdevs/dpaa.rst | 20 -------------------- doc/guides/eventdevs/dpaa2.rst | 20 -------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 8 -------- 4 files changed, 72 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..6fbee91d9e 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -43,26 +43,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..b992ae649e 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -52,26 +52,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 9a3646db0d..f7a4cdd586 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..7f9eceb01f 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 09/19] doc: remove references to make in eventdev guides 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 09/19] doc: remove references to make in eventdev guides Ciara Power @ 2020-08-18 11:46 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-18 11:46 UTC (permalink / raw) To: Ciara Power, dev; +Cc: bruce.richardson, thomas On 07/08/2020 13:29, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/eventdevs/dpaa.rst | 20 -------------------- > doc/guides/eventdevs/dpaa2.rst | 20 -------------------- > doc/guides/eventdevs/octeontx.rst | 24 ------------------------ > doc/guides/eventdevs/octeontx2.rst | 8 -------- > 4 files changed, 72 deletions(-) > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 10/19] doc: remove references to make in FreeBSD gsg guide 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (8 preceding siblings ...) 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 09/19] doc: remove references to make in eventdev guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-18 11:33 ` Bruce Richardson 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 11/19] doc: remove references to make in howto guides Ciara Power ` (15 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/freebsd_gsg/intro.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst index 63160ce64f..b2e57909ee 100644 --- a/doc/guides/freebsd_gsg/intro.rst +++ b/doc/guides/freebsd_gsg/intro.rst @@ -39,8 +39,8 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system (including the commands - that can be used in the root DPDK Makefile to build the development - kit and an application) and guidelines for porting an application + that can be used to build the development kit and an application) + and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 10/19] doc: remove references to make in FreeBSD gsg guide 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 10/19] doc: remove references to make in FreeBSD gsg guide Ciara Power @ 2020-08-18 11:33 ` Bruce Richardson 0 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 11:33 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:00PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/freebsd_gsg/intro.rst | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst > index 63160ce64f..b2e57909ee 100644 > --- a/doc/guides/freebsd_gsg/intro.rst > +++ b/doc/guides/freebsd_gsg/intro.rst > @@ -39,8 +39,8 @@ The following is a list of DPDK documents in the suggested reading order: > specifically in a Linux* application (linux) environment > > * The content of the DPDK, the build system (including the commands > - that can be used in the root DPDK Makefile to build the development > - kit and an application) and guidelines for porting an application > + that can be used to build the development kit and an application) > + and guidelines for porting an application > > * Optimizations used in the software and those that should be considered > for new development > -- Scanning through the full doc, this does indeed appear to be the only place where we need a change to drop "make" support. Acked-by: Bruce Richardson <bruce.richardson@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 11/19] doc: remove references to make in howto guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (9 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 10/19] doc: remove references to make in FreeBSD gsg guide Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-12 22:00 ` Thomas Monjalon 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power ` (14 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/howto/packet_capture_framework.rst | 17 +----------- doc/guides/howto/pvp_reference_benchmark.rst | 26 ------------------- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/doc/guides/howto/packet_capture_framework.rst b/doc/guides/howto/packet_capture_framework.rst index 946a21c8ed..f86cff810b 100644 --- a/doc/guides/howto/packet_capture_framework.rst +++ b/doc/guides/howto/packet_capture_framework.rst @@ -52,11 +52,7 @@ Some things to note: initialization code. Refer to the ``app/test-pmd/testpmd.c`` code and look for ``pdump`` keyword to see how this is done. -* The ``dpdk-pdump`` tool depends on the libpcap based PMD which is disabled - by default in the build configuration files, owing to an external dependency - on the libpcap development files. Once the libpcap development files are - installed, the libpcap based PMD can be enabled by setting - ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` and recompiling the DPDK. +* The ``dpdk-pdump`` tool depends on the libpcap based PMD. Test Environment @@ -73,17 +69,6 @@ for packet capturing on the DPDK port in Packet capturing on a DPDK port using the dpdk-pdump tool. -Configuration -------------- - -Modify the DPDK primary application to initialize the packet capture framework -as mentioned in the above notes and enable the following config options and -build DPDK:: - - CONFIG_RTE_LIBRTE_PMD_PCAP=y - CONFIG_RTE_LIBRTE_PDUMP=y - - Running the Application ----------------------- diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst index 64b1f4d8ec..371ba84e38 100644 --- a/doc/guides/howto/pvp_reference_benchmark.rst +++ b/doc/guides/howto/pvp_reference_benchmark.rst @@ -96,19 +96,6 @@ Build Qemu: make -DPDK build -~~~~~~~~~~ - -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install - - Testpmd launch ~~~~~~~~~~~~~~ @@ -310,19 +297,6 @@ Guest tuning done -DPDK build -~~~~~~~~~~ - -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install - - Testpmd launch ~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 11/19] doc: remove references to make in howto guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 11/19] doc: remove references to make in howto guides Ciara Power @ 2020-08-12 22:00 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 22:00 UTC (permalink / raw) To: Ciara Power; +Cc: dev, bruce.richardson 07/08/2020 14:30, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/howto/packet_capture_framework.rst | 17 +----------- > doc/guides/howto/pvp_reference_benchmark.rst | 26 ------------------- > 2 files changed, 1 insertion(+), 42 deletions(-) [...] > -DPDK build > -~~~~~~~~~~ > - > -Build DPDK: > - > - .. code-block:: console > - > - git clone git://dpdk.org/dpdk > - cd dpdk > - export RTE_SDK=$PWD > - make install T=x86_64-native-linux-gcc DESTDIR=install > - > - > Testpmd launch > ~~~~~~~~~~~~~~ Unfortunately it's a bit more complicate. Even the testpmd launch must be updated to fit with meson: " RTE_SDK/install/bin/testpmd " RTE_SDK doesn't exist with meson, and the binary is dpdk-testpmd. I'm afraid this kind of difficulty is in many doc files. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (10 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 11/19] doc: remove references to make in howto guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-18 11:40 ` Bruce Richardson ` (5 more replies) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in mempool guides Ciara Power ` (13 subsequent siblings) 25 siblings, 6 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- doc/guides/linux_gsg/enable_func.rst | 3 - doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/linux_drivers.rst | 2 - doc/guides/linux_gsg/sys_reqs.rst | 4 -- 7 files changed, 4 insertions(+), 123 deletions(-) diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index c536e354ef..a0536696e6 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -39,11 +39,6 @@ Compiling and Installing DPDK System-wide DPDK can be configured, built and installed on your system using the tools ``meson`` and ``ninja``. -.. note:: - - The older makefile-based build system used in older DPDK releases is - still present and its use is described in section - `Installation of DPDK Target Environment using Make`_. DPDK Configuration ~~~~~~~~~~~~~~~~~~ @@ -158,59 +153,6 @@ build system is shown below: executable('dpdk-app', sources, dependencies: dpdk) -Installation of DPDK Target Environment using Make --------------------------------------------------- - -.. note:: - - The building of DPDK using make will be deprecated in a future release. It - is therefore recommended that DPDK installation is done using meson and - ninja as described above. - -Get a native target environment automatically:: - - make defconfig O=mybuild - -.. note:: - - Within the configuration files, the ``RTE_MACHINE`` configuration value is set to native, - which means that the compiled software is tuned for the platform on which it is built. - -Or get a specific target environment:: - - make config T=x86_64-native-linux-gcc O=mybuild - -The format of a DPDK target is "ARCH-MACHINE-EXECENV-TOOLCHAIN". -Available targets can be found with:: - - make help - -Customize the target configuration in the generated ``.config`` file. -Example for enabling the pcap PMD:: - - sed -ri 's,(PMD_PCAP=).*,\1y,' mybuild/.config - -Compile the target:: - - make -j4 O=mybuild - -.. warning:: - - Any kernel modules to be used, e.g. ``igb_uio``, ``kni``, must be compiled with the - same kernel as the one running on the target. - If the DPDK is not being built on the target machine, - the ``RTE_KERNELDIR`` environment variable should be used to point the compilation at a copy of the kernel version to be used on the target machine. - -Install the target in a separate directory:: - - make install O=mybuild DESTDIR=myinstall prefix= - -The environment is ready to build a DPDK application:: - - RTE_SDK=$(pwd)/myinstall/share/dpdk RTE_TARGET=x86_64-native-linux-gcc make -C myapp - -In addition, the make clean command can be used to remove any existing compiled files for a subsequent full, clean rebuild of the code. - Browsing the Installed DPDK Environment Target ---------------------------------------------- diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2f606535c3..afa94acbbe 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -18,14 +18,8 @@ Compiling a Sample Application Once an DPDK target environment directory has been created (such as ``x86_64-native-linux-gcc``), it contains all libraries and header files required to build an application. -When compiling an application in the Linux* environment on the DPDK, the following variables must be exported: - -* ``RTE_SDK`` - Points to the DPDK installation directory. - -* ``RTE_TARGET`` - Points to the DPDK target environment directory. - The following is an example of creating the ``helloworld`` application, which runs in the DPDK Linux environment. -This example may be found in the ``${RTE_SDK}/examples`` directory. +This example may be found in the ``${DPDK installation directory}/examples`` directory. The directory contains the ``main.c`` file. This file, when combined with the libraries in the DPDK target environment, calls the various functions to initialize the DPDK environment, @@ -35,8 +29,6 @@ By default, the binary is generated in the build directory. .. code-block:: console cd examples/helloworld/ - export RTE_SDK=$HOME/DPDK - export RTE_TARGET=x86_64-native-linux-gcc make CC main.o @@ -55,10 +47,8 @@ By default, the binary is generated in the build directory. .. code-block:: console - export RTE_SDK=/home/user/DPDK - cp -r $(RTE_SDK)/examples/helloworld my_rte_app + cp -r $(DPDK installation directory)/examples/helloworld my_rte_app cd my_rte_app/ - export RTE_TARGET=x86_64-native-linux-gcc make CC main.o @@ -232,7 +222,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization Additional Sample Applications ------------------------------ -Additional sample applications are included in the ${RTE_SDK}/examples directory. +Additional sample applications are included in the ${DPDK installation directory}/examples directory. These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. In addition, see the *DPDK Sample Applications User Guide* for a description of the application, specific instructions on compilation and execution and some explanation of the code. diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index c5875a6d57..dc8e640835 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -99,45 +99,3 @@ command:: meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ninja -C arm64-build - -Configure and Cross Compile DPDK using Make -------------------------------------------- -To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc. - -.. code-block:: console - - make config T=arm64-armv8a-linux-gcc - -To cross-compile, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -To cross-compile, including the kernel modules, the kernel source tree needs to be specified by setting -RTE_KERNELDIR: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- RTE_KERNELDIR=<kernel_src_rootdir> CROSS_COMPILE=aarch64-linux-gnu- - -To compile for non-NUMA targets, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n - -.. note:: - - 1. EXTRA_CFLAGS and EXTRA_LDFLAGS should be added to include the NUMA headers and link the library respectively, - if the above step :ref:`augment_the_cross_toolchain_with_numa_support` was skipped therefore the toolchain was not - augmented with NUMA support. - - 2. "-isystem <numa_install_dir>/include" should be add to EXTRA_CFLAGS, otherwise the numa.h file will get a lot of compiling - errors of Werror=cast-qual, Werror=strict-prototypes and Werror=old-style-definition. - - An example is given below: - - .. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index b2bda80bb7..40c6f25a6f 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -40,9 +40,6 @@ requires that the ``HPET_MMAP`` kernel configuration option be enabled. Enabling HPET in the DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -By default, HPET support is disabled in the DPDK build configuration files. -To use HPET, the ``CONFIG_RTE_LIBEAL_USE_HPET`` setting should be changed to ``y``, which will enable the HPET settings at compile time. - For an application to use the ``rte_get_hpet_cycles()`` and ``rte_get_hpet_hz()`` API calls, and optionally to make the HPET the default time source for the rte_timer library, the new ``rte_eal_hpet_init()`` API call should be called at application initialization. diff --git a/doc/guides/linux_gsg/intro.rst b/doc/guides/linux_gsg/intro.rst index 94877f4ae2..890169e97f 100644 --- a/doc/guides/linux_gsg/intro.rst +++ b/doc/guides/linux_gsg/intro.rst @@ -23,7 +23,7 @@ The following is a list of DPDK documents in the suggested reading order: * The software architecture and how to use it (through examples), specifically in a Linux application (linux) environment - * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development kit and + * The content of the DPDK, the build system (including the commands that can be used to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst index 185074013a..ba0e45d95b 100644 --- a/doc/guides/linux_gsg/linux_drivers.rst +++ b/doc/guides/linux_gsg/linux_drivers.rst @@ -38,8 +38,6 @@ be loaded as shown below: .. note:: - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. It is planned to move ``igb_uio`` module to a different git repository. .. note:: diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index a124656bcb..a009f3146b 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -85,10 +85,6 @@ A number of DPDK components, such as libraries and poll-mode drivers (PMDs) have For DPDK builds using meson, the presence or absence of these dependencies will be automatically detected enabling or disabling the relevant components appropriately. -For builds using make, these components are disabled in the default configuration and -need to be enabled manually by changing the relevant setting to "y" in the build configuration file -i.e. the ``.config`` file in the build folder. - In each case, the relevant library development package (``-devel`` or ``-dev``) is needed to build the DPDK components. For libraries the additional dependencies include: -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power @ 2020-08-18 11:40 ` Bruce Richardson 2020-08-19 13:03 ` Bruce Richardson 2020-08-18 11:48 ` Bruce Richardson ` (4 subsequent siblings) 5 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 11:40 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > doc/guides/linux_gsg/enable_func.rst | 3 - > doc/guides/linux_gsg/intro.rst | 2 +- > doc/guides/linux_gsg/linux_drivers.rst | 2 - > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > 7 files changed, 4 insertions(+), 123 deletions(-) > <snip> > diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst > index a124656bcb..a009f3146b 100644 > --- a/doc/guides/linux_gsg/sys_reqs.rst > +++ b/doc/guides/linux_gsg/sys_reqs.rst > @@ -85,10 +85,6 @@ A number of DPDK components, such as libraries and poll-mode drivers (PMDs) have > For DPDK builds using meson, the presence or absence of these dependencies will be > automatically detected enabling or disabling the relevant components appropriately. > I think you can drop the words "using meson" here as there is no alternative any more. > -For builds using make, these components are disabled in the default configuration and > -need to be enabled manually by changing the relevant setting to "y" in the build configuration file > -i.e. the ``.config`` file in the build folder. > - > In each case, the relevant library development package (``-devel`` or ``-dev``) is needed to build the DPDK components. > > For libraries the additional dependencies include: In sys_reqs.rst there is also a reference to make in the "Required Tools and Libraries". Change: "General development tools including make, and a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+)." To something like: "General development tools including a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+)." ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-18 11:40 ` Bruce Richardson @ 2020-08-19 13:03 ` Bruce Richardson 0 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-19 13:03 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Tue, Aug 18, 2020 at 12:40:53PM +0100, Bruce Richardson wrote: > On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > > Make is no longer supported for compiling DPDK, references are now > > removed in the documentation. > > > > Signed-off-by: Ciara Power <ciara.power@intel.com> > > --- > > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > > doc/guides/linux_gsg/enable_func.rst | 3 - > > doc/guides/linux_gsg/intro.rst | 2 +- > > doc/guides/linux_gsg/linux_drivers.rst | 2 - > > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > > 7 files changed, 4 insertions(+), 123 deletions(-) > > > <snip> > > diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst > > index a124656bcb..a009f3146b 100644 > > --- a/doc/guides/linux_gsg/sys_reqs.rst > > +++ b/doc/guides/linux_gsg/sys_reqs.rst > > @@ -85,10 +85,6 @@ A number of DPDK components, such as libraries and poll-mode drivers (PMDs) have > > For DPDK builds using meson, the presence or absence of these dependencies will be > > automatically detected enabling or disabling the relevant components appropriately. > > > > I think you can drop the words "using meson" here as there is no > alternative any more. > > > -For builds using make, these components are disabled in the default configuration and > > -need to be enabled manually by changing the relevant setting to "y" in the build configuration file > > -i.e. the ``.config`` file in the build folder. > > - > > In each case, the relevant library development package (``-devel`` or ``-dev``) is needed to build the DPDK components. > > > > For libraries the additional dependencies include: > > In sys_reqs.rst there is also a reference to make in the "Required Tools > and Libraries". Change: > > "General development tools including make, and a supported C compiler such > as gcc (version 4.9+) or clang (version 3.4+)." > > To something like: > > "General development tools including a supported C compiler such > as gcc (version 4.9+) or clang (version 3.4+)." Also, one more thing I spot in that section is that we need to update our python minimum version to 3.5+ and drop references to 2.7. Therefore, I'd suggest just removing the whole sub-bullets and put a single bullet saying "Python, v3.5 or later" ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power 2020-08-18 11:40 ` Bruce Richardson @ 2020-08-18 11:48 ` Bruce Richardson 2020-08-18 13:11 ` Bruce Richardson ` (3 subsequent siblings) 5 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 11:48 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > doc/guides/linux_gsg/enable_func.rst | 3 - > doc/guides/linux_gsg/intro.rst | 2 +- > doc/guides/linux_gsg/linux_drivers.rst | 2 - > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > 7 files changed, 4 insertions(+), 123 deletions(-) > > diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst > index c536e354ef..a0536696e6 100644 > --- a/doc/guides/linux_gsg/build_dpdk.rst > +++ b/doc/guides/linux_gsg/build_dpdk.rst > @@ -39,11 +39,6 @@ Compiling and Installing DPDK System-wide In the directory listing just before this "Compiling and Installing..." subsection, you need to remove the reference to the "mk" directory. > DPDK can be configured, built and installed on your system using the tools > ``meson`` and ``ninja``. > > -.. note:: > - > - The older makefile-based build system used in older DPDK releases is > - still present and its use is described in section > - `Installation of DPDK Target Environment using Make`_. > > DPDK Configuration > ~~~~~~~~~~~~~~~~~~ > @@ -158,59 +153,6 @@ build system is shown below: > executable('dpdk-app', sources, dependencies: dpdk) > In the Note before this block, where it says that DPDK is no longer designed for linking apps straight from the build directory, the "older make build system" can be changed to "make build system present used in older DPDK releases", so similar. > > -Installation of DPDK Target Environment using Make > --------------------------------------------------- > - > -.. note:: > - > - The building of DPDK using make will be deprecated in a future release. It > - is therefore recommended that DPDK installation is done using meson and > - ninja as described above. > - > -Get a native target environment automatically:: > - > - make defconfig O=mybuild > - > -.. note:: > - > - Within the configuration files, the ``RTE_MACHINE`` configuration value is set to native, > - which means that the compiled software is tuned for the platform on which it is built. > - > -Or get a specific target environment:: > - > - make config T=x86_64-native-linux-gcc O=mybuild > - > -The format of a DPDK target is "ARCH-MACHINE-EXECENV-TOOLCHAIN". > -Available targets can be found with:: > - > - make help > - > -Customize the target configuration in the generated ``.config`` file. > -Example for enabling the pcap PMD:: > - > - sed -ri 's,(PMD_PCAP=).*,\1y,' mybuild/.config > - > -Compile the target:: > - > - make -j4 O=mybuild > - > -.. warning:: > - > - Any kernel modules to be used, e.g. ``igb_uio``, ``kni``, must be compiled with the > - same kernel as the one running on the target. > - If the DPDK is not being built on the target machine, > - the ``RTE_KERNELDIR`` environment variable should be used to point the compilation at a copy of the kernel version to be used on the target machine. > - > -Install the target in a separate directory:: > - > - make install O=mybuild DESTDIR=myinstall prefix= > - > -The environment is ready to build a DPDK application:: > - > - RTE_SDK=$(pwd)/myinstall/share/dpdk RTE_TARGET=x86_64-native-linux-gcc make -C myapp > - > -In addition, the make clean command can be used to remove any existing compiled files for a subsequent full, clean rebuild of the code. > - > Browsing the Installed DPDK Environment Target > ---------------------------------------------- > I think we should remove this last subsection too, because, while it doesn't actually refer to make directly, it's more in keeping with the target-build-dir style of the make system. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power 2020-08-18 11:40 ` Bruce Richardson 2020-08-18 11:48 ` Bruce Richardson @ 2020-08-18 13:11 ` Bruce Richardson 2020-08-18 13:34 ` Bruce Richardson ` (2 subsequent siblings) 5 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 13:11 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > doc/guides/linux_gsg/enable_func.rst | 3 - > doc/guides/linux_gsg/intro.rst | 2 +- > doc/guides/linux_gsg/linux_drivers.rst | 2 - > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > 7 files changed, 4 insertions(+), 123 deletions(-) > <snip> > diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst > index c5875a6d57..dc8e640835 100644 > --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst > +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst > @@ -99,45 +99,3 @@ command:: > The title of this section "Cross Compiling DPDK using Meson" should just be renamed to "Cross Compiling DPDK". Also, the note in the previous section 4.4 "Augment the cross toolchain...", refers to the meson build and using CFLAGS and LDFLAGS, but there is no actual reference to them in the meson build instructions - instead they are discussed in the make build section. So I think that note should have the section reference removed, i.e. finish the note/sentence at the comma after LDFLAGS. > meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc > ninja -C arm64-build > - > -Configure and Cross Compile DPDK using Make > -------------------------------------------- > -To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc. > - > -.. code-block:: console > - > - make config T=arm64-armv8a-linux-gcc > - > -To cross-compile, without compiling the kernel modules, use the following command: > - > -.. code-block:: console > - > - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n > - > -To cross-compile, including the kernel modules, the kernel source tree needs to be specified by setting > -RTE_KERNELDIR: > - > -.. code-block:: console > - > - make -j CROSS=aarch64-linux-gnu- RTE_KERNELDIR=<kernel_src_rootdir> CROSS_COMPILE=aarch64-linux-gnu- > - > -To compile for non-NUMA targets, without compiling the kernel modules, use the following command: > - > -.. code-block:: console > - > - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n > - > -.. note:: > - > - 1. EXTRA_CFLAGS and EXTRA_LDFLAGS should be added to include the NUMA headers and link the library respectively, > - if the above step :ref:`augment_the_cross_toolchain_with_numa_support` was skipped therefore the toolchain was not > - augmented with NUMA support. > - > - 2. "-isystem <numa_install_dir>/include" should be add to EXTRA_CFLAGS, otherwise the numa.h file will get a lot of compiling > - errors of Werror=cast-qual, Werror=strict-prototypes and Werror=old-style-definition. > - > - An example is given below: > - > - .. code-block:: console > - > - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power ` (2 preceding siblings ...) 2020-08-18 13:11 ` Bruce Richardson @ 2020-08-18 13:34 ` Bruce Richardson 2020-08-18 14:31 ` Bruce Richardson 2020-08-18 14:45 ` Bruce Richardson 5 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 13:34 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > doc/guides/linux_gsg/enable_func.rst | 3 - > doc/guides/linux_gsg/intro.rst | 2 +- > doc/guides/linux_gsg/linux_drivers.rst | 2 - > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > 7 files changed, 4 insertions(+), 123 deletions(-) > <snip> > diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst > index 185074013a..ba0e45d95b 100644 > --- a/doc/guides/linux_gsg/linux_drivers.rst > +++ b/doc/guides/linux_gsg/linux_drivers.rst In section 5.1 there is a reference to the "kmod" subdirectory, which is the make build directory name. This should be changed to "kernel/linux" for meson builds. > @@ -38,8 +38,6 @@ be loaded as shown below: > > .. note:: > > - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. > - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. The deleted text needs to be replaced, I think. I'd suggest: "Building DPDK Linux kernel modules is disabled by default starting from DPDK v20.02. To enable them again, the config option "enable_kmods" needs to be set in the meson build configuration. See :ref:`adjusting_build_options` for details on how to set/clear build options." > It is planned to move ``igb_uio`` module to a different git repository. > > .. note:: ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power ` (3 preceding siblings ...) 2020-08-18 13:34 ` Bruce Richardson @ 2020-08-18 14:31 ` Bruce Richardson 2020-08-18 14:45 ` Bruce Richardson 5 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 14:31 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > doc/guides/linux_gsg/enable_func.rst | 3 - > doc/guides/linux_gsg/intro.rst | 2 +- > doc/guides/linux_gsg/linux_drivers.rst | 2 - > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > 7 files changed, 4 insertions(+), 123 deletions(-) > <snip> > diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst > index 2f606535c3..afa94acbbe 100644 > --- a/doc/guides/linux_gsg/build_sample_apps.rst > +++ b/doc/guides/linux_gsg/build_sample_apps.rst > @@ -18,14 +18,8 @@ Compiling a Sample Application > Once an DPDK target environment directory has been created (such as ``x86_64-native-linux-gcc``), > it contains all libraries and header files required to build an application. > This reference to x86_64-native-linuxapp-gcc is also a make-build reference. It should be removed. In fact, since building example apps separately is covered in section 3.2.3, I think we can rename this whole section from "compiling and running sample applications" to just "running sample applications". Rather than renumbering the sections and heading levels, section 6.1 can be kept just referring back to 3.2.3, since that info may well be useful to the reader who starts on this section. > -When compiling an application in the Linux* environment on the DPDK, the following variables must be exported: > - > -* ``RTE_SDK`` - Points to the DPDK installation directory. > - > -* ``RTE_TARGET`` - Points to the DPDK target environment directory. > - > The following is an example of creating the ``helloworld`` application, which runs in the DPDK Linux environment. > -This example may be found in the ``${RTE_SDK}/examples`` directory. > +This example may be found in the ``${DPDK installation directory}/examples`` directory. > > The directory contains the ``main.c`` file. This file, when combined with the libraries in the DPDK target environment, > calls the various functions to initialize the DPDK environment, > @@ -35,8 +29,6 @@ By default, the binary is generated in the build directory. > .. code-block:: console > > cd examples/helloworld/ > - export RTE_SDK=$HOME/DPDK > - export RTE_TARGET=x86_64-native-linux-gcc > > make > CC main.o > @@ -55,10 +47,8 @@ By default, the binary is generated in the build directory. > > .. code-block:: console > > - export RTE_SDK=/home/user/DPDK > - cp -r $(RTE_SDK)/examples/helloworld my_rte_app > + cp -r $(DPDK installation directory)/examples/helloworld my_rte_app > cd my_rte_app/ > - export RTE_TARGET=x86_64-native-linux-gcc > > make > CC main.o Drop all this text and refer to previous chapter. > @@ -232,7 +222,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization > Additional Sample Applications > ------------------------------ > > -Additional sample applications are included in the ${RTE_SDK}/examples directory. > +Additional sample applications are included in the ${DPDK installation directory}/examples directory. I think "${DPDK installation directory}/examples" can be written simply as "DPDK examples" to make it a plain sentence without any explicit path references. > These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. > In addition, see the *DPDK Sample Applications User Guide* for a description of the application, > specific instructions on compilation and execution and some explanation of the code. The subsection on "Additonal Test Applications" following this block seems very out of date, and should be removed IMHO. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power ` (4 preceding siblings ...) 2020-08-18 14:31 ` Bruce Richardson @ 2020-08-18 14:45 ` Bruce Richardson 5 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-18 14:45 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:02PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> Apologies for the multiple emails, but to review this properly I'm reviewing the text section by section. /Bruce > --- > doc/guides/linux_gsg/build_dpdk.rst | 58 ------------------- > doc/guides/linux_gsg/build_sample_apps.rst | 16 +---- > .../linux_gsg/cross_build_dpdk_for_arm64.rst | 42 -------------- > doc/guides/linux_gsg/enable_func.rst | 3 - > doc/guides/linux_gsg/intro.rst | 2 +- > doc/guides/linux_gsg/linux_drivers.rst | 2 - > doc/guides/linux_gsg/sys_reqs.rst | 4 -- > 7 files changed, 4 insertions(+), 123 deletions(-) > <snap> > diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst > index b2bda80bb7..40c6f25a6f 100644 > --- a/doc/guides/linux_gsg/enable_func.rst > +++ b/doc/guides/linux_gsg/enable_func.rst > @@ -40,9 +40,6 @@ requires that the ``HPET_MMAP`` kernel configuration option be enabled. > Enabling HPET in the DPDK > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > -By default, HPET support is disabled in the DPDK build configuration files. This sentence can be kept. > -To use HPET, the ``CONFIG_RTE_LIBEAL_USE_HPET`` setting should be changed to ``y``, which will enable the HPET settings at compile time. > - This should instead refer to the "use_hpet" meson build option. I'm not sure who, if anyone, still uses hpet for DPDK timers, but that is outside the scope of this set, so let's just update to match the current situation. > For an application to use the ``rte_get_hpet_cycles()`` and ``rte_get_hpet_hz()`` API calls, > and optionally to make the HPET the default time source for the rte_timer library, > the new ``rte_eal_hpet_init()`` API call should be called at application initialization. section 8.5 in this chapter discusses kni, and the reference there to the kmod directory should be replaced by kernel/linux. To cover enabling the build of it etc., I'd just say it can be enabled in the same way as igb_uio and give the reference. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in mempool guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (11 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-18 10:34 ` Kilheeney, Louise 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides Ciara Power ` (12 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/mempool/octeontx.rst | 28 ---------------------------- doc/guides/mempool/octeontx2.rst | 8 -------- 2 files changed, 36 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..53b65b0eb6 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -30,34 +30,6 @@ Prerequisites See :doc: `../platform/octeontx.rst` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) - - Set default mempool ops to octeontx_fpavf. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc - Initialization -------------- diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..db47fde610 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in mempool guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in mempool guides Ciara Power @ 2020-08-18 10:34 ` Kilheeney, Louise 0 siblings, 0 replies; 300+ messages in thread From: Kilheeney, Louise @ 2020-08-18 10:34 UTC (permalink / raw) To: Power, Ciara, dev; +Cc: Richardson, Bruce, thomas, Power, Ciara Hey Ciara, The doc's should include a reference to the build instructions for meson build. Louise Kilheeney. > -----Original Message----- > From: dev <dev-bounces@dpdk.org> On Behalf Of Ciara Power > Sent: Friday 7 August 2020 13:30 > To: dev@dpdk.org > Cc: Richardson, Bruce <bruce.richardson@intel.com>; thomas@monjalon.net; > Power, Ciara <ciara.power@intel.com> > Subject: [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in > mempool guides > > Make is no longer supported for compiling DPDK, references are now removed > in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/mempool/octeontx.rst | 28 ---------------------------- > doc/guides/mempool/octeontx2.rst | 8 -------- > 2 files changed, 36 deletions(-) > > diff --git a/doc/guides/mempool/octeontx.rst > b/doc/guides/mempool/octeontx.rst index dfa1993e19..53b65b0eb6 100644 > --- a/doc/guides/mempool/octeontx.rst > +++ b/doc/guides/mempool/octeontx.rst > @@ -30,34 +30,6 @@ Prerequisites > > See :doc: `../platform/octeontx.rst` for setup information. > > -Pre-Installation Configuration > ------------------------------- > - > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > -Please note that enabling debugging options may affect system performance. > - > -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) > - > - Set default mempool ops to octeontx_fpavf. > - > -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) > - > - Toggle compilation of the ``librte_mempool_octeontx`` driver. > - > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, > run the -following ``make`` command: > - > -.. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-thunderx-linux-gcc > - > > Initialization > -------------- > diff --git a/doc/guides/mempool/octeontx2.rst > b/doc/guides/mempool/octeontx2.rst > index 49b45a04e8..db47fde610 100644 > --- a/doc/guides/mempool/octeontx2.rst > +++ b/doc/guides/mempool/octeontx2.rst > @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation > Configuration > ------------------------------ > > -Compile time Config Options > -~~~~~~~~~~~~~~~~~~~~~~~~~~~ > - > -The following option can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) > - > - Toggle compilation of the ``librte_mempool_octeontx2`` driver. > > Runtime Config Options > ~~~~~~~~~~~~~~~~~~~~~~ > -- > 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (12 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in mempool guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-19 16:22 ` Bruce Richardson 2020-08-19 17:17 ` Bruce Richardson 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 15/19] doc: remove references to make in platform guides Ciara Power ` (11 subsequent siblings) 25 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/nics/ark.rst | 26 --------------- doc/guides/nics/atlantic.rst | 4 --- doc/guides/nics/axgbe.rst | 15 --------- doc/guides/nics/bnx2x.rst | 27 --------------- doc/guides/nics/bnxt.rst | 3 -- doc/guides/nics/cxgbe.rst | 13 -------- doc/guides/nics/dpaa.rst | 25 -------------- doc/guides/nics/dpaa2.rst | 24 -------------- doc/guides/nics/ena.rst | 16 --------- doc/guides/nics/enic.rst | 9 ----- doc/guides/nics/fail_safe.rst | 12 ------- doc/guides/nics/fm10k.rst | 4 --- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ------ doc/guides/nics/i40e.rst | 28 ++-------------- doc/guides/nics/ice.rst | 17 ---------- doc/guides/nics/igc.rst | 14 -------- doc/guides/nics/intel_vf.rst | 14 ++------ doc/guides/nics/ionic.rst | 8 ----- doc/guides/nics/ipn3ke.rst | 8 ----- doc/guides/nics/liquidio.rst | 27 --------------- doc/guides/nics/mlx4.rst | 51 ----------------------------- doc/guides/nics/mlx5.rst | 58 --------------------------------- doc/guides/nics/mvneta.rst | 19 +---------- doc/guides/nics/mvpp2.rst | 29 +---------------- doc/guides/nics/nfb.rst | 17 +--------- doc/guides/nics/nfp.rst | 4 --- doc/guides/nics/null.rst | 6 ++-- doc/guides/nics/octeontx.rst | 19 +---------- doc/guides/nics/octeontx2.rst | 11 ------- doc/guides/nics/pcap_ring.rst | 22 ++++++------- doc/guides/nics/qede.rst | 17 ++-------- doc/guides/nics/sfc_efx.rst | 15 --------- doc/guides/nics/softnic.rst | 9 ----- doc/guides/nics/szedata2.rst | 18 +--------- doc/guides/nics/thunderx.rst | 20 ------------ doc/guides/nics/vdev_netvsc.rst | 6 ---- 37 files changed, 26 insertions(+), 608 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 06e8c33746..d7d679b452 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -119,32 +119,6 @@ Data Path Interface Ingress RX and Egress TX operation is by the nominal DPDK API . The driver supports single-port, multi-queue for both RX and TX. -Configuration Information -------------------------- - -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug - logging and internal checking of RX ingress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug - logging and internal checking of TX egress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables debug - logging of detailed packet and performance statistics gathered in - the PMD and FPGA. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables debug - logging of detailed PMD events and status. - Building DPDK ------------- diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..3c163df7a8 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -72,33 +72,6 @@ Prerequisites `linux-firmware git repository <https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/bnx2x/bnx2x-e2-7.13.11.0.fw>`_ to get the required firmware. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) - - Toggle display of register reads and writes. - .. _bnx2x_driver-compilation: diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 129a16cfc7..8c0d60f154 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..628e8063c2 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -90,19 +90,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options ~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 17839a920e..ae3fa7b8a6 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -195,31 +195,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5a..8cd417f6f0 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index bec97c3326..4bdc3182fc 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..be6a034279 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,8 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index b4a92f663b..579a1fcdf8 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index b7430f6c4e..19f0b06885 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -156,34 +156,12 @@ Config File Options ~~~~~~~~~~~~~~~~~~~ The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -760,7 +738,7 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +Configuration of ``RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb0..9b3bd5d593 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -23,23 +23,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3dabbdcc6a 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..6a8fe0f02c 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,7 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. +The number of queue pairs of each VF can be configured by ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +521,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./{build_dir}/app/testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..857ae87ca6 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 1f1e2f6c77..96c1015658 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,42 +51,6 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - This option is available in meson: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +63,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +201,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 211c0c5a6c..4daab00643 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -328,49 +323,6 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - This option is available in meson: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -383,10 +335,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1109,12 +1057,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..7cd7bea499 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -84,14 +78,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options ~~~~~~~~~~~~~~~ @@ -132,10 +118,7 @@ the path to the MUSDK installation directory needs to be exported. .. code-block:: console export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + Usage Example ------------- diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..3b134ca301 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -151,14 +131,7 @@ For additional instructions regarding DPDK cross compilation please refer to :do .. code-block:: console export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc - - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make + Usage Example ------------- diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..d4e04179f6 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./{build_dir}/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 5f2a0698f6..6aa58f4358 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..bf25402637 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./{build_dir}/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./{build_dir}/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./{build_dir}/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..cb4c52e7de 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./{build_dir}/app/testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index bb591a8b7e..0036fdf70d 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index cf230ae40a..4257f3db85 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + {build_dir}/app/testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index 5b2f868952..cfa1b46ee2 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -111,22 +111,9 @@ Performance note Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index be1c2fe1d6..6ee5190f3c 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -271,21 +271,6 @@ Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_PMD`` (default **y**) - - Enable compilation of Solarflare libefx-based poll-mode driver. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG`` (default **n**) - - Enable compilation of the extra run-time consistency checks. - - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..21030e4371 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..d1dcee971f 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./{build_dir}/app/testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..464c934add 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides Ciara Power @ 2020-08-19 16:22 ` Bruce Richardson 2020-08-19 17:17 ` Bruce Richardson 1 sibling, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-19 16:22 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:04PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > Scanned the first half of the NIC guide with this patch applied. Some comments below. The review of the second half of the doc will follow. /Bruce > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/nics/ark.rst | 26 --------------- > doc/guides/nics/atlantic.rst | 4 --- > doc/guides/nics/axgbe.rst | 15 --------- > doc/guides/nics/bnx2x.rst | 27 --------------- > doc/guides/nics/bnxt.rst | 3 -- > doc/guides/nics/cxgbe.rst | 13 -------- > doc/guides/nics/dpaa.rst | 25 -------------- > doc/guides/nics/dpaa2.rst | 24 -------------- > doc/guides/nics/ena.rst | 16 --------- > doc/guides/nics/enic.rst | 9 ----- > doc/guides/nics/fail_safe.rst | 12 ------- > doc/guides/nics/fm10k.rst | 4 --- > doc/guides/nics/hinic.rst | 9 ----- > doc/guides/nics/hns3.rst | 10 ------ > doc/guides/nics/i40e.rst | 28 ++-------------- > doc/guides/nics/ice.rst | 17 ---------- > doc/guides/nics/igc.rst | 14 -------- > doc/guides/nics/intel_vf.rst | 14 ++------ > doc/guides/nics/ionic.rst | 8 ----- > doc/guides/nics/ipn3ke.rst | 8 ----- > doc/guides/nics/liquidio.rst | 27 --------------- > doc/guides/nics/mlx4.rst | 51 ----------------------------- > doc/guides/nics/mlx5.rst | 58 --------------------------------- > doc/guides/nics/mvneta.rst | 19 +---------- > doc/guides/nics/mvpp2.rst | 29 +---------------- > doc/guides/nics/nfb.rst | 17 +--------- > doc/guides/nics/nfp.rst | 4 --- > doc/guides/nics/null.rst | 6 ++-- > doc/guides/nics/octeontx.rst | 19 +---------- > doc/guides/nics/octeontx2.rst | 11 ------- > doc/guides/nics/pcap_ring.rst | 22 ++++++------- > doc/guides/nics/qede.rst | 17 ++-------- > doc/guides/nics/sfc_efx.rst | 15 --------- > doc/guides/nics/softnic.rst | 9 ----- > doc/guides/nics/szedata2.rst | 18 +--------- > doc/guides/nics/thunderx.rst | 20 ------------ > doc/guides/nics/vdev_netvsc.rst | 6 ---- > 37 files changed, 26 insertions(+), 608 deletions(-) > The features.rst file needs a small update - near the end where the supported architectures are listed, we need to remove the "Use defconfig_*" values. I don't think any replacement text is needed for those. <snip> > diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst > index 129a16cfc7..8c0d60f154 100644 > --- a/doc/guides/nics/bnxt.rst > +++ b/doc/guides/nics/bnxt.rst > @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master > clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to > run on PF and vector mode needs to be disabled. > > -For the PTP time synchronization support, the BNXT PMD must be compiled with > -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). > - > .. code-block:: console > > testpmd> set fwd ieee1588 // enable IEEE 1588 mode There is also a reference to CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS, which should be changed to a reference to RTE_ETHDEV_QUEUE_STAT_CNTRS in config/rte_config.h > diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst > index 54a4c13899..628e8063c2 100644 > --- a/doc/guides/nics/cxgbe.rst > +++ b/doc/guides/nics/cxgbe.rst > @@ -90,19 +90,6 @@ Prerequisites > Pre-Installation Configuration > ------------------------------ > > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``.config`` file. Please note that > -enabling debugging options may affect system performance. > - > -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) > - > - Toggle compilation of librte_pmd_cxgbe driver. > - > - .. note:: > - > - This controls compilation of both CXGBE and CXGBEVF PMD. > > Runtime Options The level headings of this section are now wrong. I think the heading "Pre-Installation Configuration" should be removed and the "Runtime Options" subsection promoted up a level. <snip> > diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst > index b7430f6c4e..19f0b06885 100644 > --- a/doc/guides/nics/i40e.rst > +++ b/doc/guides/nics/i40e.rst > @@ -156,34 +156,12 @@ Config File Options > ~~~~~~~~~~~~~~~~~~~ > > The following options can be modified in the ``config`` file. The "config" file should be clarified as "config/rte_config.h". However, I'd query if the values in that file actually need to be called out as tunable in the documentation. Can you please check with the i40e maintainers if they can be dropped here. > -Please note that enabling debugging options may affect system performance. > > -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) > - > - Toggle compilation of the ``librte_pmd_i40e`` driver. > - > -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) > - > - Toggle display of generic debugging messages. > - > -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) > - > - Toggle bulk allocation for RX. > - > -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) > - > - Toggle the use of Vector PMD instead of normal RX/TX path. > - To enable vPMD for RX, bulk allocation for Rx must be allowed. > - > -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) > - > - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. > - > -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) > +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) > > Number of queues reserved for PF. > > -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) > +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) > > Number of queues reserved for each VMDQ Pool. > > @@ -760,7 +738,7 @@ Use 16 Bytes RX Descriptor Size > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. > -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. > +Configuration of ``RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. This needs more clarification - the setting should be added as "#define RTE_... 1" in config/rte_config.h. Actually, unrelated to this set, a future patch should remove the #undef in the config/rte_config.h file, so that we can set the flag just using CFLAGS. > > Input set requirement of each pctype for FDIR > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ <snip> > diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst > index ade5152595..6a8fe0f02c 100644 > --- a/doc/guides/nics/intel_vf.rst > +++ b/doc/guides/nics/intel_vf.rst > @@ -124,7 +124,7 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure > > In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* > globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. > -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. > +The number of queue pairs of each VF can be configured by ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. This is covered previously in the i40e doc, so I'd suggest dropping this line completely. > The Physical Function in host could be either configured by the Linux* i40e driver > (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. > When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. > @@ -521,20 +521,12 @@ The setup procedure is as follows: > > .. code-block:: console > > - make install T=x86_64-native-linux-gcc > - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i > + ./{build_dir}/app/testpmd -l 0-3 -n 4 -- -i > > #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. > The virtual functions will be listed as available for use. > > -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, > - that is, there is no change to the normal installation procedure. > - > - .. code-block:: console > - > - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc > - cd x86_64-native-linux-gcc > - make > +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. > > .. note:: > <snip> ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides Ciara Power 2020-08-19 16:22 ` Bruce Richardson @ 2020-08-19 17:17 ` Bruce Richardson 1 sibling, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-19 17:17 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:04PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- Final comments for this review of the doc. /Bruce <snip> > diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst > index 1f1e2f6c77..96c1015658 100644 > --- a/doc/guides/nics/mlx4.rst > +++ b/doc/guides/nics/mlx4.rst > @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. > There is also a `section dedicated to this poll mode driver > <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. > > -.. note:: > - > - Due to external dependencies, this driver is disabled by default. It must > - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and > - recompiling DPDK. > > Implementation details > ---------------------- > @@ -56,42 +51,6 @@ Configuration > Compilation options > ~~~~~~~~~~~~~~~~~~~ > > -These options can be modified in the ``.config`` file. > - > -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) > - > - Toggle compilation of librte_pmd_mlx4 itself. > - > -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) > - > - Build PMD with additional code to make it loadable without hard > - dependencies on **libibverbs** nor **libmlx4**, which may not be installed > - on the target system. > - > - In this mode, their presence is still required for it to run properly, > - however their absence won't prevent a DPDK application from starting (with > - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as > - missing with ``ldd(1)``. > - > - It works by moving these dependencies to a purpose-built rdma-core "glue" > - plug-in which must either be installed in a directory whose name is based > - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a > - standard location for the dynamic linker (e.g. ``/lib``) if left to the > - default empty string (``""``). > - > - This option has no performance impact. > - > -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) > - > - Embed static flavor of the dependencies **libibverbs** and **libmlx4** > - in the PMD shared library or the executable static binary. > - > -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) > - > - Toggle debugging code and stricter compilation flags. Enabling this option > - adds additional run-time checks and debugging messages at the cost of > - lower performance. > - > This option is available in meson: This heading needs to be reworded since the make options are now gone, making it weird having it on it's own like that. I'd suggest changing it to something like: "The ibverbs libraries can be linked with this PMD in a number of ways, configured by the "ibverbs_link" build option. This can take on the values..." Whatever way it is reworded, the rewording also applies to the mlx5 doc in the next chapter too. > > - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. > @@ -104,9 +63,6 @@ Environment variables > A list of directories in which to search for the rdma-core "glue" plug-in, > separated by colons or semi-colons. > > - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` > - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, > - since ``LD_LIBRARY_PATH`` has no effect in this case. > > Run-time configuration > ~~~~~~~~~~~~~~~~~~~~~~ > @@ -245,13 +201,6 @@ Current RDMA core package and Linux kernel (recommended) > > .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md > > -If rdma-core libraries are built but not installed, DPDK makefile can link them, > -thanks to these environment variables: > - > - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` > - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` > - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` > - > .. _Mellanox_OFED_as_a_fallback: > > Mellanox OFED as a fallback <snip> > diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst > index c8b00ddf22..7cd7bea499 100644 > --- a/doc/guides/nics/mvneta.rst > +++ b/doc/guides/nics/mvneta.rst > @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: > > * https://www.marvell.com/embedded-processors/armada-3700/ > > -.. Note:: > - > - Due to external dependencies, this driver is disabled by default. It must > - be enabled manually by setting relevant configuration option manually. > - Please refer to `Config File Options`_ section for further details. > - > > Features > -------- > @@ -84,14 +78,6 @@ Prerequisites > Pre-Installation Configuration > ------------------------------ > > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) > - > - Toggle compilation of the librte_pmd_mvneta driver. As in at least one other driver I spotted, if we remove the config file options section, the whole chapter of pre-installation configuration needs to be changed to just a chapter on runtime options. > > Runtime options > ~~~~~~~~~~~~~~~ > @@ -132,10 +118,7 @@ the path to the MUSDK installation directory needs to be exported. > .. code-block:: console > > export LIBMUSDK_PATH=<musdk>/usr/local > - export CROSS=aarch64-linux-gnu- > - make config T=arm64-armv8a-linux-gcc > - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config > - make > + The MUSDK path is now a meson option, so I'd replace all this with: meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build [This also applies to mvpp2.rst] > <snip> > diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst > index 5b2f868952..cfa1b46ee2 100644 > --- a/doc/guides/nics/qede.rst > +++ b/doc/guides/nics/qede.rst > @@ -111,22 +111,9 @@ Performance note > Config File Options > ~~~~~~~~~~~~~~~~~~~ > > -The following options can be modified in the ``.config`` file. Please note that > -enabling debugging options may affect system performance. > +The following option can be modified in the ``rte_config.h`` file. Minor nit, let's clarify that as config/rte_config.h > > -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) > - > - Toggle compilation of QEDE PMD driver. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) > - > - Toggle display of transmit fast path run-time messages. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) > - > - Toggle display of receive fast path run-time messages. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) > +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) > > Gives absolute path of firmware file. > ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` <snip> > diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst > index b1ef9eba59..464c934add 100644 > --- a/doc/guides/nics/thunderx.rst > +++ b/doc/guides/nics/thunderx.rst > @@ -43,26 +43,6 @@ Prerequisites > ------------- > - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. > > -Pre-Installation Configuration > ------------------------------- > - > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > -Please note that enabling debugging options may affect system performance. > - > -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) > - > - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. > - > -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) > - > - Toggle asserts of receive fast path. > - > -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) > - > - Toggle asserts of transmit fast path. > > Driver compilation and testing > ------------------------------ This section has a reference to arm64-thunderx-linux-gcc which looks like a make target, though is also a cross-file. Therefore I suggest referring to that cross file explicitly, by saying to "use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling". > diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst > index d1da071187..d9f6319b9f 100644 > --- a/doc/guides/nics/vdev_netvsc.rst > +++ b/doc/guides/nics/vdev_netvsc.rst > @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed > either when hot-plug will be fully supported in EAL and bus drivers or when > a new NetVSC driver will be integrated. > > -Build options > -------------- > - > -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) > - > - Toggle compilation of this driver. > > Run-time parameters > ------------------- > -- > 2.17.1 > In the virtio.rst file, there is an example using the kni application. The pathname there needs to be adjusted/removed and the binary referred to as dpdk-kni. Similarly later in the doc, l3fwd-power should probably be dpdk-l3fwd-power. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 15/19] doc: remove references to make in platform guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (13 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-12 22:03 ` Thomas Monjalon 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides Ciara Power ` (10 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/platform/bluefield.rst | 15 -------------- doc/guides/platform/octeontx.rst | 33 +------------------------------ doc/guides/platform/octeontx2.rst | 24 ---------------------- 3 files changed, 1 insertion(+), 71 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..71e0f95d9b 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,14 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - meson build ^^^^^^^^^^^ @@ -126,13 +118,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n meson build ^^^^^^^^^^^ diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..ef10208ac9 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. The above steps would rebuild the modules and the required intermediate binaries. Once the target is ready for native compilation, the OCTEON TX platform -drivers can be compiled with the following steps, +drivers can be compiled. -.. code-block:: console - - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: The above steps will prepare build system with numa additions. Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" - If NUMA support is not required, it can be disabled as explained in :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. -Following steps could be used in that case. - -.. code-block:: console - - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- - - SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 13255eec5c..a13ebe7df0 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -498,23 +498,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j meson build ^^^^^^^^^^^ @@ -529,13 +512,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n meson build ^^^^^^^^^^^ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 15/19] doc: remove references to make in platform guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 15/19] doc: remove references to make in platform guides Ciara Power @ 2020-08-12 22:03 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 22:03 UTC (permalink / raw) To: Ciara Power; +Cc: dev, bruce.richardson 07/08/2020 14:30, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> [...] > -make build > -^^^^^^^^^^ > - > -.. code-block:: console > - > - make config T=arm64-bluefield-linux-gcc > - make -j > - > meson build > ^^^^^^^^^^^ I think you can rename "meson build" to "Build" here and elsewhere. I would recommend looking for meson occurences in the docs. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (14 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 15/19] doc: remove references to make in platform guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-12 22:05 ` Thomas Monjalon ` (2 more replies) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 17/19] doc: remove references to make in rawdev guides Ciara Power ` (9 subsequent siblings) 25 siblings, 3 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/prog_guide/build_app.rst | 46 +--- .../prog_guide/dev_kit_build_system.rst | 218 +----------------- .../prog_guide/dev_kit_root_make_help.rst | 188 --------------- .../prog_guide/env_abstraction_layer.rst | 17 +- .../prog_guide/ext_app_lib_make_help.rst | 25 +- doc/guides/prog_guide/graph_lib.rst | 6 +- doc/guides/prog_guide/intro.rst | 2 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../link_bonding_poll_mode_drv_lib.rst | 5 - doc/guides/prog_guide/lto.rst | 13 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/profile_app.rst | 15 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- 19 files changed, 36 insertions(+), 573 deletions(-) delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index bffa55bbef..54e4283752 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -9,14 +9,11 @@ Building Your Own Application Compiling a Sample Application in the Development Kit Directory --------------------------------------------------------------- -When compiling a sample application (for example, hello world), the following variables must be exported: -RTE_SDK and RTE_TARGET. +To compile a sample application (for example, hello world): .. code-block:: console ~/DPDK$ cd examples/helloworld/ - ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc ~/DPDK/examples/helloworld$ make CC main.o LD helloworld @@ -39,8 +36,6 @@ The sample application (Hello World) can be duplicated in a new directory as a s ~$ cp -r DPDK/examples/helloworld my_rte_app ~$ cd my_rte_app/ - ~/my_rte_app$ export RTE_SDK=/home/user/DPDK - ~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc ~/my_rte_app$ make CC main.o LD helloworld @@ -53,47 +48,10 @@ Customizing Makefiles Application Makefile ~~~~~~~~~~~~~~~~~~~~ -The default makefile provided with the Hello World sample application is a good starting point. It includes: - -* $(RTE_SDK)/mk/rte.vars.mk at the beginning - -* $(RTE_SDK)/mk/rte.extapp.mk at the end +The default makefile provided with the Hello World sample application is a good starting point. The user must define several variables: * APP: Contains the name of the application. * SRCS-y: List of source files (\*.c, \*.S). - -Library Makefile -~~~~~~~~~~~~~~~~ - -It is also possible to build a library in the same way: - -* Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -* Include $(RTE_SDK)/mk/rte.extlib.mk at the end. - -The only difference is that APP should be replaced by LIB, which contains the name of the library. For example, libfoo.a. - -Customize Makefile Actions -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be defined to customize Makefile actions. The most common are listed below. Refer to -:ref:`Makefile Description <Makefile_Description>` section in -:ref:`Development Kit Build System <Development_Kit_Build_System>` - -chapter for details. - -* VPATH: The path list where the build system will search for sources. By default, - RTE_SRCDIR will be included in VPATH. - -* CFLAGS_my_file.o: The specific flags to add for C compilation of my_file.c. - -* CFLAGS: The flags to use for C compilation. - -* LDFLAGS: The flags to use for linking. - -* CPPFLAGS: The flags to use to provide flags to the C preprocessor (only useful when assembling .S files) - -* LDLIBS: A list of libraries to link with (for example, -L /path/to/libfoo - lfoo) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 74dba4dd16..91d2120e22 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -31,51 +31,17 @@ Each build directory contains include files, libraries, and applications. A build directory is specific to a configuration that includes architecture + execution environment + toolchain. It is possible to have several build directories sharing the same sources with different configurations. -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, -we use: - -.. code-block:: console - - cd ${RTE_SDK} - make config T=x86_64-native-linux-gcc O=my_sdk_build_dir - -This creates a new my_sdk_build_dir directory. After that, we can compile by doing: - -.. code-block:: console - - cd my_sdk_build_dir - make - -which is equivalent to: - -.. code-block:: console - - make O=my_sdk_build_dir - -Refer to -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` -for details about make commands that can be used from the root of DPDK. Building External Applications ------------------------------ Since DPDK is in essence a development kit, the first objective of end users will be to create an application using this SDK. -To compile an application, the user must set the RTE_SDK and RTE_TARGET environment variables. - -.. code-block:: console - export RTE_SDK=/opt/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - cd /path/to/my_app - -For a new application, the user must create their own Makefile that includes some .mk files, such as -${RTE_SDK}/mk/rte.vars.mk, and ${RTE_SDK}/mk/ rte.app.mk. -This is described in +For a new application, the user must create their own Makefile. This is described in :ref:`Building Your Own Application <Building_Your_Own_Application>`. -Depending on the chosen target (architecture, machine, executive environment, toolchain) defined in the Makefile or as an environment variable, -the applications and libraries will compile using the appropriate .h files and will link with the appropriate .a files. -These files are located in ${RTE_SDK}/arch-machine-execenv-toolchain, which is referenced internally by ${RTE_BIN_SDK}. +Depending on the chosen target (architecture, machine, executive environment, toolchain) defined, the applications and +libraries will compile using the appropriate .h files and will link with the appropriate .a files. To compile their application, the user just has to call make. The compilation result will be located in /path/to/my_app/build directory. @@ -90,92 +56,18 @@ Makefile Description General Rules For DPDK Makefiles ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In the DPDK, Makefiles always follow the same scheme: - -#. Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -#. Define specific variables for RTE build system. - -#. Include a specific $(RTE_SDK)/mk/rte.XYZ.mk, where XYZ can be app, lib, extapp, extlib, obj, gnuconfigure, - and so on, depending on what kind of object you want to build. - :ref:`See Makefile Types <Makefile_Types>` below. - -#. Include user-defined rules and variables. +In the DPDK, Makefiles always define specific variables for RTE build system. The following is a very simple example of an external application Makefile: .. code-block:: make - include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = helloworld # all source are stored in SRCS-y SRCS-y := main.c - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - include $(RTE_SDK)/mk/rte.extapp.mk - -.. _Makefile_Types: - -Makefile Types -~~~~~~~~~~~~~~ - -Depending on the .mk file which is included at the end of the user Makefile, the Makefile will have a different role. -Note that it is not possible to build a library and an application in the same Makefile. -For that, the user must create two separate Makefiles, possibly in two different directories. - -In any case, the rte.vars.mk file must be included in the user Makefile as soon as possible. - -Application -^^^^^^^^^^^ - -These Makefiles generate a binary application. - -* rte.app.mk: Application in the development kit framework - -* rte.extapp.mk: External application - -* rte.hostapp.mk: prerequisite tool to build dpdk - -Library -^^^^^^^ - -Generate a .a library. - -* rte.lib.mk: Library in the development kit framework - -* rte.extlib.mk: external library - -* rte.hostlib.mk: host library in the development kit framework - -Install -^^^^^^^ - -* rte.install.mk: Does not build anything, it is only used to create links or copy files to the installation directory. - This is useful for including files in the development kit framework. - -Kernel Module -^^^^^^^^^^^^^ - -* rte.module.mk: Build a kernel module in the development kit framework. - -Objects -^^^^^^^ - -* rte.obj.mk: Object aggregation (merge several .o in one) in the development kit framework. - -* rte.extobj.mk: Object aggregation (merge several .o in one) outside the development kit framework. - -Misc -^^^^ - -* rte.gnuconfigure.mk: Build an application that is configure-based. - -* rte.subdir.mk: Build several directories in the development kit framework. .. _Internally_Generated_Build_Tools: @@ -220,112 +112,10 @@ hardware support of a given library or application. Useful Variables Provided by the Build System ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* RTE_SDK: The absolute path to the DPDK sources. - When compiling the development kit, this variable is automatically set by the framework. - It has to be defined by the user as an environment variable if compiling an external application. - -* RTE_SRCDIR: The path to the root of the sources. When compiling the development kit, RTE_SRCDIR = RTE_SDK. - When compiling an external application, the variable points to the root of external application sources. - -* RTE_OUTPUT: The path to which output files are written. - Typically, it is $(RTE_SRCDIR)/build, but it can be overridden by the O= option in the make command line. - -* RTE_TARGET: A string identifying the target for which we are building. - The format is arch-machine-execenv-toolchain. - When compiling the SDK, the target is deduced by the build system from the configuration (.config). - When building an external application, it must be specified by the user in the Makefile or as an environment variable. - -* RTE_SDK_BIN: References $(RTE_SDK)/$(RTE_TARGET). - * RTE_ARCH: Defines the architecture (i686, x86_64). - It is the same value as CONFIG_RTE_ARCH but without the double-quotes around the string. * RTE_MACHINE: Defines the machine. - It is the same value as CONFIG_RTE_MACHINE but without the double-quotes around the string. * RTE_TOOLCHAIN: Defines the toolchain (gcc , icc). - It is the same value as CONFIG_RTE_TOOLCHAIN but without the double-quotes around the string. * RTE_EXEC_ENV: Defines the executive environment (linux). - It is the same value as CONFIG_RTE_EXEC_ENV but without the double-quotes around the string. - -* RTE_KERNELDIR: This variable contains the absolute path to the kernel sources that will be used to compile the kernel modules. - The kernel headers must be the same as the ones that will be used on the target machine (the machine that will run the application). - By default, the variable is set to /lib/modules/$(shell uname -r)/build, - which is correct when the target machine is also the build machine. - -* RTE_DEVEL_BUILD: Stricter options (stop on warning). It defaults to y in a git tree. - -Variables that Can be Set/Overridden in a Makefile Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* VPATH: The path list that the build system will search for sources. By default, RTE_SRCDIR will be included in VPATH. - -* CFLAGS: Flags to use for C compilation. The user should use += to append data in this variable. - -* LDFLAGS: Flags to use for linking. The user should use += to append data in this variable. - -* ASFLAGS: Flags to use for assembly. The user should use += to append data in this variable. - -* CPPFLAGS: Flags to use to give flags to C preprocessor (only useful when assembling .S files). - The user should use += to append data in this variable. - -* LDLIBS: In an application, the list of libraries to link with (for example, -L /path/to/libfoo -lfoo ). - The user should use += to append data in this variable. - -* SRC-y: A list of source files (.c, .S, or .o if the source is a binary) in case of application, library or object Makefiles. - The sources must be available from VPATH. - -* INSTALL-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be copied in $(RTE_OUTPUT)/$(INSTPATH). Can be used in almost any RTE Makefile. - -* SYMLINK-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be linked (symbolically) in $(RTE_OUTPUT)/$(INSTPATH). - This variable can be used in almost any DPDK Makefile. - -* PREBUILD: A list of prerequisite actions to be taken before building. The user should use += to append data in this variable. - -* POSTBUILD: A list of actions to be taken after the main build. The user should use += to append data in this variable. - -* PREINSTALL: A list of prerequisite actions to be taken before installing. The user should use += to append data in this variable. - -* POSTINSTALL: A list of actions to be taken after installing. The user should use += to append data in this variable. - -* PRECLEAN: A list of prerequisite actions to be taken before cleaning. The user should use += to append data in this variable. - -* POSTCLEAN: A list of actions to be taken after cleaning. The user should use += to append data in this variable. - -* DEPDIRS-$(DIR): Only used in the development kit framework to specify if the build of the current directory depends on build of another one. - This is needed to support parallel builds correctly. - -Variables that can be Set/Overridden by the User on the Command Line Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be used to configure the build system behavior. They are documented in -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` and -:ref:`External Application/Library Makefile Help <External_Application/Library_Makefile_Help>` - - * WERROR_CFLAGS: By default, this is set to a specific value that depends on the compiler. - Users are encouraged to use this variable as follows: - - CFLAGS += $(WERROR_CFLAGS) - -This avoids the use of different cases depending on the compiler (icc or gcc). -Also, this variable can be overridden from the command line, which allows bypassing of the flags for testing purposes. - -Variables that Can be Set/Overridden by the User in a Makefile or Command Line -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* CFLAGS_my_file.o: Specific flags to add for C compilation of my_file.c. - -* LDFLAGS_my_app: Specific flags to add when linking my_app. - -* EXTRA_CFLAGS: The content of this variable is appended after CFLAGS when compiling. - -* EXTRA_LDFLAGS: The content of this variable is appended after LDFLAGS when linking. - -* EXTRA_LDLIBS: The content of this variable is appended after LDLIBS when linking. - -* EXTRA_ASFLAGS: The content of this variable is appended after ASFLAGS when assembling. - -* EXTRA_CPPFLAGS: The content of this variable is appended after CPPFLAGS when using a C preprocessor on assembly files. diff --git a/doc/guides/prog_guide/dev_kit_root_make_help.rst b/doc/guides/prog_guide/dev_kit_root_make_help.rst deleted file mode 100644 index a30db7d5b4..0000000000 --- a/doc/guides/prog_guide/dev_kit_root_make_help.rst +++ /dev/null @@ -1,188 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Root_Makefile_Help: - -Development Kit Root Makefile Help -================================== - -The DPDK provides a root level Makefile with targets for configuration, building, cleaning, testing, installation and others. -These targets are explained in the following sections. - -Configuration Targets ---------------------- - -The configuration target requires the name of the target, which is specified using T=mytarget and it is mandatory. -The list of available targets are in $(RTE_SDK)/config (remove the defconfig _ prefix). - -Configuration targets also support the specification of the name of the output directory, using O=mybuilddir. -This is an optional parameter, the default output directory is build. - -* Config - - This will create a build directory, and generates a configuration from a template. - A Makefile is also created in the new build directory. - - Example: - - .. code-block:: console - - make config O=mybuild T=x86_64-native-linux-gcc - -Build Targets -------------- - -Build targets support the optional specification of the name of the output directory, using O=mybuilddir. -The default output directory is build. - -* all, build or just make - - Build the DPDK in the output directory previously created by a make config. - - Example: - - .. code-block:: console - - make O=mybuild - -* clean - - Clean all objects created using make build. - - Example: - - .. code-block:: console - - make clean O=mybuild - -* %_sub - - Build a subdirectory only, without managing dependencies on other directories. - - Example: - - .. code-block:: console - - make lib/librte_eal_sub O=mybuild - -* %_clean - - Clean a subdirectory only. - - Example: - - .. code-block:: console - - make lib/librte_eal_clean O=mybuild - -Install Targets ---------------- - -* Install - - The list of available targets are in $(RTE_SDK)/config (remove the defconfig\_ prefix). - - The GNU standards variables may be used: - http://gnu.org/prep/standards/html_node/Directory-Variables.html and - http://gnu.org/prep/standards/html_node/DESTDIR.html - - Example: - - .. code-block:: console - - make install DESTDIR=myinstall prefix=/usr - -Test Targets ------------- - -* test - - Launch automatic tests for a build directory specified using O=mybuilddir. - It is optional, the default output directory is build. - - Example: - - .. code-block:: console - - make test O=mybuild - -Documentation Targets ---------------------- - -* doc - - Generate the documentation (API and guides). - -* doc-api-html - - Generate the Doxygen API documentation in html. - -* doc-guides-html - - Generate the guides documentation in html. - -* doc-guides-pdf - - Generate the guides documentation in pdf. - -Misc Targets ------------- - -* help - - Show a quick help. - -Other Useful Command-line Variables ------------------------------------ - -The following variables can be specified on the command line: - -* V= - - Enable verbose build (show full compilation command line, and some intermediate commands). - -* D= - - Enable dependency debugging. This provides some useful information about why a target is built or not. - -* EXTRA_CFLAGS=, EXTRA_LDFLAGS=, EXTRA_LDLIBS=, EXTRA_ASFLAGS=, EXTRA_CPPFLAGS= - - Append specific compilation, link or asm flags. - -* CROSS= - - Specify a cross toolchain header that will prefix all gcc/binutils applications. This only works when using gcc. - -Make in a Build Directory -------------------------- - -All targets described above are called from the SDK root $(RTE_SDK). -It is possible to run the same Makefile targets inside the build directory. -For instance, the following command: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - make O=mybuild - -is equivalent to: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - cd mybuild - - # no need to specify O= now - make - -Compiling for Debug -------------------- - -To compile the DPDK and sample applications with debugging information included and the optimization level set to 0, -the EXTRA_CFLAGS environment variable should be set before compiling as follows: - -.. code-block:: console - - export EXTRA_CFLAGS='-O0 -g' diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index f64ae953d1..936c885081 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -201,16 +201,16 @@ each segment is strictly one physical page. It is possible to change the amount of virtual memory being preallocated at startup by editing the following config variables: -* ``CONFIG_RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have -* ``CONFIG_RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each +* ``RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have +* ``RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each segment list can address -* ``CONFIG_RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can +* ``RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can have -* ``CONFIG_RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type +* ``RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type can have (where "type" is defined as "page size + NUMA node" combination) -* ``CONFIG_RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each +* ``RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each memory type can address -* ``CONFIG_RTE_MAX_MEM_MB`` places a global maximum on the amount of memory +* ``RTE_MAX_MEM_MB`` places a global maximum on the amount of memory DPDK can reserve Normally, these options do not need to be changed. @@ -715,11 +715,6 @@ However, they can be used in configuration code. Refer to the rte_malloc() function description in the *DPDK API Reference* manual for more information. -Cookies -~~~~~~~ - -When CONFIG_RTE_MALLOC_DEBUG is enabled, the allocated memory contains -overwrite protection fields to help identify buffer overflows. Alignment and NUMA Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/prog_guide/ext_app_lib_make_help.rst b/doc/guides/prog_guide/ext_app_lib_make_help.rst index 4312778dc9..681114239d 100644 --- a/doc/guides/prog_guide/ext_app_lib_make_help.rst +++ b/doc/guides/prog_guide/ext_app_lib_make_help.rst @@ -1,28 +1,11 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -.. _External_Application/Library_Makefile_help: +.. _External_Application_Makefile_help: -External Application/Library Makefile help +External Application Makefile help ========================================== -External applications or libraries should include specific Makefiles from RTE_SDK, located in mk directory. -These Makefiles are: - -* ${RTE_SDK}/mk/rte.extapp.mk: Build an application - -* ${RTE_SDK}/mk/rte.extlib.mk: Build a static library - -* ${RTE_SDK}/mk/rte.extobj.mk: Build objects (.o) - -Prerequisites -------------- - -The following variables must be defined: - -* ${RTE_SDK}: Points to the root directory of the DPDK. - -* ${RTE_TARGET}: Reference the target to be used for compilation (for example, x86_64-native-linux-gcc). Build Targets ------------- @@ -32,7 +15,7 @@ This is optional; the default output directory is build. * all, "nothing" (meaning just make) - Build the application or the library in the specified output directory. + Build the application in the specified output directory. Example: @@ -93,6 +76,4 @@ It is possible to run the Makefile from another directory, by specifying the out .. code-block:: console - export RTE_SDK=/path/to/DPDK - export RTE_TARGET=x86_64-native-linux-icc make -f /path/to/my_app/Makefile S=/path/to/my_app O=/path/to/build_dir diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 669d77c740..c922d10f3d 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -45,13 +45,11 @@ Performance tuning parameters ----------------------------- - Test with various burst size values (256, 128, 64, 32) using - CONFIG_RTE_GRAPH_BURST_SIZE config option. + RTE_GRAPH_BURST_SIZE config option. The testing shows, on x86 and arm64 servers, The sweet spot is 256 burst size. While on arm64 embedded SoCs, it is either 64 or 128. -- Disable node statistics (using ``CONFIG_RTE_LIBRTE_GRAPH_STATS`` config option) +- Disable node statistics (using ``RTE_LIBRTE_GRAPH_STATS`` config option) if not needed. -- Use arm64 optimized memory copy for arm64 architecture by - selecting ``CONFIG_RTE_ARCH_ARM64_MEMCPY``. Programming model ----------------- diff --git a/doc/guides/prog_guide/intro.rst b/doc/guides/prog_guide/intro.rst index 5b319d36d9..44877bd3e3 100644 --- a/doc/guides/prog_guide/intro.rst +++ b/doc/guides/prog_guide/intro.rst @@ -34,7 +34,7 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system - (including the commands that can be used in the root DPDK Makefile to build the development kit and an application) + (including the commands that can be used in the root DPDK to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst index 6ac1bba649..314d4adbb8 100644 --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst @@ -103,8 +103,3 @@ Debug logging and Statistics Collection The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. This macro is not enabled by default. - -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. -This macro is disabled by default. -Note that while logging contains a lot of detailed information, -it slows down packet processing and might cause the loss of a lot of packets. diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst index 2459fd243e..c376ac5f74 100644 --- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst +++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst @@ -25,11 +25,6 @@ The librte_pmd_bond library exports a C API which provides an API for the creation of bonded devices as well as the configuration and management of the bonded device and its slave devices. -.. note:: - - The Link Bonding PMD Library is enabled by default in the build - configuration files, the library can be disabled by setting - ``CONFIG_RTE_LIBRTE_PMD_BOND=n`` and recompiling the DPDK. Link Bonding Modes Overview --------------------------- diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index 277a6f1090..efa0cec4a1 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -26,17 +26,8 @@ need to explicitly initialize variable in order to silence the compiler. Please note that turning LTO on causes considerable extension of build time. -When using make based build, link time optimization can be enabled for -the whole DPDK by setting: - -.. code-block:: console - - CONFIG_RTE_ENABLE_LTO=y - -in config file. - -For the meson based build it can be enabled by setting meson built-in -'b_lto' option: +For the meson based build link time optimization can be enabled by setting +meson built-in 'b_lto' option: .. code-block:: console diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index c3dbfb9221..2f190b40e4 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), -the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). +In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, +bad type, and so on). Use Cases --------- diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index e3e1f940be..f0bdcd3be1 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -17,14 +17,13 @@ This library is used by the :ref:`Mbuf Library <Mbuf_Library>`. Cookies ------- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. +In debug mode, cookies are added at the beginning and end of allocated blocks. The allocated objects then contain overwrite protection fields to help debugging buffer overflows. Stats ----- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), -statistics about get from/put in the pool are stored in the mempool structure. +In debug mode, statistics about get from/put in the pool are stored in the mempool structure. Statistics are per-lcore to avoid concurrent access to statistics counters. Memory Alignment Constraints on x86 architecture @@ -90,7 +89,7 @@ the speed at which a core can access its own cache for a specific memory pool wi The cache is composed of a small, per-core table of pointers and its length (used as a stack). This internal cache can be enabled or disabled at creation of the pool. -The maximum size of the cache is static and is defined at compilation time (CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE). +The maximum size of the cache is static and is defined at compilation time (RTE_MEMPOOL_CACHE_MAX_SIZE). :numref:`figure_mempool` shows a cache in operation. diff --git a/doc/guides/prog_guide/overview.rst b/doc/guides/prog_guide/overview.rst index 986c896908..537a568f1e 100644 --- a/doc/guides/prog_guide/overview.rst +++ b/doc/guides/prog_guide/overview.rst @@ -18,7 +18,7 @@ The framework creates a set of libraries for specific environments through the creation of an Environment Abstraction Layer (EAL), which may be specific to a mode of the Intel® architecture (32-bit or 64-bit), Linux* user space compilers or a specific platform. -These environments are created through the use of make files and configuration files. +These environments are created through the use of meson files and configuration files. Once the EAL library is created, the user may link with the library to create their own applications. Other libraries, outside of EAL, including the Hash, Longest Prefix Match (LPM) and rings libraries are also provided. @@ -38,21 +38,13 @@ Development Environment ----------------------- The DPDK project installation requires Linux and the associated toolchain, -such as one or more compilers, assembler, make utility, +such as one or more compilers, assembler, meson utility, editor and various libraries to create the DPDK components and libraries. Once these libraries are created for the specific environment and architecture, they may then be used to create the user's data plane application. When creating applications for the Linux user space, the glibc library is used. -For DPDK applications, two environmental variables (RTE_SDK and RTE_TARGET) -must be configured before compiling the applications. -The following are examples of how the variables can be set: - -.. code-block:: console - - export RTE_SDK=/home/user/DPDK - export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started Guide* for information on setting up the development environment. diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index e5d0e9079e..9394bb7b41 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -33,14 +33,6 @@ Refer to the for details about application profiling. -Profiling with VTune -~~~~~~~~~~~~~~~~~~~~ - -To allow VTune attaching to the DPDK application, reconfigure and recompile -the DPDK with ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` and -``CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE`` enabled. - - Profiling on ARM64 ------------------ @@ -76,8 +68,7 @@ cycle counter for user space access by configuring the PMU from the privileged mode (kernel space). By default the ``rte_rdtsc()`` implementation uses a portable ``cntvct_el0`` -scheme. Application can choose the PMU based implementation with -``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``. +scheme. The example below shows the steps to configure the PMU based cycle counter on an ARMv8 machine. @@ -88,10 +79,6 @@ an ARMv8 machine. cd armv8_pmu_cycle_counter_el0 make sudo insmod pmu_el0_cycle_counter.ko - cd $DPDK_DIR - make config T=arm64-armv8a-linux-gcc - echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config - make .. warning:: diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst index a159709450..4e4ea33ccb 100644 --- a/doc/guides/prog_guide/qos_framework.rst +++ b/doc/guides/prog_guide/qos_framework.rst @@ -1525,15 +1525,7 @@ Integration with the DPDK QoS Scheduler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ RED functionality in the DPDK QoS scheduler is disabled by default. -To enable it, use the DPDK configuration parameter: - -:: - - CONFIG_RTE_SCHED_RED=y - -This parameter must be set to y. -The parameter is found in the build configuration files in the DPDK/config directory, -for example, DPDK/config/common_linux. +The parameter is found in the build configuration files in the DPDK/config directory. RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure that is passed to the scheduler on initialization. RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) diff --git a/doc/guides/prog_guide/rcu_lib.rst b/doc/guides/prog_guide/rcu_lib.rst index d142d0c79d..d0aef3bc16 100644 --- a/doc/guides/prog_guide/rcu_lib.rst +++ b/doc/guides/prog_guide/rcu_lib.rst @@ -186,10 +186,9 @@ they entered a quiescent state. This API checks if a writer has triggered a quiescent state query and update the state accordingly. The ``rte_rcu_qsbr_lock()`` and ``rte_rcu_qsbr_unlock()`` are empty functions. -However, when ``CONFIG_RTE_LIBRTE_RCU_DEBUG`` is enabled, these APIs aid -in debugging issues. One can mark the access to shared data structures on the -reader side using these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if -all the locks are unlocked. +However, these APIs can aid in debugging issues. One can mark the access to +shared data structures on the reader side using these APIs. The +``rte_rcu_qsbr_quiescent()`` will check if all the locks are unlocked. Resource reclamation framework for DPDK --------------------------------------- diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 31c153a1b7..8d531bd9ef 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -8,29 +8,10 @@ Source Organization This section describes the organization of sources in the DPDK framework. -Makefiles and Config --------------------- - -.. note:: - - In the following descriptions, - ``RTE_SDK`` is the environment variable that points to the base directory into which the tarball was extracted. - See - :ref:`Useful_Variables_Provided_by_the_Build_System` - for descriptions of other variables. - -Makefiles that are provided by the DPDK libraries and applications are located in ``$(RTE_SDK)/mk``. - -Config templates are located in ``$(RTE_SDK)/config``. The templates describe the options that are enabled for each target. -The config file also contains items that can be enabled and disabled for many of the DPDK libraries, -including debug options. -The user should look at the config file and become familiar with these options. -The config file is also used to create a header file, which will be located in the new build directory. - Libraries --------- -Libraries are located in subdirectories of ``$(RTE_SDK)/lib``. +Libraries are located in subdirectories of ``dpdk/lib``. By convention a library refers to any code that provides an API to an application. Typically, it generates an archive file (``.a``), but a kernel module would also go in the same directory. @@ -55,7 +36,7 @@ Applications ------------ Applications are source files that contain a ``main()`` function. -They are located in the ``$(RTE_SDK)/app`` and ``$(RTE_SDK)/examples`` directories. +They are located in the ``dpdk/app`` and ``dpdk/examples`` directories. The app directory contains sample applications that are used to test DPDK (such as autotests) or the Poll Mode Drivers (test-pmd). diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 9bbfd165d8..fbadf9fde9 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -135,8 +135,7 @@ In order to avoid performance impact in fast path code, the library introduced the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``. ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using -``CONFIG_RTE_ENABLE_TRACE_FP`` configuration parameter. -The ``enable_trace_fp`` option shall be used for the same for meson build. +the ``enable_trace_fp`` option for meson build. Event record mode ----------------- diff --git a/doc/guides/prog_guide/writing_efficient_code.rst b/doc/guides/prog_guide/writing_efficient_code.rst index 2639ef7bf6..db2f1ddbc2 100644 --- a/doc/guides/prog_guide/writing_efficient_code.rst +++ b/doc/guides/prog_guide/writing_efficient_code.rst @@ -258,8 +258,7 @@ For instance: Setting the Target CPU Type --------------------------- -The DPDK supports CPU microarchitecture-specific optimizations by means of CONFIG_RTE_MACHINE option -in the DPDK configuration file. +The DPDK supports CPU microarchitecture-specific optimizations by means of RTE_MACHINE option. The degree of optimization depends on the compiler's ability to optimize for a specific microarchitecture, therefore it is preferable to use the latest compiler versions whenever possible. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides Ciara Power @ 2020-08-12 22:05 ` Thomas Monjalon 2020-08-17 13:54 ` Bruce Richardson 2020-08-19 15:21 ` Laatz, Kevin 2 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 22:05 UTC (permalink / raw) To: Ciara Power; +Cc: dev, bruce.richardson 07/08/2020 14:30, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> [...] > ~/DPDK$ cd examples/helloworld/ > - ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK > - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc The equivalent with meson is to specify the installation path with PKG_CONFIG_PATH. > ~/DPDK/examples/helloworld$ make ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides Ciara Power 2020-08-12 22:05 ` Thomas Monjalon @ 2020-08-17 13:54 ` Bruce Richardson 2020-08-19 15:54 ` Stephen Hemminger 2020-08-19 15:21 ` Laatz, Kevin 2 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-17 13:54 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:30:06PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/prog_guide/build_app.rst | 46 +--- > .../prog_guide/dev_kit_build_system.rst | 218 +----------------- > .../prog_guide/dev_kit_root_make_help.rst | 188 --------------- > .../prog_guide/env_abstraction_layer.rst | 17 +- > .../prog_guide/ext_app_lib_make_help.rst | 25 +- > doc/guides/prog_guide/graph_lib.rst | 6 +- > doc/guides/prog_guide/intro.rst | 2 +- > .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - > .../link_bonding_poll_mode_drv_lib.rst | 5 - > doc/guides/prog_guide/lto.rst | 13 +- > doc/guides/prog_guide/mbuf_lib.rst | 4 +- > doc/guides/prog_guide/mempool_lib.rst | 7 +- > doc/guides/prog_guide/overview.rst | 12 +- > doc/guides/prog_guide/profile_app.rst | 15 +- > doc/guides/prog_guide/qos_framework.rst | 10 +- > doc/guides/prog_guide/rcu_lib.rst | 7 +- > doc/guides/prog_guide/source_org.rst | 23 +- > doc/guides/prog_guide/trace_lib.rst | 3 +- > .../prog_guide/writing_efficient_code.rst | 3 +- > 19 files changed, 36 insertions(+), 573 deletions(-) > delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst > <snip> > diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst > index 74dba4dd16..91d2120e22 100644 > --- a/doc/guides/prog_guide/dev_kit_build_system.rst > +++ b/doc/guides/prog_guide/dev_kit_build_system.rst > @@ -31,51 +31,17 @@ Each build directory contains include files, libraries, and applications. > A build directory is specific to a configuration that includes architecture + execution environment + toolchain. > It is possible to have several build directories sharing the same sources with different configurations. > > -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, > -we use: > - Rather than selectively removing parts of this file and then looking to replace them with meson equivalents, I think we should just completely remove this section. The info for using the build system and the variables that meson uses are already covered in the contributors guide (section 1.11 specifically). ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides 2020-08-17 13:54 ` Bruce Richardson @ 2020-08-19 15:54 ` Stephen Hemminger 0 siblings, 0 replies; 300+ messages in thread From: Stephen Hemminger @ 2020-08-19 15:54 UTC (permalink / raw) To: Bruce Richardson; +Cc: Ciara Power, dev, thomas On Mon, 17 Aug 2020 14:54:21 +0100 Bruce Richardson <bruce.richardson@intel.com> wrote: > > diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst > > index 74dba4dd16..91d2120e22 100644 > > --- a/doc/guides/prog_guide/dev_kit_build_system.rst > > +++ b/doc/guides/prog_guide/dev_kit_build_system.rst > > @@ -31,51 +31,17 @@ Each build directory contains include files, libraries, and applications. > > A build directory is specific to a configuration that includes architecture + execution environment + toolchain. > > It is possible to have several build directories sharing the same sources with different configurations. > > > > -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, > > -we use: > > - > Rather than selectively removing parts of this file and then looking to > replace them with meson equivalents, I think we should just completely > remove this section. The info for using the build system and the variables > that meson uses are already covered in the contributors guide (section 1.11 > specifically). Agreed, until all of mk/ is gone, DPDK can't really say it doesn't support make. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides Ciara Power 2020-08-12 22:05 ` Thomas Monjalon 2020-08-17 13:54 ` Bruce Richardson @ 2020-08-19 15:21 ` Laatz, Kevin 2 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-19 15:21 UTC (permalink / raw) To: Ciara Power, dev; +Cc: bruce.richardson, thomas On 07/08/2020 13:30, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/prog_guide/build_app.rst | 46 +--- > .../prog_guide/dev_kit_build_system.rst | 218 +----------------- > .../prog_guide/dev_kit_root_make_help.rst | 188 --------------- > .../prog_guide/env_abstraction_layer.rst | 17 +- > .../prog_guide/ext_app_lib_make_help.rst | 25 +- > doc/guides/prog_guide/graph_lib.rst | 6 +- > doc/guides/prog_guide/intro.rst | 2 +- > .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - > .../link_bonding_poll_mode_drv_lib.rst | 5 - > doc/guides/prog_guide/lto.rst | 13 +- > doc/guides/prog_guide/mbuf_lib.rst | 4 +- > doc/guides/prog_guide/mempool_lib.rst | 7 +- > doc/guides/prog_guide/overview.rst | 12 +- > doc/guides/prog_guide/profile_app.rst | 15 +- > doc/guides/prog_guide/qos_framework.rst | 10 +- > doc/guides/prog_guide/rcu_lib.rst | 7 +- > doc/guides/prog_guide/source_org.rst | 23 +- > doc/guides/prog_guide/trace_lib.rst | 3 +- > .../prog_guide/writing_efficient_code.rst | 3 +- > 19 files changed, 36 insertions(+), 573 deletions(-) > delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst > > diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst > index bffa55bbef..54e4283752 100644 > --- a/doc/guides/prog_guide/build_app.rst > +++ b/doc/guides/prog_guide/build_app.rst > @@ -9,14 +9,11 @@ Building Your Own Application > Compiling a Sample Application in the Development Kit Directory > --------------------------------------------------------------- > > -When compiling a sample application (for example, hello world), the following variables must be exported: > -RTE_SDK and RTE_TARGET. > +To compile a sample application (for example, hello world): > > .. code-block:: console > > ~/DPDK$ cd examples/helloworld/ > - ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK > - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc > ~/DPDK/examples/helloworld$ make > CC main.o > LD helloworld While the example apps will still support make, it would be good to give these examples for meson IMO. > @@ -39,8 +36,6 @@ The sample application (Hello World) can be duplicated in a new directory as a s > > ~$ cp -r DPDK/examples/helloworld my_rte_app > ~$ cd my_rte_app/ > - ~/my_rte_app$ export RTE_SDK=/home/user/DPDK > - ~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc > ~/my_rte_app$ make > CC main.o > LD helloworld > @@ -53,47 +48,10 @@ Customizing Makefiles > Application Makefile > ~~~~~~~~~~~~~~~~~~~~ > > -The default makefile provided with the Hello World sample application is a good starting point. It includes: > - > -* $(RTE_SDK)/mk/rte.vars.mk at the beginning > - > -* $(RTE_SDK)/mk/rte.extapp.mk at the end > +The default makefile provided with the Hello World sample application is a good starting point. > > The user must define several variables: > > * APP: Contains the name of the application. > > * SRCS-y: List of source files (\*.c, \*.S). > - > -Library Makefile > -~~~~~~~~~~~~~~~~ > - > -It is also possible to build a library in the same way: > - > -* Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. > - > -* Include $(RTE_SDK)/mk/rte.extlib.mk at the end. > - > -The only difference is that APP should be replaced by LIB, which contains the name of the library. For example, libfoo.a. > - > -Customize Makefile Actions > -~~~~~~~~~~~~~~~~~~~~~~~~~~ > - > -Some variables can be defined to customize Makefile actions. The most common are listed below. Refer to > -:ref:`Makefile Description <Makefile_Description>` section in > -:ref:`Development Kit Build System <Development_Kit_Build_System>` > - > -chapter for details. > - > -* VPATH: The path list where the build system will search for sources. By default, > - RTE_SRCDIR will be included in VPATH. > - > -* CFLAGS_my_file.o: The specific flags to add for C compilation of my_file.c. > - > -* CFLAGS: The flags to use for C compilation. > - > -* LDFLAGS: The flags to use for linking. > - > -* CPPFLAGS: The flags to use to provide flags to the C preprocessor (only useful when assembling .S files) > - > -* LDLIBS: A list of libraries to link with (for example, -L /path/to/libfoo - lfoo) <snip> > diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst > index 6ac1bba649..314d4adbb8 100644 > --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst > +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst > @@ -103,8 +103,3 @@ Debug logging and Statistics Collection > > The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. > This macro is not enabled by default. > - > -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. > -This macro is disabled by default. > -Note that while logging contains a lot of detailed information, > -it slows down packet processing and might cause the loss of a lot of packets. > diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst > index 2459fd243e..c376ac5f74 100644 > --- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst > +++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst > @@ -25,11 +25,6 @@ The librte_pmd_bond library exports a C API which provides an API for the > creation of bonded devices as well as the configuration and management of the > bonded device and its slave devices. > > -.. note:: > - > - The Link Bonding PMD Library is enabled by default in the build > - configuration files, the library can be disabled by setting > - ``CONFIG_RTE_LIBRTE_PMD_BOND=n`` and recompiling the DPDK. Rather than removing this completely, I suggest replacing with the meson option: "-Ddisable_drivers=net/bond" There is also still a reference to RTE_TARGET on line 380 of this file. > > Link Bonding Modes Overview > --------------------------- > diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst > index 277a6f1090..efa0cec4a1 100644 > --- a/doc/guides/prog_guide/lto.rst > +++ b/doc/guides/prog_guide/lto.rst > @@ -26,17 +26,8 @@ need to explicitly initialize variable in order to silence the compiler. > Please note that turning LTO on causes considerable extension of > build time. > > -When using make based build, link time optimization can be enabled for > -the whole DPDK by setting: > - > -.. code-block:: console > - > - CONFIG_RTE_ENABLE_LTO=y > - > -in config file. > - > -For the meson based build it can be enabled by setting meson built-in > -'b_lto' option: > +For the meson based build link time optimization can be enabled by setting > +meson built-in 'b_lto' option: This wording implies that there is another build system. Suggest changing to just "link time optimization can be enabled by setting +meson built-in 'b_lto' option". > > .. code-block:: console > > diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst > index c3dbfb9221..2f190b40e4 100644 > --- a/doc/guides/prog_guide/mbuf_lib.rst > +++ b/doc/guides/prog_guide/mbuf_lib.rst > @@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic > Debug > ----- > > -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), > -the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). > +In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, > +bad type, and so on). > > Use Cases > --------- <snip> > > diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst > index e5d0e9079e..9394bb7b41 100644 > --- a/doc/guides/prog_guide/profile_app.rst > +++ b/doc/guides/prog_guide/profile_app.rst > @@ -33,14 +33,6 @@ Refer to the > for details about application profiling. > > > -Profiling with VTune > -~~~~~~~~~~~~~~~~~~~~ > - > -To allow VTune attaching to the DPDK application, reconfigure and recompile > -the DPDK with ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` and > -``CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE`` enabled. > - > - > Profiling on ARM64 > ------------------ > > @@ -76,8 +68,7 @@ cycle counter for user space access by configuring the PMU from the privileged > mode (kernel space). > > By default the ``rte_rdtsc()`` implementation uses a portable ``cntvct_el0`` > -scheme. Application can choose the PMU based implementation with > -``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``. > +scheme. > > The example below shows the steps to configure the PMU based cycle counter on > an ARMv8 machine. > @@ -88,10 +79,6 @@ an ARMv8 machine. > cd armv8_pmu_cycle_counter_el0 > make > sudo insmod pmu_el0_cycle_counter.ko > - cd $DPDK_DIR > - make config T=arm64-armv8a-linux-gcc > - echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config > - make This could be replaced with meson/ninja rather than just removing the build step. > > .. warning:: > > diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst > index a159709450..4e4ea33ccb 100644 > --- a/doc/guides/prog_guide/qos_framework.rst > +++ b/doc/guides/prog_guide/qos_framework.rst > @@ -1525,15 +1525,7 @@ Integration with the DPDK QoS Scheduler > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > RED functionality in the DPDK QoS scheduler is disabled by default. > -To enable it, use the DPDK configuration parameter: > - > -:: > - > - CONFIG_RTE_SCHED_RED=y > - > -This parameter must be set to y. > -The parameter is found in the build configuration files in the DPDK/config directory, > -for example, DPDK/config/common_linux. > +The parameter is found in the build configuration files in the DPDK/config directory. > RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure > that is passed to the scheduler on initialization. > RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) <snip> Comments outside the changes: - index.rst still refers to the removed 'dev_kit_root_make_help.rst' - 'kernel_nic_interface.rst' has insmod examples which need updated paths for meson Thanks, Kevin ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 17/19] doc: remove references to make in rawdev guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (15 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 18/19] doc: remove references to make in sample app guides Ciara Power ` (8 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ioat.rst | 5 ----- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 7 files changed, 83 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst index d0eee5e237..3026511cf8 100644 --- a/doc/guides/rawdevs/ioat.rst +++ b/doc/guides/rawdevs/ioat.rst @@ -54,11 +54,6 @@ shows: Compilation ------------ -For builds done with ``make``, the driver compilation is enabled by the -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is -enabled by default in builds for x86 platforms, and disabled in other -configurations. - For builds using ``meson`` and ``ninja``, the driver will be built when the target platform is x86-based. diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index aa7d809649..0589b70087 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ is https://www.intel.com/content/dam/support/us/en/documents/server-products/Int - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 1e1dfbe931..f93ec1ffd7 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index bbcf530a45..4f91e78ab1 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 17/19] doc: remove references to make in rawdev guides 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 17/19] doc: remove references to make in rawdev guides Ciara Power @ 2020-08-18 11:46 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-18 11:46 UTC (permalink / raw) To: Ciara Power, dev; +Cc: bruce.richardson, thomas On 07/08/2020 13:30, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- > doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- > doc/guides/rawdevs/ifpga.rst | 10 ---------- > doc/guides/rawdevs/ioat.rst | 5 ----- > doc/guides/rawdevs/ntb.rst | 6 ------ > doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ > doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- > 7 files changed, 83 deletions(-) <snip> > diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst > index d0eee5e237..3026511cf8 100644 > --- a/doc/guides/rawdevs/ioat.rst > +++ b/doc/guides/rawdevs/ioat.rst > @@ -54,11 +54,6 @@ shows: > Compilation > ------------ > > -For builds done with ``make``, the driver compilation is enabled by the > -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is > -enabled by default in builds for x86 platforms, and disabled in other > -configurations. > - > For builds using ``meson`` and ``ninja``, the driver will be built when the > target platform is x86-based. > No need to explicitly mention "meson and ninja" here since make is gone. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 18/19] doc: remove references to make in sample app guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (16 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 17/19] doc: remove references to make in rawdev guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 19/19] doc: remove references to make in vdpadevs guides Ciara Power ` (7 subsequent siblings) 25 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/sample_app_ug/bbdev_app.rst | 11 +------ doc/guides/sample_app_ug/compiling.rst | 29 ++++--------------- .../sample_app_ug/l3_forward_access_ctrl.rst | 2 +- .../sample_app_ug/performance_thread.rst | 3 +- doc/guides/sample_app_ug/qos_scheduler.rst | 2 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 7 ----- doc/guides/sample_app_ug/service_cores.rst | 11 +------ doc/guides/sample_app_ug/tep_termination.rst | 15 +--------- doc/guides/sample_app_ug/test_pipeline.rst | 2 +- doc/guides/sample_app_ug/vhost.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 22 +++++--------- .../sample_app_ug/vmdq_dcb_forwarding.rst | 4 +-- doc/guides/sample_app_ug/vmdq_forwarding.rst | 4 +-- 13 files changed, 26 insertions(+), 88 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..ef12dca8e6 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -39,16 +39,7 @@ Compiling the Application .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. + cd dpdk/examples/bbdev_app #. Build the application: diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..c08cb63571 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,17 +9,11 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - Go to DPDK source: .. code-block:: console - cd $RTE_SDK + cd dpdk Build DPDK: @@ -32,15 +26,13 @@ Build the sample applications: .. code-block:: console - export RTE_TARGET=build make -C examples -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. +Applications are output to: ``dpdk/examples/app-dir/build`` or +``dpdk/examples/app-dir/{build_dir}``. In the example above the compiled application is written to the ``build`` subdirectory. @@ -63,17 +55,11 @@ sets verbose output. To compile a single application ------------------------------- -Set the path to DPDK source code: - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - Go to DPDK source: .. code-block:: console - cd $RTE_SDK + cd dpdk Build DPDK: @@ -83,14 +69,13 @@ Build DPDK: make Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make To cross compile the sample application(s) @@ -101,8 +86,6 @@ In example of AARCH64 cross compiling: .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk make -C examples CROSS=aarch64-linux-gnu- or make CROSS=aarch64-linux-gnu- diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..ac23c3aa9c 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..7303ff19c4 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -1150,8 +1150,7 @@ To build and run the pthread shim example .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim + cd dpdk/examples/performance-thread/pthread_shim #. Set the target (a default target is used if not specified). For example: diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..5cd64b5fd4 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,7 +42,7 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the configuration file for the specific target to be compiled. Running the Application diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..087744bd0b 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..d2a2a6cac3 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -24,16 +24,7 @@ Compiling the Application .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. + cd dpdk/examples/service_cores #. Build the application: diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..a26fa888e7 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,18 +90,6 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- @@ -110,8 +98,7 @@ Running the Sample Code .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination + cd dpdk/examples/tep_termination #. Run the tep_termination sample code: diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..a540faa3ed 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/app/test-pipeline`` directory. Running the Application diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..ad682c68b2 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -78,7 +78,7 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..d8d35d6d88 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c66877c538 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,8 +26,8 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index c3a3439e51..5df6bbeef3 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,8 +24,8 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH 20.11 19/19] doc: remove references to make in vdpadevs guides 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (17 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 18/19] doc: remove references to make in sample app guides Ciara Power @ 2020-08-07 12:30 ` Ciara Power 2020-08-07 13:28 ` [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Bruce Richardson ` (6 subsequent siblings) 25 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-07 12:30 UTC (permalink / raw) To: dev; +Cc: bruce.richardson, thomas, Ciara Power Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/vdpadevs/mlx5.rst | 40 +++--------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..2717459b6f 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -65,42 +63,10 @@ Prerequisites Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (18 preceding siblings ...) 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 19/19] doc: remove references to make in vdpadevs guides Ciara Power @ 2020-08-07 13:28 ` Bruce Richardson 2020-08-12 22:07 ` Thomas Monjalon 2020-08-12 21:50 ` Thomas Monjalon ` (5 subsequent siblings) 25 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-08-07 13:28 UTC (permalink / raw) To: Ciara Power; +Cc: dev, thomas On Fri, Aug 07, 2020 at 01:29:50PM +0100, Ciara Power wrote: > As previously decided [1] and communicated via deprecation notice [2], the > make build system is to be removed in the 20.11 release. > > This patchset removes support for compiling DPDK with the legacy make > build system. Some make support is maintained for example applications, > where pkg-config is used rather than the legacy make method. > > References to the make build system are removed from all documentation, > please review to see if replacement meson instructions are needed in some cases. > > [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 > > Ciara Power (19): > examples: remove legacy sections of makefiles > build: remove makefiles and mk directory > config: remove all config files used by make > buildtools: remove all scripts for use with make > doc: remove references to make in bbdev guides > doc: remove references to make in compressdev guides > doc: remove references to make in contributing guides > doc: remove references to make in cryptodev guides > doc: remove references to make in eventdev guides > doc: remove references to make in FreeBSD gsg guide > doc: remove references to make in howto guides > doc: remove references to make in Linux gsg guides > doc: remove references to make in mempool guides > doc: remove references to make in NIC guides > doc: remove references to make in platform guides > doc: remove references to make in prog guides > doc: remove references to make in rawdev guides > doc: remove references to make in sample app guides > doc: remove references to make in vdpadevs guides > <snip> > 535 files changed, 256 insertions(+), 18894 deletions(-) Thanks for taking on this work. I like those diff-stat numbers. Nearly 19000 lines fewer in DPDK! ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK 2020-08-07 13:28 ` [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Bruce Richardson @ 2020-08-12 22:07 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 22:07 UTC (permalink / raw) To: Ciara Power, Bruce Richardson; +Cc: dev, olivier.matz 07/08/2020 15:28, Bruce Richardson: > <snip> > > 535 files changed, 256 insertions(+), 18894 deletions(-) > > Thanks for taking on this work. > > I like those diff-stat numbers. Nearly 19000 lines fewer in DPDK! Me too. I expect even more than 19000 in the future last version :-) ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (19 preceding siblings ...) 2020-08-07 13:28 ` [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Bruce Richardson @ 2020-08-12 21:50 ` Thomas Monjalon 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (4 subsequent siblings) 25 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-08-12 21:50 UTC (permalink / raw) To: Ciara Power; +Cc: dev, bruce.richardson 07/08/2020 14:29, Ciara Power: > As previously decided [1] and communicated via deprecation notice [2], the > make build system is to be removed in the 20.11 release. Thanks for working on it. Please, remove the deprecation notice with this patch. > 535 files changed, 256 insertions(+), 18894 deletions(-) That's not a small patch. It would be good to merge it quickly. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 00/37] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (20 preceding siblings ...) 2020-08-12 21:50 ` Thomas Monjalon @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 01/37] examples: remove legacy sections of makefiles Ciara Power ` (36 more replies) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (3 subsequent siblings) 25 siblings, 37 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power v2: - Fixed comments on v1. - Removed additional make references. - Added some meson replacements where necessary. - Added dummy root Makefile. As previously decided [1] and communicated via deprecation notice [2], the make build system is to be removed in the 20.11 release. This patchset removes support for compiling DPDK with the legacy make build system. Some make support is maintained for example applications, where pkg-config is used rather than the legacy make method. References to the make build system are removed from all documentation, please review to see if replacement meson instructions are needed in some cases. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 Bruce Richardson (6): examples/multi_process: convert to pkg-config-based build examples/vm_power_manager: convert to use DPDK pkg-config examples/vm_power_manager: convert guest cli to pkg-config examples/ethtool: convert to pkg-config-based build build: create dummy Makefile doc/guides: remove use of DPDK make build system Ciara Power (28): examples: remove legacy sections of makefiles build: remove makefiles and mk directory config: remove all config files used by make examples: remove old build system references buildtools: remove all scripts for use with make devtools: remove use of make in scripts app/test: remove references to make drivers: remove references to make config options lib: remove references to make config options doc: remove deprecation notice for make doc: remove references to make in bbdev guides doc: remove references to make in compressdev guides doc: remove references to make in contributing guides doc: remove references to make in cryptodev guides doc: remove references to make in eventdev guides doc: remove references to make in FreeBSD gsg guide doc: remove references to make in howto guides doc: remove references to make in Linux gsg guides doc: remove references to make in mempool guides doc: remove references to make in NIC guides doc: remove references to make in platform guides doc: remove references to make in prog guides doc: remove references to make in rawdev guides doc: remove references to make in sample app guides doc: remove references to make in vdpadevs guides doc: remove reference to make in tools guides doc: remove references to make in testpmd guides doc: update quick build doc to remove make references Kevin Laatz (3): examples/server_node_efd: convert to pkg-config-based build examples/ka-agent: convert to pkg-config-based build examples/pthread: convert to pkg-config-based build GNUmakefile | 17 - MAINTAINERS | 12 +- Makefile | 7 +- app/Makefile | 34 - app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 - app/test-bbdev/test-bbdev.py | 11 +- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 - app/test-eventdev/Makefile | 32 - app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 - app/test-pipeline/Makefile | 33 - app/test-pmd/Makefile | 73 -- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ----- app/test/test_cryptodev.c | 89 +- app/test/test_cryptodev_asym.c | 18 +- buildtools/Makefile | 9 - buildtools/auto-config-h.sh | 108 -- buildtools/call-sphinx-build.py | 5 +- buildtools/gen-build-mk.sh | 23 - buildtools/gen-config-h.sh | 15 - buildtools/pmdinfogen/Makefile | 20 - buildtools/relpath.sh | 76 -- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - devtools/build-tags.sh | 14 +- devtools/check-includes.sh | 3 +- devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 315 ----- doc/build-sdk-quick.txt | 55 +- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 +- doc/guides/bbdevs/fpga_lte_fec.rst | 7 +- doc/guides/bbdevs/turbo_sw.rst | 15 - doc/guides/compressdevs/isal.rst | 4 - doc/guides/compressdevs/octeontx.rst | 24 +- doc/guides/compressdevs/zlib.rst | 4 - doc/guides/conf.py | 7 +- doc/guides/contributing/coding_style.rst | 46 +- doc/guides/contributing/design.rst | 127 +- doc/guides/contributing/documentation.rst | 31 +- doc/guides/contributing/patches.rst | 45 - doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 - doc/guides/cryptodevs/caam_jr.rst | 30 - doc/guides/cryptodevs/ccp.rst | 14 +- doc/guides/cryptodevs/dpaa2_sec.rst | 25 - doc/guides/cryptodevs/dpaa_sec.rst | 25 - doc/guides/cryptodevs/kasumi.rst | 11 +- doc/guides/cryptodevs/mvsam.rst | 10 +- doc/guides/cryptodevs/nitrox.rst | 7 - doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +- doc/guides/cryptodevs/octeontx2.rst | 8 +- doc/guides/cryptodevs/openssl.rst | 6 +- doc/guides/cryptodevs/qat.rst | 67 +- doc/guides/cryptodevs/scheduler.rst | 8 - doc/guides/cryptodevs/snow3g.rst | 10 +- doc/guides/cryptodevs/virtio.rst | 20 +- doc/guides/cryptodevs/zuc.rst | 10 +- doc/guides/eventdevs/dpaa.rst | 20 - doc/guides/eventdevs/dpaa2.rst | 20 - doc/guides/eventdevs/octeontx.rst | 24 - doc/guides/eventdevs/octeontx2.rst | 8 - doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/freebsd_gsg/intro.rst | 4 +- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +- doc/guides/howto/packet_capture_framework.rst | 21 +- doc/guides/howto/pvp_reference_benchmark.rst | 27 +- doc/guides/howto/vfd.rst | 4 +- .../virtio_user_for_container_networking.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 84 +- doc/guides/linux_gsg/build_sample_apps.rst | 69 +- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 48 +- doc/guides/linux_gsg/enable_func.rst | 13 +- doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/linux_drivers.rst | 18 +- doc/guides/linux_gsg/sys_reqs.rst | 16 +- doc/guides/mempool/octeontx.rst | 28 +- doc/guides/mempool/octeontx2.rst | 10 +- doc/guides/meson.build | 3 +- doc/guides/nics/ark.rst | 26 - doc/guides/nics/atlantic.rst | 4 - doc/guides/nics/axgbe.rst | 15 - doc/guides/nics/bnx2x.rst | 27 - doc/guides/nics/bnxt.rst | 5 +- doc/guides/nics/build_and_test.rst | 8 +- doc/guides/nics/cxgbe.rst | 36 +- doc/guides/nics/dpaa.rst | 27 +- doc/guides/nics/dpaa2.rst | 26 +- doc/guides/nics/ena.rst | 16 - doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 - doc/guides/nics/fail_safe.rst | 20 +- doc/guides/nics/features.rst | 9 - doc/guides/nics/fm10k.rst | 4 - doc/guides/nics/hinic.rst | 9 - doc/guides/nics/hns3.rst | 10 - doc/guides/nics/i40e.rst | 44 +- doc/guides/nics/ice.rst | 25 +- doc/guides/nics/igc.rst | 18 +- doc/guides/nics/intel_vf.rst | 13 +- doc/guides/nics/ionic.rst | 8 - doc/guides/nics/ipn3ke.rst | 12 +- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 - doc/guides/nics/memif.rst | 10 +- doc/guides/nics/mlx4.rst | 55 +- doc/guides/nics/mlx5.rst | 62 +- doc/guides/nics/mvneta.rst | 36 +- doc/guides/nics/mvpp2.rst | 43 +- doc/guides/nics/nfb.rst | 19 +- doc/guides/nics/nfp.rst | 4 - doc/guides/nics/null.rst | 6 +- doc/guides/nics/octeontx.rst | 19 +- doc/guides/nics/octeontx2.rst | 13 +- doc/guides/nics/pcap_ring.rst | 24 +- doc/guides/nics/qede.rst | 17 +- doc/guides/nics/sfc_efx.rst | 15 - doc/guides/nics/softnic.rst | 13 +- doc/guides/nics/szedata2.rst | 18 +- doc/guides/nics/thunderx.rst | 25 +- doc/guides/nics/vdev_netvsc.rst | 6 - doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- doc/guides/platform/bluefield.rst | 22 - doc/guides/platform/octeontx.rst | 33 +- doc/guides/platform/octeontx2.rst | 32 - doc/guides/prog_guide/build_app.rst | 48 +- .../prog_guide/dev_kit_build_system.rst | 331 ----- .../prog_guide/dev_kit_root_make_help.rst | 188 --- .../prog_guide/env_abstraction_layer.rst | 17 +- ...ib_make_help.rst => ext_app_make_help.rst} | 25 +- doc/guides/prog_guide/graph_lib.rst | 6 +- doc/guides/prog_guide/index.rst | 4 +- doc/guides/prog_guide/intro.rst | 2 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../prog_guide/kernel_nic_interface.rst | 14 +- .../link_bonding_poll_mode_drv_lib.rst | 15 +- doc/guides/prog_guide/lto.rst | 12 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/profile_app.rst | 17 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 - doc/guides/rawdevs/dpaa2_qdma.rst | 21 - doc/guides/rawdevs/ifpga.rst | 10 - doc/guides/rawdevs/ioat.rst | 8 +- doc/guides/rawdevs/ntb.rst | 6 - doc/guides/rawdevs/octeontx2_dma.rst | 12 - doc/guides/rawdevs/octeontx2_ep.rst | 8 - doc/guides/rel_notes/deprecation.rst | 7 - doc/guides/sample_app_ug/bbdev_app.rst | 34 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +- doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 +- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 +- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- doc/guides/tools/comp_perf.rst | 10 +- doc/guides/tools/cryptoperf.rst | 20 +- doc/guides/tools/pdump.rst | 15 +- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 36 +- doc/guides/tools/testeventdev.rst | 21 +- doc/guides/vdpadevs/ifc.rst | 13 - doc/guides/vdpadevs/mlx5.rst | 40 +- drivers/Makefile | 34 - drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 - drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 - drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 - drivers/bus/fslmc/Makefile | 47 - drivers/bus/ifpga/Makefile | 28 - drivers/bus/pci/Makefile | 33 - drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/pci/linux/pci_vfio.c | 1 - drivers/bus/vdev/Makefile | 27 - drivers/bus/vmbus/Makefile | 33 - drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 - drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 - drivers/common/iavf/Makefile | 27 - drivers/common/mlx5/Makefile | 404 ------ drivers/common/mvep/Makefile | 35 - drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 - drivers/common/qat/Makefile | 74 -- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 - drivers/compress/octeontx/Makefile | 26 - drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 - drivers/crypto/aesni_gcm/Makefile | 43 - drivers/crypto/aesni_mb/Makefile | 42 - drivers/crypto/armv8/Makefile | 36 - drivers/crypto/caam_jr/Makefile | 39 - drivers/crypto/ccp/Makefile | 32 - drivers/crypto/dpaa2_sec/Makefile | 45 - drivers/crypto/dpaa_sec/Makefile | 38 - drivers/crypto/kasumi/Makefile | 42 - drivers/crypto/mvsam/Makefile | 40 - drivers/crypto/nitrox/Makefile | 30 - drivers/crypto/null/Makefile | 27 - drivers/crypto/octeontx/Makefile | 36 - drivers/crypto/octeontx2/Makefile | 49 - drivers/crypto/openssl/Makefile | 26 - drivers/crypto/scheduler/Makefile | 34 - drivers/crypto/snow3g/Makefile | 43 - drivers/crypto/virtio/Makefile | 33 - drivers/crypto/zuc/Makefile | 42 - drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 - drivers/event/dpaa2/Makefile | 41 - drivers/event/dsw/Makefile | 26 - drivers/event/octeontx/Makefile | 51 - drivers/event/octeontx2/Makefile | 47 - drivers/event/opdl/Makefile | 29 - drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 - drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 - drivers/mempool/dpaa2/Makefile | 31 - drivers/mempool/octeontx/Makefile | 39 - drivers/mempool/octeontx2/Makefile | 40 - drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 -- drivers/net/af_packet/Makefile | 27 - drivers/net/af_xdp/Makefile | 26 - drivers/net/ark/Makefile | 39 - drivers/net/atlantic/Makefile | 34 - drivers/net/avp/Makefile | 29 - drivers/net/axgbe/Makefile | 33 - drivers/net/bnx2x/Makefile | 33 - drivers/net/bnxt/Makefile | 63 - drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 - drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 - drivers/net/cxgbe/Makefile | 57 - drivers/net/dpaa/Makefile | 41 - drivers/net/dpaa2/Makefile | 47 - drivers/net/e1000/Makefile | 79 -- drivers/net/ena/Makefile | 30 - drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 - drivers/net/failsafe/Makefile | 43 - drivers/net/fm10k/Makefile | 77 -- drivers/net/hinic/Makefile | 67 - drivers/net/hns3/Makefile | 42 - drivers/net/i40e/Makefile | 112 -- drivers/net/i40e/i40e_rxtx.c | 1 - drivers/net/iavf/Makefile | 54 - drivers/net/ice/Makefile | 96 -- drivers/net/igc/Makefile | 40 - drivers/net/ionic/Makefile | 31 - drivers/net/ipn3ke/Makefile | 38 - drivers/net/ixgbe/Makefile | 110 -- drivers/net/kni/Makefile | 30 - drivers/net/liquidio/Makefile | 30 - drivers/net/memif/Makefile | 26 - drivers/net/mlx4/Makefile | 142 -- drivers/net/mlx5/Makefile | 82 -- drivers/net/mvneta/Makefile | 39 - drivers/net/mvpp2/Makefile | 42 - drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 - drivers/net/nfp/Makefile | 41 - drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 - drivers/net/octeontx2/Makefile | 63 - drivers/net/pcap/Makefile | 32 - drivers/net/pfe/Makefile | 31 - drivers/net/qede/Makefile | 109 -- drivers/net/ring/Makefile | 29 - drivers/net/sfc/Makefile | 133 -- drivers/net/softnic/Makefile | 54 - drivers/net/szedata2/Makefile | 30 - drivers/net/tap/Makefile | 97 -- drivers/net/thunderx/Makefile | 41 - drivers/net/vdev_netvsc/Makefile | 30 - drivers/net/vhost/Makefile | 31 - drivers/net/virtio/Makefile | 82 -- drivers/net/vmxnet3/Makefile | 53 - drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 - drivers/raw/dpaa2_qdma/Makefile | 36 - drivers/raw/ifpga/Makefile | 39 - drivers/raw/ifpga/base/Makefile | 32 - drivers/raw/ioat/Makefile | 28 - drivers/raw/ntb/Makefile | 28 - drivers/raw/octeontx2_dma/Makefile | 34 - drivers/raw/octeontx2_ep/Makefile | 42 - drivers/raw/skeleton/Makefile | 26 - drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 - drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 - drivers/vdpa/mlx5/Makefile | 58 - examples/Makefile | 90 -- examples/bbdev_app/Makefile | 23 +- examples/bond/Makefile | 34 +- examples/bpf/t2.c | 6 +- examples/bpf/t3.c | 10 +- examples/cmdline/Makefile | 29 +- examples/distributor/Makefile | 30 +- examples/ethtool/Makefile | 26 +- examples/ethtool/ethtool-app/Makefile | 56 +- examples/ethtool/lib/Makefile | 62 +- examples/eventdev_pipeline/Makefile | 23 +- examples/fips_validation/Makefile | 34 +- examples/flow_classify/Makefile | 29 +- examples/flow_filtering/Makefile | 23 +- examples/helloworld/Makefile | 23 +- examples/ioat/Makefile | 22 +- examples/ip_fragmentation/Makefile | 29 +- examples/ip_pipeline/Makefile | 36 +- examples/ip_reassembly/Makefile | 29 +- examples/ipsec-secgw/Makefile | 36 +- examples/ipsec-secgw/test/common_defs.sh | 4 +- examples/ipv4_multicast/Makefile | 29 +- examples/kni/Makefile | 27 +- examples/l2fwd-cat/Makefile | 38 +- examples/l2fwd-crypto/Makefile | 28 +- examples/l2fwd-event/Makefile | 22 +- examples/l2fwd-jobstats/Makefile | 23 +- examples/l2fwd-keepalive/Makefile | 23 +- examples/l2fwd-keepalive/ka-agent/Makefile | 51 +- examples/l2fwd/Makefile | 23 +- examples/l3fwd-acl/Makefile | 28 +- examples/l3fwd-graph/Makefile | 23 +- examples/l3fwd-power/Makefile | 36 +- examples/l3fwd/Makefile | 23 +- examples/link_status_interrupt/Makefile | 22 +- examples/multi_process/Makefile | 21 +- .../multi_process/client_server_mp/Makefile | 19 +- .../client_server_mp/mp_client/Makefile | 44 +- .../client_server_mp/mp_server/Makefile | 51 +- examples/multi_process/hotplug_mp/Makefile | 46 +- examples/multi_process/simple_mp/Makefile | 44 +- examples/multi_process/symmetric_mp/Makefile | 44 +- examples/ntb/Makefile | 32 +- examples/packet_ordering/Makefile | 22 +- examples/performance-thread/Makefile | 21 +- examples/performance-thread/common/common.mk | 6 +- .../performance-thread/l3fwd-thread/Makefile | 47 +- .../performance-thread/pthread_shim/Makefile | 56 +- examples/ptpclient/Makefile | 28 +- examples/qos_meter/Makefile | 28 +- examples/qos_sched/Makefile | 31 +- examples/rxtx_callbacks/Makefile | 31 +- examples/server_node_efd/Makefile | 18 +- examples/server_node_efd/node/Makefile | 46 +- examples/server_node_efd/server/Makefile | 51 +- examples/service_cores/Makefile | 28 +- examples/skeleton/Makefile | 29 +- examples/tep_termination/Makefile | 27 +- examples/timer/Makefile | 28 +- examples/vdpa/Makefile | 32 +- examples/vhost/Makefile | 30 +- examples/vhost_blk/Makefile | 31 +- examples/vhost_crypto/Makefile | 31 +- examples/vm_power_manager/Makefile | 74 +- examples/vm_power_manager/guest_cli/Makefile | 50 +- examples/vmdq/Makefile | 23 +- examples/vmdq_dcb/Makefile | 31 +- kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 - lib/Makefile | 138 -- lib/librte_acl/Makefile | 65 - lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 - lib/librte_cfgfile/Makefile | 26 - lib/librte_cmdline/Makefile | 34 - lib/librte_compressdev/Makefile | 27 - lib/librte_cryptodev/Makefile | 30 - lib/librte_distributor/Makefile | 28 - lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 -- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 -- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 - lib/librte_eventdev/Makefile | 47 - lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 - lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 - lib/librte_ip_frag/Makefile | 27 - lib/librte_ipsec/Makefile | 29 - lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 - lib/librte_mbuf/Makefile | 26 - lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_mempool/rte_mempool.h | 2 +- lib/librte_meter/Makefile | 27 - lib/librte_metrics/Makefile | 30 - lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 - lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 - lib/librte_port/Makefile | 59 - lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 - lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 - lib/librte_ring/rte_ring_elem.h | 3 +- lib/librte_sched/Makefile | 29 - lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 - lib/librte_table/Makefile | 59 - lib/librte_telemetry/Makefile | 30 - lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 - mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 - mk/arch/i686/rte.vars.mk | 36 - mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 - mk/arch/x86_x32/rte.vars.mk | 40 - mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 - mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 - mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 - mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 - mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 --- mk/internal/rte.extvars.mk | 55 - mk/internal/rte.install-post.mk | 71 - mk/internal/rte.install-pre.mk | 32 - mk/machine/armv7a/rte.vars.mk | 36 - mk/machine/armv8a/rte.vars.mk | 31 - mk/machine/default/rte.vars.mk | 30 - mk/machine/dpaa/rte.vars.mk | 37 - mk/machine/emag/rte.vars.mk | 32 - mk/machine/hsw/rte.vars.mk | 30 - mk/machine/ivb/rte.vars.mk | 30 - mk/machine/n1sdp/rte.vars.mk | 34 - mk/machine/native/rte.vars.mk | 39 - mk/machine/nhm/rte.vars.mk | 30 - mk/machine/octeontx2/rte.vars.mk | 34 - mk/machine/power8/rte.vars.mk | 30 - mk/machine/silvermont/rte.vars.mk | 30 - mk/machine/snb/rte.vars.mk | 30 - mk/machine/thunderx/rte.vars.mk | 31 - mk/machine/thunderx2/rte.vars.mk | 34 - mk/machine/wsm/rte.vars.mk | 30 - mk/machine/xgene1/rte.vars.mk | 31 - mk/rte.app.mk | 509 -------- mk/rte.bsdmodule.mk | 89 -- mk/rte.combinedlib.mk | 30 - mk/rte.cpuflags.mk | 124 -- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 - mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 - mk/rte.extsubdir.mk | 39 - mk/rte.gnuconfigure.mk | 44 - mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 -- mk/rte.hostlib.mk | 86 -- mk/rte.install.mk | 28 - mk/rte.lib.mk | 156 --- mk/rte.module.mk | 86 -- mk/rte.obj.mk | 82 -- mk/rte.sdkbuild.mk | 77 -- mk/rte.sdkconfig.mk | 142 -- mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 -- mk/rte.sdkexamples.mk | 50 - mk/rte.sdkgcov.mk | 39 - mk/rte.sdkinstall.mk | 152 --- mk/rte.sdkroot.mk | 115 -- mk/rte.sdktest.mk | 76 -- mk/rte.shared.mk | 108 -- mk/rte.subdir.mk | 65 - mk/rte.vars.mk | 102 -- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 -- mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 - mk/toolchain/gcc/rte.toolchain-compat.mk | 120 -- mk/toolchain/gcc/rte.vars.mk | 109 -- mk/toolchain/icc/rte.toolchain-compat.mk | 58 - mk/toolchain/icc/rte.vars.mk | 62 - 615 files changed, 1227 insertions(+), 19895 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100755 buildtools/relpath.sh delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc delete mode 100755 devtools/test-build.sh delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => ext_app_make_help.rst} (69%) delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 01/37] examples: remove legacy sections of makefiles 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 02/37] examples/multi_process: convert to pkg-config-based build Ciara Power ` (35 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, Chas Williams, Wei Hu (Xavier), Olivier Matz, David Hunt, Harry van Haaren, Marko Kovacevic, Ori Kam, Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Bernard Iremonger, Konstantin Ananyev, Cristian Dumitrescu, Ferruh Yigit, Declan Doherty, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Xiaoyun Li, Jingjing Wu, Reshma Pattan, John McNamara, Kirill Rybalchenko, Jasvinder Singh, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang The example app makefiles contained sections using the legacy method of compiling with make. These are no longer needed, and are removed, leaving only the section that uses pkg-config for the make build. Signed-off-by: Ciara Power <ciara.power@intel.com> --- examples/bbdev_app/Makefile | 23 ++------------- examples/bond/Makefile | 34 ++-------------------- examples/cmdline/Makefile | 29 ++----------------- examples/distributor/Makefile | 30 ++----------------- examples/eventdev_pipeline/Makefile | 23 ++------------- examples/fips_validation/Makefile | 34 ++-------------------- examples/flow_classify/Makefile | 29 ++----------------- examples/flow_filtering/Makefile | 23 ++------------- examples/helloworld/Makefile | 23 ++------------- examples/ioat/Makefile | 22 ++------------ examples/ip_fragmentation/Makefile | 29 ++----------------- examples/ip_pipeline/Makefile | 36 ++--------------------- examples/ip_reassembly/Makefile | 29 ++----------------- examples/ipsec-secgw/Makefile | 36 ++--------------------- examples/ipv4_multicast/Makefile | 29 ++----------------- examples/kni/Makefile | 27 ++---------------- examples/l2fwd-cat/Makefile | 38 ++----------------------- examples/l2fwd-crypto/Makefile | 28 ++---------------- examples/l2fwd-event/Makefile | 22 ++------------ examples/l2fwd-jobstats/Makefile | 23 ++------------- examples/l2fwd-keepalive/Makefile | 23 ++------------- examples/l2fwd/Makefile | 23 ++------------- examples/l3fwd-acl/Makefile | 28 ++---------------- examples/l3fwd-graph/Makefile | 23 ++------------- examples/l3fwd-power/Makefile | 36 ++--------------------- examples/l3fwd/Makefile | 23 ++------------- examples/link_status_interrupt/Makefile | 22 ++------------ examples/ntb/Makefile | 32 ++------------------- examples/packet_ordering/Makefile | 22 ++------------ examples/ptpclient/Makefile | 28 ++---------------- examples/qos_meter/Makefile | 28 ++---------------- examples/qos_sched/Makefile | 31 ++------------------ examples/rxtx_callbacks/Makefile | 31 ++------------------ examples/service_cores/Makefile | 28 ++---------------- examples/skeleton/Makefile | 29 ++----------------- examples/tep_termination/Makefile | 27 ++---------------- examples/timer/Makefile | 28 ++---------------- examples/vdpa/Makefile | 32 ++------------------- examples/vhost/Makefile | 30 ++----------------- examples/vhost_blk/Makefile | 31 ++------------------ examples/vhost_crypto/Makefile | 31 ++------------------ examples/vmdq/Makefile | 23 ++------------- examples/vmdq_dcb/Makefile | 31 ++------------------ 43 files changed, 129 insertions(+), 1078 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 3c8eb75a4e..2f156736d1 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -8,7 +8,9 @@ APP = bbdev SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 4e4289e151..4e560f574c 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -8,7 +8,9 @@ APP = bond_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,33 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -LDLIBS += -lrte_pmd_bond -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 7325097722..d8f51fb39b 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -8,7 +8,9 @@ APP = cmdline SRCS-y := main.c commands.c parse_obj_list.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = cmdline - -# all source are stored in SRCS-y -SRCS-y := main.c commands.c parse_obj_list.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 6e3fef9813..4116064581 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -8,7 +8,9 @@ APP = distributor_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,29 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 95a8d0884a..05c6f865ad 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -10,7 +10,9 @@ SRCS-y += pipeline_worker_generic.c SRCS-y += pipeline_worker_tx.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index b44ca2ee62..7ba9bcfea6 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -18,7 +18,9 @@ SRCS-y += fips_validation_xts.c SRCS-y += main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -47,33 +49,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -INC += $(sort $(wildcard *.h)) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 161d576b60..4c215daf1b 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -8,7 +8,9 @@ APP = flow_classify SRCS-y := flow_classify.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 010a1383e2..0577e52985 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -6,7 +6,9 @@ APP = flow SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -35,22 +37,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 94a1074cf6..2eef6e4527 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -8,7 +8,9 @@ APP = helloworld SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile index 86308854ea..9645c27d2f 100644 --- a/examples/ioat/Makefile +++ b/examples/ioat/Makefile @@ -8,7 +8,9 @@ APP = ioatfwd SRCS-y := ioatfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 3f4db3f59d..f6baf635bb 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -9,7 +9,9 @@ APP = ip_fragmentation SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 1116bb6c18..d25e39a464 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -21,7 +21,9 @@ SRCS-y += tmgr.c SRCS-y += cryptodev.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -57,35 +59,3 @@ build: clean: rm -f build/$(APP)* build/*.o test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -INC += $(sort $(wildcard *.h)) - -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := $(SRCS-y) - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index be9e541bd6..479b802907 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -9,7 +9,9 @@ APP = ip_reassembly SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index b5ccbca858..5e6cb51eac 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -23,7 +23,9 @@ SRCS-y += flow.c CFLAGS += -gdwarf-2 # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -54,35 +56,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -$(error "RTE_LIBRTE_IPSEC is required to build ipsec-secgw") -endif -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -gdwarf-2 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_sa.o += -diag-disable=vec -endif - -ifeq ($(DEBUG),1) -CFLAGS += -DIPSEC_DEBUG -fstack-protector-all -O0 -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index 0ed78c1cc2..fb1ebdd433 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -9,7 +9,9 @@ APP = ipv4_multicast SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 8fcb67c619..fa9fa85319 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -8,7 +8,9 @@ APP = kni SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,26 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index d767a10d7d..c5f82fb548 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-cat SRCS-y := l2fwd-cat.c cat.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,37 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -ifeq ($(PQOS_INSTALL_PATH),) -$(error "Please define PQOS_INSTALL_PATH environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -CFLAGS += -I$(PQOS_INSTALL_PATH)/../include - -LDLIBS += -L$(PQOS_INSTALL_PATH) -LDLIBS += -lpqos - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index cdbb91a1e6..4953ee2b95 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-crypto SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile index ddee388ae6..109b7caa4e 100644 --- a/examples/l2fwd-event/Makefile +++ b/examples/l2fwd-event/Makefile @@ -14,7 +14,9 @@ SRCS-y += l2fwd_event_generic.c SRCS-y += l2fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -43,21 +45,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index bdb83c3e1c..d3ff2d3ee9 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-jobstats SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 9fd9db4974..c327efab36 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-keepalive SRCS-y := main.c shm.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 15105ac57e..b180deb862 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -8,7 +8,9 @@ APP = l2fwd SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Add flag to allow experimental API as l2fwd uses rte_ethdev_set_ptype API -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 6644a2cf1e..eeb6288dae 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-acl SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-graph/Makefile b/examples/l3fwd-graph/Makefile index f3cf275ece..368ac21147 100644 --- a/examples/l3fwd-graph/Makefile +++ b/examples/l3fwd-graph/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-graph SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index ac1ccdcf61..d69854c9f8 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-power SRCS-y := main.c perf_core.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,35 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lm -lrte_telemetry - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -endif diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index b25a515813..d87eafcd0c 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c SRCS-y += l3fwd_event_generic.c l3fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,22 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index f16916faa9..b9b02124a4 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -8,7 +8,9 @@ APP = link_status_interrupt SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile index 81ec6017f5..4675570fd2 100644 --- a/examples/ntb/Makefile +++ b/examples/ntb/Makefile @@ -8,8 +8,9 @@ APP = ntb_fwd SRCS-y := ntb_fwd.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,30 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared rmdir --ignore-fail-on-non-empty build - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) -$(info This application can only operate in a linuxapp environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -O2 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index f99b69dc25..e8d6c57b72 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -8,7 +8,9 @@ APP = packet_ordering SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index a9555fc66a..86059d8b28 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -8,7 +8,9 @@ APP = ptpclient SRCS-y := ptpclient.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 165e07ee25..7a53818296 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -8,7 +8,9 @@ APP = qos_meter SRCS-y := main.c rte_policer.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,27 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 0dd7d91055..408074a9f5 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -8,7 +8,9 @@ APP = qos_sched SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index 10e5f14d5c..bac3015d34 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -8,7 +8,9 @@ APP = rxtx_callbacks SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# rte_eth_read_clock is experimental -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index e742d88f61..beb7ea0b82 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -8,7 +8,9 @@ APP = service_cores SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index 5f5acf7159..ca52abba42 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -8,7 +8,9 @@ APP = basicfwd SRCS-y := basicfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 548ca3cee3..443bcb190e 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -8,7 +8,9 @@ APP = tep_termination SRCS-y := main.c vxlan_setup.c vxlan.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,26 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/timer/Makefile b/examples/timer/Makefile index b40b65995e..0f6523afa6 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -8,7 +8,9 @@ APP = timer SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index bc0b6793e6..c4b2184ead 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,31 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -D_GNU_SOURCE -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # linuxapp - -endif # pkg-config diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index ef6f3550f3..cec59d0e0f 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -8,7 +8,9 @@ APP = vhost-switch SRCS-y := main.c virtio_net.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile index 3952791784..792591386e 100644 --- a/examples/vhost_blk/Makefile +++ b/examples/vhost_blk/Makefile @@ -8,8 +8,9 @@ APP = vhost-blk SRCS-y := blk.c vhost_blk.c vhost_blk_compat.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index 28e3e4de74..27abd91998 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,30 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # Linux - -endif # pkg-config diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index b73373d3f5..de527281eb 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -8,7 +8,9 @@ APP = vmdq_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -EXTRA_CFLAGS += -O3 - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 8d8baf729b..9c9049d85e 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -8,7 +8,9 @@ APP = vmdq_dcb_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_main.o += -diag-disable=vec -endif -EXTRA_CFLAGS += -O3 -g - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 02/37] examples/multi_process: convert to pkg-config-based build 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 01/37] examples: remove legacy sections of makefiles Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 03/37] examples/server_node_efd: " Ciara Power ` (34 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, Anatoly Burakov From: Bruce Richardson <bruce.richardson@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/multi_process/Makefile | 21 ++------ .../multi_process/client_server_mp/Makefile | 19 ++----- .../client_server_mp/mp_client/Makefile | 44 ++++++++++++---- .../client_server_mp/mp_server/Makefile | 51 +++++++++++-------- examples/multi_process/hotplug_mp/Makefile | 46 ++++++++++++----- examples/multi_process/simple_mp/Makefile | 44 +++++++++++----- examples/multi_process/symmetric_mp/Makefile | 44 +++++++++++----- 7 files changed, 167 insertions(+), 102 deletions(-) diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index 7f7e68d912..f0a999745a 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -1,18 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := client_server_mp hotplug_mp simple_mp symmetric_mp -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index fe7a8af605..e8debdfd9a 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -1,16 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := mp_client mp_server -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile index 7c447feba3..b723e545b7 100644 --- a/examples/multi_process/client_server_mp/mp_client/Makefile +++ b/examples/multi_process/client_server_mp/mp_client/Makefile @@ -1,21 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = mp_client # all source are stored in SRCS-y SRCS-y := client.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index 50ebf1d7da..f49260a256 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -1,34 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +# binary name +APP = mp_server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +# all source are stored in SRCS-y +SRCS-y := main.c init.c args.c -include $(RTE_SDK)/mk/rte.vars.mk +CFLAGS += -I../shared -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# binary name -APP = mp_server +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) -INC := $(sort $(wildcard *.h)) +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -# for newer gcc, e.g. 4.4, no-strict-aliasing may not be necessary -# and so the next line can be removed in those cases. -EXTRA_CFLAGS += -fno-strict-aliasing +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile index 1fd7aa085c..2c023a73d8 100644 --- a/examples/multi_process/hotplug_mp/Makefile +++ b/examples/multi_process/hotplug_mp/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2014 Intel Corporation # binary name APP = hotplug_mp @@ -16,8 +7,35 @@ APP = hotplug_mp # all source are stored in SRCS-y SRCS-y := main.c commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile index f88b499bdc..410f8b5368 100644 --- a/examples/multi_process/simple_mp/Makefile +++ b/examples/multi_process/simple_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = simple_mp # all source are stored in SRCS-y SRCS-y := main.c mp_commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile index b7544489bb..df69ecabe7 100644 --- a/examples/multi_process/symmetric_mp/Makefile +++ b/examples/multi_process/symmetric_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = symmetric_mp # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 03/37] examples/server_node_efd: convert to pkg-config-based build 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 01/37] examples: remove legacy sections of makefiles Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 02/37] examples/multi_process: convert to pkg-config-based build Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 04/37] examples/ka-agent: " Ciara Power ` (33 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz, Byron Marohn, Yipeng Wang From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/server_node_efd/Makefile | 18 +++------ examples/server_node_efd/node/Makefile | 46 +++++++++++++++------ examples/server_node_efd/server/Makefile | 51 +++++++++++++++--------- 3 files changed, 72 insertions(+), 43 deletions(-) diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile index cc2ea8b566..e4a4a94a79 100644 --- a/examples/server_node_efd/Makefile +++ b/examples/server_node_efd/Makefile @@ -1,16 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := node server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/server_node_efd/node/Makefile b/examples/server_node_efd/node/Makefile index ecc551e1d6..a4efef42dc 100644 --- a/examples/server_node_efd/node/Makefile +++ b/examples/server_node_efd/node/Makefile @@ -1,12 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = node @@ -14,8 +7,37 @@ APP = node # all source are stored in SRCS-y SRCS-y := node.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index acbd12ae23..106e1abd74 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -1,30 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +# binary name +APP = server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +# all source are stored in SRCS-y +SRCS-y := main.c init.c args.c -include $(RTE_SDK)/mk/rte.vars.mk +CFLAGS += -I../shared -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# binary name -APP = server +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -INC := $(sort $(wildcard *.h)) +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 04/37] examples/ka-agent: convert to pkg-config-based build 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (2 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 03/37] examples/server_node_efd: " Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 05/37] examples/pthread: " Ciara Power ` (32 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/l2fwd-keepalive/ka-agent/Makefile | 51 ++++++++++++++++------ 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile index 8d5061b178..700137c2e2 100644 --- a/examples/l2fwd-keepalive/ka-agent/Makefile +++ b/examples/l2fwd-keepalive/ka-agent/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = ka-agent @@ -16,7 +7,39 @@ APP = ka-agent # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../ -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt -include $(RTE_SDK)/mk/rte.extapp.mk +CFLAGS += -I.. + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +LDFLAGS += -lpthread -lrt + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 05/37] examples/pthread: convert to pkg-config-based build 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (3 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 04/37] examples/ka-agent: " Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 06/37] examples/vm_power_manager: convert to use DPDK pkg-config Ciara Power ` (31 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Kevin Laatz, John McNamara, Kirill Rybalchenko, Bruce Richardson, Harry van Haaren, Xiaoyun Li From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/performance-thread/Makefile | 21 +++---- examples/performance-thread/common/common.mk | 6 +- .../performance-thread/l3fwd-thread/Makefile | 47 +++++++++++----- .../performance-thread/pthread_shim/Makefile | 56 +++++++++++++------ 4 files changed, 83 insertions(+), 47 deletions(-) diff --git a/examples/performance-thread/Makefile b/examples/performance-thread/Makefile index 08158914c3..ef88722d3c 100644 --- a/examples/performance-thread/Makefile +++ b/examples/performance-thread/Makefile @@ -1,21 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +subdirs := l3fwd-thread pthread_shim -include $(RTE_SDK)/mk/rte.vars.mk +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -ifeq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) $(CONFIG_RTE_ARCH_ARM64)),) +ifeq ($(filter $(shell uname -m),x86_64 arm64),) $(error This application is only supported for x86_64 and arm64 targets) endif -DIRS-y += l3fwd-thread -DIRS-y += pthread_shim - - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/performance-thread/common/common.mk b/examples/performance-thread/common/common.mk index 5e2b18a9ff..a33e2ab038 100644 --- a/examples/performance-thread/common/common.mk +++ b/examples/performance-thread/common/common.mk @@ -8,9 +8,9 @@ MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))) -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) +ifeq ($(shell uname -m),x86_64) ARCH_PATH += $(MKFILE_PATH)/arch/x86 -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) +else ifeq ($(shell uname -m),arm64) ARCH_PATH += $(MKFILE_PATH)/arch/arm64 endif @@ -18,4 +18,4 @@ VPATH := $(MKFILE_PATH) $(ARCH_PATH) SRCS-y += lthread.c lthread_sched.c lthread_cond.c lthread_tls.c lthread_mutex.c lthread_diag.c ctx.c -INCLUDES += -I$(MKFILE_PATH) -I$(ARCH_PATH) +CFLAGS += -I$(MKFILE_PATH) -I$(ARCH_PATH) diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile index c6cf05a438..ca1a5d087e 100644 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ b/examples/performance-thread/l3fwd-thread/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = l3fwd-thread @@ -16,9 +7,39 @@ APP = l3fwd-thread # all source are stored in SRCS-y SRCS-y := main.c -include $(RTE_SDK)/examples/performance-thread/common/common.mk +include ../common/common.mk -CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -include $(RTE_SDK)/mk/rte.extapp.mk +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/performance-thread/pthread_shim/Makefile b/examples/performance-thread/pthread_shim/Makefile index cdadf2cb77..6b19ff63fe 100644 --- a/examples/performance-thread/pthread_shim/Makefile +++ b/examples/performance-thread/pthread_shim/Makefile @@ -1,33 +1,55 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = lthread_pthread_shim # all source are stored in SRCS-y -SRCS-y := main.c pthread_shim.c -INCLUDES := -I$(RTE_SDK)/$(RTE_TARGET)/include -I$(SRCDIR) -include $(RTE_SDK)/examples/performance-thread/common/common.mk +SRCS-y := main.c pthread_shim.c + +include ../common/common.mk -CFLAGS += -g -O3 $(USER_FLAGS) $(INCLUDES) -CFLAGS += $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -D_GNU_SOURCE +LDFLAGS += "-Wl,--copy-dt-needed-entries" + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) LDFLAGS += -lpthread +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell gcc -dumpversion),-gt 0) CFLAGS_main.o += -Wno-return-type endif -include $(RTE_SDK)/mk/rte.extapp.mk +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 06/37] examples/vm_power_manager: convert to use DPDK pkg-config 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (4 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 05/37] examples/pthread: " Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 07/37] examples/vm_power_manager: convert guest cli to pkg-config Ciara Power ` (30 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, David Hunt From: Bruce Richardson <bruce.richardson@intel.com> Convert the build of the vm_power_manager app over to use DPDK from pkg-config rather than using RTE_SDK/RTE_TARGET. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/vm_power_manager/Makefile | 74 ++++++++++++++---------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile index 65c2ad179e..87b9744d8c 100644 --- a/examples/vm_power_manager/Makefile +++ b/examples/vm_power_manager/Makefile @@ -1,65 +1,61 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2020 Intel Corporation -ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -$(error vm_power_manager requires libvirt >= 0.9.3) -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = vm_power_mgr # all source are stored in SRCS-y SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c SRCS-y += channel_monitor.c parse.c -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) +ifeq ($(shell uname -m),x86_64) SRCS-y += oob_monitor_x86.c else SRCS-y += oob_monitor_nop.c endif -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -LDLIBS += -lvirt +PKGCONF ?= pkg-config -JANSSON := $(shell pkg-config --exists jansson; echo $$?) -ifeq ($(JANSSON), 0) -LDLIBS += $(shell pkg-config --libs jansson) -CFLAGS += -DUSE_JANSSON -endif +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe +ifneq ($(shell $(PKGCONF) --atleast-version=0.9.3 libvirt; echo $$?), 0) +$(error vm_power_manager requires libvirt >= 0.9.3) endif +LDFLAGS += $(shell $(PKGCONF) --libs libvirt) -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e +JANSSON := $(shell $(PKGCONF) --exists jansson; echo $$?) +ifeq ($(JANSSON), 0) +LDFLAGS += $(shell $(PKGCONF) --libs jansson) +CFLAGS += -DUSE_JANSSON endif -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif +# for shared library builds, we need to explicitly link these PMDs +LDFLAGS_SHARED += -lrte_pmd_ixgbe -lrte_pmd_i40e -lrte_pmd_bnxt -endif +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -include $(RTE_SDK)/mk/rte.extapp.mk +build: + @mkdir -p $@ -endif # libvirt check +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 07/37] examples/vm_power_manager: convert guest cli to pkg-config 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (5 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 06/37] examples/vm_power_manager: convert to use DPDK pkg-config Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 08/37] examples/ethtool: convert to pkg-config-based build Ciara Power ` (29 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, David Hunt From: Bruce Richardson <bruce.richardson@intel.com> Convert the makefile for the vm_power_manager/guest_cli utility to build using pkg-config rather than the old build system. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/vm_power_manager/guest_cli/Makefile | 50 ++++++++++++-------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/examples/vm_power_manager/guest_cli/Makefile b/examples/vm_power_manager/guest_cli/Makefile index 67cf081936..b84deec574 100644 --- a/examples/vm_power_manager/guest_cli/Makefile +++ b/examples/vm_power_manager/guest_cli/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = guest_vm_power_mgr @@ -16,14 +7,35 @@ APP = guest_vm_power_mgr # all source are stored in SRCS-y SRCS-y := main.c vm_power_cli_guest.c parse.c -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 08/37] examples/ethtool: convert to pkg-config-based build 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (6 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 07/37] examples/vm_power_manager: convert guest cli to pkg-config Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 09/37] build: create dummy Makefile Ciara Power ` (28 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Bruce Richardson, Marko Kovacevic, Ori Kam, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh From: Bruce Richardson <bruce.richardson@intel.com> Remove references to the old DPDK build system from the makefiles, and use pkg-config provided flags instead. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/ethtool/Makefile | 26 +++-------- examples/ethtool/ethtool-app/Makefile | 56 +++++++++++++++--------- examples/ethtool/lib/Makefile | 62 ++++++++++++++++----------- 3 files changed, 79 insertions(+), 65 deletions(-) diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile index d3b97bb50b..a1a80c44e6 100644 --- a/examples/ethtool/Makefile +++ b/examples/ethtool/Makefile @@ -1,23 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := lib ethtool-app -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -else - -DIRS-y += lib ethtool-app -endif - -DEPDIRS-ethtool-app := lib - -include $(RTE_SDK)/mk/rte.extsubdir.mk +ethtool-app: lib +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile index 20ac0d3240..5ebeb200a8 100644 --- a/examples/ethtool/ethtool-app/Makefile +++ b/examples/ethtool/ethtool-app/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = ethtool @@ -16,17 +7,40 @@ APP = ethtool # all source are stored in SRCS-y SRCS-y := main.c ethapp.c -CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib -LDLIBS += -lrte_ethtool +CFLAGS += -I../lib +LDFLAGS += -L../lib/build +LDFLAGS_STATIC = -l:librte_ethtool.a +LDFLAGS_SHARED = -lrte_ethtool -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED += $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC += $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile index 6494741270..3bc2b9d8ba 100644 --- a/examples/ethtool/lib/Makefile +++ b/examples/ethtool/lib/Makefile @@ -1,37 +1,49 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif +ifneq ($(shell uname),Linux) +$(error This application can only operate in a linux environment) endif -# library name -LIB = librte_ethtool.a - -LIBABIVER := 0.1 +PKGCONF ?= pkg-config -# all source are stored in SRC-Y -SRCS-y := rte_ethtool.c +# library name +LIB = librte_ethtool.so +LIB_STATIC = librte_ethtool.a +SRCS = rte_ethtool.c CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) +CFLAGS += -fPIC CFLAGS += -DALLOW_EXPERIMENTAL_API -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS += -Wl,--no-undefined $(LDFLAGS_SHARED) + +# check for ixgbe by grepping pre-processor output +ifneq ($(shell $(CC) $(CFLAGS) -dM -E - < /dev/null | grep IXGBE),) +LDFLAGS += -lrte_pmd_ixgbe endif -LDLIBS += -lrte_eal -lrte_ethdev -include $(RTE_SDK)/mk/rte.extlib.mk +.PHONY: all clean static shared +all shared: build/$(LIB) +static: build/$(LIB_STATIC) + +clean: + rm -f build/$(LIB) + test -d build && rmdir -p build || true + +build: + @mkdir -p $@ + +build/%.so: $(SRCS) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) -o $@ -shared $(SRCS) $(LDFLAGS) + +build/%.a: $(SRCS) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) -c $(SRCS) -o build/$(SRCS).o + $(AR) -cr $@ build/*.o -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 09/37] build: create dummy Makefile 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (7 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 08/37] examples/ethtool: convert to pkg-config-based build Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory Ciara Power ` (27 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, Thomas Monjalon From: Bruce Richardson <bruce.richardson@intel.com> This patch modifies the root Makefile to act as a dummy Makefile for when the make support is removed from DPDK in subsequent patches. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 571277aa5a..4a9c17a9de 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2020 Intel Corporation -.error Error please compile using GNU Make (gmake) +.PHONY: all +all: + @echo "To build DPDK please use meson and ninja as described at" + @echo " https://core.dpdk.org/doc/quick-start/" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (8 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 09/37] build: create dummy Makefile Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-21 3:18 ` Ruifeng Wang 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 11/37] config: remove all config files used by make Ciara Power ` (26 subsequent siblings) 36 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Thomas Monjalon, Reshma Pattan, Maryam Tahhan, Konstantin Ananyev, Nicolas Chautru, Olivier Matz, Declan Doherty, Jerin Jacob, Vladimir Medvedkin, Wisam Jaddo, Cristian Dumitrescu, Wenzhuo Lu, Beilei Xing, Bernard Iremonger, Ori Kam, Neil Horman, Hemant Agrawal, Sachin Saxena, Rosen Xu, Stephen Hemminger, Long Li, Anoob Joseph, Jingjing Wu, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Liron Himi, Harman Kalra, Nithin Dabilpuram, Fiona Trahe, John Griffin, Deepak Kumar Jain, Ashish Gupta, Lee Daly, Sunila Sahu, Pablo de Lara, Ruifeng Wang, Gagandeep Singh, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Nagadheeraj Rottela, Srikanth Jampala, Ankur Dwivedi, Fan Zhang, Jay Zhou, Nipun Gupta, Mattias Rönnblom, Pavan Nikhilesh, Liang Ma, Peter Mccarthy, Harry van Haaren, Artem V. Andreev, Andrew Rybchenko, Gage Eads, John W. Linville, Ciara Loftus, Qi Zhang, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Steven Webster, Matt Peters, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Chas Williams, Wei Hu (Xavier), Rahul Lakkireddy, Wei Zhao, Jeff Guo, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, John Daley, Hyong Youb Kim, Gaetan Rivet, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Min Hu (Connor), Yisen Zhuang, Qiming Yang, Alfredo Cardigliano, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Zyta Szpak, K. Y. Srinivasan, Haiyang Zhang, Martin Spinler, Heinrich Kuhn, Tetsuya Mukawa, Kiran Kumar K, Bruce Richardson, Jasvinder Singh, Keith Wiles, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Yong Wang, Tianfei zhang, Xiaoyun Li, Satha Rao, Mahipal Challa, David Hunt, Byron Marohn, Yipeng Wang, Jiayu Hu, Sameh Gobriel, Honnappa Nagarahalli, Kevin Laatz, Robert Sanford, Erik Gabriel Carrillo, Anatoly Burakov A decision was made [1] to no longer support Make in DPDK, this patch removes all Makefiles that do not make use of pkg-config, along with the mk directory previously used by make. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html Signed-off-by: Ciara Power <ciara.power@intel.com> --- GNUmakefile | 17 - MAINTAINERS | 4 - app/Makefile | 34 -- app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 -- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 -- app/test-eventdev/Makefile | 32 -- app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 -- app/test-pipeline/Makefile | 33 -- app/test-pmd/Makefile | 73 --- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ------------- buildtools/Makefile | 9 - buildtools/pmdinfogen/Makefile | 20 - drivers/Makefile | 34 -- drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 -- drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 --- drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 -- drivers/bus/fslmc/Makefile | 47 -- drivers/bus/ifpga/Makefile | 28 -- drivers/bus/pci/Makefile | 33 -- drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/vdev/Makefile | 27 -- drivers/bus/vmbus/Makefile | 33 -- drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 -- drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 -- drivers/common/iavf/Makefile | 27 -- drivers/common/mlx5/Makefile | 404 ---------------- drivers/common/mvep/Makefile | 35 -- drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 -- drivers/common/qat/Makefile | 74 --- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 -- drivers/compress/octeontx/Makefile | 26 -- drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 -- drivers/crypto/aesni_gcm/Makefile | 43 -- drivers/crypto/aesni_mb/Makefile | 42 -- drivers/crypto/armv8/Makefile | 36 -- drivers/crypto/caam_jr/Makefile | 39 -- drivers/crypto/ccp/Makefile | 32 -- drivers/crypto/dpaa2_sec/Makefile | 45 -- drivers/crypto/dpaa_sec/Makefile | 38 -- drivers/crypto/kasumi/Makefile | 42 -- drivers/crypto/mvsam/Makefile | 40 -- drivers/crypto/nitrox/Makefile | 30 -- drivers/crypto/null/Makefile | 27 -- drivers/crypto/octeontx/Makefile | 36 -- drivers/crypto/octeontx2/Makefile | 49 -- drivers/crypto/openssl/Makefile | 26 -- drivers/crypto/scheduler/Makefile | 34 -- drivers/crypto/snow3g/Makefile | 43 -- drivers/crypto/virtio/Makefile | 33 -- drivers/crypto/zuc/Makefile | 42 -- drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 -- drivers/event/dpaa2/Makefile | 41 -- drivers/event/dsw/Makefile | 26 -- drivers/event/octeontx/Makefile | 51 --- drivers/event/octeontx2/Makefile | 47 -- drivers/event/opdl/Makefile | 29 -- drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 -- drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 -- drivers/mempool/dpaa2/Makefile | 31 -- drivers/mempool/octeontx/Makefile | 39 -- drivers/mempool/octeontx2/Makefile | 40 -- drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 ---- drivers/net/af_packet/Makefile | 27 -- drivers/net/af_xdp/Makefile | 26 -- drivers/net/ark/Makefile | 39 -- drivers/net/atlantic/Makefile | 34 -- drivers/net/avp/Makefile | 29 -- drivers/net/axgbe/Makefile | 33 -- drivers/net/bnx2x/Makefile | 33 -- drivers/net/bnxt/Makefile | 63 --- drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 -- drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 -- drivers/net/cxgbe/Makefile | 57 --- drivers/net/dpaa/Makefile | 41 -- drivers/net/dpaa2/Makefile | 47 -- drivers/net/e1000/Makefile | 79 ---- drivers/net/ena/Makefile | 30 -- drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 --- drivers/net/failsafe/Makefile | 43 -- drivers/net/fm10k/Makefile | 77 ---- drivers/net/hinic/Makefile | 67 --- drivers/net/hns3/Makefile | 42 -- drivers/net/i40e/Makefile | 112 ----- drivers/net/iavf/Makefile | 54 --- drivers/net/ice/Makefile | 96 ---- drivers/net/igc/Makefile | 40 -- drivers/net/ionic/Makefile | 31 -- drivers/net/ipn3ke/Makefile | 38 -- drivers/net/ixgbe/Makefile | 110 ----- drivers/net/kni/Makefile | 30 -- drivers/net/liquidio/Makefile | 30 -- drivers/net/memif/Makefile | 26 -- drivers/net/mlx4/Makefile | 142 ------ drivers/net/mlx5/Makefile | 82 ---- drivers/net/mvneta/Makefile | 39 -- drivers/net/mvpp2/Makefile | 42 -- drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 -- drivers/net/nfp/Makefile | 41 -- drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 --- drivers/net/octeontx2/Makefile | 63 --- drivers/net/pcap/Makefile | 32 -- drivers/net/pfe/Makefile | 31 -- drivers/net/qede/Makefile | 109 ----- drivers/net/ring/Makefile | 29 -- drivers/net/sfc/Makefile | 133 ------ drivers/net/softnic/Makefile | 54 --- drivers/net/szedata2/Makefile | 30 -- drivers/net/tap/Makefile | 97 ---- drivers/net/thunderx/Makefile | 41 -- drivers/net/vdev_netvsc/Makefile | 30 -- drivers/net/vhost/Makefile | 31 -- drivers/net/virtio/Makefile | 82 ---- drivers/net/vmxnet3/Makefile | 53 --- drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 -- drivers/raw/dpaa2_qdma/Makefile | 36 -- drivers/raw/ifpga/Makefile | 39 -- drivers/raw/ifpga/base/Makefile | 32 -- drivers/raw/ioat/Makefile | 28 -- drivers/raw/ntb/Makefile | 28 -- drivers/raw/octeontx2_dma/Makefile | 34 -- drivers/raw/octeontx2_ep/Makefile | 42 -- drivers/raw/skeleton/Makefile | 26 -- drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 -- drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 -- drivers/vdpa/mlx5/Makefile | 58 --- examples/Makefile | 90 ---- kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 -- lib/Makefile | 138 ------ lib/librte_acl/Makefile | 65 --- lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 -- lib/librte_cfgfile/Makefile | 26 -- lib/librte_cmdline/Makefile | 34 -- lib/librte_compressdev/Makefile | 27 -- lib/librte_cryptodev/Makefile | 30 -- lib/librte_distributor/Makefile | 28 -- lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 ----- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 ----- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 -- lib/librte_eventdev/Makefile | 47 -- lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 -- lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 -- lib/librte_ip_frag/Makefile | 27 -- lib/librte_ipsec/Makefile | 29 -- lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 -- lib/librte_mbuf/Makefile | 26 -- lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_meter/Makefile | 27 -- lib/librte_metrics/Makefile | 30 -- lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 -- lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 -- lib/librte_port/Makefile | 59 --- lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 -- lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 -- lib/librte_sched/Makefile | 29 -- lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 -- lib/librte_table/Makefile | 59 --- lib/librte_telemetry/Makefile | 30 -- lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 --- mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 -- mk/arch/i686/rte.vars.mk | 36 -- mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 -- mk/arch/x86_x32/rte.vars.mk | 40 -- mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 -- mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 -- mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 -- mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 -- mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 ------- mk/internal/rte.extvars.mk | 55 --- mk/internal/rte.install-post.mk | 71 --- mk/internal/rte.install-pre.mk | 32 -- mk/machine/armv7a/rte.vars.mk | 36 -- mk/machine/armv8a/rte.vars.mk | 31 -- mk/machine/default/rte.vars.mk | 30 -- mk/machine/dpaa/rte.vars.mk | 37 -- mk/machine/emag/rte.vars.mk | 32 -- mk/machine/hsw/rte.vars.mk | 30 -- mk/machine/ivb/rte.vars.mk | 30 -- mk/machine/n1sdp/rte.vars.mk | 34 -- mk/machine/native/rte.vars.mk | 39 -- mk/machine/nhm/rte.vars.mk | 30 -- mk/machine/octeontx2/rte.vars.mk | 34 -- mk/machine/power8/rte.vars.mk | 30 -- mk/machine/silvermont/rte.vars.mk | 30 -- mk/machine/snb/rte.vars.mk | 30 -- mk/machine/thunderx/rte.vars.mk | 31 -- mk/machine/thunderx2/rte.vars.mk | 34 -- mk/machine/wsm/rte.vars.mk | 30 -- mk/machine/xgene1/rte.vars.mk | 31 -- mk/rte.app.mk | 509 --------------------- mk/rte.bsdmodule.mk | 89 ---- mk/rte.combinedlib.mk | 30 -- mk/rte.cpuflags.mk | 124 ----- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 -- mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 -- mk/rte.extsubdir.mk | 39 -- mk/rte.gnuconfigure.mk | 44 -- mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 ---- mk/rte.hostlib.mk | 86 ---- mk/rte.install.mk | 28 -- mk/rte.lib.mk | 156 ------- mk/rte.module.mk | 86 ---- mk/rte.obj.mk | 82 ---- mk/rte.sdkbuild.mk | 77 ---- mk/rte.sdkconfig.mk | 142 ------ mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 ----- mk/rte.sdkexamples.mk | 50 -- mk/rte.sdkgcov.mk | 39 -- mk/rte.sdkinstall.mk | 152 ------ mk/rte.sdkroot.mk | 115 ----- mk/rte.sdktest.mk | 76 --- mk/rte.shared.mk | 108 ----- mk/rte.subdir.mk | 65 --- mk/rte.vars.mk | 102 ----- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 ------ mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 --- mk/toolchain/gcc/rte.toolchain-compat.mk | 120 ----- mk/toolchain/gcc/rte.vars.mk | 109 ----- mk/toolchain/icc/rte.toolchain-compat.mk | 58 --- mk/toolchain/icc/rte.vars.mk | 62 --- 296 files changed, 12992 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index e8de422df8..0000000000 --- a/GNUmakefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# Head Makefile for compiling rte SDK -# - -RTE_SDK := $(CURDIR) -export RTE_SDK - -# -# directory list -# - -ROOTDIRS-y := buildtools lib kernel drivers app - -include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/MAINTAINERS b/MAINTAINERS index ed163f5d59..ccaecabea0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -100,10 +100,8 @@ F: .editorconfig Build System ------------ M: Thomas Monjalon <thomas@monjalon.net> -F: GNUmakefile F: Makefile F: config/ -F: mk/ F: buildtools/auto-config-h.sh F: buildtools/gen-build-mk.sh F: buildtools/gen-config-h.sh @@ -354,7 +352,6 @@ Memory pool M: Olivier Matz <olivier.matz@6wind.com> M: Andrew Rybchenko <arybchenko@solarflare.com> F: lib/librte_mempool/ -F: drivers/mempool/Makefile F: drivers/mempool/ring/ F: doc/guides/prog_guide/mempool_lib.rst F: app/test/test_mempool* @@ -1519,7 +1516,6 @@ Test Applications ----------------- Unit tests framework -F: app/test/Makefile F: app/test/autotest* F: app/test/commands.c F: app/test/get-coremask.sh diff --git a/app/Makefile b/app/Makefile deleted file mode 100644 index 453c4fed6d..0000000000 --- a/app/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_APP_TEST) += test -DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd -DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib -DIRS-$(CONFIG_RTE_TEST_FLOW_PERF) += test-flow-perf -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += test-sad -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += test-regex - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -DIRS-$(CONFIG_RTE_APP_COMPRESS_PERF) += test-compress-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_APP_CRYPTO_PERF) += test-crypto-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -DIRS-$(CONFIG_RTE_APP_EVENTDEV) += test-eventdev -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/app/pdump/Makefile b/app/pdump/Makefile deleted file mode 100644 index e6b9eea91b..0000000000 --- a/app/pdump/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) - -APP = dpdk-pdump - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/proc-info/Makefile b/app/proc-info/Makefile deleted file mode 100644 index 214f3f54a1..0000000000 --- a/app/proc-info/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-procinfo - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-acl/Makefile b/app/test-acl/Makefile deleted file mode 100644 index 5f26294cf1..0000000000 --- a/app/test-acl/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) - -APP = testacl - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile deleted file mode 100644 index dc29557f37..0000000000 --- a/app/test-bbdev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -APP = testbbdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_TEST_BBDEV) += main.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c - -LDLIBS += -lm -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_5gnr_fec -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-cmdline/Makefile b/app/test-cmdline/Makefile deleted file mode 100644 index 3e7421906b..0000000000 --- a/app/test-cmdline/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y) - -# -# library name -# -APP = cmdline_test - -# -# all sources are stored in SRCS-y -# -SRCS-y += cmdline_test.c -SRCS-y += commands.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-compress-perf/Makefile b/app/test-compress-perf/Makefile deleted file mode 100644 index 2bff531836..0000000000 --- a/app/test-compress-perf/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-compress-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += comp_perf_options_parse.c -SRCS-y += comp_perf_test_verify.c -SRCS-y += comp_perf_test_throughput.c -SRCS-y += comp_perf_test_cyclecount.c -SRCS-y += comp_perf_test_common.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-crypto-perf/Makefile b/app/test-crypto-perf/Makefile deleted file mode 100644 index 0dced790f0..0000000000 --- a/app/test-crypto-perf/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -APP = dpdk-test-crypto-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += cperf_ops.c -SRCS-y += cperf_options_parsing.c -SRCS-y += cperf_test_vectors.c -SRCS-y += cperf_test_throughput.c -SRCS-y += cperf_test_latency.c -SRCS-y += cperf_test_pmd_cyclecount.c -SRCS-y += cperf_test_verify.c -SRCS-y += cperf_test_vector_parsing.c -SRCS-y += cperf_test_common.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-eventdev/Makefile b/app/test-eventdev/Makefile deleted file mode 100644 index e600e21c41..0000000000 --- a/app/test-eventdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-eventdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := evt_main.c -SRCS-y += evt_options.c -SRCS-y += evt_test.c -SRCS-y += parser.c - -SRCS-y += test_order_common.c -SRCS-y += test_order_queue.c -SRCS-y += test_order_atq.c - -SRCS-y += test_perf_common.c -SRCS-y += test_perf_queue.c -SRCS-y += test_perf_atq.c - -SRCS-y += test_pipeline_common.c -SRCS-y += test_pipeline_queue.c -SRCS-y += test_pipeline_atq.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-fib/Makefile b/app/test-fib/Makefile deleted file mode 100644 index 2ea799c0e9..0000000000 --- a/app/test-fib/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_FIB),y) - -APP = testfib - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-flow-perf/Makefile b/app/test-flow-perf/Makefile deleted file mode 100644 index 4f2db75910..0000000000 --- a/app/test-flow-perf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_FLOW_PERF),y) - -# -# library name -# -APP = dpdk-test-flow-perf - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y += actions_gen.c -SRCS-y += flow_gen.c -SRCS-y += items_gen.c -SRCS-y += main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pipeline/Makefile b/app/test-pipeline/Makefile deleted file mode 100644 index fc3a504409..0000000000 --- a/app/test-pipeline/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PIPELINE),y) - -# -# library name -# -APP = testpipeline - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := main.c -SRCS-y += config.c -SRCS-y += init.c -SRCS-y += runtime.c -SRCS-y += pipeline_stub.c -SRCS-y += pipeline_hash.c -SRCS-y += pipeline_lpm.c -SRCS-y += pipeline_lpm_ipv6.c - -# include ACL lib if available -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += pipeline_acl.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile deleted file mode 100644 index e739797f8a..0000000000 --- a/app/test-pmd/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_PMD),y) - -# -# library name -# -APP = testpmd - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -# -# all source are stored in SRCS-y -# -SRCS-y := testpmd.c -SRCS-y += parameters.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_tm.c -SRCS-y += config.c -SRCS-y += iofwd.c -SRCS-y += macfwd.c -SRCS-y += macswap.c -SRCS-y += flowgen.c -SRCS-y += rxonly.c -SRCS-y += txonly.c -SRCS-y += csumonly.c -SRCS-y += icmpecho.c -SRCS-y += noisy_vnf.c -SRCS-y += 5tswap.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c -SRCS-y += util.c - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS)$(CONFIG_RTE_LIBRTE_DPAA_PMD),yy) -LDLIBS += -lrte_pmd_dpaa -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC),y) -LDLIBS += -lrte_pmd_softnic -endif - -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-regex/Makefile b/app/test-regex/Makefile deleted file mode 100644 index bb8f150871..0000000000 --- a/app/test-regex/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-regex - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-sad/Makefile b/app/test-sad/Makefile deleted file mode 100644 index 9b5a7ddc61..0000000000 --- a/app/test-sad/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) - -APP = testsad - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test/Makefile b/app/test/Makefile deleted file mode 100644 index f4065271e4..0000000000 --- a/app/test/Makefile +++ /dev/null @@ -1,310 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_APP_TEST),y) - -# default rule -all: - -# Define an externally linked resource. A linked resource is an arbitrary -# file that is linked into the test binary. The application refers to this -# resource by name. The linked generates identifiers beg_<name> and end_<name> -# for referencing by the C code. -# -# Parameters: <unique name>, <file to be linked> -define linked_resource -SRCS-y += $(1).res.o -$(1).res.o: $(2) - @ echo ' MKRES $$@' - $Q [ "$$(<D)" = . ] || ln -fs $$< - $Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \ - --rename-section \ - .data=.rodata,alloc,load,data,contents,readonly \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1) \ - $$(<F) $$@ -endef - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -define linked_tar_resource -$(1).tar: $(2) - @ echo ' TAR $$@' - $Q tar -C $$(dir $$<) -cf $$@ $$(notdir $$<) -$(call linked_resource,$(1),$(1).tar) -endef -else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR -linked_tar_resource = -endif # CONFIG_RTE_APP_TEST_RESOURCE_TAR - -# -# library name -# -APP = test - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c -SRCS-y += test.c -SRCS-y += resource.c -SRCS-y += test_resource.c -test_resource.res: test_resource.c - @ cp $< $@ -$(eval $(call linked_resource,test_resource_c,test_resource.res)) -$(eval $(call linked_tar_resource,test_resource_tar,test_resource.c)) -SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_cfgfile.c -$(eval $(call linked_tar_resource,test_cfgfiles,test_cfgfiles)) -SRCS-y += test_prefetch.c -SRCS-y += test_byteorder.c -SRCS-y += test_per_lcore.c -SRCS-y += test_atomic.c -SRCS-y += test_barrier.c -SRCS-y += test_malloc.c -SRCS-y += test_cycles.c -SRCS-y += test_mcslock.c -SRCS-y += test_spinlock.c -SRCS-y += test_ticketlock.c -SRCS-y += test_memory.c -SRCS-y += test_memzone.c -SRCS-y += test_bitmap.c -SRCS-y += test_bitops.c -SRCS-y += test_reciprocal_division.c -SRCS-y += test_reciprocal_division_perf.c -SRCS-y += test_fbarray.c -SRCS-y += test_external_mem.c -SRCS-y += test_rand_perf.c - -SRCS-y += test_ring.c -SRCS-y += test_ring_mpmc_stress.c -SRCS-y += test_ring_hts_stress.c -SRCS-y += test_ring_perf.c -SRCS-y += test_ring_mt_peek_stress.c -SRCS-y += test_ring_rts_stress.c -SRCS-y += test_ring_st_peek_stress.c -SRCS-y += test_ring_stress.c -SRCS-y += test_pmd_perf.c - -ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y) -SRCS-y += test_table.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test_table_pipeline.c -SRCS-y += test_table_tables.c -SRCS-y += test_table_ports.c -SRCS-y += test_table_combined.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_table_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += test_flow_classify.c -endif - -SRCS-y += test_rwlock.c -SRCS-y += test_lcores.c - -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack.c -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_racecond.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_secondary.c - -SRCS-y += test_mempool.c -SRCS-y += test_mempool_perf.c - -SRCS-y += test_mbuf.c -SRCS-y += test_logs.c - -SRCS-y += test_memcpy.c -SRCS-y += test_memcpy_perf.c - - -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd.c -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_thash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_functions.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += test_telemetry_json.c - -SRCS-y += test_debug.c -SRCS-y += test_errno.c -SRCS-y += test_tailq.c -SRCS-y += test_string_fns.c -SRCS-y += test_cpuflags.c -SRCS-y += test_mp_secondary.c -SRCS-y += test_eal_flags.c -SRCS-y += test_eal_fs.c -SRCS-y += test_alarm.c -SRCS-y += test_interrupts.c -SRCS-y += test_version.c -SRCS-y += test_func_reentrancy.c -SRCS-y += test_trace.c -SRCS-y += test_trace_register.c -SRCS-y += test_trace_perf.c -SRCS-y += test_service_cores.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-y += sample_packet_forward.c -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_portlist.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_lib.c - -SRCS-$(CONFIG_RTE_LIBRTE_NET) += test_crc.c - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -SRCS-y += test_red.c -SRCS-y += test_sched.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_METER) += test_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_KNI) += test_kni.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power.c test_power_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power_kvm_vm.c -SRCS-y += test_common.c - -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c - -SRCS-y += virtual_pmd.c -SRCS-y += packet_burst_generator.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_cryptodev_security_pdcp.c - -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -SRCS-y += test_eventdev.c -SRCS-y += test_event_ring.c -SRCS-y += test_event_eth_rx_adapter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c -SRCS-y += test_event_timer_adapter.c -SRCS-y += test_event_crypto_adapter.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH), y) -SRCS-y += test_graph.c -SRCS-y += test_graph_perf.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -SRCS-y += test_rawdev.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c - -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += test_bpf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RCU) += test_rcu_qsbr.c test_rcu_qsbr_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_security.c - -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec.c test_ipsec_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec_sad.c -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -LDLIBS += -lrte_ipsec -endif - -CFLAGS += -O3 -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) -LDLIBS += -lpthread -endif - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -LDLIBS += -lz -endif -endif - -# Disable VTA for memcpy test -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_test_memcpy.o += -fno-var-tracking-assignments -CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments -endif -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -LDLIBS += -lrte_pmd_null -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -LDLIBS += -lrte_pmd_ring -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -endif - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -LDLIBS += -larchive -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/buildtools/Makefile b/buildtools/Makefile deleted file mode 100644 index 7f76fd7d65..0000000000 --- a/buildtools/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += pmdinfogen - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/buildtools/pmdinfogen/Makefile b/buildtools/pmdinfogen/Makefile deleted file mode 100644 index a97a7648fe..0000000000 --- a/buildtools/pmdinfogen/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -HOSTAPP = dpdk-pmdinfogen - -# -# all sources are stored in SRCS-y -# -SRCS-y += pmdinfogen.c - -HOST_CFLAGS += $(HOST_WERROR_FLAGS) -g -HOST_CFLAGS += -I$(RTE_OUTPUT)/include - -include $(RTE_SDK)/mk/rte.hostapp.mk diff --git a/drivers/Makefile b/drivers/Makefile deleted file mode 100644 index 7f06162dc4..0000000000 --- a/drivers/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += common -DIRS-y += bus -DEPDIRS-bus := common -DIRS-y += mempool -DEPDIRS-mempool := common bus -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -DIRS-y += common/mlx5 -DEPDIRS-common/mlx5 := bus -endif -DIRS-y += net -DEPDIRS-net := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband -DEPDIRS-baseband := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto -DEPDIRS-crypto := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat -DEPDIRS-common/qat := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress -DEPDIRS-compress := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex -DEPDIRS-regex := common bus common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa -DEPDIRS-vdpa := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event -DEPDIRS-event := common bus mempool net crypto -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw -DEPDIRS-raw := common bus mempool net event - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/Makefile b/drivers/baseband/Makefile deleted file mode 100644 index dcc0969175..0000000000 --- a/drivers/baseband/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -core-libs := librte_eal librte_mbuf librte_mempool librte_ring -core-libs += librte_bbdev librte_kvargs librte_cfgfile - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null -DEPDIRS-null = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw -DEPDIRS-turbo_sw = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec -DEPDIRS-fpga_lte_fec = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += fpga_5gnr_fec -DEPDIRS-fpga_5gnr_fec = $(core-libs) - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/fpga_5gnr_fec/Makefile b/drivers/baseband/fpga_5gnr_fec/Makefile deleted file mode 100644 index 7b7017c6dc..0000000000 --- a/drivers/baseband/fpga_5gnr_fec/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_5gnr_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_5gnr_fec_version.map - -# library version -LIBABIVER := 1 - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += rte_fpga_5gnr_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC)-include += rte_pmd_fpga_5gnr_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/fpga_lte_fec/Makefile b/drivers/baseband/fpga_lte_fec/Makefile deleted file mode 100644 index 30caafe3db..0000000000 --- a/drivers/baseband/fpga_lte_fec/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_lte_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/null/Makefile b/drivers/baseband/null/Makefile deleted file mode 100644 index 0ee500166d..0000000000 --- a/drivers/baseband/null/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk -# library name -LIB = librte_pmd_bbdev_null.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_null_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += bbdev_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/turbo_sw/Makefile b/drivers/baseband/turbo_sw/Makefile deleted file mode 100644 index c2a6fe0f81..0000000000 --- a/drivers/baseband/turbo_sw/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_turbo_sw.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_turbo_sw_version.map - -# external library dependencies if available -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -ifeq ($(FLEXRAN_SDK),) -$(error "Please define FLEXRAN_SDK environment variable") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_common -CFLAGS += -I$(FLEXRAN_SDK)/lib_turbo -CFLAGS += -I$(FLEXRAN_SDK)/lib_crc -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -LDLIBS += -L$(FLEXRAN_SDK)/lib_crc -lcrc -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_common -lcommon -LDLIBS += -lstdc++ -lirc -limf -lipps -lsvml -endif - -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),n) -$(error "CONFIG_RTE_BBDEV_SDK_AVX512 requires CONFIG_RTE_BBDEV_SDK_AVX2 set") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += bbdev_turbo_software.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile deleted file mode 100644 index cea3b55e60..0000000000 --- a/drivers/bus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc -endif -DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev -DIRS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile deleted file mode 100644 index ba40b21166..0000000000 --- a/drivers/bus/dpaa/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_BUS_DPAA=$(RTE_SDK)/drivers/bus/dpaa - -# -# library name -# -LIB = librte_bus_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual -CFLAGS += -I$(RTE_BUS_DPAA)/ -CFLAGS += -I$(RTE_BUS_DPAA)/include -CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_bus_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - dpaa_bus.c - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - base/fman/fman.c \ - base/fman/fman_hw.c \ - base/fman/netcfg_layer.c \ - base/qbman/process.c \ - base/qbman/bman.c \ - base/qbman/bman_driver.c \ - base/qbman/qman.c \ - base/qbman/qman_driver.c \ - base/qbman/dpaa_alloc.c \ - base/qbman/dpaa_sys.c - -# Link Pthread -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile deleted file mode 100644 index b98d758ee0..0000000000 --- a/drivers/bus/fslmc/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_fslmc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -# versioning export map -EXPORT_MAP := rte_bus_fslmc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - qbman/qbman_portal.c \ - qbman/qbman_debug.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - mc/dpmng.c \ - mc/dpbp.c \ - mc/dpio.c \ - mc/mc_sys.c \ - mc/dpcon.c \ - mc/dpci.c \ - mc/dpdmai.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpci.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile deleted file mode 100644 index 1df369103c..0000000000 --- a/drivers/bus/ifpga/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_bus_ifpga_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_bus.c -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_common.c - -# -# Export include files -# -SYMLINK-$(CONFIG_RTE_LIBRTE_IFPGA_BUS)-include += rte_bus_ifpga.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile deleted file mode 100644 index f4102d0a7f..0000000000 --- a/drivers/bus/pci/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_pci.a -EXPORT_MAP := rte_bus_pci_version.map - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -SYSTEM := bsd -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_pci -lrte_kvargs - -include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI_BUS)-include += rte_bus_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/bsd/Makefile b/drivers/bus/pci/bsd/Makefile deleted file mode 100644 index c1b54c05ef..0000000000 --- a/drivers/bus/pci/bsd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c diff --git a/drivers/bus/pci/linux/Makefile b/drivers/bus/pci/linux/Makefile deleted file mode 100644 index 90404468b0..0000000000 --- a/drivers/bus/pci/linux/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c -SRCS += pci_uio.c -SRCS += pci_vfio.c diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile deleted file mode 100644 index 01747f03a4..0000000000 --- a/drivers/bus/vdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_vdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_bus_vdev_version.map - -SRCS-y += vdev.c -SRCS-y += vdev_params.c - -LDLIBS += -lrte_eal -lrte_kvargs - -# -# Export include files -# -SYMLINK-y-include += rte_bus_vdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/Makefile b/drivers/bus/vmbus/Makefile deleted file mode 100644 index 335df6a0ba..0000000000 --- a/drivers/bus/vmbus/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_vmbus.a -EXPORT_MAP := rte_bus_vmbus_version.map - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -$(error "VMBUS not implemented for BSD yet") -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev - -include $(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_channel.c vmbus_bufring.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_bus_vmbus.h -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_vmbus_reg.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/linux/Makefile b/drivers/bus/vmbus/linux/Makefile deleted file mode 100644 index ef0d30b2d3..0000000000 --- a/drivers/bus/vmbus/linux/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -SRCS += vmbus_bus.c vmbus_uio.c diff --git a/drivers/common/Makefile b/drivers/common/Makefile deleted file mode 100644 index cfb6b4dc88..0000000000 --- a/drivers/common/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifneq (,$(findstring y,$(CPT-y))) -DIRS-y += cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -DIRS-y += octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -DIRS-y += octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -DIRS-y += mvep -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y) -DIRS-y += dpaax -endif - -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifneq (,$(findstring y,$(IAVF-y))) -DIRS-y += iavf -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/cpt/Makefile b/drivers/common/cpt/Makefile deleted file mode 100644 index cab9da73c8..0000000000 --- a/drivers/common/cpt/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_cpt.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -EXPORT_MAP := rte_common_cpt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += cpt_fpm_tables.c -SRCS-y += cpt_pmd_ops_helper.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile deleted file mode 100644 index 2f4b924fda..0000000000 --- a/drivers/common/dpaax/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_dpaax.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib - -# versioning export map -EXPORT_MAP := rte_common_dpaax_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/iavf/Makefile b/drivers/common/iavf/Makefile deleted file mode 100644 index f06dafd408..0000000000 --- a/drivers/common/iavf/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_iavf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -EXPORT_MAP := rte_common_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += iavf_adminq.c -SRCS-y += iavf_common.c -SRCS-y += iavf_impl.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile deleted file mode 100644 index 4edd541042..0000000000 --- a/drivers/common/mlx5/Makefile +++ /dev/null @@ -1,404 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_common_mlx5.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx5_glue.so -LIB_GLUE_VERSION = 20.02.0 - -# Sources. -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-y += linux/mlx5_glue.c -endif -SRCS-y += mlx5_devx_cmds.c -SRCS-y += mlx5_common.c -SRCS-y += linux/mlx5_common_os.c -SRCS-y += linux/mlx5_nl.c -SRCS-y += linux/mlx5_common_verbs.c -SRCS-y += mlx5_common_mp.c -SRCS-y += mlx5_common_mr.c -SRCS-y += mlx5_malloc.c -SRCS-y += mlx5_common_pci.c -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-y-lib += $(LIB_GLUE) -endif -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(SRCDIR)/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_linux/mlx5_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx5 -endif - -LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual -UPEDANTIC - -EXPORT_MAP := rte_common_mlx5_version.map - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx5_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx5_autoconf.h.new: FORCE - -mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_RELAXED_ORDERING \ - infiniband/verbs.h \ - enum IBV_ACCESS_RELAXED_ORDERING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_TUNNEL_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_MPLS_SUPPORT \ - infiniband/verbs.h \ - enum IBV_FLOW_SPEC_MPLS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAG_RX_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAG_RX_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_SWP \ - infiniband/mlx5dv.h \ - type 'struct mlx5dv_sw_parsing_caps' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_MPW \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_COMP \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_PAD \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DV_SUPPORT \ - infiniband/mlx5dv.h \ - func mlx5dv_create_flow_action_packet_reformat \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_NIC_RX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ESWITCH \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_FDB \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_VLAN \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_push_vlan \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_DEVX_PORT \ - infiniband/mlx5dv.h \ - func mlx5dv_query_devx_port \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_OBJ \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_create \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DEVX_COUNTERS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_DEFAULT_MISS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_ASYNC \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_query_async \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_QP \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_qp_query \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DEVX_UAR_OFFSET \ - infiniband/mlx5dv.h \ - field "struct mlx5dv_devx_uar.mmap_off" \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_PP_ALLOC \ - infiniband/mlx5dv.h \ - func mlx5dv_pp_alloc \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_dest_devx_tir \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_EVENT \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_get_event \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_flow_meter \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_FLOW_DUMP \ - infiniband/mlx5dv.h \ - func mlx5dv_dump_dr_domain \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD \ - infiniband/mlx5dv.h \ - enum MLX5_MMAP_GET_NC_PAGES_CMD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_VAR \ - infiniband/mlx5dv.h \ - func mlx5dv_alloc_var \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_MEM_RECLAIM \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_domain_set_reclaim_device_memory \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_ENHANCED_MPSW \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_ENHANCED_MPSW \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_SEND_EN \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_SEND_EN \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_WAIT \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_WAIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_25G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_50G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_100G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V42 \ - infiniband/verbs.h \ - type 'struct ibv_counter_set_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V45 \ - infiniband/verbs.h \ - type 'struct ibv_counters_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NL_NLDEV \ - rdma/rdma_netlink.h \ - enum RDMA_NL_NLDEV \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_PORT_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_PORT_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_NAME \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_PORT_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_PORT_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_NDEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_NUM_VF \ - linux/if_link.h \ - enum IFLA_NUM_VF \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_EXT_MASK \ - linux/if_link.h \ - enum IFLA_EXT_MASK \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_SWITCH_ID \ - linux/if_link.h \ - enum IFLA_PHYS_SWITCH_ID \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_PORT_NAME \ - linux/if_link.h \ - enum IFLA_PHYS_PORT_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_DEVLINK \ - linux/devlink.h \ - define DEVLINK_GENL_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_STATIC_ASSERT \ - /usr/include/assert.h \ - define static_assert \ - $(AUTOCONF_OUTPUT) - -# Create mlx5_autoconf.h or update it in case it differs from the new one. - -mlx5_autoconf.h: mlx5_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -$(SRCS-y:.c=.o): mlx5_autoconf.h -endif - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): linux/mlx5_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx5 - -linux/mlx5_glue.o: mlx5_autoconf.h - -endif - -clean_mlx5: FORCE - $Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new - $Q rm -f -- linux/mlx5_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx5 diff --git a/drivers/common/mvep/Makefile b/drivers/common/mvep/Makefile deleted file mode 100644 index f91d295e5c..0000000000 --- a/drivers/common/mvep/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_common_mvep.a - -# versioning export map -EXPORT_MAP := rte_common_mvep_version.map - -# external library dependencies -CFLAGS += -I$($RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_kvargs - -# library source files -SRCS-y += mvep_common.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx/Makefile b/drivers/common/octeontx/Makefile deleted file mode 100644 index 5e67df0583..0000000000 --- a/drivers/common/octeontx/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -EXPORT_MAP := rte_common_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += octeontx_mbox.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx2/Makefile b/drivers/common/octeontx2/Makefile deleted file mode 100644 index 260da8dd3e..0000000000 --- a/drivers/common/octeontx2/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_common_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += otx2_dev.c -SRCS-y += otx2_irq.c -SRCS-y += otx2_mbox.c -SRCS-y += otx2_common.c -SRCS-y += otx2_sec_idev.c - -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile deleted file mode 100644 index 85d4207099..0000000000 --- a/drivers/common/qat/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# build directories -QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat -QAT_COMPRESS_DIR := $(RTE_SDK)/drivers/compress/qat -VPATH=$(QAT_CRYPTO_DIR):$(QAT_COMPRESS_DIR) - -# external library include paths -CFLAGS += -I$(SRCDIR)/qat_adf -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(QAT_CRYPTO_DIR) -CFLAGS += -I$(QAT_COMPRESS_DIR) - - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) - LDLIBS += -lrte_compressdev - SRCS-y += qat_comp.c - SRCS-y += qat_comp_pmd.c - build_qat = yes -endif - -# library symmetric crypto source files -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto - CFLAGS += -DBUILD_QAT_ASYM - SRCS-y += qat_asym.c - SRCS-y += qat_asym_pmd.c - build_qat = yes -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) - LDLIBS += -lrte_net -endif - CFLAGS += -DBUILD_QAT_SYM - SRCS-y += qat_sym.c - SRCS-y += qat_sym_session.c - SRCS-y += qat_sym_pmd.c - build_qat = yes -endif -endif - -ifdef build_qat - - # library name - LIB = librte_pmd_qat.a - - # build flags - CFLAGS += $(WERROR_FLAGS) - CFLAGS += -O3 - - # library common source files - SRCS-y += qat_device.c - SRCS-y += qat_common.c - SRCS-y += qat_logs.c - SRCS-y += qat_qp.c - - LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool - LDLIBS += -lrte_pci -lrte_bus_pci - - # export include files - SYMLINK-y-include += - - # versioning export map - EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/Makefile b/drivers/compress/Makefile deleted file mode 100644 index 286ea6ee84..0000000000 --- a/drivers/compress/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/compress/isal/Makefile b/drivers/compress/isal/Makefile deleted file mode 100644 index 1e225ab434..0000000000 --- a/drivers/compress/isal/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_isal_comp.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# external library dependencies -LDLIBS += -lisal -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_isal_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd_ops.c - -# export include files -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/octeontx/Makefile b/drivers/compress/octeontx/Makefile deleted file mode 100644 index 9ba1db791e..0000000000 --- a/drivers/compress/octeontx/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_zip.a - -# build flags -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/compress/octeontx/include - -# external library include paths -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_compress_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/zlib/Makefile b/drivers/compress/zlib/Makefile deleted file mode 100644 index 9f695f7d9a..0000000000 --- a/drivers/compress/zlib/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium Networks - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zlib.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zlib_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lz -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile deleted file mode 100644 index 47a2a9e794..0000000000 --- a/drivers/crypto/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += zuc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += mvsam -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec -endif # CONFIG_RTE_LIBRTE_PMD_DPAA_SEC -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile deleted file mode 100644 index 01cb4fddfe..0000000000 --- a/drivers/crypto/aesni_gcm/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_gcm.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_gcm_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile deleted file mode 100644 index f0dc82f395..0000000000 --- a/drivers/crypto/aesni_mb/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_mb.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_mb_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/armv8/Makefile b/drivers/crypto/armv8/Makefile deleted file mode 100644 index 0e3bc9fb70..0000000000 --- a/drivers/crypto/armv8/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(ARMV8_CRYPTO_LIB_PATH),) -$(error "Please define ARMV8_CRYPTO_LIB_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_armv8.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_armv8_version.map - -# external library dependencies -CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH) -LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile deleted file mode 100644 index 89d3238172..0000000000 --- a/drivers/crypto/caam_jr/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_caam_jr.a - -# build flags -CFLAGS += -D _GNU_SOURCE - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_pmd_caam_jr_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_uio.c -# library dependencies - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile deleted file mode 100644 index 3f5da2adf3..0000000000 --- a/drivers/crypto/ccp/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_ccp.a - -# build flags -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += $(WERROR_FLAGS) - -# external library include paths -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_pmd_ccp_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += rte_ccp_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile deleted file mode 100644 index a0a2795575..0000000000 --- a/drivers/crypto/dpaa2_sec/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -# -# library name -# -LIB = librte_pmd_dpaa2_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -CFLAGS += -Wno-implicit-fallthrough -endif -endif - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2/ - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec_dpseci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += mc/dpseci.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile deleted file mode 100644 index ea266962a3..0000000000 --- a/drivers/crypto/dpaa_sec/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c - -# library dependencies - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/kasumi/Makefile b/drivers/crypto/kasumi/Makefile deleted file mode 100644 index a7d0d079d2..0000000000 --- a/drivers/crypto/kasumi/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_kasumi.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_kasumi_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/mvsam/Makefile b/drivers/crypto/mvsam/Makefile deleted file mode 100644 index f0641ae7d9..0000000000 --- a/drivers/crypto/mvsam/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvsam_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC - -# versioning export map -EXPORT_MAP := rte_pmd_mvsam_version.map - -# external library dependencies -LDLIBS += -L$(LIBMUSDK_PATH)/lib -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/nitrox/Makefile b/drivers/crypto/nitrox/Makefile deleted file mode 100644 index 535121196b..0000000000 --- a/drivers/crypto/nitrox/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_nitrox.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_nitrox_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_cryptodev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_device.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_reqmgr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_qp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/null/Makefile b/drivers/crypto/null/Makefile deleted file mode 100644 index 4595055f01..0000000000 --- a/drivers/crypto/null/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -# library name -LIB = librte_pmd_null_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_null_crypto_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd_ops.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx/Makefile b/drivers/crypto/octeontx/Makefile deleted file mode 100644 index 296755ee90..0000000000 --- a/drivers/crypto/octeontx/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_ops.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx2/Makefile b/drivers/crypto/octeontx2/Makefile deleted file mode 100644 index 14152c6117..0000000000 --- a/drivers/crypto/octeontx2/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx2_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_security -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt -lrte_common_octeontx2 - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx2 - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_sec.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx2_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/openssl/Makefile b/drivers/crypto/openssl/Makefile deleted file mode 100644 index b85c816551..0000000000 --- a/drivers/crypto/openssl/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_openssl.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_openssl_version.map - -# external library dependencies -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/scheduler/Makefile b/drivers/crypto/scheduler/Makefile deleted file mode 100644 index 67aac024c4..0000000000 --- a/drivers/crypto/scheduler/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_crypto_scheduler.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_kvargs -lrte_reorder -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_crypto_scheduler_version.map - -# -# Export include files -# -SYMLINK-y-include += rte_cryptodev_scheduler_operations.h -SYMLINK-y-include += rte_cryptodev_scheduler.h - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += rte_cryptodev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_roundrobin.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pkt_size_distr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_failover.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_multicore.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile deleted file mode 100644 index 469aefaa56..0000000000 --- a/drivers/crypto/snow3g/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_snow3g.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_snow3g_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile deleted file mode 100644 index 32e2e4d5e9..0000000000 --- a/drivers/crypto/virtio/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio_crypto.a - -# -# include virtio_crypto.h -# -CFLAGS += -I$(RTE_SDK)/lib/librte_vhost -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_virtio_crypto_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c - -# this lib depends upon: -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/zuc/Makefile b/drivers/crypto/zuc/Makefile deleted file mode 100644 index 529b47f25e..0000000000 --- a/drivers/crypto/zuc/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zuc.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zuc_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/Makefile b/drivers/event/Makefile deleted file mode 100644 index 86be41b9eb..0000000000 --- a/drivers/event/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += octeontx2 -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile deleted file mode 100644 index a39dc27c62..0000000000 --- a/drivers/event/dpaa/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa_event.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -LDLIBS += -lrte_pmd_dpaa_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec - -EXPORT_MAP := rte_pmd_dpaa_event_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa_eventdev.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile deleted file mode 100644 index 75cf197c5c..0000000000 --- a/drivers/event/dpaa2/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017,2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2_event.a - -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 -LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc - -LDLIBS += -lrte_pmd_dpaa2_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_hw_dpcon.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev_selftest.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile deleted file mode 100644 index f6e7dda1fd..0000000000 --- a/drivers/event/dsw/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Ericsson AB - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_dsw_event.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -Wno-format-nonliteral -endif - -LDLIBS += -lrte_eal -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool -LDLIBS += -lrte_ring -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_dsw_event_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += \ - dsw_evdev.c dsw_event.c dsw_xstats.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile deleted file mode 100644 index c1233e098d..0000000000 --- a/drivers/event/octeontx/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx_ssovf.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/ - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_ethdev - -EXPORT_MAP := rte_pmd_octeontx_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_probe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_probe.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_ssovf_worker.o += -fno-prefetch-loop-arrays -CFLAGS_timvf_worker.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -else -CFLAGS_ssovf_worker.o += -O3 -ffast-math -CFLAGS_timvf_worker.o += -O3 -ffast-math -endif - -else -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx2/Makefile b/drivers/event/octeontx2/Makefile deleted file mode 100644 index 9d67b00c69..0000000000 --- a/drivers/event/octeontx2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2_event.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/event/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_event_version.map - -# -# all source are stored in SRCS-y -# - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker_dual.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_adptr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_irq.c - -LDLIBS += -lrte_eal -lrte_bus_pci -lrte_pci -lrte_kvargs -LDLIBS += -lrte_mempool -lrte_eventdev -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile deleted file mode 100644 index 71713b00ae..0000000000 --- a/drivers/event/opdl/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_opdl_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_pmd_opdl_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_init.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_test.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/skeleton/Makefile b/drivers/event/skeleton/Makefile deleted file mode 100644 index dc85ad3c4b..0000000000 --- a/drivers/event/skeleton/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_skeleton_event.a - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_skeleton_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton_eventdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/sw/Makefile b/drivers/event/sw/Makefile deleted file mode 100644 index 8ea5cceb8b..0000000000 --- a/drivers/event/sw/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_sw_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -lrte_ring -LDLIBS += -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_sw_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_selftest.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile deleted file mode 100644 index 29ef73bf44..0000000000 --- a/drivers/mempool/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += bucket -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2 -endif -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += octeontx2 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/mempool/bucket/Makefile b/drivers/mempool/bucket/Makefile deleted file mode 100644 index c766c35b2c..0000000000 --- a/drivers/mempool/bucket/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright (c) 2017-2018 Solarflare Communications Inc. -# All rights reserved. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_bucket.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_bucket_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += rte_mempool_bucket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile deleted file mode 100644 index 144969c627..0000000000 --- a/drivers/mempool/dpaa/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile deleted file mode 100644 index 04db6d27de..0000000000 --- a/drivers/mempool/dpaa2/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa2_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)-include := rte_dpaa2_mempool.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx/Makefile b/drivers/mempool/octeontx/Makefile deleted file mode 100644 index 9c840620d9..0000000000 --- a/drivers/mempool/octeontx/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ - -EXPORT_MAP := rte_mempool_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx_fpavf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += rte_mempool_octeontx.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_rte_mempool_octeontx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_rte_mempool_octeontx.o += -Ofast -else -CFLAGS_rte_mempool_octeontx.o += -O3 -ffast-math -endif - -else -CFLAGS_rte_mempool_octeontx.o += -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_bus_pci -lrte_common_octeontx - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx2/Makefile b/drivers/mempool/octeontx2/Makefile deleted file mode 100644 index 3828219b11..0000000000 --- a/drivers/mempool/octeontx2/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_mempool_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += \ - otx2_mempool_ops.c \ - otx2_mempool.c \ - otx2_mempool_irq.c \ - otx2_mempool_debug.c - -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_kvargs -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/ring/Makefile b/drivers/mempool/ring/Makefile deleted file mode 100644 index 8624502da9..0000000000 --- a/drivers/mempool/ring/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_ring_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += rte_mempool_ring.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile deleted file mode 100644 index ccfd970400..0000000000 --- a/drivers/mempool/stack/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_stack.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# Headers -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool -LDLIBS += -lrte_eal -lrte_mempool -lrte_stack - -EXPORT_MAP := rte_mempool_stack_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/Makefile b/drivers/net/Makefile deleted file mode 100644 index 361974eacf..0000000000 --- a/drivers/net/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# set in mk/toolchain/xxx/rte.toolchain-compat.mk -ifeq ($(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD),d) - $(warning thunderx pmd is not supported by old compilers) -endif - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += af_xdp -DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark -DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic -DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp -DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe -DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding -DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 -DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena -DIRS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc -DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic -DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe -DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k -DIRS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic -DIRS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3 -DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e -DIRS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf -DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice -DIRS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc -DIRS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic -DIRS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke -DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe -DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif -DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta -DIRS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mvpp2 -DIRS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += netvsc -DIRS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb -DIRS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp -DIRS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap -DIRS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe -DIRS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede -DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring -DIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += szedata2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap -DIRS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += thunderx -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc -DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3 - -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += kni -endif - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += softnic -endif # $(CONFIG_RTE_LIBRTE_SCHED) - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost -endif # $(CONFIG_RTE_LIBRTE_VHOST) - -ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y) -ifeq ($(CONFIG_RTE_LIBRTE_CFGFILE),n) -$(error "RTE_LIBRTE_CFGFILE must be enabled in configuration!") -endif -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/net/af_packet/Makefile b/drivers/net/af_packet/Makefile deleted file mode 100644 index 91dbf0a692..0000000000 --- a/drivers/net/af_packet/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 John W. Linville <linville@redhat.com> -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_packet.a - -EXPORT_MAP := rte_pmd_af_packet_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += rte_eth_af_packet.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/af_xdp/Makefile b/drivers/net/af_xdp/Makefile deleted file mode 100644 index 55db6085ac..0000000000 --- a/drivers/net/af_xdp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_xdp.a - -EXPORT_MAP := rte_pmd_af_xdp_version.map - -CFLAGS += -O3 - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libbpf || echo "-lbpf") - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += rte_eth_af_xdp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile deleted file mode 100644 index c02080bdd0..0000000000 --- a/drivers/net/ark/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2018 Atomic Rules LLC - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ark.a - -CFLAGS += -O3 -I./ -CFLAGS += $(WERROR_FLAGS) -Werror - -EXPORT_MAP := rte_pmd_ark_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ddm.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_mpu.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktchkr.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktgen.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_rqp.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c - -# this lib depends upon: -LDLIBS += -lpthread -ifdef CONFIG_RTE_EXEC_ENV_LINUX -LDLIBS += -ldl -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/atlantic/Makefile b/drivers/net/atlantic/Makefile deleted file mode 100644 index 0d0d0a502d..0000000000 --- a/drivers/net/atlantic/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Aquantia Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_atlantic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_atlantic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/hw_atl - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_hw_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_llh.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils_fw2x.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_b0.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += rte_pmd_atlantic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/avp/Makefile b/drivers/net/avp/Makefile deleted file mode 100644 index 075247b13a..0000000000 --- a/drivers/net/avp/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2017, Wind River Systems, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_avp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_avp_version.map - -# install public header files to enable compilation of the hypervisor level -# dpdk application -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_common.h -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_fifo.h - -# -# all source files are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/axgbe/Makefile b/drivers/net/axgbe/Makefile deleted file mode 100644 index e421d0da11..0000000000 --- a/drivers/net/axgbe/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_axgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_axgbe_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_ethdev -lrte_net - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_mdio.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_phy_impl.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_i2c.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx_vec_sse.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile deleted file mode 100644 index 451434cc18..0000000000 --- a/drivers/net/bnx2x/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2014 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnx2x.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DZLIB_CONST -LDLIBS += -lz -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_bnx2x_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += ecore_sp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += elink.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_vfpf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile deleted file mode 100644 index 0c5b74918d..0000000000 --- a/drivers/net/bnxt/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnxt.a - -EXPORT_MAP := rte_pmd_bnxt_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -pthread - -EXPORT_MAP := rte_pmd_bnxt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_cpr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_hwrm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_reps.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD), y) -CFLAGS += -I$(SRCDIR) -I$(SRCDIR)/tf_ulp -I$(SRCDIR)/tf_core -I$(SRCDIR)/hcapi -include $(SRCDIR)/tf_ulp/Makefile -include $(SRCDIR)/tf_core/Makefile -include $(SRCDIR)/hcapi/Makefile -endif - -# -# Export include files -# -SYMLINK-y-include += -SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include += rte_pmd_bnxt.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/hcapi/Makefile b/drivers/net/bnxt/hcapi/Makefile deleted file mode 100644 index a5bb398ad7..0000000000 --- a/drivers/net/bnxt/hcapi/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += hcapi/hcapi_cfa_p4.c diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile deleted file mode 100644 index 84840366ab..0000000000 --- a/drivers/net/bnxt/tf_core/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/bitalloc.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/rand.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/stack.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/ll.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_core.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_rm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tfp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device_p4.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_if_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_global_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_hash.c diff --git a/drivers/net/bnxt/tf_ulp/Makefile b/drivers/net/bnxt/tf_ulp/Makefile deleted file mode 100644 index abb68150d1..0000000000 --- a/drivers/net/bnxt/tf_ulp/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_class.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_act.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_rte_parser.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_matcher.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mapper.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mark_mgr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_flow_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_port_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_def_rules.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_fc_mgr.c diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile deleted file mode 100644 index 728551a846..0000000000 --- a/drivers/net/bonding/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bond.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_bond_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_8023ad.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_alb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_flow.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_bond.h -SYMLINK-y-include += rte_eth_bond_8023ad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile deleted file mode 100644 index 53b2bb56dc..0000000000 --- a/drivers/net/cxgbe/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014-2018 Chelsio Communications. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_cxgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_cxgbe_version.map - -# -# CFLAGS for gcc/clang -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += clip_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += mps_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += l2t.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += smt.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4vf_hw.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile deleted file mode 100644 index d7bbc0e158..0000000000 --- a/drivers/net/dpaa/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_pmd_dpaa_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile deleted file mode 100644 index 6f38c18b9b..0000000000 --- a/drivers/net/dpaa2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_sparser.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += dpaa2_ptp.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_PMD)-include := rte_pmd_dpaa2.h -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile deleted file mode 100644 index f186f8d0e9..0000000000 --- a/drivers/net/e1000/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_e1000.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_e1000_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 177 -diag-disable 181 -CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259 -else -# -# CFLAGS for gcc/clang -# -CFLAGS_BASE_DRIVER = -Wno-uninitialized -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-misleading-indentation -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -endif - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_base.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_80003es2lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82540.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82541.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82542.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82543.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82571.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82575.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_i210.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_api.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_ich8lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile deleted file mode 100644 index 8ccff36db7..0000000000 --- a/drivers/net/ena/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2019 Amazon.com, Inc. or its affiliates. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ena.a -CFLAGS += $(WERROR_FLAGS) -O2 -INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ena_version.map - -VPATH += $(SRCDIR)/base -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c - -CFLAGS += $(INCLUDES) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_timer - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile deleted file mode 100644 index 7276026e37..0000000000 --- a/drivers/net/enetc/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enetc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -EXPORT_MAP := rte_pmd_enetc_version.map -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile deleted file mode 100644 index d098a474a1..0000000000 --- a/drivers/net/enic/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2008-2017 Cisco Systems, Inc. All rights reserved. -# Copyright 2007 Nuova Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enic.a - -EXPORT_MAP := rte_pmd_enic_version.map - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/src - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_fm_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_cq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c - -# The current implementation assumes 64-bit pointers -CC_AVX2_SUPPORT=0 -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -# Figure out if the compiler supports avx2. The extra check using -# -march=core-avx2 is necessary to support users who build for the -# 'default' machine (corei7 which has no avx2) and run the binary on -# newer CPUs that have avx2. -# This part is verbatim from i40e makefile. -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_enic_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_enic_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile deleted file mode 100644 index 464fd0515d..0000000000 --- a/drivers/net/failsafe/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_pmd_failsafe.a - -EXPORT_MAP := rte_pmd_failsafe_version.map - -# Sources are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_eal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif - -# No exported include files - -# Basic CFLAGS: -CFLAGS += -std=gnu99 -Wextra -CFLAGS += -O3 -CFLAGS += -I. -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=700 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -CFLAGS += -pedantic -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile deleted file mode 100644 index d486389928..0000000000 --- a/drivers/net/fm10k/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_fm10k.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_fm10k_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) - -# -## CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -else -# -# CFLAGS for gcc -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of cid-fm10k.2017.01.24.tar.gz -# -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_rxtx.c - -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_tlv.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) += fm10k_rxtx_vec.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile deleted file mode 100644 index 87fd843e41..0000000000 --- a/drivers/net/hinic/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Huawei Technologies Co., Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hinic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -CFLAGS += -D__ARM64_NEON__ -else ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -CFLAGS += -D__X86_64_SSE__ -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_hinic_version.map - -# -# CFLAGS for 32-bits platforms -# -ifneq ($(CONFIG_RTE_ARCH_64),y) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS += -diag-disable 2259 -else -# -# CFLAGS for gcc -# -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -endif -endif - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_api_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cmdq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_eqs.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwif.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mgmt.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_niccfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_nicio.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_tx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hns3/Makefile b/drivers/net/hns3/Makefile deleted file mode 100644 index d7798a4706..0000000000 --- a/drivers/net/hns3/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018-2019 Hisilicon Limited. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hns3.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Experimantal APIs: -# - rte_mp_action_register -# - rte_mp_action_unregister -# - rte_mp_reply -# - rte_mp_request_sync - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_hns3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile deleted file mode 100644 index 43f10941b2..0000000000 --- a/drivers/net/i40e/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_i40e.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF -CFLAGS += -DX722_A0_SUPPORT - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_i40e_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER = -diag-disable 593 -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER = -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-format-security -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -CFLAGS_i40e_lan_hmc.o += -Wno-error -endif -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of dpdk-i40e.2016.04.18.12.tar.gz. -# -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_adminq.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_common.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_diag.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_lan_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c - -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_sse.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += rte_pmd_i40e.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_vf_representor.c - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR),y) -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_i40e_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_i40e_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_avx2.c - CFLAGS_i40e_rxtx.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_I40E_PMD)-include := rte_pmd_i40e.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/iavf/Makefile b/drivers/net/iavf/Makefile deleted file mode 100644 index 792cbb7f79..0000000000 --- a/drivers/net/iavf/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_iavf.a - -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf -CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_iavf - -EXPORT_MAP := rte_pmd_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_hash.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IAVF_PMD), y) - ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 - else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_iavf_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_iavf_rxtx_vec_avx2.o += -mavx2 - endif - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile deleted file mode 100644 index 34cd4024b3..0000000000 --- a/drivers/net/ice/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ice.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_hash -LDLIBS += -lrte_net -lrte_common_iavf -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ice_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -endif -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_controlq.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_common.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flex_pipe.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl_ctrl.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_hash.c -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_ice_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_ice_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_avx2.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_generic_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_parent.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ICE_PMD)-include := rte_pmd_ice.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/igc/Makefile b/drivers/net/igc/Makefile deleted file mode 100644 index d6d7959d2d..0000000000 --- a/drivers/net/igc/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_igc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_pmd_igc_version.map - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_base.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_i225.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_txrx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile deleted file mode 100644 index 7442e2c5cb..0000000000 --- a/drivers/net/ionic/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ionic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ionic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_mac_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_lif.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_main.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ipn3ke/Makefile b/drivers/net/ipn3ke/Makefile deleted file mode 100644 index 40696dbde8..0000000000 --- a/drivers/net/ipn3ke/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ipn3ke.a - -# -# Add the experimenatal APIs called from this PMD -# rte_eth_switch_domain_alloc() -# rte_eth_dev_create() -# rte_eth_dev_destroy() -# rte_eth_switch_domain_free() -# -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ipn3ke_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_representor.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile deleted file mode 100644 index aebf3b286c..0000000000 --- a/drivers/net/ixgbe/Makefile +++ /dev/null @@ -1,110 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ixgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ixgbe_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -CFLAGS_ixgbe_rxtx.o += -diag-disable 3656 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_ixgbe_common.o += -Wno-unused-but-set-variable -CFLAGS_ixgbe_x550.o += -Wno-unused-but-set-variable -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ixgbe_x550.o += -Wno-maybe-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 50 && echo 1), 1) -CFLAGS_ixgbe_common.o += -Wno-logical-not-parentheses -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x540.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x550.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_hv_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_flow.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_BYPASS),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_bypass.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599_bypass.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ipsec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += rte_pmd_ixgbe.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf_representor.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)-include := rte_pmd_ixgbe.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile deleted file mode 100644 index 0694ffd021..0000000000 --- a/drivers/net/kni/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_kni.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_kni_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += rte_eth_kni.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile deleted file mode 100644 index d7fda7f527..0000000000 --- a/drivers/net/liquidio/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_lio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_liquidio_version.map - -VPATH += $(RTE_SDK)/drivers/net/liquidio/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_23xx_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_mbox.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/memif/Makefile b/drivers/net/memif/Makefile deleted file mode 100644 index 3bf4ddce4c..0000000000 --- a/drivers/net/memif/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 Cisco Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_memif.a - -EXPORT_MAP := rte_pmd_memif_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs -lrte_net -LDLIBS += -lrte_hash -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += rte_eth_memif.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif_socket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile deleted file mode 100644 index 02e9b2ec07..0000000000 --- a/drivers/net/mlx4/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012 6WIND S.A. -# Copyright 2012 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx4.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx4_glue.so -LIB_GLUE_VERSION = 18.02.0 - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_flow.c -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_glue.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_utils.c - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib += $(LIB_GLUE) -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX4_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX4_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_mlx4_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx4 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx4_version.map -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX4_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX4_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx4_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS += -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx4_autoconf.h.new: FORCE - -mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q : > '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_BUF_ALLOCATORS \ - infiniband/mlx4dv.h \ - enum MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_UAR_MMAP_OFFSET \ - infiniband/mlx4dv.h \ - enum MLX4DV_QP_MASK_UAR_MMAP_OFFSET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_WQE_LSO_SEG \ - infiniband/mlx4dv.h \ - type 'struct mlx4_wqe_lso_seg' \ - $(AUTOCONF_OUTPUT) - -# Create mlx4_autoconf.h or update it in case it differs from the new one. - -mlx4_autoconf.h: mlx4_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD):.c=.o): mlx4_autoconf.h - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): mlx4_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx4 - -mlx4_glue.o: mlx4_autoconf.h - -endif - -clean_mlx4: FORCE - $Q rm -f -- mlx4_autoconf.h mlx4_autoconf.h.new - $Q rm -f -- mlx4_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx4 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile deleted file mode 100644 index 568c772415..0000000000 --- a/drivers/net/mlx5/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. -# Copyright 2015 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txpp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) \ - $(CONFIG_RTE_ARCH_PPC_64) \ - $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx_vec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxmode.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_vlan.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - diff --git a/drivers/net/mvneta/Makefile b/drivers/net/mvneta/Makefile deleted file mode 100644 index 41e50479ff..0000000000 --- a/drivers/net/mvneta/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# Copyright(c) 2018 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvneta.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvneta_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_SIZE=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta_ethdev.c mvneta_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mvpp2/Makefile b/drivers/net/mvpp2/Makefile deleted file mode 100644 index 8a3ec93a60..0000000000 --- a/drivers/net/mvpp2/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvpp2.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvpp2_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_qos.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_tm.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/netvsc/Makefile b/drivers/net/netvsc/Makefile deleted file mode 100644 index da8991584a..0000000000 --- a/drivers/net/netvsc/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_netvsc.a - -CFLAGS += -O3 $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_netvsc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rndis.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_nvs.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_vf.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vmbus - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfb/Makefile b/drivers/net/nfb/Makefile deleted file mode 100644 index e92d29dcd3..0000000000 --- a/drivers/net/nfb/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Cesnet -# Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfb.a - -INCLUDES :=-I$(SRCDIR) - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags netcope-common) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) - -EXPORT_MAP := rte_pmd_nfb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rxmode.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfp/Makefile b/drivers/net/nfp/Makefile deleted file mode 100644 index 289b3a60e3..0000000000 --- a/drivers/net/nfp/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_nfp_version.map - -VPATH += $(SRCDIR)/nfpcore - -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cppcore.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cpp_pcie_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mutex.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_resource.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mip.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nffw.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_hwinfo.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_rtsym.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_cmds.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_eth.c - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_net.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile deleted file mode 100644 index f51150c131..0000000000 --- a/drivers/net/null/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 IGEL Co.,Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_null.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_null_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx/Makefile b/drivers/net/octeontx/Makefile deleted file mode 100644 index c4db878009..0000000000 --- a/drivers/net/octeontx/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ - -EXPORT_MAP := rte_pmd_octeontx_version.map - -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkovf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkivf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_bgx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev_ops.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_octeontx_rxtx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -else -CFLAGS_octeontx_rxtx.o += -O3 -ffast-math -endif - -else -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_common_octeontx -LDLIBS += -lrte_mempool_octeontx -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile deleted file mode 100644 index 0de43e36af..0000000000 --- a/drivers/net/octeontx2/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -flax-vector-conversions -endif - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \ - otx2_rx.c \ - otx2_tx.c \ - otx2_tm.c \ - otx2_rss.c \ - otx2_mac.c \ - otx2_ptp.c \ - otx2_flow.c \ - otx2_link.c \ - otx2_vlan.c \ - otx2_stats.c \ - otx2_mcast.c \ - otx2_lookup.c \ - otx2_ethdev.c \ - otx2_flow_ctrl.c \ - otx2_flow_parse.c \ - otx2_flow_utils.c \ - otx2_ethdev_irq.c \ - otx2_ethdev_ops.c \ - otx2_ethdev_sec.c \ - otx2_ethdev_debug.c \ - otx2_ethdev_devargs.c - -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal -lrte_net -LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf -lrte_mempool -lm -LDLIBS += -lrte_cryptodev -lrte_eventdev -lrte_security - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile deleted file mode 100644 index f243d1a0fa..0000000000 --- a/drivers/net/pcap/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pcap.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpcap -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_pcap_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += rte_eth_pcap.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pfe/Makefile b/drivers/net/pfe/Makefile deleted file mode 100644 index 75d30b01aa..0000000000 --- a/drivers/net/pfe/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pfe.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK)/drivers/net/pfe/base/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -EXPORT_MAP := rte_pmd_pfe_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif_lib.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif.c - -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile deleted file mode 100644 index 0e8a67b0da..0000000000 --- a/drivers/net/qede/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_qede.a - -CFLAGS += -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_qede_version.map - -# -# OS -# -OS_TYPE := $(shell uname -s) - -# -# CFLAGS -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes -CFLAGS_BASE_DRIVER += -Wno-cast-qual -CFLAGS_BASE_DRIVER += -Wno-unused-function -CFLAGS_BASE_DRIVER += -Wno-unused-variable -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes - -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-value -ifeq ($(OS_TYPE),Linux) -ifeq ($(shell clang -Wno-shift-negative-value -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -endif -endif -endif - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -CFLAGS += -Wno-format-nonliteral -endif -CFLAGS_BASE_DRIVER += -Wno-missing-declarations -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-maybe-uninitialized -endif -CFLAGS_BASE_DRIVER += -Wno-strict-prototypes -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-visibility -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-invalid-source-encoding -CFLAGS_BASE_DRIVER += -Wno-sometimes-uninitialized -ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion -endif -else #ICC -CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant -endif - -# -# Add extra flags for base ecore driver files -# to disable warnings in them -# -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_cxt.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_l2.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sp_commands.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_fw_funcs.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_spq.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_mcp.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_int.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dcbx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += bcm_osal.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sriov.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile deleted file mode 100644 index d6a3dec350..0000000000 --- a/drivers/net/ring/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_ring_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += rte_eth_ring.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_ring.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile deleted file mode 100644 index 20bf343814..0000000000 --- a/drivers/net/sfc/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright(c) 2019-2020 Xilinx, Inc. -# Copyright(c) 2016-2019 Solarflare Communications Inc. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_sfc_efx.a - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by rte_eth_link to uint64_t casts -CFLAGS += -Wno-strict-aliasing - -# Enable extra warnings -CFLAGS += -Wextra - -# More warnings not enabled by above aggregators -CFLAGS += -Wdisabled-optimization - -# Extra CFLAGS for base driver files -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -# Compiler and version dependent flags -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wnested-externs -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wbad-function-cast -CFLAGS_BASE_DRIVER += -Wno-empty-body -else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -# Suppress ICC false positive warning on 'bulk' may be used before its -# value is set -CFLAGS_sfc_ef10_tx.o += -diag-disable 3656 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_pci - -# -# List of base driver object files for which -# special CFLAGS above should be applied -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), \ - $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -EXPORT_MAP := rte_pmd_sfc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_kvargs.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_dp.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_essb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_tx.c - -VPATH += $(SRCDIR)/base - -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_bootcfg.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_crc32.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_lic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tunnel.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += mcdi_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_image.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += hunt_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford2_nic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile deleted file mode 100644 index dabbe13a5f..0000000000 --- a/drivers/net/softnic/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_softnic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_pipeline -lrte_port -lrte_table -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_softnic_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_swq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_link.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_softnic.h - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info Softnic PMD can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -include $(RTE_SDK)/mk/rte.lib.mk - -endif diff --git a/drivers/net/szedata2/Makefile b/drivers/net/szedata2/Makefile deleted file mode 100644 index 675d0938a2..0000000000 --- a/drivers/net/szedata2/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 CESNET - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_szedata2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lsze2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_szedata2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += rte_eth_szedata2.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile deleted file mode 100644 index cbf87af401..0000000000 --- a/drivers/net/tap/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_tap.a - -EXPORT_MAP := rte_pmd_tap_version.map - -# -# TAP_MAX_QUEUES must be a power of 2 -# -ifeq ($(TAP_MAX_QUEUES),) - TAP_MAX_QUEUES = 16 -endif -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += -I. -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_vdev -lrte_gso - -CFLAGS += -DTAP_MAX_QUEUES=$(TAP_MAX_QUEUES) - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += rte_eth_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_netlink.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_tcmsgs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_bpf_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_intr.c - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up tap_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -tap_autoconf.h.new: FORCE - -tap_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_TC_FLOWER \ - linux/pkt_cls.h \ - enum TCA_FLOWER_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_VLAN_ID \ - linux/pkt_cls.h \ - enum TCA_FLOWER_KEY_VLAN_PRIO \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF \ - linux/pkt_cls.h \ - enum TCA_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF_FD \ - linux/pkt_cls.h \ - enum TCA_BPF_FD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF_FD \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_FD \ - $(AUTOCONF_OUTPUT) - -# Create tap_autoconf.h or update it in case it differs from the new one. - -tap_autoconf.h: tap_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP):.c=.o): tap_autoconf.h - -clean_tap: FORCE - $Q rm -f -- tap_autoconf.h tap_autoconf.h.new - -clean: clean_tap diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile deleted file mode 100644 index 149638a499..0000000000 --- a/drivers/net/thunderx/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_thunderx_nicvf.a - -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_thunderx_version.map - -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_bsvf.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_svf.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_nicvf_rxtx.o += -fno-prefetch-loop-arrays -endif -CFLAGS_nicvf_rxtx.o += -Ofast - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vdev_netvsc/Makefile b/drivers/net/vdev_netvsc/Makefile deleted file mode 100644 index 01d26fb798..0000000000 --- a/drivers/net/vdev_netvsc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Properties of the generated library. -LIB = librte_pmd_vdev_netvsc.a -EXPORT_MAP := rte_pmd_vdev_netvsc_version.map - -# Additional compilation flags. -CFLAGS += -O3 -CFLAGS += -g -CFLAGS += -Wall -Wextra -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += $(WERROR_FLAGS) - -# Dependencies. -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_net - -# Source files. -SRCS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vhost/Makefile b/drivers/net/vhost/Makefile deleted file mode 100644 index 0461e29f2c..0000000000 --- a/drivers/net/vhost/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vhost.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_vhost -LDLIBS += -lrte_bus_vdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_vhost_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += rte_eth_vhost.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_vhost.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile deleted file mode 100644 index 102b1deab8..0000000000 --- a/drivers/net/virtio/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -LDLIBS += -lrte_bus_vdev -endif - -EXPORT_MAP := rte_pmd_virtio_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c - -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_sse.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_altivec.c -else ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_neon.c -endif - -ifneq ($(FORCE_DISABLE_AVX512), y) - CC_AVX512_SUPPORT=\ - $(shell $(CC) -march=native -dM -E - </dev/null 2>&1 | \ - sed '/./{H;$$!d} ; x ; /AVX512F/!d; /AVX512BW/!d; /AVX512VL/!d' | \ - grep -q AVX512 && echo 1) -endif - -ifeq ($(CC_AVX512_SUPPORT), 1) -CFLAGS += -DCC_AVX512_SUPPORT -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_packed_avx.c - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVIRTIO_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVIRTIO_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVIRTIO_ICC_UNROLL_PRAGMA -endif -endif - -CFLAGS_virtio_rxtx_packed_avx.o += -mavx512f -mavx512bw -mavx512vl -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -CFLAGS_virtio_rxtx_packed_avx.o += -Wno-zero-length-bounds -endif -endif - -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_user.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/virtio_user_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user_ethdev.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile deleted file mode 100644 index 4390fedee0..0000000000 --- a/drivers/net/vmxnet3/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vmxnet3_uio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_vmxnet3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile deleted file mode 100644 index 80b043eb14..0000000000 --- a/drivers/raw/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# DIRS-$(<configuration>) += <directory> -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += octeontx2_ep - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile deleted file mode 100644 index 227ec4896e..0000000000 --- a/drivers/raw/dpaa2_cmdif/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_cmdif.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV)-include += rte_pmd_dpaa2_cmdif.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile deleted file mode 100644 index 7b2abdddb4..0000000000 --- a/drivers/raw/dpaa2_qdma/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_qdma.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -LDLIBS += -lrte_mempool -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_ring -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV)-include += rte_pmd_dpaa2_qdma.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile deleted file mode 100644 index 371e127f19..0000000000 --- a/drivers/raw/ifpga/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev -CFLAGS += -I$(RTE_SDK)/drivers/net/i40e -CFLAGS += -I$(RTE_SDK)/drivers/net/ipn3ke -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lpthread -LDLIBS += -lfdt -LDLIBS += -lrte_pmd_i40e -LDLIBS += -lrte_pmd_ipn3ke - -EXPORT_MAP := rte_rawdev_ifpga_version.map - -VPATH += $(SRCDIR)/base - -include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/base/Makefile b/drivers/raw/ifpga/base/Makefile deleted file mode 100644 index c5bbcbd5f8..0000000000 --- a/drivers/raw/ifpga/base/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -#SPDX-License-Identifier: BSD-3-Clause -#Copyright(c) 2010-2018 Intel Corporation - -ifneq ($(CONFIG_RTE_LIBRTE_EAL),) -OSDEP := osdep_rte -else -OSDEP := osdep_raw -endif - -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev/base/$(OSDEP) - -SRCS-y += ifpga_api.c -SRCS-y += ifpga_enumerate.c -SRCS-y += ifpga_feature_dev.c -SRCS-y += ifpga_fme.c -SRCS-y += ifpga_fme_iperf.c -SRCS-y += ifpga_fme_dperf.c -SRCS-y += ifpga_fme_error.c -SRCS-y += ifpga_port.c -SRCS-y += ifpga_port_error.c -SRCS-y += opae_hw_api.c -SRCS-y += opae_ifpga_hw_api.c -SRCS-y += opae_debug.c -SRCS-y += ifpga_fme_pr.c -SRCS-y += opae_spi.c -SRCS-y += opae_spi_transaction.c -SRCS-y += opae_intel_max10.c -SRCS-y += opae_i2c.c -SRCS-y += opae_at24_eeprom.c -SRCS-y += opae_eth_group.c - -SRCS-y += $(wildcard $(SRCDIR)/base/$(OSDEP)/*.c) diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile deleted file mode 100644 index 1609fe5e6c..0000000000 --- a/drivers/raw/ioat/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_ioat.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_rawdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_rawdev_ioat_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev_test.c - -# export include files -SYMLINK-y-include += rte_ioat_rawdev.h -SYMLINK-y-include += rte_ioat_spec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ntb/Makefile b/drivers/raw/ntb/Makefile deleted file mode 100644 index 8f0bff9b02..0000000000 --- a/drivers/raw/ntb/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ntb.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_rawdev - -EXPORT_MAP := rte_rawdev_ntb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb_hw_intel.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV)-include := rte_pmd_ntb.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_dma/Makefile b/drivers/raw/octeontx2_dma/Makefile deleted file mode 100644 index c64ca3497a..0000000000 --- a/drivers/raw/octeontx2_dma/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_octeontx2_dma.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_dma/ -LDLIBS += -lrte_eal -lrte_rawdev -lrte_bus_pci -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_mempool - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_dma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_ep/Makefile b/drivers/raw/octeontx2_ep/Makefile deleted file mode 100644 index 1a54bf56f0..0000000000 --- a/drivers/raw/octeontx2_ep/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_rawdev_octeontx2_ep.a - -# Build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_ep/ - -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mempool -LDLIBS += -lrte_common_octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_ep_version.map - -# -# All source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_enqdeq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_test.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_vf.c - - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile deleted file mode 100644 index 2ac66fbd45..0000000000 --- a/drivers/raw/skeleton/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_skeleton.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -EXPORT_MAP := rte_rawdev_skeleton_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/regex/Makefile b/drivers/regex/Makefile deleted file mode 100644 index 906b20546f..0000000000 --- a/drivers/regex/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/regex/mlx5/Makefile b/drivers/regex/mlx5/Makefile deleted file mode 100644 index 11e3325feb..0000000000 --- a/drivers/regex/mlx5/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_regex.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_rxp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_devx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_control.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_fastpath.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_regexdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_regex_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile deleted file mode 100644 index 6e8835948e..0000000000 --- a/drivers/vdpa/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc -endif - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/vdpa/ifc/Makefile b/drivers/vdpa/ifc/Makefile deleted file mode 100644 index b468bfdbdd..0000000000 --- a/drivers/vdpa/ifc/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ifc.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci -LDLIBS += -lrte_kvargs - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ifc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile deleted file mode 100644 index d46699fbc9..0000000000 --- a/drivers/vdpa/mlx5/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_vdpa.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_mem.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_event.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_virtq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_steer.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_lm.c - - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5_vdpa -CFLAGS += -I$(RTE_SDK)/lib/librte_sched -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lrte_eal -lrte_vhost -lrte_kvargs -lrte_pci -lrte_sched -LDLIBS += -pthread - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_vdpa_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/examples/Makefile b/examples/Makefile deleted file mode 100644 index b7e99a2f78..0000000000 --- a/examples/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 6WIND S.A. - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond -DIRS-y += cmdline -ifeq ($(CONFIG_RTE_LIBRTE_POWER),y) -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor -endif -DIRS-y += ethtool -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify -DIRS-y += flow_filtering -DIRS-y += helloworld -ifeq ($(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += ip_pipeline -ifeq ($(CONFIG_RTE_LIBRTE_LPM),y) -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_reassembly -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_fragmentation -endif -ifeq ($(CONFIG_RTE_LIBRTE_ACL)$(CONFIG_RTE_LIBRTE_HASH)$(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_SECURITY),yyyy) -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += ipsec-secgw -endif -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += ipv4_multicast -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni -DIRS-y += l2fwd -DIRS-y += l2fwd-event -ifneq ($(PQOS_INSTALL_PATH),) -DIRS-y += l2fwd-cat -endif -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += l2fwd-crypto -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += l2fwd-jobstats -DIRS-y += l2fwd-keepalive -DIRS-y += l2fwd-keepalive/ka-agent -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += l3fwd -endif -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl -ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy) -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power -endif -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH),y) -DIRS-y += l3fwd-graph -endif -DIRS-y += link_status_interrupt -DIRS-y += multi_process -DIRS-y += ntb -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -DIRS-y += performance-thread -endif -DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient -DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched -DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks -DIRS-y += service_cores -DIRS-y += skeleton -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination -endif -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vdpa vhost_blk -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto -endif -DIRS-y += vmdq -DIRS-y += vmdq_dcb -ifeq ($(CONFIG_RTE_LIBRTE_POWER), y) -ifeq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -DIRS-y += vm_power_manager -else -$(info vm_power_manager requires libvirt >= 0.9.3) -endif -endif - -DIRS-y += eventdev_pipeline - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/kernel/Makefile b/kernel/Makefile deleted file mode 100644 index 5d51fd94bb..0000000000 --- a/kernel/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/Makefile b/kernel/freebsd/Makefile deleted file mode 100644 index 522d3f68ff..0000000000 --- a/kernel/freebsd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += contigmem -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += nic_uio - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/contigmem/Makefile b/kernel/freebsd/contigmem/Makefile deleted file mode 100644 index 428a7edee5..0000000000 --- a/kernel/freebsd/contigmem/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = contigmem - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := contigmem.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/freebsd/nic_uio/Makefile b/kernel/freebsd/nic_uio/Makefile deleted file mode 100644 index 376ef3a3ab..0000000000 --- a/kernel/freebsd/nic_uio/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = nic_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := nic_uio.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/linux/Makefile b/kernel/linux/Makefile deleted file mode 100644 index c2c45a3e67..0000000000 --- a/kernel/linux/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EAL_IGB_UIO) += igb_uio -DIRS-$(CONFIG_RTE_KNI_KMOD) += kni - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/linux/igb_uio/Makefile b/kernel/linux/igb_uio/Makefile deleted file mode 100644 index f83bcc7c69..0000000000 --- a/kernel/linux/igb_uio/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = igb_uio -MODULE_PATH = drivers/net/igb_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=100 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := igb_uio.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile deleted file mode 100644 index 595bac2612..0000000000 --- a/kernel/linux/kni/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = rte_kni - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -MODULE_CFLAGS += -Wall -Werror - --include /etc/lsb-release - -ifeq ($(DISTRIB_ID),Ubuntu) -MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE)) -UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \ - | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1) -MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))" -endif - -# -# all source are stored in SRCS-y -# -SRCS-y := kni_misc.c -SRCS-y += kni_net.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/lib/Makefile b/lib/Makefile deleted file mode 100644 index 8f5b68a2d4..0000000000 --- a/lib/Makefile +++ /dev/null @@ -1,138 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DIRS-y += librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal -DEPDIRS-librte_eal := librte_kvargs librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci -DEPDIRS-librte_pci := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring -DEPDIRS-librte_ring := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_STACK) += librte_stack -DEPDIRS-librte_stack := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += librte_mempool -DEPDIRS-librte_mempool := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf -DEPDIRS-librte_mbuf := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer -DEPDIRS-librte_timer := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile -DEPDIRS-librte_cfgfile := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline -DEPDIRS-librte_cmdline := librte_eal librte_net -DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev -DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring -DEPDIRS-librte_ethdev += librte_mbuf -DEPDIRS-librte_ethdev += librte_kvargs -DEPDIRS-librte_ethdev += librte_meter -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev -DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev -DEPDIRS-librte_cryptodev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_cryptodev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_SECURITY) += librte_security -DEPDIRS-librte_security := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_security += librte_ethdev -DEPDIRS-librte_security += librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += librte_compressdev -DEPDIRS-librte_compressdev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_compressdev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += librte_regexdev -DEPDIRS-librte_regexdev := librte_eal librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += librte_eventdev -DEPDIRS-librte_eventdev := librte_eal librte_ring librte_ethdev librte_hash \ - librte_mempool librte_timer librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += librte_rawdev -DEPDIRS-librte_rawdev := librte_eal librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost -DEPDIRS-librte_vhost := librte_eal librte_mempool librte_mbuf librte_ethdev \ - librte_net librte_hash librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash -DEPDIRS-librte_hash := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += librte_efd -DEPDIRS-librte_efd := librte_eal librte_ring librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RIB) += librte_rib -DEPDIRS-librte_rib := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += librte_fib -DEPDIRS-librte_fib := librte_eal librte_rib -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm -DEPDIRS-librte_lpm := librte_eal librte_hash librte_rcu -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl -DEPDIRS-librte_acl := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMBER) += librte_member -DEPDIRS-librte_member := librte_eal librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_NET) += librte_net -DEPDIRS-librte_net := librte_mbuf librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += librte_ip_frag -DEPDIRS-librte_ip_frag := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_ip_frag += librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_GRO) += librte_gro -DEPDIRS-librte_gro := librte_eal librte_mbuf librte_ethdev librte_net -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += librte_jobstats -DEPDIRS-librte_jobstats := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_METRICS) += librte_metrics -DEPDIRS-librte_metrics := librte_eal librte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -DEPDIRS-librte_metrics += librte_telemetry -endif -DIRS-$(CONFIG_RTE_LIBRTE_BITRATE) += librte_bitratestats -DEPDIRS-librte_bitratestats := librte_eal librte_metrics librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += librte_latencystats -DEPDIRS-librte_latencystats := librte_eal librte_metrics librte_ethdev librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += librte_power -DEPDIRS-librte_power := librte_eal librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_METER) += librte_meter -DEPDIRS-librte_meter := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += librte_flow_classify -DEPDIRS-librte_flow_classify := librte_net librte_table librte_acl -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched -DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net -DEPDIRS-librte_sched += librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor -DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port -DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_port += librte_ip_frag librte_sched librte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DEPDIRS-librte_port += librte_kni -endif -DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table -DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_table += librte_port librte_lpm librte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -DEPDIRS-librte_table += librte_acl -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline -DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_pipeline += librte_table librte_port -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder -DEPDIRS-librte_reorder := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += librte_pdump -DEPDIRS-librte_pdump := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_GSO) += librte_gso -DEPDIRS-librte_gso := librte_eal librte_mbuf librte_ethdev librte_net -DEPDIRS-librte_gso += librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_BPF) += librte_bpf -DEPDIRS-librte_bpf := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += librte_ipsec -DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security \ - librte_net librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RCU) += librte_rcu -DEPDIRS-librte_rcu := librte_eal librte_ring - -DIRS-$(CONFIG_RTE_LIBRTE_GRAPH) += librte_graph -DEPDIRS-librte_graph := librte_eal - -DIRS-$(CONFIG_RTE_LIBRTE_NODE) += librte_node -DEPDIRS-librte_node := librte_graph librte_lpm librte_ethdev librte_mbuf - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni -endif -DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_kni += librte_pci - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile deleted file mode 100644 index f4332b0448..0000000000 --- a/lib/librte_acl/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_acl.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_acl_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += tb_mem.c - -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += rte_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_bld.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_gen.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c -CFLAGS_acl_run_neon.o += -flax-vector-conversions -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_acl_run_neon.o += -Wno-maybe-uninitialized -endif -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c -endif - -# -# If the compiler supports AVX2 instructions, -# then add support for AVX2 classify method. -# - -#check if flag for AVX2 is already on, if not set it up manually -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_acl_run_avx2.o += -march=core-avx2 - else - CFLAGS_acl_run_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_avx2.c - CFLAGS_rte_acl.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include := rte_acl_osdep.h -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include += rte_acl.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bbdev/Makefile b/lib/librte_bbdev/Makefile deleted file mode 100644 index 9d7576b358..0000000000 --- a/lib/librte_bbdev/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bbdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -# library source files -SRCS-y += rte_bbdev.c - -# export include files -SYMLINK-y-include += rte_bbdev_op.h -SYMLINK-y-include += rte_bbdev.h -SYMLINK-y-include += rte_bbdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_bbdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bitratestats/Makefile b/lib/librte_bitratestats/Makefile deleted file mode 100644 index 4862c44b83..0000000000 --- a/lib/librte_bitratestats/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bitratestats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev - -EXPORT_MAP := rte_bitratestats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) := rte_bitrate.c - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_BITRATE)-include += rte_bitrate.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bpf/Makefile b/lib/librte_bpf/Makefile deleted file mode 100644 index 3be6750432..0000000000 --- a/lib/librte_bpf/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bpf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_net -lrte_eal -LDLIBS += -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -LDLIBS += -lelf -endif - -EXPORT_MAP := rte_bpf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_exec.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_pkt.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_validate.c -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load_elf.c -endif -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_arm64.c -endif - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += bpf_def.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf_ethdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile deleted file mode 100644 index 7c10a4e56c..0000000000 --- a/lib/librte_cfgfile/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_cfgfile.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(SRCDIR)/../librte_eal/include -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_cfgfile_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CFGFILE) += rte_cfgfile.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_CFGFILE)-include += rte_cfgfile.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile deleted file mode 100644 index 619d9a2426..0000000000 --- a/lib/librte_cmdline/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cmdline.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -EXPORT_MAP := rte_cmdline_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_rdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c - -LDLIBS += -lrte_net -lrte_eal - -# install includes -INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h -INCS += cmdline_parse_etheraddr.h cmdline_parse_string.h cmdline_rdline.h -INCS += cmdline_vt100.h cmdline_socket.h cmdline_cirbuf.h cmdline_parse_portlist.h -SYMLINK-$(CONFIG_RTE_LIBRTE_CMDLINE)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_compressdev/Makefile b/lib/librte_compressdev/Makefile deleted file mode 100644 index 53679d69b8..0000000000 --- a/lib/librte_compressdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_compressdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_kvargs - -# library source files -SRCS-y += rte_compressdev.c rte_compressdev_pmd.c rte_comp.c - -# export include files -SYMLINK-y-include += rte_comp.h -SYMLINK-y-include += rte_compressdev.h -# export include files (for PMDs) -SYMLINK-y-include += rte_compressdev_pmd.h -SYMLINK-y-include += rte_compressdev_internal.h - -# versioning export map -EXPORT_MAP := rte_compressdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile deleted file mode 100644 index 73e77a27c6..0000000000 --- a/lib/librte_cryptodev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cryptodev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_kvargs - -# library source files -SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c - -# export include files -SYMLINK-y-include += rte_crypto.h -SYMLINK-y-include += rte_crypto_asym.h -SYMLINK-y-include += rte_crypto_sym.h -SYMLINK-y-include += rte_cryptodev.h -SYMLINK-y-include += rte_cryptodev_pmd.h -SYMLINK-y-include += rte_cryptodev_trace.h -SYMLINK-y-include += rte_cryptodev_trace_fp.h - -# versioning export map -EXPORT_MAP := rte_cryptodev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile deleted file mode 100644 index fc32fb3a8f..0000000000 --- a/lib/librte_distributor/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_distributor.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_distributor_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c -else -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_generic.c -endif - - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR)-include := rte_distributor.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile deleted file mode 100644 index 2fda40d230..0000000000 --- a/lib/librte_eal/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += include -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DEPDIRS-linux := include -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd -DEPDIRS-freebsd := include - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile deleted file mode 100644 index 9a89556742..0000000000 --- a/lib/librte_eal/freebsd/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lexecinfo -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry - -EXPORT_MAP := ../rte_eal_version.map - -# specific to freebsd exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -CFLAGS_eal_hpet.o += -Wno-return-type -endif - -INC := rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/include/Makefile b/lib/librte_eal/include/Makefile deleted file mode 100644 index eb99190d10..0000000000 --- a/lib/librte_eal/include/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := \ - $(sort $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/*.h))) - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include/generic := \ - $(sort $(addprefix generic/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/generic/*.h)))) - -ARCH_DIR ?= $(RTE_ARCH) -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \ - $(sort $(addprefix ../$(ARCH_DIR)/include/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include/*.h)))) - -include $(RTE_SDK)/mk/rte.install.mk diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile deleted file mode 100644 index 9939b3d147..0000000000 --- a/lib/librte_eal/linux/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -ldl -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrt -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry -ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) -LDLIBS += -lnuma -endif - -EXPORT_MAP := ../rte_eal_version.map - -# specific to linux exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio_mp_sync.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dynmem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -endif - -INC := rte_kni_common.h -INC += rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_efd/Makefile b/lib/librte_efd/Makefile deleted file mode 100644 index 2dc97132e0..0000000000 --- a/lib/librte_efd/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_efd.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring -lrte_hash - -EXPORT_MAP := rte_efd_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_EFD) := rte_efd.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_EFD)-include := rte_efd.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile deleted file mode 100644 index 47747150b2..0000000000 --- a/lib/librte_ethdev/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_ethdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_kvargs -lrte_meter -lrte_telemetry - -EXPORT_MAP := rte_ethdev_version.map - -SRCS-y += ethdev_private.c -SRCS-y += rte_ethdev.c -SRCS-y += rte_class_eth.c -SRCS-y += rte_flow.c -SRCS-y += rte_tm.c -SRCS-y += rte_mtr.c -SRCS-y += ethdev_profile.c -SRCS-y += ethdev_trace_points.c - -# -# Export include files -# -SYMLINK-y-include += rte_ethdev.h -SYMLINK-y-include += rte_ethdev_driver.h -SYMLINK-y-include += rte_ethdev_core.h -SYMLINK-y-include += rte_ethdev_pci.h -SYMLINK-y-include += rte_ethdev_trace.h -SYMLINK-y-include += rte_ethdev_trace_fp.h -SYMLINK-y-include += rte_ethdev_vdev.h -SYMLINK-y-include += rte_eth_ctrl.h -SYMLINK-y-include += rte_dev_info.h -SYMLINK-y-include += rte_flow.h -SYMLINK-y-include += rte_flow_driver.h -SYMLINK-y-include += rte_tm.h -SYMLINK-y-include += rte_tm_driver.h -SYMLINK-y-include += rte_mtr.h -SYMLINK-y-include += rte_mtr_driver.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile deleted file mode 100644 index 0715256bb4..0000000000 --- a/lib/librte_eventdev/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_eventdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif -LDLIBS += -lrte_eal -lrte_ring -lrte_ethdev -lrte_hash -lrte_mempool -lrte_timer -LDLIBS += -lrte_mbuf -lrte_cryptodev -lpthread - -# library source files -SRCS-y += rte_eventdev.c -SRCS-y += rte_event_ring.c -SRCS-y += eventdev_trace_points.c -SRCS-y += rte_event_eth_rx_adapter.c -SRCS-y += rte_event_timer_adapter.c -SRCS-y += rte_event_crypto_adapter.c -SRCS-y += rte_event_eth_tx_adapter.c - -# export include files -SYMLINK-y-include += rte_eventdev.h -SYMLINK-y-include += rte_eventdev_pmd.h -SYMLINK-y-include += rte_eventdev_pmd_pci.h -SYMLINK-y-include += rte_eventdev_pmd_vdev.h -SYMLINK-y-include += rte_eventdev_trace.h -SYMLINK-y-include += rte_eventdev_trace_fp.h -SYMLINK-y-include += rte_event_ring.h -SYMLINK-y-include += rte_event_eth_rx_adapter.h -SYMLINK-y-include += rte_event_timer_adapter.h -SYMLINK-y-include += rte_event_timer_adapter_pmd.h -SYMLINK-y-include += rte_event_crypto_adapter.h -SYMLINK-y-include += rte_event_eth_tx_adapter.h - -# versioning export map -EXPORT_MAP := rte_eventdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_fib/Makefile b/lib/librte_fib/Makefile deleted file mode 100644 index 1dd2a495b1..0000000000 --- a/lib/librte_fib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_fib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_rib - -EXPORT_MAP := rte_fib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FIB) := rte_fib.c rte_fib6.c dir24_8.c trie.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FIB)-include := rte_fib.h rte_fib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_flow_classify/Makefile b/lib/librte_flow_classify/Makefile deleted file mode 100644 index ca3cae82dd..0000000000 --- a/lib/librte_flow_classify/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_flow_classify.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) - -EXPORT_MAP := rte_flow_classify_version.map - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_net -lrte_table -lrte_acl - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify_parse.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY)-include := rte_flow_classify.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_graph/Makefile b/lib/librte_graph/Makefile deleted file mode 100644 index b66279c675..0000000000 --- a/lib/librte_graph/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_graph.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_graph_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += node.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_populate.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph.h -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph_worker.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gro/Makefile b/lib/librte_gro/Makefile deleted file mode 100644 index e848687acd..0000000000 --- a/lib/librte_gro/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gro.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net - -EXPORT_MAP := rte_gro_version.map - -# source files -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += rte_gro.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_vxlan_tcp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GRO)-include += rte_gro.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile deleted file mode 100644 index a34846e920..0000000000 --- a/lib/librte_gso/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gso.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_gso_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile deleted file mode 100644 index ec9f864992..0000000000 --- a/lib/librte_hash/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_hash.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_hash_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_HASH) := rte_cuckoo_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h -endif -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ip_frag/Makefile b/lib/librte_ip_frag/Makefile deleted file mode 100644 index 6b80d9f1f2..0000000000 --- a/lib/librte_ip_frag/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ip_frag.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_hash - -EXPORT_MAP := rte_ip_frag_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ip_frag_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += ip_frag_internal.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IP_FRAG)-include += rte_ip_frag.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ipsec/Makefile b/lib/librte_ipsec/Makefile deleted file mode 100644 index e4c69646b0..0000000000 --- a/lib/librte_ipsec/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ipsec.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_cryptodev -lrte_security -lrte_hash - -EXPORT_MAP := rte_ipsec_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_inb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_outb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += sa.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ses.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ipsec_sad.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_group.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sa.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_jobstats/Makefile b/lib/librte_jobstats/Makefile deleted file mode 100644 index b30d046829..0000000000 --- a/lib/librte_jobstats/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_jobstats.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_jobstats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_JOBSTATS) := rte_jobstats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_JOBSTATS)-include := rte_jobstats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile deleted file mode 100644 index 9d440aa135..0000000000 --- a/lib/librte_kni/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kni.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_kni_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KNI) := rte_kni.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_KNI)-include := rte_kni.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile deleted file mode 100644 index 24b1c3c5b9..0000000000 --- a/lib/librte_kvargs/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kvargs.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_kvargs_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c - -# install includes -INCS := rte_kvargs.h -SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_latencystats/Makefile b/lib/librte_latencystats/Makefile deleted file mode 100644 index b19e0b1788..0000000000 --- a/lib/librte_latencystats/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_latencystats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lm -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev -lrte_mbuf - -EXPORT_MAP := rte_latencystats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) := rte_latencystats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LATENCY_STATS)-include := rte_latencystats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile deleted file mode 100644 index 6f06c5c034..0000000000 --- a/lib/librte_lpm/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_lpm.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_hash -lrte_rcu - -EXPORT_MAP := rte_lpm_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LPM) := rte_lpm.c rte_lpm6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include := rte_lpm.h rte_lpm6.h - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile deleted file mode 100644 index 41ea5496e3..0000000000 --- a/lib/librte_mbuf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mbuf.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_mbuf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c rte_mbuf_pool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) += rte_mbuf_dyn.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_ptype.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_pool_ops.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_dyn.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_member/Makefile b/lib/librte_member/Makefile deleted file mode 100644 index ef9e2faeaf..0000000000 --- a/lib/librte_member/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_member.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_hash - -EXPORT_MAP := rte_member_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += rte_member.c rte_member_ht.c rte_member_vbf.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMBER)-include := rte_member.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile deleted file mode 100644 index 432d6217ec..0000000000 --- a/lib/librte_mempool/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mempool.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_mempool_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops_default.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += mempool_trace_points.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace_fp.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile deleted file mode 100644 index 48366e82b0..0000000000 --- a/lib/librte_meter/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_meter.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_meter_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_METER) := rte_meter.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_METER)-include := rte_meter.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_metrics/Makefile b/lib/librte_metrics/Makefile deleted file mode 100644 index 1264d3bbb0..0000000000 --- a/lib/librte_metrics/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_metrics.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_metrics_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) := rte_metrics.c - -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -SRCS-y += rte_metrics_telemetry.c -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics_telemetry.h - -LDLIBS += -lrte_ethdev -lrte_telemetry -LDLIBS += -ljansson - -CFLAGS += -I$(RTE_SDK)/lib/librte_telemetry/ -endif - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile deleted file mode 100644 index 9830e771b3..0000000000 --- a/lib/librte_net/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_net.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_mbuf -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_net_version.map -SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h rte_higig.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_gtp.h rte_vxlan.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ecpri.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_node/Makefile b/lib/librte_node/Makefile deleted file mode 100644 index 3ec02104d3..0000000000 --- a/lib/librte_node/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_node.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_graph -lrte_mbuf -lrte_lpm -lrte_ethdev -lrte_mempool - -EXPORT_MAP := rte_node_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += null.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += log.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_ctrl.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_lookup.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_rewrite.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_cls.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_drop.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_ip4_api.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_eth_api.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pci/Makefile b/lib/librte_pci/Makefile deleted file mode 100644 index 7943f30cab..0000000000 --- a/lib/librte_pci/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pci.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_pci_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PCI) += rte_pci.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI)-include += rte_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile deleted file mode 100644 index ece8aaacc1..0000000000 --- a/lib/librte_pdump/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pdump.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_pdump_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) := rte_pdump.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PDUMP)-include := rte_pdump.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile deleted file mode 100644 index cfbbd18282..0000000000 --- a/lib/librte_pipeline/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pipeline.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table -LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev - -EXPORT_MAP := rte_pipeline_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := rte_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_port_in_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_table_action.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PIPELINE)-include += rte_pipeline.h rte_port_in_action.h rte_table_action.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile deleted file mode 100644 index 57d2aedbc5..0000000000 --- a/lib/librte_port/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_port.a -ifeq ($(CONFIG_RTE_PORT_PCAP),y) -LDLIBS += -lpcap -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_ip_frag -lrte_sched -lrte_cryptodev -lrte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -LDLIBS += -lrte_kni -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_port_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ring.c -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_frag.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ras.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_fd.c -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_kni.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_source_sink.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sym_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_eventdev.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ring.h -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_frag.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ras.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sched.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_fd.h -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_kni.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_source_sink.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sym_crypto.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_eventdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile deleted file mode 100644 index 3b067b615f..0000000000 --- a/lib/librte_power/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_power.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_timer - -EXPORT_MAP := rte_power_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c power_acpi_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_kvm_vm.c guest_channel.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += rte_power_empty_poll.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_pstate_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_common.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_POWER)-include := rte_power.h rte_power_empty_poll.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rawdev/Makefile b/lib/librte_rawdev/Makefile deleted file mode 100644 index 99f5d2a471..0000000000 --- a/lib/librte_rawdev/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_telemetry - -# library source files -SRCS-y += rte_rawdev.c - -# export include files -SYMLINK-y-include += rte_rawdev.h -SYMLINK-y-include += rte_rawdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_rawdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rcu/Makefile b/lib/librte_rcu/Makefile deleted file mode 100644 index 553bca2ef4..0000000000 --- a/lib/librte_rcu/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Arm Limited - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rcu.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_rcu_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RCU) := rte_rcu_qsbr.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RCU)-include := rte_rcu_qsbr.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_regexdev/Makefile b/lib/librte_regexdev/Makefile deleted file mode 100644 index c123fcaf5c..0000000000 --- a/lib/librte_regexdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_regexdev.a - -EXPORT_MAP := rte_regex_version.map - -# library version -LIBABIVER := 1 - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf - -# library source files -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REGEXDEV) := rte_regexdev.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_driver.h - -# versioning export map -EXPORT_MAP := rte_regexdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_reorder/Makefile b/lib/librte_reorder/Makefile deleted file mode 100644 index 1914411d52..0000000000 --- a/lib/librte_reorder/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_reorder.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -EXPORT_MAP := rte_reorder_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) := rte_reorder.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_REORDER)-include := rte_reorder.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rib/Makefile b/lib/librte_rib/Makefile deleted file mode 100644 index be80ce5d3f..0000000000 --- a/lib/librte_rib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_rib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RIB) := rte_rib.c rte_rib6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_RIB)-include := rte_rib.h rte_rib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile deleted file mode 100644 index 83a9d0840e..0000000000 --- a/lib/librte_ring/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ring.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_ring_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \ - rte_ring_core.h \ - rte_ring_elem.h \ - rte_ring_generic.h \ - rte_ring_c11_mem.h \ - rte_ring_hts.h \ - rte_ring_hts_c11_mem.h \ - rte_ring_peek.h \ - rte_ring_peek_c11_mem.h \ - rte_ring_rts.h \ - rte_ring_rts_c11_mem.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile deleted file mode 100644 index aee93a1205..0000000000 --- a/lib/librte_sched/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_sched.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrt -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_timer - -EXPORT_MAP := rte_sched_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include := rte_sched.h rte_sched_common.h rte_red.h rte_approx.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_security/Makefile b/lib/librte_security/Makefile deleted file mode 100644 index 825eaeff8e..0000000000 --- a/lib/librte_security/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_security.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool - -# library source files -SRCS-y += rte_security.c - -# export include files -SYMLINK-y-include += rte_security.h -SYMLINK-y-include += rte_security_driver.h - -# versioning export map -EXPORT_MAP := rte_security_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_stack/Makefile b/lib/librte_stack/Makefile deleted file mode 100644 index 020ef102b5..0000000000 --- a/lib/librte_stack/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_stack.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_stack_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_STACK) := rte_stack.c \ - rte_stack_std.c \ - rte_stack_lf.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_STACK)-include := rte_stack.h \ - rte_stack_std.h \ - rte_stack_lf.h \ - rte_stack_lf_generic.h \ - rte_stack_lf_c11.h \ - rte_stack_lf_stubs.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_table/Makefile b/lib/librte_table/Makefile deleted file mode 100644 index 6ad8a6b17d..0000000000 --- a/lib/librte_table/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_table.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_port -LDLIBS += -lrte_lpm -lrte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -LDLIBS += -lrte_acl -endif - -EXPORT_MAP := rte_table_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm_ipv6.c -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_acl.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_cuckoo.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key8.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key16.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key32.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_ext.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_lru.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_array.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_stub.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm_ipv6.h -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_acl.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_cuckoo.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func_arm64.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_x86.h -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_arm64.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_array.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_stub.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_telemetry/Makefile b/lib/librte_telemetry/Makefile deleted file mode 100644 index c62cbd86dc..0000000000 --- a/lib/librte_telemetry/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_telemetry.a - -ARCH_DIR ?= $(RTE_ARCH) - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -CFLAGS += -I$(RTE_SDK)/lib/librte_metrics/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include -CFLAGS += -pthread - -LDLIBS += -lpthread - -EXPORT_MAP := rte_telemetry_version.map - -# library source files -SRCS-y += telemetry.c -SRCS-y += telemetry_data.c -SRCS-y += telemetry_legacy.c - -# export include files -SYMLINK-y-include := rte_telemetry.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile deleted file mode 100644 index 7e95d120c0..0000000000 --- a/lib/librte_timer/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_timer.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_timer_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) := rte_timer.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_TIMER)-include := rte_timer.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile deleted file mode 100644 index 4f2f3e47da..0000000000 --- a/lib/librte_vhost/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_vhost.a - -EXPORT_MAP := rte_vhost_version.map - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I vhost_user -CFLAGS += -fno-strict-aliasing -LDLIBS += -lpthread - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVHOST_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVHOST_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVHOST_ICC_UNROLL_PRAGMA -endif -endif - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -LDLIBS += -lnuma -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \ - vhost_user.c virtio_net.c vdpa.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h \ - rte_vdpa_dev.h rte_vhost_async.h - -# only compile vhost crypto when cryptodev is enabled -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -LDLIBS += -lrte_cryptodev -lrte_hash -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto.c -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost_crypto.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk deleted file mode 100644 index dc8c10a24c..0000000000 --- a/mk/arch/arm/rte.vars.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -ARCH ?= arm -CROSS ?= - -CPU_CFLAGS ?= -marm -munaligned-access -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-littlearm -RTE_OBJCOPY_ARCH = arm - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk deleted file mode 100644 index a75b80c222..0000000000 --- a/mk/arch/arm64/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= arm64 -# common arch dir in eal headers -ARCH_DIR := arm -CROSS ?= - -CPU_CFLAGS ?= -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-littleaarch64 -RTE_OBJCOPY_ARCH = aarch64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk deleted file mode 100644 index c867883f15..0000000000 --- a/mk/arch/i686/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= i386 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m32 -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -melf_i386 -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-i386 -RTE_OBJCOPY_ARCH = i386 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk deleted file mode 100644 index 9f7ab22f42..0000000000 --- a/mk/arch/ppc_64/rte.vars.mk +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -ARCH ?= powerpc -ARCH_DIR := ppc -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-powerpcle -RTE_OBJCOPY_ARCH = powerpc:common64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk deleted file mode 100644 index e1689be9b4..0000000000 --- a/mk/arch/x86_64/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_x32/rte.vars.mk b/mk/arch/x86_x32/rte.vars.mk deleted file mode 100644 index c59b37a2c8..0000000000 --- a/mk/arch/x86_x32/rte.vars.mk +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -mx32 -CPU_LDFLAGS ?= -melf32_x86_64 -#CPU_ASFLAGS ?= -felf64 -# x32 is supported by Linux distribution with gcc4.8 and newer in some -# cases there is backported support in gcc4.6 -ifneq ($(shell echo | $(CC) $(CPU_CFLAGS) -E - 2>/dev/null 1>/dev/null && echo 0), 0) - $(error This version of GCC does not support x32 ABI) -endif - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp deleted file mode 120000 index 69f5cba2c2..0000000000 --- a/mk/exec-env/bsdapp +++ /dev/null @@ -1 +0,0 @@ -freebsd/ \ No newline at end of file diff --git a/mk/exec-env/freebsd/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/freebsd/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk deleted file mode 100644 index 630eb55f73..0000000000 --- a/mk/exec-env/freebsd/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/include - -EXECENV_LDFLAGS = -EXECENV_LDLIBS = -lexecinfo -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -BSDMAKE=/usr/bin/make - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS diff --git a/mk/exec-env/linux/rte.app.mk b/mk/exec-env/linux/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/linux/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk deleted file mode 100644 index 41ef4195b0..0000000000 --- a/mk/exec-env/linux/rte.vars.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/include - -EXECENV_LDLIBS = -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -# For shared libraries -EXECENV_LDFLAGS += -export-dynamic -# Add library to the group to resolve symbols -EXECENV_LDLIBS += -ldl - -# EXECENV_LDLIBS-y applies to lib.so and app linking -# while EXECENV_LDLIBS applies only to app linking. -EXECENV_LDLIBS += $(EXECENV_LDLIBS-y) - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp deleted file mode 120000 index ce5e2c77b2..0000000000 --- a/mk/exec-env/linuxapp +++ /dev/null @@ -1 +0,0 @@ -linux/ \ No newline at end of file diff --git a/mk/internal/rte.build-post.mk b/mk/internal/rte.build-post.mk deleted file mode 100644 index a6b6a9a46a..0000000000 --- a/mk/internal/rte.build-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# build helper .mk - -# fast way, no need to do prebuild and postbuild -ifeq ($(PREBUILD)$(POSTBUILD),) - -_postbuild: $(_BUILD) - @touch _postbuild - -else # slower way - -_prebuild: $(PREBUILD) - @touch _prebuild - -ifneq ($(_BUILD),) -$(_BUILD): _prebuild -else -_BUILD = _prebuild -endif - -_build: $(_BUILD) - @touch _build - -ifneq ($(POSTBUILD),) -$(POSTBUILD): _build -else -POSTBUILD = _build -endif - -_postbuild: $(POSTBUILD) - @touch _postbuild -endif \ No newline at end of file diff --git a/mk/internal/rte.build-pre.mk b/mk/internal/rte.build-pre.mk deleted file mode 100644 index 137612f19b..0000000000 --- a/mk/internal/rte.build-pre.mk +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_BUILD_TARGETS := _prebuild _build _postbuild - -comma := , -linkerprefix = $(subst -Wl$(comma)-L,-L,$(addprefix -Wl$(comma),$1)) diff --git a/mk/internal/rte.clean-post.mk b/mk/internal/rte.clean-post.mk deleted file mode 100644 index 77685edd99..0000000000 --- a/mk/internal/rte.clean-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# clean helper .mk - -# fast way, no need to do preclean and postclean -ifeq ($(PRECLEAN)$(POSTCLEAN),) - -_postclean: $(_CLEAN) - @touch _postclean - -else # slower way - -_preclean: $(PRECLEAN) - @touch _preclean - -ifneq ($(_CLEAN),) -$(_CLEAN): _preclean -else -_CLEAN = _preclean -endif - -_clean: $(_CLEAN) - @touch _clean - -ifneq ($(POSTCLEAN),) -$(POSTCLEAN): _clean -else -POSTCLEAN = _clean -endif - -_postclean: $(POSTCLEAN) - @touch _postclean -endif diff --git a/mk/internal/rte.clean-pre.mk b/mk/internal/rte.clean-pre.mk deleted file mode 100644 index e21607bff9..0000000000 --- a/mk/internal/rte.clean-pre.mk +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_CLEAN_TARGETS := _preclean _clean _postclean diff --git a/mk/internal/rte.compile-post.mk b/mk/internal/rte.compile-post.mk deleted file mode 100644 index 01525bee1b..0000000000 --- a/mk/internal/rte.compile-post.mk +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# no rule no build these files -$(DEPS-y) $(CMDS-y): diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk deleted file mode 100644 index df05b55769..0000000000 --- a/mk/internal/rte.compile-pre.mk +++ /dev/null @@ -1,164 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# Common to rte.lib.mk, rte.app.mk, rte.obj.mk -# - -SRCS-all := $(SRCS-y) $(SRCS-n) $(SRCS-) - -# convert source to obj file -src2obj = $(strip $(patsubst %.c,%.o,\ - $(patsubst %.S,%_s.o,$(1)))) - -# add a dot in front of the file name -dotfile = $(strip $(foreach f,$(1),\ - $(join $(dir $f),.$(notdir $f)))) - -# convert source/obj files into dot-dep filename (does not -# include .S files) -src2dep = $(strip $(call dotfile,$(patsubst %.c,%.o.d, \ - $(patsubst %.S,,$(1))))) -obj2dep = $(strip $(call dotfile,$(patsubst %.o,%.o.d,$(1)))) - -# convert source/obj files into dot-cmd filename -src2cmd = $(strip $(call dotfile,$(patsubst %.c,%.o.cmd, \ - $(patsubst %.S,%_s.o.cmd,$(1))))) -obj2cmd = $(strip $(call dotfile,$(patsubst %.o,%.o.cmd,$(1)))) - -OBJS-y := $(call src2obj,$(SRCS-y)) -OBJS-n := $(call src2obj,$(SRCS-n)) -OBJS- := $(call src2obj,$(SRCS-)) -OBJS-all := $(filter-out $(SRCS-all),$(OBJS-y) $(OBJS-n) $(OBJS-)) - -DEPS-y := $(call src2dep,$(SRCS-y)) -DEPS-n := $(call src2dep,$(SRCS-n)) -DEPS- := $(call src2dep,$(SRCS-)) -DEPS-all := $(DEPS-y) $(DEPS-n) $(DEPS-) -DEPSTMP-all := $(DEPS-all:%.d=%.d.tmp) - -CMDS-y := $(call src2cmd,$(SRCS-y)) -CMDS-n := $(call src2cmd,$(SRCS-n)) -CMDS- := $(call src2cmd,$(SRCS-)) -CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-) - --include $(DEPS-y) $(CMDS-y) - -# command to compile a .c file to generate an object -ifeq ($(USE_HOST),1) -C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \ - $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)") -else -C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \ - $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)") -endif -CHECK_SYMBOLS_SCRIPT = $(RTE_SDK)/buildtools/check-symbols.sh -CHECK_SYMBOLS = $(CHECK_SYMBOLS_SCRIPT) $(SRCDIR)/$(EXPORT_MAP) $@ - -PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c -PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c -PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@ -PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \ - echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ - $(PMDINFO_GEN) && \ - echo "$(if $V,$(PMDINFO_CC), CC $@.pmd.o)" && \ - $(PMDINFO_CC) && \ - echo "$(if $V,$(PMDINFO_LD), LD $@)" && \ - $(PMDINFO_LD) && \ - mv -f $@.o $@; fi -C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)' -C_TO_O_DO = @set -e; \ - echo $(C_TO_O_DISP); \ - $(C_TO_O) && \ - $(PMDINFO_TO_O) && \ - $(CHECK_SYMBOLS) && \ - echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \ - sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \ - rm -f $(call obj2dep,$(@)).tmp - -# return an empty string if string are equal -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -# return a non-empty string if the dst file does not exist -file_missing = $(call compare,$(wildcard $@),$@) - -# return a non-empty string if cmdline changed -cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1))) - -# return a non-empty string if a dependency file does not exist -depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@)) - -# return an empty string if no prereq is newer than target -# - $^ -> names of all the prerequisites -# - $(wildcard $^) -> every existing prereq -# - $(filter-out $(wildcard $^),$^) -> every prereq that don't -# exist (filter-out removes existing ones from the list) -# - $? -> names of all the prerequisites newer than target -depfile_newer = $(strip $(filter-out FORCE,$? \ - $(filter-out $(wildcard $^),$^))) - -# return 1 if parameter is a non-empty string, else 0 -boolean = $(if $1,1,0) - -# -# Compile .c file if needed -# Note: dep_$$@ is from the .d file and DEP_$$@ can be specified by -# user (by default it is empty) -# -.SECONDEXPANSION: -%.o: %.c $$(wildcard $$(dep_$$@)) $$(DEP_$$(@)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer))") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(C_TO_O)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(C_TO_O_DO)) - -# command to assemble a .S file to generate an object -ifeq ($(USE_HOST),1) -S_TO_O = $(CPP) $(HOST_CPPFLAGS) $($(@)_CPPFLAGS) $(HOST_EXTRA_CPPFLAGS) $< $(@).tmp && \ - $(HOSTAS) $(HOST_ASFLAGS) $($(@)_ASFLAGS) $(HOST_EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," HOSTAS $(@)") -else -S_TO_O = $(CPP) $(CPPFLAGS) $($(@)_CPPFLAGS) $(EXTRA_CPPFLAGS) $< -o $(@).tmp && \ - $(AS) $(ASFLAGS) $($(@)_ASFLAGS) $(EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," AS $(@)") -endif - -S_TO_O_CMD = "cmd_$@ = $(S_TO_O_STR)" -S_TO_O_DO = @set -e; \ - echo $(S_TO_O_DISP); \ - $(S_TO_O) && \ - echo $(S_TO_O_CMD) > $(call obj2cmd,$(@)) - -# -# Compile .S file if needed -# Note: DEP_$$@ can be specified by user (by default it is empty) -# -%_s.o: %.S $$(DEP_$$@) FORCE - @[ ! -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(S_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(S_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(S_TO_O_DO)) diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk deleted file mode 100644 index 98c860628a..0000000000 --- a/mk/internal/rte.extvars.mk +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# directory where sources are located -# -ifdef S -ifeq ("$(origin S)", "command line") -RTE_SRCDIR := $(abspath $(S)) -endif -endif -RTE_SRCDIR ?= $(CURDIR) -export RTE_SRCDIR - -# -# Makefile to call once $(RTE_OUTPUT) is created -# -ifdef M -ifeq ("$(origin M)", "command line") -RTE_EXTMK := $(abspath $(M)) -endif -endif -RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST))) -export RTE_EXTMK - -# RTE_SDK_BIN must point to .config, include/ and lib/. -RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET) -ifeq ($(wildcard $(RTE_SDK_BIN)/.config),) -$(error Cannot find .config in $(RTE_SDK_BIN)) -endif - -# -# Output files wil go in a separate directory: default output is -# $(RTE_SRCDIR)/build -# Output dir can be given as command line using "O=" -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# if we are building an external application, include SDK -# configuration and include project configuration if any -include $(RTE_SDK_BIN)/.config -ifneq ($(wildcard $(RTE_OUTPUT)/.config),) - include $(RTE_OUTPUT)/.config -endif -# remove double-quotes from config names -RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) -RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) -RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) -RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk deleted file mode 100644 index a1aa0ca4ff..0000000000 --- a/mk/internal/rte.install-post.mk +++ /dev/null @@ -1,71 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install helper .mk - -# -# generate rules to install files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define install_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " INSTALL-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)cp -rf $$(<) $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(INSTALL-DIRS-y),\ - $(foreach file,$(INSTALL-y-$(dir)),\ - $(eval $(call install_rule,$(dir),$(file))))) - - -# -# generate rules to install symbolic links of files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define symlink_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " SYMLINK-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)ln -nsf `$(RTE_SDK)/buildtools/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \ - $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(SYMLINK-DIRS-y),\ - $(foreach file,$(SYMLINK-y-$(dir)),\ - $(eval $(call symlink_rule,$(dir),$(file))))) - - -# fast way, no need to do preinstall and postinstall -ifeq ($(PREINSTALL)$(POSTINSTALL),) - -_postinstall: $(_INSTALL) - @touch _postinstall - -else # slower way - -_preinstall: $(PREINSTALL) - @touch _preinstall - -ifneq ($(_INSTALL),) -$(_INSTALL): _preinstall -else -_INSTALL = _preinstall -endif - -_install: $(_INSTALL) - @touch _install - -ifneq ($(POSTINSTALL),) -$(POSTINSTALL): _install -else -POSTINSTALL = _install -endif - -_postinstall: $(POSTINSTALL) - @touch _postinstall -endif diff --git a/mk/internal/rte.install-pre.mk b/mk/internal/rte.install-pre.mk deleted file mode 100644 index 4786d3b28b..0000000000 --- a/mk/internal/rte.install-pre.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# get all variables starting with "INSTALL-y-", and extract the -# installation dir and path -# -INSTALL-y := $(filter INSTALL-y-%,$(.VARIABLES)) -INSTALL-n := $(filter INSTALL-n-%,$(.VARIABLES)) -INSTALL- := $(filter INSTALL--%,$(.VARIABLES)) -INSTALL-DIRS-y := $(patsubst INSTALL-y-%,%,$(INSTALL-y)) -INSTALL-FILES-y := $(foreach i,$(INSTALL-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) -INSTALL-FILES-all := $(foreach i,$(INSTALL-DIRS-y) $(INSTALL-DIRS-n) $(INSTALL-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) - -_INSTALL_TARGETS := _preinstall _install _postinstall - -# -# get all variables starting with "SYMLINK-y-", and extract the -# installation dir and path -# -SYMLINK-y := $(filter SYMLINK-y-%,$(.VARIABLES)) -SYMLINK-n := $(filter SYMLINK-n-%,$(.VARIABLES)) -SYMLINK- := $(filter SYMLINK--%,$(.VARIABLES)) -SYMLINK-DIRS-y := $(patsubst SYMLINK-y-%,%,$(SYMLINK-y)) -SYMLINK-FILES-y := $(foreach i,$(SYMLINK-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) -SYMLINK-FILES-all := $(foreach i,$(SYMLINK-DIRS-y) $(SYMLINK-DIRS-n) $(SYMLINK-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) - -_SYMLINK_TARGETS := _presymlink _symlink _postsymlink diff --git a/mk/machine/armv7a/rte.vars.mk b/mk/machine/armv7a/rte.vars.mk deleted file mode 100644 index 44ebd68dae..0000000000 --- a/mk/machine/armv7a/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv7-a - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -MACHINE_CFLAGS += -mfpu=neon diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk deleted file mode 100644 index 5e3ffc3adf..0000000000 --- a/mk/machine/armv8a/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk deleted file mode 100644 index df08d3b038..0000000000 --- a/mk/machine/default/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=corei7 diff --git a/mk/machine/dpaa/rte.vars.mk b/mk/machine/dpaa/rte.vars.mk deleted file mode 100644 index 75df626ff2..0000000000 --- a/mk/machine/dpaa/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -# To avoid TLS corruption issue. -MACHINE_CFLAGS += -mtls-dialect=trad diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk deleted file mode 100644 index 50342dfa27..0000000000 --- a/mk/machine/emag/rte.vars.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag) diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk deleted file mode 100644 index 39099e760e..0000000000 --- a/mk/machine/hsw/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx2 diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk deleted file mode 100644 index 5b6563742a..0000000000 --- a/mk/machine/ivb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx-i diff --git a/mk/machine/n1sdp/rte.vars.mk b/mk/machine/n1sdp/rte.vars.mk deleted file mode 100644 index 6d69de03c9..0000000000 --- a/mk/machine/n1sdp/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=neoverse-n1) diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk deleted file mode 100644 index 8c96e3fa04..0000000000 --- a/mk/machine/native/rte.vars.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=native - -# On FreeBSD systems, sometimes the correct CPU type is not picked up. -# To get everything to compile, we need SSE4.2 support, so check if that is -# reported by compiler. If not, check if the CPU actually supports it, and if -# so, set the compilation target to be a corei7, minimum target with SSE4.2. -SSE42_SUPPORT=$(shell $(CC) -march=native -dM -E - </dev/null | grep SSE4_2) -ifeq ($(SSE42_SUPPORT),) - MACHINE_CFLAGS = -march=corei7 -endif diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk deleted file mode 100644 index 91de5d9bed..0000000000 --- a/mk/machine/nhm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.mk deleted file mode 100644 index e209cf4920..0000000000 --- a/mk/machine/octeontx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto+lse) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2) diff --git a/mk/machine/power8/rte.vars.mk b/mk/machine/power8/rte.vars.mk deleted file mode 100644 index 00e0834b8a..0000000000 --- a/mk/machine/power8/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = diff --git a/mk/machine/silvermont/rte.vars.mk b/mk/machine/silvermont/rte.vars.mk deleted file mode 100644 index e4f3fe42bd..0000000000 --- a/mk/machine/silvermont/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=silvermont diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk deleted file mode 100644 index efe2f32d70..0000000000 --- a/mk/machine/snb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7-avx diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk deleted file mode 100644 index 047741668c..0000000000 --- a/mk/machine/thunderx/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -mcpu=thunderx diff --git a/mk/machine/thunderx2/rte.vars.mk b/mk/machine/thunderx2/rte.vars.mk deleted file mode 100644 index b80dc8680c..0000000000 --- a/mk/machine/thunderx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99) diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk deleted file mode 100644 index e9bc3f9848..0000000000 --- a/mk/machine/wsm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 -maes -mpclmul diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk deleted file mode 100644 index e632f3139b..0000000000 --- a/mk/machine/xgene1/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a diff --git a/mk/rte.app.mk b/mk/rte.app.mk deleted file mode 100644 index a544259970..0000000000 --- a/mk/rte.app.mk +++ /dev/null @@ -1,509 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation. -# Copyright(c) 2014-2015 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(APP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_INSTALL += $(RTE_OUTPUT)/app/$(APP) $(RTE_OUTPUT)/app/$(APP).map -POSTINSTALL += target-appinstall -_CLEAN = doclean -POSTCLEAN += target-appclean - -ifeq ($(NO_LDSCRIPT),) -LDSCRIPT = $(RTE_LDSCRIPT) -endif - -# Link only the libraries used in the application -LDFLAGS += --as-needed - -# default path for libs -_LDLIBS-y += -L$(RTE_SDK_BIN)/lib - -# -# Order is important: from higher level to lower level -# -_LDLIBS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += -lrte_flow_classify -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += -lrte_pipeline -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += -lrte_table -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += -lrte_port -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --no-whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PDUMP) += -lrte_pdump -_LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor -_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter -_LDLIBS-$(CONFIG_RTE_LIBRTE_FIB) += -lrte_fib -_LDLIBS-$(CONFIG_RTE_LIBRTE_RIB) += -lrte_rib -_LDLIBS-$(CONFIG_RTE_LIBRTE_LPM) += -lrte_lpm -_LDLIBS-$(CONFIG_RTE_LIBRTE_ACL) += -lrte_acl -_LDLIBS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += -lrte_jobstats -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -lrte_metrics -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -ljansson -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_BITRATE) += -lrte_bitratestats -_LDLIBS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += -lrte_latencystats -_LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power - -_LDLIBS-$(CONFIG_RTE_LIBRTE_EFD) += -lrte_efd -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lrte_bpf -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lelf -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPSEC) += -lrte_ipsec - -_LDLIBS-y += --whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE) += -lrte_cfgfile -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRO) += -lrte_gro -_LDLIBS-$(CONFIG_RTE_LIBRTE_GSO) += -lrte_gso -_LDLIBS-$(CONFIG_RTE_LIBRTE_HASH) += -lrte_hash -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lrte_member -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost -_LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs -_LDLIBS-y += -lrte_telemetry -_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf -_LDLIBS-$(CONFIG_RTE_LIBRTE_NET) += -lrte_net -_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lrte_ethdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_BBDEV) += -lrte_bbdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += -lrte_cryptodev -_LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY) += -lrte_security -_LDLIBS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += -lrte_compressdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += -lrte_regexdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += -lrte_eventdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV) += -lrte_rawdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool -_LDLIBS-$(CONFIG_RTE_LIBRTE_STACK) += -lrte_stack -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += -lrte_mempool_octeontx2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI) += -lrte_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrte_eal -_LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline -_LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -_LDLIBS-$(CONFIG_RTE_LIBRTE_RCU) += -lrte_rcu -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRAPH) += -lrte_graph -_LDLIBS-$(CONFIG_RTE_LIBRTE_NODE) += -lrte_node - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni -endif - -OTX-CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -OTX-CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OTX-CPT-y)),y) -_LDLIBS-y += -lrte_common_cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -_LDLIBS-y += -lrte_common_octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -_LDLIBS-y += -lrte_common_octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -_LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk -endif - -DPAAX-y := $(CONFIG_RTE_LIBRTE_DPAA_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_FSLMC_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_ENETC_PMD) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PFE_PMD) -ifeq ($(findstring y,$(DPAAX-y)),y) - _LDLIBS-y += -lrte_common_dpaax -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += -lrte_bus_vdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += -lrte_bus_fslmc -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# plugins (link only if static libraries) - -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += -lrte_mempool_dpaa2 -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += -lrte_pmd_af_xdp -lbpf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += -lrte_pmd_ark -_LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += -lrte_pmd_atlantic -_LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += -lrte_pmd_avp -_LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += -lrte_pmd_axgbe -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += -lrte_pmd_bnxt -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond -_LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += -lrte_pmd_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += -lrte_pmd_enetc -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic -_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += -lrte_pmd_failsafe -_LDLIBS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += -lrte_pmd_hinic -_LDLIBS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += -lrte_pmd_hns3 -_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e -_LDLIBS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += -lrte_pmd_iavf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += -lrte_pmd_ice -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifeq ($(findstring y,$(IAVF-y)),y) -_LDLIBS-y += -lrte_common_iavf -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += -lrte_pmd_igc -_LDLIBS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += -lrte_pmd_ionic -_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += -lrte_pmd_kni -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += -lrte_pmd_lio -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += -lrte_pmd_memif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4 -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -lrte_common_mlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -lrte_pmd_mlx5 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += -lrte_pmd_mlx5_vdpa -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += -lrte_pmd_mlx5_regex -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -_LDLIBS-y += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LIBS_IBVERBS_STATIC = $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -_LDLIBS-y += --no-whole-archive -_LDLIBS-y += $(LIBS_IBVERBS_STATIC) -_LDLIBS-y += --whole-archive -else -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -libverbs -lmlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs -lmlx4 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += -lrte_pmd_mvpp2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += -lrte_pmd_mvneta -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += -lrte_pmd_nfp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += -lrte_pmd_octeontx2 -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap -lpcap -_LDLIBS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += -lrte_pmd_pfe -_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += -lrte_pmd_qede -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += -lrte_pmd_softnic -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += -lrte_pmd_sfc_efx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lrte_pmd_szedata2 -lsze2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += -lrte_pmd_nfb -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += -lrte_pmd_tap -_LDLIBS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += -lrte_pmd_thunderx_nicvf -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += -lrte_pmd_vdev_netvsc -_LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += -lrte_pmd_vhost -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc -endif # $(CONFIG_RTE_EAL_VFIO) -endif # $(CONFIG_RTE_LIBRTE_VHOST) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio - -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMBUS) += -lrte_bus_vmbus -_LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += -lrte_pmd_netvsc - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += -lrte_pmd_bbdev_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += -lrte_pmd_bbdev_fpga_5gnr_fec - -# TURBO SOFTWARE PMD is dependent on the FLEXRAN library -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -# Dependency on the FLEXRAN SDK library if available -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_crc -lcrc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_common -lcommon -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lirc -limf -lstdc++ -lipps -lsvml -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif # CONFIG_RTE_BBDEV_SDK_AVX512 -endif # CONFIG_RTE_BBDEV_SDK_AVX2 -endif # CONFIG_RTE_LIBRTE_BBDEV - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lrte_pmd_aesni_mb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lrte_pmd_aesni_gcm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += -lrte_pmd_ccp -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_SYM) += -lrte_pmd_qat -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM) += -lrte_pmd_qat -lcrypto -endif # CONFIG_RTE_LIBRTE_PMD_QAT -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lrte_pmd_zuc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -lrte_pmd_armv8 -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mvsam_crypto -lmusdk -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += -lrte_pmd_nitrox -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += -lrte_pmd_octeontx_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += -lrte_pmd_octeontx2_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += -lrte_pmd_crypto_scheduler -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_pmd_dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += -lrte_pmd_dpaa_sec -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += -lrte_pmd_caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += -lrte_pmd_virtio_crypto -endif # CONFIG_RTE_LIBRTE_CRYPTODEV - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lrte_pmd_isal_comp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lisal -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += -lrte_pmd_octeontx_zip -# Link QAT driver if it has not been linked yet -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),n) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -endif # CONFIG_RTE_LIBRTE_PMD_QAT_SYM -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lrte_pmd_zlib -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lz -endif # CONFIG_RTE_LIBRTE_COMPRESSDEV - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += -lrte_pmd_skeleton_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += -lrte_pmd_sw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += -lrte_pmd_dsw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += -lrte_pmd_octeontx_ssovf -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += -lrte_pmd_dpaa_event -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += -lrte_pmd_dpaa2_event -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS - -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += -lrte_mempool_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += -lrte_pmd_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += -lrte_pmd_octeontx2_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event -endif # CONFIG_RTE_LIBRTE_EVENTDEV - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_rawdev_skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_rawdev_dpaa2_cmdif -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_rawdev_dpaa2_qdma -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga -ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += -lrte_rawdev_ifpga -lfdt -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += -lrte_pmd_ipn3ke -endif # CONFIG_RTE_LIBRTE_IFPGA_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += -lrte_rawdev_ioat -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_rawdev_ntb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += -lrte_rawdev_octeontx2_dma -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += -lrte_rawdev_octeontx2_ep -endif # CONFIG_RTE_LIBRTE_RAWDEV - -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += --no-whole-archive - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# The static libraries do not know their dependencies. -# So linking with static library requires explicit dependencies. -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrt -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lm -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_PORT_PCAP) += -lpcap -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += $(EXECENV_LDLIBS) - -LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS) $(EXTRA_LDLIBS) - -# all the words except the first one -allbutfirst = $(wordlist 2,$(words $(1)),$(1)) - -# Eliminate duplicates without sorting, only keep the last occurrence -filter-libs = \ - $(if $(1),$(strip\ - $(if \ - $(and \ - $(filter $(firstword $(1)),$(call allbutfirst,$(1))),\ - $(filter -l%,$(firstword $(1)))),\ - ,\ - $(firstword $(1))) \ - $(call filter-libs,$(call allbutfirst,$(1))))) - -LDLIBS := $(call filter-libs,$(LDLIBS)) - -MAPFLAGS = -Map=$@.map --cref - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS)) -else -O_TO_EXE = $(LD) -o $@ $(OBJS-y) \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS) -endif -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," LD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(APP).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Compile executable file if needed -# -$(APP): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(APP)) $(LDSCRIPT) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP): $(APP) - @echo " INSTALL-APP $(APP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP) $(RTE_OUTPUT)/app - -# -# install app map file in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP).map: $(APP) - @echo " INSTALL-MAP $(APP).map" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP).map $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(APP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(APP).cmd $(APP).map - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk -else -include $(RTE_SDK)/mk/target/generic/rte.app.mk -endif - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.bsdmodule.mk b/mk/rte.bsdmodule.mk deleted file mode 100644 index df8bf9ef35..0000000000 --- a/mk/rte.bsdmodule.mk +++ /dev/null @@ -1,89 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# DPDK uses a more up-to-date gcc, so clear the override here. -unexport CC -override CFLAGS = $(MODULE_CFLAGS) - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)if [ ! -f $(notdir BSDmakefile) ]; then ln -nfs $(SRCDIR)/BSDmakefile . ; fi - $(Q)MAKEFLAGS= $(BSDMAKE) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - $(Q)echo INSTALL-MODULE $(MODULE).ko - $(Q)[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - $(Q)cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - $(Q)MAKEFLAGS= $(BSDMAKE) install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - $(Q)$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - $(Q)if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.combinedlib.mk b/mk/rte.combinedlib.mk deleted file mode 100644 index 9d0f935358..0000000000 --- a/mk/rte.combinedlib.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -default: all - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXT:=.so -else -EXT:=.a -endif - -RTE_LIBNAME := dpdk -COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT) - -LIBS := $(filter-out $(COMBINEDLIB), $(sort $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT))))) - -all: FORCE - $(Q)echo "GROUP ( $(LIBS) )" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -# -# Clean all generated files -# -.PHONY: clean -clean: - $(Q)rm -f $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk deleted file mode 100644 index fa87535312..0000000000 --- a/mk/rte.cpuflags.mk +++ /dev/null @@ -1,124 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# this makefile is called from the generic rte.vars.mk and is -# used to set the RTE_CPUFLAG_* environment variables giving details -# of what instruction sets the target cpu supports. - -AUTO_CPUFLAGS := $(shell $(CC) $(MACHINE_CFLAGS) $(WERROR_FLAGS) $(EXTRA_CFLAGS) -dM -E - < /dev/null) - -# adding flags to CPUFLAGS - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE__),) -CPUFLAGS += SSE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE2__),) -CPUFLAGS += SSE2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE3__),) -CPUFLAGS += SSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSSE3__),) -CPUFLAGS += SSSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_1__),) -CPUFLAGS += SSE4_1 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_2__),) -CPUFLAGS += SSE4_2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AES__),) -CPUFLAGS += AES -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PCLMUL__),) -CPUFLAGS += PCLMULQDQ -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) -CPUFLAGS += RDRAND -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) -CPUFLAGS += RDSEED -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),) -CPUFLAGS += FSGSBASE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__F16C__),) -CPUFLAGS += F16C -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX2 -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX512),y) -CPUFLAGS += AVX512F -else -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(FORCE_DISABLE_AVX512),y) -MACHINE_CFLAGS += -mno-avx512f -endif -endif -endif - -# IBM Power CPU flags -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC64__),) -CPUFLAGS += PPC64 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC32__),) -CPUFLAGS += PPC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__vector),) -CPUFLAGS += ALTIVEC -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),) -CPUFLAGS += VSX -endif - -# ARM flags -ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),) -CPUFLAGS += NEON -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRC32),) -CPUFLAGS += CRC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRYPTO),) -CPUFLAGS += AES -CPUFLAGS += PMULL -CPUFLAGS += SHA1 -CPUFLAGS += SHA2 -endif - -MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS)) - -# To strip whitespace -comma:= , -empty:= -space:= $(empty) $(empty) -CPUFLAGSTMP1 := $(addprefix RTE_CPUFLAG_,$(CPUFLAGS)) -CPUFLAGSTMP2 := $(subst $(space),$(comma),$(CPUFLAGSTMP1)) -CPUFLAGS_LIST := -DRTE_COMPILE_TIME_CPUFLAGS=$(CPUFLAGSTMP2) diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk deleted file mode 100644 index 427bb52306..0000000000 --- a/mk/rte.extapp.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.app.mk -endif diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk deleted file mode 100644 index 977873325d..0000000000 --- a/mk/rte.extlib.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -EXTLIB_BUILD := y - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.lib.mk -endif diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk deleted file mode 100644 index c761a5de1e..0000000000 --- a/mk/rte.extobj.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.obj.mk -endif diff --git a/mk/rte.extshared.mk b/mk/rte.extshared.mk deleted file mode 100644 index 64269e1a85..0000000000 --- a/mk/rte.extshared.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - @echo $(RTE_OUTPUT)/lib must be added to /etc/ld.so.conf or \ - LD_LIBRARY_PATH variable to allow binary to link with dynamic library - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.shared.mk -endif diff --git a/mk/rte.extsubdir.mk b/mk/rte.extsubdir.mk deleted file mode 100644 index 0f8ef94c50..0000000000 --- a/mk/rte.extsubdir.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -# output directory -O ?= $(CURDIR) -BASE_OUTPUT ?= $(abspath $(O)) -CUR_SUBDIR ?= . - -.PHONY: all -all: $(DIRS-y) - -.PHONY: clean -clean: $(DIRS-y) - -.PHONY: $(DIRS-y) -$(DIRS-y): - @echo "== $@" - $(Q)$(MAKE) -C $(@) \ - M=$(CURDIR)/$(@)/Makefile \ - O=$(BASE_OUTPUT)/$(CUR_SUBDIR)/$(@)/$(RTE_TARGET) \ - BASE_OUTPUT=$(BASE_OUTPUT) \ - CUR_SUBDIR=$(CUR_SUBDIR)/$(@) \ - S=$(CURDIR)/$(@) \ - $(filter-out $(DIRS-y),$(MAKECMDGOALS)) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) diff --git a/mk/rte.gnuconfigure.mk b/mk/rte.gnuconfigure.mk deleted file mode 100644 index 72e99aafc3..0000000000 --- a/mk/rte.gnuconfigure.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.build-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) -_BUILD = configure -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -configure: - $(Q)cd $(CONFIGURE_PATH) ; \ - ./configure --prefix $(CONFIGURE_PREFIX) $(CONFIGURE_ARGS) ; \ - make ; \ - make install - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)cd $(CONFIGURE_PATH) ; make clean - $(Q)rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.build-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.helper.mk b/mk/rte.helper.mk deleted file mode 100644 index 6e7fd03d7f..0000000000 --- a/mk/rte.helper.mk +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd - -# rte_cc_has_argument -# Usage: MACHINE_CFLAGS += $(call rte_cc_has_argument, -mno-avx512f) -# Return the argument if the argument is supported by the compiler. -# -define rte_cc_has_argument - $(shell $(CC) -E $(1) -xc /dev/null 1>/dev/null 2>/dev/null && echo $(1)) -endef diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk deleted file mode 100644 index 68e32b5780..0000000000 --- a/mk/rte.hostapp.mk +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTAPP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/app/$(HOSTAPP) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_EXE = $(HOSTCC) $(HOST_LDFLAGS) $(LDFLAGS_$(@)) \ - $(EXTRA_HOST_LDFLAGS) -o $@ $(OBJS-y) $(LDLIBS) -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," HOSTLD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTAPP).cmd - -# list of .a files that are linked to this application -LDLIBS_FILES := $(sort $(wildcard \ - $(addprefix $(RTE_OUTPUT)/lib/, \ - $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))))) - -# -# Compile executable file if needed -# -$(HOSTAPP): $(OBJS-y) $(LDLIBS_FILES) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/hostapp -# -$(RTE_OUTPUT)/app/$(HOSTAPP): $(HOSTAPP) - @echo " INSTALL-HOSTAPP $(HOSTAPP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(HOSTAPP) $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTAPP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(HOSTAPP).cmd - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.hostlib.mk b/mk/rte.hostlib.mk deleted file mode 100644 index 0ccaa55f09..0000000000 --- a/mk/rte.hostlib.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTLIB) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/hostlib/$(HOSTLIB) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_A = $(AR) crus $(HOSTLIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," HOSTAR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTLIB).cmd - -# -# Archive objects in .a file if needed -# -$(HOSTLIB): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) - -# -# install lib in $(RTE_OUTPUT)/hostlib -# -$(RTE_OUTPUT)/hostlib/$(HOSTLIB): $(HOSTLIB) - @echo " INSTALL-HOSTLIB $(HOSTLIB)" - @[ -d $(RTE_OUTPUT)/hostlib ] || mkdir -p $(RTE_OUTPUT)/hostlib - $(Q)cp -f $(HOSTLIB) $(RTE_OUTPUT)/hostlib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTLIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.install.mk b/mk/rte.install.mk deleted file mode 100644 index e56daf457c..0000000000 --- a/mk/rte.install.mk +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install-only makefile (no build target) - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: _postinstall - @true - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(INSTALL-FILES-all) - @rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk deleted file mode 100644 index 229ae16814..0000000000 --- a/mk/rte.lib.mk +++ /dev/null @@ -1,156 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -EXTLIB_BUILD ?= n - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION) -SOVER := $(basename $(LIBABIVER)) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB)) -LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) -ifeq ($(EXTLIB_BUILD),n) -CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) -endif -endif - - -_BUILD = $(LIB) -PREINSTALL = $(SYMLINK-FILES-y) -_INSTALL = $(INSTALL-FILES-y) $(RTE_OUTPUT)/lib/$(LIB) -_CLEAN = doclean - -LDLIBS += $(EXECENV_LDLIBS-y) - -.PHONY: all -all: install - -.PHONY: install -ifeq ($(SYMLINK-FILES-y),) -install: build _postinstall -else -install: _preinstall build _postinstall -build: _preinstall -endif - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -# Override the definition of LD here, since we're linking with CC -LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS) -_CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -else -_CPU_LDFLAGS := $(CPU_LDFLAGS) -endif - -O_TO_A = $(AR) crDs $(LIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," AR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - -ifneq ($(CC_SUPPORTS_Z),false) -NO_UNDEFINED := -z defs -endif - -O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \ - -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -o $(LIB) -O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight -O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") -O_TO_S_DO = @set -e; \ - echo $(O_TO_S_DISP); \ - $(O_TO_S) && \ - echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) - --include .$(LIB).cmd - -# -# Archive objects in .a file if needed -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE -ifeq ($(LIBABIVER),) - @echo "Must Specify a $(LIB) ABI version" - @false -endif - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_S_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_S_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_S_DO)) - -else -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) -endif - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(LIB): $(LIB) - @echo " INSTALL-LIB $(LIB)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - $(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/') - $(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \ - ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \ - fi -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(LIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) .$(LIB).cmd $(INSTALL-FILES-all) *.pmd.c *.pmd.o - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.module.mk b/mk/rte.module.mk deleted file mode 100644 index 1ada528a00..0000000000 --- a/mk/rte.module.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - @echo INSTALL-MODULE $(MODULE).ko - @[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - @cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - modules_install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.obj.mk b/mk/rte.obj.mk deleted file mode 100644 index 1641a52e75..0000000000 --- a/mk/rte.obj.mk +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -ifneq ($(OBJ),) -_BUILD = $(OBJ) -else -_BUILD = $(OBJS-y) -endif -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -ifneq ($(OBJ),) -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_O = $(LD) -r -o $(OBJ) $(OBJS-y) -O_TO_O_STR = $(subst ','\'',$(O_TO_O)) #'# fix syntax highlight -O_TO_O_DISP = $(if $(V),"$(O_TO_O_STR)"," LD $(@)") -O_TO_O_CMD = "cmd_$@ = $(O_TO_O_STR)" -O_TO_O_DO = @set -e; \ - echo $(O_TO_O_DISP); \ - $(O_TO_O) && \ - echo $(O_TO_O_CMD) > $(call exe2cmd,$(@)) - --include .$(OBJ).cmd - -# -# Archive objects in .a file if needed -# -$(OBJ): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_O_DO)) -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(OBJ) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk deleted file mode 100644 index d1d57b6695..0000000000 --- a/mk/rte.sdkbuild.mk +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# include rte.vars.mk if config file exists -# -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif - -# allow exec-env specific targets --include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.custom.mk - -buildtools: | lib -kernel: | lib -drivers: | lib buildtools -app: | lib buildtools drivers -test: | lib buildtools drivers - -# -# build and clean targets -# - -CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-)) - -.PHONY: build -build: $(ROOTDIRS-y) - @echo "Build complete [$(RTE_TARGET)]" - @echo "==== NOTE ====" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html for instructions" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "==============" - -.PHONY: clean -clean: $(CLEANDIRS) - @rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod - @[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include - @$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean - @echo Clean complete - -.SECONDEXPANSION: -.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-) -$(ROOTDIRS-y) $(ROOTDIRS-): - @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ - @echo "== Build $@" - $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = drivers ]; then \ - $(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \ - fi - -%_clean: - @echo "== Clean $*" - $(Q)if [ -f $(RTE_SRCDIR)/$*/Makefile -a -d $(BUILDDIR)/$* ]; then \ - $(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* clean ; \ - fi - -RTE_MAKE_SUBTARGET ?= all - -%_sub: $(addsuffix _sub,$(*)) - @echo $(addsuffix _sub,$(*)) - @[ -d $(BUILDDIR)/$* ] || mkdir -p $(BUILDDIR)/$* - @echo "== Build $*" - $(Q)$(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* \ - $(RTE_MAKE_SUBTARGET) - -.PHONY: all -all: build - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk deleted file mode 100644 index f538649f22..0000000000 --- a/mk/rte.sdkconfig.mk +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -.PHONY: showversion -showversion: - @cat $(RTE_SRCDIR)/VERSION - -.PHONY: showversionum -showversionum: - @cat $(RTE_SRCDIR)/VERSION | awk -F '.' '{print $$1$$2}' - -INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ - $(filter-out %app-gcc,$(filter-out %~,\ - $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_*))))))) -INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS)) - -.PHONY: showconfigs -showconfigs: - @$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);) - -.PHONY: notemplate -notemplate: - @printf "No template specified. Use 'make defconfig' or " - @echo "use T=template from the following list:" - @$(MAKE) -rR showconfigs | sed 's,^, ,' - -.PHONY: defconfig -defconfig: - @$(MAKE) config T=$(shell \ - uname -m | awk '{ \ - if ($$0 == "aarch64") { \ - print "arm64-armv8a"} \ - else if ($$0 == "armv7l") { \ - print "arm-armv7a"} \ - else if ($$0 == "ppc64") { \ - print "ppc_64-power8"} \ - else if ($$0 == "amd64") { \ - print "x86_64-native"} \ - else { \ - printf "%s-native", $$0} }' \ - )-$(shell \ - uname | awk '{ \ - if ($$0 == "Linux") { \ - print "linux"} \ - else { \ - print "freebsd"} }' \ - )-$(shell \ - ${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \ - '{ \ - if ($$1 == "cc") { \ - print "gcc" } \ - else { \ - print $$1 } \ - }' \ - ) - -.PHONY: config -ifeq ($(RTE_CONFIG_TEMPLATE),) -config: notemplate -else -config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile - @echo "Configuration done using" \ - $(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE))) -endif - -$(RTE_OUTPUT): - $(Q)mkdir -p $@ - -ifdef NODOTCONF -$(RTE_OUTPUT)/.config: ; -else -# Generate config from template, if there are duplicates keep only the last. -# To do so the temp config is checked for duplicate keys with cut/sort/uniq -# Then for each of those identified duplicates as long as there are more than -# just one left the last match is removed. -# Part of the config includes the version information taken from "VERSION" -# in the repo. This needs to be split into the various parts using sed and awk. -# To ensure correct version comparison, we append ".99" to the version number -# so that the version of a release is higher than that of its rc's. -$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT) - $(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \ - $(CPP) -undef -P -x assembler-with-cpp \ - `cat $(RTE_SRCDIR)/VERSION | \ - sed -e 's/-rc/.-rc./' -e 's/$$/..99/' | \ - awk -F '.' '{print "-D__YEAR="int($$1), "-D__MONTH="int($$2), "-D__MINOR="int($$3), "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \ - -ffreestanding \ - -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \ - config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \ - echo "$$config" | awk -F '=' 'BEGIN {i=1} \ - /^#/ {pos[i++]=$$0} \ - !/^#/ {if (!s[$$1]) {pos[i]=$$0; s[$$1]=i++} \ - else {pos[s[$$1]]=$$0}} END \ - {for (j=1; j<i; j++) print pos[j]}' \ - > $(RTE_OUTPUT)/.config_tmp ; \ - if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config.orig ; \ - fi ; \ - rm -f $(RTE_OUTPUT)/.config_tmp ; \ - else \ - $(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \ - fi -endif - -# generate a Makefile for this build directory -# use a relative path so it will continue to work even if we move the directory -SDK_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_SRCDIR)) \ - $(abspath $(RTE_OUTPUT))) -OUTPUT_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_OUTPUT)) \ - $(abspath $(RTE_SRCDIR))) -$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT) - $(Q)$(RTE_SDK)/buildtools/gen-build-mk.sh $(SDK_RELPATH) > $@ - -# clean installed files, and generate a new config header file -# if NODOTCONF variable is defined, don't try to rebuild .config -$(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config - $(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build - $(Q)mkdir -p $(RTE_OUTPUT)/include - $(Q)$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - -# generate the rte_config.h -.PHONY: headerconfig -headerconfig: $(RTE_OUTPUT)/include/rte_config.h - @true - -# check that .config is present, and if yes, check that rte_config.h -# is up to date -.PHONY: checkconfig -checkconfig: - @if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - echo "No .config in build directory"; \ - exit 1; \ - fi - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk \ - headerconfig NODOTCONF=1 - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk deleted file mode 100644 index 7adeb0e11b..0000000000 --- a/mk/rte.sdkdepdirs.mk +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk deleted file mode 100644 index fd77e41867..0000000000 --- a/mk/rte.sdkdoc.mk +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation. -# Copyright(c) 2013-2015 6WIND S.A. - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with doc target") -endif -endif - -RTE_SPHINX_BUILD = sphinx-build -RTE_PDFLATEX_VERBOSE := --interaction=nonstopmode - -ifndef V -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif -ifeq '$V' '0' -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif - -RTE_PDF_DPI ?= 300 - -RTE_GUIDES := $(filter %/, $(wildcard $(RTE_SDK)/doc/guides/*/)) - -API_EXAMPLES := $(RTE_OUTPUT)/doc/html/examples.dox - -.PHONY: help -help: - @cat $(RTE_SDK)/doc/build-sdk-quick.txt - @$(MAKE) -rR showconfigs | sed 's,^,\t\t\t\t,' - -.PHONY: all -all: api-html guides-html guides-pdf - -.PHONY: clean -clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean - -.PHONY: api-html -api-html: $(API_EXAMPLES) - @echo 'doxygen for API...' - $(Q)mkdir -p $(RTE_OUTPUT)/doc/html - $(Q)(sed -e "s|@VERSION@|`$(MAKE) -rRs showversion`|" \ - -e "s|@API_EXAMPLES@|$(API_EXAMPLES)|" \ - -e "s|@OUTPUT@|$(RTE_OUTPUT)/doc|" \ - -e "s|@HTML_OUTPUT@|html/api|" \ - -e "s|@TOPDIR@|./|g" \ - -e "s|@STRIP_FROM_PATH@|./|g" \ - $(RTE_SDK)/doc/api/doxy-api.conf.in)| \ - doxygen - - $(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css - -.PHONY: api-html-clean -api-html-clean: - $(Q)rm -f $(API_EXAMPLES) - $(Q)rm -rf $(RTE_OUTPUT)/doc/html/api/search - $(Q)rm -f $(RTE_OUTPUT)/doc/html/api/* - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true - -$(API_EXAMPLES): api-html-clean - $(Q)mkdir -p $(@D) - $(Q)doc/api/generate_examples.sh examples $(API_EXAMPLES) - -guides-pdf-clean: guides-pdf-img-clean -guides-pdf-img-clean: - $(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf - -guides-%-clean: - $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true - -guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ; -guides-pdf-%: - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \ - $(RTE_OUTPUT)/doc/pdf/guides/$* - $(if $^,$(Q)rm -f $^) - @echo 'pdflatex processing $@...' - $(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \ - LATEXOPTS=$(RTE_PDFLATEX_VERBOSE) - $(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \ - $(RTE_OUTPUT)/doc/pdf/guides/$*.pdf - -guides-html-prepare: - $(Q)install -D -m0644 $(RTE_SDK)/doc/guides/custom.css \ - $(RTE_OUTPUT)/doc/html/guides/_static/css/custom.css - -guides-%-prepare: ; - -guides-%: guides-%-prepare - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \ - $(RTE_OUTPUT)/doc/$*/guides - -# Each PDF depends on generated images *.pdf from *.svg -$(foreach guide, $(RTE_GUIDES), $(foreach img, $(wildcard $(guide)img/*.svg), \ - $(eval guides-pdf-$(notdir $(guide:/=)): $(img:svg=pdf)))) -%.pdf: %.svg - $(Q)inkscape -d $(RTE_PDF_DPI) -D -f $< -A $@ $(RTE_INKSCAPE_VERBOSE) diff --git a/mk/rte.sdkexamples.mk b/mk/rte.sdkexamples.mk deleted file mode 100644 index 5eeec36494..0000000000 --- a/mk/rte.sdkexamples.mk +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -# examples application are seen as external applications which are -# not part of SDK. -BUILDING_RTE_SDK := -export BUILDING_RTE_SDK - -# Build directory is given with O= -O ?= $(RTE_SDK)/examples - -# Target for which examples should be built. -T ?= * - -# list all available configurations -EXAMPLES_CONFIGS := $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_$(T))) -EXAMPLES_TARGETS := $(addsuffix _examples,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples -examples: $(EXAMPLES_TARGETS) - -%_examples: - @echo ================== Build examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*); \ - fi - -EXAMPLES_CLEAN_TARGETS := $(addsuffix _examples_clean,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples_clean -examples_clean: $(EXAMPLES_CLEAN_TARGETS) - -%_examples_clean: - @echo ================== Clean examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*) clean; \ - fi diff --git a/mk/rte.sdkgcov.mk b/mk/rte.sdkgcov.mk deleted file mode 100644 index ab528b18b8..0000000000 --- a/mk/rte.sdkgcov.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with gcov target") -endif -endif - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -INPUTDIR = $(RTE_OUTPUT) -OUTPUTDIR = $(RTE_OUTPUT)/gcov - -.PHONY: gcovclean -gcovclean: - $(Q)find $(INPUTDIR)/build -name "*.gcno" -o -name "*.gcda" -exec rm {} \; - $(Q)rm -rf $(OUTPUTDIR) - -.PHONY: gcov -gcov: - $(Q)for APP in test ; do \ - mkdir -p $(OUTPUTDIR)/$$APP ; cd $(OUTPUTDIR)/$$APP ; \ - for FIC in `strings $(RTE_OUTPUT)/app/$$APP | grep gcda | sed s,gcda,o,` ; do \ - SUBDIR=`basename $$FIC`;\ - mkdir $$SUBDIR ;\ - cd $$SUBDIR ;\ - $(GCOV) $(RTE_OUTPUT)/app/$$APP -o $$FIC > gcov.log; \ - cd - >/dev/null;\ - done ; \ - cd - >/dev/null; \ - done diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk deleted file mode 100644 index 32bed5d951..0000000000 --- a/mk/rte.sdkinstall.mk +++ /dev/null @@ -1,152 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright 2015 6WIND S.A. - -# Configuration, compilation and installation can be done at once -# with make install T=<config> - -ifdef T # config, build and install combined -# The build directory is T and may be prepended with O -O ?= . -RTE_OUTPUT := $O/$T -else # standard install -# Build directory is given with O= -O ?= build -RTE_OUTPUT := $O -endif - -ifneq ($(MAKECMDGOALS),pre_install) -include $(RTE_SDK)/mk/rte.vars.mk -endif - -ifdef T # defaults with T= will install an almost flat staging tree -export prefix ?= -kerneldir ?= $(prefix)/kmod -else -ifeq ($(RTE_EXEC_ENV),linuxapp) -RTE_EXEC_ENV=linux -endif -ifeq ($(RTE_EXEC_ENV),linux) -kerneldir ?= $(RTE_KERNELDIR:/build=/extra/dpdk) -else -kerneldir ?= /boot/modules -endif -prefix ?= /usr/local -endif -exec_prefix ?= $(prefix) -bindir ?= $(exec_prefix)/bin -sbindir ?= $(exec_prefix)/sbin -libdir ?= $(exec_prefix)/lib -includedir ?= $(prefix)/include/dpdk -datarootdir ?= $(prefix)/share -docdir ?= $(datarootdir)/doc/dpdk -datadir ?= $(datarootdir)/dpdk -mandir ?= $(datarootdir)/man -sdkdir ?= $(datadir) -targetdir ?= $(datadir)/$(RTE_TARGET) - -# The install directories may be staged in DESTDIR - -# Create the directory $1 if not exists -rte_mkdir = test -d $1 || mkdir -p $1 - -# Create the relative symbolic link $2 -> $1 -# May be replaced with --relative option of ln from coreutils-8.16 -rte_symlink = ln -snf $$($(RTE_SDK)/buildtools/relpath.sh $1 $(dir $2)) $2 - -.PHONY: pre_install -pre_install: -ifdef T - $(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - else \ - if [ -f $(RTE_OUTPUT)/.config.orig ] ; then \ - tmp_build=$(RTE_OUTPUT)/.config.tmp; \ - $(MAKE) config O=$$tmp_build; \ - if ! cmp -s $(RTE_OUTPUT)/.config.orig $$tmp_build/.config ; then \ - echo "Conflict: local config and template config have both changed"; \ - exit 1; \ - fi; \ - fi; \ - echo "Using local configuration"; \ - fi - $(Q)$(MAKE) all O=$(RTE_OUTPUT) -endif - -.PHONY: install -install: -ifeq ($(DESTDIR)$(if $T,,+),) - @echo Installation cannot run with T defined and DESTDIR undefined -else - @echo ================== Installing $(DESTDIR)$(prefix)/ - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-kmod - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-doc - @echo Installation in $(DESTDIR)$(prefix)/ complete -endif - -# when installing we want recursive copies preserving timestamps only, no -# preservation of user/group ids or permissions -CP_FLAGS=-dR --preserve=timestamps -TAR_X_FLAGS=--strip-components=1 --keep-newer-files --no-same-owner --no-same-permissions - -install-runtime: - $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp $(CP_FLAGS) $O/lib/* $(DESTDIR)$(libdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $O --exclude 'app/*.map' \ - --exclude app/dpdk-pmdinfogen \ - --exclude 'app/cmdline*' --exclude app/test \ - --exclude app/testacl --exclude app/testpipeline app | \ - tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools) - $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \ - tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ - $(DESTDIR)$(sbindir)/dpdk-devbind) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-pmdinfo.py, \ - $(DESTDIR)$(bindir)/dpdk-pmdinfo) -ifneq ($(wildcard $O/doc/man/*/*.1),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man1) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1 -endif -ifneq ($(wildcard $O/doc/man/*/*.8),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man8) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.8 $(DESTDIR)$(mandir)/man8 -endif - -install-kmod: -ifneq ($(wildcard $O/kmod/*),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) - $(Q)cp $(CP_FLAGS) $O/kmod/* $(DESTDIR)$(kerneldir) -endif - -install-sdk: - $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir)) - $(Q)tar -chf - -C $O include | \ - tar -xf - -C $(DESTDIR)$(includedir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) - $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) - $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app - $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) - $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) - -install-doc: -ifneq ($(wildcard $O/doc/html),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)) - $(Q)tar -cf - -C $O/doc --exclude 'html/guides/.*' html | \ - tar -xf - -C $(DESTDIR)$(docdir) $(TAR_X_FLAGS) -endif -ifneq ($(wildcard $O/doc/*/*/*pdf),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides) - $(Q)cp $(CP_FLAGS) $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides -endif - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/examples $(DESTDIR)$(datadir) diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk deleted file mode 100644 index fbee6e96d9..0000000000 --- a/mk/rte.sdkroot.mk +++ /dev/null @@ -1,115 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif - -RTE_SRCDIR = $(CURDIR) -export RTE_SRCDIR - -BUILDING_RTE_SDK := 1 -export BUILDING_RTE_SDK - -# -# We can specify the configuration template when doing the "make -# config". For instance: make config T=x86_64-native-linux-gcc -# -RTE_CONFIG_TEMPLATE := -ifdef T -ifeq ("$(origin T)", "command line") -RTE_CONFIG_TEMPLATE := $(RTE_SRCDIR)/config/defconfig_$(T) -endif -endif -export RTE_CONFIG_TEMPLATE - -# -# Default output is $(RTE_SRCDIR)/build -# output files wil go in a separate directory -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# the directory where intermediate build files are stored, like *.o, -# *.d, *.cmd, ... -BUILDDIR = $(RTE_OUTPUT)/build -export BUILDDIR - -export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n - -.PHONY: default test-build -default test-build: all - -.PHONY: warning -warning: - @echo - @echo "=========================== WARNING ============================" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "================================================================" - @echo - @test "$(MAKE_PAUSE)" = n || ( \ - echo "This deprecation warning can be passed by adding MAKE_PAUSE=n"; \ - echo "to 'make' command line or as an exported environment variable."; \ - echo "Press enter to continue..."; read junk) - -.PHONY: config defconfig showconfigs showversion showversionum -config: warning -config defconfig showconfigs showversion showversionum: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk $@ - -.PHONY: cscope gtags tags etags -cscope gtags tags etags: - $(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T - -.PHONY: test test-fast test-perf coverage test-drivers test-dump -test test-fast test-perf coverage test-drivers test-dump: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@ - -.PHONY: install -install: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ -install-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ - -.PHONY: doc help -doc: doc-all -help: doc-help -doc-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkdoc.mk $* - -.PHONY: gcov gcovclean -gcov gcovclean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkgcov.mk $@ - -.PHONY: examples examples_clean -examples examples_clean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkexamples.mk $@ - -# all other build targets -%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkroot.mk warning - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkbuild.mk $@ diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk deleted file mode 100644 index 803018ba3a..0000000000 --- a/mk/rte.sdktest.mk +++ /dev/null @@ -1,76 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -DATE := $(shell date '+%Y%m%d-%H%M') -AUTOTEST_DIR := $(RTE_OUTPUT)/autotest-$(DATE) - -DIR := $(shell basename $(RTE_OUTPUT)) - -# -# test: launch auto-tests, very simple for now. -# -.PHONY: test test-fast test-perf test-drivers test-dump coverage - -PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\ - reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\ - barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\ - eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\ - distributor_perf,ring_pmd_perf,pmd_perf,ring_perf -DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\ - cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\ - cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\ - cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\ - cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc -DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\ - dump_log_types,dump_ring,dump_physmem,dump_memzone - -SPACESTR:= -SPACESTR+= -STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST)) -STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST)) -STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST)) - -coverage: BLACKLIST=-$(STRIPPED_PERFLIST) -test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST) -test-perf: WHITELIST=$(STRIPPED_PERFLIST) -test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST) -test-dump: WHITELIST=$(STRIPPED_DUMPLIST) - -test test-fast test-perf test-drivers test-dump: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST); \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ; \ - fi - -# this is a special target to ease the pain of running coverage tests -# this runs all the autotests, cmdline_test script and dpdk-procinfo -coverage: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \ - $(RTE_OUTPUT)/app/cmdline_test; \ - ulimit -S -n 100 ; \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST) ; \ - $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ;\ - fi diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk deleted file mode 100644 index 2b501ddb84..0000000000 --- a/mk/rte.shared.mk +++ /dev/null @@ -1,108 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(SHARED) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/lib/$(SHARED) -_CLEAN = doclean - -# Set fPIC in CFLAGS for .so generation -CFLAGS += -fPIC - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -O_TO_SO = $(CC) $(call linkerprefix,$(LDFLAGS)) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(call linkerprefix,$(LDLIBS)) -else -O_TO_SO = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(LDLIBS) -endif - -O_TO_SO_STR = $(subst ','\'',$(O_TO_SO)) #'# fix syntax highlight -O_TO_SO_DISP = $(if $(V),"$(O_TO_SO_STR)"," LD $(@)") -O_TO_SO_CMD = "cmd_$@ = $(O_TO_SO_STR)" -O_TO_SO_DO = @set -e; \ - echo $(O_TO_SO_DISP); \ - $(O_TO_SO) && \ - echo $(O_TO_SO_CMD) > $(call exe2cmd,$(@)) - --include .$(SHARED).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Archive objects in .so file if needed -# -$(SHARED): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(SHARED)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_SO_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_SO_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_SO_DO)) - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(SHARED): $(SHARED) - @echo " INSTALL-SHARED $(SHARED)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(SHARED) $(RTE_OUTPUT)/lib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(SHARED) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.subdir.mk b/mk/rte.subdir.mk deleted file mode 100644 index d6e64a2460..0000000000 --- a/mk/rte.subdir.mk +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# .mk to build subdirectories -# - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -CLEANDIRS = $(addsuffix _clean,$(DIRS-y) $(DIRS-n) $(DIRS-)) - -VPATH += $(SRCDIR) -_BUILD = $(DIRS-y) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = $(CLEANDIRS) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -.SECONDEXPANSION: -.PHONY: $(DIRS-y) -$(DIRS-y): - @[ -d $(CURDIR)/$@ ] || mkdir -p $(CURDIR)/$@ - @echo "== Build $S/$@" - @$(MAKE) S=$S/$@ -f $(SRCDIR)/$@/Makefile -C $(CURDIR)/$@ all - -.PHONY: clean -clean: _postclean - -%_clean: - @echo "== Clean $S/$*" - @if [ -f $(SRCDIR)/$*/Makefile -a -d $(CURDIR)/$* ]; then \ - $(MAKE) S=$S/$* -f $(SRCDIR)/$*/Makefile -C $(CURDIR)/$* clean ; \ - fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk deleted file mode 100644 index 07b0db127f..0000000000 --- a/mk/rte.vars.mk +++ /dev/null @@ -1,102 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# To be included at the beginning of all RTE user Makefiles. This -# .mk will define the RTE environment variables by including the -# config file of SDK. It also includes the config file from external -# application if any. -# - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif -ifeq ($(wildcard $(RTE_SDK)),) -$(error RTE_SDK variable points to an invalid location) -endif - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -# if we are building SDK, only includes SDK configuration -ifneq ($(BUILDING_RTE_SDK),) - include $(RTE_OUTPUT)/.config - # remove double-quotes from config names - RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) - RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) - RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) - RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) - RTE_SDK_BIN := $(RTE_OUTPUT) -endif - -RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN) - -ifeq ($(BUILDING_RTE_SDK),) -# if we are building an external app/lib, include internal/rte.extvars.mk that will -# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...) -include $(RTE_SDK)/mk/internal/rte.extvars.mk -endif - -CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD) -ifneq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y) - CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_EM_PMD) -endif - -ifeq ($(RTE_ARCH),) -$(error RTE_ARCH is not defined) -endif - -ifeq ($(RTE_MACHINE),) -$(error RTE_MACHINE is not defined) -endif - -ifeq ($(RTE_EXEC_ENV),) -$(error RTE_EXEC_ENV is not defined) -endif - -ifeq ($(RTE_TOOLCHAIN),) -$(error RTE_TOOLCHAIN is not defined) -endif - -# can be overridden by make command line or exported environment variable -RTE_KERNELDIR ?= /lib/modules/$(shell uname -r)/build - -export RTE_TARGET -export RTE_ARCH -export RTE_MACHINE -export RTE_EXEC_ENV -export RTE_TOOLCHAIN - -# developer build automatically enabled in a git tree -ifneq ($(wildcard $(RTE_SDK)/.git),) -RTE_DEVEL_BUILD ?= y -endif - -# SRCDIR is the current source directory -ifdef S -SRCDIR := $(abspath $(RTE_SRCDIR)/$(S)) -else -SRCDIR := $(RTE_SRCDIR) -endif - -# helper: return y if option is set to y, else return an empty string -testopt = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -# helper: return an empty string if option is set, else return y -not = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk -else -include $(RTE_SDK)/mk/target/generic/rte.vars.mk -endif diff --git a/mk/target/generic/rte.app.mk b/mk/target/generic/rte.app.mk deleted file mode 100644 index ed82656f18..0000000000 --- a/mk/target/generic/rte.app.mk +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# define Makefile targets that are specific to an environment. -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.app.mk - -.PHONY: exec-env-appinstall -target-appinstall: exec-env-appinstall - -.PHONY: exec-env-appclean -target-appclean: exec-env-appclean diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk deleted file mode 100644 index 11b0418e55..0000000000 --- a/mk/target/generic/rte.vars.mk +++ /dev/null @@ -1,132 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# This .mk is the generic target rte.var.mk ; it includes .mk for -# the specified machine, architecture, toolchain (compiler) and -# executive environment. -# - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# -ifneq ($(wildcard $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk),) -include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk -else -MACHINE_CFLAGS := -march=$(RTE_MACHINE) -endif - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk - -# Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are -# provided by Kbuild framework. -ifeq ($(KERNELRELEASE),) - -# now that the environment is mostly set up, including the machine type we will -# be passing to the compiler, set up the specific CPU flags based on that info. -include $(RTE_SDK)/mk/rte.cpuflags.mk - -# merge all CFLAGS -CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS) -CFLAGS += $(TARGET_CFLAGS) - -# merge all LDFLAGS -LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFLAGS) -LDFLAGS += $(TARGET_LDFLAGS) - -# merge all ASFLAGS -ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS) -ASFLAGS += $(TARGET_ASFLAGS) - -# add default include and lib paths -CFLAGS += -I$(RTE_OUTPUT)/include -LDFLAGS += -L$(RTE_OUTPUT)/lib - -# add in flag for supporting function versioning. The define is used in meson -# builds to ensure that the user has properly flagged the unit in question as -# using function versioning so it can be built twice - once for static lib and -# then a second time for the shared lib. Since make only builds one library -# type at a time, such precautions aren't necessary, so we can globally define -# the flag -CFLAGS += -DRTE_USE_FUNCTION_VERSIONING - -# always include rte_config.h: the one in $(RTE_OUTPUT)/include is -# the configuration of SDK when $(BUILDING_RTE_SDK) is true, or the -# configuration of the application if $(BUILDING_RTE_SDK) is not -# defined. -ifeq ($(BUILDING_RTE_SDK),1) -# building sdk -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -DALLOW_INTERNAL_API -else -# if we are building an external application, include SDK's lib and -# includes too -CFLAGS += -I$(RTE_SDK_BIN)/include -ifneq ($(wildcard $(RTE_OUTPUT)/include/rte_config.h),) -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -endif -CFLAGS += -include $(RTE_SDK_BIN)/include/rte_config.h -LDFLAGS += -L$(RTE_SDK_BIN)/lib -endif - -# always define _GNU_SOURCE -CFLAGS += -D_GNU_SOURCE - -# define __BSD_VISIBLE when building for FreeBSD -ifeq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),y) -CFLAGS += -D__BSD_VISIBLE -endif - -export CFLAGS -export LDFLAGS - -endif diff --git a/mk/toolchain/clang/rte.toolchain-compat.mk b/mk/toolchain/clang/rte.toolchain-compat.mk deleted file mode 100644 index e6189b498d..0000000000 --- a/mk/toolchain/clang/rte.toolchain-compat.mk +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out CLANG version - -CLANG_VERSION := $(shell $(CC) -v 2>&1 | \ - sed -n "s/.*version \([0-9]*\.[0-9]*\).*/\1/p") - -CLANG_MAJOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f1 -d.) - -CLANG_MINOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f2 -d.) - -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -lt 35 && echo 1), 1) - CC_SUPPORTS_Z := false -endif diff --git a/mk/toolchain/clang/rte.vars.mk b/mk/toolchain/clang/rte.vars.mk deleted file mode 100644 index d441f6d8f3..0000000000 --- a/mk/toolchain/clang/rte.vars.mk +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)clang -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = clang -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers - -# disable packed member unalign warnings -ifeq ($(shell test $(CLANG_MAJOR_VERSION) -ge 4 && echo 1), 1) -WERROR_FLAGS += -Wno-address-of-packed-member -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk deleted file mode 100644 index 98dca3e786..0000000000 --- a/mk/toolchain/gcc/rte.toolchain-compat.mk +++ /dev/null @@ -1,120 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -#find out GCC version - -GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1) -GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1) -GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(CC) -E -x c - | tail -n 1) -GCC_VERSION = $(GCC_MAJOR)$(GCC_MINOR) - -HOST_GCC_MAJOR = $(shell echo __GNUC__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_VERSION = $(HOST_GCC_MAJOR)$(HOST_GCC_MINOR) - -LD_VERSION = $(shell $(LD) -v) -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(CONFIG_RTE_ARCH_X86), y) -ifneq ($(filter 2.30%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.30. See Bug 97) -endif -endif -ifneq ($(filter 2.31%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.31. See Bug 249) -endif -endif -endif - -# if GCC is older than 4.x -ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1) - MACHINE_CFLAGS = -$(warning You are using GCC < 4.x. This is neither supported, nor tested.) - - -else -# GCC graceful degradation -# GCC 4.2.x - added support for generic target -# GCC 4.3.x - added support for core2, ssse3, sse4.1, sse4.2 -# GCC 4.4.x - added support for avx, aes, pclmul -# GCC 4.5.x - added support for atom -# GCC 4.6.x - added support for corei7, corei7-avx -# GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2 -# GCC 4.9.x - added support for armv8-a+crc -# - ifeq ($(shell test $(GCC_VERSION) -le 49 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc,-march=armv8-a+crc -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc+crypto,-march=armv8-a+crc+crypto -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -le 47 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=core-avx2,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 46 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-march=core2 -maes -mpclmul -mavx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=corei7,-march=core2 -maes -mpclmul,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 45 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=atom,-march=core2 -mssse3,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 44 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -mavx -mpclmul -maes,$(MACHINE_CFLAGS)) - ifneq ($(findstring SSE4_2, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.2 - endif - ifneq ($(findstring SSE4_1, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.1 - endif - endif - ifeq ($(shell test $(GCC_VERSION) -lt 43 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -msse% -mssse%,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core2,-march=generic,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS += -msse3 - endif - ifeq ($(shell test $(GCC_VERSION) -lt 42 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -march% -mtune% -msse%,$(MACHINE_CFLAGS)) - endif - - ifeq ($(shell test $(GCC_VERSION) -lt 74 && echo 1), 1) - CONFIG_RTE_ENABLE_LTO=n - endif - - # Disable thunderx PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable OPDL PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - - # Disable OCTEON drivers and libs for arm64 gcc < 4.8.6 - ifeq ($(RTE_ARCH), arm64) - ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d - CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX_PMD=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=d - CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=d - endif - endif - -endif diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk deleted file mode 100644 index 928f0e0830..0000000000 --- a/mk/toolchain/gcc/rte.vars.mk +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)gcc -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -ifeq ($(CONFIG_RTE_LIBRTE_GCOV),y) -TOOLCHAIN_CFLAGS += --coverage -TOOLCHAIN_LDFLAGS += --coverage -ifeq (,$(findstring -O0,$(EXTRA_CFLAGS))) - $(warning "EXTRA_CFLAGS doesn't contains -O0, coverage will be inaccurate with optimizations enabled") -endif -endif - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# There are many issues reported for strict alignment architectures -# which are not necessarily fatal. Report as warnings. -ifeq ($(CONFIG_RTE_ARCH_STRICT_ALIGN),y) -WERROR_FLAGS += -Wno-error=cast-align -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -# workaround for GCC bug 81440 -ifeq ($(shell test $(GCC_VERSION) -lt 80 && echo 1), 1) -WERROR_FLAGS += -Wno-lto-type-mismatch -endif -endif - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers -# workaround GCC bug with warning "may be used uninitialized" -ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) -WERROR_FLAGS += -Wno-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -# FIXME: Bugzilla 396 -WERROR_FLAGS += -Wno-zero-length-bounds -endif - -HOST_WERROR_FLAGS := $(WERROR_FLAGS) - -ifeq ($(shell test $(HOST_GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -HOST_WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -HOST_WERROR_FLAGS += -Wno-format-truncation -endif - -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -WERROR_FLAGS += -Wno-format-truncation -endif - -# disable packed member unalign warnings -WERROR_FLAGS += -Wno-address-of-packed-member - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk deleted file mode 100644 index 2d663b34ad..0000000000 --- a/mk/toolchain/icc/rte.toolchain-compat.mk +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out ICC version - -ICC_MAJOR_VERSION = $(shell icc -dumpversion | cut -f1 -d.) - -ifeq ($(shell test $(ICC_MAJOR_VERSION) -lt 12 && echo 1), 1) - MACHINE_CFLAGS = -xSSE4.2 -$(warning You are not using ICC 12.x or higher. This is neither supported, nor tested.) - -else -# proceed to adjust compiler flags - - ICC_MINOR_VERSION = $(shell icc -dumpversion | cut -f2 -d.) - -# replace GCC flags with ICC flags - # if icc version >= 12 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 12 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -march=atom,-xSSSE3_ATOM -march=atom,$(MACHINE_CFLAGS)) - # nehalem/westmere - MACHINE_CFLAGS := $(patsubst -march=corei7,-xSSE4.2 -march=corei7,$(MACHINE_CFLAGS)) - # sandy bridge - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-xAVX,$(MACHINE_CFLAGS)) - # ivy bridge - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-xCORE-AVX-I,$(MACHINE_CFLAGS)) - # hsw - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-xCORE-AVX2,$(MACHINE_CFLAGS)) - # remove westmere flags - MACHINE_CFLAGS := $(filter-out -mpclmul -maes,$(MACHINE_CFLAGS)) - endif - # if icc version == 12.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 12 && test $(ICC_MINOR_VERSION) -eq 0 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -xSSSE3_ATOM,-xSSE3_ATOM,$(MACHINE_CFLAGS)) - # remove march options - MACHINE_CFLAGS := $(patsubst -march=%,-xSSE3,$(MACHINE_CFLAGS)) - endif - - # Disable thunderx PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable event/opdl PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - -endif diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk deleted file mode 100644 index 1729f3d849..0000000000 --- a/mk/toolchain/icc/rte.vars.mk +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -# Warning: we do not use CROSS environment variable as icc is mainly a -# x86->x86 compiler - -CC = icc -KERNELCC = gcc -CPP = cpp -AS = nasm -AR = ar -LD = ld -OBJCOPY = objcopy -OBJDUMP = objdump -STRIP = strip -READELF = readelf - -ifeq ($(KERNELRELEASE),) -HOSTCC = icc -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = -TOOLCHAIN_ASFLAGS = - -# Turn off some ICC warnings - -# Remark #271 : trailing comma is nonstandard -# Warning #1478 : function "<func_name>" (declared at line N of "<filename>") -# error #13368: loop was not vectorized with "vector always assert" -# error #15527: loop was not vectorized: function call to fprintf cannot be vectorize -# was declared "deprecated" -# Warning #11074, 11076: to prevent "inline-max-size" warnings. -WERROR_FLAGS := -Wall -w2 -diag-disable 271 -diag-warning 1478 -WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527 -WERROR_FLAGS += -diag-disable 188 -WERROR_FLAGS += -diag-disable 11074 -diag-disable 11076 -Wdeprecated - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory Ciara Power @ 2020-08-21 3:18 ` Ruifeng Wang 0 siblings, 0 replies; 300+ messages in thread From: Ruifeng Wang @ 2020-08-21 3:18 UTC (permalink / raw) To: Ciara Power, dev Cc: thomas, Reshma Pattan, Maryam Tahhan, Konstantin Ananyev, Nicolas Chautru, Olivier Matz, Declan Doherty, jerinj, Vladimir Medvedkin, Wisam Jaddo, Cristian Dumitrescu, Wenzhuo Lu, Beilei Xing, Bernard Iremonger, Ori Kam, Neil Horman, hemant.agrawal, Sachin.saxena@nxp.com, Rosen Xu, Stephen Hemminger, Long Li, Anoob Joseph, Jingjing Wu, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Liron Himi, Harman Kalra, Nithin Dabilpuram, Fiona Trahe, John Griffin, Deepak Kumar Jain, Ashish Gupta, Lee Daly, Sunila Sahu, Pablo de Lara, Gagandeep Singh, Somalapuram Amaranath, Akhil.goyal@nxp.com, Michael Shamis, Nagadheeraj Rottela, Srikanth Jampala, Ankur Dwivedi, Fan Zhang, Jay Zhou, Nipun.gupta@nxp.com, Mattias Rönnblom, Pavan Nikhilesh, Liang Ma, Peter Mccarthy, Harry van Haaren, Artem V. Andreev, Andrew Rybchenko, Gage Eads, John W. Linville, Ciara Loftus, Qi Zhang, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Steven Webster, Matt Peters, Rasesh Mody, Shahed Shaikh, Ajit Khaparde (ajit.khaparde@broadcom.com), Somnath Kotur, Chas Williams, Wei Hu (Xavier), Rahul Lakkireddy, Wei Zhao, Jeff Guo, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, John Daley, Hyong Youb Kim, Gaetan Rivet, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Min Hu (Connor), Yisen Zhuang, Qiming Yang, Alfredo Cardigliano, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Zyta Szpak, K. Y. Srinivasan, Haiyang Zhang, Martin Spinler, Heinrich Kuhn, Tetsuya Mukawa, Kiran Kumar K, Bruce Richardson, Jasvinder Singh, Keith Wiles, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Yong Wang, Tianfei zhang, Xiaoyun Li, Satha Rao, Mahipal Challa, David Hunt, Byron Marohn, Yipeng Wang, Jiayu Hu, Sameh Gobriel, Honnappa Nagarahalli, Kevin Laatz, Robert Sanford, Erik Gabriel Carrillo, Anatoly Burakov, nd > -----Original Message----- > From: Ciara Power <ciara.power@intel.com> > Sent: Thursday, August 20, 2020 8:41 PM > To: dev@dpdk.org > Cc: Ciara Power <ciara.power@intel.com>; thomas@monjalon.net; Reshma > Pattan <reshma.pattan@intel.com>; Maryam Tahhan > <maryam.tahhan@intel.com>; Konstantin Ananyev > <konstantin.ananyev@intel.com>; Nicolas Chautru > <nicolas.chautru@intel.com>; Olivier Matz <olivier.matz@6wind.com>; > Declan Doherty <declan.doherty@intel.com>; jerinj@marvell.com; Vladimir > Medvedkin <vladimir.medvedkin@intel.com>; Wisam Jaddo > <wisamm@mellanox.com>; Cristian Dumitrescu > <cristian.dumitrescu@intel.com>; Wenzhuo Lu <wenzhuo.lu@intel.com>; > Beilei Xing <beilei.xing@intel.com>; Bernard Iremonger > <bernard.iremonger@intel.com>; Ori Kam <orika@mellanox.com>; Neil > Horman <nhorman@tuxdriver.com>; hemant.agrawal@nxp.com; > Sachin.saxena@nxp.com; Rosen Xu <rosen.xu@intel.com>; Stephen > Hemminger <sthemmin@microsoft.com>; Long Li <longli@microsoft.com>; > Anoob Joseph <anoobj@marvell.com>; Jingjing Wu <jingjing.wu@intel.com>; > Matan Azrad <matan@mellanox.com>; Shahaf Shuler > <shahafs@mellanox.com>; Viacheslav Ovsiienko > <viacheslavo@mellanox.com>; Liron Himi <lironh@marvell.com>; Harman > Kalra <hkalra@marvell.com>; Nithin Dabilpuram > <ndabilpuram@marvell.com>; Fiona Trahe <fiona.trahe@intel.com>; John > Griffin <john.griffin@intel.com>; Deepak Kumar Jain > <deepak.k.jain@intel.com>; Ashish Gupta <ashish.gupta@marvell.com>; Lee > Daly <lee.daly@intel.com>; Sunila Sahu <ssahu@marvell.com>; Pablo de Lara > <pablo.de.lara.guarch@intel.com>; Ruifeng Wang > <Ruifeng.Wang@arm.com>; Gagandeep Singh <g.singh@nxp.com>; > Somalapuram Amaranath <asomalap@amd.com>; Akhil.goyal@nxp.com; > Michael Shamis <michaelsh@marvell.com>; Nagadheeraj Rottela > <rnagadheeraj@marvell.com>; Srikanth Jampala <jsrikanth@marvell.com>; > Ankur Dwivedi <adwivedi@marvell.com>; Fan Zhang > <roy.fan.zhang@intel.com>; Jay Zhou <jianjay.zhou@huawei.com>; > Nipun.gupta@nxp.com; Mattias Rönnblom > <mattias.ronnblom@ericsson.com>; Pavan Nikhilesh > <pbhagavatula@marvell.com>; Liang Ma <liang.j.ma@intel.com>; Peter > Mccarthy <peter.mccarthy@intel.com>; Harry van Haaren > <harry.van.haaren@intel.com>; Artem V. Andreev > <artem.andreev@oktetlabs.ru>; Andrew Rybchenko > <arybchenko@solarflare.com>; Gage Eads <gage.eads@intel.com>; John W. > Linville <linville@tuxdriver.com>; Ciara Loftus <ciara.loftus@intel.com>; Qi > Zhang <qi.z.zhang@intel.com>; Shepard Siegel > <shepard.siegel@atomicrules.com>; Ed Czeck <ed.czeck@atomicrules.com>; > John Miller <john.miller@atomicrules.com>; Igor Russkikh > <igor.russkikh@aquantia.com>; Pavel Belous <pavel.belous@aquantia.com>; > Steven Webster <steven.webster@windriver.com>; Matt Peters > <matt.peters@windriver.com>; Rasesh Mody <rmody@marvell.com>; > Shahed Shaikh <shshaikh@marvell.com>; Ajit Khaparde > (ajit.khaparde@broadcom.com) <ajit.khaparde@broadcom.com>; Somnath > Kotur <somnath.kotur@broadcom.com>; Chas Williams <chas3@att.com>; > Wei Hu (Xavier) <xavier.huwei@huawei.com>; Rahul Lakkireddy > <rahul.lakkireddy@chelsio.com>; Wei Zhao <wei.zhao1@intel.com>; Jeff > Guo <jia.guo@intel.com>; Marcin Wojtas <mw@semihalf.com>; Michal > Krawczyk <mk@semihalf.com>; Guy Tzalik <gtzalik@amazon.com>; Evgeny > Schemeilin <evgenys@amazon.com>; Igor Chauskin <igorch@amazon.com>; > John Daley <johndale@cisco.com>; Hyong Youb Kim <hyonkim@cisco.com>; > Gaetan Rivet <grive@u256.net>; Xiao Wang <xiao.w.wang@intel.com>; > Ziyang Xuan <xuanziyang2@huawei.com>; Xiaoyun Wang > <cloud.wangxiaoyun@huawei.com>; Guoyang Zhou > <zhouguoyang@huawei.com>; Min Hu (Connor) <humin29@huawei.com>; > Yisen Zhuang <yisen.zhuang@huawei.com>; Qiming Yang > <qiming.yang@intel.com>; Alfredo Cardigliano <cardigliano@ntop.org>; > Ferruh Yigit <ferruh.yigit@intel.com>; Shijith Thotton > <sthotton@marvell.com>; Srisivasubramanian Srinivasan > <srinivasan@marvell.com>; Jakub Grajciar <jgrajcia@cisco.com>; Zyta Szpak > <zr@semihalf.com>; K. Y. Srinivasan <kys@microsoft.com>; Haiyang Zhang > <haiyangz@microsoft.com>; Martin Spinler <spinler@cesnet.cz>; Heinrich > Kuhn <heinrich.kuhn@netronome.com>; Tetsuya Mukawa > <mtetsuyah@gmail.com>; Kiran Kumar K <kirankumark@marvell.com>; > Bruce Richardson <bruce.richardson@intel.com>; Jasvinder Singh > <jasvinder.singh@intel.com>; Keith Wiles <keith.wiles@intel.com>; Maciej > Czekaj <mczekaj@marvell.com>; Maxime Coquelin > <maxime.coquelin@redhat.com>; Chenbo Xia <chenbo.xia@intel.com>; > Zhihong Wang <zhihong.wang@intel.com>; Yong Wang > <yongwang@vmware.com>; Tianfei zhang <tianfei.zhang@intel.com>; > Xiaoyun Li <xiaoyun.li@intel.com>; Satha Rao <skoteshwar@marvell.com>; > Mahipal Challa <mchalla@marvell.com>; David Hunt <david.hunt@intel.com>; > Byron Marohn <byron.marohn@intel.com>; Yipeng Wang > <yipeng1.wang@intel.com>; Jiayu Hu <jiayu.hu@intel.com>; Sameh Gobriel > <sameh.gobriel@intel.com>; Honnappa Nagarahalli > <Honnappa.Nagarahalli@arm.com>; Kevin Laatz <kevin.laatz@intel.com>; > Robert Sanford <rsanford@akamai.com>; Erik Gabriel Carrillo > <erik.g.carrillo@intel.com>; Anatoly Burakov <anatoly.burakov@intel.com> > Subject: [PATCH v2 10/37] build: remove makefiles and mk directory > > A decision was made [1] to no longer support Make in DPDK, this patch > removes all Makefiles that do not make use of pkg-config, along with > the mk directory previously used by make. > > [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com> <snip> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 11/37] config: remove all config files used by make 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (9 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 12/37] examples: remove old build system references Ciara Power ` (25 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon, Anatoly Burakov Make is not supported for compiling DPDK, the config files are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - 48 files changed, 1850 deletions(-) delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux deleted file mode 100644 index e942657a0f..0000000000 --- a/config/common_armv8a_linux +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv8a" - -CONFIG_RTE_ARCH="arm64" -CONFIG_RTE_ARCH_ARM64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_FORCE_INTRINSICS=y - -# Maximum available cache line size in arm64 implementations. -# Setting to maximum available cache line size in generic config -# to address minimum DMA alignment across all arm64 implementations. -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_USE_C11_MEM_MODEL=y - -# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) -# to determine the best threshold in code. Refer to notes in source file -# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info. -CONFIG_RTE_ARCH_ARM64_MEMCPY=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048 -#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512 -# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're -# strong reasons. -#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF -#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n - -CONFIG_RTE_LIBRTE_IONIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n - -# -# NXP PFE PMD Driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=y diff --git a/config/common_base b/config/common_base deleted file mode 100644 index fbf0ee70c8..0000000000 --- a/config/common_base +++ /dev/null @@ -1,1154 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -# -# String that appears before the version number -# -CONFIG_RTE_VER_PREFIX="DPDK" - -# -# Version information completed when this file is processed for a build -# -CONFIG_RTE_VER_YEAR=__YEAR -CONFIG_RTE_VER_MONTH=__MONTH -CONFIG_RTE_VER_MINOR=__MINOR -CONFIG_RTE_VER_SUFFIX=__SUFFIX -CONFIG_RTE_VER_RELEASE=__RELEASE - -# -# define executive environment -# RTE_EXEC_ENV values are the directories in mk/exec-env/ -# -CONFIG_RTE_EXEC_ENV= - -# -# define the architecture we compile for. -# RTE_ARCH values are the directories in mk/arch/ -# -CONFIG_RTE_ARCH= - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE values are the directories in mk/machine/ -# -CONFIG_RTE_MACHINE= - -# -# The compiler we use. -# RTE_TOOLCHAIN values are the directories in mk/toolchain/ -# -CONFIG_RTE_TOOLCHAIN= - -# -# Use intrinsics or assembly code for key routines -# -CONFIG_RTE_FORCE_INTRINSICS=n - -# -# Machine forces strict alignment constraints. -# -CONFIG_RTE_ARCH_STRICT_ALIGN=n - -# -# Enable link time optimization -# -CONFIG_RTE_ENABLE_LTO=n - -# -# Compile to share library -# -CONFIG_RTE_BUILD_SHARED_LIB=n - -# -# Use newest code breaking previous ABI -# -CONFIG_RTE_NEXT_ABI=y - -# -# Machine's cache line size -# -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# -# Memory model -# -CONFIG_RTE_USE_C11_MEM_MODEL=n - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_LIBRTE_EAL=y -CONFIG_RTE_MAX_LCORE=128 -CONFIG_RTE_MAX_NUMA_NODES=8 -CONFIG_RTE_MAX_HEAPS=32 -CONFIG_RTE_MAX_MEMSEG_LISTS=64 -# each memseg list will be limited to either RTE_MAX_MEMSEG_PER_LIST pages -# or RTE_MAX_MEM_MB_PER_LIST megabytes worth of memory, whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_LIST=8192 -CONFIG_RTE_MAX_MEM_MB_PER_LIST=32768 -# a "type" is a combination of page size and NUMA node. total number of memseg -# lists per type will be limited to either RTE_MAX_MEMSEG_PER_TYPE pages (split -# over multiple lists of RTE_MAX_MEMSEG_PER_LIST pages), or -# RTE_MAX_MEM_MB_PER_TYPE megabytes of memory (split over multiple lists of -# RTE_MAX_MEM_MB_PER_LIST), whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_TYPE=32768 -CONFIG_RTE_MAX_MEM_MB_PER_TYPE=131072 -# global maximum usable amount of VA, in megabytes -CONFIG_RTE_MAX_MEM_MB=524288 -CONFIG_RTE_MAX_MEMZONE=2560 -CONFIG_RTE_MAX_TAILQ=32 -CONFIG_RTE_ENABLE_ASSERT=n -CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO -CONFIG_RTE_ENABLE_TRACE_FP=n -CONFIG_RTE_LOG_HISTORY=256 -CONFIG_RTE_BACKTRACE=y -CONFIG_RTE_LIBEAL_USE_HPET=n -CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n -CONFIG_RTE_EAL_IGB_UIO=n -CONFIG_RTE_EAL_VFIO=n -CONFIG_RTE_MAX_VFIO_GROUPS=64 -CONFIG_RTE_MAX_VFIO_CONTAINERS=64 -CONFIG_RTE_MALLOC_DEBUG=n -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_USE_LIBBSD=n -# Use WFE instructions to implement the rte_wait_for_equal_xxx APIs, -# calling these APIs put the cores in low power state while waiting -# for the memory address to become equal to the expected value. -# This is supported only by aarch64. -CONFIG_RTE_ARM_USE_WFE=n - -# -# Recognize/ignore the AVX/AVX512 CPU flags for performance/power testing. -# AVX512 is marked as experimental for now, will enable it after enough -# field test and possible optimization. -# -CONFIG_RTE_ENABLE_AVX=y -CONFIG_RTE_ENABLE_AVX512=n - -# Use ARM LSE ATOMIC instructions -CONFIG_RTE_ARM_FEATURE_ATOMICS=n - -# Default driver path (or "" to disable) -CONFIG_RTE_EAL_PMD_PATH="" - -# -# Compile Environment Abstraction Layer to support Vmware TSC map -# -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y - -# -# Compile the PCI library -# -CONFIG_RTE_LIBRTE_PCI=y - -# -# Compile the argument parser library -# -CONFIG_RTE_LIBRTE_KVARGS=y - -# -# Compile generic ethernet library -# -CONFIG_RTE_LIBRTE_ETHER=y -CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n -CONFIG_RTE_MAX_ETHPORTS=32 -CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 -CONFIG_RTE_LIBRTE_IEEE1588=n -CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16 -CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y -CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE=n - -# -# Turn off Tx preparation stage -# -# Warning: rte_eth_tx_prepare() can be safely disabled only if using a -# driver which do not implement any Tx preparation. -# -CONFIG_RTE_ETHDEV_TX_PREPARE_NOOP=n - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n - -# -# Compile the Intel FPGA bus -# -CONFIG_RTE_LIBRTE_IFPGA_BUS=y - -# -# Compile PCI bus driver -# -CONFIG_RTE_LIBRTE_PCI_BUS=y - -# -# Compile the vdev bus -# -CONFIG_RTE_LIBRTE_VDEV_BUS=y - -# -# Compile ARK PMD -# -CONFIG_RTE_LIBRTE_ARK_PMD=y -CONFIG_RTE_LIBRTE_ARK_PAD_TX=y -CONFIG_RTE_LIBRTE_ARK_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE=n - -# -# Compile Aquantia Atlantic PMD driver -# -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=y - -# -# Compile AMD PMD -# -CONFIG_RTE_LIBRTE_AXGBE_PMD=y -CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG=n - -# -# Compile burst-oriented Broadcom PMD driver -# -CONFIG_RTE_LIBRTE_BNX2X_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n -CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC=n - -# -# Compile burst-oriented Broadcom BNXT PMD driver -# -CONFIG_RTE_LIBRTE_BNXT_PMD=y - -# -# Compile burst-oriented Chelsio Terminator (CXGBE) PMD -# -CONFIG_RTE_LIBRTE_CXGBE_PMD=y - -# -# Compile burst-oriented NXP PFE PMD driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n - -# -# Compile NXP DPAA2 FSL-MC Bus -# -CONFIG_RTE_LIBRTE_FSLMC_BUS=n - -# -# Compile Support Libraries for NXP DPAA2 -# -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y - -# -# Compile burst-oriented NXP DPAA2 PMD driver -# -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n - -# -# Compile NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# -# Compile burst-oriented Amazon ENA PMD driver -# -CONFIG_RTE_LIBRTE_ENA_PMD=y -CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n - -# -# Compile burst-oriented Cisco ENIC PMD driver -# -CONFIG_RTE_LIBRTE_ENIC_PMD=y - -# -# Compile burst-oriented IGB & EM PMD drivers -# -CONFIG_RTE_LIBRTE_EM_PMD=y -CONFIG_RTE_LIBRTE_IGB_PMD=y -CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n - -# -# Compile burst-oriented HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# Compile burst-oriented HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n - -# -# Compile Pensando IONIC PMD driver -# -CONFIG_RTE_LIBRTE_IONIC_PMD=y - -# -# Compile burst-oriented IXGBE PMD driver -# -CONFIG_RTE_LIBRTE_IXGBE_PMD=y -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n -CONFIG_RTE_LIBRTE_IXGBE_BYPASS=n - -# -# Compile burst-oriented I40E PMD driver -# -CONFIG_RTE_LIBRTE_I40E_PMD=y -CONFIG_RTE_LIBRTE_I40E_DEBUG_RX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y -CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64 -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4 - -# -# Compile burst-oriented FM10K PMD -# -CONFIG_RTE_LIBRTE_FM10K_PMD=y -CONFIG_RTE_LIBRTE_FM10K_DEBUG_RX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE=y -CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y - -# -# Compile burst-oriented ICE PMD driver -# -CONFIG_RTE_LIBRTE_ICE_PMD=y -CONFIG_RTE_LIBRTE_ICE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n - -# Compile burst-oriented IAVF PMD driver -# -CONFIG_RTE_LIBRTE_IAVF_PMD=y -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC=n -CONFIG_RTE_LIBRTE_IAVF_16BYTE_RX_DESC=n -# -# Compile burst-oriented IPN3KE PMD driver -# -CONFIG_RTE_LIBRTE_IPN3KE_PMD=n - -# -# Compile burst-oriented IGC PMD drivers -# -CONFIG_RTE_LIBRTE_IGC_PMD=y -CONFIG_RTE_LIBRTE_IGC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IGC_DEBUG_TX=n - -# -# Compile burst-oriented Mellanox ConnectX-3 (MLX4) PMD -# -CONFIG_RTE_LIBRTE_MLX4_PMD=n -CONFIG_RTE_LIBRTE_MLX4_DEBUG=n - -# -# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, -# ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_PMD=n -CONFIG_RTE_LIBRTE_MLX5_DEBUG=n - -# -# Compile regex-oriented Mellanox PMD -# -CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD=n - -# -# Compile vdpa-oriented Mellanox ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=n - -# Linking method for mlx4/5 dependency on ibverbs and related libraries -# Default linking is dynamic by linker. -# Other options are: dynamic by dlopen at run-time, or statically embedded. -CONFIG_RTE_IBVERBS_LINK_DLOPEN=n -CONFIG_RTE_IBVERBS_LINK_STATIC=n - -# -# Compile burst-oriented Netronome NFP PMD driver -# -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n - -# QLogic 10G/25G/40G/50G/100G PMD -# -CONFIG_RTE_LIBRTE_QEDE_PMD=y -CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n -#Provides abs path/name of the firmware file. -#Empty string denotes driver will use default firmware -CONFIG_RTE_LIBRTE_QEDE_FW="" - -# -# Compile burst-oriented Solarflare libefx-based PMD -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=y -CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n - -# -# Compile software PMD backed by SZEDATA2 device -# -CONFIG_RTE_LIBRTE_PMD_SZEDATA2=n - -# -# Compile software PMD backed by NFB device -# -CONFIG_RTE_LIBRTE_NFB_PMD=n - -# -# Compile burst-oriented Cavium Thunderx NICVF PMD driver -# -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=y -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX=n - -# -# Compile burst-oriented Cavium LiquidIO PMD driver -# -CONFIG_RTE_LIBRTE_LIO_PMD=y -CONFIG_RTE_LIBRTE_LIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n - -# -# Compile burst-oriented Cavium OCTEONTX network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX_PMD=y - -# -# Compile burst-oriented Marvell OCTEON TX2 network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=y - -# -# Compile WRS accelerated virtual port (AVP) guest PMD driver -# -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_RX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n - -# -# Compile burst-oriented VIRTIO PMD driver -# -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n - -# -# Compile virtio device emulation inside virtio PMD driver -# -CONFIG_RTE_VIRTIO_USER=n - -# -# Compile burst-oriented VMXNET3 PMD driver -# -CONFIG_RTE_LIBRTE_VMXNET3_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n - -# -# Compile software PMD backed by AF_PACKET sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=n - -# -# Compile software PMD backed by AF_XDP sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_XDP=n - -# -# Compile Memory Interface PMD driver (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_MEMIF=n - -# -# Compile link bonding PMD library -# -CONFIG_RTE_LIBRTE_PMD_BOND=y -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n - -# -# Compile fail-safe PMD -# -CONFIG_RTE_LIBRTE_PMD_FAILSAFE=y - -# -# Compile Marvell PMD driver -# -CONFIG_RTE_LIBRTE_MVPP2_PMD=n - -# -# Compile Marvell MVNETA PMD driver -# -CONFIG_RTE_LIBRTE_MVNETA_PMD=n - -# -# Compile support for VMBus library -# -CONFIG_RTE_LIBRTE_VMBUS=n - -# -# Compile native PMD for Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_NETVSC_PMD=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_DUMP=n - -# -# Compile virtual device driver for NetVSC on Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=n - -# -# Compile null PMD -# -CONFIG_RTE_LIBRTE_PMD_NULL=y - -# -# Compile software PMD backed by PCAP files -# -CONFIG_RTE_LIBRTE_PMD_PCAP=n - -# -# Compile example software rings based PMD -# -CONFIG_RTE_LIBRTE_PMD_RING=y -CONFIG_RTE_PMD_RING_MAX_RX_RINGS=16 -CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 - -# -# Compile SOFTNIC PMD -# -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=n - -# -# Compile the TAP PMD -# It is enabled by default for Linux only. -# -CONFIG_RTE_LIBRTE_PMD_TAP=n - -# -# Do prefetch of packet data within PMD driver receive function -# -CONFIG_RTE_PMD_PACKET_PREFETCH=y - -# Compile generic wireless base band device library -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_BBDEV=y -CONFIG_RTE_LIBRTE_BBDEV_DEBUG=n -CONFIG_RTE_BBDEV_MAX_DEVS=128 -CONFIG_RTE_BBDEV_OFFLOAD_COST=y -CONFIG_RTE_BBDEV_SDK_AVX2=n -CONFIG_RTE_BBDEV_SDK_AVX512=n - -# -# Compile PMD for NULL bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL=y - -# -# Compile PMD for turbo software bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y - -# -# Compile PMD for Intel FPGA LTE FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y - -# -# Compile PMD for Intel FPGA 5GNR FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC=y - -# -# Compile generic crypto device library -# -CONFIG_RTE_LIBRTE_CRYPTODEV=y -CONFIG_RTE_CRYPTO_MAX_DEVS=64 - -# -# Compile PMD for ARMv8 Crypto device -# -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n - -# -# Compile NXP CAAM JR crypto Driver -# -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE=n - -# -# Compile NXP DPAA2 crypto sec driver for CAAM HW -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n - -# -# NXP DPAA caam - crypto driver -# -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4 - -# -# Compile PMD for Cavium OCTEON TX crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y - -# -# Compile PMD for Marvell OCTEON TX2 crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y - -# -# Compile PMD for QuickAssist based devices - see docs for details -# -CONFIG_RTE_LIBRTE_PMD_QAT=y -CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n -CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n -# -# Max. number of QuickAssist devices, which can be detected and attached -# -CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 -CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -# -# Compile PMD for virtio crypto devices -# -CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y -# -# Number of maximum virtio crypto devices -# -CONFIG_RTE_MAX_VIRTIO_CRYPTO=32 - -# -# Compile PMD for AESNI backed device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# Compile PMD for Software backed device -# -CONFIG_RTE_LIBRTE_PMD_OPENSSL=n - -# -# Compile PMD for AESNI GCM device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# Compile PMD for SNOW 3G device -# -CONFIG_RTE_LIBRTE_PMD_SNOW3G=n -CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG=n - -# -# Compile PMD for KASUMI device -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# Compile PMD for ZUC device -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# Compile PMD for Crypto Scheduler device -# -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y - -# -# Compile PMD for NULL Crypto device -# -CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=y - -# -# Compile PMD for AMD CCP crypto device -# -CONFIG_RTE_LIBRTE_PMD_CCP=n - -# -# Compile PMD for Marvell Crypto device -# -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=n - -# -# Compile PMD for NITROX crypto device -# -CONFIG_RTE_LIBRTE_PMD_NITROX=y - -# -# Compile generic security library -# -CONFIG_RTE_LIBRTE_SECURITY=y - -# -# Compile generic compression device library -# -CONFIG_RTE_LIBRTE_COMPRESSDEV=y -CONFIG_RTE_COMPRESS_MAX_DEVS=64 - -# -# Compile compressdev unit test -# -CONFIG_RTE_COMPRESSDEV_TEST=n - -# -# Compile PMD for Octeontx ZIPVF compression device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF=y - -# -# Compile PMD for ISA-L compression device -# -CONFIG_RTE_LIBRTE_PMD_ISAL=n - -# -# Compile PMD for ZLIB compression device -# -CONFIG_RTE_LIBRTE_PMD_ZLIB=n - -# -# Compile RegEx device support -# -CONFIG_RTE_LIBRTE_REGEXDEV=y -CONFIG_RTE_LIBRTE_REGEXDEV_DEBUG=n -CONFIG_RTE_MAX_REGEXDEV_DEVS=32 - -# -# Compile generic event device library -# -CONFIG_RTE_LIBRTE_EVENTDEV=y -CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n -CONFIG_RTE_EVENT_MAX_DEVS=16 -CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64 -CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32 -CONFIG_RTE_EVENT_ETH_INTR_RING_SIZE=1024 -CONFIG_RTE_EVENT_CRYPTO_ADAPTER_MAX_INSTANCE=32 -CONFIG_RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE=32 - -# -# Compile PMD for skeleton event device -# -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG=n - -# -# Compile PMD for software event device -# -CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y - -# -# Compile PMD for distributed software event device -# -CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV=y - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y - -# -# Compile PMD for octeontx2 sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=y - -# -# Compile PMD for OPDL event device -# -CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=y - -# -# Compile PMD for NXP DPAA event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n - -# -# Compile PMD for NXP DPAA2 event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n - -# -# Compile raw device support -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_RAWDEV=y -CONFIG_RTE_RAWDEV_MAX_DEVS=64 -CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV=y - -# -# Compile PMD for NXP DPAA2 CMDIF raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n - -# -# Compile PMD for NXP DPAA2 QDMA raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n - -# -# Compile PMD for Intel FPGA raw device -# -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n - -# -# Compile PMD for Intel IOAT raw device -# -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=y - -# -# Compile PMD for octeontx2 DMA raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=y - -# -# Compile PMD for octeontx2 EP raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=y - -# -# Compile PMD for NTB raw device -# -CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV=y - -# -# Compile librte_ring -# -CONFIG_RTE_LIBRTE_RING=y - -# -# Compile librte_stack -# -CONFIG_RTE_LIBRTE_STACK=y - -# -# Compile librte_mempool -# -CONFIG_RTE_LIBRTE_MEMPOOL=y -CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512 -CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n - -# -# Compile Mempool drivers -# -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET=y -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB=64 -CONFIG_RTE_DRIVER_MEMPOOL_RING=y -CONFIG_RTE_DRIVER_MEMPOOL_STACK=y - -# -# Compile PMD for octeontx fpa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=y - -# -# Compile PMD for octeontx2 npa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=y - -# -# Compile librte_mbuf -# -CONFIG_RTE_LIBRTE_MBUF=y -CONFIG_RTE_LIBRTE_MBUF_DEBUG=n -CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="ring_mp_mc" -CONFIG_RTE_MBUF_REFCNT_ATOMIC=y -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# -# Compile librte_timer -# -CONFIG_RTE_LIBRTE_TIMER=y -CONFIG_RTE_LIBRTE_TIMER_DEBUG=n - -# -# Compile librte_cfgfile -# -CONFIG_RTE_LIBRTE_CFGFILE=y - -# -# Compile librte_cmdline -# -CONFIG_RTE_LIBRTE_CMDLINE=y -CONFIG_RTE_LIBRTE_CMDLINE_DEBUG=n - -# -# Compile librte_hash -# -CONFIG_RTE_LIBRTE_HASH=y -CONFIG_RTE_LIBRTE_HASH_DEBUG=n - -# -# Compile librte_efd -# -CONFIG_RTE_LIBRTE_EFD=y - -# -# Compile librte_member -# -CONFIG_RTE_LIBRTE_MEMBER=y - -# -# Compile librte_jobstats -# -CONFIG_RTE_LIBRTE_JOBSTATS=y - -# -# Compile the device metrics library -# -CONFIG_RTE_LIBRTE_METRICS=y - -# -# Compile the bitrate statistics library -# -CONFIG_RTE_LIBRTE_BITRATE=y - -# -# Compile the latency statistics library -# -CONFIG_RTE_LIBRTE_LATENCY_STATS=y - -# -# Compile librte_telemetry legacy support -# -CONFIG_RTE_LIBRTE_TELEMETRY=n - -# -# Compile librte_rcu -# -CONFIG_RTE_LIBRTE_RCU=y -CONFIG_RTE_LIBRTE_RCU_DEBUG=n - -# -# Compile librte_rib -# -CONFIG_RTE_LIBRTE_RIB=y - -# -# Compile librte_fib -# -CONFIG_RTE_LIBRTE_FIB=y -CONFIG_RTE_LIBRTE_FIB_DEBUG=n - -# -# Compile librte_lpm -# -CONFIG_RTE_LIBRTE_LPM=y -CONFIG_RTE_LIBRTE_LPM_DEBUG=n - -# -# Compile librte_acl -# -CONFIG_RTE_LIBRTE_ACL=y -CONFIG_RTE_LIBRTE_ACL_DEBUG=n - -# -# Compile librte_power -# -CONFIG_RTE_LIBRTE_POWER=n -CONFIG_RTE_LIBRTE_POWER_DEBUG=n -CONFIG_RTE_MAX_LCORE_FREQS=64 - -# -# Compile librte_net -# -CONFIG_RTE_LIBRTE_NET=y - -# -# Compile librte_ip_frag -# -CONFIG_RTE_LIBRTE_IP_FRAG=y -CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n -CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4 -CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n - -# -# Compile GRO library -# -CONFIG_RTE_LIBRTE_GRO=y - -# -# Compile GSO library -# -CONFIG_RTE_LIBRTE_GSO=y - -# -# Compile librte_meter -# -CONFIG_RTE_LIBRTE_METER=y - -# -# Compile librte_classify -# -CONFIG_RTE_LIBRTE_FLOW_CLASSIFY=y - -# -# Compile librte_sched -# -CONFIG_RTE_LIBRTE_SCHED=y -CONFIG_RTE_SCHED_DEBUG=n -CONFIG_RTE_SCHED_RED=n -CONFIG_RTE_SCHED_COLLECT_STATS=n -CONFIG_RTE_SCHED_SUBPORT_TC_OV=n -CONFIG_RTE_SCHED_PORT_N_GRINDERS=8 -CONFIG_RTE_SCHED_VECTOR=n - -# -# Compile the distributor library -# -CONFIG_RTE_LIBRTE_DISTRIBUTOR=y - -# -# Compile the reorder library -# -CONFIG_RTE_LIBRTE_REORDER=y - -# -# Compile librte_port -# -CONFIG_RTE_LIBRTE_PORT=y -CONFIG_RTE_PORT_STATS_COLLECT=n -CONFIG_RTE_PORT_PCAP=n - -# -# Compile librte_table -# -CONFIG_RTE_LIBRTE_TABLE=y -CONFIG_RTE_TABLE_STATS_COLLECT=n - -# -# Compile librte_pipeline -# -CONFIG_RTE_LIBRTE_PIPELINE=y -CONFIG_RTE_PIPELINE_STATS_COLLECT=n - -# -# Compile librte_kni -# -CONFIG_RTE_LIBRTE_KNI=n -CONFIG_RTE_LIBRTE_PMD_KNI=n -CONFIG_RTE_KNI_KMOD=n -CONFIG_RTE_KNI_PREEMPT_DEFAULT=y - -# -# Compile the pdump library -# -CONFIG_RTE_LIBRTE_PDUMP=y - -# -# Compile vhost user library -# -CONFIG_RTE_LIBRTE_VHOST=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n -CONFIG_RTE_LIBRTE_VHOST_DEBUG=n - -# -# Compile vhost PMD -# To compile, CONFIG_RTE_LIBRTE_VHOST should be enabled. -# -CONFIG_RTE_LIBRTE_PMD_VHOST=n - -# -# Compile IFC driver -# To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO -# should be enabled. -# -CONFIG_RTE_LIBRTE_IFC_PMD=n - -# -# Compile librte_bpf -# -CONFIG_RTE_LIBRTE_BPF=y -# allow load BPF from ELF files (requires libelf) -CONFIG_RTE_LIBRTE_BPF_ELF=n - -# -# Compile librte_ipsec -# -CONFIG_RTE_LIBRTE_IPSEC=y - -# -# Compile librte_graph -# -CONFIG_RTE_LIBRTE_GRAPH=y -CONFIG_RTE_GRAPH_BURST_SIZE=256 -CONFIG_RTE_LIBRTE_GRAPH_STATS=y - -# -# Compile librte_node -# -CONFIG_RTE_LIBRTE_NODE=y - -# -# Compile the test application -# -CONFIG_RTE_APP_TEST=y -CONFIG_RTE_APP_TEST_RESOURCE_TAR=n - -# -# Compile the procinfo application -# -CONFIG_RTE_PROC_INFO=n - -# -# Compile the PMD test application -# -CONFIG_RTE_TEST_PMD=y -CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n -CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n - -# -# Compile the rte flow perf application -# -CONFIG_RTE_TEST_FLOW_PERF=y - -# -# Compile the bbdev test application -# -CONFIG_RTE_TEST_BBDEV=y - -# -# Compile the compression performance application -# -CONFIG_RTE_APP_COMPRESS_PERF=y - -# -# Compile the crypto performance application -# -CONFIG_RTE_APP_CRYPTO_PERF=y - -# -# Compile the eventdev application -# -CONFIG_RTE_APP_EVENTDEV=y diff --git a/config/common_freebsd b/config/common_freebsd deleted file mode 100644 index 456b394c4d..0000000000 --- a/config/common_freebsd +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="bsdapp" -CONFIG_RTE_EXEC_ENV_BSDAPP=y -CONFIG_RTE_EXEC_ENV_FREEBSD=y - -# -# FreeBSD contiguous memory driver settings -# -CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64 -CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2 -CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024 diff --git a/config/common_linux b/config/common_linux deleted file mode 100644 index 816810671a..0000000000 --- a/config/common_linux +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="linuxapp" -CONFIG_RTE_EXEC_ENV_LINUX=y -CONFIG_RTE_EXEC_ENV_LINUXAPP=y - -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y -CONFIG_RTE_EAL_VFIO=y -CONFIG_RTE_LIBRTE_KNI=y -CONFIG_RTE_LIBRTE_PMD_KNI=y -CONFIG_RTE_LIBRTE_VHOST=y -CONFIG_RTE_LIBRTE_VHOST_NUMA=y -CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n -CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFC_PMD=y -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y -CONFIG_RTE_LIBRTE_PMD_MEMIF=y -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y -CONFIG_RTE_LIBRTE_PMD_TAP=y -CONFIG_RTE_LIBRTE_AVP_PMD=y -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y -CONFIG_RTE_LIBRTE_NFP_PMD=y -CONFIG_RTE_LIBRTE_POWER=y -CONFIG_RTE_VIRTIO_USER=y -CONFIG_RTE_PROC_INFO=y - -CONFIG_RTE_LIBRTE_VMBUS=y -CONFIG_RTE_LIBRTE_NETVSC_PMD=y - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=y - -# NXP DPAA BUS and drivers -CONFIG_RTE_LIBRTE_DPAA_BUS=y -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y - -# NXP FSLMC BUS and DPAA2 drivers -CONFIG_RTE_LIBRTE_FSLMC_BUS=y -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA2_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y - -# -# NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=y - -# -# HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=y - -# -# Hisilicon HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=y diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc deleted file mode 120000 index 84619de43a..0000000000 --- a/config/defconfig_arm-armv7a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm-armv7a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc deleted file mode 100644 index ac91120868..0000000000 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All right reserved. - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv7a" - -CONFIG_RTE_ARCH="arm" -CONFIG_RTE_ARCH_ARM=y -CONFIG_RTE_ARCH_ARMv7=y -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a9" - -# Accelerate memcpy operations. Consider enabling for Cortex-A15. -# For Cortex-A7 and Cortex-A9, It might accelerate short data copies (< 64 B). -CONFIG_RTE_ARCH_ARM_NEON_MEMCPY=n - -CONFIG_RTE_FORCE_INTRINSICS=y -CONFIG_RTE_ARCH_STRICT_ALIGN=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# NUMA is not supported on ARM -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# ARM doesn't have support for vmware TSC map -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# KNI is not supported on 32-bit -CONFIG_RTE_LIBRTE_KNI=n - -# cannot use those on ARM -CONFIG_RTE_LIBRTE_ARK_PMD=n -CONFIG_RTE_LIBRTE_EM_PMD=n -CONFIG_RTE_LIBRTE_IGB_PMD=n -CONFIG_RTE_LIBRTE_CXGBE_PMD=n -CONFIG_RTE_LIBRTE_E1000_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_QEDE_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_arm64-armada-linux-gcc b/config/defconfig_arm64-armada-linux-gcc deleted file mode 120000 index 64ce2a5687..0000000000 --- a/config/defconfig_arm64-armada-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armada-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armada-linuxapp-gcc b/config/defconfig_arm64-armada-linuxapp-gcc deleted file mode 100644 index a49bebe374..0000000000 --- a/config/defconfig_arm64-armada-linuxapp-gcc +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Enable PMDs -CONFIG_RTE_LIBRTE_MVEP_COMMON=y -CONFIG_RTE_LIBRTE_MVPP2_PMD=y -CONFIG_RTE_LIBRTE_MVNETA_PMD=y -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y - -# Disable NXP as it is conflict with MUSDK -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n -CONFIG_RTE_LIBRTE_FSLMC_BUS=n -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n -CONFIG_RTE_LIBRTE_PFE_PMD=n -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang deleted file mode 120000 index 196808b982..0000000000 --- a/config/defconfig_arm64-armv8a-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linux-gcc b/config/defconfig_arm64-armv8a-linux-gcc deleted file mode 120000 index 0949519562..0000000000 --- a/config/defconfig_arm64-armv8a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang b/config/defconfig_arm64-armv8a-linuxapp-clang deleted file mode 100644 index d3b4dad532..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-clang +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc deleted file mode 100644 index 58c4a4029a..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_MAX_LCORE=256 diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc deleted file mode 120000 index dad37d5e79..0000000000 --- a/config/defconfig_arm64-bluefield-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-bluefield-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-bluefield-linuxapp-gcc b/config/defconfig_arm64-bluefield-linuxapp-gcc deleted file mode 100644 index b496538819..0000000000 --- a/config/defconfig_arm64-bluefield-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Mellanox BlueField -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# UMA architecture -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# PMD for ConnectX-5 -CONFIG_RTE_LIBRTE_MLX5_PMD=y diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc deleted file mode 120000 index dc05caacf3..0000000000 --- a/config/defconfig_arm64-dpaa-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-dpaa-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc deleted file mode 100644 index 4ae4cd8502..0000000000 --- a/config/defconfig_arm64-dpaa-linuxapp-gcc +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 Freescale Semiconductor, Inc. -# Copyright 2017-2019 NXP - -#include "defconfig_arm64-armv8a-linux-gcc" - -# NXP (Freescale) - Soc Architecture for DPAA or DPAA2 support -# DPAA - FMAN, QMAN & BMAN support (e.g. LS1043, LS1046) -# DPAA2 - WRIOP and QBMAN (e.g. LS1088, LS2088, LX2160 etc) -# -CONFIG_RTE_MACHINE="dpaa" -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Enable PHY mode when using VM-VFIO target -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc deleted file mode 120000 index 21894a31a8..0000000000 --- a/config/defconfig_arm64-emag-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-emag-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc deleted file mode 100644 index 1db654c899..0000000000 --- a/config/defconfig_arm64-emag-linuxapp-gcc +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="emag" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=32 diff --git a/config/defconfig_arm64-n1sdp-linux-gcc b/config/defconfig_arm64-n1sdp-linux-gcc deleted file mode 120000 index 103bbea90f..0000000000 --- a/config/defconfig_arm64-n1sdp-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-n1sdp-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-n1sdp-linuxapp-gcc b/config/defconfig_arm64-n1sdp-linuxapp-gcc deleted file mode 100644 index f9138093b5..0000000000 --- a/config/defconfig_arm64-n1sdp-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="n1sdp" -CONFIG_RTE_MAX_LCORE=4 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-octeontx2-linux-gcc b/config/defconfig_arm64-octeontx2-linux-gcc deleted file mode 120000 index e251505311..0000000000 --- a/config/defconfig_arm64-octeontx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-octeontx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc deleted file mode 100644 index 0d83becf54..0000000000 --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="octeontx2" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=36 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Max supported NIX LFs -CONFIG_RTE_MAX_VFIO_GROUPS=128 diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc deleted file mode 120000 index 829dd65f05..0000000000 --- a/config/defconfig_arm64-stingray-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-stingray-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc deleted file mode 100644 index 2a6f6cee28..0000000000 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) Broadcom 2017-2018. All rights reserved. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Broadcom - Stingray -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -CONFIG_RTE_EAL_IGB_UIO=y diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc deleted file mode 120000 index 1b9c4ad211..0000000000 --- a/config/defconfig_arm64-thunderx-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc deleted file mode 100644 index 946906b67a..0000000000 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx" - -CONFIG_RTE_USE_C11_MEM_MODEL=n -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=96 -CONFIG_RTE_MAX_VFIO_GROUPS=128 - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y diff --git a/config/defconfig_arm64-thunderx2-linux-gcc b/config/defconfig_arm64-thunderx2-linux-gcc deleted file mode 120000 index b40a760b1d..0000000000 --- a/config/defconfig_arm64-thunderx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc b/config/defconfig_arm64-thunderx2-linuxapp-gcc deleted file mode 100644 index af4a89c480..0000000000 --- a/config/defconfig_arm64-thunderx2-linuxapp-gcc +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx2" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=256 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc deleted file mode 120000 index d5e8b5e550..0000000000 --- a/config/defconfig_arm64-xgene1-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-xgene1-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-xgene1-linuxapp-gcc b/config/defconfig_arm64-xgene1-linuxapp-gcc deleted file mode 100644 index fbf576c4aa..0000000000 --- a/config/defconfig_arm64-xgene1-linuxapp-gcc +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="xgene1" -CONFIG_RTE_CACHE_LINE_SIZE=64 diff --git a/config/defconfig_i686-native-linux-gcc b/config/defconfig_i686-native-linux-gcc deleted file mode 120000 index 927141d5dd..0000000000 --- a/config/defconfig_i686-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_i686-native-linux-icc b/config/defconfig_i686-native-linux-icc deleted file mode 120000 index e6a466b3e3..0000000000 --- a/config/defconfig_i686-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc deleted file mode 100644 index 61ea1606f4..0000000000 --- a/config/defconfig_i686-native-linuxapp-gcc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc deleted file mode 100644 index 7f614d3467..0000000000 --- a/config/defconfig_i686-native-linuxapp-icc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc deleted file mode 120000 index 580c92e12e..0000000000 --- a/config/defconfig_ppc_64-power8-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_ppc_64-power8-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc deleted file mode 100644 index c917c47746..0000000000 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -#include "common_linux" - -CONFIG_RTE_MACHINE="power8" - -CONFIG_RTE_ARCH="ppc_64" -CONFIG_RTE_ARCH_PPC_64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_MAX_LCORE=1536 -CONFIG_RTE_MAX_NUMA_NODES=32 -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# Note: Power doesn't have this support -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# Note: Initially, all of the PMD drivers compilation are turned off on Power -# Will turn on them only after the successful testing on Power -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=n -CONFIG_RTE_LIBRTE_IXGBE_PMD=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang deleted file mode 100644 index 7204738e14..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc deleted file mode 100644 index b24e2e6d5a..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang deleted file mode 120000 index 76115fd5a6..0000000000 --- a/config/defconfig_x86_64-native-freebsd-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-freebsd-gcc b/config/defconfig_x86_64-native-freebsd-gcc deleted file mode 120000 index 72dd4b44be..0000000000 --- a/config/defconfig_x86_64-native-freebsd-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-clang b/config/defconfig_x86_64-native-linux-clang deleted file mode 120000 index 3bcf89d6a4..0000000000 --- a/config/defconfig_x86_64-native-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-gcc b/config/defconfig_x86_64-native-linux-gcc deleted file mode 120000 index d707965941..0000000000 --- a/config/defconfig_x86_64-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-icc b/config/defconfig_x86_64-native-linux-icc deleted file mode 120000 index a36b47131a..0000000000 --- a/config/defconfig_x86_64-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang deleted file mode 100644 index 7508c0f2da..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc deleted file mode 100644 index db67066a57..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc deleted file mode 100644 index 8aa7af7e20..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-icc +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# Solarflare PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# HINIC PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc deleted file mode 120000 index 7ea00cecb3..0000000000 --- a/config/defconfig_x86_x32-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_x32-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc deleted file mode 100644 index c188f4331c..0000000000 --- a/config/defconfig_x86_x32-native-linuxapp-gcc +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_x32" -CONFIG_RTE_ARCH_X86_X32=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 12/37] examples: remove old build system references 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (10 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 11/37] config: remove all config files used by make Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 13/37] buildtools: remove all scripts for use with make Ciara Power ` (24 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Bruce Richardson, Konstantin Ananyev, Marko Kovacevic, Ori Kam, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh Remove the references to RTE_SDK and RTE_TARGET environment variables from the build instructions in the comments of the various BPF files, and in the ipsec-secgw common definition script. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- Ask for maintainer to review changes and suggest alternatives to the values added in replacement of environment variables. --- examples/bpf/t2.c | 6 ++++-- examples/bpf/t3.c | 10 ++++++---- examples/ipsec-secgw/test/common_defs.sh | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/bpf/t2.c b/examples/bpf/t2.c index 9878eaf7bd..b9bce746c0 100644 --- a/examples/bpf/t2.c +++ b/examples/bpf/t2.c @@ -9,8 +9,10 @@ * (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED). * Doesn't touch contents of packet data. * To compile: - * clang -O2 -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * clang -O2 -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file, e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include <stdint.h> diff --git a/examples/bpf/t3.c b/examples/bpf/t3.c index f58ff64b3b..66faf80cc5 100644 --- a/examples/bpf/t3.c +++ b/examples/bpf/t3.c @@ -8,13 +8,15 @@ * Dump the mbuf into stdout if it is an ARP packet (aka tcpdump 'arp'). * * To compile on x86: - * clang -O2 -U __GNUC__ -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t3.c + * clang -O2 -U __GNUC__ -target bpf -Wno-int-to-void-pointer-cast -c t3.c * * To compile on ARM: - * clang -O2 -I/usr/include/aarch64-linux-gnu \ - * -I${RTE_SDK}/${RTE_TARGET}/include -target bpf \ + * clang -O2 -I/usr/include/aarch64-linux-gnu -target bpf \ * -Wno-int-to-void-pointer-cast -c t3.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file to above commands, + * e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include <stdint.h> diff --git a/examples/ipsec-secgw/test/common_defs.sh b/examples/ipsec-secgw/test/common_defs.sh index df680805b8..f22eb3ab12 100644 --- a/examples/ipsec-secgw/test/common_defs.sh +++ b/examples/ipsec-secgw/test/common_defs.sh @@ -34,8 +34,8 @@ LOCAL_IPV4=192.168.31.92 REMOTE_IPV6=fd12:3456:789a:0031:0000:0000:0000:0014 LOCAL_IPV6=fd12:3456:789a:0031:0000:0000:0000:0092 -DPDK_PATH=${RTE_SDK:-${PWD}} -DPDK_BUILD=${RTE_TARGET:-x86_64-native-linux-gcc} +DPDK_PATH=${PWD} +DPDK_BUILD="build" DPDK_VARS="" # by default ipsec-secgw can't deal with multi-segment packets -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 13/37] buildtools: remove all scripts for use with make 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (11 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 12/37] examples: remove old build system references Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 14/37] devtools: remove use of make in scripts Ciara Power ` (23 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon Make is no longer supported for compiling DPDK, scripts used with make are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 4 -- buildtools/auto-config-h.sh | 108 ------------------------------------ buildtools/gen-build-mk.sh | 23 -------- buildtools/gen-config-h.sh | 15 ----- buildtools/relpath.sh | 76 ------------------------- 5 files changed, 226 deletions(-) delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100755 buildtools/relpath.sh diff --git a/MAINTAINERS b/MAINTAINERS index ccaecabea0..392150fc3b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -102,10 +102,6 @@ Build System M: Thomas Monjalon <thomas@monjalon.net> F: Makefile F: config/ -F: buildtools/auto-config-h.sh -F: buildtools/gen-build-mk.sh -F: buildtools/gen-config-h.sh -F: buildtools/relpath.sh F: doc/build-sdk-quick.txt F: doc/guides/prog_guide/build_app.rst F: doc/guides/prog_guide/dev_kit_* diff --git a/buildtools/auto-config-h.sh b/buildtools/auto-config-h.sh deleted file mode 100755 index 5b613c35fc..0000000000 --- a/buildtools/auto-config-h.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2015 6WIND S.A. -# -# Crude script to detect whether particular types, macros and functions are -# defined by trying to compile a file with a given header. Can be used to -# perform cross-platform checks since the resulting object file is not -# executed. -# -# Set VERBOSE=1 in the environment to display compiler output and errors. -# -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS and EXTRA_CFLAGS are taken from the -# environment. -# -# AUTO_CONFIG_CFLAGS may append additional CFLAGS without modifying the -# above variables. - -file=${1:?output file name required (config.h)} -macro=${2:?output macro name required (HAVE_*)} -include=${3:?include name required (foo.h)} -type=${4:?object type required (define, enum, type, field, func)} -name=${5:?define/type/function name required} - -: ${CC:=cc} - -temp=$(mktemp -t dpdk.${0##*/}.c.XXXXXX) - -case $type in -define) - code="\ -#ifndef $name -#error $name not defined -#endif -" - ;; -enum) - code="\ -long test____ = $name; -" - ;; -type) - code="\ -$name test____; -" - ;; -field) - code="\ -void test____(void) -{ - ${name%%.*} test_____; - - (void)test_____.${name#*.}; -} -" - ;; -func) - code="\ -void (*test____)() = (void (*)())$name; -" - ;; -*) - unset error - : ${error:?unknown object type \"$type\"} - exit -esac - -if [ "${VERBOSE}" = 1 ] -then - err=2 - out=1 - eol=' -' -else - exec 3> /dev/null || - exit - err=3 - out=3 - eol=' ' -fi && -printf 'Looking for %s %s in %s.%s' \ - "${name}" "${type}" "${include}" "${eol}" && -printf "\ -#include <%s> - -%s -" "$include" "$code" > "${temp}" && -if ${CC} ${CPPFLAGS} ${EXTRA_CPPFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ - ${AUTO_CONFIG_CFLAGS} \ - -xc -c -o ${temp}.o "${temp}" 1>&${out} 2>&${err} -then - rm -f "${temp}" "${temp}.o" - printf "\ -#ifndef %s -#define %s 1 -#endif /* %s */ - -" "${macro}" "${macro}" "${macro}" >> "${file}" && - printf 'Defining %s.\n' "${macro}" -else - rm -f "${temp}" "${temp}.o" - printf "\ -/* %s is not defined. */ - -" "${macro}" >> "${file}" && - printf 'Not defining %s.\n' "${macro}" -fi - -exit diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh deleted file mode 100755 index 636920b638..0000000000 --- a/buildtools/gen-build-mk.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# Auto-generate a Makefile in build directory -# Args: -# $1: path of project src root - -echo "# Automatically generated by gen-build-mk.sh" -echo -echo "ifdef O" -echo "ifeq (\"\$(origin O)\", \"command line\")" -echo "\$(error \"Cannot specify O= as you are already in a build directory\")" -echo "endif" -echo "endif" -echo -echo "MAKEFLAGS += --no-print-directory" -echo -echo "all:" -echo " @\$(MAKE) -C $1 O=\$(CURDIR)" -echo -echo "%::" -echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@" diff --git a/buildtools/gen-config-h.sh b/buildtools/gen-config-h.sh deleted file mode 100755 index a8c2006339..0000000000 --- a/buildtools/gen-config-h.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -echo "#ifndef __RTE_CONFIG_H" -echo "#define __RTE_CONFIG_H" -grep CONFIG_ $1 | -grep -v '^[ \t]*#' | -sed 's,CONFIG_\(.*\)=y.*$,#undef \1\ -#define \1 1,' | -sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' | -sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\ -#define \1 \2,' | -sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,' -echo "#endif /* __RTE_CONFIG_H */" diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh deleted file mode 100755 index 02953837a2..0000000000 --- a/buildtools/relpath.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# print the relative path of $1 from $2 directory -# $1 and $2 MUST be absolute paths -# - -if [ $# -ne 2 ]; then - echo "Bad arguments" - echo "Usage:" - echo " $0 path1 path2" - exit 1 -fi - -# get the real absolute path, derefencing symlinks -ABS1="$(dirname $(readlink -f $1))/$(basename $1)" -ABS2=$(readlink -f $2) - -# remove leading slash -REL1=${ABS1#/} -REL2=${ABS2#/} - -left1=${REL1%%/*} -right1=${REL1#*/} -prev_right1=$REL1 -prev_left1= - -left2=${REL2%%/*} -right2=${REL2#*/} -prev_right2=$REL2 -prev_left2= - -prefix= - -while [ "${right1}" != "" -a "${right2}" != "" ]; do - - if [ "$left1" != "$left2" ]; then - break - fi - - prev_left1=$left1 - left1=$left1/${right1%%/*} - prev_right1=$right1 - right1=${prev_right1#*/} - if [ "$right1" = "$prev_right1" ]; then - right1="" - fi - - prev_left2=$left2 - left2=$left2/${right2%%/*} - prev_right2=$right2 - right2=${prev_right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -if [ "${left1}" != "${left2}" ]; then - right2=${prev_right2} - right1=${prev_right1} -fi - -while [ "${right2}" != "" ]; do - prefix=${prefix}../ - prev_right2=$right2 - right2=${right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -echo ${prefix}${right1} - -exit 0 -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 14/37] devtools: remove use of make in scripts 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (12 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 13/37] buildtools: remove all scripts for use with make Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 15/37] app/test: remove references to make Ciara Power ` (22 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon Make is no longer supported, the test script for make builds is no longer required. Uses of make in other tool scripts are replaced. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 1 - devtools/build-tags.sh | 14 +- devtools/check-includes.sh | 3 +- devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 315 ------------------------------------- 5 files changed, 4 insertions(+), 331 deletions(-) delete mode 100755 devtools/test-build.sh diff --git a/MAINTAINERS b/MAINTAINERS index 392150fc3b..0fec96558e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,7 +90,6 @@ F: devtools/checkpatches.sh F: devtools/get-maintainer.sh F: devtools/git-log-fixes.sh F: devtools/load-devel-config -F: devtools/test-build.sh F: devtools/test-meson-builds.sh F: devtools/words-case.txt F: license/ diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index 276fff647b..614ce4c3a4 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -19,8 +19,8 @@ arm_64=true print_usage() { echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]" - echo "Valid configs are:" - make showconfigs | sed 's,^,\t,' + echo "Examples of valid configs are: " + echo "x86_64-native-linux-gcc, arm64-armv8a-linux-gcc, ppc_64-power8-linux-gcc" } # Move to the root of the git tree @@ -125,17 +125,7 @@ ppc_64_sources() find_sources "$source_dirs" '*altivec*.[chS]' } -check_valid_target() -{ - if [ ! -f "config/defconfig_$1" ] ; then - echo "Invalid config: $1" - print_usage - exit 0 - fi -} - if [ -n "$2" ]; then - check_valid_target $2 echo $2 | grep -q "linux" || linux=false echo $2 | grep -q "bsd" || bsd=false diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh index 749b9b26d2..15594f08a3 100755 --- a/devtools/check-includes.sh +++ b/devtools/check-includes.sh @@ -17,8 +17,7 @@ # # SUMMARY=1 is the same as -s. # -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and -# EXTRA_CXXFLAGS are taken into account. +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account. # # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict # C/C++ compilation flags. diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 6d468d6731..210c8dcf25 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -50,7 +50,7 @@ commit_version () # <hash> head -n1) if [ -z "$tag" ] ; then # before -rc1 tag of release in progress - make showversion | cut -d'.' -f-2 + cat VERSION | cut -d'.' -f-2 else echo $tag | sed 's,^v,,' | sed 's,-rc.*,,' fi diff --git a/devtools/test-build.sh b/devtools/test-build.sh deleted file mode 100755 index f013656024..0000000000 --- a/devtools/test-build.sh +++ /dev/null @@ -1,315 +0,0 @@ -#! /bin/sh -e -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. - -default_path=$PATH - -# Load config options: -# - ARMV8_CRYPTO_LIB_PATH -# - DPDK_ABI_REF_DIR -# - DPDK_ABI_REF_VERSION -# - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) -# - DPDK_BUILD_TEST_DIR -# - DPDK_DEP_ARCHIVE -# - DPDK_DEP_BPF (y/[n]) -# - DPDK_DEP_CFLAGS -# - DPDK_DEP_ELF (y/[n]) -# - DPDK_DEP_FDT (y/[n]) -# - DPDK_DEP_ISAL (y/[n]) -# - DPDK_DEP_JSON (y/[n]) -# - DPDK_DEP_LDFLAGS -# - DPDK_DEP_MLX (y/[n]) -# - DPDK_DEP_NFB (y/[n]) -# - DPDK_DEP_NUMA ([y]/n) -# - DPDK_DEP_PCAP (y/[n]) -# - DPDK_DEP_SSL (y/[n]) -# - DPDK_DEP_IPSEC_MB (y/[n]) -# - DPDK_DEP_SZE (y/[n]) -# - DPDK_DEP_ZLIB (y/[n]) -# - DPDK_MAKE_JOBS (int) -# - DPDK_NOTIFY (notify-send) -# - FLEXRAN_SDK -# - LIBMUSDK_PATH -devtools_dir=$(dirname $(readlink -f $0)) -. $devtools_dir/load-devel-config - -print_usage () { - echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]" -} - -print_help () { - echo 'Test building several targets with different options' - echo - print_usage - cat <<- END_OF_HELP - - options: - -h this help - -jX use X parallel jobs in "make" - -s short test only first config without tests|examples|doc - -v verbose build - - config: defconfig[[~][+]option1[[~][+]option2...]] - Example: x86_64-native-linux-gcc+debug~RXTX_CALLBACKS - The lowercase options are defined inside $(basename $0). - The uppercase options can be the end of a defconfig option - to enable if prefixed with '+' or to disable if prefixed with '~'. - Default is to automatically enable most of the options. - The external dependencies are setup with DPDK_DEP_* variables. - If no config on command line, DPDK_BUILD_TEST_CONFIGS is used. - END_OF_HELP -} - -[ -z $MAKE ] && command -v gmake > /dev/null && MAKE=gmake -[ -z $MAKE ] && command -v make > /dev/null && MAKE=make -[ -z $MAKE ] && echo "Cannot find make or gmake" && exit 1 - -J=$DPDK_MAKE_JOBS -builds_dir=${DPDK_BUILD_TEST_DIR:-.} -short=false -unset verbose -while getopts hj:sv ARG ; do - case $ARG in - j ) J=$OPTARG ;; - s ) short=true ;; - v ) verbose='V=1' ;; - h ) print_help ; exit 0 ;; - ? ) print_usage ; exit 1 ;; - esac -done -shift $(($OPTIND - 1)) -configs=${*:-$DPDK_BUILD_TEST_CONFIGS} - -success=false -on_exit () -{ - if $success ; then - [ "$DPDK_NOTIFY" != notify-send ] || \ - notify-send -u low --icon=dialog-information 'DPDK build' 'finished' - elif [ -z "$signal" ] ; then - [ -z "$dir" ] || echo "failed to build $dir" >&2 - [ "$DPDK_NOTIFY" != notify-send ] || \ - notify-send -u low --icon=dialog-error 'DPDK build' 'failed' - fi -} -# catch manual interrupt to ignore notification -trap "signal=INT ; trap - INT ; kill -INT $$" INT -# notify result on exit -trap on_exit EXIT - -cd $devtools_dir/.. - -reset_env () -{ - export PATH=$default_path - unset CROSS - unset DPDK_DEP_ARCHIVE - unset DPDK_DEP_BPF - unset DPDK_DEP_CFLAGS - unset DPDK_DEP_ELF - unset DPDK_DEP_FDT - unset DPDK_DEP_ISAL - unset DPDK_DEP_JSON - unset DPDK_DEP_LDFLAGS - unset DPDK_DEP_MLX - unset DPDK_DEP_NFB - unset DPDK_DEP_NUMA - unset DPDK_DEP_PCAP - unset DPDK_DEP_SSL - unset DPDK_DEP_IPSEC_MB - unset DPDK_DEP_SZE - unset DPDK_DEP_ZLIB - unset ARMV8_CRYPTO_LIB_PATH - unset FLEXRAN_SDK - unset LIBMUSDK_PATH - unset PQOS_INSTALL_PATH -} - -config () # <directory> <target> <options> -{ - reconfig=false - if git rev-parse 2>&- && [ -n "$(git diff HEAD~ -- config)" ] ; then - echo 'Default config may have changed' - reconfig=true - fi - if [ ! -e $1/.config ] || $reconfig ; then - echo "================== Configure $1" - ${MAKE} T=$2 O=$1 config - - echo 'Customize configuration' - # Built-in options (lowercase) - ! echo $3 | grep -q '+default' || \ - sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config - ! echo $3 | grep -q '+kmods' || \ - sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config - echo $3 | grep -q '+next' || \ - sed -ri="" 's,(NEXT_ABI=)y,\1n,' $1/.config - ! echo $3 | grep -q '+shared' || \ - sed -ri="" 's,(SHARED_LIB=)n,\1y,' $1/.config - ! echo $3 | grep -q '+debug' || ( \ - sed -ri="" 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config - sed -ri="" 's,(_DEBUG.*=)n,\1y,' $1/.config - sed -ri="" 's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config - sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) - - # Automatic configuration - ! echo $2 | grep -q 'arm64' || \ - sed -ri="" 's,(ARM_USE_WFE=)n,\1y,' $1/.config - test "$DPDK_DEP_NUMA" != n || \ - sed -ri="" 's,(NUMA.*=)y,\1n,' $1/.config - sed -ri="" 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config - sed -ri="" 's,(BYPASS=)n,\1y,' $1/.config - test "$DPDK_DEP_ARCHIVE" != y || \ - sed -ri="" 's,(RESOURCE_TAR=)n,\1y,' $1/.config - test "$DPDK_DEP_BPF" != y || \ - sed -ri="" 's,(PMD_AF_XDP=)n,\1y,' $1/.config - test "$DPDK_DEP_FDT" != y || \ - sed -ri="" 's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config - test "$DPDK_DEP_FDT" != y || \ - sed -ri="" 's,(IPN3KE_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ISAL" != y || \ - sed -ri="" 's,(PMD_ISAL=)n,\1y,' $1/.config - test "$DPDK_DEP_MLX" != y || \ - sed -ri="" 's,(MLX.*_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_NFB" != y || \ - sed -ri="" 's,(NFB_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_SZE" != y || \ - sed -ri="" 's,(PMD_SZEDATA2=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(BNX2X_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(PMD_ZLIB=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config - test "$DPDK_DEP_PCAP" != y || \ - sed -ri="" 's,(PCAP=)n,\1y,' $1/.config - test -z "$ARMV8_CRYPTO_LIB_PATH" || \ - sed -ri="" 's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_AESNI_MB=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_ZUC=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_KASUMI=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_SNOW3G=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(PMD_CCP=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(PMD_OPENSSL=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(QAT_SYM=)n,\1y,' $1/.config - test -z "$FLEXRAN_SDK" || \ - sed -ri="" 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config - sed -ri="" 's,(SCHED_.*=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(PMD_MVSAM_CRYPTO=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(MVPP2_PMD=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(MVNETA_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ELF" != y || \ - sed -ri="" 's,(BPF_ELF=)n,\1y,' $1/.config - test "$DPDK_DEP_JSON" != y || \ - sed -ri="" 's,(TELEMETRY=)n,\1y,' $1/.config - build_config_hook $1 $2 $3 - - # Explicit enabler/disabler (uppercase) - for option in $(echo $3 | sed 's,[~+], &,g') ; do - pattern=$(echo $option | cut -c2-) - if echo $option | grep -q '^~' ; then - sed -ri="" "s,($pattern=)y,\1n," $1/.config - elif echo $option | grep -q '^+' ; then - sed -ri="" "s,($pattern=)n,\1y," $1/.config - fi - done - fi -} - -# default empty hook to override in devel config -build_config_hook () # <directory> <target> <options> -{ - : -} - -for conf in $configs ; do - target=$(echo $conf | sed 's,[~+].*,,') - # reload config with DPDK_TARGET set - DPDK_TARGET=$target - reset_env - . $devtools_dir/load-devel-config - - options=$(echo $conf | sed 's,[^~+]*,,') - dir=$builds_dir/$conf - config $dir $target $options - - echo "================== Build $conf" - ${MAKE} -j$J EXTRA_CFLAGS="-Wfatal-errors -g $DPDK_DEP_CFLAGS" \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir - ! $short || break - export RTE_TARGET=$target - rm -rf $dir/install - ${MAKE} install O=$dir DESTDIR=$dir/install prefix= - echo "================== Build examples for $conf" - export RTE_SDK=$(readlink -f $dir)/install/share/dpdk - ln -sTf $(pwd)/lib $RTE_SDK/lib # workaround for vm_power_manager - grep -q 'SHARED_LIB=n' $dir/.config || # skip examples with static libs - ${MAKE} -j$J -sC examples \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \ - O=$(readlink -f $dir)/examples - unset RTE_TARGET - grep -q 'SHARED_LIB=n' $dir/.config || # skip ABI check with static libs - if [ -n "$DPDK_ABI_REF_VERSION" ]; then - abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION - if [ ! -d $abirefdir/$conf ]; then - # clone current sources - if [ ! -d $abirefdir/src ]; then - git clone --local --no-hardlinks \ - --single-branch \ - -b $DPDK_ABI_REF_VERSION \ - $(pwd) $abirefdir/src - fi - - cd $abirefdir/src - - rm -rf $abirefdir/build - config $abirefdir/build $target $options - - echo -n "================== Build $conf " - echo "($DPDK_ABI_REF_VERSION)" - ${MAKE} -j$J \ - EXTRA_CFLAGS="-Wno-error -g $DPDK_DEP_CFLAGS" \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \ - O=$abirefdir/build - export RTE_TARGET=$target - ${MAKE} install O=$abirefdir/build \ - DESTDIR=$abirefdir/$conf \ - prefix= - unset RTE_TARGET - $devtools_dir/gen-abi.sh $abirefdir/$conf - - # back to current workdir - cd $devtools_dir/.. - fi - - echo "================== Check ABI $conf" - $devtools_dir/gen-abi.sh $dir/install - $devtools_dir/check-abi.sh $abirefdir/$conf $dir/install - fi - echo "################## $conf done." - unset dir -done - -if ! $short ; then - mkdir -p .check - echo "================== Build doxygen HTML API" - ${MAKE} doc-api-html >/dev/null 2>.check/doc.txt - echo "================== Build sphinx HTML guides" - ${MAKE} doc-guides-html >/dev/null 2>>.check/doc.txt - echo "================== Check docs" - diff -u /dev/null .check/doc.txt -fi - -success=true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 15/37] app/test: remove references to make 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (13 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 14/37] devtools: remove use of make in scripts Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 16/37] drivers: remove references to make config options Ciara Power ` (21 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Nicolas Chautru, Declan Doherty Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options are no longer in use. Signed-off-by: Ciara Power <ciara.power@intel.com> --- Ask for maintainer to review changes and suggest alternatives to the values added in replacement of environment variables. --- app/test-bbdev/test-bbdev.py | 11 +---- app/test/test_cryptodev.c | 89 +++++++++------------------------- app/test/test_cryptodev_asym.c | 18 ++----- 3 files changed, 28 insertions(+), 90 deletions(-) diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index 5ae2dc6c49..bfd8a4dcc8 100755 --- a/app/test-bbdev/test-bbdev.py +++ b/app/test-bbdev/test-bbdev.py @@ -20,15 +20,8 @@ def kill(process): print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) print("Please use Python 3 instead", file=sys.stderr) -if "RTE_SDK" in os.environ: - dpdk_path = os.environ["RTE_SDK"] -else: - dpdk_path = "../.." - -if "RTE_TARGET" in os.environ: - dpdk_target = os.environ["RTE_TARGET"] -else: - dpdk_target = "x86_64-native-linux-gcc" +dpdk_path = "../.." +dpdk_target = "build" parser = argparse.ArgumentParser( description='BBdev Unit Test Application', diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 70bf6fe2c1..153d001194 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both " - "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM " - "are enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n"); return TEST_FAILED; } @@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12814,9 +12800,7 @@ test_cryptodev_null(void) RTE_STR(CRYPTODEV_NAME_NULL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NULL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NULL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12830,9 +12814,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12846,9 +12828,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12862,9 +12842,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_ZUC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12878,9 +12856,7 @@ test_cryptodev_armv8(void) RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12894,9 +12870,7 @@ test_cryptodev_mrvl(void) RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12912,16 +12886,13 @@ test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n"); return TEST_SKIPPED; } if (rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) { - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be" - " enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_scheduler_testsuite); @@ -12938,9 +12909,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12954,9 +12923,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12970,9 +12937,7 @@ test_cryptodev_ccp(void) RTE_STR(CRYPTODEV_NAME_CCP_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CCP is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CCP PMD must be loaded.\n"); return TEST_FAILED; } @@ -12985,10 +12950,7 @@ test_cryptodev_octeontx(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13000,10 +12962,7 @@ test_cryptodev_octeontx2(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13016,9 +12975,7 @@ test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded.\n"); return TEST_FAILED; } @@ -13032,9 +12989,7 @@ test_cryptodev_nitrox(void) RTE_STR(CRYPTODEV_NAME_NITROX_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NITROX PMD must be loaded.\n"); return TEST_FAILED; } diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index dc62ed7bf3..85cd076059 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -2336,9 +2336,7 @@ test_cryptodev_openssl_asym(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_FAILED; } @@ -2352,9 +2350,7 @@ test_cryptodev_qat_asym(void) RTE_STR(CRYPTODEV_NAME_QAT_ASYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_QAT_ASYM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_FAILED; } @@ -2367,10 +2363,7 @@ test_cryptodev_octeontx_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); @@ -2382,10 +2375,7 @@ test_cryptodev_octeontx2_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n"); return TEST_FAILED; } -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 16/37] drivers: remove references to make config options 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (14 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 15/37] app/test: remove references to make Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 17/37] lib: " Ciara Power ` (20 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Anatoly Burakov, Beilei Xing, Jeff Guo Make is no longer supported for compiling DPDK, references are now removed in code comments. Signed-off-by: Ciara Power <ciara.power@intel.com> --- drivers/bus/pci/linux/pci_vfio.c | 1 - drivers/net/i40e/i40e_rxtx.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 07e072e13f..c15ed3bade 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -34,7 +34,6 @@ * This code tries to determine if the PCI device is bound to VFIO driver, * and initialize it (map BARs, set up interrupts) if that's the case. * - * This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y". */ #ifdef VFIO_PRESENT diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index fe7f9200c1..60b33d20a1 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -3438,7 +3438,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev) } #ifndef RTE_LIBRTE_I40E_INC_VECTOR -/* Stubs needed for linkage when CONFIG_RTE_LIBRTE_I40E_INC_VECTOR is set to 'n' */ int i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev) { -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 17/37] lib: remove references to make config options 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (15 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 16/37] drivers: remove references to make config options Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 18/37] doc/guides: remove use of DPDK make build system Ciara Power ` (19 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Olivier Matz, Andrew Rybchenko, Honnappa Nagarahalli, Konstantin Ananyev Make is no longer supported for compiling DPDK, references are now removed in code comments. Signed-off-by: Ciara Power <ciara.power@intel.com> --- lib/librte_mempool/rte_mempool.h | 2 +- lib/librte_ring/rte_ring_elem.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 9e0ee052b3..6ad7e31170 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -970,7 +970,7 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); * If cache_size is non-zero, the rte_mempool library will try to * limit the accesses to the common lockless pool, by maintaining a * per-lcore object cache. This argument must be lower or equal to - * CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose + * RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose * cache_size to have "n modulo cache_size == 0": if this is * not the case, some elements will always stay in the pool and will * never be used. The access to the per-lcore table is of course diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h index 69dc51746c..938b398fc0 100644 --- a/lib/librte_ring/rte_ring_elem.h +++ b/lib/librte_ring/rte_ring_elem.h @@ -373,8 +373,7 @@ __rte_ring_dequeue_elems(struct rte_ring *r, uint32_t cons_head, * (powerpc/arm). * There are 2 choices for the users * 1.use rmb() memory barrier - * 2.use one-direction load_acquire/store_release barrier,defined by - * CONFIG_RTE_USE_C11_MEM_MODEL=y + * 2.use one-direction load_acquire/store_release barrier * It depends on performance test results. * By default, move common functions to rte_ring_generic.h */ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 18/37] doc/guides: remove use of DPDK make build system 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (16 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 17/37] lib: " Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 19/37] doc: remove deprecation notice for make Ciara Power ` (18 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, John McNamara, Marko Kovacevic From: Bruce Richardson <bruce.richardson@intel.com> When building the DPDK guide documents, the DPDK version information was pulled using "make showversion", which meant there was a dependency on the DPDK make-based build system. Change this to have the version info passed in from meson itself. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- buildtools/call-sphinx-build.py | 5 ++++- doc/guides/conf.py | 7 +------ doc/guides/meson.build | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index 85c9e01563..fa6f26b376 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -9,7 +9,10 @@ from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion -(sphinx, src, dst) = sys.argv[1:] # assign parameters to variables +(sphinx, version, src, dst) = sys.argv[1:] # assign parameters to variables + +# set the version in environment for sphinx to pick up +os.environ['DPDK_VERSION'] = version # for sphinx version >= 1.7 add parallelism using "-j auto" ver = run([sphinx, '--version'], stdout=PIPE, diff --git a/doc/guides/conf.py b/doc/guides/conf.py index d8fe5cccd7..9ebc26ed3f 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -2,7 +2,6 @@ # Copyright(c) 2010-2015 Intel Corporation from __future__ import print_function -import subprocess from docutils import nodes from distutils.version import LooseVersion from sphinx import __version__ as sphinx_version @@ -38,11 +37,7 @@ html_show_copyright = False highlight_language = 'none' -# If MAKEFLAGS is exported by the user, garbage text might end up in version -version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'], - env=dict(environ, MAKEFLAGS="")) -version = version.decode('utf-8').rstrip() -release = version +release = environ['DPDK_VERSION'] master_doc = 'index' diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 732e7ad3a9..daab139c4e 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -11,7 +11,8 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk') html_guides = custom_target('html_guides', input: files('index.rst'), output: 'html', - command: [sphinx_wrapper, sphinx, meson.current_source_dir(), meson.current_build_dir()], + command: [sphinx_wrapper, sphinx, meson.project_version(), + meson.current_source_dir(), meson.current_build_dir()], depfile: '.html.d', build_by_default: get_option('enable_docs'), install: get_option('enable_docs'), -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 19/37] doc: remove deprecation notice for make 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (17 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 18/37] doc/guides: remove use of DPDK make build system Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides Ciara Power ` (17 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Ray Kinsella, Neil Horman, John McNamara, Marko Kovacevic The deprecation notice for make can now be removed as this patchset removes the make build system. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/rel_notes/deprecation.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 345c38d5b6..279eccb04a 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -11,13 +11,6 @@ here. Deprecation Notices ------------------- -* make: Support for building DPDK with "make" has been deprecated and - support will be removed in the 20.11 release. From 20.11 onwards, DPDK - should be built using meson and ninja. For basic instructions see the - `Quick-start Guide <https://core.dpdk.org/doc/quick-start/>`_ on the - website or the `Getting Started Guide - <https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html>`_ document. - * meson: The minimum supported version of meson for configuring and building DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For those users with a version earlier than 0.47.1, an updated copy of meson -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (18 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 19/37] doc: remove deprecation notice for make Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-21 2:12 ` Chautru, Nicolas 2020-08-21 2:22 ` Chautru, Nicolas 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 21/37] doc: remove references to make in compressdev guides Ciara Power ` (16 subsequent siblings) 36 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Nicolas Chautru, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- doc/guides/bbdevs/turbo_sw.rst | 15 --------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index 6760391e8c..8e00c4ef22 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd8086:0d8f diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index fdc8a76981..14ffa0ee14 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd1172: diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..3b93157890 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -151,13 +143,6 @@ Example: export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides Ciara Power @ 2020-08-21 2:12 ` Chautru, Nicolas 2020-08-21 10:55 ` Power, Ciara 2020-08-21 2:22 ` Chautru, Nicolas 1 sibling, 1 reply; 300+ messages in thread From: Chautru, Nicolas @ 2020-08-21 2:12 UTC (permalink / raw) To: Power, Ciara, dev; +Cc: Mcnamara, John, Kovacevic, Marko > From: Power, Ciara <ciara.power@intel.com> > Make is no longer supported for compiling DPDK, references are now removed > in the documentation. > > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- > doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- > doc/guides/bbdevs/turbo_sw.rst | 15 --------------- > 3 files changed, 4 insertions(+), 25 deletions(-) > > diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst > b/doc/guides/bbdevs/fpga_5gnr_fec.rst > index 6760391e8c..8e00c4ef22 100644 > --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst > +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst > @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: > Installation > ------------ > > -Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. The -default set of bbdev compile flags may be found in > config/common_base, where for example -the flag to build the FPGA 5GNR FEC > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, > -is already set. > +Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > manual. > The bbdev test application has been tested with a configuration 40 x 1GB > hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this > command for every function. > .. code-block:: console > > cd <dpdk-top-level-directory> > - insmod ./build/kmod/igb_uio.ko > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko Hi, Should this more specific? What do you mean by <build_dir> here? Is this defined somewhere else explicitly in doc? In other commit (with the python script) the assumption is that meson will install under <dpdk-top-level-directory>/build directory with hard coded path, ie. not forcing to other location. Can you clarify so that we are comprehensive and avoid confusion? Thanks Nic ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides 2020-08-21 2:12 ` Chautru, Nicolas @ 2020-08-21 10:55 ` Power, Ciara 2020-08-21 15:18 ` Chautru, Nicolas 0 siblings, 1 reply; 300+ messages in thread From: Power, Ciara @ 2020-08-21 10:55 UTC (permalink / raw) To: Chautru, Nicolas, dev; +Cc: Mcnamara, John, Kovacevic, Marko Hi Nicolas, >-----Original Message----- >From: Chautru, Nicolas <nicolas.chautru@intel.com> >Sent: Friday 21 August 2020 03:13 >To: Power, Ciara <ciara.power@intel.com>; dev@dpdk.org >Cc: Mcnamara, John <john.mcnamara@intel.com>; Kovacevic, Marko ><marko.kovacevic@intel.com> >Subject: RE: [PATCH v2 20/37] doc: remove references to make in bbdev >guides > >> From: Power, Ciara <ciara.power@intel.com> Make is no longer supported >> for compiling DPDK, references are now removed in the documentation. >> >> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> >> Signed-off-by: Ciara Power <ciara.power@intel.com> >> --- >> doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- >> doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- >> doc/guides/bbdevs/turbo_sw.rst | 15 --------------- >> 3 files changed, 4 insertions(+), 25 deletions(-) >> <snip> >> cd <dpdk-top-level-directory> >> - insmod ./build/kmod/igb_uio.ko >> + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > >Hi, >Should this more specific? What do you mean by <build_dir> here? Is this >defined somewhere else explicitly in doc? >In other commit (with the python script) the assumption is that meson will >install under <dpdk-top-level-directory>/build directory with hard coded path, >ie. not forcing to other location. >Can you clarify so that we are comprehensive and avoid confusion? >Thanks >Nic > > > The "<build_dir>" here represents the meson build folder, which is named by the user so can vary. In the python script, I added "build" as the hardcoded path for the build folder, based on the example in the prog_guide/build-sdk-meson guide, which chooses to name the folder "build". Thanks, Ciara ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides 2020-08-21 10:55 ` Power, Ciara @ 2020-08-21 15:18 ` Chautru, Nicolas 0 siblings, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-08-21 15:18 UTC (permalink / raw) To: Power, Ciara, dev; +Cc: Richardson, Bruce, Mcnamara, John, Kovacevic, Marko > From: Power, Ciara <ciara.power@intel.com> > Hi Nicolas, > > > >-----Original Message----- > >From: Chautru, Nicolas <nicolas.chautru@intel.com> > >Sent: Friday 21 August 2020 03:13 > >To: Power, Ciara <ciara.power@intel.com>; dev@dpdk.org > >Cc: Mcnamara, John <john.mcnamara@intel.com>; Kovacevic, Marko > ><marko.kovacevic@intel.com> > >Subject: RE: [PATCH v2 20/37] doc: remove references to make in bbdev > >guides > > > >> From: Power, Ciara <ciara.power@intel.com> Make is no longer > >> supported for compiling DPDK, references are now removed in the > documentation. > >> > >> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > >> Signed-off-by: Ciara Power <ciara.power@intel.com> > >> --- > >> doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- > >> doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- > >> doc/guides/bbdevs/turbo_sw.rst | 15 --------------- > >> 3 files changed, 4 insertions(+), 25 deletions(-) > >> > <snip> > >> cd <dpdk-top-level-directory> > >> - insmod ./build/kmod/igb_uio.ko > >> + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > > > >Hi, > >Should this more specific? What do you mean by <build_dir> here? Is > >this defined somewhere else explicitly in doc? > >In other commit (with the python script) the assumption is that meson > >will install under <dpdk-top-level-directory>/build directory with hard > >coded path, ie. not forcing to other location. > >Can you clarify so that we are comprehensive and avoid confusion? > >Thanks > >Nic > > > > > > > > The "<build_dir>" here represents the meson build folder, which is named by > the user so can vary. > In the python script, I added "build" as the hardcoded path for the build folder, > based on the example in the prog_guide/build-sdk-meson guide, which chooses > to name the folder "build". Yes and I find this discrepancy as a source of confusion really. Either build location is flexible or not and in any case this needs to be deterministic and solid. I am not an expert on meson, unsure what is the best way to handle this but I certainly see room for errors we did not have with make. Any thought? > > Thanks, > Ciara ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides Ciara Power 2020-08-21 2:12 ` Chautru, Nicolas @ 2020-08-21 2:22 ` Chautru, Nicolas 2020-08-21 9:41 ` Bruce Richardson 1 sibling, 1 reply; 300+ messages in thread From: Chautru, Nicolas @ 2020-08-21 2:22 UTC (permalink / raw) To: Power, Ciara, dev; +Cc: Mcnamara, John, Kovacevic, Marko From: Power, Ciara <ciara.power@intel.com> > Make is no longer supported for compiling DPDK, references are now removed > in the documentation. > > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- > doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- > doc/guides/bbdevs/turbo_sw.rst | 15 --------------- > 3 files changed, 4 insertions(+), 25 deletions(-) > > diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst > b/doc/guides/bbdevs/fpga_5gnr_fec.rst > index 6760391e8c..8e00c4ef22 100644 > --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst > +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst > @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: > Installation > ------------ > > -Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. The -default set of bbdev compile flags may be found in > config/common_base, where for example -the flag to build the FPGA 5GNR FEC > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, > -is already set. > +Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > manual. > The bbdev test application has been tested with a configuration 40 x 1GB > hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this > command for every function. > .. code-block:: console > > cd <dpdk-top-level-directory> > - insmod ./build/kmod/igb_uio.ko > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id > lspci -vd8086:0d8f > > diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst > b/doc/guides/bbdevs/fpga_lte_fec.rst > index fdc8a76981..14ffa0ee14 100644 > --- a/doc/guides/bbdevs/fpga_lte_fec.rst > +++ b/doc/guides/bbdevs/fpga_lte_fec.rst > @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: > Installation > -------------- > > -Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. The -default set of bbdev compile flags may be found in > config/common_base, where for example -the flag to build the FPGA LTE FEC > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. > +Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > manual. > The bbdev test application has been tested with a configuration 40 x 1GB > hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this > command for every function. > .. code-block:: console > > cd <dpdk-top-level-directory> > - insmod ./build/kmod/igb_uio.ko > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id > lspci -vd1172: > > diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst > index 20620c2e20..3b93157890 100644 > --- a/doc/guides/bbdevs/turbo_sw.rst > +++ b/doc/guides/bbdevs/turbo_sw.rst > @@ -12,14 +12,6 @@ Note that the driver can also be built without any > dependency with reduced functionality for maintenance purpose. > > To enable linking to the SDK libraries see detailed installation section below. > -Two flags can be enabled depending on whether the target machine can > support > -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized > -signal processing functions are installed : > -- CONFIG_RTE_BBDEV_SDK_AVX2 > -- CONFIG_RTE_BBDEV_SDK_AVX512 > -By default these 2 flags are disabled by default. For AVX2 machine and SDK - > library installed then the first flag can be enabled. For AVX512 machine and - > SDK library installed then both flags can be enabled for full real time capability. Hi, We are losing information here. Even if the configuration options should not be documented based on an explicit reference make and config_base assumptions (agreed that they are no longer there), the steps should still capture the conf to be passed to meson so that the PMD can still be built with the avx2/avx512 intel libraries (ie. not the case by default due to additional dependency to retrieve the related libraries). Thanks Nic ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides 2020-08-21 2:22 ` Chautru, Nicolas @ 2020-08-21 9:41 ` Bruce Richardson 0 siblings, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-08-21 9:41 UTC (permalink / raw) To: Chautru, Nicolas; +Cc: Power, Ciara, dev, Mcnamara, John, Kovacevic, Marko On Fri, Aug 21, 2020 at 02:22:14AM +0000, Chautru, Nicolas wrote: > From: Power, Ciara <ciara.power@intel.com> > > Make is no longer supported for compiling DPDK, references are now removed > > in the documentation. > > > > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > > Signed-off-by: Ciara Power <ciara.power@intel.com> > > --- > > doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- > > doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- > > doc/guides/bbdevs/turbo_sw.rst | 15 --------------- > > 3 files changed, 4 insertions(+), 25 deletions(-) > > > > diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst > > b/doc/guides/bbdevs/fpga_5gnr_fec.rst > > index 6760391e8c..8e00c4ef22 100644 > > --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst > > +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst > > @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: > > Installation > > ------------ > > > > -Section 3 of the DPDK manual provides instructions on installing and compiling > > DPDK. The -default set of bbdev compile flags may be found in > > config/common_base, where for example -the flag to build the FPGA 5GNR FEC > > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, > > -is already set. > > +Section 3 of the DPDK manual provides instructions on installing and compiling > > DPDK. > > > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > > manual. > > The bbdev test application has been tested with a configuration 40 x 1GB > > hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this > > command for every function. > > .. code-block:: console > > > > cd <dpdk-top-level-directory> > > - insmod ./build/kmod/igb_uio.ko > > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > > echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id > > lspci -vd8086:0d8f > > > > diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst > > b/doc/guides/bbdevs/fpga_lte_fec.rst > > index fdc8a76981..14ffa0ee14 100644 > > --- a/doc/guides/bbdevs/fpga_lte_fec.rst > > +++ b/doc/guides/bbdevs/fpga_lte_fec.rst > > @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: > > Installation > > -------------- > > > > -Section 3 of the DPDK manual provides instructions on installing and compiling > > DPDK. The -default set of bbdev compile flags may be found in > > config/common_base, where for example -the flag to build the FPGA LTE FEC > > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. > > +Section 3 of the DPDK manual provides instructions on installing and compiling > > DPDK. > > > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > > manual. > > The bbdev test application has been tested with a configuration 40 x 1GB > > hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this > > command for every function. > > .. code-block:: console > > > > cd <dpdk-top-level-directory> > > - insmod ./build/kmod/igb_uio.ko > > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > > echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id > > lspci -vd1172: > > > > diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst > > index 20620c2e20..3b93157890 100644 > > --- a/doc/guides/bbdevs/turbo_sw.rst > > +++ b/doc/guides/bbdevs/turbo_sw.rst > > @@ -12,14 +12,6 @@ Note that the driver can also be built without any > > dependency with reduced functionality for maintenance purpose. > > > > To enable linking to the SDK libraries see detailed installation section below. > > -Two flags can be enabled depending on whether the target machine can > > support > > -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized > > -signal processing functions are installed : > > -- CONFIG_RTE_BBDEV_SDK_AVX2 > > -- CONFIG_RTE_BBDEV_SDK_AVX512 > > -By default these 2 flags are disabled by default. For AVX2 machine and SDK - > > library installed then the first flag can be enabled. For AVX512 machine and - > > SDK library installed then both flags can be enabled for full real time capability. > > Hi, > We are losing information here. Even if the configuration options should not be documented based on an explicit reference make and config_base assumptions (agreed that they are no longer there), the steps should still capture the conf to be passed to meson so that the PMD can still be built with the avx2/avx512 intel libraries (ie. not the case by default due to additional dependency to retrieve the related libraries). > Thanks > Nic Hi Nic, Can you perhaps suggest the appropriate wording to use? Given the size of the patchset, I think we need individual maintainers to help provide the appropriate doc adjustments. Thanks, /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 21/37] doc: remove references to make in compressdev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (19 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 22/37] doc: remove references to make in contributing guides Ciara Power ` (15 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Lee Daly, John McNamara, Marko Kovacevic, Ashish Gupta, Sunila Sahu Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..8c658721b9 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -56,21 +56,6 @@ Steps To Setup Platform SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. -Installation ------------- - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "compressdev_autotest" to test + cd to <build_dir> + meson test compressdev_autotest diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 22/37] doc: remove references to make in contributing guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (20 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 21/37] doc: remove references to make in compressdev guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides Ciara Power ` (14 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Louise Kilheeney, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> --- doc/guides/contributing/coding_style.rst | 46 +------- doc/guides/contributing/design.rst | 127 ++-------------------- doc/guides/contributing/documentation.rst | 31 +----- doc/guides/contributing/patches.rst | 45 -------- 4 files changed, 18 insertions(+), 231 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index b55075eaa2..dc352d03ca 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -773,52 +773,16 @@ The ``pep8`` tool can be used for testing compliance with the guidelines. Integrating with the Build System --------------------------------- -DPDK supports being built in two different ways: - -* using ``make`` - or more specifically "GNU make", i.e. ``gmake`` on FreeBSD -* using the tools ``meson`` and ``ninja`` +DPDK supports being built by using the tools ``meson`` and ``ninja`` Any new library or driver to be integrated into DPDK should support being -built with both systems. While building using ``make`` is a legacy approach, and -most build-system enhancements are being done using ``meson`` and ``ninja`` -there are no plans at this time to deprecate the legacy ``make`` build system. +built with this system. -Therefore all new component additions should include both a ``Makefile`` and a -``meson.build`` file, and should be added to the component lists in both the -``Makefile`` and ``meson.build`` files in the relevant top-level directory: +Therefore all new component additions should include a ``meson.build`` file, +and should be added to the component lists in the ``meson.build`` files in the +relevant top-level directory: either ``lib`` directory or a ``driver`` subdirectory. -Makefile Contents -~~~~~~~~~~~~~~~~~ - -The ``Makefile`` for the component should be of the following format, where -``<name>`` corresponds to the name of the library in question, e.g. hash, -lpm, etc. For drivers, the same format of Makefile is used. - -.. code-block:: none - - # pull in basic DPDK definitions, including whether library is to be - # built or not - include $(RTE_SDK)/mk/rte.vars.mk - - # library name - LIB = librte_<name>.a - - # any library cflags needed. Generally add "-O3 $(WERROR_FLAGS)" - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - # the symbol version information for the library - EXPORT_MAP := rte_<name>_version.map - - # all source filenames are stored in SRCS-y - SRCS-$(CONFIG_RTE_LIBRTE_<NAME>) += rte_<name>.c - - # install includes - SYMLINK-$(CONFIG_RTE_LIBRTE_<NAME>)-include += rte_<name>.h - - # pull in rules to build the library - include $(RTE_SDK)/mk/rte.lib.mk Meson Build File Contents - Libraries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..6ce0de97ac 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,22 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. - In this case, the code is split into two separate files that are architecture or environment specific. - This should only apply inside the EAL library. - -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -73,111 +65,6 @@ Adding a new static field or flag must be an exception matching many criteria like (non exhaustive): wide usage, performance, size. -Library Statistics ------------------- - -Description -~~~~~~~~~~~ - -This document describes the guidelines for DPDK library-level statistics counter -support. This includes guidelines for turning library statistics on and off and -requirements for preventing ABI changes when implementing statistics. - - -Mechanism to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are -collected for all the instances of every object type provided by the library. -When this flag is cleared, none of the counters supported by the current library -are collected for any instance of any object type provided by the library: - -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - - -Prevention of ABI changes due to library statistics support -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The layout of data structures and prototype of functions that are part of the -library API should not be affected by whether the collection of statistics -counters is turned on or off for the current library. In practical terms, this -means that space should always be allocated in the API data structures for -statistics counters and the statistics related API functions are always built -into the code, regardless of whether the statistics counter collection is turned -on or off for the current library. - -When the collection of statistics counters for the current library is turned -off, the counters retrieved through the statistics related API functions should -have a default value of zero. - - -Motivation to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -It is highly recommended that each library provides statistics counters to allow -an application to monitor the library-level run-time events. Typical counters -are: number of packets received/dropped/transmitted, number of buffers -allocated/freed, number of occurrences for specific events, etc. - -However, the resources consumed for library-level statistics counter collection -have to be spent out of the application budget and the counters collected by -some libraries might not be relevant to the current application. In order to -avoid any unwanted waste of resources and/or performance impacts, the -application should decide at build time whether the collection of library-level -statistics counters should be turned on or off for each library individually. - -Library-level statistics counters can be relevant or not for specific -applications: - -* For Application A, counters maintained by Library X are always relevant and - the application needs to use them to implement certain features, such as traffic - accounting, logging, application-level statistics, etc. In this case, - the application requires that collection of statistics counters for Library X is - always turned on. - -* For Application B, counters maintained by Library X are only useful during the - application debug stage and are not relevant once debug phase is over. In this - case, the application may decide to turn on the collection of Library X - statistics counters during the debug phase and at a later stage turn them off. - -* For Application C, counters maintained by Library X are not relevant at all. - It might be that the application maintains its own set of statistics counters - that monitor a different set of run-time events (e.g. number of connection - requests, number of active users, etc). It might also be that the application - uses multiple libraries (Library X, Library Y, etc) and it is interested in the - statistics counters of Library Y, but not in those of Library X. In this case, - the application may decide to turn the collection of statistics counters off for - Library X and on for Library Y. - -The statistics collection consumes a certain amount of CPU resources (cycles, -cache bandwidth, memory bandwidth, etc) that depends on: - -* Number of libraries used by the current application that have statistics - counters collection turned on. - -* Number of statistics counters maintained by each library per object type - instance (e.g. per port, table, pipeline, thread, etc). - -* Number of instances created for each object type supported by each library. - -* Complexity of the statistics logic collection for each counter: when only - some occurrences of a specific event are valid, additional logic is typically - needed to decide whether the current occurrence of the event should be counted - or not. For example, in the event of packet reception, when only TCP packets - with destination port within a certain range should be recorded, conditional - branches are usually required. When processing a burst of packets that have been - validated for header integrity, counting the number of bits set in a bitmask - might be needed. - PF and VF Considerations ------------------------ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 375ea64ba8..768453126f 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -222,25 +222,14 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: +To enable doc building:: - make doc + meson configure -Denable_docs=true -* Generate the Doxygen API documentation in Html:: +See :doc:`../linux_gsg/build_dpdk` for more detail on compiling DPDK with meson. - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -255,10 +244,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -308,7 +293,7 @@ Line Length Long literal command lines can be shown wrapped with backslashes. For example:: - testpmd -l 2-3 -n 4 \ + dpdk-testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ --txd=1024 --rxd=1024 @@ -460,7 +445,7 @@ Code and Literal block sections For long literal lines that exceed that limit try to wrap the text at sensible locations. For example a long command line could be documented like this and still work if copied directly from the docs:: - build/app/testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ + ./<build_dir>/app/dpdk-testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ --vdev=net_pcap1,iface=eth1 \ -- -i --nb-cores=2 --nb-ports=2 \ --total-num-mbufs=2048 @@ -743,9 +728,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 425bb874f8..bafa95be59 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -464,51 +464,6 @@ and the -r option allows the user specify a ``git log`` range. Checking Compilation -------------------- -Makefile System -~~~~~~~~~~~~~~~ - -Compilation of patches and changes should be tested using the ``test-build.sh`` script in the ``devtools`` -directory of the DPDK repo:: - - devtools/test-build.sh x86_64-native-linux-gcc+next+shared - -The script usage is:: - - test-build.sh [-h] [-jX] [-s] [config1 [config2] ...]] - -Where: - -* ``-h``: help, usage. -* ``-jX``: use X parallel jobs in "make". -* ``-s``: short test with only first config and without examples/doc. -* ``config``: default config name plus config switches delimited with a ``+`` sign. - -Examples of configs are:: - - x86_64-native-linux-gcc - x86_64-native-linux-gcc+next+shared - x86_64-native-linux-clang+shared - -The builds can be modified via the following environmental variables: - -* ``DPDK_BUILD_TEST_CONFIGS`` (target1+option1+option2 target2) -* ``DPDK_BUILD_TEST_DIR`` -* ``DPDK_DEP_CFLAGS`` -* ``DPDK_DEP_LDFLAGS`` -* ``DPDK_DEP_PCAP`` (y/[n]) -* ``DPDK_NOTIFY`` (notify-send) - -These can be set from the command line or in the config files shown above in the :ref:`contrib_checkpatch`. - -The recommended configurations and options to test compilation prior to submitting patches are:: - - x86_64-native-linux-gcc+shared+next - x86_64-native-linux-clang+shared - i686-native-linux-gcc - - export DPDK_DEP_ZLIB=y - export DPDK_DEP_PCAP=y - export DPDK_DEP_SSL=y Meson System ~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (21 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 22/37] doc: remove references to make in contributing guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 15:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 24/37] doc: remove references to make in eventdev guides Ciara Power ` (13 subsequent siblings) 36 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Declan Doherty, Pablo de Lara, John McNamara, Marko Kovacevic, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ------------- doc/guides/cryptodevs/ccp.rst | 14 +++--- doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- doc/guides/cryptodevs/kasumi.rst | 11 +---- doc/guides/cryptodevs/mvsam.rst | 10 +---- doc/guides/cryptodevs/nitrox.rst | 7 --- doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +----- doc/guides/cryptodevs/octeontx2.rst | 8 +--- doc/guides/cryptodevs/openssl.rst | 6 +-- doc/guides/cryptodevs/qat.rst | 67 +++++++---------------------- doc/guides/cryptodevs/scheduler.rst | 8 ---- doc/guides/cryptodevs/snow3g.rst | 10 +---- doc/guides/cryptodevs/virtio.rst | 20 +++------ doc/guides/cryptodevs/zuc.rst | 10 +---- 19 files changed, 40 insertions(+), 236 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 74e0de63ad..013615e2d0 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. @@ -117,5 +115,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm" diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 15388d20ab..fd533ca65b 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. @@ -152,7 +150,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo "sha1-hmac" Extra notes diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index a43fe92de9..9ca1979994 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -77,7 +75,7 @@ e.g. for the 0x1456 device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1022 1456" > /sys/bus/pci/drivers/igb_uio/new_id Another way to bind the CCP devices to DPDK UIO driver is by using the ``dpdk-devbind.py`` script. @@ -86,8 +84,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. @@ -109,7 +105,7 @@ To validate ccp pmd, l2fwd-crypto example can be used with following command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff @@ -124,7 +120,7 @@ following: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..5770a60cb2 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. @@ -117,7 +108,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "kasumi-f8" Extra notes on KASUMI F9 diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..6188c1248c 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: @@ -105,7 +97,7 @@ operation: .. code-block:: console - ./l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ + ./dpdk-l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ --auth_op GENERATE --auth_algo sha1-hmac \ diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 85f5212b64..2f0565b49e 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -33,13 +33,6 @@ Limitations * 3DES Cipher Only combination is not supported. * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/null.rst b/doc/guides/cryptodevs/null.rst index c980e0ac84..aac5904b1d 100644 --- a/doc/guides/cryptodevs/null.rst +++ b/doc/guides/cryptodevs/null.rst @@ -67,5 +67,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "null" diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..d813cb2974 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- @@ -135,7 +127,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_autotest The asymmetric crypto operations on OCTEON TX crypto PMD may be verified by running the test @@ -143,5 +135,5 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_asym_autotest diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index 432146db04..bb4af3a04d 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. @@ -148,7 +144,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_autotest The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test @@ -156,7 +152,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_asym_autotest diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..ca0f0b43f3 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: @@ -93,7 +93,7 @@ To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" --vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index e5d2cf4997..6714a7a8a2 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -483,7 +456,6 @@ To complete the installation follow the instructions in insmod ./drivers/crypto/qat/qat_common/intel_qat.ko insmod ./drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko - .. Note:: If you see the following warning in ``/var/log/messages`` it can be ignored: @@ -644,7 +616,7 @@ e.g. for the C62x device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vvd:37c9 @@ -660,27 +632,20 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -704,7 +669,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 7004ca431a..ee23b25b73 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..13341c39c4 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "snow3g-uea2" diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..83d8e32397 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,27 +83,17 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "cryptodev_virtio_autotest" to test + cd to <build_dir> + meson test cryptodev_virtio_autotest The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test-crypto-perf - type the command "make" to compile - run the tests with the following command: - - ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ + cd to <build_dir> + + ./app/dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ --ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \ --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \ --auth-op generate --auth-key-sz 64 --digest-sz 12 \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..907840ef05 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "zuc-eea3" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides Ciara Power @ 2020-08-20 15:08 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-20 15:08 UTC (permalink / raw) To: Ciara Power, dev Cc: Declan Doherty, Pablo de Lara, John McNamara, Marko Kovacevic, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou On 20/08/2020 13:41, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/cryptodevs/aesni_gcm.rst | 4 +- > doc/guides/cryptodevs/aesni_mb.rst | 4 +- > doc/guides/cryptodevs/armv8.rst | 3 -- > doc/guides/cryptodevs/caam_jr.rst | 30 ------------- > doc/guides/cryptodevs/ccp.rst | 14 +++--- > doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- > doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- > doc/guides/cryptodevs/kasumi.rst | 11 +---- > doc/guides/cryptodevs/mvsam.rst | 10 +---- > doc/guides/cryptodevs/nitrox.rst | 7 --- > doc/guides/cryptodevs/null.rst | 2 +- > doc/guides/cryptodevs/octeontx.rst | 12 +----- > doc/guides/cryptodevs/octeontx2.rst | 8 +--- > doc/guides/cryptodevs/openssl.rst | 6 +-- > doc/guides/cryptodevs/qat.rst | 67 +++++++---------------------- > doc/guides/cryptodevs/scheduler.rst | 8 ---- > doc/guides/cryptodevs/snow3g.rst | 10 +---- > doc/guides/cryptodevs/virtio.rst | 20 +++------ > doc/guides/cryptodevs/zuc.rst | 10 +---- > 19 files changed, 40 insertions(+), 236 deletions(-) > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 24/37] doc: remove references to make in eventdev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (22 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 25/37] doc: remove references to make in FreeBSD gsg guide Ciara Power ` (12 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Hemant Agrawal, Nipun Gupta, John McNamara, Marko Kovacevic, Jerin Jacob, Pavan Nikhilesh Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/eventdevs/dpaa.rst | 20 -------------------- doc/guides/eventdevs/dpaa2.rst | 20 -------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 8 -------- 4 files changed, 72 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..6fbee91d9e 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -43,26 +43,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..b992ae649e 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -52,26 +52,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 9a3646db0d..f7a4cdd586 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..7f9eceb01f 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 25/37] doc: remove references to make in FreeBSD gsg guide 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (23 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 24/37] doc: remove references to make in eventdev guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 26/37] doc: remove references to make in howto guides Ciara Power ` (11 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Bruce Richardson, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Acked-by: Bruce Richardson <bruce.richardson@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/freebsd_gsg/intro.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index e31c966b98..1e5a8cfe9e 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -122,7 +122,7 @@ up time. This can be achieved by placing lines similar to the following into An error such as:: - kldload: can't load ./x86_64-native-freebsd-gcc/kmod/contigmem.ko: + kldload: can't load ./<build_dir>/kernel/freebsd/contigmem.ko: Exec format error is generally attributed to not having enough contiguous memory diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst index 63160ce64f..b2e57909ee 100644 --- a/doc/guides/freebsd_gsg/intro.rst +++ b/doc/guides/freebsd_gsg/intro.rst @@ -39,8 +39,8 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system (including the commands - that can be used in the root DPDK Makefile to build the development - kit and an application) and guidelines for porting an application + that can be used to build the development kit and an application) + and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 26/37] doc: remove references to make in howto guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (24 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 25/37] doc: remove references to make in FreeBSD gsg guide Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 27/37] doc: remove references to make in Linux gsg guides Ciara Power ` (10 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +-- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +-- doc/guides/howto/packet_capture_framework.rst | 21 +++------------ doc/guides/howto/pvp_reference_benchmark.rst | 27 +++++-------------- doc/guides/howto/vfd.rst | 4 +-- .../virtio_user_for_container_networking.rst | 2 +- 6 files changed, 16 insertions(+), 46 deletions(-) diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst index 07563b3e24..02ba1cdf5d 100644 --- a/doc/guides/howto/lm_bond_virtio_sriov.rst +++ b/doc/guides/howto/lm_bond_virtio_sriov.rst @@ -591,7 +591,7 @@ Set up DPDK in the Virtual Machine rmmod virtio-pci ixgbevf modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -613,7 +613,7 @@ Run testpmd in the Virtual Machine. # use for bonding of virtio and vf tests in VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-3 -n 4 --socket-mem 350 -- --i --port-topology=chained .. _lm_bond_virtio_sriov_switch_conf: diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst index ecb7832906..330ff5a9c8 100644 --- a/doc/guides/howto/lm_virtio_vhost_user.rst +++ b/doc/guides/howto/lm_virtio_vhost_user.rst @@ -421,7 +421,7 @@ setup_dpdk_virtio_in_vm.sh rmmod virtio-pci modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -437,5 +437,5 @@ run_testpmd_in_vm.sh # Run testpmd for use with vhost_user sample app. # test system has 8 cpus (0-7), use cpus 2-7 for VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-5 -n 4 --socket-mem 350 -- --burst=64 --i diff --git a/doc/guides/howto/packet_capture_framework.rst b/doc/guides/howto/packet_capture_framework.rst index 946a21c8ed..d457989607 100644 --- a/doc/guides/howto/packet_capture_framework.rst +++ b/doc/guides/howto/packet_capture_framework.rst @@ -52,11 +52,7 @@ Some things to note: initialization code. Refer to the ``app/test-pmd/testpmd.c`` code and look for ``pdump`` keyword to see how this is done. -* The ``dpdk-pdump`` tool depends on the libpcap based PMD which is disabled - by default in the build configuration files, owing to an external dependency - on the libpcap development files. Once the libpcap development files are - installed, the libpcap based PMD can be enabled by setting - ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` and recompiling the DPDK. +* The ``dpdk-pdump`` tool depends on the libpcap based PMD. Test Environment @@ -73,17 +69,6 @@ for packet capturing on the DPDK port in Packet capturing on a DPDK port using the dpdk-pdump tool. -Configuration -------------- - -Modify the DPDK primary application to initialize the packet capture framework -as mentioned in the above notes and enable the following config options and -build DPDK:: - - CONFIG_RTE_LIBRTE_PMD_PCAP=y - CONFIG_RTE_LIBRTE_PDUMP=y - - Running the Application ----------------------- @@ -93,11 +78,11 @@ inspect them using ``tcpdump``. #. Launch testpmd as the primary application:: - sudo ./app/testpmd -c 0xf0 -n 4 -- -i --port-topology=chained + sudo ./<build_dir>/app/dpdk-testpmd -c 0xf0 -n 4 -- -i --port-topology=chained #. Launch the pdump tool as follows:: - sudo ./build/app/dpdk-pdump -- \ + sudo ./<build_dir>/app/dpdk-pdump -- \ --pdump 'port=0,queue=*,rx-dev=/tmp/capture.pcap' #. Send traffic to dpdk_port0 from traffic generator. diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst index 64b1f4d8ec..1d4a4b0232 100644 --- a/doc/guides/howto/pvp_reference_benchmark.rst +++ b/doc/guides/howto/pvp_reference_benchmark.rst @@ -99,14 +99,7 @@ Build Qemu: DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -117,7 +110,7 @@ Testpmd launch .. code-block:: console modprobe vfio-pci - $RTE_SDK/install/sbin/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 + ./dpdk/usertools/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 .. Note:: @@ -129,7 +122,7 @@ Testpmd launch .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ --vdev 'net_vhost0,iface=/tmp/vhost-user1' \ --vdev 'net_vhost1,iface=/tmp/vhost-user2' -- \ --portmask=f -i --rxq=1 --txq=1 \ @@ -309,18 +302,10 @@ Guest tuning echo "obase=16;$(( 0x$(cat $i) & ~$clear_mask ))" | bc > $i done - DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -340,13 +325,13 @@ Bind the virtio-net devices to DPDK: .. code-block:: console - $RTE_SDK/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 + ./dpdk/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 Start testpmd: .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ --proc-type auto --file-prefix pg -- \ --portmask=3 --forward-mode=macswap --port-topology=chained \ --disable-rss -i --rxq=1 --txq=1 \ diff --git a/doc/guides/howto/vfd.rst b/doc/guides/howto/vfd.rst index 0ec0a0478d..5a62e6ff5a 100644 --- a/doc/guides/howto/vfd.rst +++ b/doc/guides/howto/vfd.rst @@ -83,7 +83,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the PF in the host:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 #. Bind the VF port to ``igb_uio`` in the VM:: @@ -91,7 +91,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the VF in the VM:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 Common functions of IXGBE and I40E diff --git a/doc/guides/howto/virtio_user_for_container_networking.rst b/doc/guides/howto/virtio_user_for_container_networking.rst index 412b29664b..5eab360a1c 100644 --- a/doc/guides/howto/virtio_user_for_container_networking.rst +++ b/doc/guides/howto/virtio_user_for_container_networking.rst @@ -64,7 +64,7 @@ some minor changes. FROM ubuntu:latest WORKDIR /usr/src/dpdk COPY . /usr/src/dpdk - ENV PATH "$PATH:/usr/src/dpdk/x86_64-native-linux-gcc/app/" + ENV PATH "$PATH:/usr/src/dpdk/<build_dir>/app/" EOT #. Build a Docker image. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 27/37] doc: remove references to make in Linux gsg guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (25 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 26/37] doc: remove references to make in howto guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 28/37] doc: remove references to make in mempool guides Ciara Power ` (9 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/linux_gsg/build_dpdk.rst | 84 +++---------------- doc/guides/linux_gsg/build_sample_apps.rst | 69 +-------------- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 48 +---------- doc/guides/linux_gsg/enable_func.rst | 13 ++- doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/linux_drivers.rst | 18 ++-- doc/guides/linux_gsg/sys_reqs.rst | 16 +--- 7 files changed, 40 insertions(+), 210 deletions(-) diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index c536e354ef..85d04520bf 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -31,7 +31,7 @@ The DPDK is composed of several directories: * examples: Source code of DPDK application examples -* config, buildtools, mk: Framework-related makefiles, scripts and configuration +* config, buildtools: Framework-related scripts and configuration Compiling and Installing DPDK System-wide ----------------------------------------- @@ -39,11 +39,6 @@ Compiling and Installing DPDK System-wide DPDK can be configured, built and installed on your system using the tools ``meson`` and ``ninja``. -.. note:: - - The older makefile-based build system used in older DPDK releases is - still present and its use is described in section - `Installation of DPDK Target Environment using Make`_. DPDK Configuration ~~~~~~~~~~~~~~~~~~ @@ -81,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` to update its cache to take distributions, `/usr/local/lib` and `/usr/local/lib64` should be added to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. +.. _adjusting_build_options: + Adjusting Build Options ~~~~~~~~~~~~~~~~~~~~~~~ @@ -117,6 +114,9 @@ dependencies are met on the current system are built. When `-Dexamples=all` is set as a meson option, meson will check each example application to see if it can be built, and add all which can be built to the list of tasks in the ninja build configuration file. +.. _building_app_using_installed_dpdk: + + Building Applications Using Installed DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -140,11 +140,12 @@ and the sources for that build are stored in ``$(SRCS-y)``. .. note:: - Unlike with the older make build system, the meson system is not - designed to be used directly from a build directory. Instead it is - recommended that it be installed either system-wide or to a known - location in the user's home directory. The install location can be set - using the `--prefix` meson option (default: `/usr/local`). + Unlike with the make build system present used in older DPDK releases, + the meson system is not designed to be used directly from a build + directory. Instead it is recommended that it be installed either + system-wide or to a known location in the user's home directory. + The install location can be set using the `--prefix` meson option + (default: `/usr/local`). an equivalent build recipe for a simple DPDK application using meson as a build system is shown below: @@ -156,64 +157,3 @@ build system is shown below: dpdk = dependency('libdpdk') sources = files('main.c') executable('dpdk-app', sources, dependencies: dpdk) - - -Installation of DPDK Target Environment using Make --------------------------------------------------- - -.. note:: - - The building of DPDK using make will be deprecated in a future release. It - is therefore recommended that DPDK installation is done using meson and - ninja as described above. - -Get a native target environment automatically:: - - make defconfig O=mybuild - -.. note:: - - Within the configuration files, the ``RTE_MACHINE`` configuration value is set to native, - which means that the compiled software is tuned for the platform on which it is built. - -Or get a specific target environment:: - - make config T=x86_64-native-linux-gcc O=mybuild - -The format of a DPDK target is "ARCH-MACHINE-EXECENV-TOOLCHAIN". -Available targets can be found with:: - - make help - -Customize the target configuration in the generated ``.config`` file. -Example for enabling the pcap PMD:: - - sed -ri 's,(PMD_PCAP=).*,\1y,' mybuild/.config - -Compile the target:: - - make -j4 O=mybuild - -.. warning:: - - Any kernel modules to be used, e.g. ``igb_uio``, ``kni``, must be compiled with the - same kernel as the one running on the target. - If the DPDK is not being built on the target machine, - the ``RTE_KERNELDIR`` environment variable should be used to point the compilation at a copy of the kernel version to be used on the target machine. - -Install the target in a separate directory:: - - make install O=mybuild DESTDIR=myinstall prefix= - -The environment is ready to build a DPDK application:: - - RTE_SDK=$(pwd)/myinstall/share/dpdk RTE_TARGET=x86_64-native-linux-gcc make -C myapp - -In addition, the make clean command can be used to remove any existing compiled files for a subsequent full, clean rebuild of the code. - -Browsing the Installed DPDK Environment Target ----------------------------------------------- - -Once a target is created it contains all libraries, including poll-mode drivers, and header files for the DPDK environment that are required to build customer applications. -In addition, the test applications are built under the app directory, which may be used for testing. -A kmod directory is also present that contains kernel modules which may be loaded if needed. diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2f606535c3..f4bf0e71e5 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -Compiling and Running Sample Applications +Running Sample Applications ========================================= The chapter describes how to compile and run applications in an DPDK environment. @@ -15,56 +15,7 @@ It also provides a pointer to where sample applications are stored. Compiling a Sample Application ------------------------------ -Once an DPDK target environment directory has been created (such as ``x86_64-native-linux-gcc``), -it contains all libraries and header files required to build an application. - -When compiling an application in the Linux* environment on the DPDK, the following variables must be exported: - -* ``RTE_SDK`` - Points to the DPDK installation directory. - -* ``RTE_TARGET`` - Points to the DPDK target environment directory. - -The following is an example of creating the ``helloworld`` application, which runs in the DPDK Linux environment. -This example may be found in the ``${RTE_SDK}/examples`` directory. - -The directory contains the ``main.c`` file. This file, when combined with the libraries in the DPDK target environment, -calls the various functions to initialize the DPDK environment, -then launches an entry point (dispatch application) for each core to be utilized. -By default, the binary is generated in the build directory. - -.. code-block:: console - - cd examples/helloworld/ - export RTE_SDK=$HOME/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - - make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map - - ls build/app - helloworld helloworld.map - -.. note:: - - In the above example, ``helloworld`` was in the directory structure of the DPDK. - However, it could have been located outside the directory structure to keep the DPDK structure intact. - In the following case, the ``helloworld`` application is copied to a new directory as a new starting point. - - .. code-block:: console - - export RTE_SDK=/home/user/DPDK - cp -r $(RTE_SDK)/examples/helloworld my_rte_app - cd my_rte_app/ - export RTE_TARGET=x86_64-native-linux-gcc - - make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map +Please refer to :ref:`building_app_using_installed_dpdk` for detail on compiling sample apps. Running a Sample Application ---------------------------- @@ -168,7 +119,7 @@ Copy the DPDK application binary to your target, then run the application as fol (assuming the platform has four memory channels per processor socket, and that cores 0-3 are present and are to be used for running the application):: - ./helloworld -l 0-3 -n 4 + ./dpdk-helloworld -l 0-3 -n 4 .. note:: @@ -232,19 +183,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization Additional Sample Applications ------------------------------ -Additional sample applications are included in the ${RTE_SDK}/examples directory. +Additional sample applications are included in the DPDK examples directory. These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. In addition, see the *DPDK Sample Applications User Guide* for a description of the application, specific instructions on compilation and execution and some explanation of the code. - -Additional Test Applications ----------------------------- - -In addition, there are two other applications that are built when the libraries are created. -The source files for these are in the DPDK/app directory and are called test and testpmd. -Once the libraries are created, they can be found in the build/app directory. - -* The test application provides a variety of specific tests for the various functions in the DPDK. - -* The testpmd application provides a number of different packet throughput tests and - examples of features such as how to use the Flow Director found in the Intel® 82599 10 Gigabit Ethernet Controller. diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index c5875a6d57..8a1d0e88b0 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -67,7 +67,7 @@ Augment the cross toolchain with NUMA support .. note:: - This way is optional, an alternative is to use extra CFLAGS and LDFLAGS, depicted in :ref:`configure_and_cross_compile_dpdk_build` below. + This way is optional, an alternative is to use extra CFLAGS and LDFLAGS. Copy the NUMA header files and lib to the cross compiler's directories: @@ -79,8 +79,8 @@ Copy the NUMA header files and lib to the cross compiler's directories: .. _configure_and_cross_compile_dpdk_build: -Cross Compiling DPDK using Meson --------------------------------- +Cross Compiling DPDK +-------------------- Meson depends on pkgconfig to find the dependencies. The package ``pkg-config-aarch64-linux-gnu`` is required for aarch64. @@ -99,45 +99,3 @@ command:: meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ninja -C arm64-build - -Configure and Cross Compile DPDK using Make -------------------------------------------- -To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc. - -.. code-block:: console - - make config T=arm64-armv8a-linux-gcc - -To cross-compile, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -To cross-compile, including the kernel modules, the kernel source tree needs to be specified by setting -RTE_KERNELDIR: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- RTE_KERNELDIR=<kernel_src_rootdir> CROSS_COMPILE=aarch64-linux-gnu- - -To compile for non-NUMA targets, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n - -.. note:: - - 1. EXTRA_CFLAGS and EXTRA_LDFLAGS should be added to include the NUMA headers and link the library respectively, - if the above step :ref:`augment_the_cross_toolchain_with_numa_support` was skipped therefore the toolchain was not - augmented with NUMA support. - - 2. "-isystem <numa_install_dir>/include" should be add to EXTRA_CFLAGS, otherwise the numa.h file will get a lot of compiling - errors of Werror=cast-qual, Werror=strict-prototypes and Werror=old-style-definition. - - An example is given below: - - .. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index b2bda80bb7..08f55d8543 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -41,7 +41,9 @@ Enabling HPET in the DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, HPET support is disabled in the DPDK build configuration files. -To use HPET, the ``CONFIG_RTE_LIBEAL_USE_HPET`` setting should be changed to ``y``, which will enable the HPET settings at compile time. +To use HPET, use the following meson build option which will enable the HPET settings at compile time:: + + meson configure -Duse_hpet=true For an application to use the ``rte_get_hpet_cycles()`` and ``rte_get_hpet_hz()`` API calls, and optionally to make the HPET the default time source for the rte_timer library, @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module ---------------------------------- To run the DPDK Kernel NIC Interface (KNI) sample application, an extra kernel module (the kni module) must be loaded into the running kernel. -The module is found in the kmod sub-directory of the DPDK target directory. -Similar to the loading of the ``igb_uio`` module, this module should be loaded using the insmod command as shown below -(assuming that the current directory is the DPDK target directory): - -.. code-block:: console - - insmod kmod/rte_kni.ko +The module is found in the kernel/linux sub-directory of the DPDK build directory. +This can be enabled in the same way as the ``igb_uio`` module, please see :ref:`load_uio` for details. .. note:: diff --git a/doc/guides/linux_gsg/intro.rst b/doc/guides/linux_gsg/intro.rst index 94877f4ae2..890169e97f 100644 --- a/doc/guides/linux_gsg/intro.rst +++ b/doc/guides/linux_gsg/intro.rst @@ -23,7 +23,7 @@ The following is a list of DPDK documents in the suggested reading order: * The software architecture and how to use it (through examples), specifically in a Linux application (linux) environment - * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development kit and + * The content of the DPDK, the build system (including the commands that can be used to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst index 185074013a..349be1c906 100644 --- a/doc/guides/linux_gsg/linux_drivers.rst +++ b/doc/guides/linux_gsg/linux_drivers.rst @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in order to work properly. Depends on the PMD being used, a corresponding kernel driver should be load and bind to the network ports. +.. _load_uio: + + UIO --- @@ -28,19 +31,20 @@ can provide the uio capability. This module can be loaded using the command: ``uio_pci_generic`` module doesn't support the creation of virtual functions. As an alternative to the ``uio_pci_generic``, the DPDK also includes the igb_uio -module which can be found in the kmod subdirectory referred to above. It can +module which can be found in the kernel/linux subdirectory referred to above. It can be loaded as shown below: .. code-block:: console sudo modprobe uio - sudo insmod kmod/igb_uio.ko + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko .. note:: - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. - It is planned to move ``igb_uio`` module to a different git repository. + Building DPDK Linux kernel modules is disabled by default starting from DPDK v20.02. + To enable them again, the config option "enable_kmods" needs to be set in the meson + build configuration. See :ref:`adjusting_build_options` for details on how to set/clear + build options. It is planned to move ``igb_uio`` module to a different git repository. .. note:: @@ -104,11 +108,11 @@ parameter ``--vfio-vf-token``. 3. echo 2 > /sys/bus/pci/devices/0000:86:00.0/sriov_numvfs 4. Start the PF: - ./x86_64-native-linux-gcc/app/testpmd -l 22-25 -n 4 -w 86:00.0 \ + ./<build_dir>/app/dpdk-testpmd -l 22-25 -n 4 -w 86:00.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=pf -- -i 5. Start the VF: - ./x86_64-native-linux-gcc/app/testpmd -l 26-29 -n 4 -w 86:02.0 \ + ./<build_dir>/app/dpdk-testpmd -l 26-29 -n 4 -w 86:02.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=vf0 -- -i Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index a124656bcb..625fb58066 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -37,17 +37,13 @@ Compilation of the DPDK The setup commands and installed packages needed on various systems may be different. For details on Linux distributions and the versions tested, please consult the DPDK Release Notes. -* General development tools including ``make``, and a supported C compiler such as ``gcc`` (version 4.9+) or ``clang`` (version 3.4+). +* General development tools including a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+). * For RHEL/Fedora systems these can be installed using ``dnf groupinstall "Development Tools"`` * For Ubuntu/Debian systems these can be installed using ``apt install build-essential`` -* Python, recommended version 3.5+. - - * Python v3.5+ is needed to build DPDK using meson and ninja - - * Python 2.7+ or 3.2+, to use various helper scripts included in the DPDK package. +* Python, v3.5 or later. * Meson (version 0.47.1+) and ninja @@ -82,12 +78,8 @@ Compilation of the DPDK **Additional Libraries** A number of DPDK components, such as libraries and poll-mode drivers (PMDs) have additional dependencies. -For DPDK builds using meson, the presence or absence of these dependencies will be -automatically detected enabling or disabling the relevant components appropriately. - -For builds using make, these components are disabled in the default configuration and -need to be enabled manually by changing the relevant setting to "y" in the build configuration file -i.e. the ``.config`` file in the build folder. +For DPDK builds, the presence or absence of these dependencies will be automatically detected +enabling or disabling the relevant components appropriately. In each case, the relevant library development package (``-devel`` or ``-dev``) is needed to build the DPDK components. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 28/37] doc: remove references to make in mempool guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (26 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 27/37] doc: remove references to make in Linux gsg guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 29/37] doc: remove references to make in NIC guides Ciara Power ` (8 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/mempool/octeontx.rst | 28 +++------------------------- doc/guides/mempool/octeontx2.rst | 10 +--------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..33c40d5b17 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -30,33 +30,11 @@ Prerequisites See :doc: `../platform/octeontx.rst` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) - - Set default mempool ops to octeontx_fpavf. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console +------------------ - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc +See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK. Initialization @@ -70,5 +48,5 @@ Example: .. code-block:: console - ./build/app/test -c 0xf --base-virtaddr=0x100000000000 \ + ./<build_dir>/app/test/dpdk-test -c 0xf --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..53f09a52db 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -97,4 +89,4 @@ Standalone mempool device Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device:: - echo "mempool_autotest" | build/app/test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" + echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 29/37] doc: remove references to make in NIC guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (27 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 28/37] doc: remove references to make in mempool guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 30/37] doc: remove references to make in platform guides Ciara Power ` (7 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Shepard Siegel, Ed Czeck, John Miller, John McNamara, Marko Kovacevic, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Wei Zhao, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Bruce Richardson, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/nics/ark.rst | 26 ------------- doc/guides/nics/atlantic.rst | 4 -- doc/guides/nics/axgbe.rst | 15 -------- doc/guides/nics/bnx2x.rst | 27 ------------- doc/guides/nics/bnxt.rst | 5 +-- doc/guides/nics/build_and_test.rst | 8 +++- doc/guides/nics/cxgbe.rst | 36 +++++------------ doc/guides/nics/dpaa.rst | 27 +------------ doc/guides/nics/dpaa2.rst | 26 +------------ doc/guides/nics/ena.rst | 16 -------- doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 ----- doc/guides/nics/fail_safe.rst | 20 ++-------- doc/guides/nics/features.rst | 9 ----- doc/guides/nics/fm10k.rst | 4 -- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ----- doc/guides/nics/i40e.rst | 44 ++++++--------------- doc/guides/nics/ice.rst | 25 ++---------- doc/guides/nics/igc.rst | 18 +-------- doc/guides/nics/intel_vf.rst | 13 +------ doc/guides/nics/ionic.rst | 8 ---- doc/guides/nics/ipn3ke.rst | 12 +----- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 ------------- doc/guides/nics/memif.rst | 10 ++--- doc/guides/nics/mlx4.rst | 55 ++------------------------ doc/guides/nics/mlx5.rst | 62 ++---------------------------- doc/guides/nics/mvneta.rst | 36 ++++------------- doc/guides/nics/mvpp2.rst | 43 ++++----------------- doc/guides/nics/nfb.rst | 19 +-------- doc/guides/nics/nfp.rst | 4 -- doc/guides/nics/null.rst | 6 +-- doc/guides/nics/octeontx.rst | 19 +-------- doc/guides/nics/octeontx2.rst | 13 +------ doc/guides/nics/pcap_ring.rst | 24 ++++++------ doc/guides/nics/qede.rst | 17 +------- doc/guides/nics/sfc_efx.rst | 15 -------- doc/guides/nics/softnic.rst | 13 +------ doc/guides/nics/szedata2.rst | 18 +-------- doc/guides/nics/thunderx.rst | 25 +----------- doc/guides/nics/vdev_netvsc.rst | 6 --- doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- 44 files changed, 102 insertions(+), 693 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 06e8c33746..d7d679b452 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -119,32 +119,6 @@ Data Path Interface Ingress RX and Egress TX operation is by the nominal DPDK API . The driver supports single-port, multi-queue for both RX and TX. -Configuration Information -------------------------- - -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug - logging and internal checking of RX ingress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug - logging and internal checking of TX egress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables debug - logging of detailed packet and performance statistics gathered in - the PMD and FPGA. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables debug - logging of detailed PMD events and status. - Building DPDK ------------- diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..3c163df7a8 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -72,33 +72,6 @@ Prerequisites `linux-firmware git repository <https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/bnx2x/bnx2x-e2-7.13.11.0.fw>`_ to get the required firmware. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) - - Toggle display of register reads and writes. - .. _bnx2x_driver-compilation: diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 129a16cfc7..4b172fdaac 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode @@ -612,7 +609,7 @@ Basic stats include: * oerrors By default, per-queue stats for 16 queues are supported. For more than 16 -queues, BNXT PMD should be compiled with ``CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS`` +queues, BNXT PMD should be compiled with ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` set to the desired number of queues. Extended Stats diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index 3138c0f880..03ce358553 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -66,10 +66,14 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. #. Load ``igb_uio`` or ``vfio-pci`` driver: + Before compiling, make sure to enable kmods for the meson build:: + + meson configure -Denable_kmods=true + .. code-block:: console modprobe uio - insmod ./x86_64-native-linux-gcc/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko or @@ -106,7 +110,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..442ab1511c 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -87,35 +87,19 @@ Prerequisites :ref:`linux-installation` for Linux and section :ref:`freebsd-installation` for FreeBSD. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. For example, .. code-block:: console - testpmd -w 02:00.4,keep_ovlan=1 -- -i + dpdk-testpmd -w 02:00.4,keep_ovlan=1 -- -i Common Runtime Options -^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~ - ``keep_ovlan`` (default **0**) @@ -133,7 +117,7 @@ Common Runtime Options coalesce limit has been reached. CXGBE VF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``force_link_up`` (default **0**) @@ -142,7 +126,7 @@ CXGBE VF Only Runtime Options to send traffic to each other even when the physical link is down. CXGBE PF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``filtermode`` (default **0**) @@ -317,7 +301,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88 -- -i - ``filtermask`` (default **0**) @@ -344,7 +328,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i .. _driver-compilation: @@ -689,7 +673,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ + cp <build_dir>/kernel/freebsd/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -770,13 +754,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko + kldload <build_dir>/kernel/freebsd/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 17839a920e..eba8bfe600 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -195,31 +195,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ @@ -264,7 +239,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5a..b64bc6311b 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ @@ -473,7 +449,7 @@ for details. .. code-block:: console - ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx + ./dpdk-testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... EAL: Registered [pci] bus. diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index bec97c3326..4bdc3182fc 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 3c896eeffa..6203f4d799 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -113,5 +113,3 @@ Driver compilation and testing Follow instructions available in the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` to launch **testpmd** - -To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..be6a034279 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,8 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index b4a92f663b..b7bc5a566b 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- @@ -128,7 +116,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i @@ -142,7 +130,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -w 81:00.0 -- -i @@ -150,7 +138,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 -w ff:ff.f \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 -w ff:ff.f \ --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i #. Start testpmd, automatically probing the device 84:00.0 and using it with @@ -158,7 +146,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index edd21c4d8e..6172a0fa4b 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -812,8 +812,6 @@ ARMv7 Support armv7 architecture. -Use ``defconfig_arm-armv7a-*-*``. - .. _nic_features_armv8: @@ -822,8 +820,6 @@ ARMv8 Support armv8a (64bit) architecture. -Use ``defconfig_arm64-armv8a-*-*`` - .. _nic_features_power8: @@ -832,7 +828,6 @@ Power8 Support PowerPC architecture. -Use ``defconfig_ppc_64-power8-*-*`` .. _nic_features_x86-32: @@ -841,8 +836,6 @@ x86-32 Support 32bits x86 architecture. -Use ``defconfig_x86_x32-native-*-*`` and ``defconfig_i686-native-*-*``. - .. _nic_features_x86-64: @@ -851,8 +844,6 @@ x86-64 Support 64bits x86 architecture. -Use ``defconfig_x86_64-native-*-*``. - .. _nic_features_usage_doc: diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index b7430f6c4e..945fe97441 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -155,35 +155,13 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. +The following options can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -354,7 +332,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --forward-mode=mac + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --forward-mode=mac ... testpmd> set promisc 0 off @@ -389,8 +367,9 @@ Start ``testpmd`` with ``--disable-rss`` and ``--pkt-filter-mode=perfect``: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --disable-rss --pkt-filter-mode=perfect \ - --rxq=8 --txq=8 --nb-cores=8 --nb-ports=1 + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --disable-rss \ + --pkt-filter-mode=perfect --rxq=8 --txq=8 --nb-cores=8 \ + --nb-ports=1 Add a rule to direct ``ipv4-udp`` packet whose ``dst_ip=2.2.2.5, src_ip=2.2.2.3, src_port=32, dst_port=32`` to queue 1: @@ -648,8 +627,7 @@ For all available versions of the i40e driver, these drivers don't support 16 byte RX descriptor. If the Linux i40e kernel driver is used as host driver, while DPDK i40e PMD is used as the VF driver, DPDK cannot choose 16 byte receive descriptor. The reason is that the RX descriptor is already set to 32 byte by -the i40e kernel driver. That is to say, user should keep -``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n`` in config file. +the i40e kernel driver. In the future, if the Linux i40e driver supports 16 byte RX descriptor, user should make sure the DPDK VF uses the same RX descriptor mode, 16 byte or 32 byte, as the PF driver. @@ -760,7 +738,9 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +In ``config/rte_config.h`` set the following to use 16 bytes size RX descriptors:: + + #define RTE_LIBRTE_I40E_16BYTE_RX_DESC 1 Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -813,7 +793,7 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup. 7. The command line of running l3fwd would be something like the following:: - ./l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ + ./dpdk-l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ -- -p 0x3 --config '(0,0,18),(0,1,19),(1,0,20),(1,1,21)' This means that the application uses core 18 for port 0, queue pair 0 forwarding, core 19 for port 0, queue pair 1 forwarding, diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb0..9d3fcd1c9c 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -23,23 +23,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -106,14 +89,14 @@ Runtime Config Options .. code-block:: console - testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' + dpdk-testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-13 are VLAN extraction, other queues run with no protocol extraction. .. code-block:: console - testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' + dpdk-testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. @@ -253,7 +236,7 @@ responses for the same from PF. #. Bind the VF0, and run testpmd with 'cap=dcf' devarg:: - testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i + dpdk-testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i #. Monitor the VF2 interface network traffic:: @@ -282,7 +265,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i + ./app/dpdk-testpmd -l 0-15 -n 4 -- -i ... testpmd> rx_vlan add 10 0 diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3b096236bf 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ @@ -67,7 +53,7 @@ outer VLAN to 0x9100: .. code-block:: console - ./app/testpmd -l 4-8 -- -i + ./app/dpdk-testpmd -l 4-8 -- -i ... testpmd> vlan set filter on 0 @@ -94,7 +80,7 @@ Start ``testpmd``: .. code-block:: console - ./testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss + ./dpdk-testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss Add a rule to direct packet whose ``ether-type=0x801`` to queue 1: diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..723a9c0fa2 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,6 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +520,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..5d4534e4da 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +77,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop HQoS and flow acceleration ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,7 +88,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port, enable FPGA HQoS and .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap Limitations or Known issues --------------------------- diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 90d3040cf5..80ba459d49 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -97,13 +97,13 @@ It is possible to test PMD quickly using KNI kernel module loopback feature: .. code-block:: console - insmod build/kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb * Start testpmd with no physical device but two KNI virtual devices: .. code-block:: console - ./testpmd --vdev net_kni0 --vdev net_kni1 -- -i + ./dpdk-testpmd --vdev net_kni0 --vdev net_kni1 -- -i .. code-block:: console diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index ddeebed25c..6c6227f979 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -213,15 +213,15 @@ In this example we run two instances of testpmd application and transmit packets First create ``master`` interface:: - #./build/app/testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i + #./<build_dir>/app/dpdk-testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i Now create ``slave`` interface (master must be already running so the slave will connect):: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i You can also enable ``zero-copy`` on ``slave`` interface:: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i Start forwarding packets:: @@ -257,7 +257,7 @@ To see socket filename use show memif command:: Now create memif interface by running testpmd with these command line options:: - #./testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i + #./dpdk-testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i Testpmd should now create memif slave interface and try to connect to master. In testpmd set forward option to icmpecho and start forwarding:: @@ -280,7 +280,7 @@ The situation is analogous to cross connecting 2 ports of the NIC by cable. To set the loopback, just use the same socket and id with different roles:: - #./testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i + #./dpdk-testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i Then start the communication:: diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 1f1e2f6c77..d077ada7e2 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,43 +51,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +65,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +203,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 211c0c5a6c..9c32893fc6 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -328,50 +323,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -383,10 +337,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1109,12 +1059,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..e8abde42da 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -81,20 +75,9 @@ Prerequisites Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. @@ -107,7 +90,7 @@ be passed as part of EAL arguments. .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ -c 3 -- -i --p 3 -a @@ -126,16 +109,13 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +following command: .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + Usage Example ------------- @@ -160,7 +140,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ -i --p 3 -a --txd 256 --rxd 128 --rxq=1 --txq=1 --nb-cores=1 @@ -168,4 +148,4 @@ In order to run l2fwd example application following command can be used: .. code-block:: console - ./l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 + ./dpdk-l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..6fbce8358e 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -143,22 +123,15 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +command below. For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`. .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make Usage Example ------------- @@ -185,7 +158,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ --burst=128 --txd=2048 --rxd=1024 --rxq=2 --txq=2 --nb-cores=2 \ -i -a --rss-udp @@ -373,7 +346,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ -c 7 -- -i -a --disable-hw-vlan-strip --rxq=3 --txq=3 .. _flowapi: @@ -486,7 +459,7 @@ Before proceeding run testpmd user application: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip Example #1 ^^^^^^^^^^ @@ -578,7 +551,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 2. Create meter profile: @@ -657,7 +630,7 @@ For a detailed usage description please refer to "Traffic Management" section in .. code-block:: console - ./testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ + ./dpdk-testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ -i -p 3 --disable-hw-vlan-strip --rxq 3 --txq 3 --txd 1024 --rxd 1024 2. Stop all ports: diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..ecea3ecff0 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./<build_dir>/app/dpdk-testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. @@ -133,7 +118,7 @@ transmit queue: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 5f2a0698f6..6aa58f4358 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..e75abd96d2 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..c01ae09bb3 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./<build_dir>/app/dpdk-testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index bb591a8b7e..903b52b802 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document @@ -74,7 +63,7 @@ use arm64-octeontx2-linux-gcc as target. .. code-block:: console - ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 + ./<build_dir>/app/dpdk-testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 EAL: Detected 24 lcore(s) EAL: Detected 1 NUMA nodes EAL: Multi-process socket /var/run/dpdk/rte/mp_socket diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index cf230ae40a..67bd23ea4a 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx @@ -225,7 +223,7 @@ Multiple devices may be specified, separated by commas. .. code-block:: console - ./testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i + ./dpdk-testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i EAL: Detected lcore 1 as core 1 on socket 0 ... diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index 5b2f868952..6df0066dd4 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -111,22 +111,9 @@ Performance note Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index be1c2fe1d6..6ee5190f3c 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -271,21 +271,6 @@ Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_PMD`` (default **y**) - - Enable compilation of Solarflare libefx-based poll-mode driver. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG`` (default **n**) - - Enable compilation of the extra run-time consistency checks. - - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..695ebed91f 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- @@ -130,7 +121,7 @@ Soft NIC testing .. code-block:: console - ./testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i + ./dpdk-testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i --portmask=0x2 .. code-block:: console @@ -375,7 +366,7 @@ commands. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -c 0x7 -s 0x4 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0x7 -s 0x4 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..9cf3f39eb5 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..a928a790e3 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ @@ -70,8 +50,7 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linux-gcc as target. +Use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling. Linux ----- @@ -178,7 +157,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst index d36f3120b2..ee802ec4a8 100644 --- a/doc/guides/nics/vhost.rst +++ b/doc/guides/nics/vhost.rst @@ -90,7 +90,7 @@ This section demonstrates vhost PMD with testpmd DPDK sample application. .. code-block:: console - ./testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i + ./dpdk-testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i Other basic DPDK preparations like hugepage enabling here. Please refer to the *DPDK Getting Started Guide* for detailed instructions. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 0daf25b22d..a51b389685 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -110,7 +110,7 @@ Host2VM communication example .. code-block:: console - examples/kni/build/app/kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" + <build_dir>/examples/dpdk-kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" This command generates one network device vEth0 for physical port. If specify more physical ports, the generated network device will be vEth1, vEth2, and so on. @@ -340,7 +340,7 @@ Here we use l3fwd-power as an example to show how to get started. .. code-block:: console - $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ + $ dpdk-l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ --no-numa --parse-ptype -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 30/37] doc: remove references to make in platform guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (28 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 29/37] doc: remove references to make in NIC guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides Ciara Power ` (6 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/platform/bluefield.rst | 22 --------------------- doc/guides/platform/octeontx.rst | 33 +------------------------------ doc/guides/platform/octeontx2.rst | 32 ------------------------------ 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..9c20ce437d 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. The above steps would rebuild the modules and the required intermediate binaries. Once the target is ready for native compilation, the OCTEON TX platform -drivers can be compiled with the following steps, +drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details. -.. code-block:: console - - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: The above steps will prepare build system with numa additions. Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" - If NUMA support is not required, it can be disabled as explained in :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. -Following steps could be used in that case. - -.. code-block:: console - - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- - - SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 13255eec5c..232f628366 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -498,27 +498,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -529,17 +508,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (29 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 30/37] doc: remove references to make in platform guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 15:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 32/37] doc: remove references to make in rawdev guides Ciara Power ` (5 subsequent siblings) 36 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Thomas Monjalon, John McNamara, Marko Kovacevic, Anatoly Burakov, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Konstantin Ananyev, Ferruh Yigit, Chas Williams, Wei Hu (Xavier), Olivier Matz, Andrew Rybchenko, Cristian Dumitrescu, Jasvinder Singh, Honnappa Nagarahalli, Sunil Kumar Kori Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 3 +- doc/guides/prog_guide/build_app.rst | 48 +-- .../prog_guide/dev_kit_build_system.rst | 331 ------------------ .../prog_guide/dev_kit_root_make_help.rst | 188 ---------- .../prog_guide/env_abstraction_layer.rst | 17 +- ...ib_make_help.rst => ext_app_make_help.rst} | 25 +- doc/guides/prog_guide/graph_lib.rst | 6 +- doc/guides/prog_guide/index.rst | 4 +- doc/guides/prog_guide/intro.rst | 2 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../prog_guide/kernel_nic_interface.rst | 14 +- .../link_bonding_poll_mode_drv_lib.rst | 15 +- doc/guides/prog_guide/lto.rst | 12 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/profile_app.rst | 17 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- 22 files changed, 52 insertions(+), 704 deletions(-) delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => ext_app_make_help.rst} (69%) diff --git a/MAINTAINERS b/MAINTAINERS index 0fec96558e..095824ab0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -103,8 +103,7 @@ F: Makefile F: config/ F: doc/build-sdk-quick.txt F: doc/guides/prog_guide/build_app.rst -F: doc/guides/prog_guide/dev_kit_* -F: doc/guides/prog_guide/ext_app_lib_make_help.rst +F: doc/guides/prog_guide/ext_app_make_help.rst Meson build M: Bruce Richardson <bruce.richardson@intel.com> diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index bffa55bbef..550341cb93 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -9,14 +9,11 @@ Building Your Own Application Compiling a Sample Application in the Development Kit Directory --------------------------------------------------------------- -When compiling a sample application (for example, hello world), the following variables must be exported: -RTE_SDK and RTE_TARGET. +To compile a sample application with make (for example, hello world): .. code-block:: console ~/DPDK$ cd examples/helloworld/ - ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc ~/DPDK/examples/helloworld$ make CC main.o LD helloworld @@ -30,6 +27,8 @@ The binary is generated in the build directory by default: ~/DPDK/examples/helloworld$ ls build/app helloworld helloworld.map +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling with meson. + Build Your Own Application Outside the Development Kit ------------------------------------------------------ @@ -39,8 +38,6 @@ The sample application (Hello World) can be duplicated in a new directory as a s ~$ cp -r DPDK/examples/helloworld my_rte_app ~$ cd my_rte_app/ - ~/my_rte_app$ export RTE_SDK=/home/user/DPDK - ~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc ~/my_rte_app$ make CC main.o LD helloworld @@ -53,47 +50,10 @@ Customizing Makefiles Application Makefile ~~~~~~~~~~~~~~~~~~~~ -The default makefile provided with the Hello World sample application is a good starting point. It includes: - -* $(RTE_SDK)/mk/rte.vars.mk at the beginning - -* $(RTE_SDK)/mk/rte.extapp.mk at the end +The default makefile provided with the Hello World sample application is a good starting point. The user must define several variables: * APP: Contains the name of the application. * SRCS-y: List of source files (\*.c, \*.S). - -Library Makefile -~~~~~~~~~~~~~~~~ - -It is also possible to build a library in the same way: - -* Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -* Include $(RTE_SDK)/mk/rte.extlib.mk at the end. - -The only difference is that APP should be replaced by LIB, which contains the name of the library. For example, libfoo.a. - -Customize Makefile Actions -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be defined to customize Makefile actions. The most common are listed below. Refer to -:ref:`Makefile Description <Makefile_Description>` section in -:ref:`Development Kit Build System <Development_Kit_Build_System>` - -chapter for details. - -* VPATH: The path list where the build system will search for sources. By default, - RTE_SRCDIR will be included in VPATH. - -* CFLAGS_my_file.o: The specific flags to add for C compilation of my_file.c. - -* CFLAGS: The flags to use for C compilation. - -* LDFLAGS: The flags to use for linking. - -* CPPFLAGS: The flags to use to provide flags to the C preprocessor (only useful when assembling .S files) - -* LDLIBS: A list of libraries to link with (for example, -L /path/to/libfoo - lfoo) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst deleted file mode 100644 index 74dba4dd16..0000000000 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ /dev/null @@ -1,331 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Build_System: - -Development Kit Build System -============================ - -The DPDK requires a build system for compilation activities and so on. -This section describes the constraints and the mechanisms used in the DPDK framework. - -There are two use-cases for the framework: - -* Compilation of the DPDK libraries and sample applications; - the framework generates specific binary libraries, - include files and sample applications - -* Compilation of an external application or library, using an installed binary DPDK - -Building the Development Kit Binary ------------------------------------ - -The following provides details on how to build the DPDK binary. - -Build Directory Concept -~~~~~~~~~~~~~~~~~~~~~~~ - -After installation, a build directory structure is created. -Each build directory contains include files, libraries, and applications. - -A build directory is specific to a configuration that includes architecture + execution environment + toolchain. -It is possible to have several build directories sharing the same sources with different configurations. - -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, -we use: - -.. code-block:: console - - cd ${RTE_SDK} - make config T=x86_64-native-linux-gcc O=my_sdk_build_dir - -This creates a new my_sdk_build_dir directory. After that, we can compile by doing: - -.. code-block:: console - - cd my_sdk_build_dir - make - -which is equivalent to: - -.. code-block:: console - - make O=my_sdk_build_dir - -Refer to -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` -for details about make commands that can be used from the root of DPDK. - -Building External Applications ------------------------------- - -Since DPDK is in essence a development kit, the first objective of end users will be to create an application using this SDK. -To compile an application, the user must set the RTE_SDK and RTE_TARGET environment variables. - -.. code-block:: console - - export RTE_SDK=/opt/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - cd /path/to/my_app - -For a new application, the user must create their own Makefile that includes some .mk files, such as -${RTE_SDK}/mk/rte.vars.mk, and ${RTE_SDK}/mk/ rte.app.mk. -This is described in -:ref:`Building Your Own Application <Building_Your_Own_Application>`. - -Depending on the chosen target (architecture, machine, executive environment, toolchain) defined in the Makefile or as an environment variable, -the applications and libraries will compile using the appropriate .h files and will link with the appropriate .a files. -These files are located in ${RTE_SDK}/arch-machine-execenv-toolchain, which is referenced internally by ${RTE_BIN_SDK}. - -To compile their application, the user just has to call make. -The compilation result will be located in /path/to/my_app/build directory. - -Sample applications are provided in the examples directory. - -.. _Makefile_Description: - -Makefile Description --------------------- - -General Rules For DPDK Makefiles -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -In the DPDK, Makefiles always follow the same scheme: - -#. Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -#. Define specific variables for RTE build system. - -#. Include a specific $(RTE_SDK)/mk/rte.XYZ.mk, where XYZ can be app, lib, extapp, extlib, obj, gnuconfigure, - and so on, depending on what kind of object you want to build. - :ref:`See Makefile Types <Makefile_Types>` below. - -#. Include user-defined rules and variables. - - The following is a very simple example of an external application Makefile: - - .. code-block:: make - - include $(RTE_SDK)/mk/rte.vars.mk - - # binary name - APP = helloworld - - # all source are stored in SRCS-y - SRCS-y := main.c - - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - include $(RTE_SDK)/mk/rte.extapp.mk - -.. _Makefile_Types: - -Makefile Types -~~~~~~~~~~~~~~ - -Depending on the .mk file which is included at the end of the user Makefile, the Makefile will have a different role. -Note that it is not possible to build a library and an application in the same Makefile. -For that, the user must create two separate Makefiles, possibly in two different directories. - -In any case, the rte.vars.mk file must be included in the user Makefile as soon as possible. - -Application -^^^^^^^^^^^ - -These Makefiles generate a binary application. - -* rte.app.mk: Application in the development kit framework - -* rte.extapp.mk: External application - -* rte.hostapp.mk: prerequisite tool to build dpdk - -Library -^^^^^^^ - -Generate a .a library. - -* rte.lib.mk: Library in the development kit framework - -* rte.extlib.mk: external library - -* rte.hostlib.mk: host library in the development kit framework - -Install -^^^^^^^ - -* rte.install.mk: Does not build anything, it is only used to create links or copy files to the installation directory. - This is useful for including files in the development kit framework. - -Kernel Module -^^^^^^^^^^^^^ - -* rte.module.mk: Build a kernel module in the development kit framework. - -Objects -^^^^^^^ - -* rte.obj.mk: Object aggregation (merge several .o in one) in the development kit framework. - -* rte.extobj.mk: Object aggregation (merge several .o in one) outside the development kit framework. - -Misc -^^^^ - -* rte.gnuconfigure.mk: Build an application that is configure-based. - -* rte.subdir.mk: Build several directories in the development kit framework. - -.. _Internally_Generated_Build_Tools: - -Internally Generated Build Tools -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -``app/dpdk-pmdinfogen`` - - -``dpdk-pmdinfogen`` scans an object (.o) file for various well known symbol names. -These well known symbol names are defined by various macros and used to export -important information about hardware support and usage for pmd files. For -instance the macro: - -.. code-block:: c - - RTE_PMD_REGISTER_PCI(name, drv) - -Creates the following symbol: - -.. code-block:: c - - static char this_pmd_name0[] __attribute__((used)) = "<name>"; - - -Which ``dpdk-pmdinfogen`` scans for. Using this information other relevant -bits of data can be exported from the object file and used to produce a -hardware support description, that ``dpdk-pmdinfogen`` then encodes into a -JSON formatted string in the following format: - -.. code-block:: c - - static char <name_pmd_string>="PMD_INFO_STRING=\"{'name' : '<name>', ...}\""; - - -These strings can then be searched for by external tools to determine the -hardware support of a given library or application. - - -.. _Useful_Variables_Provided_by_the_Build_System: - -Useful Variables Provided by the Build System -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* RTE_SDK: The absolute path to the DPDK sources. - When compiling the development kit, this variable is automatically set by the framework. - It has to be defined by the user as an environment variable if compiling an external application. - -* RTE_SRCDIR: The path to the root of the sources. When compiling the development kit, RTE_SRCDIR = RTE_SDK. - When compiling an external application, the variable points to the root of external application sources. - -* RTE_OUTPUT: The path to which output files are written. - Typically, it is $(RTE_SRCDIR)/build, but it can be overridden by the O= option in the make command line. - -* RTE_TARGET: A string identifying the target for which we are building. - The format is arch-machine-execenv-toolchain. - When compiling the SDK, the target is deduced by the build system from the configuration (.config). - When building an external application, it must be specified by the user in the Makefile or as an environment variable. - -* RTE_SDK_BIN: References $(RTE_SDK)/$(RTE_TARGET). - -* RTE_ARCH: Defines the architecture (i686, x86_64). - It is the same value as CONFIG_RTE_ARCH but without the double-quotes around the string. - -* RTE_MACHINE: Defines the machine. - It is the same value as CONFIG_RTE_MACHINE but without the double-quotes around the string. - -* RTE_TOOLCHAIN: Defines the toolchain (gcc , icc). - It is the same value as CONFIG_RTE_TOOLCHAIN but without the double-quotes around the string. - -* RTE_EXEC_ENV: Defines the executive environment (linux). - It is the same value as CONFIG_RTE_EXEC_ENV but without the double-quotes around the string. - -* RTE_KERNELDIR: This variable contains the absolute path to the kernel sources that will be used to compile the kernel modules. - The kernel headers must be the same as the ones that will be used on the target machine (the machine that will run the application). - By default, the variable is set to /lib/modules/$(shell uname -r)/build, - which is correct when the target machine is also the build machine. - -* RTE_DEVEL_BUILD: Stricter options (stop on warning). It defaults to y in a git tree. - -Variables that Can be Set/Overridden in a Makefile Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* VPATH: The path list that the build system will search for sources. By default, RTE_SRCDIR will be included in VPATH. - -* CFLAGS: Flags to use for C compilation. The user should use += to append data in this variable. - -* LDFLAGS: Flags to use for linking. The user should use += to append data in this variable. - -* ASFLAGS: Flags to use for assembly. The user should use += to append data in this variable. - -* CPPFLAGS: Flags to use to give flags to C preprocessor (only useful when assembling .S files). - The user should use += to append data in this variable. - -* LDLIBS: In an application, the list of libraries to link with (for example, -L /path/to/libfoo -lfoo ). - The user should use += to append data in this variable. - -* SRC-y: A list of source files (.c, .S, or .o if the source is a binary) in case of application, library or object Makefiles. - The sources must be available from VPATH. - -* INSTALL-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be copied in $(RTE_OUTPUT)/$(INSTPATH). Can be used in almost any RTE Makefile. - -* SYMLINK-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be linked (symbolically) in $(RTE_OUTPUT)/$(INSTPATH). - This variable can be used in almost any DPDK Makefile. - -* PREBUILD: A list of prerequisite actions to be taken before building. The user should use += to append data in this variable. - -* POSTBUILD: A list of actions to be taken after the main build. The user should use += to append data in this variable. - -* PREINSTALL: A list of prerequisite actions to be taken before installing. The user should use += to append data in this variable. - -* POSTINSTALL: A list of actions to be taken after installing. The user should use += to append data in this variable. - -* PRECLEAN: A list of prerequisite actions to be taken before cleaning. The user should use += to append data in this variable. - -* POSTCLEAN: A list of actions to be taken after cleaning. The user should use += to append data in this variable. - -* DEPDIRS-$(DIR): Only used in the development kit framework to specify if the build of the current directory depends on build of another one. - This is needed to support parallel builds correctly. - -Variables that can be Set/Overridden by the User on the Command Line Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be used to configure the build system behavior. They are documented in -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` and -:ref:`External Application/Library Makefile Help <External_Application/Library_Makefile_Help>` - - * WERROR_CFLAGS: By default, this is set to a specific value that depends on the compiler. - Users are encouraged to use this variable as follows: - - CFLAGS += $(WERROR_CFLAGS) - -This avoids the use of different cases depending on the compiler (icc or gcc). -Also, this variable can be overridden from the command line, which allows bypassing of the flags for testing purposes. - -Variables that Can be Set/Overridden by the User in a Makefile or Command Line -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* CFLAGS_my_file.o: Specific flags to add for C compilation of my_file.c. - -* LDFLAGS_my_app: Specific flags to add when linking my_app. - -* EXTRA_CFLAGS: The content of this variable is appended after CFLAGS when compiling. - -* EXTRA_LDFLAGS: The content of this variable is appended after LDFLAGS when linking. - -* EXTRA_LDLIBS: The content of this variable is appended after LDLIBS when linking. - -* EXTRA_ASFLAGS: The content of this variable is appended after ASFLAGS when assembling. - -* EXTRA_CPPFLAGS: The content of this variable is appended after CPPFLAGS when using a C preprocessor on assembly files. diff --git a/doc/guides/prog_guide/dev_kit_root_make_help.rst b/doc/guides/prog_guide/dev_kit_root_make_help.rst deleted file mode 100644 index a30db7d5b4..0000000000 --- a/doc/guides/prog_guide/dev_kit_root_make_help.rst +++ /dev/null @@ -1,188 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Root_Makefile_Help: - -Development Kit Root Makefile Help -================================== - -The DPDK provides a root level Makefile with targets for configuration, building, cleaning, testing, installation and others. -These targets are explained in the following sections. - -Configuration Targets ---------------------- - -The configuration target requires the name of the target, which is specified using T=mytarget and it is mandatory. -The list of available targets are in $(RTE_SDK)/config (remove the defconfig _ prefix). - -Configuration targets also support the specification of the name of the output directory, using O=mybuilddir. -This is an optional parameter, the default output directory is build. - -* Config - - This will create a build directory, and generates a configuration from a template. - A Makefile is also created in the new build directory. - - Example: - - .. code-block:: console - - make config O=mybuild T=x86_64-native-linux-gcc - -Build Targets -------------- - -Build targets support the optional specification of the name of the output directory, using O=mybuilddir. -The default output directory is build. - -* all, build or just make - - Build the DPDK in the output directory previously created by a make config. - - Example: - - .. code-block:: console - - make O=mybuild - -* clean - - Clean all objects created using make build. - - Example: - - .. code-block:: console - - make clean O=mybuild - -* %_sub - - Build a subdirectory only, without managing dependencies on other directories. - - Example: - - .. code-block:: console - - make lib/librte_eal_sub O=mybuild - -* %_clean - - Clean a subdirectory only. - - Example: - - .. code-block:: console - - make lib/librte_eal_clean O=mybuild - -Install Targets ---------------- - -* Install - - The list of available targets are in $(RTE_SDK)/config (remove the defconfig\_ prefix). - - The GNU standards variables may be used: - http://gnu.org/prep/standards/html_node/Directory-Variables.html and - http://gnu.org/prep/standards/html_node/DESTDIR.html - - Example: - - .. code-block:: console - - make install DESTDIR=myinstall prefix=/usr - -Test Targets ------------- - -* test - - Launch automatic tests for a build directory specified using O=mybuilddir. - It is optional, the default output directory is build. - - Example: - - .. code-block:: console - - make test O=mybuild - -Documentation Targets ---------------------- - -* doc - - Generate the documentation (API and guides). - -* doc-api-html - - Generate the Doxygen API documentation in html. - -* doc-guides-html - - Generate the guides documentation in html. - -* doc-guides-pdf - - Generate the guides documentation in pdf. - -Misc Targets ------------- - -* help - - Show a quick help. - -Other Useful Command-line Variables ------------------------------------ - -The following variables can be specified on the command line: - -* V= - - Enable verbose build (show full compilation command line, and some intermediate commands). - -* D= - - Enable dependency debugging. This provides some useful information about why a target is built or not. - -* EXTRA_CFLAGS=, EXTRA_LDFLAGS=, EXTRA_LDLIBS=, EXTRA_ASFLAGS=, EXTRA_CPPFLAGS= - - Append specific compilation, link or asm flags. - -* CROSS= - - Specify a cross toolchain header that will prefix all gcc/binutils applications. This only works when using gcc. - -Make in a Build Directory -------------------------- - -All targets described above are called from the SDK root $(RTE_SDK). -It is possible to run the same Makefile targets inside the build directory. -For instance, the following command: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - make O=mybuild - -is equivalent to: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - cd mybuild - - # no need to specify O= now - make - -Compiling for Debug -------------------- - -To compile the DPDK and sample applications with debugging information included and the optimization level set to 0, -the EXTRA_CFLAGS environment variable should be set before compiling as follows: - -.. code-block:: console - - export EXTRA_CFLAGS='-O0 -g' diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index f64ae953d1..936c885081 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -201,16 +201,16 @@ each segment is strictly one physical page. It is possible to change the amount of virtual memory being preallocated at startup by editing the following config variables: -* ``CONFIG_RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have -* ``CONFIG_RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each +* ``RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have +* ``RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each segment list can address -* ``CONFIG_RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can +* ``RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can have -* ``CONFIG_RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type +* ``RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type can have (where "type" is defined as "page size + NUMA node" combination) -* ``CONFIG_RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each +* ``RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each memory type can address -* ``CONFIG_RTE_MAX_MEM_MB`` places a global maximum on the amount of memory +* ``RTE_MAX_MEM_MB`` places a global maximum on the amount of memory DPDK can reserve Normally, these options do not need to be changed. @@ -715,11 +715,6 @@ However, they can be used in configuration code. Refer to the rte_malloc() function description in the *DPDK API Reference* manual for more information. -Cookies -~~~~~~~ - -When CONFIG_RTE_MALLOC_DEBUG is enabled, the allocated memory contains -overwrite protection fields to help identify buffer overflows. Alignment and NUMA Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/prog_guide/ext_app_lib_make_help.rst b/doc/guides/prog_guide/ext_app_make_help.rst similarity index 69% rename from doc/guides/prog_guide/ext_app_lib_make_help.rst rename to doc/guides/prog_guide/ext_app_make_help.rst index 4312778dc9..681114239d 100644 --- a/doc/guides/prog_guide/ext_app_lib_make_help.rst +++ b/doc/guides/prog_guide/ext_app_make_help.rst @@ -1,28 +1,11 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -.. _External_Application/Library_Makefile_help: +.. _External_Application_Makefile_help: -External Application/Library Makefile help +External Application Makefile help ========================================== -External applications or libraries should include specific Makefiles from RTE_SDK, located in mk directory. -These Makefiles are: - -* ${RTE_SDK}/mk/rte.extapp.mk: Build an application - -* ${RTE_SDK}/mk/rte.extlib.mk: Build a static library - -* ${RTE_SDK}/mk/rte.extobj.mk: Build objects (.o) - -Prerequisites -------------- - -The following variables must be defined: - -* ${RTE_SDK}: Points to the root directory of the DPDK. - -* ${RTE_TARGET}: Reference the target to be used for compilation (for example, x86_64-native-linux-gcc). Build Targets ------------- @@ -32,7 +15,7 @@ This is optional; the default output directory is build. * all, "nothing" (meaning just make) - Build the application or the library in the specified output directory. + Build the application in the specified output directory. Example: @@ -93,6 +76,4 @@ It is possible to run the Makefile from another directory, by specifying the out .. code-block:: console - export RTE_SDK=/path/to/DPDK - export RTE_TARGET=x86_64-native-linux-icc make -f /path/to/my_app/Makefile S=/path/to/my_app O=/path/to/build_dir diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 669d77c740..c922d10f3d 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -45,13 +45,11 @@ Performance tuning parameters ----------------------------- - Test with various burst size values (256, 128, 64, 32) using - CONFIG_RTE_GRAPH_BURST_SIZE config option. + RTE_GRAPH_BURST_SIZE config option. The testing shows, on x86 and arm64 servers, The sweet spot is 256 burst size. While on arm64 embedded SoCs, it is either 64 or 128. -- Disable node statistics (using ``CONFIG_RTE_LIBRTE_GRAPH_STATS`` config option) +- Disable node statistics (using ``RTE_LIBRTE_GRAPH_STATS`` config option) if not needed. -- Use arm64 optimized memory copy for arm64 architecture by - selecting ``CONFIG_RTE_ARCH_ARM64_MEMCPY``. Programming model ----------------- diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst index 0454768de3..2cf20e0619 100644 --- a/doc/guides/prog_guide/index.rst +++ b/doc/guides/prog_guide/index.rst @@ -62,12 +62,10 @@ Programmer's Guide ipsec_lib graph_lib source_org - dev_kit_build_system - dev_kit_root_make_help build-sdk-meson meson_ut build_app - ext_app_lib_make_help + ext_app_make_help perf_opt_guidelines writing_efficient_code lto diff --git a/doc/guides/prog_guide/intro.rst b/doc/guides/prog_guide/intro.rst index 5b319d36d9..44877bd3e3 100644 --- a/doc/guides/prog_guide/intro.rst +++ b/doc/guides/prog_guide/intro.rst @@ -34,7 +34,7 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system - (including the commands that can be used in the root DPDK Makefile to build the development kit and an application) + (including the commands that can be used in the root DPDK to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst index 6ac1bba649..314d4adbb8 100644 --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst @@ -103,8 +103,3 @@ Debug logging and Statistics Collection The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. This macro is not enabled by default. - -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. -This macro is disabled by default. -Note that while logging contains a lot of detailed information, -it slows down packet processing and might cause the loss of a lot of packets. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 32d09ccf82..de5d75bd4c 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -65,7 +65,7 @@ disabled, and the default carrier state of KNI interfaces is set to *off*. .. code-block:: console - # insmod kmod/rte_kni.ko + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko .. _kni_loopback_mode: @@ -77,14 +77,14 @@ by specifying the ``lo_mode`` parameter: .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo The ``lo_mode_fifo`` loopback option will loop back ring enqueue/dequeue operations in kernel space. .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb The ``lo_mode_fifo_skb`` loopback option will loop back ring enqueue/dequeue operations and sk buffer copies in kernel space. @@ -105,7 +105,7 @@ Single kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=single + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=single This mode will create only one kernel thread for all KNI interfaces to receive data on the kernel side. By default, this kernel thread is not @@ -122,7 +122,7 @@ kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=multiple + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple This mode will create a separate kernel thread for each KNI interface to receive data on the kernel side. The core affinity of each ``kni_thread`` @@ -163,13 +163,13 @@ To set the default carrier state to *on*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=on + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=on To set the default carrier state to *off*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=off + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=off If the ``carrier`` parameter is not specified, the default carrier state of KNI interfaces will be set to *off*. diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst index 2459fd243e..244dca56c4 100644 --- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst +++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst @@ -28,8 +28,9 @@ bonded device and its slave devices. .. note:: The Link Bonding PMD Library is enabled by default in the build - configuration files, the library can be disabled by setting - ``CONFIG_RTE_LIBRTE_PMD_BOND=n`` and recompiling the DPDK. + configuration, the library can be disabled using the meson option + "-Ddisable_drivers=net/bond". + Link Bonding Modes Overview --------------------------- @@ -377,7 +378,7 @@ Device names and bonding options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' Link Bonding EAL Options ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -477,22 +478,22 @@ Create a bonded device in round robin mode with two slaves specified by their PC .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained Create a bonded device in round robin mode with two slaves specified by their PCI address and an overriding MAC address: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained Create a bonded device in active backup mode with two slaves specified, and a primary slave specified by their PCI addresses: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained Create a bonded device in balance mode with two slaves specified by their PCI addresses, and a transmission policy of layer 3 + 4 forwarding: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index 277a6f1090..f79c449598 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -26,17 +26,7 @@ need to explicitly initialize variable in order to silence the compiler. Please note that turning LTO on causes considerable extension of build time. -When using make based build, link time optimization can be enabled for -the whole DPDK by setting: - -.. code-block:: console - - CONFIG_RTE_ENABLE_LTO=y - -in config file. - -For the meson based build it can be enabled by setting meson built-in -'b_lto' option: +Link time optimization can be enabled by setting meson built-in 'b_lto' option: .. code-block:: console diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index c3dbfb9221..2f190b40e4 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), -the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). +In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, +bad type, and so on). Use Cases --------- diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index e3e1f940be..f0bdcd3be1 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -17,14 +17,13 @@ This library is used by the :ref:`Mbuf Library <Mbuf_Library>`. Cookies ------- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. +In debug mode, cookies are added at the beginning and end of allocated blocks. The allocated objects then contain overwrite protection fields to help debugging buffer overflows. Stats ----- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), -statistics about get from/put in the pool are stored in the mempool structure. +In debug mode, statistics about get from/put in the pool are stored in the mempool structure. Statistics are per-lcore to avoid concurrent access to statistics counters. Memory Alignment Constraints on x86 architecture @@ -90,7 +89,7 @@ the speed at which a core can access its own cache for a specific memory pool wi The cache is composed of a small, per-core table of pointers and its length (used as a stack). This internal cache can be enabled or disabled at creation of the pool. -The maximum size of the cache is static and is defined at compilation time (CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE). +The maximum size of the cache is static and is defined at compilation time (RTE_MEMPOOL_CACHE_MAX_SIZE). :numref:`figure_mempool` shows a cache in operation. diff --git a/doc/guides/prog_guide/overview.rst b/doc/guides/prog_guide/overview.rst index 986c896908..537a568f1e 100644 --- a/doc/guides/prog_guide/overview.rst +++ b/doc/guides/prog_guide/overview.rst @@ -18,7 +18,7 @@ The framework creates a set of libraries for specific environments through the creation of an Environment Abstraction Layer (EAL), which may be specific to a mode of the Intel® architecture (32-bit or 64-bit), Linux* user space compilers or a specific platform. -These environments are created through the use of make files and configuration files. +These environments are created through the use of meson files and configuration files. Once the EAL library is created, the user may link with the library to create their own applications. Other libraries, outside of EAL, including the Hash, Longest Prefix Match (LPM) and rings libraries are also provided. @@ -38,21 +38,13 @@ Development Environment ----------------------- The DPDK project installation requires Linux and the associated toolchain, -such as one or more compilers, assembler, make utility, +such as one or more compilers, assembler, meson utility, editor and various libraries to create the DPDK components and libraries. Once these libraries are created for the specific environment and architecture, they may then be used to create the user's data plane application. When creating applications for the Linux user space, the glibc library is used. -For DPDK applications, two environmental variables (RTE_SDK and RTE_TARGET) -must be configured before compiling the applications. -The following are examples of how the variables can be set: - -.. code-block:: console - - export RTE_SDK=/home/user/DPDK - export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started Guide* for information on setting up the development environment. diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index e5d0e9079e..7093681983 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -33,14 +33,6 @@ Refer to the for details about application profiling. -Profiling with VTune -~~~~~~~~~~~~~~~~~~~~ - -To allow VTune attaching to the DPDK application, reconfigure and recompile -the DPDK with ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` and -``CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE`` enabled. - - Profiling on ARM64 ------------------ @@ -76,8 +68,7 @@ cycle counter for user space access by configuring the PMU from the privileged mode (kernel space). By default the ``rte_rdtsc()`` implementation uses a portable ``cntvct_el0`` -scheme. Application can choose the PMU based implementation with -``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``. +scheme. The example below shows the steps to configure the PMU based cycle counter on an ARMv8 machine. @@ -88,10 +79,8 @@ an ARMv8 machine. cd armv8_pmu_cycle_counter_el0 make sudo insmod pmu_el0_cycle_counter.ko - cd $DPDK_DIR - make config T=arm64-armv8a-linux-gcc - echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config - make + +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling DPDK with meson. .. warning:: diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst index a159709450..4e4ea33ccb 100644 --- a/doc/guides/prog_guide/qos_framework.rst +++ b/doc/guides/prog_guide/qos_framework.rst @@ -1525,15 +1525,7 @@ Integration with the DPDK QoS Scheduler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ RED functionality in the DPDK QoS scheduler is disabled by default. -To enable it, use the DPDK configuration parameter: - -:: - - CONFIG_RTE_SCHED_RED=y - -This parameter must be set to y. -The parameter is found in the build configuration files in the DPDK/config directory, -for example, DPDK/config/common_linux. +The parameter is found in the build configuration files in the DPDK/config directory. RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure that is passed to the scheduler on initialization. RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) diff --git a/doc/guides/prog_guide/rcu_lib.rst b/doc/guides/prog_guide/rcu_lib.rst index d142d0c79d..d0aef3bc16 100644 --- a/doc/guides/prog_guide/rcu_lib.rst +++ b/doc/guides/prog_guide/rcu_lib.rst @@ -186,10 +186,9 @@ they entered a quiescent state. This API checks if a writer has triggered a quiescent state query and update the state accordingly. The ``rte_rcu_qsbr_lock()`` and ``rte_rcu_qsbr_unlock()`` are empty functions. -However, when ``CONFIG_RTE_LIBRTE_RCU_DEBUG`` is enabled, these APIs aid -in debugging issues. One can mark the access to shared data structures on the -reader side using these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if -all the locks are unlocked. +However, these APIs can aid in debugging issues. One can mark the access to +shared data structures on the reader side using these APIs. The +``rte_rcu_qsbr_quiescent()`` will check if all the locks are unlocked. Resource reclamation framework for DPDK --------------------------------------- diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 31c153a1b7..8d531bd9ef 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -8,29 +8,10 @@ Source Organization This section describes the organization of sources in the DPDK framework. -Makefiles and Config --------------------- - -.. note:: - - In the following descriptions, - ``RTE_SDK`` is the environment variable that points to the base directory into which the tarball was extracted. - See - :ref:`Useful_Variables_Provided_by_the_Build_System` - for descriptions of other variables. - -Makefiles that are provided by the DPDK libraries and applications are located in ``$(RTE_SDK)/mk``. - -Config templates are located in ``$(RTE_SDK)/config``. The templates describe the options that are enabled for each target. -The config file also contains items that can be enabled and disabled for many of the DPDK libraries, -including debug options. -The user should look at the config file and become familiar with these options. -The config file is also used to create a header file, which will be located in the new build directory. - Libraries --------- -Libraries are located in subdirectories of ``$(RTE_SDK)/lib``. +Libraries are located in subdirectories of ``dpdk/lib``. By convention a library refers to any code that provides an API to an application. Typically, it generates an archive file (``.a``), but a kernel module would also go in the same directory. @@ -55,7 +36,7 @@ Applications ------------ Applications are source files that contain a ``main()`` function. -They are located in the ``$(RTE_SDK)/app`` and ``$(RTE_SDK)/examples`` directories. +They are located in the ``dpdk/app`` and ``dpdk/examples`` directories. The app directory contains sample applications that are used to test DPDK (such as autotests) or the Poll Mode Drivers (test-pmd). diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 9bbfd165d8..fbadf9fde9 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -135,8 +135,7 @@ In order to avoid performance impact in fast path code, the library introduced the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``. ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using -``CONFIG_RTE_ENABLE_TRACE_FP`` configuration parameter. -The ``enable_trace_fp`` option shall be used for the same for meson build. +the ``enable_trace_fp`` option for meson build. Event record mode ----------------- diff --git a/doc/guides/prog_guide/writing_efficient_code.rst b/doc/guides/prog_guide/writing_efficient_code.rst index 2639ef7bf6..db2f1ddbc2 100644 --- a/doc/guides/prog_guide/writing_efficient_code.rst +++ b/doc/guides/prog_guide/writing_efficient_code.rst @@ -258,8 +258,7 @@ For instance: Setting the Target CPU Type --------------------------- -The DPDK supports CPU microarchitecture-specific optimizations by means of CONFIG_RTE_MACHINE option -in the DPDK configuration file. +The DPDK supports CPU microarchitecture-specific optimizations by means of RTE_MACHINE option. The degree of optimization depends on the compiler's ability to optimize for a specific microarchitecture, therefore it is preferable to use the latest compiler versions whenever possible. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides Ciara Power @ 2020-08-20 15:08 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-08-20 15:08 UTC (permalink / raw) To: Ciara Power, dev Cc: Thomas Monjalon, John McNamara, Marko Kovacevic, Anatoly Burakov, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Konstantin Ananyev, Ferruh Yigit, Chas Williams, Wei Hu (Xavier), Olivier Matz, Andrew Rybchenko, Cristian Dumitrescu, Jasvinder Singh, Honnappa Nagarahalli, Sunil Kumar Kori On 20/08/2020 13:41, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > MAINTAINERS | 3 +- > doc/guides/prog_guide/build_app.rst | 48 +-- > .../prog_guide/dev_kit_build_system.rst | 331 ------------------ > .../prog_guide/dev_kit_root_make_help.rst | 188 ---------- > .../prog_guide/env_abstraction_layer.rst | 17 +- > ...ib_make_help.rst => ext_app_make_help.rst} | 25 +- > doc/guides/prog_guide/graph_lib.rst | 6 +- > doc/guides/prog_guide/index.rst | 4 +- > doc/guides/prog_guide/intro.rst | 2 +- > .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - > .../prog_guide/kernel_nic_interface.rst | 14 +- > .../link_bonding_poll_mode_drv_lib.rst | 15 +- > doc/guides/prog_guide/lto.rst | 12 +- > doc/guides/prog_guide/mbuf_lib.rst | 4 +- > doc/guides/prog_guide/mempool_lib.rst | 7 +- > doc/guides/prog_guide/overview.rst | 12 +- > doc/guides/prog_guide/profile_app.rst | 17 +- > doc/guides/prog_guide/qos_framework.rst | 10 +- > doc/guides/prog_guide/rcu_lib.rst | 7 +- > doc/guides/prog_guide/source_org.rst | 23 +- > doc/guides/prog_guide/trace_lib.rst | 3 +- > .../prog_guide/writing_efficient_code.rst | 3 +- > 22 files changed, 52 insertions(+), 704 deletions(-) > delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst > delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst > rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => ext_app_make_help.rst} (69%) > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 32/37] doc: remove references to make in rawdev guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (30 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 33/37] doc: remove references to make in sample app guides Ciara Power ` (4 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Nipun Gupta, John McNamara, Marko Kovacevic, Rosen Xu, Tianfei zhang, Bruce Richardson, Xiaoyun Li, Jingjing Wu, Satha Rao, Mahipal Challa Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ioat.rst | 8 +------- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 7 files changed, 1 insertion(+), 85 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst index d0eee5e237..c0a08ff852 100644 --- a/doc/guides/rawdevs/ioat.rst +++ b/doc/guides/rawdevs/ioat.rst @@ -54,13 +54,7 @@ shows: Compilation ------------ -For builds done with ``make``, the driver compilation is enabled by the -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is -enabled by default in builds for x86 platforms, and disabled in other -configurations. - -For builds using ``meson`` and ``ninja``, the driver will be built when the -target platform is x86-based. +The driver will be built when the target platform is x86-based. Device Setup ------------- diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index aa7d809649..0589b70087 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ is https://www.intel.com/content/dam/support/us/en/documents/server-products/Int - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 1e1dfbe931..f93ec1ffd7 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index bbcf530a45..4f91e78ab1 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 33/37] doc: remove references to make in sample app guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (31 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 32/37] doc: remove references to make in rawdev guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 34/37] doc: remove references to make in vdpadevs guides Ciara Power ` (3 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, John McNamara, Marko Kovacevic, Olivier Matz, David Hunt, Ori Kam, Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Harry van Haaren, Bernard Iremonger, Konstantin Ananyev, Cristian Dumitrescu, Ferruh Yigit, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, Kirill Rybalchenko, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/sample_app_ug/bbdev_app.rst | 34 ++------ doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +++++++------------ doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +-- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +----- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +--- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 ++-- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +-- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +-- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 ++-- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 ++--- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +++------- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +-- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +---- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +++------- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +-- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 ++++---- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- 49 files changed, 194 insertions(+), 346 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..764155f983 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -31,30 +31,12 @@ Limitations Compiling the Application ------------------------- -#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along - with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* - documentation for more details on this. +DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along +with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* +documentation for more details on this. -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make Running the Application ----------------------- @@ -63,8 +45,8 @@ The application accepts a number of command line options: .. code-block:: console - $ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] / - [-p ETH_PORT_ID] [-b BBDEV_ID] + $ ./<build_dir>/examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] / + [-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID] where: @@ -84,8 +66,8 @@ issue the command: .. code-block:: console - $ ./build/bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> -c 0x38 --socket-mem=2,2 \ - --file-prefix=bbdev -- -e 0x10 -d 0x20 + $ ./<build_dir>/examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> \ + -c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20 where, NIC0PCIADDR is the PCI address of the Rx port diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index 6deb6c8112..5e3a25a317 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -52,7 +52,7 @@ To run the application in linux environment, issue the following command: .. code-block:: console - $ ./build/cmdline -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-cmdline -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..adde775d4e 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,100 +9,75 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: - - .. code-block:: console - - cd $RTE_SDK - -Build DPDK: +Enable examples compilation: .. code-block:: console - make defconfig - make + meson configure -Dexamples=all -Build the sample applications: +Build: .. code-block:: console - export RTE_TARGET=build - make -C examples + ninja -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. +Applications are output to: ``dpdk/<build_dir>/examples``. -In the example above the compiled application is written to the ``build`` subdirectory. -To have the applications written to a different location, -the ``O=/path/to/build/directory`` option may be specified in the make command. +To compile a single application +------------------------------- - .. code-block:: console - make O=/tmp +Using meson +~~~~~~~~~~~ -To build the applications for debugging use the ``DEBUG`` option. -This option adds some extra flags, disables compiler optimizations and -sets verbose output. +Go to DPDK build directory: .. code-block:: console - make DEBUG=1 - - -To compile a single application -------------------------------- + cd dpdk/<build_dir> -Set the path to DPDK source code: +Enable example app compilation: - .. code-block:: console + .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + meson configure -Dexamples=helloworld -Go to DPDK source: +Build: - .. code-block:: console + .. code-block:: console - cd $RTE_SDK + ninja -Build DPDK: - .. code-block:: console +Using Make +~~~~~~~~~~ - make defconfig - make +Pkg-config is used when building an example app standalone using make, please +see :ref:`building_app_using_installed_dpdk` for more information. Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. - +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make -To cross compile the sample application(s) ------------------------------------------- - -For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command. -In example of AARCH64 cross compiling: +To build the application for debugging use the ``DEBUG`` option. +This option adds some extra flags, disables compiler optimizations and +sets verbose output. .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk - make -C examples CROSS=aarch64-linux-gnu- - or - make CROSS=aarch64-linux-gnu- + make DEBUG=1 diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 90270e3a58..3bd03905c3 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -42,7 +42,7 @@ Running the Application .. code-block:: console - ./build/distributor_app [EAL options] -- -p PORTMASK + ./<build-dir>/examples/dpdk-distributor [EAL options] -- -p PORTMASK where, @@ -53,7 +53,7 @@ Running the Application .. code-block:: console - $ ./build/distributor_app -l 1-9,22 -n 4 -- -p f + $ ./<build-dir>/examples/dpdk-distributor -l 1-9,22 -n 4 -- -p f #. Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst index 253004dd00..7819871917 100644 --- a/doc/guides/sample_app_ug/ethtool.rst +++ b/doc/guides/sample_app_ug/ethtool.rst @@ -24,7 +24,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./ethtool-app/${RTE_TARGET}/ethtool [EAL options] + ./<build_dir>/examples/dpdk-ethtool [EAL options] Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index dc7972aa9a..b4fc587a09 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -46,7 +46,8 @@ these settings is shown below: .. code-block:: console - ./build/eventdev_pipeline --vdev event_sw0 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D + ./<build_dir>/examples/dpdk-eventdev_pipeline --vdev event_sw0 -- -r1 -t1 / + -e4 -w FF00 -s4 -n0 -c32 -W1000 -D The application has some sanity checking built-in, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 2953fddeb9..8b009244b8 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -70,9 +70,7 @@ Compiling the Application * Compile Application - .. code-block:: console - - make -C examples/fips_validation + To compile the sample application see :doc:`compiling`. * Run ``dos2unix`` on the request files @@ -92,7 +90,7 @@ The application requires a number of command line options: .. code-block:: console - ./fips_validation [EAL options] + ./dpdk-fips_validation [EAL options] -- --req-file FILE_PATH/FOLDER_PATH --rsp-file FILE_PATH/FOLDER_PATH [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder] @@ -117,7 +115,7 @@ file for crypto_aesni_mb PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_mb -- + $ ./dpdk-fips_validation --vdev crypto_aesni_mb -- --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb @@ -126,7 +124,7 @@ data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_gcm0 -- + $ ./dpdk-fips_validation --vdev crypto_aesni_gcm0 -- --req-file /PATH/TO/REQUEST/FILE/FOLDER/ --rsp-file ./PATH/TO/RESPONSE/FILE/FOLDER/ --cryptodev-id 0 --path-is-folder diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index dc40b4d6f9..2ae22739c0 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -28,8 +28,8 @@ To run the example in a ``linux`` environment: .. code-block:: console - cd ~/dpdk/examples/flow_classify - ./build/flow_classify -c 4 -n 4 -- --rule_ipv4="../ipv4_rules_file.txt" + ./<build_dir>/examples/dpdk-flow_classify -c 4 -n 4 -- / + --rule_ipv4="../ipv4_rules_file.txt" Please refer to the *DPDK Getting Started Guide*, section :doc:`../linux_gsg/build_sample_apps` diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 5e5a6cd8a0..4a4006dc8e 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -13,28 +13,7 @@ It is intended as a demonstration of the basic components RTE flow rules. Compiling the Application ------------------------- -To compile the application export the path to the DPDK source tree and go to -the example directory: - -.. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - - cd ${RTE_SDK}/examples/flow_filtering - -Set the target, for example: - -.. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - -See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. - -Build the application as follows: - -.. code-block:: console - - make +To compile the sample application see :doc:`compiling`. Running the Application @@ -44,7 +23,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/flow -l 1 -n 1 + ./<build_dir>/examples/dpdk-flow_filtering -l 1 -n 1 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 46f997a7dc..8f48533873 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -21,7 +21,7 @@ To run the example in a linux environment: .. code-block:: console - $ ./build/helloworld -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-helloworld -l 0-3 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ioat.rst b/doc/guides/sample_app_ug/ioat.rst index bab7654b8d..f35bee9d86 100644 --- a/doc/guides/sample_app_ug/ioat.rst +++ b/doc/guides/sample_app_ug/ioat.rst @@ -45,7 +45,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/ioatfwd [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] + ./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] [--[no-]mac-updating] where, @@ -81,7 +81,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw + $ ./<build_dir>/examples/dpdk-ioat -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw To run the application in a Linux environment with 2 lcores (the master lcore, plus one forwarding core), 2 ports (ports 0 and 1), hardware copying and no MAC @@ -89,7 +89,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw + $ ./<build_dir>/examples/dpdk-ioat -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index afeaff3639..92d5e4aeae 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -53,7 +53,7 @@ Application usage: .. code-block:: console - ./build/ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] where: @@ -65,7 +65,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_fragmentation -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -94,7 +94,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst index 56014be174..1d8656c637 100644 --- a/doc/guides/sample_app_ug/ip_pipeline.rst +++ b/doc/guides/sample_app_ug/ip_pipeline.rst @@ -34,7 +34,7 @@ Running the application The application startup command line is:: - ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] + dpdk-ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] The application startup arguments are: @@ -71,7 +71,7 @@ The following is an example command to run ip pipeline application configured fo .. code-block:: console - $ ./build/ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli + $ ./<build_dir>/examples/dpdk-ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli The application should start successfully and display as follows: diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index f34b9d0055..e72c8492e9 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -42,7 +42,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] + ./<build_dir>/examples/dpdk-ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] where: @@ -61,7 +61,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_reassembly -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_reassembly -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -92,7 +92,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_reassembly -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_reassembly -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. @@ -231,7 +231,8 @@ Debug logging and Statistics Collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The RTE_LIBRTE_IP_FRAG_TBL_STAT controls statistics collection for the IP Fragment Table. -This macro is disabled by default. +This macro is disabled by default, but it can be enabled by modifying the appropriate line +in ``config/rte_config.h``. To make ip_reassembly print the statistics to the standard output, the user must send either an USR1, INT or TERM signal to the process. For all of these signals, the ip_reassembly process prints Fragment table statistics for each RX queue, diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 434f484138..1f37dccf8b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -116,12 +116,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ipsec-secgw`` sub-directory. -#. [Optional] Build the application for debugging: - This option adds some extra flags, disables compiler optimizations and - is verbose:: - - make DEBUG=1 - Running the Application ----------------------- @@ -129,7 +123,7 @@ Running the Application The application has a number of command line options:: - ./build/ipsec-secgw [EAL options] -- + ./<build_dir>/examples/dpdk-ipsec-secgw [EAL options] -- -p PORTMASK -P -u PORTMASK -j FRAMESIZE -l -w REPLAY_WINOW_SIZE -e -a -c SAD_CACHE_SIZE @@ -245,7 +239,7 @@ The mapping of lcores to port/queues is similar to other l3fwd applications. For example, given the following command line to run application in poll mode:: - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ --vdev "crypto_null" -- -p 0xf -P -u 0x3 \ --config="(0,0,20),(1,0,20),(2,0,21),(3,0,21)" \ -f /path/to/config_file --transfer-mode poll \ @@ -297,7 +291,7 @@ where each option means: Similarly for example, given the following command line to run application in event app mode:: - ./build/ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ -f /path/to/config_file --transfer-mode event \ --event-schedule-type parallel \ @@ -336,7 +330,7 @@ For example, something like the following command line: .. code-block:: console - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ -w 81:00.0 -w 81:00.1 -w 81:00.2 -w 81:00.3 \ --vdev "crypto_aesni_mb" --vdev "crypto_null" \ -- \ diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index 8923a7f548..7c6e8b15cc 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -50,7 +50,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] where, @@ -67,7 +67,7 @@ Typically, to run the IPv4 Multicast sample application, issue the following com .. code-block:: console - ./build/ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 + ./<build_dir>/examples/dpdk-ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 In this command: diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..ef7936f80f 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -49,7 +49,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l2fwd-keepalive [EAL options] \ + ./<build_dir>/examples/dpdk-l2fwd-keepalive [EAL options] \ -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD] where, @@ -68,7 +68,7 @@ To run the application in linux environment with 4 lcores, 16 ports .. code-block:: console - ./build/l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 + ./<build_dir>/examples/dpdk-l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index aac4ebd8d4..ef441cc1e5 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -96,7 +96,7 @@ The ``kni`` example application requires a number of command line options: .. code-block:: console - kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] + dpdk-kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] Where: @@ -168,8 +168,8 @@ interface ``vEth1_0`` with the kernel thread bound to lcore 9. .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" The following example is identical, except an additional ``lcore_kthread`` core is specified per physical port. In this case, ``kni`` will create @@ -186,8 +186,8 @@ The kernel thread for each interface will be bound as follows: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" The following example can be used to test the interface between the ``kni`` test application and the ``rte_kni`` kernel module. In this example, @@ -206,8 +206,8 @@ disabled by **not** specifying the ``-m`` flag to ``kni``: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo carrier=on - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo carrier=on + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" KNI Operations -------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 0a813200ba..c1be2d7dff 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -70,13 +70,13 @@ To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" or to enable CAT and CDP on cpus 1,3: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" If CDP is not supported it will fail with following error message: diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 962752f21c..e2c0f9f1ec 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / + ./<build_dir>/examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / [--cdev_type HW/SW/ANY] [--chain HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] / [--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] / [--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size SIZE] / @@ -162,7 +162,7 @@ To run the application in linux environment with 2 lcores, 2 ports and 2 crypto .. code-block:: console - $ ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ + $ ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ --vdev "crypto_aesni_mb1" -- -p 0x3 --chain CIPHER_HASH \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index d536eee819..11c9d4b2ee 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -52,7 +52,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE + ./<build_dir>/examples/dpdk-l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE where, @@ -75,20 +75,20 @@ issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll Eventdev mode with 4 lcores, 16 ports , sched method ordered and MAC address updating enabled, issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered or .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -105,7 +105,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Explanation ----------- diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 8d0c38721f..1a854abb23 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -81,7 +81,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] + ./<build_dir>/examples/dpdk-l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] where, @@ -96,7 +96,7 @@ thousands separator printing, issue the command: .. code-block:: console - $ ./build/l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l + $ ./<build_dir>/examples/dpdk-l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index c0e8488e79..5a13de215e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK + ./<build_dir>/examples/dpdk-l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating [--portmap="(port, port)[,(port, port)]"] @@ -111,7 +111,7 @@ updating enabled, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p ffff To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and @@ -119,7 +119,7 @@ vice versa, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936..7acbd7404e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -51,7 +51,7 @@ Running the Application The application has a number of command line options:: - ./l3fwd [EAL options] -- -p PORTMASK + ./dpdk-l3fwd [EAL options] -- -p PORTMASK [-P] [-E] [-L] @@ -111,7 +111,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: @@ -138,13 +138,13 @@ Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered or .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered In this command: @@ -166,7 +166,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered In case of eventdev mode, *--config* option is not used for ethernet port configuration. Instead each ethernet port will be configured with mentioned diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..d3c901f8d8 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_graph.rst b/doc/guides/sample_app_ug/l3_forward_graph.rst index df50827bab..75617e3af1 100644 --- a/doc/guides/sample_app_ug/l3_forward_graph.rst +++ b/doc/guides/sample_app_ug/l3_forward_graph.rst @@ -44,7 +44,7 @@ Running the Application The application has a number of command line options similar to l3fwd:: - ./l3fwd-graph [EAL options] -- -p PORTMASK + ./dpdk-l3fwd-graph [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--eth-dest=X,MM:MM:MM:MM:MM:MM] @@ -79,7 +79,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 0cc6f2e62e..4f997108ba 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -88,7 +88,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -378,7 +378,7 @@ See :doc:`Power Management<../prog_guide/power_man>` chapter in the DPDK Program .. code-block:: console - ./l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 + ./<build_dir>/examples/dpdk-l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 Where, @@ -407,7 +407,7 @@ app with the training flag set to “1”, and the other parameters set to .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P This will run the training algorithm for x seconds on each core (cores 2 and 3), and then print out the recommended threshold values for those @@ -432,7 +432,7 @@ then be started without the training mode so traffic can start immediately. .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P Telemetry Mode -------------- @@ -449,13 +449,9 @@ cycles it took is measured and compared with minimum and maximum reference cycles and accordingly busy rate is set to either 0% or 50% or 100%. - .. Note:: - - * The CONFIG_RTE_LIBRTE_TELEMETRY should be set in order to get the stats in DPDK telemetry. - .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry + ./<build_dir>/examples/dpdk-l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry The new stats ``empty_poll`` , ``full_poll`` and ``busy_percent`` can be viewed by running the script ``/usertools/dpdk-telemetry-client.py`` and selecting the menu option ``Send for global Metrics``. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 04c40f2854..75bfd78505 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] + ./<build_dir>/examples/dpdk-link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] where, @@ -54,7 +54,7 @@ issue the command: .. code-block:: console - $ ./build/link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index f2a79a6397..8b2858b971 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -41,7 +41,7 @@ passing at least two cores in the coremask/corelist, as follows: .. code-block:: console - ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary For the first DPDK process run, the proc-type flag can be omitted or set to auto, since all DPDK processes will default to being a primary instance, @@ -50,7 +50,7 @@ The process should start successfully and display a command prompt as follows: .. code-block:: console - $ ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + $ ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary EAL: coremask set to 3 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 0 @@ -78,7 +78,7 @@ again run the same binary setting at least two cores in the coremask/corelist: .. code-block:: console - ./build/simple_mp -l 2-3 -n 4 --proc-type=secondary + ./<build_dir>/examples/dpdk-simple_mp -l 2-3 -n 4 --proc-type=secondary When running a secondary process such as that shown above, the proc-type parameter can again be specified as auto. However, omitting the parameter altogether will cause the process to try and start as a primary rather than secondary process. @@ -184,10 +184,10 @@ the following commands can be used (assuming run as root): .. code-block:: console - # ./build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 - # ./build/symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 - # ./build/symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 - # ./build/symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 .. note:: @@ -284,9 +284,9 @@ the following commands could be used: .. code-block:: console - # ./mp_server/build/mp_server -l 1-2 -n 4 -- -p 3 -n 2 - # ./mp_client/build/mp_client -l 3 -n 4 --proc-type=auto -- -n 0 - # ./mp_client/build/mp_client -l 4 -n 4 --proc-type=auto -- -n 1 + # ./<build_dir>/examples/dpdk-mp_server -l 1-2 -n 4 -- -p 3 -n 2 + # ./<build_dir>/examples/dpdk-mp_client -l 3 -n 4 --proc-type=auto -- -n 0 + # ./<build_dir>/examples/dpdk-mp_client -l 4 -n 4 --proc-type=auto -- -n 1 .. note:: diff --git a/doc/guides/sample_app_ug/ntb.rst b/doc/guides/sample_app_ug/ntb.rst index 93fb752f25..f80b221db7 100644 --- a/doc/guides/sample_app_ug/ntb.rst +++ b/doc/guides/sample_app_ug/ntb.rst @@ -32,7 +32,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./build/ntb_fwd -c 0xf -n 6 -- -i + ./<build_dir>/examples/dpdk-ntb -c 0xf -n 6 -- -i Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/packet_ordering.rst b/doc/guides/sample_app_ug/packet_ordering.rst index 1c8ee5d040..5a4e0a9d28 100644 --- a/doc/guides/sample_app_ug/packet_ordering.rst +++ b/doc/guides/sample_app_ug/packet_ordering.rst @@ -43,7 +43,8 @@ The application execution command line is: .. code-block:: console - ./packet_ordering [EAL options] -- -p PORTMASK [--disable-reorder] [--insight-worker] + ./<build_dir>/examples/dpdk-packet_ordering [EAL options] -- -p PORTMASK / + [--disable-reorder] [--insight-worker] The -c EAL CPU_COREMASK option has to contain at least 3 CPU cores. The first CPU core in the core mask is the master core and would be assigned to diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..2a50eb4270 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -55,7 +55,7 @@ Running the Application The application has a number of command line options:: - ./build/l3fwd-thread [EAL options] -- + ./<build_dir>/examples/dpdk-l3fwd-thread [EAL options] -- -p PORTMASK [-P] --rx(port,queue,lcore,thread)[,(port,queue,lcore,thread)] --tx(lcore,thread)[,(lcore,thread)] @@ -141,14 +141,14 @@ in ``--rx/--tx`` are used to affinitize threads to the selected scheduler. For example, the following places every l-thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" The following places RX l-threads on lcore 0 and TX l-threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(2,1)" @@ -164,7 +164,7 @@ place every RX and TX thread on different lcores. For example, the following places every EAL thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -176,7 +176,7 @@ parameter is used. The following places RX EAL threads on lcore 0 and TX EAL threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -190,13 +190,13 @@ and its corresponding EAL threads command line can be realized as follows: a) Start every thread on different scheduler (1:1):: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" EAL thread equivalent:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -205,13 +205,13 @@ b) Start all threads on one core (N:1). Start 4 L-threads on lcore 0:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(0,0)(0,1)" Start 4 EAL threads on cpu-set 0:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -220,14 +220,14 @@ c) Start threads on different cores (N:M). Start 2 L-threads for RX on lcore 0, and 2 L-threads for TX on lcore 1:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(1,1)" Start 2 EAL threads for RX on cpu-set 0, and 2 EAL threads for TX on cpu-set 1:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -1146,33 +1146,15 @@ in the performance-thread folder To build and run the pthread shim example -#. Go to the example applications folder - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim - - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the DPDK Getting Started Guide for possible RTE_TARGET values. - #. Build the application: - .. code-block:: console - - make + To compile the sample application see :doc:`compiling`. #. To run the pthread_shim example .. code-block:: console - lthread-pthread-shim -c core_mask -n number_of_channels + dpdk-pthread-shim -c core_mask -n number_of_channels .. _lthread_diagnostics: diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 12b4f13d5b..a58b6f35bf 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -57,13 +57,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. -.. note:: - To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 - and then recompile DPDK: - - .. code-block:: console - - CONFIG_RTE_LIBRTE_IEEE1588=y Running the Application ----------------------- @@ -72,7 +65,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/ptpclient -l 1 -n 4 -- -p 0x1 -T 0 + ./<build_dir>/examples/dpdk-ptpclient -l 1 -n 4 -- -p 0x1 -T 0 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst index d75f7da52c..6b6853a0e9 100644 --- a/doc/guides/sample_app_ug/qos_metering.rst +++ b/doc/guides/sample_app_ug/qos_metering.rst @@ -48,7 +48,7 @@ The application execution command line is as below: .. code-block:: console - ./qos_meter [EAL options] -- -p PORTMASK + ./dpdk-qos_meter [EAL options] -- -p PORTMASK The application is constrained to use a single core in the EAL core mask and 2 ports only in the application port mask (first port from the port mask is used for RX and the other port in the core mask is used for TX). diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..801f5e1286 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,8 +42,8 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, - which can be done by changing the configuration file for the specific target to be compiled. + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the relevant + entry in the ``config/rte_config.h`` file. Running the Application ----------------------- @@ -57,7 +57,7 @@ The application has a number of command line options: .. code-block:: console - ./qos_sched [EAL options] -- <APP PARAMS> + ./<build_dir>/examples/dpdk-qos_sched [EAL options] -- <APP PARAMS> Mandatory application parameters include: @@ -315,7 +315,7 @@ The following is an example command with a single packet flow configuration: .. code-block:: console - ./qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg This example uses a single packet flow configuration which creates one RX thread on lcore 5 reading from port 3 and a worker thread on lcore 7 writing to port 2. @@ -324,7 +324,7 @@ Another example with 2 packet flow configurations using different ports but shar .. code-block:: console - ./qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg Note that independent cores for the packet flow configurations for each of the RX, WT and TX thread are also supported, providing flexibility to balance the work. diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..62d1f39d7e 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- @@ -40,7 +33,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/rxtx_callbacks -l 1 -n 4 -- [-t] + ./<build_dir>/examples/dpdk-rxtx_callbacks -l 1 -n 4 -- [-t] Use -t to enable hardware timestamping. If not supported by the NIC, an error will be displayed. diff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst index 12208f4258..f27d1ccfce 100644 --- a/doc/guides/sample_app_ug/server_node_efd.rst +++ b/doc/guides/sample_app_ug/server_node_efd.rst @@ -93,7 +93,7 @@ and the back-end node. The frontend server (server) has the following command line options:: - ./server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS + ./<build_dir>/examples/dpdk-server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS Where, diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..9202be6ea9 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -20,26 +20,9 @@ is application specific, and not a part of the service cores API. Compiling the Application ------------------------- -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make +The application is located in the ``service_cores`` sub-directory. Running the Application ----------------------- @@ -50,7 +33,7 @@ pass a service core-mask as an EAL argument at startup time. .. code-block:: console - $ ./build/service_cores + $ ./<build_dir>/examples/dpdk-service_cores Explanation diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 34f6f9aea7..263d8debc8 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -25,7 +25,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/basicfwd -l 1 -n 4 + ./<build_dir>/examples/dpdk-skeleton -l 1 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..86ced036ce 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,36 +90,17 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- -#. Go to the examples directory: +Run the tep_termination sample code: - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination - -#. Run the tep_termination sample code: - - .. code-block:: console +.. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- - -p 0x1 --dev-basename tep-termination --nb-devices 4 - --udp-port 4789 --filter-type 1 + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + -p 0x1 --dev-basename tep-termination --nb-devices 4 + --udp-port 4789 --filter-type 1 .. note:: @@ -139,7 +120,7 @@ The default value is 2. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 **Tunneling UDP port.** @@ -149,7 +130,7 @@ The default value is 4789. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 **Filter Type.** @@ -160,7 +141,7 @@ The default value is 1, which means the filter type of inner MAC and tenant ID i .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 --filter-type 1 **TX Checksum.** @@ -170,7 +151,7 @@ The default value is 0, which means the checksum offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --tx-checksum **TCP segment size.** @@ -180,7 +161,7 @@ The default value is 0, which means TSO offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --tx-checksum --tso-segsz 800 **Decapsulation option.** @@ -190,7 +171,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --decap 1 **Encapsulation option.** @@ -200,7 +181,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --encap 1 diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..d57d08fb2c 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/<build_dir>/app`` directory. Running the Application @@ -45,7 +45,7 @@ The application execution command line is: .. code-block:: console - ./test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE + ./dpdk-test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE The -c or -l EAL CPU coremask/corelist option has to contain exactly 3 CPU cores. The first CPU core in the core mask is assigned for core A, the second for core B and the third for core C. diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index 98d762d238..94cee9819d 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -21,7 +21,7 @@ To run the example in linux environment: .. code-block:: console - $ ./build/timer -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-timer -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index d66a724827..a8bedbab53 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -29,7 +29,7 @@ Start the vdpa example .. code-block:: console - ./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + ./dpdk-vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] where @@ -51,7 +51,7 @@ Take IFCVF driver for example: .. code-block:: console - ./vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ + ./dpdk-vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ -w 0000:06:00.3,vdpa=1 -w 0000:06:00.4,vdpa=1 \ -- --interactive diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..bacf7898f9 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -38,7 +38,7 @@ Start the vswitch example .. code-block:: console - ./vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ + ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ -- --socket-file /tmp/sock0 --client \ ... @@ -78,13 +78,13 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. .. code-block:: console - ./x86_64-native-gcc/app/testpmd -l 0-1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-1 -- -i > start tx_first Inject packets @@ -192,11 +192,6 @@ Common Issues max queue number is larger than 128, device start will fail due to insufficient mbuf. - Change the default number to make it work as below, just set the number - according to the NIC's property. :: - - make EXTRA_CFLAGS="-DMAX_QUEUES=320" - * Option "builtin-net-driver" is incompatible with QEMU QEMU vhost net device start will fail if protocol feature is not negotiated. diff --git a/doc/guides/sample_app_ug/vhost_blk.rst b/doc/guides/sample_app_ug/vhost_blk.rst index 681de6f3e1..788eef0d5f 100644 --- a/doc/guides/sample_app_ug/vhost_blk.rst +++ b/doc/guides/sample_app_ug/vhost_blk.rst @@ -36,7 +36,7 @@ Start the vhost_blk example .. code-block:: console - ./vhost_blk -m 1024 + ./dpdk-vhost_blk -m 1024 .. _vhost_blk_app_run_vm: diff --git a/doc/guides/sample_app_ug/vhost_crypto.rst b/doc/guides/sample_app_ug/vhost_crypto.rst index bbc25bde1c..7ae7addac4 100644 --- a/doc/guides/sample_app_ug/vhost_crypto.rst +++ b/doc/guides/sample_app_ug/vhost_crypto.rst @@ -28,7 +28,7 @@ Start the vhost_crypto example .. code-block:: console - ./vhost_crypto [EAL options] -- + ./dpdk-vhost_crypto [EAL options] -- --config (lcore,cdev-id,queue-id)[,(lcore,cdev-id,queue-id)] --socket-file lcore,PATH [--zero-copy] diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..35afdac63f 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -274,7 +271,7 @@ than the EAL options: .. code-block:: console - ./build/vm_power_mgr [EAL options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] The application requires exactly two cores to run. One core for the CLI and the other for the channel endpoint monitor. For example, to run on @@ -282,7 +279,7 @@ cores 0 and 1 on a system with four memory channels, issue the command: .. code-block:: console - ./build/vm_power_mgr -l 0-1 -n 4 + ./<build_dir>/examples/dpdk-vm_power_mgr -l 0-1 -n 4 After successful initialization, the VM Power Manager CLI prompt appears: @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -515,14 +509,14 @@ The standard EAL command line parameters are necessary: .. code-block:: console - ./build/vm_power_mgr [EAL options] -- [guest options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] -- [guest options] The guest example uses a channel for each lcore enabled. For example, to run on cores 0, 1, 2 and 3: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 .. _sending_policy: @@ -593,7 +587,7 @@ host, use a command like the following: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: @@ -707,7 +701,7 @@ To start the application and configure the power policy, and send it to the host .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c908074eb0 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,13 +26,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss + ./<build_dir>/examples/dpdk-vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss where, NP can be 16 or 32, TC can be 4 or 8, rss is disabled by default. @@ -72,7 +72,7 @@ To run the example in a linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index c3a3439e51..a1a8e77de2 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,13 +24,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_app [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss + ./<build_dir>/examples/dpdk-vmdq [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss where, NP can be 8, 16 or 32, rss is disabled by default. @@ -56,7 +56,7 @@ To run the example in a Linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_app -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 34/37] doc: remove references to make in vdpadevs guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (32 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 33/37] doc: remove references to make in sample app guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides Ciara Power ` (2 subsequent siblings) 36 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Xiao Wang, John McNamara, Marko Kovacevic, Matan Azrad, Viacheslav Ovsiienko Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/vdpadevs/ifc.rst | 13 ------------ doc/guides/vdpadevs/mlx5.rst | 40 +++--------------------------------- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst index 12a2a342e6..f968489a75 100644 --- a/doc/guides/vdpadevs/ifc.rst +++ b/doc/guides/vdpadevs/ifc.rst @@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and device state report/restore, this driver enables its vDPA functionality. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux) - - Toggle compilation of the ``librte_pmd_ifc`` driver. - - IFCVF vDPA Implementation ------------------------- diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..2717459b6f 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -65,42 +63,10 @@ Prerequisites Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (33 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 34/37] doc: remove references to make in vdpadevs guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-09-02 11:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references Ciara Power 36 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Declan Doherty, Reshma Pattan, Maryam Tahhan, Nicolas Chautru, Jerin Jacob Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/tools/comp_perf.rst | 10 ++------- doc/guides/tools/cryptoperf.rst | 20 +++-------------- doc/guides/tools/pdump.rst | 15 ++++++------- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 36 +++++++++---------------------- doc/guides/tools/testeventdev.rst | 21 ++++++++---------- 6 files changed, 31 insertions(+), 73 deletions(-) diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst index ee585d1024..1b33dc4e91 100644 --- a/doc/guides/tools/comp_perf.rst +++ b/doc/guides/tools/comp_perf.rst @@ -100,13 +100,7 @@ Application Options Compiling the Tool ------------------ -**Step 1: PMD setting** - -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which -can be disabled by default in the build configuration file ``common_base``. -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: - - CONFIG_RTE_LIBRTE_PMD_ISAL=y +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. Running the Tool @@ -116,5 +110,5 @@ The tool has a number of command line options. Here is the sample command line: .. code-block:: console - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index 28b729dbda..e7ea2ba1a5 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum throughput. Compiling the Application ------------------------- -**Step 1: PMD setting** -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The crypto device drivers PMD which should be tested can be enabled by setting:: - - CONFIG_RTE_LIBRTE_PMD_<name>=y - -Setting example for open ssl PMD:: - - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y - -**Step 2: Linearization setting** +**Step 1: Linearization setting** It is possible linearized input segmented packets just before crypto operation for devices which doesn't support scatter-gather, and allows to measure @@ -56,13 +45,10 @@ To set on the linearization options add below definition to the #define CPERF_LINEARIZATION_ENABLE -**Step 3: Build the application** +**Step 2: Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-crypto-perf`` application. +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 8a499c6c5b..70f03db9cc 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports framework initialization code. Refer ``app/test-pmd/testpmd.c`` code to see how this is done. - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled - by default in the build configuration files, - owing to an external dependency on the libpcap development files - which must be installed on the board. - Once the libpcap development files are installed, the libpcap based PMD - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool depends on libpcap based PMD which must be + installed on the board. + Once the libpcap development files are installed, recompile the DPDK. * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when the primary application exits. @@ -37,7 +34,7 @@ The tool has a number of command line options: .. code-block:: console - ./build/app/dpdk-pdump -- + ./<build_dir>/app/dpdk-pdump -- [--multi] --pdump '(port=<port id> | device_id=<pci id or vdev name>), (queue=<queue_id>), @@ -120,5 +117,5 @@ Example .. code-block:: console - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 0390b9c589..9772d97ef0 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,7 +17,7 @@ The application has a number of command line options: .. code-block:: console - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 393c3e9d0d..1fea7e0aa4 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -13,25 +13,10 @@ parameters passed to a python running script. Compiling the Application ------------------------- -**Step 1: PMD setting** +**Build the application** -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The bbdevice drivers PMD which should be tested can be enabled by setting +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` - -Setting example for (*baseband_turbo_sw*) PMD - - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` - -**Step 2: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-bbdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -60,7 +45,7 @@ The following are the command-line options: ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` Indicates the path to the bbdev test app. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with "*/build/app/testbbdev*". + on "../.." concatenated with "*/build/app/testbbdev*". ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` Specifies EAL arguments which are passed to the test app. For more details, @@ -82,9 +67,8 @@ The following are the command-line options: ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR [TEST_VECTOR ...]`` Specifies paths to the test vector files. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default - data file. + on "../.." concatenated with "*/app/test-bbdev/test_vectors/bbdev_null.data*" +and indicates default data file. **Example usage:** @@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes and processing parameters while still keeping their number limited as part of sanity regression. -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linux-icc target: +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output +to the build directory: :: @@ -268,7 +252,7 @@ x86_64-native-linux-icc target: |-- test-bbdev |-- test_vectors - |-- x86_64-native-linux-icc + |-- build |-- app |-- testbbdev @@ -277,7 +261,7 @@ All bbdev devices .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -291,7 +275,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/* -n 64 -b 8 32 diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst index 2ed67a6340..00387ec4ed 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -15,11 +15,8 @@ Compiling the Application **Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-eventdev`` application. +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -251,7 +248,7 @@ Example command to run order queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ --test=order_queue --plcores 1 --wlcores 2,3 @@ -314,7 +311,7 @@ Example command to run order ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=order_atq --plcores 1 --wlcores 2,3 @@ -414,7 +411,7 @@ Example command to run perf queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf queue test with ethernet ports: @@ -428,7 +425,7 @@ Example command to run perf queue test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ --prod_type_timerdev --fwd_latency @@ -514,14 +511,14 @@ Example command to run perf ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf ``all types queue`` test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ --stlist=a --prod_type_timerdev --fwd_latency @@ -633,7 +630,7 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a @@ -725,5 +722,5 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides Ciara Power @ 2020-09-02 11:08 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-02 11:08 UTC (permalink / raw) To: Ciara Power, dev Cc: John McNamara, Marko Kovacevic, Declan Doherty, Reshma Pattan, Maryam Tahhan, Nicolas Chautru, Jerin Jacob On 20/08/2020 13:41, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/tools/comp_perf.rst | 10 ++------- > doc/guides/tools/cryptoperf.rst | 20 +++-------------- > doc/guides/tools/pdump.rst | 15 ++++++------- > doc/guides/tools/proc_info.rst | 2 +- > doc/guides/tools/testbbdev.rst | 36 +++++++++---------------------- > doc/guides/tools/testeventdev.rst | 21 ++++++++---------- > 6 files changed, 31 insertions(+), 73 deletions(-) > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (34 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-09-02 11:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references Ciara Power 36 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev Cc: Ciara Power, Wenzhuo Lu, Beilei Xing, Bernard Iremonger, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/testpmd_app_ug/run_app.rst | 6 +++--- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index d1e4ee3e7a..ac4f0d9212 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the previous section, with .. code-block:: console - sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 + sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 The command line options are: @@ -59,13 +59,13 @@ The command line options are: * ``--nb-cores=N`` Set the number of forwarding cores, - where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the configuration file. + where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the configuration file. The default value is 1. * ``--nb-ports=N`` Set the number of forwarding ports, - where 1 <= N <= "number of ports" on the board or ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` from the configuration file. The default value is the number of ports on the board. * ``--coremask=0xXX`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 90cf252df5..f0d838321c 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command .. code-block:: console - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt Interactive-mode selected CLI commands to be read from /home/ubuntu/flow-create-commands.txt Configuring Port 0 (socket 0) @@ -329,8 +329,6 @@ The available information categories are: * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. - * ``noisy``: Noisy neighbor simulation. Simulate more realistic behavior of a guest machine engaged in receiving and sending packets performing Virtual Network Function (VNF). @@ -379,11 +377,6 @@ Example for the io forwarding engine, with some packet drops on the tx side:: TX-packets: 548595568 TX-dropped: 128 TX-total: 548595696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. note:: - - Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" stats, like: - - CPU cycles/packet=xx.dd (total cycles=xxxx / total RX packets=xxxx) at xxx MHz clock clear fwd ~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides Ciara Power @ 2020-09-02 11:08 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-02 11:08 UTC (permalink / raw) To: Ciara Power, dev Cc: Wenzhuo Lu, Beilei Xing, Bernard Iremonger, John McNamara, Marko Kovacevic On 20/08/2020 13:41, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/testpmd_app_ug/run_app.rst | 6 +++--- > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +-------- > 2 files changed, 4 insertions(+), 11 deletions(-) > <snip> > diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > index 90cf252df5..f0d838321c 100644 > --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command > > .. code-block:: console > > - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt > + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt > Interactive-mode selected > CLI commands to be read from /home/ubuntu/flow-create-commands.txt > Configuring Port 0 (socket 0) > @@ -329,8 +329,6 @@ The available information categories are: > > * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. > > -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. > - The support for ieee1588 info is not being removed, this line should stay in the documentation. Just remove the "CONFIG..." part. LGTM other than that. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power ` (35 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides Ciara Power @ 2020-08-20 12:41 ` Ciara Power 2020-09-02 11:08 ` Laatz, Kevin 36 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-08-20 12:41 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/build-sdk-quick.txt | 55 ++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index bcfa7d6fe1..423104094e 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -1,34 +1,21 @@ -Basic build - make defconfig && make - or - make config T=x86_64-native-linux-gcc && make -Build commands - config get configuration from target template (T=) - defconfig auto-select target template based on arch, OS, etc. - all same as build (default rule) - build build in a configured directory - clean remove files but keep configuration - install T= configure, build and install a target in DESTDIR - install install optionally staged in DESTDIR - examples build examples for given targets (T=) - examples_clean clean examples for given targets (T=) - test compile tests and run basic unit tests - test-* run specific subset of unit tests - tags|etags|gtags generate tags database for given targets (T=) - cscope generate cscope database for given targets (T=) -Build variables - EXTRA_CPPFLAGS preprocessor options - EXTRA_CFLAGS compiler options - EXTRA_LDFLAGS linker options - EXTRA_LDLIBS linker library options - RTE_KERNELDIR linux headers path - RTE_DEVEL_BUILD stricter options (default: y in git tree) - CROSS toolchain prefix - V verbose - D debug dependencies - O build directory (default: build/ - install T= default: ./) - DESTDIR staging install directory (default: empty) - prefix root install directory (default: /usr/local) - T target template - used with config or install - format: <arch-machine-execenv-toolchain> - templates in config/defconfig_* +For many platforms, compiling and installing DPDK should work using the +following set of commands:: + + meson build + cd build + ninja + ninja install + +This will compile DPDK in the ``build`` subdirectory, and then install the +resulting libraries, drivers and header files onto the system - generally +in /usr/local. A package-config file, ``libdpdk.pc``, for DPDK will also +be installed to allow ease of compiling and linking with applications. + +After installation, to use DPDK, the necessary CFLAG and LDFLAG variables +can be got from pkg-config:: + + pkg-config --cflags libdpdk + pkg-config --libs libdpdk + +More detail on each of these steps can be got from the +"Installing DPDK Using the meson build system" section of the programming guides. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references Ciara Power @ 2020-09-02 11:08 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-02 11:08 UTC (permalink / raw) To: Ciara Power, dev; +Cc: Thomas Monjalon, John McNamara, Marko Kovacevic On 20/08/2020 13:41, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/build-sdk-quick.txt | 55 ++++++++++++++++------------------------- > 1 file changed, 21 insertions(+), 34 deletions(-) > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (21 preceding siblings ...) 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles Ciara Power ` (38 more replies) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (2 subsequent siblings) 25 siblings, 39 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Ciara Power v3: Fixed comments on v2. v2: - Fixed comments on v1. - Removed additional make references. - Added some meson replacements where necessary. - Added dummy root Makefile. As previously decided [1] and communicated via deprecation notice [2], the make build system is to be removed in the 20.11 release. This patchset removes support for compiling DPDK with the legacy make build system. Some make support is maintained for example applications, where pkg-config is used rather than the legacy make method. References to the make build system are removed from all documentation, please review to see if replacement meson instructions are needed in some cases. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 Bruce Richardson (6): examples/multi_process: convert to pkg-config-based build examples/vm_power_manager: convert to use DPDK pkg-config examples/vm_power_manager: convert guest cli to pkg-config examples/ethtool: convert to pkg-config-based build build: create dummy Makefile doc/guides: remove use of DPDK make build system Ciara Power (28): examples: remove legacy sections of makefiles build: remove makefiles and mk directory config: remove all config files used by make examples: remove old build system references buildtools: remove all scripts for use with make devtools: remove use of make in scripts app/test: remove references to make drivers: remove references to make config options lib: remove references to make config options doc: remove deprecation notice for make doc: remove references to make in bbdev guides doc: remove references to make in compressdev guides doc: remove references to make in contributing guides doc: remove references to make in cryptodev guides doc: remove references to make in eventdev guides doc: remove references to make in FreeBSD gsg guide doc: remove references to make in howto guides doc: remove references to make in Linux gsg guides doc: remove references to make in mempool guides doc: remove references to make in NIC guides doc: remove references to make in platform guides doc: remove references to make in prog guides doc: remove references to make in rawdev guides doc: remove references to make in sample app guides doc: remove references to make in vdpadevs guides doc: remove reference to make in tools guides doc: remove references to make in testpmd guides doc: update quick build doc to remove make references Kevin Laatz (3): examples/server_node_efd: convert to pkg-config-based build examples/ka-agent: convert to pkg-config-based build examples/pthread: convert to pkg-config-based build GNUmakefile | 17 - MAINTAINERS | 12 +- Makefile | 7 +- app/Makefile | 34 - app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 - app/test-bbdev/test-bbdev.py | 11 +- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 - app/test-eventdev/Makefile | 32 - app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 - app/test-pipeline/Makefile | 33 - app/test-pmd/Makefile | 73 -- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ----- app/test/test_cryptodev.c | 89 +- app/test/test_cryptodev_asym.c | 18 +- buildtools/Makefile | 9 - buildtools/auto-config-h.sh | 108 -- buildtools/call-sphinx-build.py | 5 +- buildtools/gen-build-mk.sh | 23 - buildtools/gen-config-h.sh | 15 - buildtools/pmdinfogen/Makefile | 20 - buildtools/relpath.sh | 76 -- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - devtools/build-tags.sh | 14 +- devtools/check-includes.sh | 3 +- devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 315 ----- doc/build-sdk-quick.txt | 55 +- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 +- doc/guides/bbdevs/fpga_lte_fec.rst | 7 +- doc/guides/bbdevs/turbo_sw.rst | 15 - doc/guides/compressdevs/isal.rst | 4 - doc/guides/compressdevs/octeontx.rst | 24 +- doc/guides/compressdevs/zlib.rst | 4 - doc/guides/conf.py | 7 +- doc/guides/contributing/coding_style.rst | 46 +- doc/guides/contributing/design.rst | 127 +- doc/guides/contributing/documentation.rst | 31 +- doc/guides/contributing/patches.rst | 45 - doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 - doc/guides/cryptodevs/caam_jr.rst | 30 - doc/guides/cryptodevs/ccp.rst | 14 +- doc/guides/cryptodevs/dpaa2_sec.rst | 25 - doc/guides/cryptodevs/dpaa_sec.rst | 25 - doc/guides/cryptodevs/kasumi.rst | 11 +- doc/guides/cryptodevs/mvsam.rst | 10 +- doc/guides/cryptodevs/nitrox.rst | 7 - doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +- doc/guides/cryptodevs/octeontx2.rst | 8 +- doc/guides/cryptodevs/openssl.rst | 6 +- doc/guides/cryptodevs/qat.rst | 67 +- doc/guides/cryptodevs/scheduler.rst | 8 - doc/guides/cryptodevs/snow3g.rst | 10 +- doc/guides/cryptodevs/virtio.rst | 20 +- doc/guides/cryptodevs/zuc.rst | 10 +- doc/guides/eventdevs/dpaa.rst | 20 - doc/guides/eventdevs/dpaa2.rst | 20 - doc/guides/eventdevs/octeontx.rst | 24 - doc/guides/eventdevs/octeontx2.rst | 8 - doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/freebsd_gsg/intro.rst | 4 +- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +- doc/guides/howto/packet_capture_framework.rst | 21 +- doc/guides/howto/pvp_reference_benchmark.rst | 27 +- doc/guides/howto/vfd.rst | 4 +- .../virtio_user_for_container_networking.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 84 +- doc/guides/linux_gsg/build_sample_apps.rst | 69 +- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 48 +- doc/guides/linux_gsg/enable_func.rst | 13 +- doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/linux_drivers.rst | 18 +- doc/guides/linux_gsg/sys_reqs.rst | 16 +- doc/guides/mempool/octeontx.rst | 28 +- doc/guides/mempool/octeontx2.rst | 10 +- doc/guides/meson.build | 3 +- doc/guides/nics/ark.rst | 26 - doc/guides/nics/atlantic.rst | 4 - doc/guides/nics/axgbe.rst | 15 - doc/guides/nics/bnx2x.rst | 27 - doc/guides/nics/bnxt.rst | 5 +- doc/guides/nics/build_and_test.rst | 8 +- doc/guides/nics/cxgbe.rst | 36 +- doc/guides/nics/dpaa.rst | 27 +- doc/guides/nics/dpaa2.rst | 26 +- doc/guides/nics/ena.rst | 16 - doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 - doc/guides/nics/fail_safe.rst | 20 +- doc/guides/nics/features.rst | 9 - doc/guides/nics/fm10k.rst | 4 - doc/guides/nics/hinic.rst | 9 - doc/guides/nics/hns3.rst | 10 - doc/guides/nics/i40e.rst | 44 +- doc/guides/nics/ice.rst | 25 +- doc/guides/nics/igc.rst | 18 +- doc/guides/nics/intel_vf.rst | 13 +- doc/guides/nics/ionic.rst | 8 - doc/guides/nics/ipn3ke.rst | 12 +- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 - doc/guides/nics/memif.rst | 10 +- doc/guides/nics/mlx4.rst | 55 +- doc/guides/nics/mlx5.rst | 62 +- doc/guides/nics/mvneta.rst | 36 +- doc/guides/nics/mvpp2.rst | 43 +- doc/guides/nics/nfb.rst | 19 +- doc/guides/nics/nfp.rst | 4 - doc/guides/nics/null.rst | 6 +- doc/guides/nics/octeontx.rst | 19 +- doc/guides/nics/octeontx2.rst | 13 +- doc/guides/nics/pcap_ring.rst | 24 +- doc/guides/nics/qede.rst | 17 +- doc/guides/nics/sfc_efx.rst | 15 - doc/guides/nics/softnic.rst | 13 +- doc/guides/nics/szedata2.rst | 18 +- doc/guides/nics/thunderx.rst | 25 +- doc/guides/nics/vdev_netvsc.rst | 6 - doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- doc/guides/platform/bluefield.rst | 22 - doc/guides/platform/octeontx.rst | 33 +- doc/guides/platform/octeontx2.rst | 32 - doc/guides/prog_guide/build_app.rst | 48 +- .../prog_guide/dev_kit_build_system.rst | 331 ----- .../prog_guide/dev_kit_root_make_help.rst | 188 --- .../prog_guide/env_abstraction_layer.rst | 17 +- ...ib_make_help.rst => ext_app_make_help.rst} | 25 +- doc/guides/prog_guide/graph_lib.rst | 6 +- doc/guides/prog_guide/index.rst | 4 +- doc/guides/prog_guide/intro.rst | 2 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../prog_guide/kernel_nic_interface.rst | 14 +- .../link_bonding_poll_mode_drv_lib.rst | 15 +- doc/guides/prog_guide/lto.rst | 12 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/profile_app.rst | 17 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 - doc/guides/rawdevs/dpaa2_qdma.rst | 21 - doc/guides/rawdevs/ifpga.rst | 10 - doc/guides/rawdevs/ioat.rst | 8 +- doc/guides/rawdevs/ntb.rst | 6 - doc/guides/rawdevs/octeontx2_dma.rst | 12 - doc/guides/rawdevs/octeontx2_ep.rst | 8 - doc/guides/rel_notes/deprecation.rst | 7 - doc/guides/sample_app_ug/bbdev_app.rst | 34 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +- doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 +- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 +- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- doc/guides/tools/comp_perf.rst | 10 +- doc/guides/tools/cryptoperf.rst | 20 +- doc/guides/tools/pdump.rst | 15 +- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 36 +- doc/guides/tools/testeventdev.rst | 21 +- doc/guides/vdpadevs/ifc.rst | 13 - doc/guides/vdpadevs/mlx5.rst | 40 +- drivers/Makefile | 34 - drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 - drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 - drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 - drivers/bus/fslmc/Makefile | 47 - drivers/bus/ifpga/Makefile | 28 - drivers/bus/pci/Makefile | 33 - drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/pci/linux/pci_vfio.c | 1 - drivers/bus/vdev/Makefile | 27 - drivers/bus/vmbus/Makefile | 33 - drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 - drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 - drivers/common/iavf/Makefile | 27 - drivers/common/mlx5/Makefile | 404 ------ drivers/common/mvep/Makefile | 35 - drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 - drivers/common/qat/Makefile | 74 -- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 - drivers/compress/octeontx/Makefile | 26 - drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 - drivers/crypto/aesni_gcm/Makefile | 43 - drivers/crypto/aesni_mb/Makefile | 42 - drivers/crypto/armv8/Makefile | 36 - drivers/crypto/caam_jr/Makefile | 39 - drivers/crypto/ccp/Makefile | 32 - drivers/crypto/dpaa2_sec/Makefile | 45 - drivers/crypto/dpaa_sec/Makefile | 38 - drivers/crypto/kasumi/Makefile | 42 - drivers/crypto/mvsam/Makefile | 40 - drivers/crypto/nitrox/Makefile | 30 - drivers/crypto/null/Makefile | 27 - drivers/crypto/octeontx/Makefile | 36 - drivers/crypto/octeontx2/Makefile | 49 - drivers/crypto/openssl/Makefile | 26 - drivers/crypto/scheduler/Makefile | 34 - drivers/crypto/snow3g/Makefile | 43 - drivers/crypto/virtio/Makefile | 33 - drivers/crypto/zuc/Makefile | 42 - drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 - drivers/event/dpaa2/Makefile | 41 - drivers/event/dsw/Makefile | 26 - drivers/event/octeontx/Makefile | 51 - drivers/event/octeontx2/Makefile | 47 - drivers/event/opdl/Makefile | 29 - drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 - drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 - drivers/mempool/dpaa2/Makefile | 31 - drivers/mempool/octeontx/Makefile | 39 - drivers/mempool/octeontx2/Makefile | 40 - drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 -- drivers/net/af_packet/Makefile | 27 - drivers/net/af_xdp/Makefile | 26 - drivers/net/ark/Makefile | 39 - drivers/net/atlantic/Makefile | 34 - drivers/net/avp/Makefile | 29 - drivers/net/axgbe/Makefile | 33 - drivers/net/bnx2x/Makefile | 33 - drivers/net/bnxt/Makefile | 63 - drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 - drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 - drivers/net/cxgbe/Makefile | 57 - drivers/net/dpaa/Makefile | 41 - drivers/net/dpaa2/Makefile | 47 - drivers/net/e1000/Makefile | 79 -- drivers/net/ena/Makefile | 30 - drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 - drivers/net/failsafe/Makefile | 43 - drivers/net/fm10k/Makefile | 77 -- drivers/net/hinic/Makefile | 67 - drivers/net/hns3/Makefile | 42 - drivers/net/i40e/Makefile | 112 -- drivers/net/i40e/i40e_rxtx.c | 1 - drivers/net/iavf/Makefile | 54 - drivers/net/ice/Makefile | 96 -- drivers/net/igc/Makefile | 40 - drivers/net/ionic/Makefile | 31 - drivers/net/ipn3ke/Makefile | 38 - drivers/net/ixgbe/Makefile | 110 -- drivers/net/kni/Makefile | 30 - drivers/net/liquidio/Makefile | 30 - drivers/net/memif/Makefile | 26 - drivers/net/mlx4/Makefile | 142 -- drivers/net/mlx5/Makefile | 82 -- drivers/net/mvneta/Makefile | 39 - drivers/net/mvpp2/Makefile | 42 - drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 - drivers/net/nfp/Makefile | 41 - drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 - drivers/net/octeontx2/Makefile | 63 - drivers/net/pcap/Makefile | 32 - drivers/net/pfe/Makefile | 31 - drivers/net/qede/Makefile | 109 -- drivers/net/ring/Makefile | 29 - drivers/net/sfc/Makefile | 133 -- drivers/net/softnic/Makefile | 54 - drivers/net/szedata2/Makefile | 30 - drivers/net/tap/Makefile | 97 -- drivers/net/thunderx/Makefile | 41 - drivers/net/vdev_netvsc/Makefile | 30 - drivers/net/vhost/Makefile | 31 - drivers/net/virtio/Makefile | 82 -- drivers/net/vmxnet3/Makefile | 53 - drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 - drivers/raw/dpaa2_qdma/Makefile | 36 - drivers/raw/ifpga/Makefile | 39 - drivers/raw/ifpga/base/Makefile | 32 - drivers/raw/ioat/Makefile | 28 - drivers/raw/ntb/Makefile | 28 - drivers/raw/octeontx2_dma/Makefile | 34 - drivers/raw/octeontx2_ep/Makefile | 42 - drivers/raw/skeleton/Makefile | 26 - drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 - drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 - drivers/vdpa/mlx5/Makefile | 58 - examples/Makefile | 90 -- examples/bbdev_app/Makefile | 23 +- examples/bond/Makefile | 34 +- examples/bpf/t2.c | 6 +- examples/bpf/t3.c | 10 +- examples/cmdline/Makefile | 29 +- examples/distributor/Makefile | 30 +- examples/ethtool/Makefile | 26 +- examples/ethtool/ethtool-app/Makefile | 56 +- examples/ethtool/lib/Makefile | 62 +- examples/eventdev_pipeline/Makefile | 23 +- examples/fips_validation/Makefile | 34 +- examples/flow_classify/Makefile | 29 +- examples/flow_filtering/Makefile | 23 +- examples/helloworld/Makefile | 23 +- examples/ioat/Makefile | 22 +- examples/ip_fragmentation/Makefile | 29 +- examples/ip_pipeline/Makefile | 36 +- examples/ip_reassembly/Makefile | 29 +- examples/ipsec-secgw/Makefile | 36 +- examples/ipsec-secgw/test/common_defs.sh | 4 +- examples/ipv4_multicast/Makefile | 29 +- examples/kni/Makefile | 27 +- examples/l2fwd-cat/Makefile | 38 +- examples/l2fwd-crypto/Makefile | 28 +- examples/l2fwd-event/Makefile | 22 +- examples/l2fwd-jobstats/Makefile | 23 +- examples/l2fwd-keepalive/Makefile | 23 +- examples/l2fwd-keepalive/ka-agent/Makefile | 51 +- examples/l2fwd/Makefile | 23 +- examples/l3fwd-acl/Makefile | 28 +- examples/l3fwd-graph/Makefile | 23 +- examples/l3fwd-power/Makefile | 36 +- examples/l3fwd/Makefile | 23 +- examples/link_status_interrupt/Makefile | 22 +- examples/multi_process/Makefile | 21 +- .../multi_process/client_server_mp/Makefile | 19 +- .../client_server_mp/mp_client/Makefile | 44 +- .../client_server_mp/mp_server/Makefile | 51 +- examples/multi_process/hotplug_mp/Makefile | 46 +- examples/multi_process/simple_mp/Makefile | 44 +- examples/multi_process/symmetric_mp/Makefile | 44 +- examples/ntb/Makefile | 32 +- examples/packet_ordering/Makefile | 22 +- examples/performance-thread/Makefile | 21 +- examples/performance-thread/common/common.mk | 6 +- .../performance-thread/l3fwd-thread/Makefile | 47 +- .../performance-thread/pthread_shim/Makefile | 56 +- examples/ptpclient/Makefile | 28 +- examples/qos_meter/Makefile | 28 +- examples/qos_sched/Makefile | 31 +- examples/rxtx_callbacks/Makefile | 31 +- examples/server_node_efd/Makefile | 18 +- examples/server_node_efd/node/Makefile | 46 +- examples/server_node_efd/server/Makefile | 51 +- examples/service_cores/Makefile | 28 +- examples/skeleton/Makefile | 29 +- examples/tep_termination/Makefile | 27 +- examples/timer/Makefile | 28 +- examples/vdpa/Makefile | 32 +- examples/vhost/Makefile | 30 +- examples/vhost_blk/Makefile | 31 +- examples/vhost_crypto/Makefile | 31 +- examples/vm_power_manager/Makefile | 74 +- examples/vm_power_manager/guest_cli/Makefile | 50 +- examples/vmdq/Makefile | 23 +- examples/vmdq_dcb/Makefile | 31 +- kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 - lib/Makefile | 138 -- lib/librte_acl/Makefile | 65 - lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 - lib/librte_cfgfile/Makefile | 26 - lib/librte_cmdline/Makefile | 34 - lib/librte_compressdev/Makefile | 27 - lib/librte_cryptodev/Makefile | 30 - lib/librte_distributor/Makefile | 28 - lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 -- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 -- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 - lib/librte_eventdev/Makefile | 47 - lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 - lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 - lib/librte_ip_frag/Makefile | 27 - lib/librte_ipsec/Makefile | 29 - lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 - lib/librte_mbuf/Makefile | 26 - lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_mempool/rte_mempool.h | 2 +- lib/librte_meter/Makefile | 27 - lib/librte_metrics/Makefile | 30 - lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 - lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 - lib/librte_port/Makefile | 59 - lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 - lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 - lib/librte_ring/rte_ring_elem.h | 3 +- lib/librte_sched/Makefile | 29 - lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 - lib/librte_table/Makefile | 59 - lib/librte_telemetry/Makefile | 30 - lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 - mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 - mk/arch/i686/rte.vars.mk | 36 - mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 - mk/arch/x86_x32/rte.vars.mk | 40 - mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 - mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 - mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 - mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 - mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 --- mk/internal/rte.extvars.mk | 55 - mk/internal/rte.install-post.mk | 71 - mk/internal/rte.install-pre.mk | 32 - mk/machine/armv7a/rte.vars.mk | 36 - mk/machine/armv8a/rte.vars.mk | 31 - mk/machine/default/rte.vars.mk | 30 - mk/machine/dpaa/rte.vars.mk | 37 - mk/machine/emag/rte.vars.mk | 32 - mk/machine/hsw/rte.vars.mk | 30 - mk/machine/ivb/rte.vars.mk | 30 - mk/machine/n1sdp/rte.vars.mk | 34 - mk/machine/native/rte.vars.mk | 39 - mk/machine/nhm/rte.vars.mk | 30 - mk/machine/octeontx2/rte.vars.mk | 34 - mk/machine/power8/rte.vars.mk | 30 - mk/machine/silvermont/rte.vars.mk | 30 - mk/machine/snb/rte.vars.mk | 30 - mk/machine/thunderx/rte.vars.mk | 31 - mk/machine/thunderx2/rte.vars.mk | 34 - mk/machine/wsm/rte.vars.mk | 30 - mk/machine/xgene1/rte.vars.mk | 31 - mk/rte.app.mk | 509 -------- mk/rte.bsdmodule.mk | 89 -- mk/rte.combinedlib.mk | 30 - mk/rte.cpuflags.mk | 124 -- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 - mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 - mk/rte.extsubdir.mk | 39 - mk/rte.gnuconfigure.mk | 44 - mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 -- mk/rte.hostlib.mk | 86 -- mk/rte.install.mk | 28 - mk/rte.lib.mk | 156 --- mk/rte.module.mk | 86 -- mk/rte.obj.mk | 82 -- mk/rte.sdkbuild.mk | 77 -- mk/rte.sdkconfig.mk | 142 -- mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 -- mk/rte.sdkexamples.mk | 50 - mk/rte.sdkgcov.mk | 39 - mk/rte.sdkinstall.mk | 152 --- mk/rte.sdkroot.mk | 115 -- mk/rte.sdktest.mk | 76 -- mk/rte.shared.mk | 108 -- mk/rte.subdir.mk | 65 - mk/rte.vars.mk | 102 -- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 -- mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 - mk/toolchain/gcc/rte.toolchain-compat.mk | 120 -- mk/toolchain/gcc/rte.vars.mk | 109 -- mk/toolchain/icc/rte.toolchain-compat.mk | 58 - mk/toolchain/icc/rte.vars.mk | 62 - 615 files changed, 1228 insertions(+), 19894 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100755 buildtools/relpath.sh delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc delete mode 100755 devtools/test-build.sh delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => ext_app_make_help.rst} (69%) delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-04 0:36 ` Chautru, Nicolas 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 02/37] examples/multi_process: convert to pkg-config-based build Ciara Power ` (37 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, Chas Williams, Wei Hu (Xavier), Olivier Matz, David Hunt, Harry van Haaren, Marko Kovacevic, Ori Kam, Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Bernard Iremonger, Konstantin Ananyev, Cristian Dumitrescu, Ferruh Yigit, Declan Doherty, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Xiaoyun Li, Jingjing Wu, Reshma Pattan, John McNamara, Kirill Rybalchenko, Jasvinder Singh, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang The example app makefiles contained sections using the legacy method of compiling with make. These are no longer needed, and are removed, leaving only the section that uses pkg-config for the make build. Signed-off-by: Ciara Power <ciara.power@intel.com> --- examples/bbdev_app/Makefile | 23 ++------------- examples/bond/Makefile | 34 ++-------------------- examples/cmdline/Makefile | 29 ++----------------- examples/distributor/Makefile | 30 ++----------------- examples/eventdev_pipeline/Makefile | 23 ++------------- examples/fips_validation/Makefile | 34 ++-------------------- examples/flow_classify/Makefile | 29 ++----------------- examples/flow_filtering/Makefile | 23 ++------------- examples/helloworld/Makefile | 23 ++------------- examples/ioat/Makefile | 22 ++------------ examples/ip_fragmentation/Makefile | 29 ++----------------- examples/ip_pipeline/Makefile | 36 ++--------------------- examples/ip_reassembly/Makefile | 29 ++----------------- examples/ipsec-secgw/Makefile | 36 ++--------------------- examples/ipv4_multicast/Makefile | 29 ++----------------- examples/kni/Makefile | 27 ++---------------- examples/l2fwd-cat/Makefile | 38 ++----------------------- examples/l2fwd-crypto/Makefile | 28 ++---------------- examples/l2fwd-event/Makefile | 22 ++------------ examples/l2fwd-jobstats/Makefile | 23 ++------------- examples/l2fwd-keepalive/Makefile | 23 ++------------- examples/l2fwd/Makefile | 23 ++------------- examples/l3fwd-acl/Makefile | 28 ++---------------- examples/l3fwd-graph/Makefile | 23 ++------------- examples/l3fwd-power/Makefile | 36 ++--------------------- examples/l3fwd/Makefile | 23 ++------------- examples/link_status_interrupt/Makefile | 22 ++------------ examples/ntb/Makefile | 32 ++------------------- examples/packet_ordering/Makefile | 22 ++------------ examples/ptpclient/Makefile | 28 ++---------------- examples/qos_meter/Makefile | 28 ++---------------- examples/qos_sched/Makefile | 31 ++------------------ examples/rxtx_callbacks/Makefile | 31 ++------------------ examples/service_cores/Makefile | 28 ++---------------- examples/skeleton/Makefile | 29 ++----------------- examples/tep_termination/Makefile | 27 ++---------------- examples/timer/Makefile | 28 ++---------------- examples/vdpa/Makefile | 32 ++------------------- examples/vhost/Makefile | 30 ++----------------- examples/vhost_blk/Makefile | 31 ++------------------ examples/vhost_crypto/Makefile | 31 ++------------------ examples/vmdq/Makefile | 23 ++------------- examples/vmdq_dcb/Makefile | 31 ++------------------ 43 files changed, 129 insertions(+), 1078 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 3c8eb75a4e..2f156736d1 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -8,7 +8,9 @@ APP = bbdev SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 4e4289e151..4e560f574c 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -8,7 +8,9 @@ APP = bond_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,33 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -LDLIBS += -lrte_pmd_bond -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 7325097722..d8f51fb39b 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -8,7 +8,9 @@ APP = cmdline SRCS-y := main.c commands.c parse_obj_list.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = cmdline - -# all source are stored in SRCS-y -SRCS-y := main.c commands.c parse_obj_list.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 6e3fef9813..4116064581 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -8,7 +8,9 @@ APP = distributor_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,29 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 95a8d0884a..05c6f865ad 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -10,7 +10,9 @@ SRCS-y += pipeline_worker_generic.c SRCS-y += pipeline_worker_tx.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index b44ca2ee62..7ba9bcfea6 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -18,7 +18,9 @@ SRCS-y += fips_validation_xts.c SRCS-y += main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -47,33 +49,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -INC += $(sort $(wildcard *.h)) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 161d576b60..4c215daf1b 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -8,7 +8,9 @@ APP = flow_classify SRCS-y := flow_classify.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 010a1383e2..0577e52985 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -6,7 +6,9 @@ APP = flow SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -35,22 +37,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 94a1074cf6..2eef6e4527 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -8,7 +8,9 @@ APP = helloworld SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile index 86308854ea..9645c27d2f 100644 --- a/examples/ioat/Makefile +++ b/examples/ioat/Makefile @@ -8,7 +8,9 @@ APP = ioatfwd SRCS-y := ioatfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 3f4db3f59d..f6baf635bb 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -9,7 +9,9 @@ APP = ip_fragmentation SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 1116bb6c18..d25e39a464 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -21,7 +21,9 @@ SRCS-y += tmgr.c SRCS-y += cryptodev.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -57,35 +59,3 @@ build: clean: rm -f build/$(APP)* build/*.o test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -INC += $(sort $(wildcard *.h)) - -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := $(SRCS-y) - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index be9e541bd6..479b802907 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -9,7 +9,9 @@ APP = ip_reassembly SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index b5ccbca858..5e6cb51eac 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -23,7 +23,9 @@ SRCS-y += flow.c CFLAGS += -gdwarf-2 # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -54,35 +56,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -$(error "RTE_LIBRTE_IPSEC is required to build ipsec-secgw") -endif -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -gdwarf-2 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_sa.o += -diag-disable=vec -endif - -ifeq ($(DEBUG),1) -CFLAGS += -DIPSEC_DEBUG -fstack-protector-all -O0 -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index 0ed78c1cc2..fb1ebdd433 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -9,7 +9,9 @@ APP = ipv4_multicast SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 8fcb67c619..fa9fa85319 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -8,7 +8,9 @@ APP = kni SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,26 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index d767a10d7d..c5f82fb548 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-cat SRCS-y := l2fwd-cat.c cat.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,37 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -ifeq ($(PQOS_INSTALL_PATH),) -$(error "Please define PQOS_INSTALL_PATH environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -CFLAGS += -I$(PQOS_INSTALL_PATH)/../include - -LDLIBS += -L$(PQOS_INSTALL_PATH) -LDLIBS += -lpqos - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index cdbb91a1e6..4953ee2b95 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-crypto SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile index ddee388ae6..109b7caa4e 100644 --- a/examples/l2fwd-event/Makefile +++ b/examples/l2fwd-event/Makefile @@ -14,7 +14,9 @@ SRCS-y += l2fwd_event_generic.c SRCS-y += l2fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -43,21 +45,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index bdb83c3e1c..d3ff2d3ee9 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-jobstats SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 9fd9db4974..c327efab36 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-keepalive SRCS-y := main.c shm.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 15105ac57e..b180deb862 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -8,7 +8,9 @@ APP = l2fwd SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Add flag to allow experimental API as l2fwd uses rte_ethdev_set_ptype API -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 6644a2cf1e..eeb6288dae 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-acl SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-graph/Makefile b/examples/l3fwd-graph/Makefile index f3cf275ece..368ac21147 100644 --- a/examples/l3fwd-graph/Makefile +++ b/examples/l3fwd-graph/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-graph SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index ac1ccdcf61..d69854c9f8 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-power SRCS-y := main.c perf_core.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,35 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lm -lrte_telemetry - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -endif diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index b25a515813..d87eafcd0c 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c SRCS-y += l3fwd_event_generic.c l3fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,22 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index f16916faa9..b9b02124a4 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -8,7 +8,9 @@ APP = link_status_interrupt SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile index 81ec6017f5..4675570fd2 100644 --- a/examples/ntb/Makefile +++ b/examples/ntb/Makefile @@ -8,8 +8,9 @@ APP = ntb_fwd SRCS-y := ntb_fwd.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,30 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared rmdir --ignore-fail-on-non-empty build - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) -$(info This application can only operate in a linuxapp environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -O2 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index f99b69dc25..e8d6c57b72 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -8,7 +8,9 @@ APP = packet_ordering SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index a9555fc66a..86059d8b28 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -8,7 +8,9 @@ APP = ptpclient SRCS-y := ptpclient.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 165e07ee25..7a53818296 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -8,7 +8,9 @@ APP = qos_meter SRCS-y := main.c rte_policer.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,27 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 0dd7d91055..408074a9f5 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -8,7 +8,9 @@ APP = qos_sched SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index 10e5f14d5c..bac3015d34 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -8,7 +8,9 @@ APP = rxtx_callbacks SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# rte_eth_read_clock is experimental -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index e742d88f61..beb7ea0b82 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -8,7 +8,9 @@ APP = service_cores SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index 5f5acf7159..ca52abba42 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -8,7 +8,9 @@ APP = basicfwd SRCS-y := basicfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 548ca3cee3..443bcb190e 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -8,7 +8,9 @@ APP = tep_termination SRCS-y := main.c vxlan_setup.c vxlan.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,26 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/timer/Makefile b/examples/timer/Makefile index b40b65995e..0f6523afa6 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -8,7 +8,9 @@ APP = timer SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index bc0b6793e6..c4b2184ead 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,31 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -D_GNU_SOURCE -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # linuxapp - -endif # pkg-config diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index ef6f3550f3..cec59d0e0f 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -8,7 +8,9 @@ APP = vhost-switch SRCS-y := main.c virtio_net.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile index 3952791784..792591386e 100644 --- a/examples/vhost_blk/Makefile +++ b/examples/vhost_blk/Makefile @@ -8,8 +8,9 @@ APP = vhost-blk SRCS-y := blk.c vhost_blk.c vhost_blk_compat.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index 28e3e4de74..27abd91998 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,30 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # Linux - -endif # pkg-config diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index b73373d3f5..de527281eb 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -8,7 +8,9 @@ APP = vmdq_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -EXTRA_CFLAGS += -O3 - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 8d8baf729b..9c9049d85e 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -8,7 +8,9 @@ APP = vmdq_dcb_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_main.o += -diag-disable=vec -endif -EXTRA_CFLAGS += -O3 -g - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles Ciara Power @ 2020-09-04 0:36 ` Chautru, Nicolas 0 siblings, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-04 0:36 UTC (permalink / raw) To: Power, Ciara, dev Cc: Chas Williams, Wei Hu (Xavier), Olivier Matz, Hunt, David, Van Haaren, Harry, Kovacevic, Marko, Ori Kam, Richardson, Bruce, Nicolau, Radu, Akhil Goyal, Kantecki, Tomasz, Sunil Kumar Kori, Pavan Nikhilesh, Iremonger, Bernard, Ananyev, Konstantin, Dumitrescu, Cristian, Yigit, Ferruh, Doherty, Declan, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Li, Xiaoyun, Wu, Jingjing, Pattan, Reshma, Mcnamara, John, Rybalchenko, Kirill, Singh, Jasvinder, Robert Sanford, Carrillo, Erik G, Maxime Coquelin, Xia, Chenbo, Wang, Zhihong Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 02/37] examples/multi_process: convert to pkg-config-based build 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 03/37] examples/server_node_efd: " Ciara Power ` (36 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, Anatoly Burakov From: Bruce Richardson <bruce.richardson@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/multi_process/Makefile | 21 ++------ .../multi_process/client_server_mp/Makefile | 19 ++----- .../client_server_mp/mp_client/Makefile | 44 ++++++++++++---- .../client_server_mp/mp_server/Makefile | 51 +++++++++++-------- examples/multi_process/hotplug_mp/Makefile | 46 ++++++++++++----- examples/multi_process/simple_mp/Makefile | 44 +++++++++++----- examples/multi_process/symmetric_mp/Makefile | 44 +++++++++++----- 7 files changed, 167 insertions(+), 102 deletions(-) diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index 7f7e68d912..f0a999745a 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -1,18 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := client_server_mp hotplug_mp simple_mp symmetric_mp -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index fe7a8af605..e8debdfd9a 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -1,16 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := mp_client mp_server -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile index 7c447feba3..b723e545b7 100644 --- a/examples/multi_process/client_server_mp/mp_client/Makefile +++ b/examples/multi_process/client_server_mp/mp_client/Makefile @@ -1,21 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = mp_client # all source are stored in SRCS-y SRCS-y := client.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index 50ebf1d7da..f49260a256 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -1,34 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +# binary name +APP = mp_server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +# all source are stored in SRCS-y +SRCS-y := main.c init.c args.c -include $(RTE_SDK)/mk/rte.vars.mk +CFLAGS += -I../shared -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# binary name -APP = mp_server +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) -INC := $(sort $(wildcard *.h)) +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -# for newer gcc, e.g. 4.4, no-strict-aliasing may not be necessary -# and so the next line can be removed in those cases. -EXTRA_CFLAGS += -fno-strict-aliasing +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile index 1fd7aa085c..2c023a73d8 100644 --- a/examples/multi_process/hotplug_mp/Makefile +++ b/examples/multi_process/hotplug_mp/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2014 Intel Corporation # binary name APP = hotplug_mp @@ -16,8 +7,35 @@ APP = hotplug_mp # all source are stored in SRCS-y SRCS-y := main.c commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile index f88b499bdc..410f8b5368 100644 --- a/examples/multi_process/simple_mp/Makefile +++ b/examples/multi_process/simple_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = simple_mp # all source are stored in SRCS-y SRCS-y := main.c mp_commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile index b7544489bb..df69ecabe7 100644 --- a/examples/multi_process/symmetric_mp/Makefile +++ b/examples/multi_process/symmetric_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = symmetric_mp # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 03/37] examples/server_node_efd: convert to pkg-config-based build 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 02/37] examples/multi_process: convert to pkg-config-based build Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 04/37] examples/ka-agent: " Ciara Power ` (35 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz, Byron Marohn, Yipeng Wang From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/server_node_efd/Makefile | 18 +++------ examples/server_node_efd/node/Makefile | 46 +++++++++++++++------ examples/server_node_efd/server/Makefile | 51 +++++++++++++++--------- 3 files changed, 72 insertions(+), 43 deletions(-) diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile index cc2ea8b566..e4a4a94a79 100644 --- a/examples/server_node_efd/Makefile +++ b/examples/server_node_efd/Makefile @@ -1,16 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := node server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/server_node_efd/node/Makefile b/examples/server_node_efd/node/Makefile index ecc551e1d6..a4efef42dc 100644 --- a/examples/server_node_efd/node/Makefile +++ b/examples/server_node_efd/node/Makefile @@ -1,12 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = node @@ -14,8 +7,37 @@ APP = node # all source are stored in SRCS-y SRCS-y := node.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index acbd12ae23..106e1abd74 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -1,30 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +# binary name +APP = server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +# all source are stored in SRCS-y +SRCS-y := main.c init.c args.c -include $(RTE_SDK)/mk/rte.vars.mk +CFLAGS += -I../shared -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# binary name -APP = server +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -INC := $(sort $(wildcard *.h)) +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 04/37] examples/ka-agent: convert to pkg-config-based build 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (2 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 03/37] examples/server_node_efd: " Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 05/37] examples/pthread: " Ciara Power ` (34 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/l2fwd-keepalive/ka-agent/Makefile | 51 ++++++++++++++++------ 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile index 8d5061b178..700137c2e2 100644 --- a/examples/l2fwd-keepalive/ka-agent/Makefile +++ b/examples/l2fwd-keepalive/ka-agent/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = ka-agent @@ -16,7 +7,39 @@ APP = ka-agent # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../ -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt -include $(RTE_SDK)/mk/rte.extapp.mk +CFLAGS += -I.. + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +LDFLAGS += -lpthread -lrt + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 05/37] examples/pthread: convert to pkg-config-based build 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (3 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 04/37] examples/ka-agent: " Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 06/37] examples/vm_power_manager: convert to use DPDK pkg-config Ciara Power ` (33 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Kevin Laatz, John McNamara, Kirill Rybalchenko, Bruce Richardson, Harry van Haaren, Xiaoyun Li From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/performance-thread/Makefile | 21 +++---- examples/performance-thread/common/common.mk | 6 +- .../performance-thread/l3fwd-thread/Makefile | 47 +++++++++++----- .../performance-thread/pthread_shim/Makefile | 56 +++++++++++++------ 4 files changed, 83 insertions(+), 47 deletions(-) diff --git a/examples/performance-thread/Makefile b/examples/performance-thread/Makefile index 08158914c3..ef88722d3c 100644 --- a/examples/performance-thread/Makefile +++ b/examples/performance-thread/Makefile @@ -1,21 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +subdirs := l3fwd-thread pthread_shim -include $(RTE_SDK)/mk/rte.vars.mk +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -ifeq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) $(CONFIG_RTE_ARCH_ARM64)),) +ifeq ($(filter $(shell uname -m),x86_64 arm64),) $(error This application is only supported for x86_64 and arm64 targets) endif -DIRS-y += l3fwd-thread -DIRS-y += pthread_shim - - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/performance-thread/common/common.mk b/examples/performance-thread/common/common.mk index 5e2b18a9ff..a33e2ab038 100644 --- a/examples/performance-thread/common/common.mk +++ b/examples/performance-thread/common/common.mk @@ -8,9 +8,9 @@ MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))) -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) +ifeq ($(shell uname -m),x86_64) ARCH_PATH += $(MKFILE_PATH)/arch/x86 -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) +else ifeq ($(shell uname -m),arm64) ARCH_PATH += $(MKFILE_PATH)/arch/arm64 endif @@ -18,4 +18,4 @@ VPATH := $(MKFILE_PATH) $(ARCH_PATH) SRCS-y += lthread.c lthread_sched.c lthread_cond.c lthread_tls.c lthread_mutex.c lthread_diag.c ctx.c -INCLUDES += -I$(MKFILE_PATH) -I$(ARCH_PATH) +CFLAGS += -I$(MKFILE_PATH) -I$(ARCH_PATH) diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile index c6cf05a438..ca1a5d087e 100644 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ b/examples/performance-thread/l3fwd-thread/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = l3fwd-thread @@ -16,9 +7,39 @@ APP = l3fwd-thread # all source are stored in SRCS-y SRCS-y := main.c -include $(RTE_SDK)/examples/performance-thread/common/common.mk +include ../common/common.mk -CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -include $(RTE_SDK)/mk/rte.extapp.mk +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/performance-thread/pthread_shim/Makefile b/examples/performance-thread/pthread_shim/Makefile index cdadf2cb77..6b19ff63fe 100644 --- a/examples/performance-thread/pthread_shim/Makefile +++ b/examples/performance-thread/pthread_shim/Makefile @@ -1,33 +1,55 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = lthread_pthread_shim # all source are stored in SRCS-y -SRCS-y := main.c pthread_shim.c -INCLUDES := -I$(RTE_SDK)/$(RTE_TARGET)/include -I$(SRCDIR) -include $(RTE_SDK)/examples/performance-thread/common/common.mk +SRCS-y := main.c pthread_shim.c + +include ../common/common.mk -CFLAGS += -g -O3 $(USER_FLAGS) $(INCLUDES) -CFLAGS += $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -D_GNU_SOURCE +LDFLAGS += "-Wl,--copy-dt-needed-entries" + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) LDFLAGS += -lpthread +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell gcc -dumpversion),-gt 0) CFLAGS_main.o += -Wno-return-type endif -include $(RTE_SDK)/mk/rte.extapp.mk +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 06/37] examples/vm_power_manager: convert to use DPDK pkg-config 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (4 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 05/37] examples/pthread: " Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 07/37] examples/vm_power_manager: convert guest cli to pkg-config Ciara Power ` (32 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, David Hunt From: Bruce Richardson <bruce.richardson@intel.com> Convert the build of the vm_power_manager app over to use DPDK from pkg-config rather than using RTE_SDK/RTE_TARGET. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/vm_power_manager/Makefile | 74 ++++++++++++++---------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile index 65c2ad179e..87b9744d8c 100644 --- a/examples/vm_power_manager/Makefile +++ b/examples/vm_power_manager/Makefile @@ -1,65 +1,61 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2020 Intel Corporation -ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -$(error vm_power_manager requires libvirt >= 0.9.3) -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = vm_power_mgr # all source are stored in SRCS-y SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c SRCS-y += channel_monitor.c parse.c -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) +ifeq ($(shell uname -m),x86_64) SRCS-y += oob_monitor_x86.c else SRCS-y += oob_monitor_nop.c endif -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -LDLIBS += -lvirt +PKGCONF ?= pkg-config -JANSSON := $(shell pkg-config --exists jansson; echo $$?) -ifeq ($(JANSSON), 0) -LDLIBS += $(shell pkg-config --libs jansson) -CFLAGS += -DUSE_JANSSON -endif +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe +ifneq ($(shell $(PKGCONF) --atleast-version=0.9.3 libvirt; echo $$?), 0) +$(error vm_power_manager requires libvirt >= 0.9.3) endif +LDFLAGS += $(shell $(PKGCONF) --libs libvirt) -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e +JANSSON := $(shell $(PKGCONF) --exists jansson; echo $$?) +ifeq ($(JANSSON), 0) +LDFLAGS += $(shell $(PKGCONF) --libs jansson) +CFLAGS += -DUSE_JANSSON endif -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif +# for shared library builds, we need to explicitly link these PMDs +LDFLAGS_SHARED += -lrte_pmd_ixgbe -lrte_pmd_i40e -lrte_pmd_bnxt -endif +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -include $(RTE_SDK)/mk/rte.extapp.mk +build: + @mkdir -p $@ -endif # libvirt check +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 07/37] examples/vm_power_manager: convert guest cli to pkg-config 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (5 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 06/37] examples/vm_power_manager: convert to use DPDK pkg-config Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 08/37] examples/ethtool: convert to pkg-config-based build Ciara Power ` (31 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, David Hunt From: Bruce Richardson <bruce.richardson@intel.com> Convert the makefile for the vm_power_manager/guest_cli utility to build using pkg-config rather than the old build system. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/vm_power_manager/guest_cli/Makefile | 50 ++++++++++++-------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/examples/vm_power_manager/guest_cli/Makefile b/examples/vm_power_manager/guest_cli/Makefile index 67cf081936..b84deec574 100644 --- a/examples/vm_power_manager/guest_cli/Makefile +++ b/examples/vm_power_manager/guest_cli/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = guest_vm_power_mgr @@ -16,14 +7,35 @@ APP = guest_vm_power_mgr # all source are stored in SRCS-y SRCS-y := main.c vm_power_cli_guest.c parse.c -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 08/37] examples/ethtool: convert to pkg-config-based build 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (6 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 07/37] examples/vm_power_manager: convert guest cli to pkg-config Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 09/37] build: create dummy Makefile Ciara Power ` (30 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Bruce Richardson, Marko Kovacevic, Ori Kam, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh From: Bruce Richardson <bruce.richardson@intel.com> Remove references to the old DPDK build system from the makefiles, and use pkg-config provided flags instead. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/ethtool/Makefile | 26 +++-------- examples/ethtool/ethtool-app/Makefile | 56 +++++++++++++++--------- examples/ethtool/lib/Makefile | 62 ++++++++++++++++----------- 3 files changed, 79 insertions(+), 65 deletions(-) diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile index d3b97bb50b..a1a80c44e6 100644 --- a/examples/ethtool/Makefile +++ b/examples/ethtool/Makefile @@ -1,23 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := lib ethtool-app -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -else - -DIRS-y += lib ethtool-app -endif - -DEPDIRS-ethtool-app := lib - -include $(RTE_SDK)/mk/rte.extsubdir.mk +ethtool-app: lib +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile index 20ac0d3240..5ebeb200a8 100644 --- a/examples/ethtool/ethtool-app/Makefile +++ b/examples/ethtool/ethtool-app/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = ethtool @@ -16,17 +7,40 @@ APP = ethtool # all source are stored in SRCS-y SRCS-y := main.c ethapp.c -CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib -LDLIBS += -lrte_ethtool +CFLAGS += -I../lib +LDFLAGS += -L../lib/build +LDFLAGS_STATIC = -l:librte_ethtool.a +LDFLAGS_SHARED = -lrte_ethtool -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED += $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC += $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile index 6494741270..3bc2b9d8ba 100644 --- a/examples/ethtool/lib/Makefile +++ b/examples/ethtool/lib/Makefile @@ -1,37 +1,49 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif +ifneq ($(shell uname),Linux) +$(error This application can only operate in a linux environment) endif -# library name -LIB = librte_ethtool.a - -LIBABIVER := 0.1 +PKGCONF ?= pkg-config -# all source are stored in SRC-Y -SRCS-y := rte_ethtool.c +# library name +LIB = librte_ethtool.so +LIB_STATIC = librte_ethtool.a +SRCS = rte_ethtool.c CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) +CFLAGS += -fPIC CFLAGS += -DALLOW_EXPERIMENTAL_API -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS += -Wl,--no-undefined $(LDFLAGS_SHARED) + +# check for ixgbe by grepping pre-processor output +ifneq ($(shell $(CC) $(CFLAGS) -dM -E - < /dev/null | grep IXGBE),) +LDFLAGS += -lrte_pmd_ixgbe endif -LDLIBS += -lrte_eal -lrte_ethdev -include $(RTE_SDK)/mk/rte.extlib.mk +.PHONY: all clean static shared +all shared: build/$(LIB) +static: build/$(LIB_STATIC) + +clean: + rm -f build/$(LIB) + test -d build && rmdir -p build || true + +build: + @mkdir -p $@ + +build/%.so: $(SRCS) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) -o $@ -shared $(SRCS) $(LDFLAGS) + +build/%.a: $(SRCS) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) -c $(SRCS) -o build/$(SRCS).o + $(AR) -cr $@ build/*.o -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 09/37] build: create dummy Makefile 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (7 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 08/37] examples/ethtool: convert to pkg-config-based build Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 10/37] build: remove makefiles and mk directory Ciara Power ` (29 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, Thomas Monjalon From: Bruce Richardson <bruce.richardson@intel.com> This patch modifies the root Makefile to act as a dummy Makefile for when the make support is removed from DPDK in subsequent patches. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 571277aa5a..4a9c17a9de 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2020 Intel Corporation -.error Error please compile using GNU Make (gmake) +.PHONY: all +all: + @echo "To build DPDK please use meson and ninja as described at" + @echo " https://core.dpdk.org/doc/quick-start/" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 10/37] build: remove makefiles and mk directory 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (8 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 09/37] build: create dummy Makefile Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 11/37] config: remove all config files used by make Ciara Power ` (28 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Ciara Power, Thomas Monjalon, Reshma Pattan, Maryam Tahhan, Konstantin Ananyev, Nicolas Chautru, Olivier Matz, Declan Doherty, Jerin Jacob, Vladimir Medvedkin, Wisam Jaddo, Cristian Dumitrescu, Wenzhuo Lu, Beilei Xing, Bernard Iremonger, Ori Kam, Neil Horman, Hemant Agrawal, Sachin Saxena, Rosen Xu, Stephen Hemminger, Long Li, Anoob Joseph, Jingjing Wu, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Liron Himi, Harman Kalra, Nithin Dabilpuram, John Griffin, Fiona Trahe, Deepak Kumar Jain, Ashish Gupta, Lee Daly, Sunila Sahu, Pablo de Lara, Ruifeng Wang, Gagandeep Singh, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Nagadheeraj Rottela, Srikanth Jampala, Ankur Dwivedi, Fan Zhang, Jay Zhou, Nipun Gupta, Mattias Rönnblom, Pavan Nikhilesh, Liang Ma, Peter Mccarthy, Harry van Haaren, Artem V. Andreev, Andrew Rybchenko, Gage Eads, John W. Linville, Ciara Loftus, Qi Zhang, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Steven Webster, Matt Peters, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Chas Williams, Wei Hu (Xavier), Rahul Lakkireddy, Wei Zhao, Jeff Guo, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, John Daley, Hyong Youb Kim, Gaetan Rivet, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Min Hu (Connor), Yisen Zhuang, Qiming Yang, Alfredo Cardigliano, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Zyta Szpak, K. Y. Srinivasan, Haiyang Zhang, Martin Spinler, Heinrich Kuhn, Tetsuya Mukawa, Kiran Kumar K, Bruce Richardson, Jasvinder Singh, Keith Wiles, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Yong Wang, Tianfei zhang, Xiaoyun Li, Satha Rao, Mahipal Challa, David Hunt, Byron Marohn, Yipeng Wang, Jiayu Hu, Sameh Gobriel, Honnappa Nagarahalli, Kevin Laatz, Robert Sanford, Erik Gabriel Carrillo, Anatoly Burakov A decision was made [1] to no longer support Make in DPDK, this patch removes all Makefiles that do not make use of pkg-config, along with the mk directory previously used by make. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com> --- GNUmakefile | 17 - MAINTAINERS | 4 - app/Makefile | 34 -- app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 -- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 -- app/test-eventdev/Makefile | 32 -- app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 -- app/test-pipeline/Makefile | 33 -- app/test-pmd/Makefile | 73 --- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ------------- buildtools/Makefile | 9 - buildtools/pmdinfogen/Makefile | 20 - drivers/Makefile | 34 -- drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 -- drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 --- drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 -- drivers/bus/fslmc/Makefile | 47 -- drivers/bus/ifpga/Makefile | 28 -- drivers/bus/pci/Makefile | 33 -- drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/vdev/Makefile | 27 -- drivers/bus/vmbus/Makefile | 33 -- drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 -- drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 -- drivers/common/iavf/Makefile | 27 -- drivers/common/mlx5/Makefile | 404 ---------------- drivers/common/mvep/Makefile | 35 -- drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 -- drivers/common/qat/Makefile | 74 --- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 -- drivers/compress/octeontx/Makefile | 26 -- drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 -- drivers/crypto/aesni_gcm/Makefile | 43 -- drivers/crypto/aesni_mb/Makefile | 42 -- drivers/crypto/armv8/Makefile | 36 -- drivers/crypto/caam_jr/Makefile | 39 -- drivers/crypto/ccp/Makefile | 32 -- drivers/crypto/dpaa2_sec/Makefile | 45 -- drivers/crypto/dpaa_sec/Makefile | 38 -- drivers/crypto/kasumi/Makefile | 42 -- drivers/crypto/mvsam/Makefile | 40 -- drivers/crypto/nitrox/Makefile | 30 -- drivers/crypto/null/Makefile | 27 -- drivers/crypto/octeontx/Makefile | 36 -- drivers/crypto/octeontx2/Makefile | 49 -- drivers/crypto/openssl/Makefile | 26 -- drivers/crypto/scheduler/Makefile | 34 -- drivers/crypto/snow3g/Makefile | 43 -- drivers/crypto/virtio/Makefile | 33 -- drivers/crypto/zuc/Makefile | 42 -- drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 -- drivers/event/dpaa2/Makefile | 41 -- drivers/event/dsw/Makefile | 26 -- drivers/event/octeontx/Makefile | 51 --- drivers/event/octeontx2/Makefile | 47 -- drivers/event/opdl/Makefile | 29 -- drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 -- drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 -- drivers/mempool/dpaa2/Makefile | 31 -- drivers/mempool/octeontx/Makefile | 39 -- drivers/mempool/octeontx2/Makefile | 40 -- drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 ---- drivers/net/af_packet/Makefile | 27 -- drivers/net/af_xdp/Makefile | 26 -- drivers/net/ark/Makefile | 39 -- drivers/net/atlantic/Makefile | 34 -- drivers/net/avp/Makefile | 29 -- drivers/net/axgbe/Makefile | 33 -- drivers/net/bnx2x/Makefile | 33 -- drivers/net/bnxt/Makefile | 63 --- drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 -- drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 -- drivers/net/cxgbe/Makefile | 57 --- drivers/net/dpaa/Makefile | 41 -- drivers/net/dpaa2/Makefile | 47 -- drivers/net/e1000/Makefile | 79 ---- drivers/net/ena/Makefile | 30 -- drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 --- drivers/net/failsafe/Makefile | 43 -- drivers/net/fm10k/Makefile | 77 ---- drivers/net/hinic/Makefile | 67 --- drivers/net/hns3/Makefile | 42 -- drivers/net/i40e/Makefile | 112 ----- drivers/net/iavf/Makefile | 54 --- drivers/net/ice/Makefile | 96 ---- drivers/net/igc/Makefile | 40 -- drivers/net/ionic/Makefile | 31 -- drivers/net/ipn3ke/Makefile | 38 -- drivers/net/ixgbe/Makefile | 110 ----- drivers/net/kni/Makefile | 30 -- drivers/net/liquidio/Makefile | 30 -- drivers/net/memif/Makefile | 26 -- drivers/net/mlx4/Makefile | 142 ------ drivers/net/mlx5/Makefile | 82 ---- drivers/net/mvneta/Makefile | 39 -- drivers/net/mvpp2/Makefile | 42 -- drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 -- drivers/net/nfp/Makefile | 41 -- drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 --- drivers/net/octeontx2/Makefile | 63 --- drivers/net/pcap/Makefile | 32 -- drivers/net/pfe/Makefile | 31 -- drivers/net/qede/Makefile | 109 ----- drivers/net/ring/Makefile | 29 -- drivers/net/sfc/Makefile | 133 ------ drivers/net/softnic/Makefile | 54 --- drivers/net/szedata2/Makefile | 30 -- drivers/net/tap/Makefile | 97 ---- drivers/net/thunderx/Makefile | 41 -- drivers/net/vdev_netvsc/Makefile | 30 -- drivers/net/vhost/Makefile | 31 -- drivers/net/virtio/Makefile | 82 ---- drivers/net/vmxnet3/Makefile | 53 --- drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 -- drivers/raw/dpaa2_qdma/Makefile | 36 -- drivers/raw/ifpga/Makefile | 39 -- drivers/raw/ifpga/base/Makefile | 32 -- drivers/raw/ioat/Makefile | 28 -- drivers/raw/ntb/Makefile | 28 -- drivers/raw/octeontx2_dma/Makefile | 34 -- drivers/raw/octeontx2_ep/Makefile | 42 -- drivers/raw/skeleton/Makefile | 26 -- drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 -- drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 -- drivers/vdpa/mlx5/Makefile | 58 --- examples/Makefile | 90 ---- kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 -- lib/Makefile | 138 ------ lib/librte_acl/Makefile | 65 --- lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 -- lib/librte_cfgfile/Makefile | 26 -- lib/librte_cmdline/Makefile | 34 -- lib/librte_compressdev/Makefile | 27 -- lib/librte_cryptodev/Makefile | 30 -- lib/librte_distributor/Makefile | 28 -- lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 ----- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 ----- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 -- lib/librte_eventdev/Makefile | 47 -- lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 -- lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 -- lib/librte_ip_frag/Makefile | 27 -- lib/librte_ipsec/Makefile | 29 -- lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 -- lib/librte_mbuf/Makefile | 26 -- lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_meter/Makefile | 27 -- lib/librte_metrics/Makefile | 30 -- lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 -- lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 -- lib/librte_port/Makefile | 59 --- lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 -- lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 -- lib/librte_sched/Makefile | 29 -- lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 -- lib/librte_table/Makefile | 59 --- lib/librte_telemetry/Makefile | 30 -- lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 --- mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 -- mk/arch/i686/rte.vars.mk | 36 -- mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 -- mk/arch/x86_x32/rte.vars.mk | 40 -- mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 -- mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 -- mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 -- mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 -- mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 ------- mk/internal/rte.extvars.mk | 55 --- mk/internal/rte.install-post.mk | 71 --- mk/internal/rte.install-pre.mk | 32 -- mk/machine/armv7a/rte.vars.mk | 36 -- mk/machine/armv8a/rte.vars.mk | 31 -- mk/machine/default/rte.vars.mk | 30 -- mk/machine/dpaa/rte.vars.mk | 37 -- mk/machine/emag/rte.vars.mk | 32 -- mk/machine/hsw/rte.vars.mk | 30 -- mk/machine/ivb/rte.vars.mk | 30 -- mk/machine/n1sdp/rte.vars.mk | 34 -- mk/machine/native/rte.vars.mk | 39 -- mk/machine/nhm/rte.vars.mk | 30 -- mk/machine/octeontx2/rte.vars.mk | 34 -- mk/machine/power8/rte.vars.mk | 30 -- mk/machine/silvermont/rte.vars.mk | 30 -- mk/machine/snb/rte.vars.mk | 30 -- mk/machine/thunderx/rte.vars.mk | 31 -- mk/machine/thunderx2/rte.vars.mk | 34 -- mk/machine/wsm/rte.vars.mk | 30 -- mk/machine/xgene1/rte.vars.mk | 31 -- mk/rte.app.mk | 509 --------------------- mk/rte.bsdmodule.mk | 89 ---- mk/rte.combinedlib.mk | 30 -- mk/rte.cpuflags.mk | 124 ----- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 -- mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 -- mk/rte.extsubdir.mk | 39 -- mk/rte.gnuconfigure.mk | 44 -- mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 ---- mk/rte.hostlib.mk | 86 ---- mk/rte.install.mk | 28 -- mk/rte.lib.mk | 156 ------- mk/rte.module.mk | 86 ---- mk/rte.obj.mk | 82 ---- mk/rte.sdkbuild.mk | 77 ---- mk/rte.sdkconfig.mk | 142 ------ mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 ----- mk/rte.sdkexamples.mk | 50 -- mk/rte.sdkgcov.mk | 39 -- mk/rte.sdkinstall.mk | 152 ------ mk/rte.sdkroot.mk | 115 ----- mk/rte.sdktest.mk | 76 --- mk/rte.shared.mk | 108 ----- mk/rte.subdir.mk | 65 --- mk/rte.vars.mk | 102 ----- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 ------ mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 --- mk/toolchain/gcc/rte.toolchain-compat.mk | 120 ----- mk/toolchain/gcc/rte.vars.mk | 109 ----- mk/toolchain/icc/rte.toolchain-compat.mk | 58 --- mk/toolchain/icc/rte.vars.mk | 62 --- 296 files changed, 12992 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index e8de422df8..0000000000 --- a/GNUmakefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# Head Makefile for compiling rte SDK -# - -RTE_SDK := $(CURDIR) -export RTE_SDK - -# -# directory list -# - -ROOTDIRS-y := buildtools lib kernel drivers app - -include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/MAINTAINERS b/MAINTAINERS index ed163f5d59..ccaecabea0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -100,10 +100,8 @@ F: .editorconfig Build System ------------ M: Thomas Monjalon <thomas@monjalon.net> -F: GNUmakefile F: Makefile F: config/ -F: mk/ F: buildtools/auto-config-h.sh F: buildtools/gen-build-mk.sh F: buildtools/gen-config-h.sh @@ -354,7 +352,6 @@ Memory pool M: Olivier Matz <olivier.matz@6wind.com> M: Andrew Rybchenko <arybchenko@solarflare.com> F: lib/librte_mempool/ -F: drivers/mempool/Makefile F: drivers/mempool/ring/ F: doc/guides/prog_guide/mempool_lib.rst F: app/test/test_mempool* @@ -1519,7 +1516,6 @@ Test Applications ----------------- Unit tests framework -F: app/test/Makefile F: app/test/autotest* F: app/test/commands.c F: app/test/get-coremask.sh diff --git a/app/Makefile b/app/Makefile deleted file mode 100644 index 453c4fed6d..0000000000 --- a/app/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_APP_TEST) += test -DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd -DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib -DIRS-$(CONFIG_RTE_TEST_FLOW_PERF) += test-flow-perf -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += test-sad -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += test-regex - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -DIRS-$(CONFIG_RTE_APP_COMPRESS_PERF) += test-compress-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_APP_CRYPTO_PERF) += test-crypto-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -DIRS-$(CONFIG_RTE_APP_EVENTDEV) += test-eventdev -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/app/pdump/Makefile b/app/pdump/Makefile deleted file mode 100644 index e6b9eea91b..0000000000 --- a/app/pdump/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) - -APP = dpdk-pdump - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/proc-info/Makefile b/app/proc-info/Makefile deleted file mode 100644 index 214f3f54a1..0000000000 --- a/app/proc-info/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-procinfo - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-acl/Makefile b/app/test-acl/Makefile deleted file mode 100644 index 5f26294cf1..0000000000 --- a/app/test-acl/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) - -APP = testacl - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile deleted file mode 100644 index dc29557f37..0000000000 --- a/app/test-bbdev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -APP = testbbdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_TEST_BBDEV) += main.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c - -LDLIBS += -lm -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_5gnr_fec -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-cmdline/Makefile b/app/test-cmdline/Makefile deleted file mode 100644 index 3e7421906b..0000000000 --- a/app/test-cmdline/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y) - -# -# library name -# -APP = cmdline_test - -# -# all sources are stored in SRCS-y -# -SRCS-y += cmdline_test.c -SRCS-y += commands.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-compress-perf/Makefile b/app/test-compress-perf/Makefile deleted file mode 100644 index 2bff531836..0000000000 --- a/app/test-compress-perf/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-compress-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += comp_perf_options_parse.c -SRCS-y += comp_perf_test_verify.c -SRCS-y += comp_perf_test_throughput.c -SRCS-y += comp_perf_test_cyclecount.c -SRCS-y += comp_perf_test_common.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-crypto-perf/Makefile b/app/test-crypto-perf/Makefile deleted file mode 100644 index 0dced790f0..0000000000 --- a/app/test-crypto-perf/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -APP = dpdk-test-crypto-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += cperf_ops.c -SRCS-y += cperf_options_parsing.c -SRCS-y += cperf_test_vectors.c -SRCS-y += cperf_test_throughput.c -SRCS-y += cperf_test_latency.c -SRCS-y += cperf_test_pmd_cyclecount.c -SRCS-y += cperf_test_verify.c -SRCS-y += cperf_test_vector_parsing.c -SRCS-y += cperf_test_common.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-eventdev/Makefile b/app/test-eventdev/Makefile deleted file mode 100644 index e600e21c41..0000000000 --- a/app/test-eventdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-eventdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := evt_main.c -SRCS-y += evt_options.c -SRCS-y += evt_test.c -SRCS-y += parser.c - -SRCS-y += test_order_common.c -SRCS-y += test_order_queue.c -SRCS-y += test_order_atq.c - -SRCS-y += test_perf_common.c -SRCS-y += test_perf_queue.c -SRCS-y += test_perf_atq.c - -SRCS-y += test_pipeline_common.c -SRCS-y += test_pipeline_queue.c -SRCS-y += test_pipeline_atq.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-fib/Makefile b/app/test-fib/Makefile deleted file mode 100644 index 2ea799c0e9..0000000000 --- a/app/test-fib/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_FIB),y) - -APP = testfib - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-flow-perf/Makefile b/app/test-flow-perf/Makefile deleted file mode 100644 index 4f2db75910..0000000000 --- a/app/test-flow-perf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_FLOW_PERF),y) - -# -# library name -# -APP = dpdk-test-flow-perf - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y += actions_gen.c -SRCS-y += flow_gen.c -SRCS-y += items_gen.c -SRCS-y += main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pipeline/Makefile b/app/test-pipeline/Makefile deleted file mode 100644 index fc3a504409..0000000000 --- a/app/test-pipeline/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PIPELINE),y) - -# -# library name -# -APP = testpipeline - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := main.c -SRCS-y += config.c -SRCS-y += init.c -SRCS-y += runtime.c -SRCS-y += pipeline_stub.c -SRCS-y += pipeline_hash.c -SRCS-y += pipeline_lpm.c -SRCS-y += pipeline_lpm_ipv6.c - -# include ACL lib if available -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += pipeline_acl.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile deleted file mode 100644 index e739797f8a..0000000000 --- a/app/test-pmd/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_PMD),y) - -# -# library name -# -APP = testpmd - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -# -# all source are stored in SRCS-y -# -SRCS-y := testpmd.c -SRCS-y += parameters.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_tm.c -SRCS-y += config.c -SRCS-y += iofwd.c -SRCS-y += macfwd.c -SRCS-y += macswap.c -SRCS-y += flowgen.c -SRCS-y += rxonly.c -SRCS-y += txonly.c -SRCS-y += csumonly.c -SRCS-y += icmpecho.c -SRCS-y += noisy_vnf.c -SRCS-y += 5tswap.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c -SRCS-y += util.c - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS)$(CONFIG_RTE_LIBRTE_DPAA_PMD),yy) -LDLIBS += -lrte_pmd_dpaa -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC),y) -LDLIBS += -lrte_pmd_softnic -endif - -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-regex/Makefile b/app/test-regex/Makefile deleted file mode 100644 index bb8f150871..0000000000 --- a/app/test-regex/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-regex - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-sad/Makefile b/app/test-sad/Makefile deleted file mode 100644 index 9b5a7ddc61..0000000000 --- a/app/test-sad/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) - -APP = testsad - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test/Makefile b/app/test/Makefile deleted file mode 100644 index f4065271e4..0000000000 --- a/app/test/Makefile +++ /dev/null @@ -1,310 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_APP_TEST),y) - -# default rule -all: - -# Define an externally linked resource. A linked resource is an arbitrary -# file that is linked into the test binary. The application refers to this -# resource by name. The linked generates identifiers beg_<name> and end_<name> -# for referencing by the C code. -# -# Parameters: <unique name>, <file to be linked> -define linked_resource -SRCS-y += $(1).res.o -$(1).res.o: $(2) - @ echo ' MKRES $$@' - $Q [ "$$(<D)" = . ] || ln -fs $$< - $Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \ - --rename-section \ - .data=.rodata,alloc,load,data,contents,readonly \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1) \ - $$(<F) $$@ -endef - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -define linked_tar_resource -$(1).tar: $(2) - @ echo ' TAR $$@' - $Q tar -C $$(dir $$<) -cf $$@ $$(notdir $$<) -$(call linked_resource,$(1),$(1).tar) -endef -else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR -linked_tar_resource = -endif # CONFIG_RTE_APP_TEST_RESOURCE_TAR - -# -# library name -# -APP = test - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c -SRCS-y += test.c -SRCS-y += resource.c -SRCS-y += test_resource.c -test_resource.res: test_resource.c - @ cp $< $@ -$(eval $(call linked_resource,test_resource_c,test_resource.res)) -$(eval $(call linked_tar_resource,test_resource_tar,test_resource.c)) -SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_cfgfile.c -$(eval $(call linked_tar_resource,test_cfgfiles,test_cfgfiles)) -SRCS-y += test_prefetch.c -SRCS-y += test_byteorder.c -SRCS-y += test_per_lcore.c -SRCS-y += test_atomic.c -SRCS-y += test_barrier.c -SRCS-y += test_malloc.c -SRCS-y += test_cycles.c -SRCS-y += test_mcslock.c -SRCS-y += test_spinlock.c -SRCS-y += test_ticketlock.c -SRCS-y += test_memory.c -SRCS-y += test_memzone.c -SRCS-y += test_bitmap.c -SRCS-y += test_bitops.c -SRCS-y += test_reciprocal_division.c -SRCS-y += test_reciprocal_division_perf.c -SRCS-y += test_fbarray.c -SRCS-y += test_external_mem.c -SRCS-y += test_rand_perf.c - -SRCS-y += test_ring.c -SRCS-y += test_ring_mpmc_stress.c -SRCS-y += test_ring_hts_stress.c -SRCS-y += test_ring_perf.c -SRCS-y += test_ring_mt_peek_stress.c -SRCS-y += test_ring_rts_stress.c -SRCS-y += test_ring_st_peek_stress.c -SRCS-y += test_ring_stress.c -SRCS-y += test_pmd_perf.c - -ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y) -SRCS-y += test_table.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test_table_pipeline.c -SRCS-y += test_table_tables.c -SRCS-y += test_table_ports.c -SRCS-y += test_table_combined.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_table_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += test_flow_classify.c -endif - -SRCS-y += test_rwlock.c -SRCS-y += test_lcores.c - -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack.c -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_racecond.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_secondary.c - -SRCS-y += test_mempool.c -SRCS-y += test_mempool_perf.c - -SRCS-y += test_mbuf.c -SRCS-y += test_logs.c - -SRCS-y += test_memcpy.c -SRCS-y += test_memcpy_perf.c - - -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd.c -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_thash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_functions.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += test_telemetry_json.c - -SRCS-y += test_debug.c -SRCS-y += test_errno.c -SRCS-y += test_tailq.c -SRCS-y += test_string_fns.c -SRCS-y += test_cpuflags.c -SRCS-y += test_mp_secondary.c -SRCS-y += test_eal_flags.c -SRCS-y += test_eal_fs.c -SRCS-y += test_alarm.c -SRCS-y += test_interrupts.c -SRCS-y += test_version.c -SRCS-y += test_func_reentrancy.c -SRCS-y += test_trace.c -SRCS-y += test_trace_register.c -SRCS-y += test_trace_perf.c -SRCS-y += test_service_cores.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-y += sample_packet_forward.c -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_portlist.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_lib.c - -SRCS-$(CONFIG_RTE_LIBRTE_NET) += test_crc.c - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -SRCS-y += test_red.c -SRCS-y += test_sched.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_METER) += test_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_KNI) += test_kni.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power.c test_power_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power_kvm_vm.c -SRCS-y += test_common.c - -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c - -SRCS-y += virtual_pmd.c -SRCS-y += packet_burst_generator.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_cryptodev_security_pdcp.c - -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -SRCS-y += test_eventdev.c -SRCS-y += test_event_ring.c -SRCS-y += test_event_eth_rx_adapter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c -SRCS-y += test_event_timer_adapter.c -SRCS-y += test_event_crypto_adapter.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH), y) -SRCS-y += test_graph.c -SRCS-y += test_graph_perf.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -SRCS-y += test_rawdev.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c - -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += test_bpf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RCU) += test_rcu_qsbr.c test_rcu_qsbr_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_security.c - -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec.c test_ipsec_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec_sad.c -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -LDLIBS += -lrte_ipsec -endif - -CFLAGS += -O3 -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) -LDLIBS += -lpthread -endif - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -LDLIBS += -lz -endif -endif - -# Disable VTA for memcpy test -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_test_memcpy.o += -fno-var-tracking-assignments -CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments -endif -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -LDLIBS += -lrte_pmd_null -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -LDLIBS += -lrte_pmd_ring -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -endif - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -LDLIBS += -larchive -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/buildtools/Makefile b/buildtools/Makefile deleted file mode 100644 index 7f76fd7d65..0000000000 --- a/buildtools/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += pmdinfogen - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/buildtools/pmdinfogen/Makefile b/buildtools/pmdinfogen/Makefile deleted file mode 100644 index a97a7648fe..0000000000 --- a/buildtools/pmdinfogen/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -HOSTAPP = dpdk-pmdinfogen - -# -# all sources are stored in SRCS-y -# -SRCS-y += pmdinfogen.c - -HOST_CFLAGS += $(HOST_WERROR_FLAGS) -g -HOST_CFLAGS += -I$(RTE_OUTPUT)/include - -include $(RTE_SDK)/mk/rte.hostapp.mk diff --git a/drivers/Makefile b/drivers/Makefile deleted file mode 100644 index 7f06162dc4..0000000000 --- a/drivers/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += common -DIRS-y += bus -DEPDIRS-bus := common -DIRS-y += mempool -DEPDIRS-mempool := common bus -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -DIRS-y += common/mlx5 -DEPDIRS-common/mlx5 := bus -endif -DIRS-y += net -DEPDIRS-net := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband -DEPDIRS-baseband := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto -DEPDIRS-crypto := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat -DEPDIRS-common/qat := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress -DEPDIRS-compress := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex -DEPDIRS-regex := common bus common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa -DEPDIRS-vdpa := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event -DEPDIRS-event := common bus mempool net crypto -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw -DEPDIRS-raw := common bus mempool net event - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/Makefile b/drivers/baseband/Makefile deleted file mode 100644 index dcc0969175..0000000000 --- a/drivers/baseband/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -core-libs := librte_eal librte_mbuf librte_mempool librte_ring -core-libs += librte_bbdev librte_kvargs librte_cfgfile - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null -DEPDIRS-null = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw -DEPDIRS-turbo_sw = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec -DEPDIRS-fpga_lte_fec = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += fpga_5gnr_fec -DEPDIRS-fpga_5gnr_fec = $(core-libs) - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/fpga_5gnr_fec/Makefile b/drivers/baseband/fpga_5gnr_fec/Makefile deleted file mode 100644 index 7b7017c6dc..0000000000 --- a/drivers/baseband/fpga_5gnr_fec/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_5gnr_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_5gnr_fec_version.map - -# library version -LIBABIVER := 1 - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += rte_fpga_5gnr_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC)-include += rte_pmd_fpga_5gnr_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/fpga_lte_fec/Makefile b/drivers/baseband/fpga_lte_fec/Makefile deleted file mode 100644 index 30caafe3db..0000000000 --- a/drivers/baseband/fpga_lte_fec/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_lte_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/null/Makefile b/drivers/baseband/null/Makefile deleted file mode 100644 index 0ee500166d..0000000000 --- a/drivers/baseband/null/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk -# library name -LIB = librte_pmd_bbdev_null.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_null_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += bbdev_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/turbo_sw/Makefile b/drivers/baseband/turbo_sw/Makefile deleted file mode 100644 index c2a6fe0f81..0000000000 --- a/drivers/baseband/turbo_sw/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_turbo_sw.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_turbo_sw_version.map - -# external library dependencies if available -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -ifeq ($(FLEXRAN_SDK),) -$(error "Please define FLEXRAN_SDK environment variable") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_common -CFLAGS += -I$(FLEXRAN_SDK)/lib_turbo -CFLAGS += -I$(FLEXRAN_SDK)/lib_crc -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -LDLIBS += -L$(FLEXRAN_SDK)/lib_crc -lcrc -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_common -lcommon -LDLIBS += -lstdc++ -lirc -limf -lipps -lsvml -endif - -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),n) -$(error "CONFIG_RTE_BBDEV_SDK_AVX512 requires CONFIG_RTE_BBDEV_SDK_AVX2 set") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += bbdev_turbo_software.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile deleted file mode 100644 index cea3b55e60..0000000000 --- a/drivers/bus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc -endif -DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev -DIRS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile deleted file mode 100644 index ba40b21166..0000000000 --- a/drivers/bus/dpaa/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_BUS_DPAA=$(RTE_SDK)/drivers/bus/dpaa - -# -# library name -# -LIB = librte_bus_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual -CFLAGS += -I$(RTE_BUS_DPAA)/ -CFLAGS += -I$(RTE_BUS_DPAA)/include -CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_bus_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - dpaa_bus.c - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - base/fman/fman.c \ - base/fman/fman_hw.c \ - base/fman/netcfg_layer.c \ - base/qbman/process.c \ - base/qbman/bman.c \ - base/qbman/bman_driver.c \ - base/qbman/qman.c \ - base/qbman/qman_driver.c \ - base/qbman/dpaa_alloc.c \ - base/qbman/dpaa_sys.c - -# Link Pthread -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile deleted file mode 100644 index b98d758ee0..0000000000 --- a/drivers/bus/fslmc/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_fslmc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -# versioning export map -EXPORT_MAP := rte_bus_fslmc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - qbman/qbman_portal.c \ - qbman/qbman_debug.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - mc/dpmng.c \ - mc/dpbp.c \ - mc/dpio.c \ - mc/mc_sys.c \ - mc/dpcon.c \ - mc/dpci.c \ - mc/dpdmai.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpci.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile deleted file mode 100644 index 1df369103c..0000000000 --- a/drivers/bus/ifpga/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_bus_ifpga_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_bus.c -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_common.c - -# -# Export include files -# -SYMLINK-$(CONFIG_RTE_LIBRTE_IFPGA_BUS)-include += rte_bus_ifpga.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile deleted file mode 100644 index f4102d0a7f..0000000000 --- a/drivers/bus/pci/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_pci.a -EXPORT_MAP := rte_bus_pci_version.map - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -SYSTEM := bsd -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_pci -lrte_kvargs - -include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI_BUS)-include += rte_bus_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/bsd/Makefile b/drivers/bus/pci/bsd/Makefile deleted file mode 100644 index c1b54c05ef..0000000000 --- a/drivers/bus/pci/bsd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c diff --git a/drivers/bus/pci/linux/Makefile b/drivers/bus/pci/linux/Makefile deleted file mode 100644 index 90404468b0..0000000000 --- a/drivers/bus/pci/linux/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c -SRCS += pci_uio.c -SRCS += pci_vfio.c diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile deleted file mode 100644 index 01747f03a4..0000000000 --- a/drivers/bus/vdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_vdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_bus_vdev_version.map - -SRCS-y += vdev.c -SRCS-y += vdev_params.c - -LDLIBS += -lrte_eal -lrte_kvargs - -# -# Export include files -# -SYMLINK-y-include += rte_bus_vdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/Makefile b/drivers/bus/vmbus/Makefile deleted file mode 100644 index 335df6a0ba..0000000000 --- a/drivers/bus/vmbus/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_vmbus.a -EXPORT_MAP := rte_bus_vmbus_version.map - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -$(error "VMBUS not implemented for BSD yet") -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev - -include $(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_channel.c vmbus_bufring.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_bus_vmbus.h -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_vmbus_reg.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/linux/Makefile b/drivers/bus/vmbus/linux/Makefile deleted file mode 100644 index ef0d30b2d3..0000000000 --- a/drivers/bus/vmbus/linux/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -SRCS += vmbus_bus.c vmbus_uio.c diff --git a/drivers/common/Makefile b/drivers/common/Makefile deleted file mode 100644 index cfb6b4dc88..0000000000 --- a/drivers/common/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifneq (,$(findstring y,$(CPT-y))) -DIRS-y += cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -DIRS-y += octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -DIRS-y += octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -DIRS-y += mvep -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y) -DIRS-y += dpaax -endif - -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifneq (,$(findstring y,$(IAVF-y))) -DIRS-y += iavf -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/cpt/Makefile b/drivers/common/cpt/Makefile deleted file mode 100644 index cab9da73c8..0000000000 --- a/drivers/common/cpt/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_cpt.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -EXPORT_MAP := rte_common_cpt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += cpt_fpm_tables.c -SRCS-y += cpt_pmd_ops_helper.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile deleted file mode 100644 index 2f4b924fda..0000000000 --- a/drivers/common/dpaax/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_dpaax.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib - -# versioning export map -EXPORT_MAP := rte_common_dpaax_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/iavf/Makefile b/drivers/common/iavf/Makefile deleted file mode 100644 index f06dafd408..0000000000 --- a/drivers/common/iavf/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_iavf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -EXPORT_MAP := rte_common_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += iavf_adminq.c -SRCS-y += iavf_common.c -SRCS-y += iavf_impl.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile deleted file mode 100644 index 4edd541042..0000000000 --- a/drivers/common/mlx5/Makefile +++ /dev/null @@ -1,404 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_common_mlx5.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx5_glue.so -LIB_GLUE_VERSION = 20.02.0 - -# Sources. -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-y += linux/mlx5_glue.c -endif -SRCS-y += mlx5_devx_cmds.c -SRCS-y += mlx5_common.c -SRCS-y += linux/mlx5_common_os.c -SRCS-y += linux/mlx5_nl.c -SRCS-y += linux/mlx5_common_verbs.c -SRCS-y += mlx5_common_mp.c -SRCS-y += mlx5_common_mr.c -SRCS-y += mlx5_malloc.c -SRCS-y += mlx5_common_pci.c -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-y-lib += $(LIB_GLUE) -endif -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(SRCDIR)/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_linux/mlx5_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx5 -endif - -LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual -UPEDANTIC - -EXPORT_MAP := rte_common_mlx5_version.map - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx5_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx5_autoconf.h.new: FORCE - -mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_RELAXED_ORDERING \ - infiniband/verbs.h \ - enum IBV_ACCESS_RELAXED_ORDERING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_TUNNEL_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_MPLS_SUPPORT \ - infiniband/verbs.h \ - enum IBV_FLOW_SPEC_MPLS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAG_RX_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAG_RX_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_SWP \ - infiniband/mlx5dv.h \ - type 'struct mlx5dv_sw_parsing_caps' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_MPW \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_COMP \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_PAD \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DV_SUPPORT \ - infiniband/mlx5dv.h \ - func mlx5dv_create_flow_action_packet_reformat \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_NIC_RX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ESWITCH \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_FDB \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_VLAN \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_push_vlan \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_DEVX_PORT \ - infiniband/mlx5dv.h \ - func mlx5dv_query_devx_port \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_OBJ \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_create \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DEVX_COUNTERS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_DEFAULT_MISS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_ASYNC \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_query_async \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_QP \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_qp_query \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DEVX_UAR_OFFSET \ - infiniband/mlx5dv.h \ - field "struct mlx5dv_devx_uar.mmap_off" \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_PP_ALLOC \ - infiniband/mlx5dv.h \ - func mlx5dv_pp_alloc \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_dest_devx_tir \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_EVENT \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_get_event \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_flow_meter \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_FLOW_DUMP \ - infiniband/mlx5dv.h \ - func mlx5dv_dump_dr_domain \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD \ - infiniband/mlx5dv.h \ - enum MLX5_MMAP_GET_NC_PAGES_CMD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_VAR \ - infiniband/mlx5dv.h \ - func mlx5dv_alloc_var \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_MEM_RECLAIM \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_domain_set_reclaim_device_memory \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_ENHANCED_MPSW \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_ENHANCED_MPSW \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_SEND_EN \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_SEND_EN \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_WAIT \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_WAIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_25G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_50G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_100G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V42 \ - infiniband/verbs.h \ - type 'struct ibv_counter_set_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V45 \ - infiniband/verbs.h \ - type 'struct ibv_counters_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NL_NLDEV \ - rdma/rdma_netlink.h \ - enum RDMA_NL_NLDEV \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_PORT_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_PORT_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_NAME \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_PORT_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_PORT_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_NDEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_NUM_VF \ - linux/if_link.h \ - enum IFLA_NUM_VF \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_EXT_MASK \ - linux/if_link.h \ - enum IFLA_EXT_MASK \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_SWITCH_ID \ - linux/if_link.h \ - enum IFLA_PHYS_SWITCH_ID \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_PORT_NAME \ - linux/if_link.h \ - enum IFLA_PHYS_PORT_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_DEVLINK \ - linux/devlink.h \ - define DEVLINK_GENL_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_STATIC_ASSERT \ - /usr/include/assert.h \ - define static_assert \ - $(AUTOCONF_OUTPUT) - -# Create mlx5_autoconf.h or update it in case it differs from the new one. - -mlx5_autoconf.h: mlx5_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -$(SRCS-y:.c=.o): mlx5_autoconf.h -endif - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): linux/mlx5_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx5 - -linux/mlx5_glue.o: mlx5_autoconf.h - -endif - -clean_mlx5: FORCE - $Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new - $Q rm -f -- linux/mlx5_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx5 diff --git a/drivers/common/mvep/Makefile b/drivers/common/mvep/Makefile deleted file mode 100644 index f91d295e5c..0000000000 --- a/drivers/common/mvep/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_common_mvep.a - -# versioning export map -EXPORT_MAP := rte_common_mvep_version.map - -# external library dependencies -CFLAGS += -I$($RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_kvargs - -# library source files -SRCS-y += mvep_common.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx/Makefile b/drivers/common/octeontx/Makefile deleted file mode 100644 index 5e67df0583..0000000000 --- a/drivers/common/octeontx/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -EXPORT_MAP := rte_common_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += octeontx_mbox.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx2/Makefile b/drivers/common/octeontx2/Makefile deleted file mode 100644 index 260da8dd3e..0000000000 --- a/drivers/common/octeontx2/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_common_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += otx2_dev.c -SRCS-y += otx2_irq.c -SRCS-y += otx2_mbox.c -SRCS-y += otx2_common.c -SRCS-y += otx2_sec_idev.c - -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile deleted file mode 100644 index 85d4207099..0000000000 --- a/drivers/common/qat/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# build directories -QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat -QAT_COMPRESS_DIR := $(RTE_SDK)/drivers/compress/qat -VPATH=$(QAT_CRYPTO_DIR):$(QAT_COMPRESS_DIR) - -# external library include paths -CFLAGS += -I$(SRCDIR)/qat_adf -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(QAT_CRYPTO_DIR) -CFLAGS += -I$(QAT_COMPRESS_DIR) - - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) - LDLIBS += -lrte_compressdev - SRCS-y += qat_comp.c - SRCS-y += qat_comp_pmd.c - build_qat = yes -endif - -# library symmetric crypto source files -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto - CFLAGS += -DBUILD_QAT_ASYM - SRCS-y += qat_asym.c - SRCS-y += qat_asym_pmd.c - build_qat = yes -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) - LDLIBS += -lrte_net -endif - CFLAGS += -DBUILD_QAT_SYM - SRCS-y += qat_sym.c - SRCS-y += qat_sym_session.c - SRCS-y += qat_sym_pmd.c - build_qat = yes -endif -endif - -ifdef build_qat - - # library name - LIB = librte_pmd_qat.a - - # build flags - CFLAGS += $(WERROR_FLAGS) - CFLAGS += -O3 - - # library common source files - SRCS-y += qat_device.c - SRCS-y += qat_common.c - SRCS-y += qat_logs.c - SRCS-y += qat_qp.c - - LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool - LDLIBS += -lrte_pci -lrte_bus_pci - - # export include files - SYMLINK-y-include += - - # versioning export map - EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/Makefile b/drivers/compress/Makefile deleted file mode 100644 index 286ea6ee84..0000000000 --- a/drivers/compress/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/compress/isal/Makefile b/drivers/compress/isal/Makefile deleted file mode 100644 index 1e225ab434..0000000000 --- a/drivers/compress/isal/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_isal_comp.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# external library dependencies -LDLIBS += -lisal -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_isal_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd_ops.c - -# export include files -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/octeontx/Makefile b/drivers/compress/octeontx/Makefile deleted file mode 100644 index 9ba1db791e..0000000000 --- a/drivers/compress/octeontx/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_zip.a - -# build flags -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/compress/octeontx/include - -# external library include paths -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_compress_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/zlib/Makefile b/drivers/compress/zlib/Makefile deleted file mode 100644 index 9f695f7d9a..0000000000 --- a/drivers/compress/zlib/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium Networks - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zlib.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zlib_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lz -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile deleted file mode 100644 index 47a2a9e794..0000000000 --- a/drivers/crypto/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += zuc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += mvsam -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec -endif # CONFIG_RTE_LIBRTE_PMD_DPAA_SEC -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile deleted file mode 100644 index 01cb4fddfe..0000000000 --- a/drivers/crypto/aesni_gcm/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_gcm.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_gcm_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile deleted file mode 100644 index f0dc82f395..0000000000 --- a/drivers/crypto/aesni_mb/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_mb.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_mb_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/armv8/Makefile b/drivers/crypto/armv8/Makefile deleted file mode 100644 index 0e3bc9fb70..0000000000 --- a/drivers/crypto/armv8/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(ARMV8_CRYPTO_LIB_PATH),) -$(error "Please define ARMV8_CRYPTO_LIB_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_armv8.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_armv8_version.map - -# external library dependencies -CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH) -LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile deleted file mode 100644 index 89d3238172..0000000000 --- a/drivers/crypto/caam_jr/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_caam_jr.a - -# build flags -CFLAGS += -D _GNU_SOURCE - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_pmd_caam_jr_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_uio.c -# library dependencies - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile deleted file mode 100644 index 3f5da2adf3..0000000000 --- a/drivers/crypto/ccp/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_ccp.a - -# build flags -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += $(WERROR_FLAGS) - -# external library include paths -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_pmd_ccp_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += rte_ccp_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile deleted file mode 100644 index a0a2795575..0000000000 --- a/drivers/crypto/dpaa2_sec/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -# -# library name -# -LIB = librte_pmd_dpaa2_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -CFLAGS += -Wno-implicit-fallthrough -endif -endif - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2/ - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec_dpseci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += mc/dpseci.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile deleted file mode 100644 index ea266962a3..0000000000 --- a/drivers/crypto/dpaa_sec/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c - -# library dependencies - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/kasumi/Makefile b/drivers/crypto/kasumi/Makefile deleted file mode 100644 index a7d0d079d2..0000000000 --- a/drivers/crypto/kasumi/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_kasumi.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_kasumi_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/mvsam/Makefile b/drivers/crypto/mvsam/Makefile deleted file mode 100644 index f0641ae7d9..0000000000 --- a/drivers/crypto/mvsam/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvsam_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC - -# versioning export map -EXPORT_MAP := rte_pmd_mvsam_version.map - -# external library dependencies -LDLIBS += -L$(LIBMUSDK_PATH)/lib -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/nitrox/Makefile b/drivers/crypto/nitrox/Makefile deleted file mode 100644 index 535121196b..0000000000 --- a/drivers/crypto/nitrox/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_nitrox.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_nitrox_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_cryptodev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_device.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_reqmgr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_qp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/null/Makefile b/drivers/crypto/null/Makefile deleted file mode 100644 index 4595055f01..0000000000 --- a/drivers/crypto/null/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -# library name -LIB = librte_pmd_null_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_null_crypto_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd_ops.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx/Makefile b/drivers/crypto/octeontx/Makefile deleted file mode 100644 index 296755ee90..0000000000 --- a/drivers/crypto/octeontx/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_ops.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx2/Makefile b/drivers/crypto/octeontx2/Makefile deleted file mode 100644 index 14152c6117..0000000000 --- a/drivers/crypto/octeontx2/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx2_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_security -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt -lrte_common_octeontx2 - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx2 - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_sec.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx2_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/openssl/Makefile b/drivers/crypto/openssl/Makefile deleted file mode 100644 index b85c816551..0000000000 --- a/drivers/crypto/openssl/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_openssl.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_openssl_version.map - -# external library dependencies -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/scheduler/Makefile b/drivers/crypto/scheduler/Makefile deleted file mode 100644 index 67aac024c4..0000000000 --- a/drivers/crypto/scheduler/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_crypto_scheduler.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_kvargs -lrte_reorder -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_crypto_scheduler_version.map - -# -# Export include files -# -SYMLINK-y-include += rte_cryptodev_scheduler_operations.h -SYMLINK-y-include += rte_cryptodev_scheduler.h - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += rte_cryptodev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_roundrobin.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pkt_size_distr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_failover.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_multicore.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile deleted file mode 100644 index 469aefaa56..0000000000 --- a/drivers/crypto/snow3g/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_snow3g.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_snow3g_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile deleted file mode 100644 index 32e2e4d5e9..0000000000 --- a/drivers/crypto/virtio/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio_crypto.a - -# -# include virtio_crypto.h -# -CFLAGS += -I$(RTE_SDK)/lib/librte_vhost -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_virtio_crypto_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c - -# this lib depends upon: -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/zuc/Makefile b/drivers/crypto/zuc/Makefile deleted file mode 100644 index 529b47f25e..0000000000 --- a/drivers/crypto/zuc/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zuc.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zuc_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/Makefile b/drivers/event/Makefile deleted file mode 100644 index 86be41b9eb..0000000000 --- a/drivers/event/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += octeontx2 -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile deleted file mode 100644 index a39dc27c62..0000000000 --- a/drivers/event/dpaa/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa_event.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -LDLIBS += -lrte_pmd_dpaa_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec - -EXPORT_MAP := rte_pmd_dpaa_event_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa_eventdev.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile deleted file mode 100644 index 75cf197c5c..0000000000 --- a/drivers/event/dpaa2/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017,2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2_event.a - -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 -LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc - -LDLIBS += -lrte_pmd_dpaa2_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_hw_dpcon.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev_selftest.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile deleted file mode 100644 index f6e7dda1fd..0000000000 --- a/drivers/event/dsw/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Ericsson AB - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_dsw_event.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -Wno-format-nonliteral -endif - -LDLIBS += -lrte_eal -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool -LDLIBS += -lrte_ring -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_dsw_event_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += \ - dsw_evdev.c dsw_event.c dsw_xstats.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile deleted file mode 100644 index c1233e098d..0000000000 --- a/drivers/event/octeontx/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx_ssovf.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/ - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_ethdev - -EXPORT_MAP := rte_pmd_octeontx_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_probe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_probe.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_ssovf_worker.o += -fno-prefetch-loop-arrays -CFLAGS_timvf_worker.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -else -CFLAGS_ssovf_worker.o += -O3 -ffast-math -CFLAGS_timvf_worker.o += -O3 -ffast-math -endif - -else -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx2/Makefile b/drivers/event/octeontx2/Makefile deleted file mode 100644 index 9d67b00c69..0000000000 --- a/drivers/event/octeontx2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2_event.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/event/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_event_version.map - -# -# all source are stored in SRCS-y -# - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker_dual.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_adptr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_irq.c - -LDLIBS += -lrte_eal -lrte_bus_pci -lrte_pci -lrte_kvargs -LDLIBS += -lrte_mempool -lrte_eventdev -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile deleted file mode 100644 index 71713b00ae..0000000000 --- a/drivers/event/opdl/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_opdl_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_pmd_opdl_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_init.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_test.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/skeleton/Makefile b/drivers/event/skeleton/Makefile deleted file mode 100644 index dc85ad3c4b..0000000000 --- a/drivers/event/skeleton/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_skeleton_event.a - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_skeleton_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton_eventdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/sw/Makefile b/drivers/event/sw/Makefile deleted file mode 100644 index 8ea5cceb8b..0000000000 --- a/drivers/event/sw/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_sw_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -lrte_ring -LDLIBS += -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_sw_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_selftest.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile deleted file mode 100644 index 29ef73bf44..0000000000 --- a/drivers/mempool/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += bucket -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2 -endif -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += octeontx2 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/mempool/bucket/Makefile b/drivers/mempool/bucket/Makefile deleted file mode 100644 index c766c35b2c..0000000000 --- a/drivers/mempool/bucket/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright (c) 2017-2018 Solarflare Communications Inc. -# All rights reserved. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_bucket.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_bucket_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += rte_mempool_bucket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile deleted file mode 100644 index 144969c627..0000000000 --- a/drivers/mempool/dpaa/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile deleted file mode 100644 index 04db6d27de..0000000000 --- a/drivers/mempool/dpaa2/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa2_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)-include := rte_dpaa2_mempool.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx/Makefile b/drivers/mempool/octeontx/Makefile deleted file mode 100644 index 9c840620d9..0000000000 --- a/drivers/mempool/octeontx/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ - -EXPORT_MAP := rte_mempool_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx_fpavf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += rte_mempool_octeontx.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_rte_mempool_octeontx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_rte_mempool_octeontx.o += -Ofast -else -CFLAGS_rte_mempool_octeontx.o += -O3 -ffast-math -endif - -else -CFLAGS_rte_mempool_octeontx.o += -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_bus_pci -lrte_common_octeontx - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx2/Makefile b/drivers/mempool/octeontx2/Makefile deleted file mode 100644 index 3828219b11..0000000000 --- a/drivers/mempool/octeontx2/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_mempool_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += \ - otx2_mempool_ops.c \ - otx2_mempool.c \ - otx2_mempool_irq.c \ - otx2_mempool_debug.c - -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_kvargs -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/ring/Makefile b/drivers/mempool/ring/Makefile deleted file mode 100644 index 8624502da9..0000000000 --- a/drivers/mempool/ring/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_ring_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += rte_mempool_ring.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile deleted file mode 100644 index ccfd970400..0000000000 --- a/drivers/mempool/stack/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_stack.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# Headers -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool -LDLIBS += -lrte_eal -lrte_mempool -lrte_stack - -EXPORT_MAP := rte_mempool_stack_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/Makefile b/drivers/net/Makefile deleted file mode 100644 index 361974eacf..0000000000 --- a/drivers/net/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# set in mk/toolchain/xxx/rte.toolchain-compat.mk -ifeq ($(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD),d) - $(warning thunderx pmd is not supported by old compilers) -endif - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += af_xdp -DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark -DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic -DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp -DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe -DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding -DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 -DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena -DIRS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc -DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic -DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe -DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k -DIRS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic -DIRS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3 -DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e -DIRS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf -DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice -DIRS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc -DIRS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic -DIRS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke -DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe -DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif -DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta -DIRS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mvpp2 -DIRS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += netvsc -DIRS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb -DIRS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp -DIRS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap -DIRS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe -DIRS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede -DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring -DIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += szedata2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap -DIRS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += thunderx -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc -DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3 - -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += kni -endif - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += softnic -endif # $(CONFIG_RTE_LIBRTE_SCHED) - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost -endif # $(CONFIG_RTE_LIBRTE_VHOST) - -ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y) -ifeq ($(CONFIG_RTE_LIBRTE_CFGFILE),n) -$(error "RTE_LIBRTE_CFGFILE must be enabled in configuration!") -endif -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/net/af_packet/Makefile b/drivers/net/af_packet/Makefile deleted file mode 100644 index 91dbf0a692..0000000000 --- a/drivers/net/af_packet/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 John W. Linville <linville@redhat.com> -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_packet.a - -EXPORT_MAP := rte_pmd_af_packet_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += rte_eth_af_packet.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/af_xdp/Makefile b/drivers/net/af_xdp/Makefile deleted file mode 100644 index 55db6085ac..0000000000 --- a/drivers/net/af_xdp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_xdp.a - -EXPORT_MAP := rte_pmd_af_xdp_version.map - -CFLAGS += -O3 - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libbpf || echo "-lbpf") - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += rte_eth_af_xdp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile deleted file mode 100644 index c02080bdd0..0000000000 --- a/drivers/net/ark/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2018 Atomic Rules LLC - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ark.a - -CFLAGS += -O3 -I./ -CFLAGS += $(WERROR_FLAGS) -Werror - -EXPORT_MAP := rte_pmd_ark_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ddm.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_mpu.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktchkr.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktgen.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_rqp.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c - -# this lib depends upon: -LDLIBS += -lpthread -ifdef CONFIG_RTE_EXEC_ENV_LINUX -LDLIBS += -ldl -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/atlantic/Makefile b/drivers/net/atlantic/Makefile deleted file mode 100644 index 0d0d0a502d..0000000000 --- a/drivers/net/atlantic/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Aquantia Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_atlantic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_atlantic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/hw_atl - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_hw_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_llh.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils_fw2x.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_b0.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += rte_pmd_atlantic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/avp/Makefile b/drivers/net/avp/Makefile deleted file mode 100644 index 075247b13a..0000000000 --- a/drivers/net/avp/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2017, Wind River Systems, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_avp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_avp_version.map - -# install public header files to enable compilation of the hypervisor level -# dpdk application -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_common.h -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_fifo.h - -# -# all source files are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/axgbe/Makefile b/drivers/net/axgbe/Makefile deleted file mode 100644 index e421d0da11..0000000000 --- a/drivers/net/axgbe/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_axgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_axgbe_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_ethdev -lrte_net - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_mdio.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_phy_impl.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_i2c.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx_vec_sse.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile deleted file mode 100644 index 451434cc18..0000000000 --- a/drivers/net/bnx2x/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2014 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnx2x.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DZLIB_CONST -LDLIBS += -lz -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_bnx2x_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += ecore_sp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += elink.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_vfpf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile deleted file mode 100644 index 0c5b74918d..0000000000 --- a/drivers/net/bnxt/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnxt.a - -EXPORT_MAP := rte_pmd_bnxt_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -pthread - -EXPORT_MAP := rte_pmd_bnxt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_cpr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_hwrm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_reps.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD), y) -CFLAGS += -I$(SRCDIR) -I$(SRCDIR)/tf_ulp -I$(SRCDIR)/tf_core -I$(SRCDIR)/hcapi -include $(SRCDIR)/tf_ulp/Makefile -include $(SRCDIR)/tf_core/Makefile -include $(SRCDIR)/hcapi/Makefile -endif - -# -# Export include files -# -SYMLINK-y-include += -SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include += rte_pmd_bnxt.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/hcapi/Makefile b/drivers/net/bnxt/hcapi/Makefile deleted file mode 100644 index a5bb398ad7..0000000000 --- a/drivers/net/bnxt/hcapi/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += hcapi/hcapi_cfa_p4.c diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile deleted file mode 100644 index 84840366ab..0000000000 --- a/drivers/net/bnxt/tf_core/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/bitalloc.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/rand.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/stack.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/ll.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_core.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_rm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tfp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device_p4.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_if_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_global_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_hash.c diff --git a/drivers/net/bnxt/tf_ulp/Makefile b/drivers/net/bnxt/tf_ulp/Makefile deleted file mode 100644 index abb68150d1..0000000000 --- a/drivers/net/bnxt/tf_ulp/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_class.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_act.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_rte_parser.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_matcher.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mapper.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mark_mgr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_flow_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_port_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_def_rules.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_fc_mgr.c diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile deleted file mode 100644 index 728551a846..0000000000 --- a/drivers/net/bonding/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bond.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_bond_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_8023ad.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_alb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_flow.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_bond.h -SYMLINK-y-include += rte_eth_bond_8023ad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile deleted file mode 100644 index 53b2bb56dc..0000000000 --- a/drivers/net/cxgbe/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014-2018 Chelsio Communications. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_cxgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_cxgbe_version.map - -# -# CFLAGS for gcc/clang -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += clip_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += mps_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += l2t.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += smt.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4vf_hw.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile deleted file mode 100644 index d7bbc0e158..0000000000 --- a/drivers/net/dpaa/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_pmd_dpaa_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile deleted file mode 100644 index 6f38c18b9b..0000000000 --- a/drivers/net/dpaa2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_sparser.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += dpaa2_ptp.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_PMD)-include := rte_pmd_dpaa2.h -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile deleted file mode 100644 index f186f8d0e9..0000000000 --- a/drivers/net/e1000/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_e1000.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_e1000_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 177 -diag-disable 181 -CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259 -else -# -# CFLAGS for gcc/clang -# -CFLAGS_BASE_DRIVER = -Wno-uninitialized -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-misleading-indentation -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -endif - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_base.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_80003es2lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82540.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82541.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82542.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82543.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82571.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82575.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_i210.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_api.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_ich8lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile deleted file mode 100644 index 8ccff36db7..0000000000 --- a/drivers/net/ena/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2019 Amazon.com, Inc. or its affiliates. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ena.a -CFLAGS += $(WERROR_FLAGS) -O2 -INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ena_version.map - -VPATH += $(SRCDIR)/base -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c - -CFLAGS += $(INCLUDES) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_timer - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile deleted file mode 100644 index 7276026e37..0000000000 --- a/drivers/net/enetc/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enetc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -EXPORT_MAP := rte_pmd_enetc_version.map -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile deleted file mode 100644 index d098a474a1..0000000000 --- a/drivers/net/enic/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2008-2017 Cisco Systems, Inc. All rights reserved. -# Copyright 2007 Nuova Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enic.a - -EXPORT_MAP := rte_pmd_enic_version.map - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/src - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_fm_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_cq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c - -# The current implementation assumes 64-bit pointers -CC_AVX2_SUPPORT=0 -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -# Figure out if the compiler supports avx2. The extra check using -# -march=core-avx2 is necessary to support users who build for the -# 'default' machine (corei7 which has no avx2) and run the binary on -# newer CPUs that have avx2. -# This part is verbatim from i40e makefile. -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_enic_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_enic_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile deleted file mode 100644 index 464fd0515d..0000000000 --- a/drivers/net/failsafe/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_pmd_failsafe.a - -EXPORT_MAP := rte_pmd_failsafe_version.map - -# Sources are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_eal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif - -# No exported include files - -# Basic CFLAGS: -CFLAGS += -std=gnu99 -Wextra -CFLAGS += -O3 -CFLAGS += -I. -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=700 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -CFLAGS += -pedantic -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile deleted file mode 100644 index d486389928..0000000000 --- a/drivers/net/fm10k/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_fm10k.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_fm10k_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) - -# -## CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -else -# -# CFLAGS for gcc -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of cid-fm10k.2017.01.24.tar.gz -# -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_rxtx.c - -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_tlv.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) += fm10k_rxtx_vec.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile deleted file mode 100644 index 87fd843e41..0000000000 --- a/drivers/net/hinic/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Huawei Technologies Co., Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hinic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -CFLAGS += -D__ARM64_NEON__ -else ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -CFLAGS += -D__X86_64_SSE__ -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_hinic_version.map - -# -# CFLAGS for 32-bits platforms -# -ifneq ($(CONFIG_RTE_ARCH_64),y) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS += -diag-disable 2259 -else -# -# CFLAGS for gcc -# -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -endif -endif - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_api_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cmdq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_eqs.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwif.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mgmt.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_niccfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_nicio.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_tx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hns3/Makefile b/drivers/net/hns3/Makefile deleted file mode 100644 index d7798a4706..0000000000 --- a/drivers/net/hns3/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018-2019 Hisilicon Limited. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hns3.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Experimantal APIs: -# - rte_mp_action_register -# - rte_mp_action_unregister -# - rte_mp_reply -# - rte_mp_request_sync - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_hns3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile deleted file mode 100644 index 43f10941b2..0000000000 --- a/drivers/net/i40e/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_i40e.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF -CFLAGS += -DX722_A0_SUPPORT - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_i40e_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER = -diag-disable 593 -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER = -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-format-security -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -CFLAGS_i40e_lan_hmc.o += -Wno-error -endif -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of dpdk-i40e.2016.04.18.12.tar.gz. -# -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_adminq.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_common.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_diag.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_lan_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c - -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_sse.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += rte_pmd_i40e.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_vf_representor.c - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR),y) -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_i40e_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_i40e_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_avx2.c - CFLAGS_i40e_rxtx.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_I40E_PMD)-include := rte_pmd_i40e.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/iavf/Makefile b/drivers/net/iavf/Makefile deleted file mode 100644 index 792cbb7f79..0000000000 --- a/drivers/net/iavf/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_iavf.a - -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf -CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_iavf - -EXPORT_MAP := rte_pmd_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_hash.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IAVF_PMD), y) - ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 - else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_iavf_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_iavf_rxtx_vec_avx2.o += -mavx2 - endif - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile deleted file mode 100644 index 34cd4024b3..0000000000 --- a/drivers/net/ice/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ice.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_hash -LDLIBS += -lrte_net -lrte_common_iavf -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ice_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -endif -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_controlq.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_common.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flex_pipe.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl_ctrl.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_hash.c -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_ice_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_ice_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_avx2.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_generic_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_parent.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ICE_PMD)-include := rte_pmd_ice.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/igc/Makefile b/drivers/net/igc/Makefile deleted file mode 100644 index d6d7959d2d..0000000000 --- a/drivers/net/igc/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_igc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_pmd_igc_version.map - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_base.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_i225.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_txrx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile deleted file mode 100644 index 7442e2c5cb..0000000000 --- a/drivers/net/ionic/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ionic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ionic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_mac_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_lif.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_main.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ipn3ke/Makefile b/drivers/net/ipn3ke/Makefile deleted file mode 100644 index 40696dbde8..0000000000 --- a/drivers/net/ipn3ke/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ipn3ke.a - -# -# Add the experimenatal APIs called from this PMD -# rte_eth_switch_domain_alloc() -# rte_eth_dev_create() -# rte_eth_dev_destroy() -# rte_eth_switch_domain_free() -# -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ipn3ke_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_representor.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile deleted file mode 100644 index aebf3b286c..0000000000 --- a/drivers/net/ixgbe/Makefile +++ /dev/null @@ -1,110 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ixgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ixgbe_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -CFLAGS_ixgbe_rxtx.o += -diag-disable 3656 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_ixgbe_common.o += -Wno-unused-but-set-variable -CFLAGS_ixgbe_x550.o += -Wno-unused-but-set-variable -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ixgbe_x550.o += -Wno-maybe-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 50 && echo 1), 1) -CFLAGS_ixgbe_common.o += -Wno-logical-not-parentheses -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x540.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x550.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_hv_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_flow.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_BYPASS),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_bypass.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599_bypass.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ipsec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += rte_pmd_ixgbe.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf_representor.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)-include := rte_pmd_ixgbe.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile deleted file mode 100644 index 0694ffd021..0000000000 --- a/drivers/net/kni/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_kni.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_kni_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += rte_eth_kni.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile deleted file mode 100644 index d7fda7f527..0000000000 --- a/drivers/net/liquidio/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_lio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_liquidio_version.map - -VPATH += $(RTE_SDK)/drivers/net/liquidio/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_23xx_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_mbox.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/memif/Makefile b/drivers/net/memif/Makefile deleted file mode 100644 index 3bf4ddce4c..0000000000 --- a/drivers/net/memif/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 Cisco Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_memif.a - -EXPORT_MAP := rte_pmd_memif_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs -lrte_net -LDLIBS += -lrte_hash -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += rte_eth_memif.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif_socket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile deleted file mode 100644 index 02e9b2ec07..0000000000 --- a/drivers/net/mlx4/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012 6WIND S.A. -# Copyright 2012 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx4.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx4_glue.so -LIB_GLUE_VERSION = 18.02.0 - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_flow.c -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_glue.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_utils.c - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib += $(LIB_GLUE) -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX4_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX4_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_mlx4_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx4 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx4_version.map -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX4_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX4_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx4_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS += -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx4_autoconf.h.new: FORCE - -mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q : > '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_BUF_ALLOCATORS \ - infiniband/mlx4dv.h \ - enum MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_UAR_MMAP_OFFSET \ - infiniband/mlx4dv.h \ - enum MLX4DV_QP_MASK_UAR_MMAP_OFFSET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_WQE_LSO_SEG \ - infiniband/mlx4dv.h \ - type 'struct mlx4_wqe_lso_seg' \ - $(AUTOCONF_OUTPUT) - -# Create mlx4_autoconf.h or update it in case it differs from the new one. - -mlx4_autoconf.h: mlx4_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD):.c=.o): mlx4_autoconf.h - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): mlx4_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx4 - -mlx4_glue.o: mlx4_autoconf.h - -endif - -clean_mlx4: FORCE - $Q rm -f -- mlx4_autoconf.h mlx4_autoconf.h.new - $Q rm -f -- mlx4_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx4 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile deleted file mode 100644 index 568c772415..0000000000 --- a/drivers/net/mlx5/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. -# Copyright 2015 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txpp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) \ - $(CONFIG_RTE_ARCH_PPC_64) \ - $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx_vec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxmode.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_vlan.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - diff --git a/drivers/net/mvneta/Makefile b/drivers/net/mvneta/Makefile deleted file mode 100644 index 41e50479ff..0000000000 --- a/drivers/net/mvneta/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# Copyright(c) 2018 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvneta.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvneta_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_SIZE=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta_ethdev.c mvneta_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mvpp2/Makefile b/drivers/net/mvpp2/Makefile deleted file mode 100644 index 8a3ec93a60..0000000000 --- a/drivers/net/mvpp2/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvpp2.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvpp2_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_qos.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_tm.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/netvsc/Makefile b/drivers/net/netvsc/Makefile deleted file mode 100644 index da8991584a..0000000000 --- a/drivers/net/netvsc/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_netvsc.a - -CFLAGS += -O3 $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_netvsc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rndis.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_nvs.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_vf.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vmbus - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfb/Makefile b/drivers/net/nfb/Makefile deleted file mode 100644 index e92d29dcd3..0000000000 --- a/drivers/net/nfb/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Cesnet -# Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfb.a - -INCLUDES :=-I$(SRCDIR) - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags netcope-common) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) - -EXPORT_MAP := rte_pmd_nfb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rxmode.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfp/Makefile b/drivers/net/nfp/Makefile deleted file mode 100644 index 289b3a60e3..0000000000 --- a/drivers/net/nfp/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_nfp_version.map - -VPATH += $(SRCDIR)/nfpcore - -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cppcore.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cpp_pcie_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mutex.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_resource.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mip.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nffw.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_hwinfo.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_rtsym.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_cmds.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_eth.c - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_net.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile deleted file mode 100644 index f51150c131..0000000000 --- a/drivers/net/null/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 IGEL Co.,Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_null.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_null_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx/Makefile b/drivers/net/octeontx/Makefile deleted file mode 100644 index c4db878009..0000000000 --- a/drivers/net/octeontx/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ - -EXPORT_MAP := rte_pmd_octeontx_version.map - -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkovf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkivf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_bgx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev_ops.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_octeontx_rxtx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -else -CFLAGS_octeontx_rxtx.o += -O3 -ffast-math -endif - -else -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_common_octeontx -LDLIBS += -lrte_mempool_octeontx -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile deleted file mode 100644 index 0de43e36af..0000000000 --- a/drivers/net/octeontx2/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -flax-vector-conversions -endif - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \ - otx2_rx.c \ - otx2_tx.c \ - otx2_tm.c \ - otx2_rss.c \ - otx2_mac.c \ - otx2_ptp.c \ - otx2_flow.c \ - otx2_link.c \ - otx2_vlan.c \ - otx2_stats.c \ - otx2_mcast.c \ - otx2_lookup.c \ - otx2_ethdev.c \ - otx2_flow_ctrl.c \ - otx2_flow_parse.c \ - otx2_flow_utils.c \ - otx2_ethdev_irq.c \ - otx2_ethdev_ops.c \ - otx2_ethdev_sec.c \ - otx2_ethdev_debug.c \ - otx2_ethdev_devargs.c - -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal -lrte_net -LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf -lrte_mempool -lm -LDLIBS += -lrte_cryptodev -lrte_eventdev -lrte_security - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile deleted file mode 100644 index f243d1a0fa..0000000000 --- a/drivers/net/pcap/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pcap.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpcap -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_pcap_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += rte_eth_pcap.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pfe/Makefile b/drivers/net/pfe/Makefile deleted file mode 100644 index 75d30b01aa..0000000000 --- a/drivers/net/pfe/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pfe.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK)/drivers/net/pfe/base/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -EXPORT_MAP := rte_pmd_pfe_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif_lib.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif.c - -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile deleted file mode 100644 index 0e8a67b0da..0000000000 --- a/drivers/net/qede/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_qede.a - -CFLAGS += -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_qede_version.map - -# -# OS -# -OS_TYPE := $(shell uname -s) - -# -# CFLAGS -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes -CFLAGS_BASE_DRIVER += -Wno-cast-qual -CFLAGS_BASE_DRIVER += -Wno-unused-function -CFLAGS_BASE_DRIVER += -Wno-unused-variable -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes - -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-value -ifeq ($(OS_TYPE),Linux) -ifeq ($(shell clang -Wno-shift-negative-value -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -endif -endif -endif - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -CFLAGS += -Wno-format-nonliteral -endif -CFLAGS_BASE_DRIVER += -Wno-missing-declarations -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-maybe-uninitialized -endif -CFLAGS_BASE_DRIVER += -Wno-strict-prototypes -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-visibility -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-invalid-source-encoding -CFLAGS_BASE_DRIVER += -Wno-sometimes-uninitialized -ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion -endif -else #ICC -CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant -endif - -# -# Add extra flags for base ecore driver files -# to disable warnings in them -# -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_cxt.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_l2.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sp_commands.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_fw_funcs.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_spq.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_mcp.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_int.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dcbx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += bcm_osal.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sriov.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile deleted file mode 100644 index d6a3dec350..0000000000 --- a/drivers/net/ring/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_ring_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += rte_eth_ring.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_ring.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile deleted file mode 100644 index 20bf343814..0000000000 --- a/drivers/net/sfc/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright(c) 2019-2020 Xilinx, Inc. -# Copyright(c) 2016-2019 Solarflare Communications Inc. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_sfc_efx.a - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by rte_eth_link to uint64_t casts -CFLAGS += -Wno-strict-aliasing - -# Enable extra warnings -CFLAGS += -Wextra - -# More warnings not enabled by above aggregators -CFLAGS += -Wdisabled-optimization - -# Extra CFLAGS for base driver files -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -# Compiler and version dependent flags -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wnested-externs -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wbad-function-cast -CFLAGS_BASE_DRIVER += -Wno-empty-body -else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -# Suppress ICC false positive warning on 'bulk' may be used before its -# value is set -CFLAGS_sfc_ef10_tx.o += -diag-disable 3656 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_pci - -# -# List of base driver object files for which -# special CFLAGS above should be applied -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), \ - $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -EXPORT_MAP := rte_pmd_sfc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_kvargs.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_dp.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_essb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_tx.c - -VPATH += $(SRCDIR)/base - -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_bootcfg.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_crc32.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_lic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tunnel.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += mcdi_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_image.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += hunt_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford2_nic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile deleted file mode 100644 index dabbe13a5f..0000000000 --- a/drivers/net/softnic/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_softnic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_pipeline -lrte_port -lrte_table -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_softnic_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_swq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_link.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_softnic.h - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info Softnic PMD can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -include $(RTE_SDK)/mk/rte.lib.mk - -endif diff --git a/drivers/net/szedata2/Makefile b/drivers/net/szedata2/Makefile deleted file mode 100644 index 675d0938a2..0000000000 --- a/drivers/net/szedata2/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 CESNET - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_szedata2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lsze2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_szedata2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += rte_eth_szedata2.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile deleted file mode 100644 index cbf87af401..0000000000 --- a/drivers/net/tap/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_tap.a - -EXPORT_MAP := rte_pmd_tap_version.map - -# -# TAP_MAX_QUEUES must be a power of 2 -# -ifeq ($(TAP_MAX_QUEUES),) - TAP_MAX_QUEUES = 16 -endif -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += -I. -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_vdev -lrte_gso - -CFLAGS += -DTAP_MAX_QUEUES=$(TAP_MAX_QUEUES) - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += rte_eth_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_netlink.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_tcmsgs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_bpf_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_intr.c - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up tap_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -tap_autoconf.h.new: FORCE - -tap_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_TC_FLOWER \ - linux/pkt_cls.h \ - enum TCA_FLOWER_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_VLAN_ID \ - linux/pkt_cls.h \ - enum TCA_FLOWER_KEY_VLAN_PRIO \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF \ - linux/pkt_cls.h \ - enum TCA_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF_FD \ - linux/pkt_cls.h \ - enum TCA_BPF_FD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF_FD \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_FD \ - $(AUTOCONF_OUTPUT) - -# Create tap_autoconf.h or update it in case it differs from the new one. - -tap_autoconf.h: tap_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP):.c=.o): tap_autoconf.h - -clean_tap: FORCE - $Q rm -f -- tap_autoconf.h tap_autoconf.h.new - -clean: clean_tap diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile deleted file mode 100644 index 149638a499..0000000000 --- a/drivers/net/thunderx/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_thunderx_nicvf.a - -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_thunderx_version.map - -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_bsvf.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_svf.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_nicvf_rxtx.o += -fno-prefetch-loop-arrays -endif -CFLAGS_nicvf_rxtx.o += -Ofast - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vdev_netvsc/Makefile b/drivers/net/vdev_netvsc/Makefile deleted file mode 100644 index 01d26fb798..0000000000 --- a/drivers/net/vdev_netvsc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Properties of the generated library. -LIB = librte_pmd_vdev_netvsc.a -EXPORT_MAP := rte_pmd_vdev_netvsc_version.map - -# Additional compilation flags. -CFLAGS += -O3 -CFLAGS += -g -CFLAGS += -Wall -Wextra -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += $(WERROR_FLAGS) - -# Dependencies. -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_net - -# Source files. -SRCS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vhost/Makefile b/drivers/net/vhost/Makefile deleted file mode 100644 index 0461e29f2c..0000000000 --- a/drivers/net/vhost/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vhost.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_vhost -LDLIBS += -lrte_bus_vdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_vhost_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += rte_eth_vhost.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_vhost.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile deleted file mode 100644 index 102b1deab8..0000000000 --- a/drivers/net/virtio/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -LDLIBS += -lrte_bus_vdev -endif - -EXPORT_MAP := rte_pmd_virtio_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c - -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_sse.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_altivec.c -else ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_neon.c -endif - -ifneq ($(FORCE_DISABLE_AVX512), y) - CC_AVX512_SUPPORT=\ - $(shell $(CC) -march=native -dM -E - </dev/null 2>&1 | \ - sed '/./{H;$$!d} ; x ; /AVX512F/!d; /AVX512BW/!d; /AVX512VL/!d' | \ - grep -q AVX512 && echo 1) -endif - -ifeq ($(CC_AVX512_SUPPORT), 1) -CFLAGS += -DCC_AVX512_SUPPORT -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_packed_avx.c - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVIRTIO_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVIRTIO_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVIRTIO_ICC_UNROLL_PRAGMA -endif -endif - -CFLAGS_virtio_rxtx_packed_avx.o += -mavx512f -mavx512bw -mavx512vl -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -CFLAGS_virtio_rxtx_packed_avx.o += -Wno-zero-length-bounds -endif -endif - -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_user.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/virtio_user_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user_ethdev.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile deleted file mode 100644 index 4390fedee0..0000000000 --- a/drivers/net/vmxnet3/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vmxnet3_uio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_vmxnet3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile deleted file mode 100644 index 80b043eb14..0000000000 --- a/drivers/raw/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# DIRS-$(<configuration>) += <directory> -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += octeontx2_ep - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile deleted file mode 100644 index 227ec4896e..0000000000 --- a/drivers/raw/dpaa2_cmdif/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_cmdif.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV)-include += rte_pmd_dpaa2_cmdif.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile deleted file mode 100644 index 7b2abdddb4..0000000000 --- a/drivers/raw/dpaa2_qdma/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_qdma.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -LDLIBS += -lrte_mempool -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_ring -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV)-include += rte_pmd_dpaa2_qdma.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile deleted file mode 100644 index 371e127f19..0000000000 --- a/drivers/raw/ifpga/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev -CFLAGS += -I$(RTE_SDK)/drivers/net/i40e -CFLAGS += -I$(RTE_SDK)/drivers/net/ipn3ke -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lpthread -LDLIBS += -lfdt -LDLIBS += -lrte_pmd_i40e -LDLIBS += -lrte_pmd_ipn3ke - -EXPORT_MAP := rte_rawdev_ifpga_version.map - -VPATH += $(SRCDIR)/base - -include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/base/Makefile b/drivers/raw/ifpga/base/Makefile deleted file mode 100644 index c5bbcbd5f8..0000000000 --- a/drivers/raw/ifpga/base/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -#SPDX-License-Identifier: BSD-3-Clause -#Copyright(c) 2010-2018 Intel Corporation - -ifneq ($(CONFIG_RTE_LIBRTE_EAL),) -OSDEP := osdep_rte -else -OSDEP := osdep_raw -endif - -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev/base/$(OSDEP) - -SRCS-y += ifpga_api.c -SRCS-y += ifpga_enumerate.c -SRCS-y += ifpga_feature_dev.c -SRCS-y += ifpga_fme.c -SRCS-y += ifpga_fme_iperf.c -SRCS-y += ifpga_fme_dperf.c -SRCS-y += ifpga_fme_error.c -SRCS-y += ifpga_port.c -SRCS-y += ifpga_port_error.c -SRCS-y += opae_hw_api.c -SRCS-y += opae_ifpga_hw_api.c -SRCS-y += opae_debug.c -SRCS-y += ifpga_fme_pr.c -SRCS-y += opae_spi.c -SRCS-y += opae_spi_transaction.c -SRCS-y += opae_intel_max10.c -SRCS-y += opae_i2c.c -SRCS-y += opae_at24_eeprom.c -SRCS-y += opae_eth_group.c - -SRCS-y += $(wildcard $(SRCDIR)/base/$(OSDEP)/*.c) diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile deleted file mode 100644 index 1609fe5e6c..0000000000 --- a/drivers/raw/ioat/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_ioat.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_rawdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_rawdev_ioat_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev_test.c - -# export include files -SYMLINK-y-include += rte_ioat_rawdev.h -SYMLINK-y-include += rte_ioat_spec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ntb/Makefile b/drivers/raw/ntb/Makefile deleted file mode 100644 index 8f0bff9b02..0000000000 --- a/drivers/raw/ntb/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ntb.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_rawdev - -EXPORT_MAP := rte_rawdev_ntb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb_hw_intel.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV)-include := rte_pmd_ntb.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_dma/Makefile b/drivers/raw/octeontx2_dma/Makefile deleted file mode 100644 index c64ca3497a..0000000000 --- a/drivers/raw/octeontx2_dma/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_octeontx2_dma.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_dma/ -LDLIBS += -lrte_eal -lrte_rawdev -lrte_bus_pci -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_mempool - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_dma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_ep/Makefile b/drivers/raw/octeontx2_ep/Makefile deleted file mode 100644 index 1a54bf56f0..0000000000 --- a/drivers/raw/octeontx2_ep/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_rawdev_octeontx2_ep.a - -# Build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_ep/ - -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mempool -LDLIBS += -lrte_common_octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_ep_version.map - -# -# All source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_enqdeq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_test.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_vf.c - - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile deleted file mode 100644 index 2ac66fbd45..0000000000 --- a/drivers/raw/skeleton/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_skeleton.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -EXPORT_MAP := rte_rawdev_skeleton_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/regex/Makefile b/drivers/regex/Makefile deleted file mode 100644 index 906b20546f..0000000000 --- a/drivers/regex/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/regex/mlx5/Makefile b/drivers/regex/mlx5/Makefile deleted file mode 100644 index 11e3325feb..0000000000 --- a/drivers/regex/mlx5/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_regex.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_rxp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_devx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_control.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_fastpath.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_regexdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_regex_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile deleted file mode 100644 index 6e8835948e..0000000000 --- a/drivers/vdpa/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc -endif - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/vdpa/ifc/Makefile b/drivers/vdpa/ifc/Makefile deleted file mode 100644 index b468bfdbdd..0000000000 --- a/drivers/vdpa/ifc/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ifc.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci -LDLIBS += -lrte_kvargs - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ifc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile deleted file mode 100644 index d46699fbc9..0000000000 --- a/drivers/vdpa/mlx5/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_vdpa.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_mem.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_event.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_virtq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_steer.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_lm.c - - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5_vdpa -CFLAGS += -I$(RTE_SDK)/lib/librte_sched -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lrte_eal -lrte_vhost -lrte_kvargs -lrte_pci -lrte_sched -LDLIBS += -pthread - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_vdpa_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/examples/Makefile b/examples/Makefile deleted file mode 100644 index b7e99a2f78..0000000000 --- a/examples/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 6WIND S.A. - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond -DIRS-y += cmdline -ifeq ($(CONFIG_RTE_LIBRTE_POWER),y) -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor -endif -DIRS-y += ethtool -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify -DIRS-y += flow_filtering -DIRS-y += helloworld -ifeq ($(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += ip_pipeline -ifeq ($(CONFIG_RTE_LIBRTE_LPM),y) -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_reassembly -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_fragmentation -endif -ifeq ($(CONFIG_RTE_LIBRTE_ACL)$(CONFIG_RTE_LIBRTE_HASH)$(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_SECURITY),yyyy) -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += ipsec-secgw -endif -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += ipv4_multicast -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni -DIRS-y += l2fwd -DIRS-y += l2fwd-event -ifneq ($(PQOS_INSTALL_PATH),) -DIRS-y += l2fwd-cat -endif -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += l2fwd-crypto -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += l2fwd-jobstats -DIRS-y += l2fwd-keepalive -DIRS-y += l2fwd-keepalive/ka-agent -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += l3fwd -endif -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl -ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy) -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power -endif -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH),y) -DIRS-y += l3fwd-graph -endif -DIRS-y += link_status_interrupt -DIRS-y += multi_process -DIRS-y += ntb -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -DIRS-y += performance-thread -endif -DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient -DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched -DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks -DIRS-y += service_cores -DIRS-y += skeleton -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination -endif -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vdpa vhost_blk -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto -endif -DIRS-y += vmdq -DIRS-y += vmdq_dcb -ifeq ($(CONFIG_RTE_LIBRTE_POWER), y) -ifeq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -DIRS-y += vm_power_manager -else -$(info vm_power_manager requires libvirt >= 0.9.3) -endif -endif - -DIRS-y += eventdev_pipeline - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/kernel/Makefile b/kernel/Makefile deleted file mode 100644 index 5d51fd94bb..0000000000 --- a/kernel/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/Makefile b/kernel/freebsd/Makefile deleted file mode 100644 index 522d3f68ff..0000000000 --- a/kernel/freebsd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += contigmem -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += nic_uio - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/contigmem/Makefile b/kernel/freebsd/contigmem/Makefile deleted file mode 100644 index 428a7edee5..0000000000 --- a/kernel/freebsd/contigmem/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = contigmem - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := contigmem.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/freebsd/nic_uio/Makefile b/kernel/freebsd/nic_uio/Makefile deleted file mode 100644 index 376ef3a3ab..0000000000 --- a/kernel/freebsd/nic_uio/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = nic_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := nic_uio.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/linux/Makefile b/kernel/linux/Makefile deleted file mode 100644 index c2c45a3e67..0000000000 --- a/kernel/linux/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EAL_IGB_UIO) += igb_uio -DIRS-$(CONFIG_RTE_KNI_KMOD) += kni - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/linux/igb_uio/Makefile b/kernel/linux/igb_uio/Makefile deleted file mode 100644 index f83bcc7c69..0000000000 --- a/kernel/linux/igb_uio/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = igb_uio -MODULE_PATH = drivers/net/igb_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=100 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := igb_uio.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile deleted file mode 100644 index 595bac2612..0000000000 --- a/kernel/linux/kni/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = rte_kni - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -MODULE_CFLAGS += -Wall -Werror - --include /etc/lsb-release - -ifeq ($(DISTRIB_ID),Ubuntu) -MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE)) -UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \ - | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1) -MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))" -endif - -# -# all source are stored in SRCS-y -# -SRCS-y := kni_misc.c -SRCS-y += kni_net.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/lib/Makefile b/lib/Makefile deleted file mode 100644 index 8f5b68a2d4..0000000000 --- a/lib/Makefile +++ /dev/null @@ -1,138 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DIRS-y += librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal -DEPDIRS-librte_eal := librte_kvargs librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci -DEPDIRS-librte_pci := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring -DEPDIRS-librte_ring := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_STACK) += librte_stack -DEPDIRS-librte_stack := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += librte_mempool -DEPDIRS-librte_mempool := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf -DEPDIRS-librte_mbuf := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer -DEPDIRS-librte_timer := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile -DEPDIRS-librte_cfgfile := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline -DEPDIRS-librte_cmdline := librte_eal librte_net -DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev -DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring -DEPDIRS-librte_ethdev += librte_mbuf -DEPDIRS-librte_ethdev += librte_kvargs -DEPDIRS-librte_ethdev += librte_meter -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev -DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev -DEPDIRS-librte_cryptodev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_cryptodev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_SECURITY) += librte_security -DEPDIRS-librte_security := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_security += librte_ethdev -DEPDIRS-librte_security += librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += librte_compressdev -DEPDIRS-librte_compressdev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_compressdev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += librte_regexdev -DEPDIRS-librte_regexdev := librte_eal librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += librte_eventdev -DEPDIRS-librte_eventdev := librte_eal librte_ring librte_ethdev librte_hash \ - librte_mempool librte_timer librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += librte_rawdev -DEPDIRS-librte_rawdev := librte_eal librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost -DEPDIRS-librte_vhost := librte_eal librte_mempool librte_mbuf librte_ethdev \ - librte_net librte_hash librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash -DEPDIRS-librte_hash := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += librte_efd -DEPDIRS-librte_efd := librte_eal librte_ring librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RIB) += librte_rib -DEPDIRS-librte_rib := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += librte_fib -DEPDIRS-librte_fib := librte_eal librte_rib -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm -DEPDIRS-librte_lpm := librte_eal librte_hash librte_rcu -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl -DEPDIRS-librte_acl := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMBER) += librte_member -DEPDIRS-librte_member := librte_eal librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_NET) += librte_net -DEPDIRS-librte_net := librte_mbuf librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += librte_ip_frag -DEPDIRS-librte_ip_frag := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_ip_frag += librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_GRO) += librte_gro -DEPDIRS-librte_gro := librte_eal librte_mbuf librte_ethdev librte_net -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += librte_jobstats -DEPDIRS-librte_jobstats := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_METRICS) += librte_metrics -DEPDIRS-librte_metrics := librte_eal librte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -DEPDIRS-librte_metrics += librte_telemetry -endif -DIRS-$(CONFIG_RTE_LIBRTE_BITRATE) += librte_bitratestats -DEPDIRS-librte_bitratestats := librte_eal librte_metrics librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += librte_latencystats -DEPDIRS-librte_latencystats := librte_eal librte_metrics librte_ethdev librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += librte_power -DEPDIRS-librte_power := librte_eal librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_METER) += librte_meter -DEPDIRS-librte_meter := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += librte_flow_classify -DEPDIRS-librte_flow_classify := librte_net librte_table librte_acl -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched -DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net -DEPDIRS-librte_sched += librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor -DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port -DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_port += librte_ip_frag librte_sched librte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DEPDIRS-librte_port += librte_kni -endif -DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table -DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_table += librte_port librte_lpm librte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -DEPDIRS-librte_table += librte_acl -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline -DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_pipeline += librte_table librte_port -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder -DEPDIRS-librte_reorder := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += librte_pdump -DEPDIRS-librte_pdump := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_GSO) += librte_gso -DEPDIRS-librte_gso := librte_eal librte_mbuf librte_ethdev librte_net -DEPDIRS-librte_gso += librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_BPF) += librte_bpf -DEPDIRS-librte_bpf := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += librte_ipsec -DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security \ - librte_net librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RCU) += librte_rcu -DEPDIRS-librte_rcu := librte_eal librte_ring - -DIRS-$(CONFIG_RTE_LIBRTE_GRAPH) += librte_graph -DEPDIRS-librte_graph := librte_eal - -DIRS-$(CONFIG_RTE_LIBRTE_NODE) += librte_node -DEPDIRS-librte_node := librte_graph librte_lpm librte_ethdev librte_mbuf - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni -endif -DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_kni += librte_pci - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile deleted file mode 100644 index f4332b0448..0000000000 --- a/lib/librte_acl/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_acl.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_acl_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += tb_mem.c - -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += rte_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_bld.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_gen.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c -CFLAGS_acl_run_neon.o += -flax-vector-conversions -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_acl_run_neon.o += -Wno-maybe-uninitialized -endif -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c -endif - -# -# If the compiler supports AVX2 instructions, -# then add support for AVX2 classify method. -# - -#check if flag for AVX2 is already on, if not set it up manually -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_acl_run_avx2.o += -march=core-avx2 - else - CFLAGS_acl_run_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_avx2.c - CFLAGS_rte_acl.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include := rte_acl_osdep.h -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include += rte_acl.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bbdev/Makefile b/lib/librte_bbdev/Makefile deleted file mode 100644 index 9d7576b358..0000000000 --- a/lib/librte_bbdev/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bbdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -# library source files -SRCS-y += rte_bbdev.c - -# export include files -SYMLINK-y-include += rte_bbdev_op.h -SYMLINK-y-include += rte_bbdev.h -SYMLINK-y-include += rte_bbdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_bbdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bitratestats/Makefile b/lib/librte_bitratestats/Makefile deleted file mode 100644 index 4862c44b83..0000000000 --- a/lib/librte_bitratestats/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bitratestats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev - -EXPORT_MAP := rte_bitratestats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) := rte_bitrate.c - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_BITRATE)-include += rte_bitrate.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bpf/Makefile b/lib/librte_bpf/Makefile deleted file mode 100644 index 3be6750432..0000000000 --- a/lib/librte_bpf/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bpf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_net -lrte_eal -LDLIBS += -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -LDLIBS += -lelf -endif - -EXPORT_MAP := rte_bpf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_exec.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_pkt.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_validate.c -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load_elf.c -endif -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_arm64.c -endif - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += bpf_def.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf_ethdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile deleted file mode 100644 index 7c10a4e56c..0000000000 --- a/lib/librte_cfgfile/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_cfgfile.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(SRCDIR)/../librte_eal/include -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_cfgfile_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CFGFILE) += rte_cfgfile.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_CFGFILE)-include += rte_cfgfile.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile deleted file mode 100644 index 619d9a2426..0000000000 --- a/lib/librte_cmdline/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cmdline.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -EXPORT_MAP := rte_cmdline_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_rdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c - -LDLIBS += -lrte_net -lrte_eal - -# install includes -INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h -INCS += cmdline_parse_etheraddr.h cmdline_parse_string.h cmdline_rdline.h -INCS += cmdline_vt100.h cmdline_socket.h cmdline_cirbuf.h cmdline_parse_portlist.h -SYMLINK-$(CONFIG_RTE_LIBRTE_CMDLINE)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_compressdev/Makefile b/lib/librte_compressdev/Makefile deleted file mode 100644 index 53679d69b8..0000000000 --- a/lib/librte_compressdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_compressdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_kvargs - -# library source files -SRCS-y += rte_compressdev.c rte_compressdev_pmd.c rte_comp.c - -# export include files -SYMLINK-y-include += rte_comp.h -SYMLINK-y-include += rte_compressdev.h -# export include files (for PMDs) -SYMLINK-y-include += rte_compressdev_pmd.h -SYMLINK-y-include += rte_compressdev_internal.h - -# versioning export map -EXPORT_MAP := rte_compressdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile deleted file mode 100644 index 73e77a27c6..0000000000 --- a/lib/librte_cryptodev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cryptodev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_kvargs - -# library source files -SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c - -# export include files -SYMLINK-y-include += rte_crypto.h -SYMLINK-y-include += rte_crypto_asym.h -SYMLINK-y-include += rte_crypto_sym.h -SYMLINK-y-include += rte_cryptodev.h -SYMLINK-y-include += rte_cryptodev_pmd.h -SYMLINK-y-include += rte_cryptodev_trace.h -SYMLINK-y-include += rte_cryptodev_trace_fp.h - -# versioning export map -EXPORT_MAP := rte_cryptodev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile deleted file mode 100644 index fc32fb3a8f..0000000000 --- a/lib/librte_distributor/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_distributor.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_distributor_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c -else -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_generic.c -endif - - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR)-include := rte_distributor.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile deleted file mode 100644 index 2fda40d230..0000000000 --- a/lib/librte_eal/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += include -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DEPDIRS-linux := include -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd -DEPDIRS-freebsd := include - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile deleted file mode 100644 index 9a89556742..0000000000 --- a/lib/librte_eal/freebsd/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lexecinfo -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry - -EXPORT_MAP := ../rte_eal_version.map - -# specific to freebsd exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -CFLAGS_eal_hpet.o += -Wno-return-type -endif - -INC := rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/include/Makefile b/lib/librte_eal/include/Makefile deleted file mode 100644 index eb99190d10..0000000000 --- a/lib/librte_eal/include/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := \ - $(sort $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/*.h))) - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include/generic := \ - $(sort $(addprefix generic/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/generic/*.h)))) - -ARCH_DIR ?= $(RTE_ARCH) -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \ - $(sort $(addprefix ../$(ARCH_DIR)/include/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include/*.h)))) - -include $(RTE_SDK)/mk/rte.install.mk diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile deleted file mode 100644 index 9939b3d147..0000000000 --- a/lib/librte_eal/linux/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -ldl -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrt -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry -ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) -LDLIBS += -lnuma -endif - -EXPORT_MAP := ../rte_eal_version.map - -# specific to linux exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio_mp_sync.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dynmem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -endif - -INC := rte_kni_common.h -INC += rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_efd/Makefile b/lib/librte_efd/Makefile deleted file mode 100644 index 2dc97132e0..0000000000 --- a/lib/librte_efd/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_efd.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring -lrte_hash - -EXPORT_MAP := rte_efd_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_EFD) := rte_efd.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_EFD)-include := rte_efd.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile deleted file mode 100644 index 47747150b2..0000000000 --- a/lib/librte_ethdev/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_ethdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_kvargs -lrte_meter -lrte_telemetry - -EXPORT_MAP := rte_ethdev_version.map - -SRCS-y += ethdev_private.c -SRCS-y += rte_ethdev.c -SRCS-y += rte_class_eth.c -SRCS-y += rte_flow.c -SRCS-y += rte_tm.c -SRCS-y += rte_mtr.c -SRCS-y += ethdev_profile.c -SRCS-y += ethdev_trace_points.c - -# -# Export include files -# -SYMLINK-y-include += rte_ethdev.h -SYMLINK-y-include += rte_ethdev_driver.h -SYMLINK-y-include += rte_ethdev_core.h -SYMLINK-y-include += rte_ethdev_pci.h -SYMLINK-y-include += rte_ethdev_trace.h -SYMLINK-y-include += rte_ethdev_trace_fp.h -SYMLINK-y-include += rte_ethdev_vdev.h -SYMLINK-y-include += rte_eth_ctrl.h -SYMLINK-y-include += rte_dev_info.h -SYMLINK-y-include += rte_flow.h -SYMLINK-y-include += rte_flow_driver.h -SYMLINK-y-include += rte_tm.h -SYMLINK-y-include += rte_tm_driver.h -SYMLINK-y-include += rte_mtr.h -SYMLINK-y-include += rte_mtr_driver.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile deleted file mode 100644 index 0715256bb4..0000000000 --- a/lib/librte_eventdev/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_eventdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif -LDLIBS += -lrte_eal -lrte_ring -lrte_ethdev -lrte_hash -lrte_mempool -lrte_timer -LDLIBS += -lrte_mbuf -lrte_cryptodev -lpthread - -# library source files -SRCS-y += rte_eventdev.c -SRCS-y += rte_event_ring.c -SRCS-y += eventdev_trace_points.c -SRCS-y += rte_event_eth_rx_adapter.c -SRCS-y += rte_event_timer_adapter.c -SRCS-y += rte_event_crypto_adapter.c -SRCS-y += rte_event_eth_tx_adapter.c - -# export include files -SYMLINK-y-include += rte_eventdev.h -SYMLINK-y-include += rte_eventdev_pmd.h -SYMLINK-y-include += rte_eventdev_pmd_pci.h -SYMLINK-y-include += rte_eventdev_pmd_vdev.h -SYMLINK-y-include += rte_eventdev_trace.h -SYMLINK-y-include += rte_eventdev_trace_fp.h -SYMLINK-y-include += rte_event_ring.h -SYMLINK-y-include += rte_event_eth_rx_adapter.h -SYMLINK-y-include += rte_event_timer_adapter.h -SYMLINK-y-include += rte_event_timer_adapter_pmd.h -SYMLINK-y-include += rte_event_crypto_adapter.h -SYMLINK-y-include += rte_event_eth_tx_adapter.h - -# versioning export map -EXPORT_MAP := rte_eventdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_fib/Makefile b/lib/librte_fib/Makefile deleted file mode 100644 index 1dd2a495b1..0000000000 --- a/lib/librte_fib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_fib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_rib - -EXPORT_MAP := rte_fib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FIB) := rte_fib.c rte_fib6.c dir24_8.c trie.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FIB)-include := rte_fib.h rte_fib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_flow_classify/Makefile b/lib/librte_flow_classify/Makefile deleted file mode 100644 index ca3cae82dd..0000000000 --- a/lib/librte_flow_classify/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_flow_classify.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) - -EXPORT_MAP := rte_flow_classify_version.map - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_net -lrte_table -lrte_acl - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify_parse.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY)-include := rte_flow_classify.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_graph/Makefile b/lib/librte_graph/Makefile deleted file mode 100644 index b66279c675..0000000000 --- a/lib/librte_graph/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_graph.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_graph_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += node.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_populate.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph.h -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph_worker.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gro/Makefile b/lib/librte_gro/Makefile deleted file mode 100644 index e848687acd..0000000000 --- a/lib/librte_gro/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gro.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net - -EXPORT_MAP := rte_gro_version.map - -# source files -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += rte_gro.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_vxlan_tcp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GRO)-include += rte_gro.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile deleted file mode 100644 index a34846e920..0000000000 --- a/lib/librte_gso/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gso.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_gso_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile deleted file mode 100644 index ec9f864992..0000000000 --- a/lib/librte_hash/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_hash.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_hash_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_HASH) := rte_cuckoo_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h -endif -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ip_frag/Makefile b/lib/librte_ip_frag/Makefile deleted file mode 100644 index 6b80d9f1f2..0000000000 --- a/lib/librte_ip_frag/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ip_frag.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_hash - -EXPORT_MAP := rte_ip_frag_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ip_frag_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += ip_frag_internal.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IP_FRAG)-include += rte_ip_frag.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ipsec/Makefile b/lib/librte_ipsec/Makefile deleted file mode 100644 index e4c69646b0..0000000000 --- a/lib/librte_ipsec/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ipsec.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_cryptodev -lrte_security -lrte_hash - -EXPORT_MAP := rte_ipsec_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_inb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_outb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += sa.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ses.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ipsec_sad.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_group.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sa.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_jobstats/Makefile b/lib/librte_jobstats/Makefile deleted file mode 100644 index b30d046829..0000000000 --- a/lib/librte_jobstats/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_jobstats.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_jobstats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_JOBSTATS) := rte_jobstats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_JOBSTATS)-include := rte_jobstats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile deleted file mode 100644 index 9d440aa135..0000000000 --- a/lib/librte_kni/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kni.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_kni_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KNI) := rte_kni.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_KNI)-include := rte_kni.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile deleted file mode 100644 index 24b1c3c5b9..0000000000 --- a/lib/librte_kvargs/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kvargs.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_kvargs_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c - -# install includes -INCS := rte_kvargs.h -SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_latencystats/Makefile b/lib/librte_latencystats/Makefile deleted file mode 100644 index b19e0b1788..0000000000 --- a/lib/librte_latencystats/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_latencystats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lm -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev -lrte_mbuf - -EXPORT_MAP := rte_latencystats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) := rte_latencystats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LATENCY_STATS)-include := rte_latencystats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile deleted file mode 100644 index 6f06c5c034..0000000000 --- a/lib/librte_lpm/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_lpm.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_hash -lrte_rcu - -EXPORT_MAP := rte_lpm_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LPM) := rte_lpm.c rte_lpm6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include := rte_lpm.h rte_lpm6.h - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile deleted file mode 100644 index 41ea5496e3..0000000000 --- a/lib/librte_mbuf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mbuf.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_mbuf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c rte_mbuf_pool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) += rte_mbuf_dyn.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_ptype.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_pool_ops.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_dyn.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_member/Makefile b/lib/librte_member/Makefile deleted file mode 100644 index ef9e2faeaf..0000000000 --- a/lib/librte_member/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_member.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_hash - -EXPORT_MAP := rte_member_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += rte_member.c rte_member_ht.c rte_member_vbf.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMBER)-include := rte_member.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile deleted file mode 100644 index 432d6217ec..0000000000 --- a/lib/librte_mempool/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mempool.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_mempool_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops_default.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += mempool_trace_points.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace_fp.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile deleted file mode 100644 index 48366e82b0..0000000000 --- a/lib/librte_meter/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_meter.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_meter_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_METER) := rte_meter.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_METER)-include := rte_meter.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_metrics/Makefile b/lib/librte_metrics/Makefile deleted file mode 100644 index 1264d3bbb0..0000000000 --- a/lib/librte_metrics/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_metrics.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_metrics_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) := rte_metrics.c - -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -SRCS-y += rte_metrics_telemetry.c -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics_telemetry.h - -LDLIBS += -lrte_ethdev -lrte_telemetry -LDLIBS += -ljansson - -CFLAGS += -I$(RTE_SDK)/lib/librte_telemetry/ -endif - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile deleted file mode 100644 index 9830e771b3..0000000000 --- a/lib/librte_net/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_net.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_mbuf -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_net_version.map -SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h rte_higig.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_gtp.h rte_vxlan.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ecpri.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_node/Makefile b/lib/librte_node/Makefile deleted file mode 100644 index 3ec02104d3..0000000000 --- a/lib/librte_node/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_node.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_graph -lrte_mbuf -lrte_lpm -lrte_ethdev -lrte_mempool - -EXPORT_MAP := rte_node_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += null.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += log.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_ctrl.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_lookup.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_rewrite.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_cls.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_drop.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_ip4_api.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_eth_api.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pci/Makefile b/lib/librte_pci/Makefile deleted file mode 100644 index 7943f30cab..0000000000 --- a/lib/librte_pci/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pci.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_pci_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PCI) += rte_pci.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI)-include += rte_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile deleted file mode 100644 index ece8aaacc1..0000000000 --- a/lib/librte_pdump/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pdump.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_pdump_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) := rte_pdump.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PDUMP)-include := rte_pdump.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile deleted file mode 100644 index cfbbd18282..0000000000 --- a/lib/librte_pipeline/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pipeline.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table -LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev - -EXPORT_MAP := rte_pipeline_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := rte_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_port_in_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_table_action.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PIPELINE)-include += rte_pipeline.h rte_port_in_action.h rte_table_action.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile deleted file mode 100644 index 57d2aedbc5..0000000000 --- a/lib/librte_port/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_port.a -ifeq ($(CONFIG_RTE_PORT_PCAP),y) -LDLIBS += -lpcap -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_ip_frag -lrte_sched -lrte_cryptodev -lrte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -LDLIBS += -lrte_kni -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_port_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ring.c -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_frag.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ras.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_fd.c -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_kni.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_source_sink.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sym_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_eventdev.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ring.h -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_frag.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ras.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sched.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_fd.h -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_kni.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_source_sink.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sym_crypto.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_eventdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile deleted file mode 100644 index 3b067b615f..0000000000 --- a/lib/librte_power/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_power.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_timer - -EXPORT_MAP := rte_power_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c power_acpi_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_kvm_vm.c guest_channel.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += rte_power_empty_poll.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_pstate_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_common.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_POWER)-include := rte_power.h rte_power_empty_poll.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rawdev/Makefile b/lib/librte_rawdev/Makefile deleted file mode 100644 index 99f5d2a471..0000000000 --- a/lib/librte_rawdev/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_telemetry - -# library source files -SRCS-y += rte_rawdev.c - -# export include files -SYMLINK-y-include += rte_rawdev.h -SYMLINK-y-include += rte_rawdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_rawdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rcu/Makefile b/lib/librte_rcu/Makefile deleted file mode 100644 index 553bca2ef4..0000000000 --- a/lib/librte_rcu/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Arm Limited - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rcu.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_rcu_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RCU) := rte_rcu_qsbr.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RCU)-include := rte_rcu_qsbr.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_regexdev/Makefile b/lib/librte_regexdev/Makefile deleted file mode 100644 index c123fcaf5c..0000000000 --- a/lib/librte_regexdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_regexdev.a - -EXPORT_MAP := rte_regex_version.map - -# library version -LIBABIVER := 1 - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf - -# library source files -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REGEXDEV) := rte_regexdev.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_driver.h - -# versioning export map -EXPORT_MAP := rte_regexdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_reorder/Makefile b/lib/librte_reorder/Makefile deleted file mode 100644 index 1914411d52..0000000000 --- a/lib/librte_reorder/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_reorder.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -EXPORT_MAP := rte_reorder_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) := rte_reorder.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_REORDER)-include := rte_reorder.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rib/Makefile b/lib/librte_rib/Makefile deleted file mode 100644 index be80ce5d3f..0000000000 --- a/lib/librte_rib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_rib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RIB) := rte_rib.c rte_rib6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_RIB)-include := rte_rib.h rte_rib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile deleted file mode 100644 index 83a9d0840e..0000000000 --- a/lib/librte_ring/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ring.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_ring_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \ - rte_ring_core.h \ - rte_ring_elem.h \ - rte_ring_generic.h \ - rte_ring_c11_mem.h \ - rte_ring_hts.h \ - rte_ring_hts_c11_mem.h \ - rte_ring_peek.h \ - rte_ring_peek_c11_mem.h \ - rte_ring_rts.h \ - rte_ring_rts_c11_mem.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile deleted file mode 100644 index aee93a1205..0000000000 --- a/lib/librte_sched/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_sched.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrt -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_timer - -EXPORT_MAP := rte_sched_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include := rte_sched.h rte_sched_common.h rte_red.h rte_approx.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_security/Makefile b/lib/librte_security/Makefile deleted file mode 100644 index 825eaeff8e..0000000000 --- a/lib/librte_security/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_security.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool - -# library source files -SRCS-y += rte_security.c - -# export include files -SYMLINK-y-include += rte_security.h -SYMLINK-y-include += rte_security_driver.h - -# versioning export map -EXPORT_MAP := rte_security_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_stack/Makefile b/lib/librte_stack/Makefile deleted file mode 100644 index 020ef102b5..0000000000 --- a/lib/librte_stack/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_stack.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_stack_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_STACK) := rte_stack.c \ - rte_stack_std.c \ - rte_stack_lf.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_STACK)-include := rte_stack.h \ - rte_stack_std.h \ - rte_stack_lf.h \ - rte_stack_lf_generic.h \ - rte_stack_lf_c11.h \ - rte_stack_lf_stubs.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_table/Makefile b/lib/librte_table/Makefile deleted file mode 100644 index 6ad8a6b17d..0000000000 --- a/lib/librte_table/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_table.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_port -LDLIBS += -lrte_lpm -lrte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -LDLIBS += -lrte_acl -endif - -EXPORT_MAP := rte_table_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm_ipv6.c -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_acl.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_cuckoo.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key8.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key16.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key32.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_ext.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_lru.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_array.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_stub.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm_ipv6.h -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_acl.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_cuckoo.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func_arm64.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_x86.h -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_arm64.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_array.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_stub.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_telemetry/Makefile b/lib/librte_telemetry/Makefile deleted file mode 100644 index c62cbd86dc..0000000000 --- a/lib/librte_telemetry/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_telemetry.a - -ARCH_DIR ?= $(RTE_ARCH) - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -CFLAGS += -I$(RTE_SDK)/lib/librte_metrics/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include -CFLAGS += -pthread - -LDLIBS += -lpthread - -EXPORT_MAP := rte_telemetry_version.map - -# library source files -SRCS-y += telemetry.c -SRCS-y += telemetry_data.c -SRCS-y += telemetry_legacy.c - -# export include files -SYMLINK-y-include := rte_telemetry.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile deleted file mode 100644 index 7e95d120c0..0000000000 --- a/lib/librte_timer/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_timer.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_timer_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) := rte_timer.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_TIMER)-include := rte_timer.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile deleted file mode 100644 index 4f2f3e47da..0000000000 --- a/lib/librte_vhost/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_vhost.a - -EXPORT_MAP := rte_vhost_version.map - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I vhost_user -CFLAGS += -fno-strict-aliasing -LDLIBS += -lpthread - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVHOST_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVHOST_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVHOST_ICC_UNROLL_PRAGMA -endif -endif - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -LDLIBS += -lnuma -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \ - vhost_user.c virtio_net.c vdpa.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h \ - rte_vdpa_dev.h rte_vhost_async.h - -# only compile vhost crypto when cryptodev is enabled -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -LDLIBS += -lrte_cryptodev -lrte_hash -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto.c -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost_crypto.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk deleted file mode 100644 index dc8c10a24c..0000000000 --- a/mk/arch/arm/rte.vars.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -ARCH ?= arm -CROSS ?= - -CPU_CFLAGS ?= -marm -munaligned-access -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-littlearm -RTE_OBJCOPY_ARCH = arm - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk deleted file mode 100644 index a75b80c222..0000000000 --- a/mk/arch/arm64/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= arm64 -# common arch dir in eal headers -ARCH_DIR := arm -CROSS ?= - -CPU_CFLAGS ?= -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-littleaarch64 -RTE_OBJCOPY_ARCH = aarch64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk deleted file mode 100644 index c867883f15..0000000000 --- a/mk/arch/i686/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= i386 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m32 -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -melf_i386 -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-i386 -RTE_OBJCOPY_ARCH = i386 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk deleted file mode 100644 index 9f7ab22f42..0000000000 --- a/mk/arch/ppc_64/rte.vars.mk +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -ARCH ?= powerpc -ARCH_DIR := ppc -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-powerpcle -RTE_OBJCOPY_ARCH = powerpc:common64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk deleted file mode 100644 index e1689be9b4..0000000000 --- a/mk/arch/x86_64/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_x32/rte.vars.mk b/mk/arch/x86_x32/rte.vars.mk deleted file mode 100644 index c59b37a2c8..0000000000 --- a/mk/arch/x86_x32/rte.vars.mk +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -mx32 -CPU_LDFLAGS ?= -melf32_x86_64 -#CPU_ASFLAGS ?= -felf64 -# x32 is supported by Linux distribution with gcc4.8 and newer in some -# cases there is backported support in gcc4.6 -ifneq ($(shell echo | $(CC) $(CPU_CFLAGS) -E - 2>/dev/null 1>/dev/null && echo 0), 0) - $(error This version of GCC does not support x32 ABI) -endif - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp deleted file mode 120000 index 69f5cba2c2..0000000000 --- a/mk/exec-env/bsdapp +++ /dev/null @@ -1 +0,0 @@ -freebsd/ \ No newline at end of file diff --git a/mk/exec-env/freebsd/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/freebsd/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk deleted file mode 100644 index 630eb55f73..0000000000 --- a/mk/exec-env/freebsd/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/include - -EXECENV_LDFLAGS = -EXECENV_LDLIBS = -lexecinfo -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -BSDMAKE=/usr/bin/make - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS diff --git a/mk/exec-env/linux/rte.app.mk b/mk/exec-env/linux/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/linux/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk deleted file mode 100644 index 41ef4195b0..0000000000 --- a/mk/exec-env/linux/rte.vars.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/include - -EXECENV_LDLIBS = -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -# For shared libraries -EXECENV_LDFLAGS += -export-dynamic -# Add library to the group to resolve symbols -EXECENV_LDLIBS += -ldl - -# EXECENV_LDLIBS-y applies to lib.so and app linking -# while EXECENV_LDLIBS applies only to app linking. -EXECENV_LDLIBS += $(EXECENV_LDLIBS-y) - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp deleted file mode 120000 index ce5e2c77b2..0000000000 --- a/mk/exec-env/linuxapp +++ /dev/null @@ -1 +0,0 @@ -linux/ \ No newline at end of file diff --git a/mk/internal/rte.build-post.mk b/mk/internal/rte.build-post.mk deleted file mode 100644 index a6b6a9a46a..0000000000 --- a/mk/internal/rte.build-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# build helper .mk - -# fast way, no need to do prebuild and postbuild -ifeq ($(PREBUILD)$(POSTBUILD),) - -_postbuild: $(_BUILD) - @touch _postbuild - -else # slower way - -_prebuild: $(PREBUILD) - @touch _prebuild - -ifneq ($(_BUILD),) -$(_BUILD): _prebuild -else -_BUILD = _prebuild -endif - -_build: $(_BUILD) - @touch _build - -ifneq ($(POSTBUILD),) -$(POSTBUILD): _build -else -POSTBUILD = _build -endif - -_postbuild: $(POSTBUILD) - @touch _postbuild -endif \ No newline at end of file diff --git a/mk/internal/rte.build-pre.mk b/mk/internal/rte.build-pre.mk deleted file mode 100644 index 137612f19b..0000000000 --- a/mk/internal/rte.build-pre.mk +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_BUILD_TARGETS := _prebuild _build _postbuild - -comma := , -linkerprefix = $(subst -Wl$(comma)-L,-L,$(addprefix -Wl$(comma),$1)) diff --git a/mk/internal/rte.clean-post.mk b/mk/internal/rte.clean-post.mk deleted file mode 100644 index 77685edd99..0000000000 --- a/mk/internal/rte.clean-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# clean helper .mk - -# fast way, no need to do preclean and postclean -ifeq ($(PRECLEAN)$(POSTCLEAN),) - -_postclean: $(_CLEAN) - @touch _postclean - -else # slower way - -_preclean: $(PRECLEAN) - @touch _preclean - -ifneq ($(_CLEAN),) -$(_CLEAN): _preclean -else -_CLEAN = _preclean -endif - -_clean: $(_CLEAN) - @touch _clean - -ifneq ($(POSTCLEAN),) -$(POSTCLEAN): _clean -else -POSTCLEAN = _clean -endif - -_postclean: $(POSTCLEAN) - @touch _postclean -endif diff --git a/mk/internal/rte.clean-pre.mk b/mk/internal/rte.clean-pre.mk deleted file mode 100644 index e21607bff9..0000000000 --- a/mk/internal/rte.clean-pre.mk +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_CLEAN_TARGETS := _preclean _clean _postclean diff --git a/mk/internal/rte.compile-post.mk b/mk/internal/rte.compile-post.mk deleted file mode 100644 index 01525bee1b..0000000000 --- a/mk/internal/rte.compile-post.mk +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# no rule no build these files -$(DEPS-y) $(CMDS-y): diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk deleted file mode 100644 index df05b55769..0000000000 --- a/mk/internal/rte.compile-pre.mk +++ /dev/null @@ -1,164 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# Common to rte.lib.mk, rte.app.mk, rte.obj.mk -# - -SRCS-all := $(SRCS-y) $(SRCS-n) $(SRCS-) - -# convert source to obj file -src2obj = $(strip $(patsubst %.c,%.o,\ - $(patsubst %.S,%_s.o,$(1)))) - -# add a dot in front of the file name -dotfile = $(strip $(foreach f,$(1),\ - $(join $(dir $f),.$(notdir $f)))) - -# convert source/obj files into dot-dep filename (does not -# include .S files) -src2dep = $(strip $(call dotfile,$(patsubst %.c,%.o.d, \ - $(patsubst %.S,,$(1))))) -obj2dep = $(strip $(call dotfile,$(patsubst %.o,%.o.d,$(1)))) - -# convert source/obj files into dot-cmd filename -src2cmd = $(strip $(call dotfile,$(patsubst %.c,%.o.cmd, \ - $(patsubst %.S,%_s.o.cmd,$(1))))) -obj2cmd = $(strip $(call dotfile,$(patsubst %.o,%.o.cmd,$(1)))) - -OBJS-y := $(call src2obj,$(SRCS-y)) -OBJS-n := $(call src2obj,$(SRCS-n)) -OBJS- := $(call src2obj,$(SRCS-)) -OBJS-all := $(filter-out $(SRCS-all),$(OBJS-y) $(OBJS-n) $(OBJS-)) - -DEPS-y := $(call src2dep,$(SRCS-y)) -DEPS-n := $(call src2dep,$(SRCS-n)) -DEPS- := $(call src2dep,$(SRCS-)) -DEPS-all := $(DEPS-y) $(DEPS-n) $(DEPS-) -DEPSTMP-all := $(DEPS-all:%.d=%.d.tmp) - -CMDS-y := $(call src2cmd,$(SRCS-y)) -CMDS-n := $(call src2cmd,$(SRCS-n)) -CMDS- := $(call src2cmd,$(SRCS-)) -CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-) - --include $(DEPS-y) $(CMDS-y) - -# command to compile a .c file to generate an object -ifeq ($(USE_HOST),1) -C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \ - $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)") -else -C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \ - $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)") -endif -CHECK_SYMBOLS_SCRIPT = $(RTE_SDK)/buildtools/check-symbols.sh -CHECK_SYMBOLS = $(CHECK_SYMBOLS_SCRIPT) $(SRCDIR)/$(EXPORT_MAP) $@ - -PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c -PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c -PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@ -PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \ - echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ - $(PMDINFO_GEN) && \ - echo "$(if $V,$(PMDINFO_CC), CC $@.pmd.o)" && \ - $(PMDINFO_CC) && \ - echo "$(if $V,$(PMDINFO_LD), LD $@)" && \ - $(PMDINFO_LD) && \ - mv -f $@.o $@; fi -C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)' -C_TO_O_DO = @set -e; \ - echo $(C_TO_O_DISP); \ - $(C_TO_O) && \ - $(PMDINFO_TO_O) && \ - $(CHECK_SYMBOLS) && \ - echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \ - sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \ - rm -f $(call obj2dep,$(@)).tmp - -# return an empty string if string are equal -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -# return a non-empty string if the dst file does not exist -file_missing = $(call compare,$(wildcard $@),$@) - -# return a non-empty string if cmdline changed -cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1))) - -# return a non-empty string if a dependency file does not exist -depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@)) - -# return an empty string if no prereq is newer than target -# - $^ -> names of all the prerequisites -# - $(wildcard $^) -> every existing prereq -# - $(filter-out $(wildcard $^),$^) -> every prereq that don't -# exist (filter-out removes existing ones from the list) -# - $? -> names of all the prerequisites newer than target -depfile_newer = $(strip $(filter-out FORCE,$? \ - $(filter-out $(wildcard $^),$^))) - -# return 1 if parameter is a non-empty string, else 0 -boolean = $(if $1,1,0) - -# -# Compile .c file if needed -# Note: dep_$$@ is from the .d file and DEP_$$@ can be specified by -# user (by default it is empty) -# -.SECONDEXPANSION: -%.o: %.c $$(wildcard $$(dep_$$@)) $$(DEP_$$(@)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer))") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(C_TO_O)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(C_TO_O_DO)) - -# command to assemble a .S file to generate an object -ifeq ($(USE_HOST),1) -S_TO_O = $(CPP) $(HOST_CPPFLAGS) $($(@)_CPPFLAGS) $(HOST_EXTRA_CPPFLAGS) $< $(@).tmp && \ - $(HOSTAS) $(HOST_ASFLAGS) $($(@)_ASFLAGS) $(HOST_EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," HOSTAS $(@)") -else -S_TO_O = $(CPP) $(CPPFLAGS) $($(@)_CPPFLAGS) $(EXTRA_CPPFLAGS) $< -o $(@).tmp && \ - $(AS) $(ASFLAGS) $($(@)_ASFLAGS) $(EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," AS $(@)") -endif - -S_TO_O_CMD = "cmd_$@ = $(S_TO_O_STR)" -S_TO_O_DO = @set -e; \ - echo $(S_TO_O_DISP); \ - $(S_TO_O) && \ - echo $(S_TO_O_CMD) > $(call obj2cmd,$(@)) - -# -# Compile .S file if needed -# Note: DEP_$$@ can be specified by user (by default it is empty) -# -%_s.o: %.S $$(DEP_$$@) FORCE - @[ ! -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(S_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(S_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(S_TO_O_DO)) diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk deleted file mode 100644 index 98c860628a..0000000000 --- a/mk/internal/rte.extvars.mk +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# directory where sources are located -# -ifdef S -ifeq ("$(origin S)", "command line") -RTE_SRCDIR := $(abspath $(S)) -endif -endif -RTE_SRCDIR ?= $(CURDIR) -export RTE_SRCDIR - -# -# Makefile to call once $(RTE_OUTPUT) is created -# -ifdef M -ifeq ("$(origin M)", "command line") -RTE_EXTMK := $(abspath $(M)) -endif -endif -RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST))) -export RTE_EXTMK - -# RTE_SDK_BIN must point to .config, include/ and lib/. -RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET) -ifeq ($(wildcard $(RTE_SDK_BIN)/.config),) -$(error Cannot find .config in $(RTE_SDK_BIN)) -endif - -# -# Output files wil go in a separate directory: default output is -# $(RTE_SRCDIR)/build -# Output dir can be given as command line using "O=" -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# if we are building an external application, include SDK -# configuration and include project configuration if any -include $(RTE_SDK_BIN)/.config -ifneq ($(wildcard $(RTE_OUTPUT)/.config),) - include $(RTE_OUTPUT)/.config -endif -# remove double-quotes from config names -RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) -RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) -RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) -RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk deleted file mode 100644 index a1aa0ca4ff..0000000000 --- a/mk/internal/rte.install-post.mk +++ /dev/null @@ -1,71 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install helper .mk - -# -# generate rules to install files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define install_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " INSTALL-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)cp -rf $$(<) $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(INSTALL-DIRS-y),\ - $(foreach file,$(INSTALL-y-$(dir)),\ - $(eval $(call install_rule,$(dir),$(file))))) - - -# -# generate rules to install symbolic links of files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define symlink_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " SYMLINK-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)ln -nsf `$(RTE_SDK)/buildtools/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \ - $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(SYMLINK-DIRS-y),\ - $(foreach file,$(SYMLINK-y-$(dir)),\ - $(eval $(call symlink_rule,$(dir),$(file))))) - - -# fast way, no need to do preinstall and postinstall -ifeq ($(PREINSTALL)$(POSTINSTALL),) - -_postinstall: $(_INSTALL) - @touch _postinstall - -else # slower way - -_preinstall: $(PREINSTALL) - @touch _preinstall - -ifneq ($(_INSTALL),) -$(_INSTALL): _preinstall -else -_INSTALL = _preinstall -endif - -_install: $(_INSTALL) - @touch _install - -ifneq ($(POSTINSTALL),) -$(POSTINSTALL): _install -else -POSTINSTALL = _install -endif - -_postinstall: $(POSTINSTALL) - @touch _postinstall -endif diff --git a/mk/internal/rte.install-pre.mk b/mk/internal/rte.install-pre.mk deleted file mode 100644 index 4786d3b28b..0000000000 --- a/mk/internal/rte.install-pre.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# get all variables starting with "INSTALL-y-", and extract the -# installation dir and path -# -INSTALL-y := $(filter INSTALL-y-%,$(.VARIABLES)) -INSTALL-n := $(filter INSTALL-n-%,$(.VARIABLES)) -INSTALL- := $(filter INSTALL--%,$(.VARIABLES)) -INSTALL-DIRS-y := $(patsubst INSTALL-y-%,%,$(INSTALL-y)) -INSTALL-FILES-y := $(foreach i,$(INSTALL-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) -INSTALL-FILES-all := $(foreach i,$(INSTALL-DIRS-y) $(INSTALL-DIRS-n) $(INSTALL-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) - -_INSTALL_TARGETS := _preinstall _install _postinstall - -# -# get all variables starting with "SYMLINK-y-", and extract the -# installation dir and path -# -SYMLINK-y := $(filter SYMLINK-y-%,$(.VARIABLES)) -SYMLINK-n := $(filter SYMLINK-n-%,$(.VARIABLES)) -SYMLINK- := $(filter SYMLINK--%,$(.VARIABLES)) -SYMLINK-DIRS-y := $(patsubst SYMLINK-y-%,%,$(SYMLINK-y)) -SYMLINK-FILES-y := $(foreach i,$(SYMLINK-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) -SYMLINK-FILES-all := $(foreach i,$(SYMLINK-DIRS-y) $(SYMLINK-DIRS-n) $(SYMLINK-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) - -_SYMLINK_TARGETS := _presymlink _symlink _postsymlink diff --git a/mk/machine/armv7a/rte.vars.mk b/mk/machine/armv7a/rte.vars.mk deleted file mode 100644 index 44ebd68dae..0000000000 --- a/mk/machine/armv7a/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv7-a - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -MACHINE_CFLAGS += -mfpu=neon diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk deleted file mode 100644 index 5e3ffc3adf..0000000000 --- a/mk/machine/armv8a/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk deleted file mode 100644 index df08d3b038..0000000000 --- a/mk/machine/default/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=corei7 diff --git a/mk/machine/dpaa/rte.vars.mk b/mk/machine/dpaa/rte.vars.mk deleted file mode 100644 index 75df626ff2..0000000000 --- a/mk/machine/dpaa/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -# To avoid TLS corruption issue. -MACHINE_CFLAGS += -mtls-dialect=trad diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk deleted file mode 100644 index 50342dfa27..0000000000 --- a/mk/machine/emag/rte.vars.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag) diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk deleted file mode 100644 index 39099e760e..0000000000 --- a/mk/machine/hsw/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx2 diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk deleted file mode 100644 index 5b6563742a..0000000000 --- a/mk/machine/ivb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx-i diff --git a/mk/machine/n1sdp/rte.vars.mk b/mk/machine/n1sdp/rte.vars.mk deleted file mode 100644 index 6d69de03c9..0000000000 --- a/mk/machine/n1sdp/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=neoverse-n1) diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk deleted file mode 100644 index 8c96e3fa04..0000000000 --- a/mk/machine/native/rte.vars.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=native - -# On FreeBSD systems, sometimes the correct CPU type is not picked up. -# To get everything to compile, we need SSE4.2 support, so check if that is -# reported by compiler. If not, check if the CPU actually supports it, and if -# so, set the compilation target to be a corei7, minimum target with SSE4.2. -SSE42_SUPPORT=$(shell $(CC) -march=native -dM -E - </dev/null | grep SSE4_2) -ifeq ($(SSE42_SUPPORT),) - MACHINE_CFLAGS = -march=corei7 -endif diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk deleted file mode 100644 index 91de5d9bed..0000000000 --- a/mk/machine/nhm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.mk deleted file mode 100644 index e209cf4920..0000000000 --- a/mk/machine/octeontx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto+lse) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2) diff --git a/mk/machine/power8/rte.vars.mk b/mk/machine/power8/rte.vars.mk deleted file mode 100644 index 00e0834b8a..0000000000 --- a/mk/machine/power8/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = diff --git a/mk/machine/silvermont/rte.vars.mk b/mk/machine/silvermont/rte.vars.mk deleted file mode 100644 index e4f3fe42bd..0000000000 --- a/mk/machine/silvermont/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=silvermont diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk deleted file mode 100644 index efe2f32d70..0000000000 --- a/mk/machine/snb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7-avx diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk deleted file mode 100644 index 047741668c..0000000000 --- a/mk/machine/thunderx/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -mcpu=thunderx diff --git a/mk/machine/thunderx2/rte.vars.mk b/mk/machine/thunderx2/rte.vars.mk deleted file mode 100644 index b80dc8680c..0000000000 --- a/mk/machine/thunderx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99) diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk deleted file mode 100644 index e9bc3f9848..0000000000 --- a/mk/machine/wsm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 -maes -mpclmul diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk deleted file mode 100644 index e632f3139b..0000000000 --- a/mk/machine/xgene1/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a diff --git a/mk/rte.app.mk b/mk/rte.app.mk deleted file mode 100644 index a544259970..0000000000 --- a/mk/rte.app.mk +++ /dev/null @@ -1,509 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation. -# Copyright(c) 2014-2015 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(APP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_INSTALL += $(RTE_OUTPUT)/app/$(APP) $(RTE_OUTPUT)/app/$(APP).map -POSTINSTALL += target-appinstall -_CLEAN = doclean -POSTCLEAN += target-appclean - -ifeq ($(NO_LDSCRIPT),) -LDSCRIPT = $(RTE_LDSCRIPT) -endif - -# Link only the libraries used in the application -LDFLAGS += --as-needed - -# default path for libs -_LDLIBS-y += -L$(RTE_SDK_BIN)/lib - -# -# Order is important: from higher level to lower level -# -_LDLIBS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += -lrte_flow_classify -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += -lrte_pipeline -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += -lrte_table -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += -lrte_port -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --no-whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PDUMP) += -lrte_pdump -_LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor -_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter -_LDLIBS-$(CONFIG_RTE_LIBRTE_FIB) += -lrte_fib -_LDLIBS-$(CONFIG_RTE_LIBRTE_RIB) += -lrte_rib -_LDLIBS-$(CONFIG_RTE_LIBRTE_LPM) += -lrte_lpm -_LDLIBS-$(CONFIG_RTE_LIBRTE_ACL) += -lrte_acl -_LDLIBS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += -lrte_jobstats -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -lrte_metrics -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -ljansson -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_BITRATE) += -lrte_bitratestats -_LDLIBS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += -lrte_latencystats -_LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power - -_LDLIBS-$(CONFIG_RTE_LIBRTE_EFD) += -lrte_efd -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lrte_bpf -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lelf -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPSEC) += -lrte_ipsec - -_LDLIBS-y += --whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE) += -lrte_cfgfile -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRO) += -lrte_gro -_LDLIBS-$(CONFIG_RTE_LIBRTE_GSO) += -lrte_gso -_LDLIBS-$(CONFIG_RTE_LIBRTE_HASH) += -lrte_hash -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lrte_member -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost -_LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs -_LDLIBS-y += -lrte_telemetry -_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf -_LDLIBS-$(CONFIG_RTE_LIBRTE_NET) += -lrte_net -_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lrte_ethdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_BBDEV) += -lrte_bbdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += -lrte_cryptodev -_LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY) += -lrte_security -_LDLIBS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += -lrte_compressdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += -lrte_regexdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += -lrte_eventdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV) += -lrte_rawdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool -_LDLIBS-$(CONFIG_RTE_LIBRTE_STACK) += -lrte_stack -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += -lrte_mempool_octeontx2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI) += -lrte_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrte_eal -_LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline -_LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -_LDLIBS-$(CONFIG_RTE_LIBRTE_RCU) += -lrte_rcu -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRAPH) += -lrte_graph -_LDLIBS-$(CONFIG_RTE_LIBRTE_NODE) += -lrte_node - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni -endif - -OTX-CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -OTX-CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OTX-CPT-y)),y) -_LDLIBS-y += -lrte_common_cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -_LDLIBS-y += -lrte_common_octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -_LDLIBS-y += -lrte_common_octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -_LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk -endif - -DPAAX-y := $(CONFIG_RTE_LIBRTE_DPAA_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_FSLMC_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_ENETC_PMD) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PFE_PMD) -ifeq ($(findstring y,$(DPAAX-y)),y) - _LDLIBS-y += -lrte_common_dpaax -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += -lrte_bus_vdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += -lrte_bus_fslmc -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# plugins (link only if static libraries) - -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += -lrte_mempool_dpaa2 -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += -lrte_pmd_af_xdp -lbpf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += -lrte_pmd_ark -_LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += -lrte_pmd_atlantic -_LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += -lrte_pmd_avp -_LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += -lrte_pmd_axgbe -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += -lrte_pmd_bnxt -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond -_LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += -lrte_pmd_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += -lrte_pmd_enetc -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic -_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += -lrte_pmd_failsafe -_LDLIBS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += -lrte_pmd_hinic -_LDLIBS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += -lrte_pmd_hns3 -_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e -_LDLIBS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += -lrte_pmd_iavf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += -lrte_pmd_ice -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifeq ($(findstring y,$(IAVF-y)),y) -_LDLIBS-y += -lrte_common_iavf -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += -lrte_pmd_igc -_LDLIBS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += -lrte_pmd_ionic -_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += -lrte_pmd_kni -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += -lrte_pmd_lio -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += -lrte_pmd_memif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4 -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -lrte_common_mlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -lrte_pmd_mlx5 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += -lrte_pmd_mlx5_vdpa -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += -lrte_pmd_mlx5_regex -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -_LDLIBS-y += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LIBS_IBVERBS_STATIC = $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -_LDLIBS-y += --no-whole-archive -_LDLIBS-y += $(LIBS_IBVERBS_STATIC) -_LDLIBS-y += --whole-archive -else -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -libverbs -lmlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs -lmlx4 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += -lrte_pmd_mvpp2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += -lrte_pmd_mvneta -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += -lrte_pmd_nfp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += -lrte_pmd_octeontx2 -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap -lpcap -_LDLIBS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += -lrte_pmd_pfe -_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += -lrte_pmd_qede -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += -lrte_pmd_softnic -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += -lrte_pmd_sfc_efx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lrte_pmd_szedata2 -lsze2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += -lrte_pmd_nfb -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += -lrte_pmd_tap -_LDLIBS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += -lrte_pmd_thunderx_nicvf -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += -lrte_pmd_vdev_netvsc -_LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += -lrte_pmd_vhost -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc -endif # $(CONFIG_RTE_EAL_VFIO) -endif # $(CONFIG_RTE_LIBRTE_VHOST) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio - -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMBUS) += -lrte_bus_vmbus -_LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += -lrte_pmd_netvsc - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += -lrte_pmd_bbdev_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += -lrte_pmd_bbdev_fpga_5gnr_fec - -# TURBO SOFTWARE PMD is dependent on the FLEXRAN library -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -# Dependency on the FLEXRAN SDK library if available -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_crc -lcrc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_common -lcommon -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lirc -limf -lstdc++ -lipps -lsvml -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif # CONFIG_RTE_BBDEV_SDK_AVX512 -endif # CONFIG_RTE_BBDEV_SDK_AVX2 -endif # CONFIG_RTE_LIBRTE_BBDEV - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lrte_pmd_aesni_mb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lrte_pmd_aesni_gcm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += -lrte_pmd_ccp -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_SYM) += -lrte_pmd_qat -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM) += -lrte_pmd_qat -lcrypto -endif # CONFIG_RTE_LIBRTE_PMD_QAT -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lrte_pmd_zuc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -lrte_pmd_armv8 -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mvsam_crypto -lmusdk -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += -lrte_pmd_nitrox -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += -lrte_pmd_octeontx_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += -lrte_pmd_octeontx2_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += -lrte_pmd_crypto_scheduler -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_pmd_dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += -lrte_pmd_dpaa_sec -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += -lrte_pmd_caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += -lrte_pmd_virtio_crypto -endif # CONFIG_RTE_LIBRTE_CRYPTODEV - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lrte_pmd_isal_comp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lisal -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += -lrte_pmd_octeontx_zip -# Link QAT driver if it has not been linked yet -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),n) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -endif # CONFIG_RTE_LIBRTE_PMD_QAT_SYM -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lrte_pmd_zlib -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lz -endif # CONFIG_RTE_LIBRTE_COMPRESSDEV - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += -lrte_pmd_skeleton_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += -lrte_pmd_sw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += -lrte_pmd_dsw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += -lrte_pmd_octeontx_ssovf -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += -lrte_pmd_dpaa_event -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += -lrte_pmd_dpaa2_event -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS - -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += -lrte_mempool_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += -lrte_pmd_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += -lrte_pmd_octeontx2_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event -endif # CONFIG_RTE_LIBRTE_EVENTDEV - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_rawdev_skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_rawdev_dpaa2_cmdif -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_rawdev_dpaa2_qdma -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga -ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += -lrte_rawdev_ifpga -lfdt -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += -lrte_pmd_ipn3ke -endif # CONFIG_RTE_LIBRTE_IFPGA_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += -lrte_rawdev_ioat -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_rawdev_ntb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += -lrte_rawdev_octeontx2_dma -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += -lrte_rawdev_octeontx2_ep -endif # CONFIG_RTE_LIBRTE_RAWDEV - -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += --no-whole-archive - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# The static libraries do not know their dependencies. -# So linking with static library requires explicit dependencies. -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrt -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lm -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_PORT_PCAP) += -lpcap -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += $(EXECENV_LDLIBS) - -LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS) $(EXTRA_LDLIBS) - -# all the words except the first one -allbutfirst = $(wordlist 2,$(words $(1)),$(1)) - -# Eliminate duplicates without sorting, only keep the last occurrence -filter-libs = \ - $(if $(1),$(strip\ - $(if \ - $(and \ - $(filter $(firstword $(1)),$(call allbutfirst,$(1))),\ - $(filter -l%,$(firstword $(1)))),\ - ,\ - $(firstword $(1))) \ - $(call filter-libs,$(call allbutfirst,$(1))))) - -LDLIBS := $(call filter-libs,$(LDLIBS)) - -MAPFLAGS = -Map=$@.map --cref - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS)) -else -O_TO_EXE = $(LD) -o $@ $(OBJS-y) \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS) -endif -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," LD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(APP).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Compile executable file if needed -# -$(APP): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(APP)) $(LDSCRIPT) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP): $(APP) - @echo " INSTALL-APP $(APP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP) $(RTE_OUTPUT)/app - -# -# install app map file in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP).map: $(APP) - @echo " INSTALL-MAP $(APP).map" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP).map $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(APP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(APP).cmd $(APP).map - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk -else -include $(RTE_SDK)/mk/target/generic/rte.app.mk -endif - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.bsdmodule.mk b/mk/rte.bsdmodule.mk deleted file mode 100644 index df8bf9ef35..0000000000 --- a/mk/rte.bsdmodule.mk +++ /dev/null @@ -1,89 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# DPDK uses a more up-to-date gcc, so clear the override here. -unexport CC -override CFLAGS = $(MODULE_CFLAGS) - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)if [ ! -f $(notdir BSDmakefile) ]; then ln -nfs $(SRCDIR)/BSDmakefile . ; fi - $(Q)MAKEFLAGS= $(BSDMAKE) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - $(Q)echo INSTALL-MODULE $(MODULE).ko - $(Q)[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - $(Q)cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - $(Q)MAKEFLAGS= $(BSDMAKE) install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - $(Q)$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - $(Q)if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.combinedlib.mk b/mk/rte.combinedlib.mk deleted file mode 100644 index 9d0f935358..0000000000 --- a/mk/rte.combinedlib.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -default: all - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXT:=.so -else -EXT:=.a -endif - -RTE_LIBNAME := dpdk -COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT) - -LIBS := $(filter-out $(COMBINEDLIB), $(sort $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT))))) - -all: FORCE - $(Q)echo "GROUP ( $(LIBS) )" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -# -# Clean all generated files -# -.PHONY: clean -clean: - $(Q)rm -f $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk deleted file mode 100644 index fa87535312..0000000000 --- a/mk/rte.cpuflags.mk +++ /dev/null @@ -1,124 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# this makefile is called from the generic rte.vars.mk and is -# used to set the RTE_CPUFLAG_* environment variables giving details -# of what instruction sets the target cpu supports. - -AUTO_CPUFLAGS := $(shell $(CC) $(MACHINE_CFLAGS) $(WERROR_FLAGS) $(EXTRA_CFLAGS) -dM -E - < /dev/null) - -# adding flags to CPUFLAGS - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE__),) -CPUFLAGS += SSE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE2__),) -CPUFLAGS += SSE2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE3__),) -CPUFLAGS += SSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSSE3__),) -CPUFLAGS += SSSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_1__),) -CPUFLAGS += SSE4_1 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_2__),) -CPUFLAGS += SSE4_2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AES__),) -CPUFLAGS += AES -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PCLMUL__),) -CPUFLAGS += PCLMULQDQ -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) -CPUFLAGS += RDRAND -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) -CPUFLAGS += RDSEED -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),) -CPUFLAGS += FSGSBASE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__F16C__),) -CPUFLAGS += F16C -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX2 -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX512),y) -CPUFLAGS += AVX512F -else -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(FORCE_DISABLE_AVX512),y) -MACHINE_CFLAGS += -mno-avx512f -endif -endif -endif - -# IBM Power CPU flags -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC64__),) -CPUFLAGS += PPC64 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC32__),) -CPUFLAGS += PPC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__vector),) -CPUFLAGS += ALTIVEC -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),) -CPUFLAGS += VSX -endif - -# ARM flags -ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),) -CPUFLAGS += NEON -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRC32),) -CPUFLAGS += CRC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRYPTO),) -CPUFLAGS += AES -CPUFLAGS += PMULL -CPUFLAGS += SHA1 -CPUFLAGS += SHA2 -endif - -MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS)) - -# To strip whitespace -comma:= , -empty:= -space:= $(empty) $(empty) -CPUFLAGSTMP1 := $(addprefix RTE_CPUFLAG_,$(CPUFLAGS)) -CPUFLAGSTMP2 := $(subst $(space),$(comma),$(CPUFLAGSTMP1)) -CPUFLAGS_LIST := -DRTE_COMPILE_TIME_CPUFLAGS=$(CPUFLAGSTMP2) diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk deleted file mode 100644 index 427bb52306..0000000000 --- a/mk/rte.extapp.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.app.mk -endif diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk deleted file mode 100644 index 977873325d..0000000000 --- a/mk/rte.extlib.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -EXTLIB_BUILD := y - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.lib.mk -endif diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk deleted file mode 100644 index c761a5de1e..0000000000 --- a/mk/rte.extobj.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.obj.mk -endif diff --git a/mk/rte.extshared.mk b/mk/rte.extshared.mk deleted file mode 100644 index 64269e1a85..0000000000 --- a/mk/rte.extshared.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - @echo $(RTE_OUTPUT)/lib must be added to /etc/ld.so.conf or \ - LD_LIBRARY_PATH variable to allow binary to link with dynamic library - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.shared.mk -endif diff --git a/mk/rte.extsubdir.mk b/mk/rte.extsubdir.mk deleted file mode 100644 index 0f8ef94c50..0000000000 --- a/mk/rte.extsubdir.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -# output directory -O ?= $(CURDIR) -BASE_OUTPUT ?= $(abspath $(O)) -CUR_SUBDIR ?= . - -.PHONY: all -all: $(DIRS-y) - -.PHONY: clean -clean: $(DIRS-y) - -.PHONY: $(DIRS-y) -$(DIRS-y): - @echo "== $@" - $(Q)$(MAKE) -C $(@) \ - M=$(CURDIR)/$(@)/Makefile \ - O=$(BASE_OUTPUT)/$(CUR_SUBDIR)/$(@)/$(RTE_TARGET) \ - BASE_OUTPUT=$(BASE_OUTPUT) \ - CUR_SUBDIR=$(CUR_SUBDIR)/$(@) \ - S=$(CURDIR)/$(@) \ - $(filter-out $(DIRS-y),$(MAKECMDGOALS)) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) diff --git a/mk/rte.gnuconfigure.mk b/mk/rte.gnuconfigure.mk deleted file mode 100644 index 72e99aafc3..0000000000 --- a/mk/rte.gnuconfigure.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.build-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) -_BUILD = configure -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -configure: - $(Q)cd $(CONFIGURE_PATH) ; \ - ./configure --prefix $(CONFIGURE_PREFIX) $(CONFIGURE_ARGS) ; \ - make ; \ - make install - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)cd $(CONFIGURE_PATH) ; make clean - $(Q)rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.build-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.helper.mk b/mk/rte.helper.mk deleted file mode 100644 index 6e7fd03d7f..0000000000 --- a/mk/rte.helper.mk +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd - -# rte_cc_has_argument -# Usage: MACHINE_CFLAGS += $(call rte_cc_has_argument, -mno-avx512f) -# Return the argument if the argument is supported by the compiler. -# -define rte_cc_has_argument - $(shell $(CC) -E $(1) -xc /dev/null 1>/dev/null 2>/dev/null && echo $(1)) -endef diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk deleted file mode 100644 index 68e32b5780..0000000000 --- a/mk/rte.hostapp.mk +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTAPP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/app/$(HOSTAPP) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_EXE = $(HOSTCC) $(HOST_LDFLAGS) $(LDFLAGS_$(@)) \ - $(EXTRA_HOST_LDFLAGS) -o $@ $(OBJS-y) $(LDLIBS) -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," HOSTLD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTAPP).cmd - -# list of .a files that are linked to this application -LDLIBS_FILES := $(sort $(wildcard \ - $(addprefix $(RTE_OUTPUT)/lib/, \ - $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))))) - -# -# Compile executable file if needed -# -$(HOSTAPP): $(OBJS-y) $(LDLIBS_FILES) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/hostapp -# -$(RTE_OUTPUT)/app/$(HOSTAPP): $(HOSTAPP) - @echo " INSTALL-HOSTAPP $(HOSTAPP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(HOSTAPP) $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTAPP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(HOSTAPP).cmd - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.hostlib.mk b/mk/rte.hostlib.mk deleted file mode 100644 index 0ccaa55f09..0000000000 --- a/mk/rte.hostlib.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTLIB) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/hostlib/$(HOSTLIB) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_A = $(AR) crus $(HOSTLIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," HOSTAR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTLIB).cmd - -# -# Archive objects in .a file if needed -# -$(HOSTLIB): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) - -# -# install lib in $(RTE_OUTPUT)/hostlib -# -$(RTE_OUTPUT)/hostlib/$(HOSTLIB): $(HOSTLIB) - @echo " INSTALL-HOSTLIB $(HOSTLIB)" - @[ -d $(RTE_OUTPUT)/hostlib ] || mkdir -p $(RTE_OUTPUT)/hostlib - $(Q)cp -f $(HOSTLIB) $(RTE_OUTPUT)/hostlib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTLIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.install.mk b/mk/rte.install.mk deleted file mode 100644 index e56daf457c..0000000000 --- a/mk/rte.install.mk +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install-only makefile (no build target) - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: _postinstall - @true - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(INSTALL-FILES-all) - @rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk deleted file mode 100644 index 229ae16814..0000000000 --- a/mk/rte.lib.mk +++ /dev/null @@ -1,156 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -EXTLIB_BUILD ?= n - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION) -SOVER := $(basename $(LIBABIVER)) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB)) -LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) -ifeq ($(EXTLIB_BUILD),n) -CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) -endif -endif - - -_BUILD = $(LIB) -PREINSTALL = $(SYMLINK-FILES-y) -_INSTALL = $(INSTALL-FILES-y) $(RTE_OUTPUT)/lib/$(LIB) -_CLEAN = doclean - -LDLIBS += $(EXECENV_LDLIBS-y) - -.PHONY: all -all: install - -.PHONY: install -ifeq ($(SYMLINK-FILES-y),) -install: build _postinstall -else -install: _preinstall build _postinstall -build: _preinstall -endif - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -# Override the definition of LD here, since we're linking with CC -LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS) -_CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -else -_CPU_LDFLAGS := $(CPU_LDFLAGS) -endif - -O_TO_A = $(AR) crDs $(LIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," AR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - -ifneq ($(CC_SUPPORTS_Z),false) -NO_UNDEFINED := -z defs -endif - -O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \ - -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -o $(LIB) -O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight -O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") -O_TO_S_DO = @set -e; \ - echo $(O_TO_S_DISP); \ - $(O_TO_S) && \ - echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) - --include .$(LIB).cmd - -# -# Archive objects in .a file if needed -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE -ifeq ($(LIBABIVER),) - @echo "Must Specify a $(LIB) ABI version" - @false -endif - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_S_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_S_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_S_DO)) - -else -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) -endif - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(LIB): $(LIB) - @echo " INSTALL-LIB $(LIB)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - $(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/') - $(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \ - ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \ - fi -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(LIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) .$(LIB).cmd $(INSTALL-FILES-all) *.pmd.c *.pmd.o - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.module.mk b/mk/rte.module.mk deleted file mode 100644 index 1ada528a00..0000000000 --- a/mk/rte.module.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - @echo INSTALL-MODULE $(MODULE).ko - @[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - @cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - modules_install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.obj.mk b/mk/rte.obj.mk deleted file mode 100644 index 1641a52e75..0000000000 --- a/mk/rte.obj.mk +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -ifneq ($(OBJ),) -_BUILD = $(OBJ) -else -_BUILD = $(OBJS-y) -endif -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -ifneq ($(OBJ),) -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_O = $(LD) -r -o $(OBJ) $(OBJS-y) -O_TO_O_STR = $(subst ','\'',$(O_TO_O)) #'# fix syntax highlight -O_TO_O_DISP = $(if $(V),"$(O_TO_O_STR)"," LD $(@)") -O_TO_O_CMD = "cmd_$@ = $(O_TO_O_STR)" -O_TO_O_DO = @set -e; \ - echo $(O_TO_O_DISP); \ - $(O_TO_O) && \ - echo $(O_TO_O_CMD) > $(call exe2cmd,$(@)) - --include .$(OBJ).cmd - -# -# Archive objects in .a file if needed -# -$(OBJ): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_O_DO)) -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(OBJ) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk deleted file mode 100644 index d1d57b6695..0000000000 --- a/mk/rte.sdkbuild.mk +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# include rte.vars.mk if config file exists -# -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif - -# allow exec-env specific targets --include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.custom.mk - -buildtools: | lib -kernel: | lib -drivers: | lib buildtools -app: | lib buildtools drivers -test: | lib buildtools drivers - -# -# build and clean targets -# - -CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-)) - -.PHONY: build -build: $(ROOTDIRS-y) - @echo "Build complete [$(RTE_TARGET)]" - @echo "==== NOTE ====" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html for instructions" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "==============" - -.PHONY: clean -clean: $(CLEANDIRS) - @rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod - @[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include - @$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean - @echo Clean complete - -.SECONDEXPANSION: -.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-) -$(ROOTDIRS-y) $(ROOTDIRS-): - @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ - @echo "== Build $@" - $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = drivers ]; then \ - $(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \ - fi - -%_clean: - @echo "== Clean $*" - $(Q)if [ -f $(RTE_SRCDIR)/$*/Makefile -a -d $(BUILDDIR)/$* ]; then \ - $(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* clean ; \ - fi - -RTE_MAKE_SUBTARGET ?= all - -%_sub: $(addsuffix _sub,$(*)) - @echo $(addsuffix _sub,$(*)) - @[ -d $(BUILDDIR)/$* ] || mkdir -p $(BUILDDIR)/$* - @echo "== Build $*" - $(Q)$(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* \ - $(RTE_MAKE_SUBTARGET) - -.PHONY: all -all: build - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk deleted file mode 100644 index f538649f22..0000000000 --- a/mk/rte.sdkconfig.mk +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -.PHONY: showversion -showversion: - @cat $(RTE_SRCDIR)/VERSION - -.PHONY: showversionum -showversionum: - @cat $(RTE_SRCDIR)/VERSION | awk -F '.' '{print $$1$$2}' - -INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ - $(filter-out %app-gcc,$(filter-out %~,\ - $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_*))))))) -INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS)) - -.PHONY: showconfigs -showconfigs: - @$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);) - -.PHONY: notemplate -notemplate: - @printf "No template specified. Use 'make defconfig' or " - @echo "use T=template from the following list:" - @$(MAKE) -rR showconfigs | sed 's,^, ,' - -.PHONY: defconfig -defconfig: - @$(MAKE) config T=$(shell \ - uname -m | awk '{ \ - if ($$0 == "aarch64") { \ - print "arm64-armv8a"} \ - else if ($$0 == "armv7l") { \ - print "arm-armv7a"} \ - else if ($$0 == "ppc64") { \ - print "ppc_64-power8"} \ - else if ($$0 == "amd64") { \ - print "x86_64-native"} \ - else { \ - printf "%s-native", $$0} }' \ - )-$(shell \ - uname | awk '{ \ - if ($$0 == "Linux") { \ - print "linux"} \ - else { \ - print "freebsd"} }' \ - )-$(shell \ - ${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \ - '{ \ - if ($$1 == "cc") { \ - print "gcc" } \ - else { \ - print $$1 } \ - }' \ - ) - -.PHONY: config -ifeq ($(RTE_CONFIG_TEMPLATE),) -config: notemplate -else -config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile - @echo "Configuration done using" \ - $(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE))) -endif - -$(RTE_OUTPUT): - $(Q)mkdir -p $@ - -ifdef NODOTCONF -$(RTE_OUTPUT)/.config: ; -else -# Generate config from template, if there are duplicates keep only the last. -# To do so the temp config is checked for duplicate keys with cut/sort/uniq -# Then for each of those identified duplicates as long as there are more than -# just one left the last match is removed. -# Part of the config includes the version information taken from "VERSION" -# in the repo. This needs to be split into the various parts using sed and awk. -# To ensure correct version comparison, we append ".99" to the version number -# so that the version of a release is higher than that of its rc's. -$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT) - $(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \ - $(CPP) -undef -P -x assembler-with-cpp \ - `cat $(RTE_SRCDIR)/VERSION | \ - sed -e 's/-rc/.-rc./' -e 's/$$/..99/' | \ - awk -F '.' '{print "-D__YEAR="int($$1), "-D__MONTH="int($$2), "-D__MINOR="int($$3), "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \ - -ffreestanding \ - -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \ - config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \ - echo "$$config" | awk -F '=' 'BEGIN {i=1} \ - /^#/ {pos[i++]=$$0} \ - !/^#/ {if (!s[$$1]) {pos[i]=$$0; s[$$1]=i++} \ - else {pos[s[$$1]]=$$0}} END \ - {for (j=1; j<i; j++) print pos[j]}' \ - > $(RTE_OUTPUT)/.config_tmp ; \ - if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config.orig ; \ - fi ; \ - rm -f $(RTE_OUTPUT)/.config_tmp ; \ - else \ - $(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \ - fi -endif - -# generate a Makefile for this build directory -# use a relative path so it will continue to work even if we move the directory -SDK_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_SRCDIR)) \ - $(abspath $(RTE_OUTPUT))) -OUTPUT_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_OUTPUT)) \ - $(abspath $(RTE_SRCDIR))) -$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT) - $(Q)$(RTE_SDK)/buildtools/gen-build-mk.sh $(SDK_RELPATH) > $@ - -# clean installed files, and generate a new config header file -# if NODOTCONF variable is defined, don't try to rebuild .config -$(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config - $(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build - $(Q)mkdir -p $(RTE_OUTPUT)/include - $(Q)$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - -# generate the rte_config.h -.PHONY: headerconfig -headerconfig: $(RTE_OUTPUT)/include/rte_config.h - @true - -# check that .config is present, and if yes, check that rte_config.h -# is up to date -.PHONY: checkconfig -checkconfig: - @if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - echo "No .config in build directory"; \ - exit 1; \ - fi - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk \ - headerconfig NODOTCONF=1 - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk deleted file mode 100644 index 7adeb0e11b..0000000000 --- a/mk/rte.sdkdepdirs.mk +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk deleted file mode 100644 index fd77e41867..0000000000 --- a/mk/rte.sdkdoc.mk +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation. -# Copyright(c) 2013-2015 6WIND S.A. - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with doc target") -endif -endif - -RTE_SPHINX_BUILD = sphinx-build -RTE_PDFLATEX_VERBOSE := --interaction=nonstopmode - -ifndef V -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif -ifeq '$V' '0' -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif - -RTE_PDF_DPI ?= 300 - -RTE_GUIDES := $(filter %/, $(wildcard $(RTE_SDK)/doc/guides/*/)) - -API_EXAMPLES := $(RTE_OUTPUT)/doc/html/examples.dox - -.PHONY: help -help: - @cat $(RTE_SDK)/doc/build-sdk-quick.txt - @$(MAKE) -rR showconfigs | sed 's,^,\t\t\t\t,' - -.PHONY: all -all: api-html guides-html guides-pdf - -.PHONY: clean -clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean - -.PHONY: api-html -api-html: $(API_EXAMPLES) - @echo 'doxygen for API...' - $(Q)mkdir -p $(RTE_OUTPUT)/doc/html - $(Q)(sed -e "s|@VERSION@|`$(MAKE) -rRs showversion`|" \ - -e "s|@API_EXAMPLES@|$(API_EXAMPLES)|" \ - -e "s|@OUTPUT@|$(RTE_OUTPUT)/doc|" \ - -e "s|@HTML_OUTPUT@|html/api|" \ - -e "s|@TOPDIR@|./|g" \ - -e "s|@STRIP_FROM_PATH@|./|g" \ - $(RTE_SDK)/doc/api/doxy-api.conf.in)| \ - doxygen - - $(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css - -.PHONY: api-html-clean -api-html-clean: - $(Q)rm -f $(API_EXAMPLES) - $(Q)rm -rf $(RTE_OUTPUT)/doc/html/api/search - $(Q)rm -f $(RTE_OUTPUT)/doc/html/api/* - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true - -$(API_EXAMPLES): api-html-clean - $(Q)mkdir -p $(@D) - $(Q)doc/api/generate_examples.sh examples $(API_EXAMPLES) - -guides-pdf-clean: guides-pdf-img-clean -guides-pdf-img-clean: - $(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf - -guides-%-clean: - $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true - -guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ; -guides-pdf-%: - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \ - $(RTE_OUTPUT)/doc/pdf/guides/$* - $(if $^,$(Q)rm -f $^) - @echo 'pdflatex processing $@...' - $(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \ - LATEXOPTS=$(RTE_PDFLATEX_VERBOSE) - $(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \ - $(RTE_OUTPUT)/doc/pdf/guides/$*.pdf - -guides-html-prepare: - $(Q)install -D -m0644 $(RTE_SDK)/doc/guides/custom.css \ - $(RTE_OUTPUT)/doc/html/guides/_static/css/custom.css - -guides-%-prepare: ; - -guides-%: guides-%-prepare - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \ - $(RTE_OUTPUT)/doc/$*/guides - -# Each PDF depends on generated images *.pdf from *.svg -$(foreach guide, $(RTE_GUIDES), $(foreach img, $(wildcard $(guide)img/*.svg), \ - $(eval guides-pdf-$(notdir $(guide:/=)): $(img:svg=pdf)))) -%.pdf: %.svg - $(Q)inkscape -d $(RTE_PDF_DPI) -D -f $< -A $@ $(RTE_INKSCAPE_VERBOSE) diff --git a/mk/rte.sdkexamples.mk b/mk/rte.sdkexamples.mk deleted file mode 100644 index 5eeec36494..0000000000 --- a/mk/rte.sdkexamples.mk +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -# examples application are seen as external applications which are -# not part of SDK. -BUILDING_RTE_SDK := -export BUILDING_RTE_SDK - -# Build directory is given with O= -O ?= $(RTE_SDK)/examples - -# Target for which examples should be built. -T ?= * - -# list all available configurations -EXAMPLES_CONFIGS := $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_$(T))) -EXAMPLES_TARGETS := $(addsuffix _examples,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples -examples: $(EXAMPLES_TARGETS) - -%_examples: - @echo ================== Build examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*); \ - fi - -EXAMPLES_CLEAN_TARGETS := $(addsuffix _examples_clean,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples_clean -examples_clean: $(EXAMPLES_CLEAN_TARGETS) - -%_examples_clean: - @echo ================== Clean examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*) clean; \ - fi diff --git a/mk/rte.sdkgcov.mk b/mk/rte.sdkgcov.mk deleted file mode 100644 index ab528b18b8..0000000000 --- a/mk/rte.sdkgcov.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with gcov target") -endif -endif - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -INPUTDIR = $(RTE_OUTPUT) -OUTPUTDIR = $(RTE_OUTPUT)/gcov - -.PHONY: gcovclean -gcovclean: - $(Q)find $(INPUTDIR)/build -name "*.gcno" -o -name "*.gcda" -exec rm {} \; - $(Q)rm -rf $(OUTPUTDIR) - -.PHONY: gcov -gcov: - $(Q)for APP in test ; do \ - mkdir -p $(OUTPUTDIR)/$$APP ; cd $(OUTPUTDIR)/$$APP ; \ - for FIC in `strings $(RTE_OUTPUT)/app/$$APP | grep gcda | sed s,gcda,o,` ; do \ - SUBDIR=`basename $$FIC`;\ - mkdir $$SUBDIR ;\ - cd $$SUBDIR ;\ - $(GCOV) $(RTE_OUTPUT)/app/$$APP -o $$FIC > gcov.log; \ - cd - >/dev/null;\ - done ; \ - cd - >/dev/null; \ - done diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk deleted file mode 100644 index 32bed5d951..0000000000 --- a/mk/rte.sdkinstall.mk +++ /dev/null @@ -1,152 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright 2015 6WIND S.A. - -# Configuration, compilation and installation can be done at once -# with make install T=<config> - -ifdef T # config, build and install combined -# The build directory is T and may be prepended with O -O ?= . -RTE_OUTPUT := $O/$T -else # standard install -# Build directory is given with O= -O ?= build -RTE_OUTPUT := $O -endif - -ifneq ($(MAKECMDGOALS),pre_install) -include $(RTE_SDK)/mk/rte.vars.mk -endif - -ifdef T # defaults with T= will install an almost flat staging tree -export prefix ?= -kerneldir ?= $(prefix)/kmod -else -ifeq ($(RTE_EXEC_ENV),linuxapp) -RTE_EXEC_ENV=linux -endif -ifeq ($(RTE_EXEC_ENV),linux) -kerneldir ?= $(RTE_KERNELDIR:/build=/extra/dpdk) -else -kerneldir ?= /boot/modules -endif -prefix ?= /usr/local -endif -exec_prefix ?= $(prefix) -bindir ?= $(exec_prefix)/bin -sbindir ?= $(exec_prefix)/sbin -libdir ?= $(exec_prefix)/lib -includedir ?= $(prefix)/include/dpdk -datarootdir ?= $(prefix)/share -docdir ?= $(datarootdir)/doc/dpdk -datadir ?= $(datarootdir)/dpdk -mandir ?= $(datarootdir)/man -sdkdir ?= $(datadir) -targetdir ?= $(datadir)/$(RTE_TARGET) - -# The install directories may be staged in DESTDIR - -# Create the directory $1 if not exists -rte_mkdir = test -d $1 || mkdir -p $1 - -# Create the relative symbolic link $2 -> $1 -# May be replaced with --relative option of ln from coreutils-8.16 -rte_symlink = ln -snf $$($(RTE_SDK)/buildtools/relpath.sh $1 $(dir $2)) $2 - -.PHONY: pre_install -pre_install: -ifdef T - $(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - else \ - if [ -f $(RTE_OUTPUT)/.config.orig ] ; then \ - tmp_build=$(RTE_OUTPUT)/.config.tmp; \ - $(MAKE) config O=$$tmp_build; \ - if ! cmp -s $(RTE_OUTPUT)/.config.orig $$tmp_build/.config ; then \ - echo "Conflict: local config and template config have both changed"; \ - exit 1; \ - fi; \ - fi; \ - echo "Using local configuration"; \ - fi - $(Q)$(MAKE) all O=$(RTE_OUTPUT) -endif - -.PHONY: install -install: -ifeq ($(DESTDIR)$(if $T,,+),) - @echo Installation cannot run with T defined and DESTDIR undefined -else - @echo ================== Installing $(DESTDIR)$(prefix)/ - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-kmod - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-doc - @echo Installation in $(DESTDIR)$(prefix)/ complete -endif - -# when installing we want recursive copies preserving timestamps only, no -# preservation of user/group ids or permissions -CP_FLAGS=-dR --preserve=timestamps -TAR_X_FLAGS=--strip-components=1 --keep-newer-files --no-same-owner --no-same-permissions - -install-runtime: - $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp $(CP_FLAGS) $O/lib/* $(DESTDIR)$(libdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $O --exclude 'app/*.map' \ - --exclude app/dpdk-pmdinfogen \ - --exclude 'app/cmdline*' --exclude app/test \ - --exclude app/testacl --exclude app/testpipeline app | \ - tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools) - $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \ - tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ - $(DESTDIR)$(sbindir)/dpdk-devbind) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-pmdinfo.py, \ - $(DESTDIR)$(bindir)/dpdk-pmdinfo) -ifneq ($(wildcard $O/doc/man/*/*.1),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man1) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1 -endif -ifneq ($(wildcard $O/doc/man/*/*.8),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man8) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.8 $(DESTDIR)$(mandir)/man8 -endif - -install-kmod: -ifneq ($(wildcard $O/kmod/*),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) - $(Q)cp $(CP_FLAGS) $O/kmod/* $(DESTDIR)$(kerneldir) -endif - -install-sdk: - $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir)) - $(Q)tar -chf - -C $O include | \ - tar -xf - -C $(DESTDIR)$(includedir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) - $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) - $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app - $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) - $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) - -install-doc: -ifneq ($(wildcard $O/doc/html),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)) - $(Q)tar -cf - -C $O/doc --exclude 'html/guides/.*' html | \ - tar -xf - -C $(DESTDIR)$(docdir) $(TAR_X_FLAGS) -endif -ifneq ($(wildcard $O/doc/*/*/*pdf),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides) - $(Q)cp $(CP_FLAGS) $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides -endif - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/examples $(DESTDIR)$(datadir) diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk deleted file mode 100644 index fbee6e96d9..0000000000 --- a/mk/rte.sdkroot.mk +++ /dev/null @@ -1,115 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif - -RTE_SRCDIR = $(CURDIR) -export RTE_SRCDIR - -BUILDING_RTE_SDK := 1 -export BUILDING_RTE_SDK - -# -# We can specify the configuration template when doing the "make -# config". For instance: make config T=x86_64-native-linux-gcc -# -RTE_CONFIG_TEMPLATE := -ifdef T -ifeq ("$(origin T)", "command line") -RTE_CONFIG_TEMPLATE := $(RTE_SRCDIR)/config/defconfig_$(T) -endif -endif -export RTE_CONFIG_TEMPLATE - -# -# Default output is $(RTE_SRCDIR)/build -# output files wil go in a separate directory -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# the directory where intermediate build files are stored, like *.o, -# *.d, *.cmd, ... -BUILDDIR = $(RTE_OUTPUT)/build -export BUILDDIR - -export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n - -.PHONY: default test-build -default test-build: all - -.PHONY: warning -warning: - @echo - @echo "=========================== WARNING ============================" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "================================================================" - @echo - @test "$(MAKE_PAUSE)" = n || ( \ - echo "This deprecation warning can be passed by adding MAKE_PAUSE=n"; \ - echo "to 'make' command line or as an exported environment variable."; \ - echo "Press enter to continue..."; read junk) - -.PHONY: config defconfig showconfigs showversion showversionum -config: warning -config defconfig showconfigs showversion showversionum: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk $@ - -.PHONY: cscope gtags tags etags -cscope gtags tags etags: - $(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T - -.PHONY: test test-fast test-perf coverage test-drivers test-dump -test test-fast test-perf coverage test-drivers test-dump: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@ - -.PHONY: install -install: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ -install-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ - -.PHONY: doc help -doc: doc-all -help: doc-help -doc-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkdoc.mk $* - -.PHONY: gcov gcovclean -gcov gcovclean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkgcov.mk $@ - -.PHONY: examples examples_clean -examples examples_clean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkexamples.mk $@ - -# all other build targets -%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkroot.mk warning - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkbuild.mk $@ diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk deleted file mode 100644 index 803018ba3a..0000000000 --- a/mk/rte.sdktest.mk +++ /dev/null @@ -1,76 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -DATE := $(shell date '+%Y%m%d-%H%M') -AUTOTEST_DIR := $(RTE_OUTPUT)/autotest-$(DATE) - -DIR := $(shell basename $(RTE_OUTPUT)) - -# -# test: launch auto-tests, very simple for now. -# -.PHONY: test test-fast test-perf test-drivers test-dump coverage - -PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\ - reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\ - barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\ - eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\ - distributor_perf,ring_pmd_perf,pmd_perf,ring_perf -DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\ - cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\ - cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\ - cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\ - cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc -DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\ - dump_log_types,dump_ring,dump_physmem,dump_memzone - -SPACESTR:= -SPACESTR+= -STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST)) -STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST)) -STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST)) - -coverage: BLACKLIST=-$(STRIPPED_PERFLIST) -test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST) -test-perf: WHITELIST=$(STRIPPED_PERFLIST) -test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST) -test-dump: WHITELIST=$(STRIPPED_DUMPLIST) - -test test-fast test-perf test-drivers test-dump: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST); \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ; \ - fi - -# this is a special target to ease the pain of running coverage tests -# this runs all the autotests, cmdline_test script and dpdk-procinfo -coverage: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \ - $(RTE_OUTPUT)/app/cmdline_test; \ - ulimit -S -n 100 ; \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST) ; \ - $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ;\ - fi diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk deleted file mode 100644 index 2b501ddb84..0000000000 --- a/mk/rte.shared.mk +++ /dev/null @@ -1,108 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(SHARED) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/lib/$(SHARED) -_CLEAN = doclean - -# Set fPIC in CFLAGS for .so generation -CFLAGS += -fPIC - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -O_TO_SO = $(CC) $(call linkerprefix,$(LDFLAGS)) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(call linkerprefix,$(LDLIBS)) -else -O_TO_SO = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(LDLIBS) -endif - -O_TO_SO_STR = $(subst ','\'',$(O_TO_SO)) #'# fix syntax highlight -O_TO_SO_DISP = $(if $(V),"$(O_TO_SO_STR)"," LD $(@)") -O_TO_SO_CMD = "cmd_$@ = $(O_TO_SO_STR)" -O_TO_SO_DO = @set -e; \ - echo $(O_TO_SO_DISP); \ - $(O_TO_SO) && \ - echo $(O_TO_SO_CMD) > $(call exe2cmd,$(@)) - --include .$(SHARED).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Archive objects in .so file if needed -# -$(SHARED): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(SHARED)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_SO_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_SO_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_SO_DO)) - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(SHARED): $(SHARED) - @echo " INSTALL-SHARED $(SHARED)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(SHARED) $(RTE_OUTPUT)/lib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(SHARED) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.subdir.mk b/mk/rte.subdir.mk deleted file mode 100644 index d6e64a2460..0000000000 --- a/mk/rte.subdir.mk +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# .mk to build subdirectories -# - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -CLEANDIRS = $(addsuffix _clean,$(DIRS-y) $(DIRS-n) $(DIRS-)) - -VPATH += $(SRCDIR) -_BUILD = $(DIRS-y) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = $(CLEANDIRS) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -.SECONDEXPANSION: -.PHONY: $(DIRS-y) -$(DIRS-y): - @[ -d $(CURDIR)/$@ ] || mkdir -p $(CURDIR)/$@ - @echo "== Build $S/$@" - @$(MAKE) S=$S/$@ -f $(SRCDIR)/$@/Makefile -C $(CURDIR)/$@ all - -.PHONY: clean -clean: _postclean - -%_clean: - @echo "== Clean $S/$*" - @if [ -f $(SRCDIR)/$*/Makefile -a -d $(CURDIR)/$* ]; then \ - $(MAKE) S=$S/$* -f $(SRCDIR)/$*/Makefile -C $(CURDIR)/$* clean ; \ - fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk deleted file mode 100644 index 07b0db127f..0000000000 --- a/mk/rte.vars.mk +++ /dev/null @@ -1,102 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# To be included at the beginning of all RTE user Makefiles. This -# .mk will define the RTE environment variables by including the -# config file of SDK. It also includes the config file from external -# application if any. -# - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif -ifeq ($(wildcard $(RTE_SDK)),) -$(error RTE_SDK variable points to an invalid location) -endif - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -# if we are building SDK, only includes SDK configuration -ifneq ($(BUILDING_RTE_SDK),) - include $(RTE_OUTPUT)/.config - # remove double-quotes from config names - RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) - RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) - RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) - RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) - RTE_SDK_BIN := $(RTE_OUTPUT) -endif - -RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN) - -ifeq ($(BUILDING_RTE_SDK),) -# if we are building an external app/lib, include internal/rte.extvars.mk that will -# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...) -include $(RTE_SDK)/mk/internal/rte.extvars.mk -endif - -CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD) -ifneq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y) - CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_EM_PMD) -endif - -ifeq ($(RTE_ARCH),) -$(error RTE_ARCH is not defined) -endif - -ifeq ($(RTE_MACHINE),) -$(error RTE_MACHINE is not defined) -endif - -ifeq ($(RTE_EXEC_ENV),) -$(error RTE_EXEC_ENV is not defined) -endif - -ifeq ($(RTE_TOOLCHAIN),) -$(error RTE_TOOLCHAIN is not defined) -endif - -# can be overridden by make command line or exported environment variable -RTE_KERNELDIR ?= /lib/modules/$(shell uname -r)/build - -export RTE_TARGET -export RTE_ARCH -export RTE_MACHINE -export RTE_EXEC_ENV -export RTE_TOOLCHAIN - -# developer build automatically enabled in a git tree -ifneq ($(wildcard $(RTE_SDK)/.git),) -RTE_DEVEL_BUILD ?= y -endif - -# SRCDIR is the current source directory -ifdef S -SRCDIR := $(abspath $(RTE_SRCDIR)/$(S)) -else -SRCDIR := $(RTE_SRCDIR) -endif - -# helper: return y if option is set to y, else return an empty string -testopt = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -# helper: return an empty string if option is set, else return y -not = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk -else -include $(RTE_SDK)/mk/target/generic/rte.vars.mk -endif diff --git a/mk/target/generic/rte.app.mk b/mk/target/generic/rte.app.mk deleted file mode 100644 index ed82656f18..0000000000 --- a/mk/target/generic/rte.app.mk +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# define Makefile targets that are specific to an environment. -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.app.mk - -.PHONY: exec-env-appinstall -target-appinstall: exec-env-appinstall - -.PHONY: exec-env-appclean -target-appclean: exec-env-appclean diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk deleted file mode 100644 index 11b0418e55..0000000000 --- a/mk/target/generic/rte.vars.mk +++ /dev/null @@ -1,132 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# This .mk is the generic target rte.var.mk ; it includes .mk for -# the specified machine, architecture, toolchain (compiler) and -# executive environment. -# - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# -ifneq ($(wildcard $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk),) -include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk -else -MACHINE_CFLAGS := -march=$(RTE_MACHINE) -endif - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk - -# Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are -# provided by Kbuild framework. -ifeq ($(KERNELRELEASE),) - -# now that the environment is mostly set up, including the machine type we will -# be passing to the compiler, set up the specific CPU flags based on that info. -include $(RTE_SDK)/mk/rte.cpuflags.mk - -# merge all CFLAGS -CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS) -CFLAGS += $(TARGET_CFLAGS) - -# merge all LDFLAGS -LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFLAGS) -LDFLAGS += $(TARGET_LDFLAGS) - -# merge all ASFLAGS -ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS) -ASFLAGS += $(TARGET_ASFLAGS) - -# add default include and lib paths -CFLAGS += -I$(RTE_OUTPUT)/include -LDFLAGS += -L$(RTE_OUTPUT)/lib - -# add in flag for supporting function versioning. The define is used in meson -# builds to ensure that the user has properly flagged the unit in question as -# using function versioning so it can be built twice - once for static lib and -# then a second time for the shared lib. Since make only builds one library -# type at a time, such precautions aren't necessary, so we can globally define -# the flag -CFLAGS += -DRTE_USE_FUNCTION_VERSIONING - -# always include rte_config.h: the one in $(RTE_OUTPUT)/include is -# the configuration of SDK when $(BUILDING_RTE_SDK) is true, or the -# configuration of the application if $(BUILDING_RTE_SDK) is not -# defined. -ifeq ($(BUILDING_RTE_SDK),1) -# building sdk -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -DALLOW_INTERNAL_API -else -# if we are building an external application, include SDK's lib and -# includes too -CFLAGS += -I$(RTE_SDK_BIN)/include -ifneq ($(wildcard $(RTE_OUTPUT)/include/rte_config.h),) -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -endif -CFLAGS += -include $(RTE_SDK_BIN)/include/rte_config.h -LDFLAGS += -L$(RTE_SDK_BIN)/lib -endif - -# always define _GNU_SOURCE -CFLAGS += -D_GNU_SOURCE - -# define __BSD_VISIBLE when building for FreeBSD -ifeq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),y) -CFLAGS += -D__BSD_VISIBLE -endif - -export CFLAGS -export LDFLAGS - -endif diff --git a/mk/toolchain/clang/rte.toolchain-compat.mk b/mk/toolchain/clang/rte.toolchain-compat.mk deleted file mode 100644 index e6189b498d..0000000000 --- a/mk/toolchain/clang/rte.toolchain-compat.mk +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out CLANG version - -CLANG_VERSION := $(shell $(CC) -v 2>&1 | \ - sed -n "s/.*version \([0-9]*\.[0-9]*\).*/\1/p") - -CLANG_MAJOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f1 -d.) - -CLANG_MINOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f2 -d.) - -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -lt 35 && echo 1), 1) - CC_SUPPORTS_Z := false -endif diff --git a/mk/toolchain/clang/rte.vars.mk b/mk/toolchain/clang/rte.vars.mk deleted file mode 100644 index d441f6d8f3..0000000000 --- a/mk/toolchain/clang/rte.vars.mk +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)clang -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = clang -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers - -# disable packed member unalign warnings -ifeq ($(shell test $(CLANG_MAJOR_VERSION) -ge 4 && echo 1), 1) -WERROR_FLAGS += -Wno-address-of-packed-member -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk deleted file mode 100644 index 98dca3e786..0000000000 --- a/mk/toolchain/gcc/rte.toolchain-compat.mk +++ /dev/null @@ -1,120 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -#find out GCC version - -GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1) -GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1) -GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(CC) -E -x c - | tail -n 1) -GCC_VERSION = $(GCC_MAJOR)$(GCC_MINOR) - -HOST_GCC_MAJOR = $(shell echo __GNUC__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_VERSION = $(HOST_GCC_MAJOR)$(HOST_GCC_MINOR) - -LD_VERSION = $(shell $(LD) -v) -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(CONFIG_RTE_ARCH_X86), y) -ifneq ($(filter 2.30%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.30. See Bug 97) -endif -endif -ifneq ($(filter 2.31%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.31. See Bug 249) -endif -endif -endif - -# if GCC is older than 4.x -ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1) - MACHINE_CFLAGS = -$(warning You are using GCC < 4.x. This is neither supported, nor tested.) - - -else -# GCC graceful degradation -# GCC 4.2.x - added support for generic target -# GCC 4.3.x - added support for core2, ssse3, sse4.1, sse4.2 -# GCC 4.4.x - added support for avx, aes, pclmul -# GCC 4.5.x - added support for atom -# GCC 4.6.x - added support for corei7, corei7-avx -# GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2 -# GCC 4.9.x - added support for armv8-a+crc -# - ifeq ($(shell test $(GCC_VERSION) -le 49 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc,-march=armv8-a+crc -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc+crypto,-march=armv8-a+crc+crypto -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -le 47 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=core-avx2,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 46 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-march=core2 -maes -mpclmul -mavx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=corei7,-march=core2 -maes -mpclmul,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 45 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=atom,-march=core2 -mssse3,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 44 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -mavx -mpclmul -maes,$(MACHINE_CFLAGS)) - ifneq ($(findstring SSE4_2, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.2 - endif - ifneq ($(findstring SSE4_1, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.1 - endif - endif - ifeq ($(shell test $(GCC_VERSION) -lt 43 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -msse% -mssse%,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core2,-march=generic,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS += -msse3 - endif - ifeq ($(shell test $(GCC_VERSION) -lt 42 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -march% -mtune% -msse%,$(MACHINE_CFLAGS)) - endif - - ifeq ($(shell test $(GCC_VERSION) -lt 74 && echo 1), 1) - CONFIG_RTE_ENABLE_LTO=n - endif - - # Disable thunderx PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable OPDL PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - - # Disable OCTEON drivers and libs for arm64 gcc < 4.8.6 - ifeq ($(RTE_ARCH), arm64) - ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d - CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX_PMD=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=d - CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=d - endif - endif - -endif diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk deleted file mode 100644 index 928f0e0830..0000000000 --- a/mk/toolchain/gcc/rte.vars.mk +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)gcc -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -ifeq ($(CONFIG_RTE_LIBRTE_GCOV),y) -TOOLCHAIN_CFLAGS += --coverage -TOOLCHAIN_LDFLAGS += --coverage -ifeq (,$(findstring -O0,$(EXTRA_CFLAGS))) - $(warning "EXTRA_CFLAGS doesn't contains -O0, coverage will be inaccurate with optimizations enabled") -endif -endif - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# There are many issues reported for strict alignment architectures -# which are not necessarily fatal. Report as warnings. -ifeq ($(CONFIG_RTE_ARCH_STRICT_ALIGN),y) -WERROR_FLAGS += -Wno-error=cast-align -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -# workaround for GCC bug 81440 -ifeq ($(shell test $(GCC_VERSION) -lt 80 && echo 1), 1) -WERROR_FLAGS += -Wno-lto-type-mismatch -endif -endif - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers -# workaround GCC bug with warning "may be used uninitialized" -ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) -WERROR_FLAGS += -Wno-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -# FIXME: Bugzilla 396 -WERROR_FLAGS += -Wno-zero-length-bounds -endif - -HOST_WERROR_FLAGS := $(WERROR_FLAGS) - -ifeq ($(shell test $(HOST_GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -HOST_WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -HOST_WERROR_FLAGS += -Wno-format-truncation -endif - -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -WERROR_FLAGS += -Wno-format-truncation -endif - -# disable packed member unalign warnings -WERROR_FLAGS += -Wno-address-of-packed-member - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk deleted file mode 100644 index 2d663b34ad..0000000000 --- a/mk/toolchain/icc/rte.toolchain-compat.mk +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out ICC version - -ICC_MAJOR_VERSION = $(shell icc -dumpversion | cut -f1 -d.) - -ifeq ($(shell test $(ICC_MAJOR_VERSION) -lt 12 && echo 1), 1) - MACHINE_CFLAGS = -xSSE4.2 -$(warning You are not using ICC 12.x or higher. This is neither supported, nor tested.) - -else -# proceed to adjust compiler flags - - ICC_MINOR_VERSION = $(shell icc -dumpversion | cut -f2 -d.) - -# replace GCC flags with ICC flags - # if icc version >= 12 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 12 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -march=atom,-xSSSE3_ATOM -march=atom,$(MACHINE_CFLAGS)) - # nehalem/westmere - MACHINE_CFLAGS := $(patsubst -march=corei7,-xSSE4.2 -march=corei7,$(MACHINE_CFLAGS)) - # sandy bridge - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-xAVX,$(MACHINE_CFLAGS)) - # ivy bridge - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-xCORE-AVX-I,$(MACHINE_CFLAGS)) - # hsw - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-xCORE-AVX2,$(MACHINE_CFLAGS)) - # remove westmere flags - MACHINE_CFLAGS := $(filter-out -mpclmul -maes,$(MACHINE_CFLAGS)) - endif - # if icc version == 12.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 12 && test $(ICC_MINOR_VERSION) -eq 0 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -xSSSE3_ATOM,-xSSE3_ATOM,$(MACHINE_CFLAGS)) - # remove march options - MACHINE_CFLAGS := $(patsubst -march=%,-xSSE3,$(MACHINE_CFLAGS)) - endif - - # Disable thunderx PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable event/opdl PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - -endif diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk deleted file mode 100644 index 1729f3d849..0000000000 --- a/mk/toolchain/icc/rte.vars.mk +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -# Warning: we do not use CROSS environment variable as icc is mainly a -# x86->x86 compiler - -CC = icc -KERNELCC = gcc -CPP = cpp -AS = nasm -AR = ar -LD = ld -OBJCOPY = objcopy -OBJDUMP = objdump -STRIP = strip -READELF = readelf - -ifeq ($(KERNELRELEASE),) -HOSTCC = icc -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = -TOOLCHAIN_ASFLAGS = - -# Turn off some ICC warnings - -# Remark #271 : trailing comma is nonstandard -# Warning #1478 : function "<func_name>" (declared at line N of "<filename>") -# error #13368: loop was not vectorized with "vector always assert" -# error #15527: loop was not vectorized: function call to fprintf cannot be vectorize -# was declared "deprecated" -# Warning #11074, 11076: to prevent "inline-max-size" warnings. -WERROR_FLAGS := -Wall -w2 -diag-disable 271 -diag-warning 1478 -WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527 -WERROR_FLAGS += -diag-disable 188 -WERROR_FLAGS += -diag-disable 11074 -diag-disable 11076 -Wdeprecated - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 11/37] config: remove all config files used by make 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (9 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 10/37] build: remove makefiles and mk directory Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 12/37] examples: remove old build system references Ciara Power ` (27 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon, Anatoly Burakov Make is not supported for compiling DPDK, the config files are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - 48 files changed, 1850 deletions(-) delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux deleted file mode 100644 index e942657a0f..0000000000 --- a/config/common_armv8a_linux +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv8a" - -CONFIG_RTE_ARCH="arm64" -CONFIG_RTE_ARCH_ARM64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_FORCE_INTRINSICS=y - -# Maximum available cache line size in arm64 implementations. -# Setting to maximum available cache line size in generic config -# to address minimum DMA alignment across all arm64 implementations. -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_USE_C11_MEM_MODEL=y - -# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) -# to determine the best threshold in code. Refer to notes in source file -# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info. -CONFIG_RTE_ARCH_ARM64_MEMCPY=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048 -#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512 -# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're -# strong reasons. -#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF -#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n - -CONFIG_RTE_LIBRTE_IONIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n - -# -# NXP PFE PMD Driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=y diff --git a/config/common_base b/config/common_base deleted file mode 100644 index fbf0ee70c8..0000000000 --- a/config/common_base +++ /dev/null @@ -1,1154 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -# -# String that appears before the version number -# -CONFIG_RTE_VER_PREFIX="DPDK" - -# -# Version information completed when this file is processed for a build -# -CONFIG_RTE_VER_YEAR=__YEAR -CONFIG_RTE_VER_MONTH=__MONTH -CONFIG_RTE_VER_MINOR=__MINOR -CONFIG_RTE_VER_SUFFIX=__SUFFIX -CONFIG_RTE_VER_RELEASE=__RELEASE - -# -# define executive environment -# RTE_EXEC_ENV values are the directories in mk/exec-env/ -# -CONFIG_RTE_EXEC_ENV= - -# -# define the architecture we compile for. -# RTE_ARCH values are the directories in mk/arch/ -# -CONFIG_RTE_ARCH= - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE values are the directories in mk/machine/ -# -CONFIG_RTE_MACHINE= - -# -# The compiler we use. -# RTE_TOOLCHAIN values are the directories in mk/toolchain/ -# -CONFIG_RTE_TOOLCHAIN= - -# -# Use intrinsics or assembly code for key routines -# -CONFIG_RTE_FORCE_INTRINSICS=n - -# -# Machine forces strict alignment constraints. -# -CONFIG_RTE_ARCH_STRICT_ALIGN=n - -# -# Enable link time optimization -# -CONFIG_RTE_ENABLE_LTO=n - -# -# Compile to share library -# -CONFIG_RTE_BUILD_SHARED_LIB=n - -# -# Use newest code breaking previous ABI -# -CONFIG_RTE_NEXT_ABI=y - -# -# Machine's cache line size -# -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# -# Memory model -# -CONFIG_RTE_USE_C11_MEM_MODEL=n - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_LIBRTE_EAL=y -CONFIG_RTE_MAX_LCORE=128 -CONFIG_RTE_MAX_NUMA_NODES=8 -CONFIG_RTE_MAX_HEAPS=32 -CONFIG_RTE_MAX_MEMSEG_LISTS=64 -# each memseg list will be limited to either RTE_MAX_MEMSEG_PER_LIST pages -# or RTE_MAX_MEM_MB_PER_LIST megabytes worth of memory, whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_LIST=8192 -CONFIG_RTE_MAX_MEM_MB_PER_LIST=32768 -# a "type" is a combination of page size and NUMA node. total number of memseg -# lists per type will be limited to either RTE_MAX_MEMSEG_PER_TYPE pages (split -# over multiple lists of RTE_MAX_MEMSEG_PER_LIST pages), or -# RTE_MAX_MEM_MB_PER_TYPE megabytes of memory (split over multiple lists of -# RTE_MAX_MEM_MB_PER_LIST), whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_TYPE=32768 -CONFIG_RTE_MAX_MEM_MB_PER_TYPE=131072 -# global maximum usable amount of VA, in megabytes -CONFIG_RTE_MAX_MEM_MB=524288 -CONFIG_RTE_MAX_MEMZONE=2560 -CONFIG_RTE_MAX_TAILQ=32 -CONFIG_RTE_ENABLE_ASSERT=n -CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO -CONFIG_RTE_ENABLE_TRACE_FP=n -CONFIG_RTE_LOG_HISTORY=256 -CONFIG_RTE_BACKTRACE=y -CONFIG_RTE_LIBEAL_USE_HPET=n -CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n -CONFIG_RTE_EAL_IGB_UIO=n -CONFIG_RTE_EAL_VFIO=n -CONFIG_RTE_MAX_VFIO_GROUPS=64 -CONFIG_RTE_MAX_VFIO_CONTAINERS=64 -CONFIG_RTE_MALLOC_DEBUG=n -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_USE_LIBBSD=n -# Use WFE instructions to implement the rte_wait_for_equal_xxx APIs, -# calling these APIs put the cores in low power state while waiting -# for the memory address to become equal to the expected value. -# This is supported only by aarch64. -CONFIG_RTE_ARM_USE_WFE=n - -# -# Recognize/ignore the AVX/AVX512 CPU flags for performance/power testing. -# AVX512 is marked as experimental for now, will enable it after enough -# field test and possible optimization. -# -CONFIG_RTE_ENABLE_AVX=y -CONFIG_RTE_ENABLE_AVX512=n - -# Use ARM LSE ATOMIC instructions -CONFIG_RTE_ARM_FEATURE_ATOMICS=n - -# Default driver path (or "" to disable) -CONFIG_RTE_EAL_PMD_PATH="" - -# -# Compile Environment Abstraction Layer to support Vmware TSC map -# -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y - -# -# Compile the PCI library -# -CONFIG_RTE_LIBRTE_PCI=y - -# -# Compile the argument parser library -# -CONFIG_RTE_LIBRTE_KVARGS=y - -# -# Compile generic ethernet library -# -CONFIG_RTE_LIBRTE_ETHER=y -CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n -CONFIG_RTE_MAX_ETHPORTS=32 -CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 -CONFIG_RTE_LIBRTE_IEEE1588=n -CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16 -CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y -CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE=n - -# -# Turn off Tx preparation stage -# -# Warning: rte_eth_tx_prepare() can be safely disabled only if using a -# driver which do not implement any Tx preparation. -# -CONFIG_RTE_ETHDEV_TX_PREPARE_NOOP=n - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n - -# -# Compile the Intel FPGA bus -# -CONFIG_RTE_LIBRTE_IFPGA_BUS=y - -# -# Compile PCI bus driver -# -CONFIG_RTE_LIBRTE_PCI_BUS=y - -# -# Compile the vdev bus -# -CONFIG_RTE_LIBRTE_VDEV_BUS=y - -# -# Compile ARK PMD -# -CONFIG_RTE_LIBRTE_ARK_PMD=y -CONFIG_RTE_LIBRTE_ARK_PAD_TX=y -CONFIG_RTE_LIBRTE_ARK_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE=n - -# -# Compile Aquantia Atlantic PMD driver -# -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=y - -# -# Compile AMD PMD -# -CONFIG_RTE_LIBRTE_AXGBE_PMD=y -CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG=n - -# -# Compile burst-oriented Broadcom PMD driver -# -CONFIG_RTE_LIBRTE_BNX2X_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n -CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC=n - -# -# Compile burst-oriented Broadcom BNXT PMD driver -# -CONFIG_RTE_LIBRTE_BNXT_PMD=y - -# -# Compile burst-oriented Chelsio Terminator (CXGBE) PMD -# -CONFIG_RTE_LIBRTE_CXGBE_PMD=y - -# -# Compile burst-oriented NXP PFE PMD driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n - -# -# Compile NXP DPAA2 FSL-MC Bus -# -CONFIG_RTE_LIBRTE_FSLMC_BUS=n - -# -# Compile Support Libraries for NXP DPAA2 -# -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y - -# -# Compile burst-oriented NXP DPAA2 PMD driver -# -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n - -# -# Compile NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# -# Compile burst-oriented Amazon ENA PMD driver -# -CONFIG_RTE_LIBRTE_ENA_PMD=y -CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n - -# -# Compile burst-oriented Cisco ENIC PMD driver -# -CONFIG_RTE_LIBRTE_ENIC_PMD=y - -# -# Compile burst-oriented IGB & EM PMD drivers -# -CONFIG_RTE_LIBRTE_EM_PMD=y -CONFIG_RTE_LIBRTE_IGB_PMD=y -CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n - -# -# Compile burst-oriented HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# Compile burst-oriented HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n - -# -# Compile Pensando IONIC PMD driver -# -CONFIG_RTE_LIBRTE_IONIC_PMD=y - -# -# Compile burst-oriented IXGBE PMD driver -# -CONFIG_RTE_LIBRTE_IXGBE_PMD=y -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n -CONFIG_RTE_LIBRTE_IXGBE_BYPASS=n - -# -# Compile burst-oriented I40E PMD driver -# -CONFIG_RTE_LIBRTE_I40E_PMD=y -CONFIG_RTE_LIBRTE_I40E_DEBUG_RX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y -CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64 -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4 - -# -# Compile burst-oriented FM10K PMD -# -CONFIG_RTE_LIBRTE_FM10K_PMD=y -CONFIG_RTE_LIBRTE_FM10K_DEBUG_RX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE=y -CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y - -# -# Compile burst-oriented ICE PMD driver -# -CONFIG_RTE_LIBRTE_ICE_PMD=y -CONFIG_RTE_LIBRTE_ICE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n - -# Compile burst-oriented IAVF PMD driver -# -CONFIG_RTE_LIBRTE_IAVF_PMD=y -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC=n -CONFIG_RTE_LIBRTE_IAVF_16BYTE_RX_DESC=n -# -# Compile burst-oriented IPN3KE PMD driver -# -CONFIG_RTE_LIBRTE_IPN3KE_PMD=n - -# -# Compile burst-oriented IGC PMD drivers -# -CONFIG_RTE_LIBRTE_IGC_PMD=y -CONFIG_RTE_LIBRTE_IGC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IGC_DEBUG_TX=n - -# -# Compile burst-oriented Mellanox ConnectX-3 (MLX4) PMD -# -CONFIG_RTE_LIBRTE_MLX4_PMD=n -CONFIG_RTE_LIBRTE_MLX4_DEBUG=n - -# -# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, -# ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_PMD=n -CONFIG_RTE_LIBRTE_MLX5_DEBUG=n - -# -# Compile regex-oriented Mellanox PMD -# -CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD=n - -# -# Compile vdpa-oriented Mellanox ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=n - -# Linking method for mlx4/5 dependency on ibverbs and related libraries -# Default linking is dynamic by linker. -# Other options are: dynamic by dlopen at run-time, or statically embedded. -CONFIG_RTE_IBVERBS_LINK_DLOPEN=n -CONFIG_RTE_IBVERBS_LINK_STATIC=n - -# -# Compile burst-oriented Netronome NFP PMD driver -# -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n - -# QLogic 10G/25G/40G/50G/100G PMD -# -CONFIG_RTE_LIBRTE_QEDE_PMD=y -CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n -#Provides abs path/name of the firmware file. -#Empty string denotes driver will use default firmware -CONFIG_RTE_LIBRTE_QEDE_FW="" - -# -# Compile burst-oriented Solarflare libefx-based PMD -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=y -CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n - -# -# Compile software PMD backed by SZEDATA2 device -# -CONFIG_RTE_LIBRTE_PMD_SZEDATA2=n - -# -# Compile software PMD backed by NFB device -# -CONFIG_RTE_LIBRTE_NFB_PMD=n - -# -# Compile burst-oriented Cavium Thunderx NICVF PMD driver -# -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=y -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX=n - -# -# Compile burst-oriented Cavium LiquidIO PMD driver -# -CONFIG_RTE_LIBRTE_LIO_PMD=y -CONFIG_RTE_LIBRTE_LIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n - -# -# Compile burst-oriented Cavium OCTEONTX network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX_PMD=y - -# -# Compile burst-oriented Marvell OCTEON TX2 network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=y - -# -# Compile WRS accelerated virtual port (AVP) guest PMD driver -# -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_RX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n - -# -# Compile burst-oriented VIRTIO PMD driver -# -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n - -# -# Compile virtio device emulation inside virtio PMD driver -# -CONFIG_RTE_VIRTIO_USER=n - -# -# Compile burst-oriented VMXNET3 PMD driver -# -CONFIG_RTE_LIBRTE_VMXNET3_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n - -# -# Compile software PMD backed by AF_PACKET sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=n - -# -# Compile software PMD backed by AF_XDP sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_XDP=n - -# -# Compile Memory Interface PMD driver (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_MEMIF=n - -# -# Compile link bonding PMD library -# -CONFIG_RTE_LIBRTE_PMD_BOND=y -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n - -# -# Compile fail-safe PMD -# -CONFIG_RTE_LIBRTE_PMD_FAILSAFE=y - -# -# Compile Marvell PMD driver -# -CONFIG_RTE_LIBRTE_MVPP2_PMD=n - -# -# Compile Marvell MVNETA PMD driver -# -CONFIG_RTE_LIBRTE_MVNETA_PMD=n - -# -# Compile support for VMBus library -# -CONFIG_RTE_LIBRTE_VMBUS=n - -# -# Compile native PMD for Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_NETVSC_PMD=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_DUMP=n - -# -# Compile virtual device driver for NetVSC on Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=n - -# -# Compile null PMD -# -CONFIG_RTE_LIBRTE_PMD_NULL=y - -# -# Compile software PMD backed by PCAP files -# -CONFIG_RTE_LIBRTE_PMD_PCAP=n - -# -# Compile example software rings based PMD -# -CONFIG_RTE_LIBRTE_PMD_RING=y -CONFIG_RTE_PMD_RING_MAX_RX_RINGS=16 -CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 - -# -# Compile SOFTNIC PMD -# -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=n - -# -# Compile the TAP PMD -# It is enabled by default for Linux only. -# -CONFIG_RTE_LIBRTE_PMD_TAP=n - -# -# Do prefetch of packet data within PMD driver receive function -# -CONFIG_RTE_PMD_PACKET_PREFETCH=y - -# Compile generic wireless base band device library -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_BBDEV=y -CONFIG_RTE_LIBRTE_BBDEV_DEBUG=n -CONFIG_RTE_BBDEV_MAX_DEVS=128 -CONFIG_RTE_BBDEV_OFFLOAD_COST=y -CONFIG_RTE_BBDEV_SDK_AVX2=n -CONFIG_RTE_BBDEV_SDK_AVX512=n - -# -# Compile PMD for NULL bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL=y - -# -# Compile PMD for turbo software bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y - -# -# Compile PMD for Intel FPGA LTE FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y - -# -# Compile PMD for Intel FPGA 5GNR FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC=y - -# -# Compile generic crypto device library -# -CONFIG_RTE_LIBRTE_CRYPTODEV=y -CONFIG_RTE_CRYPTO_MAX_DEVS=64 - -# -# Compile PMD for ARMv8 Crypto device -# -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n - -# -# Compile NXP CAAM JR crypto Driver -# -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE=n - -# -# Compile NXP DPAA2 crypto sec driver for CAAM HW -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n - -# -# NXP DPAA caam - crypto driver -# -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4 - -# -# Compile PMD for Cavium OCTEON TX crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y - -# -# Compile PMD for Marvell OCTEON TX2 crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y - -# -# Compile PMD for QuickAssist based devices - see docs for details -# -CONFIG_RTE_LIBRTE_PMD_QAT=y -CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n -CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n -# -# Max. number of QuickAssist devices, which can be detected and attached -# -CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 -CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -# -# Compile PMD for virtio crypto devices -# -CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y -# -# Number of maximum virtio crypto devices -# -CONFIG_RTE_MAX_VIRTIO_CRYPTO=32 - -# -# Compile PMD for AESNI backed device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# Compile PMD for Software backed device -# -CONFIG_RTE_LIBRTE_PMD_OPENSSL=n - -# -# Compile PMD for AESNI GCM device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# Compile PMD for SNOW 3G device -# -CONFIG_RTE_LIBRTE_PMD_SNOW3G=n -CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG=n - -# -# Compile PMD for KASUMI device -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# Compile PMD for ZUC device -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# Compile PMD for Crypto Scheduler device -# -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y - -# -# Compile PMD for NULL Crypto device -# -CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=y - -# -# Compile PMD for AMD CCP crypto device -# -CONFIG_RTE_LIBRTE_PMD_CCP=n - -# -# Compile PMD for Marvell Crypto device -# -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=n - -# -# Compile PMD for NITROX crypto device -# -CONFIG_RTE_LIBRTE_PMD_NITROX=y - -# -# Compile generic security library -# -CONFIG_RTE_LIBRTE_SECURITY=y - -# -# Compile generic compression device library -# -CONFIG_RTE_LIBRTE_COMPRESSDEV=y -CONFIG_RTE_COMPRESS_MAX_DEVS=64 - -# -# Compile compressdev unit test -# -CONFIG_RTE_COMPRESSDEV_TEST=n - -# -# Compile PMD for Octeontx ZIPVF compression device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF=y - -# -# Compile PMD for ISA-L compression device -# -CONFIG_RTE_LIBRTE_PMD_ISAL=n - -# -# Compile PMD for ZLIB compression device -# -CONFIG_RTE_LIBRTE_PMD_ZLIB=n - -# -# Compile RegEx device support -# -CONFIG_RTE_LIBRTE_REGEXDEV=y -CONFIG_RTE_LIBRTE_REGEXDEV_DEBUG=n -CONFIG_RTE_MAX_REGEXDEV_DEVS=32 - -# -# Compile generic event device library -# -CONFIG_RTE_LIBRTE_EVENTDEV=y -CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n -CONFIG_RTE_EVENT_MAX_DEVS=16 -CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64 -CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32 -CONFIG_RTE_EVENT_ETH_INTR_RING_SIZE=1024 -CONFIG_RTE_EVENT_CRYPTO_ADAPTER_MAX_INSTANCE=32 -CONFIG_RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE=32 - -# -# Compile PMD for skeleton event device -# -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG=n - -# -# Compile PMD for software event device -# -CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y - -# -# Compile PMD for distributed software event device -# -CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV=y - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y - -# -# Compile PMD for octeontx2 sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=y - -# -# Compile PMD for OPDL event device -# -CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=y - -# -# Compile PMD for NXP DPAA event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n - -# -# Compile PMD for NXP DPAA2 event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n - -# -# Compile raw device support -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_RAWDEV=y -CONFIG_RTE_RAWDEV_MAX_DEVS=64 -CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV=y - -# -# Compile PMD for NXP DPAA2 CMDIF raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n - -# -# Compile PMD for NXP DPAA2 QDMA raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n - -# -# Compile PMD for Intel FPGA raw device -# -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n - -# -# Compile PMD for Intel IOAT raw device -# -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=y - -# -# Compile PMD for octeontx2 DMA raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=y - -# -# Compile PMD for octeontx2 EP raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=y - -# -# Compile PMD for NTB raw device -# -CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV=y - -# -# Compile librte_ring -# -CONFIG_RTE_LIBRTE_RING=y - -# -# Compile librte_stack -# -CONFIG_RTE_LIBRTE_STACK=y - -# -# Compile librte_mempool -# -CONFIG_RTE_LIBRTE_MEMPOOL=y -CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512 -CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n - -# -# Compile Mempool drivers -# -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET=y -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB=64 -CONFIG_RTE_DRIVER_MEMPOOL_RING=y -CONFIG_RTE_DRIVER_MEMPOOL_STACK=y - -# -# Compile PMD for octeontx fpa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=y - -# -# Compile PMD for octeontx2 npa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=y - -# -# Compile librte_mbuf -# -CONFIG_RTE_LIBRTE_MBUF=y -CONFIG_RTE_LIBRTE_MBUF_DEBUG=n -CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="ring_mp_mc" -CONFIG_RTE_MBUF_REFCNT_ATOMIC=y -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# -# Compile librte_timer -# -CONFIG_RTE_LIBRTE_TIMER=y -CONFIG_RTE_LIBRTE_TIMER_DEBUG=n - -# -# Compile librte_cfgfile -# -CONFIG_RTE_LIBRTE_CFGFILE=y - -# -# Compile librte_cmdline -# -CONFIG_RTE_LIBRTE_CMDLINE=y -CONFIG_RTE_LIBRTE_CMDLINE_DEBUG=n - -# -# Compile librte_hash -# -CONFIG_RTE_LIBRTE_HASH=y -CONFIG_RTE_LIBRTE_HASH_DEBUG=n - -# -# Compile librte_efd -# -CONFIG_RTE_LIBRTE_EFD=y - -# -# Compile librte_member -# -CONFIG_RTE_LIBRTE_MEMBER=y - -# -# Compile librte_jobstats -# -CONFIG_RTE_LIBRTE_JOBSTATS=y - -# -# Compile the device metrics library -# -CONFIG_RTE_LIBRTE_METRICS=y - -# -# Compile the bitrate statistics library -# -CONFIG_RTE_LIBRTE_BITRATE=y - -# -# Compile the latency statistics library -# -CONFIG_RTE_LIBRTE_LATENCY_STATS=y - -# -# Compile librte_telemetry legacy support -# -CONFIG_RTE_LIBRTE_TELEMETRY=n - -# -# Compile librte_rcu -# -CONFIG_RTE_LIBRTE_RCU=y -CONFIG_RTE_LIBRTE_RCU_DEBUG=n - -# -# Compile librte_rib -# -CONFIG_RTE_LIBRTE_RIB=y - -# -# Compile librte_fib -# -CONFIG_RTE_LIBRTE_FIB=y -CONFIG_RTE_LIBRTE_FIB_DEBUG=n - -# -# Compile librte_lpm -# -CONFIG_RTE_LIBRTE_LPM=y -CONFIG_RTE_LIBRTE_LPM_DEBUG=n - -# -# Compile librte_acl -# -CONFIG_RTE_LIBRTE_ACL=y -CONFIG_RTE_LIBRTE_ACL_DEBUG=n - -# -# Compile librte_power -# -CONFIG_RTE_LIBRTE_POWER=n -CONFIG_RTE_LIBRTE_POWER_DEBUG=n -CONFIG_RTE_MAX_LCORE_FREQS=64 - -# -# Compile librte_net -# -CONFIG_RTE_LIBRTE_NET=y - -# -# Compile librte_ip_frag -# -CONFIG_RTE_LIBRTE_IP_FRAG=y -CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n -CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4 -CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n - -# -# Compile GRO library -# -CONFIG_RTE_LIBRTE_GRO=y - -# -# Compile GSO library -# -CONFIG_RTE_LIBRTE_GSO=y - -# -# Compile librte_meter -# -CONFIG_RTE_LIBRTE_METER=y - -# -# Compile librte_classify -# -CONFIG_RTE_LIBRTE_FLOW_CLASSIFY=y - -# -# Compile librte_sched -# -CONFIG_RTE_LIBRTE_SCHED=y -CONFIG_RTE_SCHED_DEBUG=n -CONFIG_RTE_SCHED_RED=n -CONFIG_RTE_SCHED_COLLECT_STATS=n -CONFIG_RTE_SCHED_SUBPORT_TC_OV=n -CONFIG_RTE_SCHED_PORT_N_GRINDERS=8 -CONFIG_RTE_SCHED_VECTOR=n - -# -# Compile the distributor library -# -CONFIG_RTE_LIBRTE_DISTRIBUTOR=y - -# -# Compile the reorder library -# -CONFIG_RTE_LIBRTE_REORDER=y - -# -# Compile librte_port -# -CONFIG_RTE_LIBRTE_PORT=y -CONFIG_RTE_PORT_STATS_COLLECT=n -CONFIG_RTE_PORT_PCAP=n - -# -# Compile librte_table -# -CONFIG_RTE_LIBRTE_TABLE=y -CONFIG_RTE_TABLE_STATS_COLLECT=n - -# -# Compile librte_pipeline -# -CONFIG_RTE_LIBRTE_PIPELINE=y -CONFIG_RTE_PIPELINE_STATS_COLLECT=n - -# -# Compile librte_kni -# -CONFIG_RTE_LIBRTE_KNI=n -CONFIG_RTE_LIBRTE_PMD_KNI=n -CONFIG_RTE_KNI_KMOD=n -CONFIG_RTE_KNI_PREEMPT_DEFAULT=y - -# -# Compile the pdump library -# -CONFIG_RTE_LIBRTE_PDUMP=y - -# -# Compile vhost user library -# -CONFIG_RTE_LIBRTE_VHOST=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n -CONFIG_RTE_LIBRTE_VHOST_DEBUG=n - -# -# Compile vhost PMD -# To compile, CONFIG_RTE_LIBRTE_VHOST should be enabled. -# -CONFIG_RTE_LIBRTE_PMD_VHOST=n - -# -# Compile IFC driver -# To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO -# should be enabled. -# -CONFIG_RTE_LIBRTE_IFC_PMD=n - -# -# Compile librte_bpf -# -CONFIG_RTE_LIBRTE_BPF=y -# allow load BPF from ELF files (requires libelf) -CONFIG_RTE_LIBRTE_BPF_ELF=n - -# -# Compile librte_ipsec -# -CONFIG_RTE_LIBRTE_IPSEC=y - -# -# Compile librte_graph -# -CONFIG_RTE_LIBRTE_GRAPH=y -CONFIG_RTE_GRAPH_BURST_SIZE=256 -CONFIG_RTE_LIBRTE_GRAPH_STATS=y - -# -# Compile librte_node -# -CONFIG_RTE_LIBRTE_NODE=y - -# -# Compile the test application -# -CONFIG_RTE_APP_TEST=y -CONFIG_RTE_APP_TEST_RESOURCE_TAR=n - -# -# Compile the procinfo application -# -CONFIG_RTE_PROC_INFO=n - -# -# Compile the PMD test application -# -CONFIG_RTE_TEST_PMD=y -CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n -CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n - -# -# Compile the rte flow perf application -# -CONFIG_RTE_TEST_FLOW_PERF=y - -# -# Compile the bbdev test application -# -CONFIG_RTE_TEST_BBDEV=y - -# -# Compile the compression performance application -# -CONFIG_RTE_APP_COMPRESS_PERF=y - -# -# Compile the crypto performance application -# -CONFIG_RTE_APP_CRYPTO_PERF=y - -# -# Compile the eventdev application -# -CONFIG_RTE_APP_EVENTDEV=y diff --git a/config/common_freebsd b/config/common_freebsd deleted file mode 100644 index 456b394c4d..0000000000 --- a/config/common_freebsd +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="bsdapp" -CONFIG_RTE_EXEC_ENV_BSDAPP=y -CONFIG_RTE_EXEC_ENV_FREEBSD=y - -# -# FreeBSD contiguous memory driver settings -# -CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64 -CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2 -CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024 diff --git a/config/common_linux b/config/common_linux deleted file mode 100644 index 816810671a..0000000000 --- a/config/common_linux +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="linuxapp" -CONFIG_RTE_EXEC_ENV_LINUX=y -CONFIG_RTE_EXEC_ENV_LINUXAPP=y - -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y -CONFIG_RTE_EAL_VFIO=y -CONFIG_RTE_LIBRTE_KNI=y -CONFIG_RTE_LIBRTE_PMD_KNI=y -CONFIG_RTE_LIBRTE_VHOST=y -CONFIG_RTE_LIBRTE_VHOST_NUMA=y -CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n -CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFC_PMD=y -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y -CONFIG_RTE_LIBRTE_PMD_MEMIF=y -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y -CONFIG_RTE_LIBRTE_PMD_TAP=y -CONFIG_RTE_LIBRTE_AVP_PMD=y -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y -CONFIG_RTE_LIBRTE_NFP_PMD=y -CONFIG_RTE_LIBRTE_POWER=y -CONFIG_RTE_VIRTIO_USER=y -CONFIG_RTE_PROC_INFO=y - -CONFIG_RTE_LIBRTE_VMBUS=y -CONFIG_RTE_LIBRTE_NETVSC_PMD=y - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=y - -# NXP DPAA BUS and drivers -CONFIG_RTE_LIBRTE_DPAA_BUS=y -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y - -# NXP FSLMC BUS and DPAA2 drivers -CONFIG_RTE_LIBRTE_FSLMC_BUS=y -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA2_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y - -# -# NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=y - -# -# HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=y - -# -# Hisilicon HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=y diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc deleted file mode 120000 index 84619de43a..0000000000 --- a/config/defconfig_arm-armv7a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm-armv7a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc deleted file mode 100644 index ac91120868..0000000000 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All right reserved. - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv7a" - -CONFIG_RTE_ARCH="arm" -CONFIG_RTE_ARCH_ARM=y -CONFIG_RTE_ARCH_ARMv7=y -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a9" - -# Accelerate memcpy operations. Consider enabling for Cortex-A15. -# For Cortex-A7 and Cortex-A9, It might accelerate short data copies (< 64 B). -CONFIG_RTE_ARCH_ARM_NEON_MEMCPY=n - -CONFIG_RTE_FORCE_INTRINSICS=y -CONFIG_RTE_ARCH_STRICT_ALIGN=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# NUMA is not supported on ARM -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# ARM doesn't have support for vmware TSC map -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# KNI is not supported on 32-bit -CONFIG_RTE_LIBRTE_KNI=n - -# cannot use those on ARM -CONFIG_RTE_LIBRTE_ARK_PMD=n -CONFIG_RTE_LIBRTE_EM_PMD=n -CONFIG_RTE_LIBRTE_IGB_PMD=n -CONFIG_RTE_LIBRTE_CXGBE_PMD=n -CONFIG_RTE_LIBRTE_E1000_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_QEDE_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_arm64-armada-linux-gcc b/config/defconfig_arm64-armada-linux-gcc deleted file mode 120000 index 64ce2a5687..0000000000 --- a/config/defconfig_arm64-armada-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armada-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armada-linuxapp-gcc b/config/defconfig_arm64-armada-linuxapp-gcc deleted file mode 100644 index a49bebe374..0000000000 --- a/config/defconfig_arm64-armada-linuxapp-gcc +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Enable PMDs -CONFIG_RTE_LIBRTE_MVEP_COMMON=y -CONFIG_RTE_LIBRTE_MVPP2_PMD=y -CONFIG_RTE_LIBRTE_MVNETA_PMD=y -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y - -# Disable NXP as it is conflict with MUSDK -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n -CONFIG_RTE_LIBRTE_FSLMC_BUS=n -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n -CONFIG_RTE_LIBRTE_PFE_PMD=n -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang deleted file mode 120000 index 196808b982..0000000000 --- a/config/defconfig_arm64-armv8a-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linux-gcc b/config/defconfig_arm64-armv8a-linux-gcc deleted file mode 120000 index 0949519562..0000000000 --- a/config/defconfig_arm64-armv8a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang b/config/defconfig_arm64-armv8a-linuxapp-clang deleted file mode 100644 index d3b4dad532..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-clang +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc deleted file mode 100644 index 58c4a4029a..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_MAX_LCORE=256 diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc deleted file mode 120000 index dad37d5e79..0000000000 --- a/config/defconfig_arm64-bluefield-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-bluefield-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-bluefield-linuxapp-gcc b/config/defconfig_arm64-bluefield-linuxapp-gcc deleted file mode 100644 index b496538819..0000000000 --- a/config/defconfig_arm64-bluefield-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Mellanox BlueField -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# UMA architecture -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# PMD for ConnectX-5 -CONFIG_RTE_LIBRTE_MLX5_PMD=y diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc deleted file mode 120000 index dc05caacf3..0000000000 --- a/config/defconfig_arm64-dpaa-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-dpaa-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc deleted file mode 100644 index 4ae4cd8502..0000000000 --- a/config/defconfig_arm64-dpaa-linuxapp-gcc +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 Freescale Semiconductor, Inc. -# Copyright 2017-2019 NXP - -#include "defconfig_arm64-armv8a-linux-gcc" - -# NXP (Freescale) - Soc Architecture for DPAA or DPAA2 support -# DPAA - FMAN, QMAN & BMAN support (e.g. LS1043, LS1046) -# DPAA2 - WRIOP and QBMAN (e.g. LS1088, LS2088, LX2160 etc) -# -CONFIG_RTE_MACHINE="dpaa" -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Enable PHY mode when using VM-VFIO target -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc deleted file mode 120000 index 21894a31a8..0000000000 --- a/config/defconfig_arm64-emag-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-emag-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc deleted file mode 100644 index 1db654c899..0000000000 --- a/config/defconfig_arm64-emag-linuxapp-gcc +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="emag" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=32 diff --git a/config/defconfig_arm64-n1sdp-linux-gcc b/config/defconfig_arm64-n1sdp-linux-gcc deleted file mode 120000 index 103bbea90f..0000000000 --- a/config/defconfig_arm64-n1sdp-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-n1sdp-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-n1sdp-linuxapp-gcc b/config/defconfig_arm64-n1sdp-linuxapp-gcc deleted file mode 100644 index f9138093b5..0000000000 --- a/config/defconfig_arm64-n1sdp-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="n1sdp" -CONFIG_RTE_MAX_LCORE=4 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-octeontx2-linux-gcc b/config/defconfig_arm64-octeontx2-linux-gcc deleted file mode 120000 index e251505311..0000000000 --- a/config/defconfig_arm64-octeontx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-octeontx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc deleted file mode 100644 index 0d83becf54..0000000000 --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="octeontx2" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=36 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Max supported NIX LFs -CONFIG_RTE_MAX_VFIO_GROUPS=128 diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc deleted file mode 120000 index 829dd65f05..0000000000 --- a/config/defconfig_arm64-stingray-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-stingray-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc deleted file mode 100644 index 2a6f6cee28..0000000000 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) Broadcom 2017-2018. All rights reserved. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Broadcom - Stingray -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -CONFIG_RTE_EAL_IGB_UIO=y diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc deleted file mode 120000 index 1b9c4ad211..0000000000 --- a/config/defconfig_arm64-thunderx-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc deleted file mode 100644 index 946906b67a..0000000000 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx" - -CONFIG_RTE_USE_C11_MEM_MODEL=n -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=96 -CONFIG_RTE_MAX_VFIO_GROUPS=128 - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y diff --git a/config/defconfig_arm64-thunderx2-linux-gcc b/config/defconfig_arm64-thunderx2-linux-gcc deleted file mode 120000 index b40a760b1d..0000000000 --- a/config/defconfig_arm64-thunderx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc b/config/defconfig_arm64-thunderx2-linuxapp-gcc deleted file mode 100644 index af4a89c480..0000000000 --- a/config/defconfig_arm64-thunderx2-linuxapp-gcc +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx2" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=256 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc deleted file mode 120000 index d5e8b5e550..0000000000 --- a/config/defconfig_arm64-xgene1-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-xgene1-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-xgene1-linuxapp-gcc b/config/defconfig_arm64-xgene1-linuxapp-gcc deleted file mode 100644 index fbf576c4aa..0000000000 --- a/config/defconfig_arm64-xgene1-linuxapp-gcc +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="xgene1" -CONFIG_RTE_CACHE_LINE_SIZE=64 diff --git a/config/defconfig_i686-native-linux-gcc b/config/defconfig_i686-native-linux-gcc deleted file mode 120000 index 927141d5dd..0000000000 --- a/config/defconfig_i686-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_i686-native-linux-icc b/config/defconfig_i686-native-linux-icc deleted file mode 120000 index e6a466b3e3..0000000000 --- a/config/defconfig_i686-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc deleted file mode 100644 index 61ea1606f4..0000000000 --- a/config/defconfig_i686-native-linuxapp-gcc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc deleted file mode 100644 index 7f614d3467..0000000000 --- a/config/defconfig_i686-native-linuxapp-icc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc deleted file mode 120000 index 580c92e12e..0000000000 --- a/config/defconfig_ppc_64-power8-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_ppc_64-power8-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc deleted file mode 100644 index c917c47746..0000000000 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -#include "common_linux" - -CONFIG_RTE_MACHINE="power8" - -CONFIG_RTE_ARCH="ppc_64" -CONFIG_RTE_ARCH_PPC_64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_MAX_LCORE=1536 -CONFIG_RTE_MAX_NUMA_NODES=32 -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# Note: Power doesn't have this support -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# Note: Initially, all of the PMD drivers compilation are turned off on Power -# Will turn on them only after the successful testing on Power -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=n -CONFIG_RTE_LIBRTE_IXGBE_PMD=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang deleted file mode 100644 index 7204738e14..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc deleted file mode 100644 index b24e2e6d5a..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang deleted file mode 120000 index 76115fd5a6..0000000000 --- a/config/defconfig_x86_64-native-freebsd-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-freebsd-gcc b/config/defconfig_x86_64-native-freebsd-gcc deleted file mode 120000 index 72dd4b44be..0000000000 --- a/config/defconfig_x86_64-native-freebsd-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-clang b/config/defconfig_x86_64-native-linux-clang deleted file mode 120000 index 3bcf89d6a4..0000000000 --- a/config/defconfig_x86_64-native-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-gcc b/config/defconfig_x86_64-native-linux-gcc deleted file mode 120000 index d707965941..0000000000 --- a/config/defconfig_x86_64-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-icc b/config/defconfig_x86_64-native-linux-icc deleted file mode 120000 index a36b47131a..0000000000 --- a/config/defconfig_x86_64-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang deleted file mode 100644 index 7508c0f2da..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc deleted file mode 100644 index db67066a57..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc deleted file mode 100644 index 8aa7af7e20..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-icc +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# Solarflare PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# HINIC PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc deleted file mode 120000 index 7ea00cecb3..0000000000 --- a/config/defconfig_x86_x32-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_x32-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc deleted file mode 100644 index c188f4331c..0000000000 --- a/config/defconfig_x86_x32-native-linuxapp-gcc +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_x32" -CONFIG_RTE_ARCH_X86_X32=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 12/37] examples: remove old build system references 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (10 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 11/37] config: remove all config files used by make Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 13/37] buildtools: remove all scripts for use with make Ciara Power ` (26 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Ciara Power, Bruce Richardson, Konstantin Ananyev, Marko Kovacevic, Ori Kam, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh Remove the references to RTE_SDK and RTE_TARGET environment variables from the build instructions in the comments of the various BPF files, and in the ipsec-secgw common definition script. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/bpf/t2.c | 6 ++++-- examples/bpf/t3.c | 10 ++++++---- examples/ipsec-secgw/test/common_defs.sh | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/bpf/t2.c b/examples/bpf/t2.c index 9878eaf7bd..b9bce746c0 100644 --- a/examples/bpf/t2.c +++ b/examples/bpf/t2.c @@ -9,8 +9,10 @@ * (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED). * Doesn't touch contents of packet data. * To compile: - * clang -O2 -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * clang -O2 -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file, e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include <stdint.h> diff --git a/examples/bpf/t3.c b/examples/bpf/t3.c index f58ff64b3b..66faf80cc5 100644 --- a/examples/bpf/t3.c +++ b/examples/bpf/t3.c @@ -8,13 +8,15 @@ * Dump the mbuf into stdout if it is an ARP packet (aka tcpdump 'arp'). * * To compile on x86: - * clang -O2 -U __GNUC__ -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t3.c + * clang -O2 -U __GNUC__ -target bpf -Wno-int-to-void-pointer-cast -c t3.c * * To compile on ARM: - * clang -O2 -I/usr/include/aarch64-linux-gnu \ - * -I${RTE_SDK}/${RTE_TARGET}/include -target bpf \ + * clang -O2 -I/usr/include/aarch64-linux-gnu -target bpf \ * -Wno-int-to-void-pointer-cast -c t3.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file to above commands, + * e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include <stdint.h> diff --git a/examples/ipsec-secgw/test/common_defs.sh b/examples/ipsec-secgw/test/common_defs.sh index df680805b8..f22eb3ab12 100644 --- a/examples/ipsec-secgw/test/common_defs.sh +++ b/examples/ipsec-secgw/test/common_defs.sh @@ -34,8 +34,8 @@ LOCAL_IPV4=192.168.31.92 REMOTE_IPV6=fd12:3456:789a:0031:0000:0000:0000:0014 LOCAL_IPV6=fd12:3456:789a:0031:0000:0000:0000:0092 -DPDK_PATH=${RTE_SDK:-${PWD}} -DPDK_BUILD=${RTE_TARGET:-x86_64-native-linux-gcc} +DPDK_PATH=${PWD} +DPDK_BUILD="build" DPDK_VARS="" # by default ipsec-secgw can't deal with multi-segment packets -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 13/37] buildtools: remove all scripts for use with make 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (11 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 12/37] examples: remove old build system references Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 14/37] devtools: remove use of make in scripts Ciara Power ` (25 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon Make is no longer supported for compiling DPDK, scripts used with make are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 4 -- buildtools/auto-config-h.sh | 108 ------------------------------------ buildtools/gen-build-mk.sh | 23 -------- buildtools/gen-config-h.sh | 15 ----- buildtools/relpath.sh | 76 ------------------------- 5 files changed, 226 deletions(-) delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100755 buildtools/relpath.sh diff --git a/MAINTAINERS b/MAINTAINERS index ccaecabea0..392150fc3b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -102,10 +102,6 @@ Build System M: Thomas Monjalon <thomas@monjalon.net> F: Makefile F: config/ -F: buildtools/auto-config-h.sh -F: buildtools/gen-build-mk.sh -F: buildtools/gen-config-h.sh -F: buildtools/relpath.sh F: doc/build-sdk-quick.txt F: doc/guides/prog_guide/build_app.rst F: doc/guides/prog_guide/dev_kit_* diff --git a/buildtools/auto-config-h.sh b/buildtools/auto-config-h.sh deleted file mode 100755 index 5b613c35fc..0000000000 --- a/buildtools/auto-config-h.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2015 6WIND S.A. -# -# Crude script to detect whether particular types, macros and functions are -# defined by trying to compile a file with a given header. Can be used to -# perform cross-platform checks since the resulting object file is not -# executed. -# -# Set VERBOSE=1 in the environment to display compiler output and errors. -# -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS and EXTRA_CFLAGS are taken from the -# environment. -# -# AUTO_CONFIG_CFLAGS may append additional CFLAGS without modifying the -# above variables. - -file=${1:?output file name required (config.h)} -macro=${2:?output macro name required (HAVE_*)} -include=${3:?include name required (foo.h)} -type=${4:?object type required (define, enum, type, field, func)} -name=${5:?define/type/function name required} - -: ${CC:=cc} - -temp=$(mktemp -t dpdk.${0##*/}.c.XXXXXX) - -case $type in -define) - code="\ -#ifndef $name -#error $name not defined -#endif -" - ;; -enum) - code="\ -long test____ = $name; -" - ;; -type) - code="\ -$name test____; -" - ;; -field) - code="\ -void test____(void) -{ - ${name%%.*} test_____; - - (void)test_____.${name#*.}; -} -" - ;; -func) - code="\ -void (*test____)() = (void (*)())$name; -" - ;; -*) - unset error - : ${error:?unknown object type \"$type\"} - exit -esac - -if [ "${VERBOSE}" = 1 ] -then - err=2 - out=1 - eol=' -' -else - exec 3> /dev/null || - exit - err=3 - out=3 - eol=' ' -fi && -printf 'Looking for %s %s in %s.%s' \ - "${name}" "${type}" "${include}" "${eol}" && -printf "\ -#include <%s> - -%s -" "$include" "$code" > "${temp}" && -if ${CC} ${CPPFLAGS} ${EXTRA_CPPFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ - ${AUTO_CONFIG_CFLAGS} \ - -xc -c -o ${temp}.o "${temp}" 1>&${out} 2>&${err} -then - rm -f "${temp}" "${temp}.o" - printf "\ -#ifndef %s -#define %s 1 -#endif /* %s */ - -" "${macro}" "${macro}" "${macro}" >> "${file}" && - printf 'Defining %s.\n' "${macro}" -else - rm -f "${temp}" "${temp}.o" - printf "\ -/* %s is not defined. */ - -" "${macro}" >> "${file}" && - printf 'Not defining %s.\n' "${macro}" -fi - -exit diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh deleted file mode 100755 index 636920b638..0000000000 --- a/buildtools/gen-build-mk.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# Auto-generate a Makefile in build directory -# Args: -# $1: path of project src root - -echo "# Automatically generated by gen-build-mk.sh" -echo -echo "ifdef O" -echo "ifeq (\"\$(origin O)\", \"command line\")" -echo "\$(error \"Cannot specify O= as you are already in a build directory\")" -echo "endif" -echo "endif" -echo -echo "MAKEFLAGS += --no-print-directory" -echo -echo "all:" -echo " @\$(MAKE) -C $1 O=\$(CURDIR)" -echo -echo "%::" -echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@" diff --git a/buildtools/gen-config-h.sh b/buildtools/gen-config-h.sh deleted file mode 100755 index a8c2006339..0000000000 --- a/buildtools/gen-config-h.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -echo "#ifndef __RTE_CONFIG_H" -echo "#define __RTE_CONFIG_H" -grep CONFIG_ $1 | -grep -v '^[ \t]*#' | -sed 's,CONFIG_\(.*\)=y.*$,#undef \1\ -#define \1 1,' | -sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' | -sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\ -#define \1 \2,' | -sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,' -echo "#endif /* __RTE_CONFIG_H */" diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh deleted file mode 100755 index 02953837a2..0000000000 --- a/buildtools/relpath.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# print the relative path of $1 from $2 directory -# $1 and $2 MUST be absolute paths -# - -if [ $# -ne 2 ]; then - echo "Bad arguments" - echo "Usage:" - echo " $0 path1 path2" - exit 1 -fi - -# get the real absolute path, derefencing symlinks -ABS1="$(dirname $(readlink -f $1))/$(basename $1)" -ABS2=$(readlink -f $2) - -# remove leading slash -REL1=${ABS1#/} -REL2=${ABS2#/} - -left1=${REL1%%/*} -right1=${REL1#*/} -prev_right1=$REL1 -prev_left1= - -left2=${REL2%%/*} -right2=${REL2#*/} -prev_right2=$REL2 -prev_left2= - -prefix= - -while [ "${right1}" != "" -a "${right2}" != "" ]; do - - if [ "$left1" != "$left2" ]; then - break - fi - - prev_left1=$left1 - left1=$left1/${right1%%/*} - prev_right1=$right1 - right1=${prev_right1#*/} - if [ "$right1" = "$prev_right1" ]; then - right1="" - fi - - prev_left2=$left2 - left2=$left2/${right2%%/*} - prev_right2=$right2 - right2=${prev_right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -if [ "${left1}" != "${left2}" ]; then - right2=${prev_right2} - right1=${prev_right1} -fi - -while [ "${right2}" != "" ]; do - prefix=${prefix}../ - prev_right2=$right2 - right2=${right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -echo ${prefix}${right1} - -exit 0 -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 14/37] devtools: remove use of make in scripts 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (12 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 13/37] buildtools: remove all scripts for use with make Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-06 10:15 ` Thomas Monjalon 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 15/37] app/test: remove references to make Ciara Power ` (24 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon Make is no longer supported, the test script for make builds is no longer required. Uses of make in other tool scripts are replaced. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 1 - devtools/build-tags.sh | 14 +- devtools/check-includes.sh | 3 +- devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 315 ------------------------------------- 5 files changed, 4 insertions(+), 331 deletions(-) delete mode 100755 devtools/test-build.sh diff --git a/MAINTAINERS b/MAINTAINERS index 392150fc3b..0fec96558e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,7 +90,6 @@ F: devtools/checkpatches.sh F: devtools/get-maintainer.sh F: devtools/git-log-fixes.sh F: devtools/load-devel-config -F: devtools/test-build.sh F: devtools/test-meson-builds.sh F: devtools/words-case.txt F: license/ diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index 276fff647b..614ce4c3a4 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -19,8 +19,8 @@ arm_64=true print_usage() { echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]" - echo "Valid configs are:" - make showconfigs | sed 's,^,\t,' + echo "Examples of valid configs are: " + echo "x86_64-native-linux-gcc, arm64-armv8a-linux-gcc, ppc_64-power8-linux-gcc" } # Move to the root of the git tree @@ -125,17 +125,7 @@ ppc_64_sources() find_sources "$source_dirs" '*altivec*.[chS]' } -check_valid_target() -{ - if [ ! -f "config/defconfig_$1" ] ; then - echo "Invalid config: $1" - print_usage - exit 0 - fi -} - if [ -n "$2" ]; then - check_valid_target $2 echo $2 | grep -q "linux" || linux=false echo $2 | grep -q "bsd" || bsd=false diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh index 749b9b26d2..15594f08a3 100755 --- a/devtools/check-includes.sh +++ b/devtools/check-includes.sh @@ -17,8 +17,7 @@ # # SUMMARY=1 is the same as -s. # -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and -# EXTRA_CXXFLAGS are taken into account. +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account. # # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict # C/C++ compilation flags. diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 6d468d6731..210c8dcf25 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -50,7 +50,7 @@ commit_version () # <hash> head -n1) if [ -z "$tag" ] ; then # before -rc1 tag of release in progress - make showversion | cut -d'.' -f-2 + cat VERSION | cut -d'.' -f-2 else echo $tag | sed 's,^v,,' | sed 's,-rc.*,,' fi diff --git a/devtools/test-build.sh b/devtools/test-build.sh deleted file mode 100755 index f013656024..0000000000 --- a/devtools/test-build.sh +++ /dev/null @@ -1,315 +0,0 @@ -#! /bin/sh -e -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. - -default_path=$PATH - -# Load config options: -# - ARMV8_CRYPTO_LIB_PATH -# - DPDK_ABI_REF_DIR -# - DPDK_ABI_REF_VERSION -# - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) -# - DPDK_BUILD_TEST_DIR -# - DPDK_DEP_ARCHIVE -# - DPDK_DEP_BPF (y/[n]) -# - DPDK_DEP_CFLAGS -# - DPDK_DEP_ELF (y/[n]) -# - DPDK_DEP_FDT (y/[n]) -# - DPDK_DEP_ISAL (y/[n]) -# - DPDK_DEP_JSON (y/[n]) -# - DPDK_DEP_LDFLAGS -# - DPDK_DEP_MLX (y/[n]) -# - DPDK_DEP_NFB (y/[n]) -# - DPDK_DEP_NUMA ([y]/n) -# - DPDK_DEP_PCAP (y/[n]) -# - DPDK_DEP_SSL (y/[n]) -# - DPDK_DEP_IPSEC_MB (y/[n]) -# - DPDK_DEP_SZE (y/[n]) -# - DPDK_DEP_ZLIB (y/[n]) -# - DPDK_MAKE_JOBS (int) -# - DPDK_NOTIFY (notify-send) -# - FLEXRAN_SDK -# - LIBMUSDK_PATH -devtools_dir=$(dirname $(readlink -f $0)) -. $devtools_dir/load-devel-config - -print_usage () { - echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]" -} - -print_help () { - echo 'Test building several targets with different options' - echo - print_usage - cat <<- END_OF_HELP - - options: - -h this help - -jX use X parallel jobs in "make" - -s short test only first config without tests|examples|doc - -v verbose build - - config: defconfig[[~][+]option1[[~][+]option2...]] - Example: x86_64-native-linux-gcc+debug~RXTX_CALLBACKS - The lowercase options are defined inside $(basename $0). - The uppercase options can be the end of a defconfig option - to enable if prefixed with '+' or to disable if prefixed with '~'. - Default is to automatically enable most of the options. - The external dependencies are setup with DPDK_DEP_* variables. - If no config on command line, DPDK_BUILD_TEST_CONFIGS is used. - END_OF_HELP -} - -[ -z $MAKE ] && command -v gmake > /dev/null && MAKE=gmake -[ -z $MAKE ] && command -v make > /dev/null && MAKE=make -[ -z $MAKE ] && echo "Cannot find make or gmake" && exit 1 - -J=$DPDK_MAKE_JOBS -builds_dir=${DPDK_BUILD_TEST_DIR:-.} -short=false -unset verbose -while getopts hj:sv ARG ; do - case $ARG in - j ) J=$OPTARG ;; - s ) short=true ;; - v ) verbose='V=1' ;; - h ) print_help ; exit 0 ;; - ? ) print_usage ; exit 1 ;; - esac -done -shift $(($OPTIND - 1)) -configs=${*:-$DPDK_BUILD_TEST_CONFIGS} - -success=false -on_exit () -{ - if $success ; then - [ "$DPDK_NOTIFY" != notify-send ] || \ - notify-send -u low --icon=dialog-information 'DPDK build' 'finished' - elif [ -z "$signal" ] ; then - [ -z "$dir" ] || echo "failed to build $dir" >&2 - [ "$DPDK_NOTIFY" != notify-send ] || \ - notify-send -u low --icon=dialog-error 'DPDK build' 'failed' - fi -} -# catch manual interrupt to ignore notification -trap "signal=INT ; trap - INT ; kill -INT $$" INT -# notify result on exit -trap on_exit EXIT - -cd $devtools_dir/.. - -reset_env () -{ - export PATH=$default_path - unset CROSS - unset DPDK_DEP_ARCHIVE - unset DPDK_DEP_BPF - unset DPDK_DEP_CFLAGS - unset DPDK_DEP_ELF - unset DPDK_DEP_FDT - unset DPDK_DEP_ISAL - unset DPDK_DEP_JSON - unset DPDK_DEP_LDFLAGS - unset DPDK_DEP_MLX - unset DPDK_DEP_NFB - unset DPDK_DEP_NUMA - unset DPDK_DEP_PCAP - unset DPDK_DEP_SSL - unset DPDK_DEP_IPSEC_MB - unset DPDK_DEP_SZE - unset DPDK_DEP_ZLIB - unset ARMV8_CRYPTO_LIB_PATH - unset FLEXRAN_SDK - unset LIBMUSDK_PATH - unset PQOS_INSTALL_PATH -} - -config () # <directory> <target> <options> -{ - reconfig=false - if git rev-parse 2>&- && [ -n "$(git diff HEAD~ -- config)" ] ; then - echo 'Default config may have changed' - reconfig=true - fi - if [ ! -e $1/.config ] || $reconfig ; then - echo "================== Configure $1" - ${MAKE} T=$2 O=$1 config - - echo 'Customize configuration' - # Built-in options (lowercase) - ! echo $3 | grep -q '+default' || \ - sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config - ! echo $3 | grep -q '+kmods' || \ - sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config - echo $3 | grep -q '+next' || \ - sed -ri="" 's,(NEXT_ABI=)y,\1n,' $1/.config - ! echo $3 | grep -q '+shared' || \ - sed -ri="" 's,(SHARED_LIB=)n,\1y,' $1/.config - ! echo $3 | grep -q '+debug' || ( \ - sed -ri="" 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config - sed -ri="" 's,(_DEBUG.*=)n,\1y,' $1/.config - sed -ri="" 's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config - sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) - - # Automatic configuration - ! echo $2 | grep -q 'arm64' || \ - sed -ri="" 's,(ARM_USE_WFE=)n,\1y,' $1/.config - test "$DPDK_DEP_NUMA" != n || \ - sed -ri="" 's,(NUMA.*=)y,\1n,' $1/.config - sed -ri="" 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config - sed -ri="" 's,(BYPASS=)n,\1y,' $1/.config - test "$DPDK_DEP_ARCHIVE" != y || \ - sed -ri="" 's,(RESOURCE_TAR=)n,\1y,' $1/.config - test "$DPDK_DEP_BPF" != y || \ - sed -ri="" 's,(PMD_AF_XDP=)n,\1y,' $1/.config - test "$DPDK_DEP_FDT" != y || \ - sed -ri="" 's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config - test "$DPDK_DEP_FDT" != y || \ - sed -ri="" 's,(IPN3KE_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ISAL" != y || \ - sed -ri="" 's,(PMD_ISAL=)n,\1y,' $1/.config - test "$DPDK_DEP_MLX" != y || \ - sed -ri="" 's,(MLX.*_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_NFB" != y || \ - sed -ri="" 's,(NFB_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_SZE" != y || \ - sed -ri="" 's,(PMD_SZEDATA2=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(BNX2X_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(PMD_ZLIB=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config - test "$DPDK_DEP_PCAP" != y || \ - sed -ri="" 's,(PCAP=)n,\1y,' $1/.config - test -z "$ARMV8_CRYPTO_LIB_PATH" || \ - sed -ri="" 's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_AESNI_MB=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_ZUC=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_KASUMI=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_SNOW3G=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(PMD_CCP=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(PMD_OPENSSL=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(QAT_SYM=)n,\1y,' $1/.config - test -z "$FLEXRAN_SDK" || \ - sed -ri="" 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config - sed -ri="" 's,(SCHED_.*=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(PMD_MVSAM_CRYPTO=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(MVPP2_PMD=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(MVNETA_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ELF" != y || \ - sed -ri="" 's,(BPF_ELF=)n,\1y,' $1/.config - test "$DPDK_DEP_JSON" != y || \ - sed -ri="" 's,(TELEMETRY=)n,\1y,' $1/.config - build_config_hook $1 $2 $3 - - # Explicit enabler/disabler (uppercase) - for option in $(echo $3 | sed 's,[~+], &,g') ; do - pattern=$(echo $option | cut -c2-) - if echo $option | grep -q '^~' ; then - sed -ri="" "s,($pattern=)y,\1n," $1/.config - elif echo $option | grep -q '^+' ; then - sed -ri="" "s,($pattern=)n,\1y," $1/.config - fi - done - fi -} - -# default empty hook to override in devel config -build_config_hook () # <directory> <target> <options> -{ - : -} - -for conf in $configs ; do - target=$(echo $conf | sed 's,[~+].*,,') - # reload config with DPDK_TARGET set - DPDK_TARGET=$target - reset_env - . $devtools_dir/load-devel-config - - options=$(echo $conf | sed 's,[^~+]*,,') - dir=$builds_dir/$conf - config $dir $target $options - - echo "================== Build $conf" - ${MAKE} -j$J EXTRA_CFLAGS="-Wfatal-errors -g $DPDK_DEP_CFLAGS" \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir - ! $short || break - export RTE_TARGET=$target - rm -rf $dir/install - ${MAKE} install O=$dir DESTDIR=$dir/install prefix= - echo "================== Build examples for $conf" - export RTE_SDK=$(readlink -f $dir)/install/share/dpdk - ln -sTf $(pwd)/lib $RTE_SDK/lib # workaround for vm_power_manager - grep -q 'SHARED_LIB=n' $dir/.config || # skip examples with static libs - ${MAKE} -j$J -sC examples \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \ - O=$(readlink -f $dir)/examples - unset RTE_TARGET - grep -q 'SHARED_LIB=n' $dir/.config || # skip ABI check with static libs - if [ -n "$DPDK_ABI_REF_VERSION" ]; then - abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION - if [ ! -d $abirefdir/$conf ]; then - # clone current sources - if [ ! -d $abirefdir/src ]; then - git clone --local --no-hardlinks \ - --single-branch \ - -b $DPDK_ABI_REF_VERSION \ - $(pwd) $abirefdir/src - fi - - cd $abirefdir/src - - rm -rf $abirefdir/build - config $abirefdir/build $target $options - - echo -n "================== Build $conf " - echo "($DPDK_ABI_REF_VERSION)" - ${MAKE} -j$J \ - EXTRA_CFLAGS="-Wno-error -g $DPDK_DEP_CFLAGS" \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \ - O=$abirefdir/build - export RTE_TARGET=$target - ${MAKE} install O=$abirefdir/build \ - DESTDIR=$abirefdir/$conf \ - prefix= - unset RTE_TARGET - $devtools_dir/gen-abi.sh $abirefdir/$conf - - # back to current workdir - cd $devtools_dir/.. - fi - - echo "================== Check ABI $conf" - $devtools_dir/gen-abi.sh $dir/install - $devtools_dir/check-abi.sh $abirefdir/$conf $dir/install - fi - echo "################## $conf done." - unset dir -done - -if ! $short ; then - mkdir -p .check - echo "================== Build doxygen HTML API" - ${MAKE} doc-api-html >/dev/null 2>.check/doc.txt - echo "================== Build sphinx HTML guides" - ${MAKE} doc-guides-html >/dev/null 2>>.check/doc.txt - echo "================== Check docs" - diff -u /dev/null .check/doc.txt -fi - -success=true -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 14/37] devtools: remove use of make in scripts 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 14/37] devtools: remove use of make in scripts Ciara Power @ 2020-09-06 10:15 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-06 10:15 UTC (permalink / raw) To: Ciara Power, dev; +Cc: Thomas Monjalon On Thu Sep 3, 2020 at 6:26 PM CEST, Ciara Power wrote: > --- a/devtools/build-tags.sh > +++ b/devtools/build-tags.sh [...] > + echo "Examples of valid configs are: " > + echo "x86_64-native-linux-gcc, arm64-armv8a-linux-gcc, > ppc_64-power8-linux-gcc" Only arch and OS are used in this script. I would give these simpler examples: x86_64-bsd, arm64-linux, ppc_64-linux [...] > --- a/devtools/check-includes.sh > +++ b/devtools/check-includes.sh > @@ -17,8 +17,7 @@ > # > # SUMMARY=1 is the same as -s. > # > -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and > -# EXTRA_CXXFLAGS are taken into account. > +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account. The comment is changed but not the script. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 15/37] app/test: remove references to make 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (13 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 14/37] devtools: remove use of make in scripts Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-04 0:24 ` Chautru, Nicolas 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options Ciara Power ` (23 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Nicolas Chautru, Declan Doherty Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options are no longer in use. Signed-off-by: Ciara Power <ciara.power@intel.com> --- app/test-bbdev/test-bbdev.py | 11 +---- app/test/test_cryptodev.c | 89 +++++++++------------------------- app/test/test_cryptodev_asym.c | 18 ++----- 3 files changed, 28 insertions(+), 90 deletions(-) diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index 5ae2dc6c49..bfd8a4dcc8 100755 --- a/app/test-bbdev/test-bbdev.py +++ b/app/test-bbdev/test-bbdev.py @@ -20,15 +20,8 @@ def kill(process): print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) print("Please use Python 3 instead", file=sys.stderr) -if "RTE_SDK" in os.environ: - dpdk_path = os.environ["RTE_SDK"] -else: - dpdk_path = "../.." - -if "RTE_TARGET" in os.environ: - dpdk_target = os.environ["RTE_TARGET"] -else: - dpdk_target = "x86_64-native-linux-gcc" +dpdk_path = "../.." +dpdk_target = "build" parser = argparse.ArgumentParser( description='BBdev Unit Test Application', diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 70bf6fe2c1..153d001194 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both " - "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM " - "are enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n"); return TEST_FAILED; } @@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12814,9 +12800,7 @@ test_cryptodev_null(void) RTE_STR(CRYPTODEV_NAME_NULL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NULL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NULL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12830,9 +12814,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12846,9 +12828,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12862,9 +12842,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_ZUC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12878,9 +12856,7 @@ test_cryptodev_armv8(void) RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12894,9 +12870,7 @@ test_cryptodev_mrvl(void) RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12912,16 +12886,13 @@ test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n"); return TEST_SKIPPED; } if (rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) { - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be" - " enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_scheduler_testsuite); @@ -12938,9 +12909,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12954,9 +12923,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12970,9 +12937,7 @@ test_cryptodev_ccp(void) RTE_STR(CRYPTODEV_NAME_CCP_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CCP is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CCP PMD must be loaded.\n"); return TEST_FAILED; } @@ -12985,10 +12950,7 @@ test_cryptodev_octeontx(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13000,10 +12962,7 @@ test_cryptodev_octeontx2(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13016,9 +12975,7 @@ test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded.\n"); return TEST_FAILED; } @@ -13032,9 +12989,7 @@ test_cryptodev_nitrox(void) RTE_STR(CRYPTODEV_NAME_NITROX_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NITROX PMD must be loaded.\n"); return TEST_FAILED; } diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index dc62ed7bf3..85cd076059 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -2336,9 +2336,7 @@ test_cryptodev_openssl_asym(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_FAILED; } @@ -2352,9 +2350,7 @@ test_cryptodev_qat_asym(void) RTE_STR(CRYPTODEV_NAME_QAT_ASYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_QAT_ASYM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_FAILED; } @@ -2367,10 +2363,7 @@ test_cryptodev_octeontx_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); @@ -2382,10 +2375,7 @@ test_cryptodev_octeontx2_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n"); return TEST_FAILED; } -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 15/37] app/test: remove references to make 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 15/37] app/test: remove references to make Ciara Power @ 2020-09-04 0:24 ` Chautru, Nicolas 0 siblings, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-04 0:24 UTC (permalink / raw) To: Power, Ciara, dev; +Cc: Doherty, Declan, Richardson, Bruce Hi Ciara, > From: Power, Ciara <ciara.power@intel.com> > > Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options are > no longer in use. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > app/test-bbdev/test-bbdev.py | 11 +---- > app/test/test_cryptodev.c | 89 +++++++++------------------------- > app/test/test_cryptodev_asym.c | 18 ++----- > 3 files changed, 28 insertions(+), 90 deletions(-) > > diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index > 5ae2dc6c49..bfd8a4dcc8 100755 > --- a/app/test-bbdev/test-bbdev.py > +++ b/app/test-bbdev/test-bbdev.py > @@ -20,15 +20,8 @@ def kill(process): > print("WARNING: Python 2 is deprecated for use in DPDK, and will not work > in future releases.", file=sys.stderr) > print("Please use Python 3 instead", file=sys.stderr) > > -if "RTE_SDK" in os.environ: > - dpdk_path = os.environ["RTE_SDK"] > -else: > - dpdk_path = "../.." > - > -if "RTE_TARGET" in os.environ: > - dpdk_target = os.environ["RTE_TARGET"] > -else: > - dpdk_target = "x86_64-native-linux-gcc" > +dpdk_path = "../.." > +dpdk_target = "build" > I am okay with adding the assumption that DPDK staged build location is "build" since that assumptions exists already somewhere else but then we probably need one line in the test-bbdev .rst to capture that new assumption. Also I believe that not only that path but the binary name is now different with meson as well. I see the binary name with meson is "dpdk-test-bbdev" instead of "testbbdev" that we used to have so far with make (let me know if I am missing something, I was expecting the move to meson to be more seamless). So there is another line to be changed here in the same script a couple of lines below to be able to run the tests : - default=dpdk_path + "/" + dpdk_target + "/app/testbbdev") + default=dpdk_path + "/" + dpdk_target + "/app/dpdk-test-bbdev") Thanks, let me know if I can help Nic > parser = argparse.ArgumentParser( > description='BBdev Unit Test Application', diff --git > a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index > 70bf6fe2c1..153d001194 100644 > --- a/app/test/test_cryptodev.c > +++ b/app/test/test_cryptodev.c > @@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int > argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that > both " > - "CONFIG_RTE_LIBRTE_PMD_QAT and > CONFIG_RTE_LIBRTE_PMD_QAT_SYM " > - "are enabled in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, > int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO > is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void) > RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void) > RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void) > RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void) > RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12814,9 +12800,7 @@ test_cryptodev_null(void) > RTE_STR(CRYPTODEV_NAME_NULL_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_NULL is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "NULL PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12830,9 +12814,7 @@ test_cryptodev_sw_snow3g(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_SNOW3G is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12846,9 +12828,7 @@ test_cryptodev_sw_kasumi(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_KASUMI is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12862,9 +12842,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, > int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_ZUC_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12878,9 +12856,7 @@ test_cryptodev_armv8(void) > RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if > " > - "CONFIG_RTE_LIBRTE_PMD_ARMV8 is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12894,9 +12870,7 @@ test_cryptodev_mrvl(void) > RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if > " > - "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO > is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12912,16 +12886,13 @@ test_cryptodev_scheduler(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > if (rte_cryptodev_driver_id_get( > > RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) { > - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB > must be" > - " enabled in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); > return TEST_SKIPPED; > } > return unit_test_suite_runner(&cryptodev_scheduler_testsuite); > @@ -12938,9 +12909,7 @@ test_cryptodev_dpaa2_sec(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12954,9 +12923,7 @@ test_cryptodev_dpaa_sec(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12970,9 +12937,7 @@ test_cryptodev_ccp(void) > RTE_STR(CRYPTODEV_NAME_CCP_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_CCP is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "CCP PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -12985,10 +12950,7 @@ test_cryptodev_octeontx(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > > RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. > Check if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); > return TEST_FAILED; > } > return unit_test_suite_runner(&cryptodev_testsuite); > @@ -13000,10 +12962,7 @@ test_cryptodev_octeontx2(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. > Check if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be > loaded.\n"); > return TEST_FAILED; > } > return unit_test_suite_runner(&cryptodev_testsuite); > @@ -13016,9 +12975,7 @@ test_cryptodev_caam_jr(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -13032,9 +12989,7 @@ test_cryptodev_nitrox(void) > RTE_STR(CRYPTODEV_NAME_NITROX_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if > " > - "CONFIG_RTE_LIBRTE_PMD_NITROX is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "NITROX PMD must be loaded.\n"); > return TEST_FAILED; > } > > diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c > index dc62ed7bf3..85cd076059 100644 > --- a/app/test/test_cryptodev_asym.c > +++ b/app/test/test_cryptodev_asym.c > @@ -2336,9 +2336,7 @@ test_cryptodev_openssl_asym(void) > RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -2352,9 +2350,7 @@ test_cryptodev_qat_asym(void) > RTE_STR(CRYPTODEV_NAME_QAT_ASYM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_QAT_ASYM is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -2367,10 +2363,7 @@ test_cryptodev_octeontx_asym(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > > RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. > Check if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); > return TEST_FAILED; > } > return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); > @@ -2382,10 +2375,7 @@ test_cryptodev_octeontx2_asym(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded. > Check if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n"); > return TEST_FAILED; > } > > -- > 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (14 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 15/37] app/test: remove references to make Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-06 10:24 ` Thomas Monjalon 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 17/37] lib: " Ciara Power ` (22 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Anatoly Burakov, Beilei Xing, Jeff Guo Make is no longer supported for compiling DPDK, references are now removed in code comments. Signed-off-by: Ciara Power <ciara.power@intel.com> --- drivers/bus/pci/linux/pci_vfio.c | 1 - drivers/net/i40e/i40e_rxtx.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 07e072e13f..c15ed3bade 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -34,7 +34,6 @@ * This code tries to determine if the PCI device is bound to VFIO driver, * and initialize it (map BARs, set up interrupts) if that's the case. * - * This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y". */ #ifdef VFIO_PRESENT diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index fe7f9200c1..60b33d20a1 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -3438,7 +3438,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev) } #ifndef RTE_LIBRTE_I40E_INC_VECTOR -/* Stubs needed for linkage when CONFIG_RTE_LIBRTE_I40E_INC_VECTOR is set to 'n' */ int i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev) { -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options Ciara Power @ 2020-09-06 10:24 ` Thomas Monjalon 2020-09-07 8:18 ` Bruce Richardson 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-06 10:24 UTC (permalink / raw) To: Ciara Power, dev; +Cc: Anatoly Burakov, Beilei Xing, Jeff Guo On Thu Sep 3, 2020 at 6:26 PM CEST, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in code comments. It should be squashed with the patch removing the config options. In general, I feel this patchset would benefit a bit more squashing. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options 2020-09-06 10:24 ` Thomas Monjalon @ 2020-09-07 8:18 ` Bruce Richardson 2020-09-07 9:43 ` Thomas Monjalon 0 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-09-07 8:18 UTC (permalink / raw) To: Thomas Monjalon; +Cc: Ciara Power, dev, Anatoly Burakov, Beilei Xing, Jeff Guo On Sun, Sep 06, 2020 at 12:24:49PM +0200, Thomas Monjalon wrote: > On Thu Sep 3, 2020 at 6:26 PM CEST, Ciara Power wrote: > > Make is no longer supported for compiling DPDK, references are now > > removed in code comments. > > It should be squashed with the patch removing the config options. > > In general, I feel this patchset would benefit a bit more squashing. Yes, but that makes it harder to review and work with. For example, for removing the config options each document needs to be modified to remove references to those, and once make itself is removed again all docs need to be modified. To review properly, the doc needs to be scanned to check no references, especially indirect references, are missed. Given that e.g. the NIC guide doc is 55 chapters, that's a whole lot of reviewing you want to minimize, so having all changes to that one doc in one patch is much more feasible. Really, removing the whole build system could all be done in one patch, as removing parts a bit at a time doesn't really make sense as it's all broken once one part is gone. However, the resulting patch would be enormous, so I suggest keeping the parts separate for review and then squash on merge if so desired. /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options 2020-09-07 8:18 ` Bruce Richardson @ 2020-09-07 9:43 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 9:43 UTC (permalink / raw) To: Bruce Richardson; +Cc: Ciara Power, dev, Anatoly Burakov, Beilei Xing, Jeff Guo 07/09/2020 10:18, Bruce Richardson: > On Sun, Sep 06, 2020 at 12:24:49PM +0200, Thomas Monjalon wrote: > > On Thu Sep 3, 2020 at 6:26 PM CEST, Ciara Power wrote: > > > Make is no longer supported for compiling DPDK, references are now > > > removed in code comments. > > > > It should be squashed with the patch removing the config options. > > > > In general, I feel this patchset would benefit a bit more squashing. > > Yes, but that makes it harder to review and work with. For example, for > removing the config options each document needs to be modified to remove > references to those, and once make itself is removed again all docs need to > be modified. To review properly, the doc needs to be scanned to check no > references, especially indirect references, are missed. Given that e.g. the > NIC guide doc is 55 chapters, that's a whole lot of reviewing you want to > minimize, so having all changes to that one doc in one patch is much more > feasible. > > Really, removing the whole build system could all be done in one patch, as > removing parts a bit at a time doesn't really make sense as it's all broken > once one part is gone. However, the resulting patch would be enormous, so I > suggest keeping the parts separate for review and then squash on merge if > so desired. I will keep doc patches separate because it's too big and requires more reviews. The separation between makefiles and configs is also fine. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 17/37] lib: remove references to make config options 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (15 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 18/37] doc/guides: remove use of DPDK make build system Ciara Power ` (21 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Ciara Power, Olivier Matz, Andrew Rybchenko, Honnappa Nagarahalli, Konstantin Ananyev Make is no longer supported for compiling DPDK, references are now removed in code comments. Signed-off-by: Ciara Power <ciara.power@intel.com> --- lib/librte_mempool/rte_mempool.h | 2 +- lib/librte_ring/rte_ring_elem.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 9e0ee052b3..6ad7e31170 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -970,7 +970,7 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); * If cache_size is non-zero, the rte_mempool library will try to * limit the accesses to the common lockless pool, by maintaining a * per-lcore object cache. This argument must be lower or equal to - * CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose + * RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose * cache_size to have "n modulo cache_size == 0": if this is * not the case, some elements will always stay in the pool and will * never be used. The access to the per-lcore table is of course diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h index 69dc51746c..938b398fc0 100644 --- a/lib/librte_ring/rte_ring_elem.h +++ b/lib/librte_ring/rte_ring_elem.h @@ -373,8 +373,7 @@ __rte_ring_dequeue_elems(struct rte_ring *r, uint32_t cons_head, * (powerpc/arm). * There are 2 choices for the users * 1.use rmb() memory barrier - * 2.use one-direction load_acquire/store_release barrier,defined by - * CONFIG_RTE_USE_C11_MEM_MODEL=y + * 2.use one-direction load_acquire/store_release barrier * It depends on performance test results. * By default, move common functions to rte_ring_generic.h */ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 18/37] doc/guides: remove use of DPDK make build system 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (16 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 17/37] lib: " Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 19/37] doc: remove deprecation notice for make Ciara Power ` (20 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev; +Cc: Bruce Richardson, John McNamara, Marko Kovacevic From: Bruce Richardson <bruce.richardson@intel.com> When building the DPDK guide documents, the DPDK version information was pulled using "make showversion", which meant there was a dependency on the DPDK make-based build system. Change this to have the version info passed in from meson itself. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- buildtools/call-sphinx-build.py | 5 ++++- doc/guides/conf.py | 7 +------ doc/guides/meson.build | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index 85c9e01563..fa6f26b376 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -9,7 +9,10 @@ from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion -(sphinx, src, dst) = sys.argv[1:] # assign parameters to variables +(sphinx, version, src, dst) = sys.argv[1:] # assign parameters to variables + +# set the version in environment for sphinx to pick up +os.environ['DPDK_VERSION'] = version # for sphinx version >= 1.7 add parallelism using "-j auto" ver = run([sphinx, '--version'], stdout=PIPE, diff --git a/doc/guides/conf.py b/doc/guides/conf.py index d8fe5cccd7..9ebc26ed3f 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -2,7 +2,6 @@ # Copyright(c) 2010-2015 Intel Corporation from __future__ import print_function -import subprocess from docutils import nodes from distutils.version import LooseVersion from sphinx import __version__ as sphinx_version @@ -38,11 +37,7 @@ html_show_copyright = False highlight_language = 'none' -# If MAKEFLAGS is exported by the user, garbage text might end up in version -version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'], - env=dict(environ, MAKEFLAGS="")) -version = version.decode('utf-8').rstrip() -release = version +release = environ['DPDK_VERSION'] master_doc = 'index' diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 732e7ad3a9..daab139c4e 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -11,7 +11,8 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk') html_guides = custom_target('html_guides', input: files('index.rst'), output: 'html', - command: [sphinx_wrapper, sphinx, meson.current_source_dir(), meson.current_build_dir()], + command: [sphinx_wrapper, sphinx, meson.project_version(), + meson.current_source_dir(), meson.current_build_dir()], depfile: '.html.d', build_by_default: get_option('enable_docs'), install: get_option('enable_docs'), -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 19/37] doc: remove deprecation notice for make 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (17 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 18/37] doc/guides: remove use of DPDK make build system Ciara Power @ 2020-09-03 15:26 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 20/37] doc: remove references to make in bbdev guides Ciara Power ` (19 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:26 UTC (permalink / raw) To: dev Cc: Ciara Power, Ray Kinsella, Neil Horman, John McNamara, Marko Kovacevic The deprecation notice for make can now be removed as this patchset removes the make build system. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/rel_notes/deprecation.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 345c38d5b6..279eccb04a 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -11,13 +11,6 @@ here. Deprecation Notices ------------------- -* make: Support for building DPDK with "make" has been deprecated and - support will be removed in the 20.11 release. From 20.11 onwards, DPDK - should be built using meson and ninja. For basic instructions see the - `Quick-start Guide <https://core.dpdk.org/doc/quick-start/>`_ on the - website or the `Getting Started Guide - <https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html>`_ document. - * meson: The minimum supported version of meson for configuring and building DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For those users with a version earlier than 0.47.1, an updated copy of meson -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 20/37] doc: remove references to make in bbdev guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (18 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 19/37] doc: remove deprecation notice for make Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-04 1:35 ` Chautru, Nicolas 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 21/37] doc: remove references to make in compressdev guides Ciara Power ` (18 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Nicolas Chautru, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- doc/guides/bbdevs/turbo_sw.rst | 15 --------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index 6760391e8c..8e00c4ef22 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd8086:0d8f diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index fdc8a76981..14ffa0ee14 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd1172: diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..3b93157890 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -151,13 +143,6 @@ Example: export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 20/37] doc: remove references to make in bbdev guides 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 20/37] doc: remove references to make in bbdev guides Ciara Power @ 2020-09-04 1:35 ` Chautru, Nicolas 0 siblings, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-04 1:35 UTC (permalink / raw) To: Power, Ciara, dev; +Cc: Mcnamara, John, Kovacevic, Marko, Richardson, Bruce > From: Power, Ciara <ciara.power@intel.com> > > Make is no longer supported for compiling DPDK, references are now removed > in the documentation. > > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- > doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- > doc/guides/bbdevs/turbo_sw.rst | 15 --------------- > 3 files changed, 4 insertions(+), 25 deletions(-) > > diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst > b/doc/guides/bbdevs/fpga_5gnr_fec.rst > index 6760391e8c..8e00c4ef22 100644 > --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst > +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst > @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: > Installation > ------------ > > -Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. The -default set of bbdev compile flags may be found in > config/common_base, where for example -the flag to build the FPGA 5GNR FEC > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, > -is already set. > +Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > manual. > The bbdev test application has been tested with a configuration 40 x 1GB > hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this > command for every function. > .. code-block:: console > > cd <dpdk-top-level-directory> > - insmod ./build/kmod/igb_uio.ko > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id > lspci -vd8086:0d8f > > diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst > b/doc/guides/bbdevs/fpga_lte_fec.rst > index fdc8a76981..14ffa0ee14 100644 > --- a/doc/guides/bbdevs/fpga_lte_fec.rst > +++ b/doc/guides/bbdevs/fpga_lte_fec.rst > @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: > Installation > -------------- > > -Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. The -default set of bbdev compile flags may be found in > config/common_base, where for example -the flag to build the FPGA LTE FEC > device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. > +Section 3 of the DPDK manual provides instructions on installing and compiling > DPDK. > > DPDK requires hugepages to be configured as detailed in section 2 of the DPDK > manual. > The bbdev test application has been tested with a configuration 40 x 1GB > hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this > command for every function. > .. code-block:: console > > cd <dpdk-top-level-directory> > - insmod ./build/kmod/igb_uio.ko > + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko > echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id > lspci -vd1172: > > diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst > index 20620c2e20..3b93157890 100644 > --- a/doc/guides/bbdevs/turbo_sw.rst > +++ b/doc/guides/bbdevs/turbo_sw.rst > @@ -12,14 +12,6 @@ Note that the driver can also be built without any > dependency with reduced functionality for maintenance purpose. > > To enable linking to the SDK libraries see detailed installation section below. > -Two flags can be enabled depending on whether the target machine can > support > -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized > -signal processing functions are installed : > -- CONFIG_RTE_BBDEV_SDK_AVX2 > -- CONFIG_RTE_BBDEV_SDK_AVX512 > -By default these 2 flags are disabled by default. For AVX2 machine and SDK - > library installed then the first flag can be enabled. For AVX512 machine and - > SDK library installed then both flags can be enabled for full real time capability. > > This PMD supports the functions: FEC, Rate Matching and CRC functions > detailed in the Features section. > @@ -151,13 +143,6 @@ Example: > export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19- > 04/sdk/build-avx2-icc/install > export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19- > 04/sdk/build-avx2-icc/ > > -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and > ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` > - in DPDK common configuration file ``config/common_base`` to be able to use > - the SDK libraries as mentioned above. > - For AVX2 machine it is possible to only enable > CONFIG_RTE_BBDEV_SDK_AVX2 > - for limited 4G functionality. > - If no flag are set the PMD driver will still build but its capabilities > - will be limited accordingly. Hi, This section needs to be replaced to match with the actual steps for meson: Initialization -------------- In order to enable this virtual bbdev PMD, the user may: * Build the ``FLEXRAN SDK`` libraries (explained in Installation section). * Export the environmental variables ``FLEXRAN_SDK`` to the path where the FlexRAN SDK libraries were installed. And ``DIR_WIRELESS_SDK`` to the path where the libraries were extracted. * Tune the meson build option pointing the location of the FlexRAN SDK libraries ``flexran_sdk`` Example: .. code-block:: console export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ cd build meson configure -Dflexran_sdk=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx512-icc/install * For AVX512 machines with SDK libraries installed then both 4G and 5G can be enabled for full real time FEC capability. For AVX2 machines it is possible to only enable the 4G libraries and the PMD capabilities will be limited to 4G FEC. If no library is present then the PMD driver will still build but its capabilities will be limited accordingly. > > To use the PMD in an application, user must: > > -- > 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 21/37] doc: remove references to make in compressdev guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (19 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 20/37] doc: remove references to make in bbdev guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides Ciara Power ` (17 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Lee Daly, John McNamara, Marko Kovacevic, Ashish Gupta, Sunila Sahu Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..8c658721b9 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -56,21 +56,6 @@ Steps To Setup Platform SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. -Installation ------------- - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "compressdev_autotest" to test + cd to <build_dir> + meson test compressdev_autotest diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (20 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 21/37] doc: remove references to make in compressdev guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-07 10:20 ` Thomas Monjalon 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 23/37] doc: remove references to make in cryptodev guides Ciara Power ` (16 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Louise Kilheeney, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> --- doc/guides/contributing/coding_style.rst | 46 +------- doc/guides/contributing/design.rst | 127 ++-------------------- doc/guides/contributing/documentation.rst | 31 +----- doc/guides/contributing/patches.rst | 45 -------- 4 files changed, 18 insertions(+), 231 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index b55075eaa2..dc352d03ca 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -773,52 +773,16 @@ The ``pep8`` tool can be used for testing compliance with the guidelines. Integrating with the Build System --------------------------------- -DPDK supports being built in two different ways: - -* using ``make`` - or more specifically "GNU make", i.e. ``gmake`` on FreeBSD -* using the tools ``meson`` and ``ninja`` +DPDK supports being built by using the tools ``meson`` and ``ninja`` Any new library or driver to be integrated into DPDK should support being -built with both systems. While building using ``make`` is a legacy approach, and -most build-system enhancements are being done using ``meson`` and ``ninja`` -there are no plans at this time to deprecate the legacy ``make`` build system. +built with this system. -Therefore all new component additions should include both a ``Makefile`` and a -``meson.build`` file, and should be added to the component lists in both the -``Makefile`` and ``meson.build`` files in the relevant top-level directory: +Therefore all new component additions should include a ``meson.build`` file, +and should be added to the component lists in the ``meson.build`` files in the +relevant top-level directory: either ``lib`` directory or a ``driver`` subdirectory. -Makefile Contents -~~~~~~~~~~~~~~~~~ - -The ``Makefile`` for the component should be of the following format, where -``<name>`` corresponds to the name of the library in question, e.g. hash, -lpm, etc. For drivers, the same format of Makefile is used. - -.. code-block:: none - - # pull in basic DPDK definitions, including whether library is to be - # built or not - include $(RTE_SDK)/mk/rte.vars.mk - - # library name - LIB = librte_<name>.a - - # any library cflags needed. Generally add "-O3 $(WERROR_FLAGS)" - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - # the symbol version information for the library - EXPORT_MAP := rte_<name>_version.map - - # all source filenames are stored in SRCS-y - SRCS-$(CONFIG_RTE_LIBRTE_<NAME>) += rte_<name>.c - - # install includes - SYMLINK-$(CONFIG_RTE_LIBRTE_<NAME>)-include += rte_<name>.h - - # pull in rules to build the library - include $(RTE_SDK)/mk/rte.lib.mk Meson Build File Contents - Libraries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..6ce0de97ac 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,22 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. - In this case, the code is split into two separate files that are architecture or environment specific. - This should only apply inside the EAL library. - -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -73,111 +65,6 @@ Adding a new static field or flag must be an exception matching many criteria like (non exhaustive): wide usage, performance, size. -Library Statistics ------------------- - -Description -~~~~~~~~~~~ - -This document describes the guidelines for DPDK library-level statistics counter -support. This includes guidelines for turning library statistics on and off and -requirements for preventing ABI changes when implementing statistics. - - -Mechanism to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are -collected for all the instances of every object type provided by the library. -When this flag is cleared, none of the counters supported by the current library -are collected for any instance of any object type provided by the library: - -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - - -Prevention of ABI changes due to library statistics support -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The layout of data structures and prototype of functions that are part of the -library API should not be affected by whether the collection of statistics -counters is turned on or off for the current library. In practical terms, this -means that space should always be allocated in the API data structures for -statistics counters and the statistics related API functions are always built -into the code, regardless of whether the statistics counter collection is turned -on or off for the current library. - -When the collection of statistics counters for the current library is turned -off, the counters retrieved through the statistics related API functions should -have a default value of zero. - - -Motivation to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -It is highly recommended that each library provides statistics counters to allow -an application to monitor the library-level run-time events. Typical counters -are: number of packets received/dropped/transmitted, number of buffers -allocated/freed, number of occurrences for specific events, etc. - -However, the resources consumed for library-level statistics counter collection -have to be spent out of the application budget and the counters collected by -some libraries might not be relevant to the current application. In order to -avoid any unwanted waste of resources and/or performance impacts, the -application should decide at build time whether the collection of library-level -statistics counters should be turned on or off for each library individually. - -Library-level statistics counters can be relevant or not for specific -applications: - -* For Application A, counters maintained by Library X are always relevant and - the application needs to use them to implement certain features, such as traffic - accounting, logging, application-level statistics, etc. In this case, - the application requires that collection of statistics counters for Library X is - always turned on. - -* For Application B, counters maintained by Library X are only useful during the - application debug stage and are not relevant once debug phase is over. In this - case, the application may decide to turn on the collection of Library X - statistics counters during the debug phase and at a later stage turn them off. - -* For Application C, counters maintained by Library X are not relevant at all. - It might be that the application maintains its own set of statistics counters - that monitor a different set of run-time events (e.g. number of connection - requests, number of active users, etc). It might also be that the application - uses multiple libraries (Library X, Library Y, etc) and it is interested in the - statistics counters of Library Y, but not in those of Library X. In this case, - the application may decide to turn the collection of statistics counters off for - Library X and on for Library Y. - -The statistics collection consumes a certain amount of CPU resources (cycles, -cache bandwidth, memory bandwidth, etc) that depends on: - -* Number of libraries used by the current application that have statistics - counters collection turned on. - -* Number of statistics counters maintained by each library per object type - instance (e.g. per port, table, pipeline, thread, etc). - -* Number of instances created for each object type supported by each library. - -* Complexity of the statistics logic collection for each counter: when only - some occurrences of a specific event are valid, additional logic is typically - needed to decide whether the current occurrence of the event should be counted - or not. For example, in the event of packet reception, when only TCP packets - with destination port within a certain range should be recorded, conditional - branches are usually required. When processing a burst of packets that have been - validated for header integrity, counting the number of bits set in a bitmask - might be needed. - PF and VF Considerations ------------------------ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 375ea64ba8..768453126f 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -222,25 +222,14 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: +To enable doc building:: - make doc + meson configure -Denable_docs=true -* Generate the Doxygen API documentation in Html:: +See :doc:`../linux_gsg/build_dpdk` for more detail on compiling DPDK with meson. - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -255,10 +244,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -308,7 +293,7 @@ Line Length Long literal command lines can be shown wrapped with backslashes. For example:: - testpmd -l 2-3 -n 4 \ + dpdk-testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ --txd=1024 --rxd=1024 @@ -460,7 +445,7 @@ Code and Literal block sections For long literal lines that exceed that limit try to wrap the text at sensible locations. For example a long command line could be documented like this and still work if copied directly from the docs:: - build/app/testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ + ./<build_dir>/app/dpdk-testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ --vdev=net_pcap1,iface=eth1 \ -- -i --nb-cores=2 --nb-ports=2 \ --total-num-mbufs=2048 @@ -743,9 +728,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 425bb874f8..bafa95be59 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -464,51 +464,6 @@ and the -r option allows the user specify a ``git log`` range. Checking Compilation -------------------- -Makefile System -~~~~~~~~~~~~~~~ - -Compilation of patches and changes should be tested using the ``test-build.sh`` script in the ``devtools`` -directory of the DPDK repo:: - - devtools/test-build.sh x86_64-native-linux-gcc+next+shared - -The script usage is:: - - test-build.sh [-h] [-jX] [-s] [config1 [config2] ...]] - -Where: - -* ``-h``: help, usage. -* ``-jX``: use X parallel jobs in "make". -* ``-s``: short test with only first config and without examples/doc. -* ``config``: default config name plus config switches delimited with a ``+`` sign. - -Examples of configs are:: - - x86_64-native-linux-gcc - x86_64-native-linux-gcc+next+shared - x86_64-native-linux-clang+shared - -The builds can be modified via the following environmental variables: - -* ``DPDK_BUILD_TEST_CONFIGS`` (target1+option1+option2 target2) -* ``DPDK_BUILD_TEST_DIR`` -* ``DPDK_DEP_CFLAGS`` -* ``DPDK_DEP_LDFLAGS`` -* ``DPDK_DEP_PCAP`` (y/[n]) -* ``DPDK_NOTIFY`` (notify-send) - -These can be set from the command line or in the config files shown above in the :ref:`contrib_checkpatch`. - -The recommended configurations and options to test compilation prior to submitting patches are:: - - x86_64-native-linux-gcc+shared+next - x86_64-native-linux-clang+shared - i686-native-linux-gcc - - export DPDK_DEP_ZLIB=y - export DPDK_DEP_PCAP=y - export DPDK_DEP_SSL=y Meson System ~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides Ciara Power @ 2020-09-07 10:20 ` Thomas Monjalon 2020-09-17 13:44 ` Power, Ciara 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 10:20 UTC (permalink / raw) To: Ciara Power, dev; +Cc: Louise Kilheeney, John McNamara, Marko Kovacevic On Thu Sep 3, 2020 at 6:27 PM CEST, Ciara Power wrote: > --- a/doc/guides/contributing/coding_style.rst > +++ b/doc/guides/contributing/coding_style.rst > -DPDK supports being built in two different ways: > - > -* using ``make`` - or more specifically "GNU make", i.e. ``gmake`` on > FreeBSD > -* using the tools ``meson`` and ``ninja`` > +DPDK supports being built by using the tools ``meson`` and ``ninja`` We can simply say "DPDK *is* built". I will add a final dot at the end of the sentence. > Any new library or driver to be integrated into DPDK should support > being > -built with both systems. While building using ``make`` is a legacy > approach, and > -most build-system enhancements are being done using ``meson`` and > ``ninja`` > -there are no plans at this time to deprecate the legacy ``make`` build > system. > +built with this system. I think this paragraph does not make sense anymore. > -Therefore all new component additions should include both a > ``Makefile`` and a > -``meson.build`` file, and should be added to the component lists in > both the > -``Makefile`` and ``meson.build`` files in the relevant top-level > directory: > +Therefore all new component additions should include a ``meson.build`` > file, > +and should be added to the component lists in the ``meson.build`` files > in the > +relevant top-level directory: > either ``lib`` directory or a ``driver`` subdirectory. [...] > --- a/doc/guides/contributing/design.rst > +++ b/doc/guides/contributing/design.rst > When absolutely necessary, there are several ways to handle specific > code: > > -* Use a ``#ifdef`` with the CONFIG option in the C code. > +* Use a ``#ifdef`` with a build definition macro in the C code. > This can be done when the differences are small and they can be embedded > in the same C file: > > .. code-block:: c > @@ -32,30 +32,22 @@ When absolutely necessary, there are several ways to > handle specific code: > titi(); > #endif > > -* Use the CONFIG option in the Makefile. This is done when the > differences are more significant. > - In this case, the code is split into two separate files that are > architecture or environment specific. > - This should only apply inside the EAL library. If removing this last item, there are no "several ways" anymore. I think we should keep it (reworded) because we still have files compiled depending on the target architecture. [...] > -Library Statistics > ------------------- > - > -Description > -~~~~~~~~~~~ > - > -This document describes the guidelines for DPDK library-level > statistics counter > -support. This includes guidelines for turning library statistics on and > off and > -requirements for preventing ABI changes when implementing statistics. I think the ABI part is still relevant. [...] > -Prevention of ABI changes due to library statistics support > -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > - > -The layout of data structures and prototype of functions that are part > of the > -library API should not be affected by whether the collection of > statistics > -counters is turned on or off for the current library. In practical > terms, this > -means that space should always be allocated in the API data structures > for > -statistics counters and the statistics related API functions are always > built > -into the code, regardless of whether the statistics counter collection > is turned > -on or off for the current library. > - > -When the collection of statistics counters for the current library is > turned > -off, the counters retrieved through the statistics related API > functions should > -have a default value of zero. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-07 10:20 ` Thomas Monjalon @ 2020-09-17 13:44 ` Power, Ciara 2020-09-21 16:14 ` Thomas Monjalon 0 siblings, 1 reply; 300+ messages in thread From: Power, Ciara @ 2020-09-17 13:44 UTC (permalink / raw) To: Thomas Monjalon, dev; +Cc: Mcnamara, John, Kovacevic, Marko, Richardson, Bruce Hi Thomas, One comment inline. Thanks, Ciara >-----Original Message----- >From: Thomas Monjalon <thomas@monjalon.net> >Sent: Monday 7 September 2020 11:21 >To: Power, Ciara <ciara.power@intel.com>; dev@dpdk.org >Cc: Kilheeney, Louise <louise.kilheeney@intel.com>; Mcnamara, John ><john.mcnamara@intel.com>; Kovacevic, Marko ><marko.kovacevic@intel.com> >Subject: Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in >contributing guides > <snip> >[...] >> -Library Statistics >> ------------------- >> - >> -Description >> -~~~~~~~~~~~ >> - >> -This document describes the guidelines for DPDK library-level >> statistics counter -support. This includes guidelines for turning >> library statistics on and off and -requirements for preventing ABI >> changes when implementing statistics. > >I think the ABI part is still relevant. Looking for some clarification on this. Which parts (if any) of the library statistics section should be added back in for the ABI section below to make sense being included? Or what do you suggest doing here? >[...] >> -Prevention of ABI changes due to library statistics support >> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> - >> -The layout of data structures and prototype of functions that are >> part of the -library API should not be affected by whether the >> collection of statistics -counters is turned on or off for the current >> library. In practical terms, this -means that space should always be >> allocated in the API data structures for -statistics counters and the >> statistics related API functions are always built -into the code, >> regardless of whether the statistics counter collection is turned -on >> or off for the current library. >> - >> -When the collection of statistics counters for the current library is >> turned -off, the counters retrieved through the statistics related API >> functions should -have a default value of zero. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-17 13:44 ` Power, Ciara @ 2020-09-21 16:14 ` Thomas Monjalon 2020-09-21 19:14 ` Dumitrescu, Cristian 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-21 16:14 UTC (permalink / raw) To: Power, Ciara, cristian.dumitrescu Cc: dev, Mcnamara, John, Kovacevic, Marko, Richardson, Bruce 17/09/2020 15:44, Power, Ciara: > Hi Thomas, > > One comment inline. > > Thanks, > Ciara > > > >-----Original Message----- > >From: Thomas Monjalon <thomas@monjalon.net> > >Sent: Monday 7 September 2020 11:21 > >To: Power, Ciara <ciara.power@intel.com>; dev@dpdk.org > >Cc: Kilheeney, Louise <louise.kilheeney@intel.com>; Mcnamara, John > ><john.mcnamara@intel.com>; Kovacevic, Marko > ><marko.kovacevic@intel.com> > >Subject: Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in > >contributing guides > > > > <snip> > > >[...] > >> -Library Statistics > >> ------------------- > >> - > >> -Description > >> -~~~~~~~~~~~ > >> - > >> -This document describes the guidelines for DPDK library-level > >> statistics counter -support. This includes guidelines for turning > >> library statistics on and off and -requirements for preventing ABI > >> changes when implementing statistics. > > > >I think the ABI part is still relevant. > > Looking for some clarification on this. Which parts (if any) of the library statistics section should be > added back in for the ABI section below to make sense being included? Or what do you suggest doing here? I think we can consider we still have the ability to turn stats off because of the #ifdef still being there. Cristian, do you think we should remove this doc? Is on/off still possible in the new pipeline libs? > >[...] > >> -Prevention of ABI changes due to library statistics support > >> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > >> - > >> -The layout of data structures and prototype of functions that are > >> part of the -library API should not be affected by whether the > >> collection of statistics -counters is turned on or off for the current > >> library. In practical terms, this -means that space should always be > >> allocated in the API data structures for -statistics counters and the > >> statistics related API functions are always built -into the code, > >> regardless of whether the statistics counter collection is turned -on > >> or off for the current library. > >> - > >> -When the collection of statistics counters for the current library is > >> turned -off, the counters retrieved through the statistics related API > >> functions should -have a default value of zero. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-21 16:14 ` Thomas Monjalon @ 2020-09-21 19:14 ` Dumitrescu, Cristian 2020-09-22 8:39 ` Power, Ciara 0 siblings, 1 reply; 300+ messages in thread From: Dumitrescu, Cristian @ 2020-09-21 19:14 UTC (permalink / raw) To: Thomas Monjalon, Power, Ciara Cc: dev, Mcnamara, John, Kovacevic, Marko, Richardson, Bruce > -----Original Message----- > From: Thomas Monjalon <thomas@monjalon.net> > Sent: Monday, September 21, 2020 5:15 PM > To: Power, Ciara <ciara.power@intel.com>; Dumitrescu, Cristian > <cristian.dumitrescu@intel.com> > Cc: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>; > Kovacevic, Marko <marko.kovacevic@intel.com>; Richardson, Bruce > <bruce.richardson@intel.com> > Subject: Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in > contributing guides > > 17/09/2020 15:44, Power, Ciara: > > Hi Thomas, > > > > One comment inline. > > > > Thanks, > > Ciara > > > > > > >-----Original Message----- > > >From: Thomas Monjalon <thomas@monjalon.net> > > >Sent: Monday 7 September 2020 11:21 > > >To: Power, Ciara <ciara.power@intel.com>; dev@dpdk.org > > >Cc: Kilheeney, Louise <louise.kilheeney@intel.com>; Mcnamara, John > > ><john.mcnamara@intel.com>; Kovacevic, Marko > > ><marko.kovacevic@intel.com> > > >Subject: Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to > make in > > >contributing guides > > > > > > > <snip> > > > > >[...] > > >> -Library Statistics > > >> ------------------- > > >> - > > >> -Description > > >> -~~~~~~~~~~~ > > >> - > > >> -This document describes the guidelines for DPDK library-level > > >> statistics counter -support. This includes guidelines for turning > > >> library statistics on and off and -requirements for preventing ABI > > >> changes when implementing statistics. > > > > > >I think the ABI part is still relevant. > > > > Looking for some clarification on this. Which parts (if any) of the library > statistics section should be > > added back in for the ABI section below to make sense being included? Or > what do you suggest doing here? > > I think we can consider we still have the ability to turn stats off > because of the #ifdef still being there. > Cristian, do you think we should remove this doc? > Is on/off still possible in the new pipeline libs? > Hi Ciara and Thomas, IMO this section is still relevant and it is unrelated to the topic of this patch set, why do we want to remove it? From the make removal point of view, we only need the following change, and everything else is still logically valid: - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n + /* Library API header file. */ + #define RTE_<LIBRARY_NAME>_STATS_COLLECT On the larger stats topic, I think the section is still relevant, especially from the point of view of avoiding ABI breakage due to stats, which is applicable to several libraries, so I suggest to keep it. In the new pipeline libs (rte_swx_pipeline.h API), all the stats are enabled by default. Regards, Cristian > > > >[...] > > >> -Prevention of ABI changes due to library statistics support > > >> - > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ~ > > >> - > > >> -The layout of data structures and prototype of functions that are > > >> part of the -library API should not be affected by whether the > > >> collection of statistics -counters is turned on or off for the current > > >> library. In practical terms, this -means that space should always be > > >> allocated in the API data structures for -statistics counters and the > > >> statistics related API functions are always built -into the code, > > >> regardless of whether the statistics counter collection is turned -on > > >> or off for the current library. > > >> - > > >> -When the collection of statistics counters for the current library is > > >> turned -off, the counters retrieved through the statistics related API > > >> functions should -have a default value of zero. > > ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-21 19:14 ` Dumitrescu, Cristian @ 2020-09-22 8:39 ` Power, Ciara 2020-09-22 9:14 ` Dumitrescu, Cristian 0 siblings, 1 reply; 300+ messages in thread From: Power, Ciara @ 2020-09-22 8:39 UTC (permalink / raw) To: Dumitrescu, Cristian, Thomas Monjalon Cc: dev, Mcnamara, John, Kovacevic, Marko, Richardson, Bruce Hi Cristian, Thomas, >-----Original Message----- >From: Dumitrescu, Cristian <cristian.dumitrescu@intel.com> >Sent: Monday 21 September 2020 20:14 >To: Thomas Monjalon <thomas@monjalon.net>; Power, Ciara ><ciara.power@intel.com> >Cc: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>; Kovacevic, >Marko <marko.kovacevic@intel.com>; Richardson, Bruce ><bruce.richardson@intel.com> >Subject: RE: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in >contributing guides > <snip> >> > >[...] >> > >> -Library Statistics >> > >> ------------------- >> > >> - >> > >> -Description >> > >> -~~~~~~~~~~~ >> > >> - >> > >> -This document describes the guidelines for DPDK library-level >> > >> statistics counter -support. This includes guidelines for turning >> > >> library statistics on and off and -requirements for preventing >> > >> ABI changes when implementing statistics. >> > > >> > >I think the ABI part is still relevant. >> > >> > Looking for some clarification on this. Which parts (if any) of the >> > library >> statistics section should be >> > added back in for the ABI section below to make sense being >> > included? Or >> what do you suggest doing here? >> >> I think we can consider we still have the ability to turn stats off >> because of the #ifdef still being there. >> Cristian, do you think we should remove this doc? >> Is on/off still possible in the new pipeline libs? >> > >Hi Ciara and Thomas, > >IMO this section is still relevant and it is unrelated to the topic of this patch >set, why do we want to remove it? > >From the make removal point of view, we only need the following change, >and everything else is still logically valid: >- # DPDK file config/common_linux, config/common_freebsd, etc. >- CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n >+ /* Library API header file. */ >+ #define RTE_<LIBRARY_NAME>_STATS_COLLECT > >On the larger stats topic, I think the section is still relevant, especially from >the point of view of avoiding ABI breakage due to stats, which is applicable to >several libraries, so I suggest to keep it. > >In the new pipeline libs (rte_swx_pipeline.h API), all the stats are enabled by >default. > >Regards, >Cristian > I agree the Library Statistics is still relevant, having looked at it again since sending v1. I sent a v5 of this patchset yesterday just before your feedback here, and kept the full section but modified the instructions on how to enable/disable, removing the mention of CONFIG options. Please have a look at those changes here: https://patchwork.dpdk.org/patch/78208/ Thanks, Ciara ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides 2020-09-22 8:39 ` Power, Ciara @ 2020-09-22 9:14 ` Dumitrescu, Cristian 0 siblings, 0 replies; 300+ messages in thread From: Dumitrescu, Cristian @ 2020-09-22 9:14 UTC (permalink / raw) To: Power, Ciara, Thomas Monjalon Cc: dev, Mcnamara, John, Kovacevic, Marko, Richardson, Bruce > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > Sent: Tuesday, September 22, 2020 9:40 AM > To: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Thomas Monjalon > <thomas@monjalon.net> > Cc: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>; > Kovacevic, Marko <marko.kovacevic@intel.com>; Richardson, Bruce > <bruce.richardson@intel.com> > Subject: RE: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in > contributing guides > > Hi Cristian, Thomas, > > > >-----Original Message----- > >From: Dumitrescu, Cristian <cristian.dumitrescu@intel.com> > >Sent: Monday 21 September 2020 20:14 > >To: Thomas Monjalon <thomas@monjalon.net>; Power, Ciara > ><ciara.power@intel.com> > >Cc: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>; > Kovacevic, > >Marko <marko.kovacevic@intel.com>; Richardson, Bruce > ><bruce.richardson@intel.com> > >Subject: RE: [dpdk-dev] [PATCH v3 22/37] doc: remove references to make > in > >contributing guides > > > > <snip> > > >> > >[...] > >> > >> -Library Statistics > >> > >> ------------------- > >> > >> - > >> > >> -Description > >> > >> -~~~~~~~~~~~ > >> > >> - > >> > >> -This document describes the guidelines for DPDK library-level > >> > >> statistics counter -support. This includes guidelines for turning > >> > >> library statistics on and off and -requirements for preventing > >> > >> ABI changes when implementing statistics. > >> > > > >> > >I think the ABI part is still relevant. > >> > > >> > Looking for some clarification on this. Which parts (if any) of the > >> > library > >> statistics section should be > >> > added back in for the ABI section below to make sense being > >> > included? Or > >> what do you suggest doing here? > >> > >> I think we can consider we still have the ability to turn stats off > >> because of the #ifdef still being there. > >> Cristian, do you think we should remove this doc? > >> Is on/off still possible in the new pipeline libs? > >> > > > >Hi Ciara and Thomas, > > > >IMO this section is still relevant and it is unrelated to the topic of this patch > >set, why do we want to remove it? > > > >From the make removal point of view, we only need the following change, > >and everything else is still logically valid: > >- # DPDK file config/common_linux, config/common_freebsd, etc. > >- CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n > >+ /* Library API header file. */ > >+ #define RTE_<LIBRARY_NAME>_STATS_COLLECT > > > >On the larger stats topic, I think the section is still relevant, especially from > >the point of view of avoiding ABI breakage due to stats, which is applicable > to > >several libraries, so I suggest to keep it. > > > >In the new pipeline libs (rte_swx_pipeline.h API), all the stats are enabled > by > >default. > > > >Regards, > >Cristian > > > > I agree the Library Statistics is still relevant, having looked at it again since > sending v1. > I sent a v5 of this patchset yesterday just before your feedback here, and > kept the full > section but modified the instructions on how to enable/disable, removing > the mention > of CONFIG options. Please have a look at those changes here: > https://patchwork.dpdk.org/patch/78208/ > > Thanks, > Ciara > Cool with me, thanks Ciara. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 23/37] doc: remove references to make in cryptodev guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (21 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 24/37] doc: remove references to make in eventdev guides Ciara Power ` (15 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Declan Doherty, Pablo de Lara, John McNamara, Marko Kovacevic, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ------------- doc/guides/cryptodevs/ccp.rst | 14 +++--- doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- doc/guides/cryptodevs/kasumi.rst | 11 +---- doc/guides/cryptodevs/mvsam.rst | 10 +---- doc/guides/cryptodevs/nitrox.rst | 7 --- doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +----- doc/guides/cryptodevs/octeontx2.rst | 8 +--- doc/guides/cryptodevs/openssl.rst | 6 +-- doc/guides/cryptodevs/qat.rst | 67 +++++++---------------------- doc/guides/cryptodevs/scheduler.rst | 8 ---- doc/guides/cryptodevs/snow3g.rst | 10 +---- doc/guides/cryptodevs/virtio.rst | 20 +++------ doc/guides/cryptodevs/zuc.rst | 10 +---- 19 files changed, 40 insertions(+), 236 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 74e0de63ad..013615e2d0 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. @@ -117,5 +115,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm" diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 15388d20ab..fd533ca65b 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. @@ -152,7 +150,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo "sha1-hmac" Extra notes diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index a43fe92de9..9ca1979994 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -77,7 +75,7 @@ e.g. for the 0x1456 device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1022 1456" > /sys/bus/pci/drivers/igb_uio/new_id Another way to bind the CCP devices to DPDK UIO driver is by using the ``dpdk-devbind.py`` script. @@ -86,8 +84,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. @@ -109,7 +105,7 @@ To validate ccp pmd, l2fwd-crypto example can be used with following command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff @@ -124,7 +120,7 @@ following: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..5770a60cb2 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. @@ -117,7 +108,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "kasumi-f8" Extra notes on KASUMI F9 diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..6188c1248c 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: @@ -105,7 +97,7 @@ operation: .. code-block:: console - ./l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ + ./dpdk-l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ --auth_op GENERATE --auth_algo sha1-hmac \ diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 85f5212b64..2f0565b49e 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -33,13 +33,6 @@ Limitations * 3DES Cipher Only combination is not supported. * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/null.rst b/doc/guides/cryptodevs/null.rst index c980e0ac84..aac5904b1d 100644 --- a/doc/guides/cryptodevs/null.rst +++ b/doc/guides/cryptodevs/null.rst @@ -67,5 +67,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "null" diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..d813cb2974 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- @@ -135,7 +127,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_autotest The asymmetric crypto operations on OCTEON TX crypto PMD may be verified by running the test @@ -143,5 +135,5 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_asym_autotest diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index 432146db04..bb4af3a04d 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. @@ -148,7 +144,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_autotest The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test @@ -156,7 +152,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_asym_autotest diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..ca0f0b43f3 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: @@ -93,7 +93,7 @@ To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" --vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index e5d2cf4997..6714a7a8a2 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -483,7 +456,6 @@ To complete the installation follow the instructions in insmod ./drivers/crypto/qat/qat_common/intel_qat.ko insmod ./drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko - .. Note:: If you see the following warning in ``/var/log/messages`` it can be ignored: @@ -644,7 +616,7 @@ e.g. for the C62x device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vvd:37c9 @@ -660,27 +632,20 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -704,7 +669,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 7004ca431a..ee23b25b73 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..13341c39c4 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "snow3g-uea2" diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..83d8e32397 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,27 +83,17 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "cryptodev_virtio_autotest" to test + cd to <build_dir> + meson test cryptodev_virtio_autotest The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test-crypto-perf - type the command "make" to compile - run the tests with the following command: - - ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ + cd to <build_dir> + + ./app/dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ --ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \ --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \ --auth-op generate --auth-key-sz 64 --digest-sz 12 \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..907840ef05 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "zuc-eea3" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 24/37] doc: remove references to make in eventdev guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (22 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 23/37] doc: remove references to make in cryptodev guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 25/37] doc: remove references to make in FreeBSD gsg guide Ciara Power ` (14 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Hemant Agrawal, Nipun Gupta, John McNamara, Marko Kovacevic, Jerin Jacob, Pavan Nikhilesh Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/eventdevs/dpaa.rst | 20 -------------------- doc/guides/eventdevs/dpaa2.rst | 20 -------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 8 -------- 4 files changed, 72 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..6fbee91d9e 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -43,26 +43,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..b992ae649e 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -52,26 +52,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 9a3646db0d..f7a4cdd586 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..7f9eceb01f 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 25/37] doc: remove references to make in FreeBSD gsg guide 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (23 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 24/37] doc: remove references to make in eventdev guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 26/37] doc: remove references to make in howto guides Ciara Power ` (13 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Bruce Richardson, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Acked-by: Bruce Richardson <bruce.richardson@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/freebsd_gsg/intro.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index e31c966b98..1e5a8cfe9e 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -122,7 +122,7 @@ up time. This can be achieved by placing lines similar to the following into An error such as:: - kldload: can't load ./x86_64-native-freebsd-gcc/kmod/contigmem.ko: + kldload: can't load ./<build_dir>/kernel/freebsd/contigmem.ko: Exec format error is generally attributed to not having enough contiguous memory diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst index 63160ce64f..b2e57909ee 100644 --- a/doc/guides/freebsd_gsg/intro.rst +++ b/doc/guides/freebsd_gsg/intro.rst @@ -39,8 +39,8 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system (including the commands - that can be used in the root DPDK Makefile to build the development - kit and an application) and guidelines for porting an application + that can be used to build the development kit and an application) + and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 26/37] doc: remove references to make in howto guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (24 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 25/37] doc: remove references to make in FreeBSD gsg guide Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 27/37] doc: remove references to make in Linux gsg guides Ciara Power ` (12 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +-- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +-- doc/guides/howto/packet_capture_framework.rst | 21 +++------------ doc/guides/howto/pvp_reference_benchmark.rst | 27 +++++-------------- doc/guides/howto/vfd.rst | 4 +-- .../virtio_user_for_container_networking.rst | 2 +- 6 files changed, 16 insertions(+), 46 deletions(-) diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst index 07563b3e24..02ba1cdf5d 100644 --- a/doc/guides/howto/lm_bond_virtio_sriov.rst +++ b/doc/guides/howto/lm_bond_virtio_sriov.rst @@ -591,7 +591,7 @@ Set up DPDK in the Virtual Machine rmmod virtio-pci ixgbevf modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -613,7 +613,7 @@ Run testpmd in the Virtual Machine. # use for bonding of virtio and vf tests in VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-3 -n 4 --socket-mem 350 -- --i --port-topology=chained .. _lm_bond_virtio_sriov_switch_conf: diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst index ecb7832906..330ff5a9c8 100644 --- a/doc/guides/howto/lm_virtio_vhost_user.rst +++ b/doc/guides/howto/lm_virtio_vhost_user.rst @@ -421,7 +421,7 @@ setup_dpdk_virtio_in_vm.sh rmmod virtio-pci modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -437,5 +437,5 @@ run_testpmd_in_vm.sh # Run testpmd for use with vhost_user sample app. # test system has 8 cpus (0-7), use cpus 2-7 for VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-5 -n 4 --socket-mem 350 -- --burst=64 --i diff --git a/doc/guides/howto/packet_capture_framework.rst b/doc/guides/howto/packet_capture_framework.rst index 946a21c8ed..d457989607 100644 --- a/doc/guides/howto/packet_capture_framework.rst +++ b/doc/guides/howto/packet_capture_framework.rst @@ -52,11 +52,7 @@ Some things to note: initialization code. Refer to the ``app/test-pmd/testpmd.c`` code and look for ``pdump`` keyword to see how this is done. -* The ``dpdk-pdump`` tool depends on the libpcap based PMD which is disabled - by default in the build configuration files, owing to an external dependency - on the libpcap development files. Once the libpcap development files are - installed, the libpcap based PMD can be enabled by setting - ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` and recompiling the DPDK. +* The ``dpdk-pdump`` tool depends on the libpcap based PMD. Test Environment @@ -73,17 +69,6 @@ for packet capturing on the DPDK port in Packet capturing on a DPDK port using the dpdk-pdump tool. -Configuration -------------- - -Modify the DPDK primary application to initialize the packet capture framework -as mentioned in the above notes and enable the following config options and -build DPDK:: - - CONFIG_RTE_LIBRTE_PMD_PCAP=y - CONFIG_RTE_LIBRTE_PDUMP=y - - Running the Application ----------------------- @@ -93,11 +78,11 @@ inspect them using ``tcpdump``. #. Launch testpmd as the primary application:: - sudo ./app/testpmd -c 0xf0 -n 4 -- -i --port-topology=chained + sudo ./<build_dir>/app/dpdk-testpmd -c 0xf0 -n 4 -- -i --port-topology=chained #. Launch the pdump tool as follows:: - sudo ./build/app/dpdk-pdump -- \ + sudo ./<build_dir>/app/dpdk-pdump -- \ --pdump 'port=0,queue=*,rx-dev=/tmp/capture.pcap' #. Send traffic to dpdk_port0 from traffic generator. diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst index 64b1f4d8ec..1d4a4b0232 100644 --- a/doc/guides/howto/pvp_reference_benchmark.rst +++ b/doc/guides/howto/pvp_reference_benchmark.rst @@ -99,14 +99,7 @@ Build Qemu: DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -117,7 +110,7 @@ Testpmd launch .. code-block:: console modprobe vfio-pci - $RTE_SDK/install/sbin/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 + ./dpdk/usertools/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 .. Note:: @@ -129,7 +122,7 @@ Testpmd launch .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ --vdev 'net_vhost0,iface=/tmp/vhost-user1' \ --vdev 'net_vhost1,iface=/tmp/vhost-user2' -- \ --portmask=f -i --rxq=1 --txq=1 \ @@ -309,18 +302,10 @@ Guest tuning echo "obase=16;$(( 0x$(cat $i) & ~$clear_mask ))" | bc > $i done - DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -340,13 +325,13 @@ Bind the virtio-net devices to DPDK: .. code-block:: console - $RTE_SDK/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 + ./dpdk/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 Start testpmd: .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ --proc-type auto --file-prefix pg -- \ --portmask=3 --forward-mode=macswap --port-topology=chained \ --disable-rss -i --rxq=1 --txq=1 \ diff --git a/doc/guides/howto/vfd.rst b/doc/guides/howto/vfd.rst index 0ec0a0478d..5a62e6ff5a 100644 --- a/doc/guides/howto/vfd.rst +++ b/doc/guides/howto/vfd.rst @@ -83,7 +83,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the PF in the host:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 #. Bind the VF port to ``igb_uio`` in the VM:: @@ -91,7 +91,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the VF in the VM:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 Common functions of IXGBE and I40E diff --git a/doc/guides/howto/virtio_user_for_container_networking.rst b/doc/guides/howto/virtio_user_for_container_networking.rst index 412b29664b..5eab360a1c 100644 --- a/doc/guides/howto/virtio_user_for_container_networking.rst +++ b/doc/guides/howto/virtio_user_for_container_networking.rst @@ -64,7 +64,7 @@ some minor changes. FROM ubuntu:latest WORKDIR /usr/src/dpdk COPY . /usr/src/dpdk - ENV PATH "$PATH:/usr/src/dpdk/x86_64-native-linux-gcc/app/" + ENV PATH "$PATH:/usr/src/dpdk/<build_dir>/app/" EOT #. Build a Docker image. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 27/37] doc: remove references to make in Linux gsg guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (25 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 26/37] doc: remove references to make in howto guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 28/37] doc: remove references to make in mempool guides Ciara Power ` (11 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/linux_gsg/build_dpdk.rst | 84 +++---------------- doc/guides/linux_gsg/build_sample_apps.rst | 69 +-------------- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 48 +---------- doc/guides/linux_gsg/enable_func.rst | 13 ++- doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/linux_drivers.rst | 18 ++-- doc/guides/linux_gsg/sys_reqs.rst | 16 +--- 7 files changed, 40 insertions(+), 210 deletions(-) diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index c536e354ef..85d04520bf 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -31,7 +31,7 @@ The DPDK is composed of several directories: * examples: Source code of DPDK application examples -* config, buildtools, mk: Framework-related makefiles, scripts and configuration +* config, buildtools: Framework-related scripts and configuration Compiling and Installing DPDK System-wide ----------------------------------------- @@ -39,11 +39,6 @@ Compiling and Installing DPDK System-wide DPDK can be configured, built and installed on your system using the tools ``meson`` and ``ninja``. -.. note:: - - The older makefile-based build system used in older DPDK releases is - still present and its use is described in section - `Installation of DPDK Target Environment using Make`_. DPDK Configuration ~~~~~~~~~~~~~~~~~~ @@ -81,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` to update its cache to take distributions, `/usr/local/lib` and `/usr/local/lib64` should be added to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. +.. _adjusting_build_options: + Adjusting Build Options ~~~~~~~~~~~~~~~~~~~~~~~ @@ -117,6 +114,9 @@ dependencies are met on the current system are built. When `-Dexamples=all` is set as a meson option, meson will check each example application to see if it can be built, and add all which can be built to the list of tasks in the ninja build configuration file. +.. _building_app_using_installed_dpdk: + + Building Applications Using Installed DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -140,11 +140,12 @@ and the sources for that build are stored in ``$(SRCS-y)``. .. note:: - Unlike with the older make build system, the meson system is not - designed to be used directly from a build directory. Instead it is - recommended that it be installed either system-wide or to a known - location in the user's home directory. The install location can be set - using the `--prefix` meson option (default: `/usr/local`). + Unlike with the make build system present used in older DPDK releases, + the meson system is not designed to be used directly from a build + directory. Instead it is recommended that it be installed either + system-wide or to a known location in the user's home directory. + The install location can be set using the `--prefix` meson option + (default: `/usr/local`). an equivalent build recipe for a simple DPDK application using meson as a build system is shown below: @@ -156,64 +157,3 @@ build system is shown below: dpdk = dependency('libdpdk') sources = files('main.c') executable('dpdk-app', sources, dependencies: dpdk) - - -Installation of DPDK Target Environment using Make --------------------------------------------------- - -.. note:: - - The building of DPDK using make will be deprecated in a future release. It - is therefore recommended that DPDK installation is done using meson and - ninja as described above. - -Get a native target environment automatically:: - - make defconfig O=mybuild - -.. note:: - - Within the configuration files, the ``RTE_MACHINE`` configuration value is set to native, - which means that the compiled software is tuned for the platform on which it is built. - -Or get a specific target environment:: - - make config T=x86_64-native-linux-gcc O=mybuild - -The format of a DPDK target is "ARCH-MACHINE-EXECENV-TOOLCHAIN". -Available targets can be found with:: - - make help - -Customize the target configuration in the generated ``.config`` file. -Example for enabling the pcap PMD:: - - sed -ri 's,(PMD_PCAP=).*,\1y,' mybuild/.config - -Compile the target:: - - make -j4 O=mybuild - -.. warning:: - - Any kernel modules to be used, e.g. ``igb_uio``, ``kni``, must be compiled with the - same kernel as the one running on the target. - If the DPDK is not being built on the target machine, - the ``RTE_KERNELDIR`` environment variable should be used to point the compilation at a copy of the kernel version to be used on the target machine. - -Install the target in a separate directory:: - - make install O=mybuild DESTDIR=myinstall prefix= - -The environment is ready to build a DPDK application:: - - RTE_SDK=$(pwd)/myinstall/share/dpdk RTE_TARGET=x86_64-native-linux-gcc make -C myapp - -In addition, the make clean command can be used to remove any existing compiled files for a subsequent full, clean rebuild of the code. - -Browsing the Installed DPDK Environment Target ----------------------------------------------- - -Once a target is created it contains all libraries, including poll-mode drivers, and header files for the DPDK environment that are required to build customer applications. -In addition, the test applications are built under the app directory, which may be used for testing. -A kmod directory is also present that contains kernel modules which may be loaded if needed. diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2f606535c3..f4bf0e71e5 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -Compiling and Running Sample Applications +Running Sample Applications ========================================= The chapter describes how to compile and run applications in an DPDK environment. @@ -15,56 +15,7 @@ It also provides a pointer to where sample applications are stored. Compiling a Sample Application ------------------------------ -Once an DPDK target environment directory has been created (such as ``x86_64-native-linux-gcc``), -it contains all libraries and header files required to build an application. - -When compiling an application in the Linux* environment on the DPDK, the following variables must be exported: - -* ``RTE_SDK`` - Points to the DPDK installation directory. - -* ``RTE_TARGET`` - Points to the DPDK target environment directory. - -The following is an example of creating the ``helloworld`` application, which runs in the DPDK Linux environment. -This example may be found in the ``${RTE_SDK}/examples`` directory. - -The directory contains the ``main.c`` file. This file, when combined with the libraries in the DPDK target environment, -calls the various functions to initialize the DPDK environment, -then launches an entry point (dispatch application) for each core to be utilized. -By default, the binary is generated in the build directory. - -.. code-block:: console - - cd examples/helloworld/ - export RTE_SDK=$HOME/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - - make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map - - ls build/app - helloworld helloworld.map - -.. note:: - - In the above example, ``helloworld`` was in the directory structure of the DPDK. - However, it could have been located outside the directory structure to keep the DPDK structure intact. - In the following case, the ``helloworld`` application is copied to a new directory as a new starting point. - - .. code-block:: console - - export RTE_SDK=/home/user/DPDK - cp -r $(RTE_SDK)/examples/helloworld my_rte_app - cd my_rte_app/ - export RTE_TARGET=x86_64-native-linux-gcc - - make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map +Please refer to :ref:`building_app_using_installed_dpdk` for detail on compiling sample apps. Running a Sample Application ---------------------------- @@ -168,7 +119,7 @@ Copy the DPDK application binary to your target, then run the application as fol (assuming the platform has four memory channels per processor socket, and that cores 0-3 are present and are to be used for running the application):: - ./helloworld -l 0-3 -n 4 + ./dpdk-helloworld -l 0-3 -n 4 .. note:: @@ -232,19 +183,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization Additional Sample Applications ------------------------------ -Additional sample applications are included in the ${RTE_SDK}/examples directory. +Additional sample applications are included in the DPDK examples directory. These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. In addition, see the *DPDK Sample Applications User Guide* for a description of the application, specific instructions on compilation and execution and some explanation of the code. - -Additional Test Applications ----------------------------- - -In addition, there are two other applications that are built when the libraries are created. -The source files for these are in the DPDK/app directory and are called test and testpmd. -Once the libraries are created, they can be found in the build/app directory. - -* The test application provides a variety of specific tests for the various functions in the DPDK. - -* The testpmd application provides a number of different packet throughput tests and - examples of features such as how to use the Flow Director found in the Intel® 82599 10 Gigabit Ethernet Controller. diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index c5875a6d57..8a1d0e88b0 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -67,7 +67,7 @@ Augment the cross toolchain with NUMA support .. note:: - This way is optional, an alternative is to use extra CFLAGS and LDFLAGS, depicted in :ref:`configure_and_cross_compile_dpdk_build` below. + This way is optional, an alternative is to use extra CFLAGS and LDFLAGS. Copy the NUMA header files and lib to the cross compiler's directories: @@ -79,8 +79,8 @@ Copy the NUMA header files and lib to the cross compiler's directories: .. _configure_and_cross_compile_dpdk_build: -Cross Compiling DPDK using Meson --------------------------------- +Cross Compiling DPDK +-------------------- Meson depends on pkgconfig to find the dependencies. The package ``pkg-config-aarch64-linux-gnu`` is required for aarch64. @@ -99,45 +99,3 @@ command:: meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ninja -C arm64-build - -Configure and Cross Compile DPDK using Make -------------------------------------------- -To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc. - -.. code-block:: console - - make config T=arm64-armv8a-linux-gcc - -To cross-compile, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -To cross-compile, including the kernel modules, the kernel source tree needs to be specified by setting -RTE_KERNELDIR: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- RTE_KERNELDIR=<kernel_src_rootdir> CROSS_COMPILE=aarch64-linux-gnu- - -To compile for non-NUMA targets, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n - -.. note:: - - 1. EXTRA_CFLAGS and EXTRA_LDFLAGS should be added to include the NUMA headers and link the library respectively, - if the above step :ref:`augment_the_cross_toolchain_with_numa_support` was skipped therefore the toolchain was not - augmented with NUMA support. - - 2. "-isystem <numa_install_dir>/include" should be add to EXTRA_CFLAGS, otherwise the numa.h file will get a lot of compiling - errors of Werror=cast-qual, Werror=strict-prototypes and Werror=old-style-definition. - - An example is given below: - - .. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index b2bda80bb7..08f55d8543 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -41,7 +41,9 @@ Enabling HPET in the DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, HPET support is disabled in the DPDK build configuration files. -To use HPET, the ``CONFIG_RTE_LIBEAL_USE_HPET`` setting should be changed to ``y``, which will enable the HPET settings at compile time. +To use HPET, use the following meson build option which will enable the HPET settings at compile time:: + + meson configure -Duse_hpet=true For an application to use the ``rte_get_hpet_cycles()`` and ``rte_get_hpet_hz()`` API calls, and optionally to make the HPET the default time source for the rte_timer library, @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module ---------------------------------- To run the DPDK Kernel NIC Interface (KNI) sample application, an extra kernel module (the kni module) must be loaded into the running kernel. -The module is found in the kmod sub-directory of the DPDK target directory. -Similar to the loading of the ``igb_uio`` module, this module should be loaded using the insmod command as shown below -(assuming that the current directory is the DPDK target directory): - -.. code-block:: console - - insmod kmod/rte_kni.ko +The module is found in the kernel/linux sub-directory of the DPDK build directory. +This can be enabled in the same way as the ``igb_uio`` module, please see :ref:`load_uio` for details. .. note:: diff --git a/doc/guides/linux_gsg/intro.rst b/doc/guides/linux_gsg/intro.rst index 94877f4ae2..890169e97f 100644 --- a/doc/guides/linux_gsg/intro.rst +++ b/doc/guides/linux_gsg/intro.rst @@ -23,7 +23,7 @@ The following is a list of DPDK documents in the suggested reading order: * The software architecture and how to use it (through examples), specifically in a Linux application (linux) environment - * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development kit and + * The content of the DPDK, the build system (including the commands that can be used to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst index 185074013a..349be1c906 100644 --- a/doc/guides/linux_gsg/linux_drivers.rst +++ b/doc/guides/linux_gsg/linux_drivers.rst @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in order to work properly. Depends on the PMD being used, a corresponding kernel driver should be load and bind to the network ports. +.. _load_uio: + + UIO --- @@ -28,19 +31,20 @@ can provide the uio capability. This module can be loaded using the command: ``uio_pci_generic`` module doesn't support the creation of virtual functions. As an alternative to the ``uio_pci_generic``, the DPDK also includes the igb_uio -module which can be found in the kmod subdirectory referred to above. It can +module which can be found in the kernel/linux subdirectory referred to above. It can be loaded as shown below: .. code-block:: console sudo modprobe uio - sudo insmod kmod/igb_uio.ko + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko .. note:: - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. - It is planned to move ``igb_uio`` module to a different git repository. + Building DPDK Linux kernel modules is disabled by default starting from DPDK v20.02. + To enable them again, the config option "enable_kmods" needs to be set in the meson + build configuration. See :ref:`adjusting_build_options` for details on how to set/clear + build options. It is planned to move ``igb_uio`` module to a different git repository. .. note:: @@ -104,11 +108,11 @@ parameter ``--vfio-vf-token``. 3. echo 2 > /sys/bus/pci/devices/0000:86:00.0/sriov_numvfs 4. Start the PF: - ./x86_64-native-linux-gcc/app/testpmd -l 22-25 -n 4 -w 86:00.0 \ + ./<build_dir>/app/dpdk-testpmd -l 22-25 -n 4 -w 86:00.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=pf -- -i 5. Start the VF: - ./x86_64-native-linux-gcc/app/testpmd -l 26-29 -n 4 -w 86:02.0 \ + ./<build_dir>/app/dpdk-testpmd -l 26-29 -n 4 -w 86:02.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=vf0 -- -i Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index a124656bcb..625fb58066 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -37,17 +37,13 @@ Compilation of the DPDK The setup commands and installed packages needed on various systems may be different. For details on Linux distributions and the versions tested, please consult the DPDK Release Notes. -* General development tools including ``make``, and a supported C compiler such as ``gcc`` (version 4.9+) or ``clang`` (version 3.4+). +* General development tools including a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+). * For RHEL/Fedora systems these can be installed using ``dnf groupinstall "Development Tools"`` * For Ubuntu/Debian systems these can be installed using ``apt install build-essential`` -* Python, recommended version 3.5+. - - * Python v3.5+ is needed to build DPDK using meson and ninja - - * Python 2.7+ or 3.2+, to use various helper scripts included in the DPDK package. +* Python, v3.5 or later. * Meson (version 0.47.1+) and ninja @@ -82,12 +78,8 @@ Compilation of the DPDK **Additional Libraries** A number of DPDK components, such as libraries and poll-mode drivers (PMDs) have additional dependencies. -For DPDK builds using meson, the presence or absence of these dependencies will be -automatically detected enabling or disabling the relevant components appropriately. - -For builds using make, these components are disabled in the default configuration and -need to be enabled manually by changing the relevant setting to "y" in the build configuration file -i.e. the ``.config`` file in the build folder. +For DPDK builds, the presence or absence of these dependencies will be automatically detected +enabling or disabling the relevant components appropriately. In each case, the relevant library development package (``-devel`` or ``-dev``) is needed to build the DPDK components. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 28/37] doc: remove references to make in mempool guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (26 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 27/37] doc: remove references to make in Linux gsg guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 29/37] doc: remove references to make in NIC guides Ciara Power ` (10 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/mempool/octeontx.rst | 28 +++------------------------- doc/guides/mempool/octeontx2.rst | 10 +--------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..33c40d5b17 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -30,33 +30,11 @@ Prerequisites See :doc: `../platform/octeontx.rst` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) - - Set default mempool ops to octeontx_fpavf. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console +------------------ - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc +See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK. Initialization @@ -70,5 +48,5 @@ Example: .. code-block:: console - ./build/app/test -c 0xf --base-virtaddr=0x100000000000 \ + ./<build_dir>/app/test/dpdk-test -c 0xf --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..53f09a52db 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -97,4 +89,4 @@ Standalone mempool device Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device:: - echo "mempool_autotest" | build/app/test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" + echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 29/37] doc: remove references to make in NIC guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (27 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 28/37] doc: remove references to make in mempool guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 30/37] doc: remove references to make in platform guides Ciara Power ` (9 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Shepard Siegel, Ed Czeck, John Miller, John McNamara, Marko Kovacevic, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Wei Zhao, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Bruce Richardson, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/nics/ark.rst | 26 ------------- doc/guides/nics/atlantic.rst | 4 -- doc/guides/nics/axgbe.rst | 15 -------- doc/guides/nics/bnx2x.rst | 27 ------------- doc/guides/nics/bnxt.rst | 5 +-- doc/guides/nics/build_and_test.rst | 8 +++- doc/guides/nics/cxgbe.rst | 36 +++++------------ doc/guides/nics/dpaa.rst | 27 +------------ doc/guides/nics/dpaa2.rst | 26 +------------ doc/guides/nics/ena.rst | 16 -------- doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 ----- doc/guides/nics/fail_safe.rst | 20 ++-------- doc/guides/nics/features.rst | 9 ----- doc/guides/nics/fm10k.rst | 4 -- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ----- doc/guides/nics/i40e.rst | 44 ++++++--------------- doc/guides/nics/ice.rst | 25 ++---------- doc/guides/nics/igc.rst | 18 +-------- doc/guides/nics/intel_vf.rst | 13 +------ doc/guides/nics/ionic.rst | 8 ---- doc/guides/nics/ipn3ke.rst | 12 +----- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 ------------- doc/guides/nics/memif.rst | 10 ++--- doc/guides/nics/mlx4.rst | 55 ++------------------------ doc/guides/nics/mlx5.rst | 62 ++---------------------------- doc/guides/nics/mvneta.rst | 36 ++++------------- doc/guides/nics/mvpp2.rst | 43 ++++----------------- doc/guides/nics/nfb.rst | 19 +-------- doc/guides/nics/nfp.rst | 4 -- doc/guides/nics/null.rst | 6 +-- doc/guides/nics/octeontx.rst | 19 +-------- doc/guides/nics/octeontx2.rst | 13 +------ doc/guides/nics/pcap_ring.rst | 24 ++++++------ doc/guides/nics/qede.rst | 17 +------- doc/guides/nics/sfc_efx.rst | 15 -------- doc/guides/nics/softnic.rst | 13 +------ doc/guides/nics/szedata2.rst | 18 +-------- doc/guides/nics/thunderx.rst | 25 +----------- doc/guides/nics/vdev_netvsc.rst | 6 --- doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- 44 files changed, 102 insertions(+), 693 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 06e8c33746..d7d679b452 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -119,32 +119,6 @@ Data Path Interface Ingress RX and Egress TX operation is by the nominal DPDK API . The driver supports single-port, multi-queue for both RX and TX. -Configuration Information -------------------------- - -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug - logging and internal checking of RX ingress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug - logging and internal checking of TX egress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables debug - logging of detailed packet and performance statistics gathered in - the PMD and FPGA. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables debug - logging of detailed PMD events and status. - Building DPDK ------------- diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..3c163df7a8 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -72,33 +72,6 @@ Prerequisites `linux-firmware git repository <https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/bnx2x/bnx2x-e2-7.13.11.0.fw>`_ to get the required firmware. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) - - Toggle display of register reads and writes. - .. _bnx2x_driver-compilation: diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 129a16cfc7..4b172fdaac 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode @@ -612,7 +609,7 @@ Basic stats include: * oerrors By default, per-queue stats for 16 queues are supported. For more than 16 -queues, BNXT PMD should be compiled with ``CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS`` +queues, BNXT PMD should be compiled with ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` set to the desired number of queues. Extended Stats diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index 3138c0f880..03ce358553 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -66,10 +66,14 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. #. Load ``igb_uio`` or ``vfio-pci`` driver: + Before compiling, make sure to enable kmods for the meson build:: + + meson configure -Denable_kmods=true + .. code-block:: console modprobe uio - insmod ./x86_64-native-linux-gcc/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko or @@ -106,7 +110,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..442ab1511c 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -87,35 +87,19 @@ Prerequisites :ref:`linux-installation` for Linux and section :ref:`freebsd-installation` for FreeBSD. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. For example, .. code-block:: console - testpmd -w 02:00.4,keep_ovlan=1 -- -i + dpdk-testpmd -w 02:00.4,keep_ovlan=1 -- -i Common Runtime Options -^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~ - ``keep_ovlan`` (default **0**) @@ -133,7 +117,7 @@ Common Runtime Options coalesce limit has been reached. CXGBE VF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``force_link_up`` (default **0**) @@ -142,7 +126,7 @@ CXGBE VF Only Runtime Options to send traffic to each other even when the physical link is down. CXGBE PF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``filtermode`` (default **0**) @@ -317,7 +301,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88 -- -i - ``filtermask`` (default **0**) @@ -344,7 +328,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i .. _driver-compilation: @@ -689,7 +673,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ + cp <build_dir>/kernel/freebsd/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -770,13 +754,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko + kldload <build_dir>/kernel/freebsd/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 17839a920e..eba8bfe600 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -195,31 +195,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ @@ -264,7 +239,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5a..b64bc6311b 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ @@ -473,7 +449,7 @@ for details. .. code-block:: console - ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx + ./dpdk-testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... EAL: Registered [pci] bus. diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index bec97c3326..4bdc3182fc 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 3c896eeffa..6203f4d799 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -113,5 +113,3 @@ Driver compilation and testing Follow instructions available in the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` to launch **testpmd** - -To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..be6a034279 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,8 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index b4a92f663b..b7bc5a566b 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- @@ -128,7 +116,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i @@ -142,7 +130,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -w 81:00.0 -- -i @@ -150,7 +138,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 -w ff:ff.f \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 -w ff:ff.f \ --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i #. Start testpmd, automatically probing the device 84:00.0 and using it with @@ -158,7 +146,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index edd21c4d8e..6172a0fa4b 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -812,8 +812,6 @@ ARMv7 Support armv7 architecture. -Use ``defconfig_arm-armv7a-*-*``. - .. _nic_features_armv8: @@ -822,8 +820,6 @@ ARMv8 Support armv8a (64bit) architecture. -Use ``defconfig_arm64-armv8a-*-*`` - .. _nic_features_power8: @@ -832,7 +828,6 @@ Power8 Support PowerPC architecture. -Use ``defconfig_ppc_64-power8-*-*`` .. _nic_features_x86-32: @@ -841,8 +836,6 @@ x86-32 Support 32bits x86 architecture. -Use ``defconfig_x86_x32-native-*-*`` and ``defconfig_i686-native-*-*``. - .. _nic_features_x86-64: @@ -851,8 +844,6 @@ x86-64 Support 64bits x86 architecture. -Use ``defconfig_x86_64-native-*-*``. - .. _nic_features_usage_doc: diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index b7430f6c4e..945fe97441 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -155,35 +155,13 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. +The following options can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -354,7 +332,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --forward-mode=mac + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --forward-mode=mac ... testpmd> set promisc 0 off @@ -389,8 +367,9 @@ Start ``testpmd`` with ``--disable-rss`` and ``--pkt-filter-mode=perfect``: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --disable-rss --pkt-filter-mode=perfect \ - --rxq=8 --txq=8 --nb-cores=8 --nb-ports=1 + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --disable-rss \ + --pkt-filter-mode=perfect --rxq=8 --txq=8 --nb-cores=8 \ + --nb-ports=1 Add a rule to direct ``ipv4-udp`` packet whose ``dst_ip=2.2.2.5, src_ip=2.2.2.3, src_port=32, dst_port=32`` to queue 1: @@ -648,8 +627,7 @@ For all available versions of the i40e driver, these drivers don't support 16 byte RX descriptor. If the Linux i40e kernel driver is used as host driver, while DPDK i40e PMD is used as the VF driver, DPDK cannot choose 16 byte receive descriptor. The reason is that the RX descriptor is already set to 32 byte by -the i40e kernel driver. That is to say, user should keep -``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n`` in config file. +the i40e kernel driver. In the future, if the Linux i40e driver supports 16 byte RX descriptor, user should make sure the DPDK VF uses the same RX descriptor mode, 16 byte or 32 byte, as the PF driver. @@ -760,7 +738,9 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +In ``config/rte_config.h`` set the following to use 16 bytes size RX descriptors:: + + #define RTE_LIBRTE_I40E_16BYTE_RX_DESC 1 Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -813,7 +793,7 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup. 7. The command line of running l3fwd would be something like the following:: - ./l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ + ./dpdk-l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ -- -p 0x3 --config '(0,0,18),(0,1,19),(1,0,20),(1,1,21)' This means that the application uses core 18 for port 0, queue pair 0 forwarding, core 19 for port 0, queue pair 1 forwarding, diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb0..9d3fcd1c9c 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -23,23 +23,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -106,14 +89,14 @@ Runtime Config Options .. code-block:: console - testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' + dpdk-testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-13 are VLAN extraction, other queues run with no protocol extraction. .. code-block:: console - testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' + dpdk-testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. @@ -253,7 +236,7 @@ responses for the same from PF. #. Bind the VF0, and run testpmd with 'cap=dcf' devarg:: - testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i + dpdk-testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i #. Monitor the VF2 interface network traffic:: @@ -282,7 +265,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i + ./app/dpdk-testpmd -l 0-15 -n 4 -- -i ... testpmd> rx_vlan add 10 0 diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3b096236bf 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ @@ -67,7 +53,7 @@ outer VLAN to 0x9100: .. code-block:: console - ./app/testpmd -l 4-8 -- -i + ./app/dpdk-testpmd -l 4-8 -- -i ... testpmd> vlan set filter on 0 @@ -94,7 +80,7 @@ Start ``testpmd``: .. code-block:: console - ./testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss + ./dpdk-testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss Add a rule to direct packet whose ``ether-type=0x801`` to queue 1: diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..723a9c0fa2 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,6 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +520,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..5d4534e4da 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +77,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop HQoS and flow acceleration ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,7 +88,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port, enable FPGA HQoS and .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap Limitations or Known issues --------------------------- diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 90d3040cf5..80ba459d49 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -97,13 +97,13 @@ It is possible to test PMD quickly using KNI kernel module loopback feature: .. code-block:: console - insmod build/kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb * Start testpmd with no physical device but two KNI virtual devices: .. code-block:: console - ./testpmd --vdev net_kni0 --vdev net_kni1 -- -i + ./dpdk-testpmd --vdev net_kni0 --vdev net_kni1 -- -i .. code-block:: console diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index ddeebed25c..6c6227f979 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -213,15 +213,15 @@ In this example we run two instances of testpmd application and transmit packets First create ``master`` interface:: - #./build/app/testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i + #./<build_dir>/app/dpdk-testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i Now create ``slave`` interface (master must be already running so the slave will connect):: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i You can also enable ``zero-copy`` on ``slave`` interface:: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i Start forwarding packets:: @@ -257,7 +257,7 @@ To see socket filename use show memif command:: Now create memif interface by running testpmd with these command line options:: - #./testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i + #./dpdk-testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i Testpmd should now create memif slave interface and try to connect to master. In testpmd set forward option to icmpecho and start forwarding:: @@ -280,7 +280,7 @@ The situation is analogous to cross connecting 2 ports of the NIC by cable. To set the loopback, just use the same socket and id with different roles:: - #./testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i + #./dpdk-testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i Then start the communication:: diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 1f1e2f6c77..d077ada7e2 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,43 +51,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +65,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +203,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 211c0c5a6c..9c32893fc6 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -328,50 +323,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -383,10 +337,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1109,12 +1059,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..e8abde42da 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -81,20 +75,9 @@ Prerequisites Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. @@ -107,7 +90,7 @@ be passed as part of EAL arguments. .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ -c 3 -- -i --p 3 -a @@ -126,16 +109,13 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +following command: .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + Usage Example ------------- @@ -160,7 +140,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ -i --p 3 -a --txd 256 --rxd 128 --rxq=1 --txq=1 --nb-cores=1 @@ -168,4 +148,4 @@ In order to run l2fwd example application following command can be used: .. code-block:: console - ./l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 + ./dpdk-l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..6fbce8358e 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -143,22 +123,15 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +command below. For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`. .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make Usage Example ------------- @@ -185,7 +158,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ --burst=128 --txd=2048 --rxd=1024 --rxq=2 --txq=2 --nb-cores=2 \ -i -a --rss-udp @@ -373,7 +346,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ -c 7 -- -i -a --disable-hw-vlan-strip --rxq=3 --txq=3 .. _flowapi: @@ -486,7 +459,7 @@ Before proceeding run testpmd user application: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip Example #1 ^^^^^^^^^^ @@ -578,7 +551,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 2. Create meter profile: @@ -657,7 +630,7 @@ For a detailed usage description please refer to "Traffic Management" section in .. code-block:: console - ./testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ + ./dpdk-testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ -i -p 3 --disable-hw-vlan-strip --rxq 3 --txq 3 --txd 1024 --rxd 1024 2. Stop all ports: diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..ecea3ecff0 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./<build_dir>/app/dpdk-testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. @@ -133,7 +118,7 @@ transmit queue: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 5f2a0698f6..6aa58f4358 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..e75abd96d2 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..c01ae09bb3 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./<build_dir>/app/dpdk-testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index bb591a8b7e..903b52b802 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document @@ -74,7 +63,7 @@ use arm64-octeontx2-linux-gcc as target. .. code-block:: console - ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 + ./<build_dir>/app/dpdk-testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 EAL: Detected 24 lcore(s) EAL: Detected 1 NUMA nodes EAL: Multi-process socket /var/run/dpdk/rte/mp_socket diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index cf230ae40a..67bd23ea4a 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx @@ -225,7 +223,7 @@ Multiple devices may be specified, separated by commas. .. code-block:: console - ./testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i + ./dpdk-testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i EAL: Detected lcore 1 as core 1 on socket 0 ... diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index 5b2f868952..6df0066dd4 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -111,22 +111,9 @@ Performance note Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index be1c2fe1d6..6ee5190f3c 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -271,21 +271,6 @@ Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_PMD`` (default **y**) - - Enable compilation of Solarflare libefx-based poll-mode driver. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG`` (default **n**) - - Enable compilation of the extra run-time consistency checks. - - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..695ebed91f 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- @@ -130,7 +121,7 @@ Soft NIC testing .. code-block:: console - ./testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i + ./dpdk-testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i --portmask=0x2 .. code-block:: console @@ -375,7 +366,7 @@ commands. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -c 0x7 -s 0x4 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0x7 -s 0x4 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..9cf3f39eb5 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..a928a790e3 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ @@ -70,8 +50,7 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linux-gcc as target. +Use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling. Linux ----- @@ -178,7 +157,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst index d36f3120b2..ee802ec4a8 100644 --- a/doc/guides/nics/vhost.rst +++ b/doc/guides/nics/vhost.rst @@ -90,7 +90,7 @@ This section demonstrates vhost PMD with testpmd DPDK sample application. .. code-block:: console - ./testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i + ./dpdk-testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i Other basic DPDK preparations like hugepage enabling here. Please refer to the *DPDK Getting Started Guide* for detailed instructions. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 0daf25b22d..a51b389685 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -110,7 +110,7 @@ Host2VM communication example .. code-block:: console - examples/kni/build/app/kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" + <build_dir>/examples/dpdk-kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" This command generates one network device vEth0 for physical port. If specify more physical ports, the generated network device will be vEth1, vEth2, and so on. @@ -340,7 +340,7 @@ Here we use l3fwd-power as an example to show how to get started. .. code-block:: console - $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ + $ dpdk-l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ --no-numa --parse-ptype -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 30/37] doc: remove references to make in platform guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (28 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 29/37] doc: remove references to make in NIC guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 31/37] doc: remove references to make in prog guides Ciara Power ` (8 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/platform/bluefield.rst | 22 --------------------- doc/guides/platform/octeontx.rst | 33 +------------------------------ doc/guides/platform/octeontx2.rst | 32 ------------------------------ 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..9c20ce437d 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. The above steps would rebuild the modules and the required intermediate binaries. Once the target is ready for native compilation, the OCTEON TX platform -drivers can be compiled with the following steps, +drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details. -.. code-block:: console - - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: The above steps will prepare build system with numa additions. Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" - If NUMA support is not required, it can be disabled as explained in :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. -Following steps could be used in that case. - -.. code-block:: console - - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- - - SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 13255eec5c..232f628366 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -498,27 +498,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -529,17 +508,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 31/37] doc: remove references to make in prog guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (29 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 30/37] doc: remove references to make in platform guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 32/37] doc: remove references to make in rawdev guides Ciara Power ` (7 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Thomas Monjalon, John McNamara, Marko Kovacevic, Anatoly Burakov, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Konstantin Ananyev, Ferruh Yigit, Chas Williams, Wei Hu (Xavier), Olivier Matz, Andrew Rybchenko, Cristian Dumitrescu, Jasvinder Singh, Honnappa Nagarahalli, Sunil Kumar Kori Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- MAINTAINERS | 3 +- doc/guides/prog_guide/build_app.rst | 48 +-- .../prog_guide/dev_kit_build_system.rst | 331 ------------------ .../prog_guide/dev_kit_root_make_help.rst | 188 ---------- .../prog_guide/env_abstraction_layer.rst | 17 +- ...ib_make_help.rst => ext_app_make_help.rst} | 25 +- doc/guides/prog_guide/graph_lib.rst | 6 +- doc/guides/prog_guide/index.rst | 4 +- doc/guides/prog_guide/intro.rst | 2 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../prog_guide/kernel_nic_interface.rst | 14 +- .../link_bonding_poll_mode_drv_lib.rst | 15 +- doc/guides/prog_guide/lto.rst | 12 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/profile_app.rst | 17 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- 22 files changed, 52 insertions(+), 704 deletions(-) delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst rename doc/guides/prog_guide/{ext_app_lib_make_help.rst => ext_app_make_help.rst} (69%) diff --git a/MAINTAINERS b/MAINTAINERS index 0fec96558e..095824ab0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -103,8 +103,7 @@ F: Makefile F: config/ F: doc/build-sdk-quick.txt F: doc/guides/prog_guide/build_app.rst -F: doc/guides/prog_guide/dev_kit_* -F: doc/guides/prog_guide/ext_app_lib_make_help.rst +F: doc/guides/prog_guide/ext_app_make_help.rst Meson build M: Bruce Richardson <bruce.richardson@intel.com> diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index bffa55bbef..550341cb93 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -9,14 +9,11 @@ Building Your Own Application Compiling a Sample Application in the Development Kit Directory --------------------------------------------------------------- -When compiling a sample application (for example, hello world), the following variables must be exported: -RTE_SDK and RTE_TARGET. +To compile a sample application with make (for example, hello world): .. code-block:: console ~/DPDK$ cd examples/helloworld/ - ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc ~/DPDK/examples/helloworld$ make CC main.o LD helloworld @@ -30,6 +27,8 @@ The binary is generated in the build directory by default: ~/DPDK/examples/helloworld$ ls build/app helloworld helloworld.map +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling with meson. + Build Your Own Application Outside the Development Kit ------------------------------------------------------ @@ -39,8 +38,6 @@ The sample application (Hello World) can be duplicated in a new directory as a s ~$ cp -r DPDK/examples/helloworld my_rte_app ~$ cd my_rte_app/ - ~/my_rte_app$ export RTE_SDK=/home/user/DPDK - ~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc ~/my_rte_app$ make CC main.o LD helloworld @@ -53,47 +50,10 @@ Customizing Makefiles Application Makefile ~~~~~~~~~~~~~~~~~~~~ -The default makefile provided with the Hello World sample application is a good starting point. It includes: - -* $(RTE_SDK)/mk/rte.vars.mk at the beginning - -* $(RTE_SDK)/mk/rte.extapp.mk at the end +The default makefile provided with the Hello World sample application is a good starting point. The user must define several variables: * APP: Contains the name of the application. * SRCS-y: List of source files (\*.c, \*.S). - -Library Makefile -~~~~~~~~~~~~~~~~ - -It is also possible to build a library in the same way: - -* Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -* Include $(RTE_SDK)/mk/rte.extlib.mk at the end. - -The only difference is that APP should be replaced by LIB, which contains the name of the library. For example, libfoo.a. - -Customize Makefile Actions -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be defined to customize Makefile actions. The most common are listed below. Refer to -:ref:`Makefile Description <Makefile_Description>` section in -:ref:`Development Kit Build System <Development_Kit_Build_System>` - -chapter for details. - -* VPATH: The path list where the build system will search for sources. By default, - RTE_SRCDIR will be included in VPATH. - -* CFLAGS_my_file.o: The specific flags to add for C compilation of my_file.c. - -* CFLAGS: The flags to use for C compilation. - -* LDFLAGS: The flags to use for linking. - -* CPPFLAGS: The flags to use to provide flags to the C preprocessor (only useful when assembling .S files) - -* LDLIBS: A list of libraries to link with (for example, -L /path/to/libfoo - lfoo) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst deleted file mode 100644 index 74dba4dd16..0000000000 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ /dev/null @@ -1,331 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Build_System: - -Development Kit Build System -============================ - -The DPDK requires a build system for compilation activities and so on. -This section describes the constraints and the mechanisms used in the DPDK framework. - -There are two use-cases for the framework: - -* Compilation of the DPDK libraries and sample applications; - the framework generates specific binary libraries, - include files and sample applications - -* Compilation of an external application or library, using an installed binary DPDK - -Building the Development Kit Binary ------------------------------------ - -The following provides details on how to build the DPDK binary. - -Build Directory Concept -~~~~~~~~~~~~~~~~~~~~~~~ - -After installation, a build directory structure is created. -Each build directory contains include files, libraries, and applications. - -A build directory is specific to a configuration that includes architecture + execution environment + toolchain. -It is possible to have several build directories sharing the same sources with different configurations. - -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, -we use: - -.. code-block:: console - - cd ${RTE_SDK} - make config T=x86_64-native-linux-gcc O=my_sdk_build_dir - -This creates a new my_sdk_build_dir directory. After that, we can compile by doing: - -.. code-block:: console - - cd my_sdk_build_dir - make - -which is equivalent to: - -.. code-block:: console - - make O=my_sdk_build_dir - -Refer to -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` -for details about make commands that can be used from the root of DPDK. - -Building External Applications ------------------------------- - -Since DPDK is in essence a development kit, the first objective of end users will be to create an application using this SDK. -To compile an application, the user must set the RTE_SDK and RTE_TARGET environment variables. - -.. code-block:: console - - export RTE_SDK=/opt/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - cd /path/to/my_app - -For a new application, the user must create their own Makefile that includes some .mk files, such as -${RTE_SDK}/mk/rte.vars.mk, and ${RTE_SDK}/mk/ rte.app.mk. -This is described in -:ref:`Building Your Own Application <Building_Your_Own_Application>`. - -Depending on the chosen target (architecture, machine, executive environment, toolchain) defined in the Makefile or as an environment variable, -the applications and libraries will compile using the appropriate .h files and will link with the appropriate .a files. -These files are located in ${RTE_SDK}/arch-machine-execenv-toolchain, which is referenced internally by ${RTE_BIN_SDK}. - -To compile their application, the user just has to call make. -The compilation result will be located in /path/to/my_app/build directory. - -Sample applications are provided in the examples directory. - -.. _Makefile_Description: - -Makefile Description --------------------- - -General Rules For DPDK Makefiles -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -In the DPDK, Makefiles always follow the same scheme: - -#. Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -#. Define specific variables for RTE build system. - -#. Include a specific $(RTE_SDK)/mk/rte.XYZ.mk, where XYZ can be app, lib, extapp, extlib, obj, gnuconfigure, - and so on, depending on what kind of object you want to build. - :ref:`See Makefile Types <Makefile_Types>` below. - -#. Include user-defined rules and variables. - - The following is a very simple example of an external application Makefile: - - .. code-block:: make - - include $(RTE_SDK)/mk/rte.vars.mk - - # binary name - APP = helloworld - - # all source are stored in SRCS-y - SRCS-y := main.c - - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - include $(RTE_SDK)/mk/rte.extapp.mk - -.. _Makefile_Types: - -Makefile Types -~~~~~~~~~~~~~~ - -Depending on the .mk file which is included at the end of the user Makefile, the Makefile will have a different role. -Note that it is not possible to build a library and an application in the same Makefile. -For that, the user must create two separate Makefiles, possibly in two different directories. - -In any case, the rte.vars.mk file must be included in the user Makefile as soon as possible. - -Application -^^^^^^^^^^^ - -These Makefiles generate a binary application. - -* rte.app.mk: Application in the development kit framework - -* rte.extapp.mk: External application - -* rte.hostapp.mk: prerequisite tool to build dpdk - -Library -^^^^^^^ - -Generate a .a library. - -* rte.lib.mk: Library in the development kit framework - -* rte.extlib.mk: external library - -* rte.hostlib.mk: host library in the development kit framework - -Install -^^^^^^^ - -* rte.install.mk: Does not build anything, it is only used to create links or copy files to the installation directory. - This is useful for including files in the development kit framework. - -Kernel Module -^^^^^^^^^^^^^ - -* rte.module.mk: Build a kernel module in the development kit framework. - -Objects -^^^^^^^ - -* rte.obj.mk: Object aggregation (merge several .o in one) in the development kit framework. - -* rte.extobj.mk: Object aggregation (merge several .o in one) outside the development kit framework. - -Misc -^^^^ - -* rte.gnuconfigure.mk: Build an application that is configure-based. - -* rte.subdir.mk: Build several directories in the development kit framework. - -.. _Internally_Generated_Build_Tools: - -Internally Generated Build Tools -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -``app/dpdk-pmdinfogen`` - - -``dpdk-pmdinfogen`` scans an object (.o) file for various well known symbol names. -These well known symbol names are defined by various macros and used to export -important information about hardware support and usage for pmd files. For -instance the macro: - -.. code-block:: c - - RTE_PMD_REGISTER_PCI(name, drv) - -Creates the following symbol: - -.. code-block:: c - - static char this_pmd_name0[] __attribute__((used)) = "<name>"; - - -Which ``dpdk-pmdinfogen`` scans for. Using this information other relevant -bits of data can be exported from the object file and used to produce a -hardware support description, that ``dpdk-pmdinfogen`` then encodes into a -JSON formatted string in the following format: - -.. code-block:: c - - static char <name_pmd_string>="PMD_INFO_STRING=\"{'name' : '<name>', ...}\""; - - -These strings can then be searched for by external tools to determine the -hardware support of a given library or application. - - -.. _Useful_Variables_Provided_by_the_Build_System: - -Useful Variables Provided by the Build System -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* RTE_SDK: The absolute path to the DPDK sources. - When compiling the development kit, this variable is automatically set by the framework. - It has to be defined by the user as an environment variable if compiling an external application. - -* RTE_SRCDIR: The path to the root of the sources. When compiling the development kit, RTE_SRCDIR = RTE_SDK. - When compiling an external application, the variable points to the root of external application sources. - -* RTE_OUTPUT: The path to which output files are written. - Typically, it is $(RTE_SRCDIR)/build, but it can be overridden by the O= option in the make command line. - -* RTE_TARGET: A string identifying the target for which we are building. - The format is arch-machine-execenv-toolchain. - When compiling the SDK, the target is deduced by the build system from the configuration (.config). - When building an external application, it must be specified by the user in the Makefile or as an environment variable. - -* RTE_SDK_BIN: References $(RTE_SDK)/$(RTE_TARGET). - -* RTE_ARCH: Defines the architecture (i686, x86_64). - It is the same value as CONFIG_RTE_ARCH but without the double-quotes around the string. - -* RTE_MACHINE: Defines the machine. - It is the same value as CONFIG_RTE_MACHINE but without the double-quotes around the string. - -* RTE_TOOLCHAIN: Defines the toolchain (gcc , icc). - It is the same value as CONFIG_RTE_TOOLCHAIN but without the double-quotes around the string. - -* RTE_EXEC_ENV: Defines the executive environment (linux). - It is the same value as CONFIG_RTE_EXEC_ENV but without the double-quotes around the string. - -* RTE_KERNELDIR: This variable contains the absolute path to the kernel sources that will be used to compile the kernel modules. - The kernel headers must be the same as the ones that will be used on the target machine (the machine that will run the application). - By default, the variable is set to /lib/modules/$(shell uname -r)/build, - which is correct when the target machine is also the build machine. - -* RTE_DEVEL_BUILD: Stricter options (stop on warning). It defaults to y in a git tree. - -Variables that Can be Set/Overridden in a Makefile Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* VPATH: The path list that the build system will search for sources. By default, RTE_SRCDIR will be included in VPATH. - -* CFLAGS: Flags to use for C compilation. The user should use += to append data in this variable. - -* LDFLAGS: Flags to use for linking. The user should use += to append data in this variable. - -* ASFLAGS: Flags to use for assembly. The user should use += to append data in this variable. - -* CPPFLAGS: Flags to use to give flags to C preprocessor (only useful when assembling .S files). - The user should use += to append data in this variable. - -* LDLIBS: In an application, the list of libraries to link with (for example, -L /path/to/libfoo -lfoo ). - The user should use += to append data in this variable. - -* SRC-y: A list of source files (.c, .S, or .o if the source is a binary) in case of application, library or object Makefiles. - The sources must be available from VPATH. - -* INSTALL-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be copied in $(RTE_OUTPUT)/$(INSTPATH). Can be used in almost any RTE Makefile. - -* SYMLINK-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be linked (symbolically) in $(RTE_OUTPUT)/$(INSTPATH). - This variable can be used in almost any DPDK Makefile. - -* PREBUILD: A list of prerequisite actions to be taken before building. The user should use += to append data in this variable. - -* POSTBUILD: A list of actions to be taken after the main build. The user should use += to append data in this variable. - -* PREINSTALL: A list of prerequisite actions to be taken before installing. The user should use += to append data in this variable. - -* POSTINSTALL: A list of actions to be taken after installing. The user should use += to append data in this variable. - -* PRECLEAN: A list of prerequisite actions to be taken before cleaning. The user should use += to append data in this variable. - -* POSTCLEAN: A list of actions to be taken after cleaning. The user should use += to append data in this variable. - -* DEPDIRS-$(DIR): Only used in the development kit framework to specify if the build of the current directory depends on build of another one. - This is needed to support parallel builds correctly. - -Variables that can be Set/Overridden by the User on the Command Line Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be used to configure the build system behavior. They are documented in -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` and -:ref:`External Application/Library Makefile Help <External_Application/Library_Makefile_Help>` - - * WERROR_CFLAGS: By default, this is set to a specific value that depends on the compiler. - Users are encouraged to use this variable as follows: - - CFLAGS += $(WERROR_CFLAGS) - -This avoids the use of different cases depending on the compiler (icc or gcc). -Also, this variable can be overridden from the command line, which allows bypassing of the flags for testing purposes. - -Variables that Can be Set/Overridden by the User in a Makefile or Command Line -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* CFLAGS_my_file.o: Specific flags to add for C compilation of my_file.c. - -* LDFLAGS_my_app: Specific flags to add when linking my_app. - -* EXTRA_CFLAGS: The content of this variable is appended after CFLAGS when compiling. - -* EXTRA_LDFLAGS: The content of this variable is appended after LDFLAGS when linking. - -* EXTRA_LDLIBS: The content of this variable is appended after LDLIBS when linking. - -* EXTRA_ASFLAGS: The content of this variable is appended after ASFLAGS when assembling. - -* EXTRA_CPPFLAGS: The content of this variable is appended after CPPFLAGS when using a C preprocessor on assembly files. diff --git a/doc/guides/prog_guide/dev_kit_root_make_help.rst b/doc/guides/prog_guide/dev_kit_root_make_help.rst deleted file mode 100644 index a30db7d5b4..0000000000 --- a/doc/guides/prog_guide/dev_kit_root_make_help.rst +++ /dev/null @@ -1,188 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Root_Makefile_Help: - -Development Kit Root Makefile Help -================================== - -The DPDK provides a root level Makefile with targets for configuration, building, cleaning, testing, installation and others. -These targets are explained in the following sections. - -Configuration Targets ---------------------- - -The configuration target requires the name of the target, which is specified using T=mytarget and it is mandatory. -The list of available targets are in $(RTE_SDK)/config (remove the defconfig _ prefix). - -Configuration targets also support the specification of the name of the output directory, using O=mybuilddir. -This is an optional parameter, the default output directory is build. - -* Config - - This will create a build directory, and generates a configuration from a template. - A Makefile is also created in the new build directory. - - Example: - - .. code-block:: console - - make config O=mybuild T=x86_64-native-linux-gcc - -Build Targets -------------- - -Build targets support the optional specification of the name of the output directory, using O=mybuilddir. -The default output directory is build. - -* all, build or just make - - Build the DPDK in the output directory previously created by a make config. - - Example: - - .. code-block:: console - - make O=mybuild - -* clean - - Clean all objects created using make build. - - Example: - - .. code-block:: console - - make clean O=mybuild - -* %_sub - - Build a subdirectory only, without managing dependencies on other directories. - - Example: - - .. code-block:: console - - make lib/librte_eal_sub O=mybuild - -* %_clean - - Clean a subdirectory only. - - Example: - - .. code-block:: console - - make lib/librte_eal_clean O=mybuild - -Install Targets ---------------- - -* Install - - The list of available targets are in $(RTE_SDK)/config (remove the defconfig\_ prefix). - - The GNU standards variables may be used: - http://gnu.org/prep/standards/html_node/Directory-Variables.html and - http://gnu.org/prep/standards/html_node/DESTDIR.html - - Example: - - .. code-block:: console - - make install DESTDIR=myinstall prefix=/usr - -Test Targets ------------- - -* test - - Launch automatic tests for a build directory specified using O=mybuilddir. - It is optional, the default output directory is build. - - Example: - - .. code-block:: console - - make test O=mybuild - -Documentation Targets ---------------------- - -* doc - - Generate the documentation (API and guides). - -* doc-api-html - - Generate the Doxygen API documentation in html. - -* doc-guides-html - - Generate the guides documentation in html. - -* doc-guides-pdf - - Generate the guides documentation in pdf. - -Misc Targets ------------- - -* help - - Show a quick help. - -Other Useful Command-line Variables ------------------------------------ - -The following variables can be specified on the command line: - -* V= - - Enable verbose build (show full compilation command line, and some intermediate commands). - -* D= - - Enable dependency debugging. This provides some useful information about why a target is built or not. - -* EXTRA_CFLAGS=, EXTRA_LDFLAGS=, EXTRA_LDLIBS=, EXTRA_ASFLAGS=, EXTRA_CPPFLAGS= - - Append specific compilation, link or asm flags. - -* CROSS= - - Specify a cross toolchain header that will prefix all gcc/binutils applications. This only works when using gcc. - -Make in a Build Directory -------------------------- - -All targets described above are called from the SDK root $(RTE_SDK). -It is possible to run the same Makefile targets inside the build directory. -For instance, the following command: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - make O=mybuild - -is equivalent to: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - cd mybuild - - # no need to specify O= now - make - -Compiling for Debug -------------------- - -To compile the DPDK and sample applications with debugging information included and the optimization level set to 0, -the EXTRA_CFLAGS environment variable should be set before compiling as follows: - -.. code-block:: console - - export EXTRA_CFLAGS='-O0 -g' diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index f64ae953d1..936c885081 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -201,16 +201,16 @@ each segment is strictly one physical page. It is possible to change the amount of virtual memory being preallocated at startup by editing the following config variables: -* ``CONFIG_RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have -* ``CONFIG_RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each +* ``RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have +* ``RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each segment list can address -* ``CONFIG_RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can +* ``RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can have -* ``CONFIG_RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type +* ``RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type can have (where "type" is defined as "page size + NUMA node" combination) -* ``CONFIG_RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each +* ``RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each memory type can address -* ``CONFIG_RTE_MAX_MEM_MB`` places a global maximum on the amount of memory +* ``RTE_MAX_MEM_MB`` places a global maximum on the amount of memory DPDK can reserve Normally, these options do not need to be changed. @@ -715,11 +715,6 @@ However, they can be used in configuration code. Refer to the rte_malloc() function description in the *DPDK API Reference* manual for more information. -Cookies -~~~~~~~ - -When CONFIG_RTE_MALLOC_DEBUG is enabled, the allocated memory contains -overwrite protection fields to help identify buffer overflows. Alignment and NUMA Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/prog_guide/ext_app_lib_make_help.rst b/doc/guides/prog_guide/ext_app_make_help.rst similarity index 69% rename from doc/guides/prog_guide/ext_app_lib_make_help.rst rename to doc/guides/prog_guide/ext_app_make_help.rst index 4312778dc9..681114239d 100644 --- a/doc/guides/prog_guide/ext_app_lib_make_help.rst +++ b/doc/guides/prog_guide/ext_app_make_help.rst @@ -1,28 +1,11 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -.. _External_Application/Library_Makefile_help: +.. _External_Application_Makefile_help: -External Application/Library Makefile help +External Application Makefile help ========================================== -External applications or libraries should include specific Makefiles from RTE_SDK, located in mk directory. -These Makefiles are: - -* ${RTE_SDK}/mk/rte.extapp.mk: Build an application - -* ${RTE_SDK}/mk/rte.extlib.mk: Build a static library - -* ${RTE_SDK}/mk/rte.extobj.mk: Build objects (.o) - -Prerequisites -------------- - -The following variables must be defined: - -* ${RTE_SDK}: Points to the root directory of the DPDK. - -* ${RTE_TARGET}: Reference the target to be used for compilation (for example, x86_64-native-linux-gcc). Build Targets ------------- @@ -32,7 +15,7 @@ This is optional; the default output directory is build. * all, "nothing" (meaning just make) - Build the application or the library in the specified output directory. + Build the application in the specified output directory. Example: @@ -93,6 +76,4 @@ It is possible to run the Makefile from another directory, by specifying the out .. code-block:: console - export RTE_SDK=/path/to/DPDK - export RTE_TARGET=x86_64-native-linux-icc make -f /path/to/my_app/Makefile S=/path/to/my_app O=/path/to/build_dir diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 669d77c740..c922d10f3d 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -45,13 +45,11 @@ Performance tuning parameters ----------------------------- - Test with various burst size values (256, 128, 64, 32) using - CONFIG_RTE_GRAPH_BURST_SIZE config option. + RTE_GRAPH_BURST_SIZE config option. The testing shows, on x86 and arm64 servers, The sweet spot is 256 burst size. While on arm64 embedded SoCs, it is either 64 or 128. -- Disable node statistics (using ``CONFIG_RTE_LIBRTE_GRAPH_STATS`` config option) +- Disable node statistics (using ``RTE_LIBRTE_GRAPH_STATS`` config option) if not needed. -- Use arm64 optimized memory copy for arm64 architecture by - selecting ``CONFIG_RTE_ARCH_ARM64_MEMCPY``. Programming model ----------------- diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst index 0454768de3..2cf20e0619 100644 --- a/doc/guides/prog_guide/index.rst +++ b/doc/guides/prog_guide/index.rst @@ -62,12 +62,10 @@ Programmer's Guide ipsec_lib graph_lib source_org - dev_kit_build_system - dev_kit_root_make_help build-sdk-meson meson_ut build_app - ext_app_lib_make_help + ext_app_make_help perf_opt_guidelines writing_efficient_code lto diff --git a/doc/guides/prog_guide/intro.rst b/doc/guides/prog_guide/intro.rst index 5b319d36d9..44877bd3e3 100644 --- a/doc/guides/prog_guide/intro.rst +++ b/doc/guides/prog_guide/intro.rst @@ -34,7 +34,7 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system - (including the commands that can be used in the root DPDK Makefile to build the development kit and an application) + (including the commands that can be used in the root DPDK to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst index 6ac1bba649..314d4adbb8 100644 --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst @@ -103,8 +103,3 @@ Debug logging and Statistics Collection The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. This macro is not enabled by default. - -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. -This macro is disabled by default. -Note that while logging contains a lot of detailed information, -it slows down packet processing and might cause the loss of a lot of packets. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 32d09ccf82..de5d75bd4c 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -65,7 +65,7 @@ disabled, and the default carrier state of KNI interfaces is set to *off*. .. code-block:: console - # insmod kmod/rte_kni.ko + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko .. _kni_loopback_mode: @@ -77,14 +77,14 @@ by specifying the ``lo_mode`` parameter: .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo The ``lo_mode_fifo`` loopback option will loop back ring enqueue/dequeue operations in kernel space. .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb The ``lo_mode_fifo_skb`` loopback option will loop back ring enqueue/dequeue operations and sk buffer copies in kernel space. @@ -105,7 +105,7 @@ Single kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=single + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=single This mode will create only one kernel thread for all KNI interfaces to receive data on the kernel side. By default, this kernel thread is not @@ -122,7 +122,7 @@ kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=multiple + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple This mode will create a separate kernel thread for each KNI interface to receive data on the kernel side. The core affinity of each ``kni_thread`` @@ -163,13 +163,13 @@ To set the default carrier state to *on*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=on + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=on To set the default carrier state to *off*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=off + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=off If the ``carrier`` parameter is not specified, the default carrier state of KNI interfaces will be set to *off*. diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst index 2459fd243e..244dca56c4 100644 --- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst +++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst @@ -28,8 +28,9 @@ bonded device and its slave devices. .. note:: The Link Bonding PMD Library is enabled by default in the build - configuration files, the library can be disabled by setting - ``CONFIG_RTE_LIBRTE_PMD_BOND=n`` and recompiling the DPDK. + configuration, the library can be disabled using the meson option + "-Ddisable_drivers=net/bond". + Link Bonding Modes Overview --------------------------- @@ -377,7 +378,7 @@ Device names and bonding options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' Link Bonding EAL Options ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -477,22 +478,22 @@ Create a bonded device in round robin mode with two slaves specified by their PC .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained Create a bonded device in round robin mode with two slaves specified by their PCI address and an overriding MAC address: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained Create a bonded device in active backup mode with two slaves specified, and a primary slave specified by their PCI addresses: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained Create a bonded device in balance mode with two slaves specified by their PCI addresses, and a transmission policy of layer 3 + 4 forwarding: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index 277a6f1090..f79c449598 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -26,17 +26,7 @@ need to explicitly initialize variable in order to silence the compiler. Please note that turning LTO on causes considerable extension of build time. -When using make based build, link time optimization can be enabled for -the whole DPDK by setting: - -.. code-block:: console - - CONFIG_RTE_ENABLE_LTO=y - -in config file. - -For the meson based build it can be enabled by setting meson built-in -'b_lto' option: +Link time optimization can be enabled by setting meson built-in 'b_lto' option: .. code-block:: console diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index c3dbfb9221..2f190b40e4 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), -the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). +In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, +bad type, and so on). Use Cases --------- diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index e3e1f940be..f0bdcd3be1 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -17,14 +17,13 @@ This library is used by the :ref:`Mbuf Library <Mbuf_Library>`. Cookies ------- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. +In debug mode, cookies are added at the beginning and end of allocated blocks. The allocated objects then contain overwrite protection fields to help debugging buffer overflows. Stats ----- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), -statistics about get from/put in the pool are stored in the mempool structure. +In debug mode, statistics about get from/put in the pool are stored in the mempool structure. Statistics are per-lcore to avoid concurrent access to statistics counters. Memory Alignment Constraints on x86 architecture @@ -90,7 +89,7 @@ the speed at which a core can access its own cache for a specific memory pool wi The cache is composed of a small, per-core table of pointers and its length (used as a stack). This internal cache can be enabled or disabled at creation of the pool. -The maximum size of the cache is static and is defined at compilation time (CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE). +The maximum size of the cache is static and is defined at compilation time (RTE_MEMPOOL_CACHE_MAX_SIZE). :numref:`figure_mempool` shows a cache in operation. diff --git a/doc/guides/prog_guide/overview.rst b/doc/guides/prog_guide/overview.rst index 986c896908..537a568f1e 100644 --- a/doc/guides/prog_guide/overview.rst +++ b/doc/guides/prog_guide/overview.rst @@ -18,7 +18,7 @@ The framework creates a set of libraries for specific environments through the creation of an Environment Abstraction Layer (EAL), which may be specific to a mode of the Intel® architecture (32-bit or 64-bit), Linux* user space compilers or a specific platform. -These environments are created through the use of make files and configuration files. +These environments are created through the use of meson files and configuration files. Once the EAL library is created, the user may link with the library to create their own applications. Other libraries, outside of EAL, including the Hash, Longest Prefix Match (LPM) and rings libraries are also provided. @@ -38,21 +38,13 @@ Development Environment ----------------------- The DPDK project installation requires Linux and the associated toolchain, -such as one or more compilers, assembler, make utility, +such as one or more compilers, assembler, meson utility, editor and various libraries to create the DPDK components and libraries. Once these libraries are created for the specific environment and architecture, they may then be used to create the user's data plane application. When creating applications for the Linux user space, the glibc library is used. -For DPDK applications, two environmental variables (RTE_SDK and RTE_TARGET) -must be configured before compiling the applications. -The following are examples of how the variables can be set: - -.. code-block:: console - - export RTE_SDK=/home/user/DPDK - export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started Guide* for information on setting up the development environment. diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index e5d0e9079e..7093681983 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -33,14 +33,6 @@ Refer to the for details about application profiling. -Profiling with VTune -~~~~~~~~~~~~~~~~~~~~ - -To allow VTune attaching to the DPDK application, reconfigure and recompile -the DPDK with ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` and -``CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE`` enabled. - - Profiling on ARM64 ------------------ @@ -76,8 +68,7 @@ cycle counter for user space access by configuring the PMU from the privileged mode (kernel space). By default the ``rte_rdtsc()`` implementation uses a portable ``cntvct_el0`` -scheme. Application can choose the PMU based implementation with -``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``. +scheme. The example below shows the steps to configure the PMU based cycle counter on an ARMv8 machine. @@ -88,10 +79,8 @@ an ARMv8 machine. cd armv8_pmu_cycle_counter_el0 make sudo insmod pmu_el0_cycle_counter.ko - cd $DPDK_DIR - make config T=arm64-armv8a-linux-gcc - echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config - make + +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling DPDK with meson. .. warning:: diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst index a159709450..4e4ea33ccb 100644 --- a/doc/guides/prog_guide/qos_framework.rst +++ b/doc/guides/prog_guide/qos_framework.rst @@ -1525,15 +1525,7 @@ Integration with the DPDK QoS Scheduler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ RED functionality in the DPDK QoS scheduler is disabled by default. -To enable it, use the DPDK configuration parameter: - -:: - - CONFIG_RTE_SCHED_RED=y - -This parameter must be set to y. -The parameter is found in the build configuration files in the DPDK/config directory, -for example, DPDK/config/common_linux. +The parameter is found in the build configuration files in the DPDK/config directory. RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure that is passed to the scheduler on initialization. RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) diff --git a/doc/guides/prog_guide/rcu_lib.rst b/doc/guides/prog_guide/rcu_lib.rst index d142d0c79d..d0aef3bc16 100644 --- a/doc/guides/prog_guide/rcu_lib.rst +++ b/doc/guides/prog_guide/rcu_lib.rst @@ -186,10 +186,9 @@ they entered a quiescent state. This API checks if a writer has triggered a quiescent state query and update the state accordingly. The ``rte_rcu_qsbr_lock()`` and ``rte_rcu_qsbr_unlock()`` are empty functions. -However, when ``CONFIG_RTE_LIBRTE_RCU_DEBUG`` is enabled, these APIs aid -in debugging issues. One can mark the access to shared data structures on the -reader side using these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if -all the locks are unlocked. +However, these APIs can aid in debugging issues. One can mark the access to +shared data structures on the reader side using these APIs. The +``rte_rcu_qsbr_quiescent()`` will check if all the locks are unlocked. Resource reclamation framework for DPDK --------------------------------------- diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 31c153a1b7..8d531bd9ef 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -8,29 +8,10 @@ Source Organization This section describes the organization of sources in the DPDK framework. -Makefiles and Config --------------------- - -.. note:: - - In the following descriptions, - ``RTE_SDK`` is the environment variable that points to the base directory into which the tarball was extracted. - See - :ref:`Useful_Variables_Provided_by_the_Build_System` - for descriptions of other variables. - -Makefiles that are provided by the DPDK libraries and applications are located in ``$(RTE_SDK)/mk``. - -Config templates are located in ``$(RTE_SDK)/config``. The templates describe the options that are enabled for each target. -The config file also contains items that can be enabled and disabled for many of the DPDK libraries, -including debug options. -The user should look at the config file and become familiar with these options. -The config file is also used to create a header file, which will be located in the new build directory. - Libraries --------- -Libraries are located in subdirectories of ``$(RTE_SDK)/lib``. +Libraries are located in subdirectories of ``dpdk/lib``. By convention a library refers to any code that provides an API to an application. Typically, it generates an archive file (``.a``), but a kernel module would also go in the same directory. @@ -55,7 +36,7 @@ Applications ------------ Applications are source files that contain a ``main()`` function. -They are located in the ``$(RTE_SDK)/app`` and ``$(RTE_SDK)/examples`` directories. +They are located in the ``dpdk/app`` and ``dpdk/examples`` directories. The app directory contains sample applications that are used to test DPDK (such as autotests) or the Poll Mode Drivers (test-pmd). diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 9bbfd165d8..fbadf9fde9 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -135,8 +135,7 @@ In order to avoid performance impact in fast path code, the library introduced the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``. ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using -``CONFIG_RTE_ENABLE_TRACE_FP`` configuration parameter. -The ``enable_trace_fp`` option shall be used for the same for meson build. +the ``enable_trace_fp`` option for meson build. Event record mode ----------------- diff --git a/doc/guides/prog_guide/writing_efficient_code.rst b/doc/guides/prog_guide/writing_efficient_code.rst index 2639ef7bf6..db2f1ddbc2 100644 --- a/doc/guides/prog_guide/writing_efficient_code.rst +++ b/doc/guides/prog_guide/writing_efficient_code.rst @@ -258,8 +258,7 @@ For instance: Setting the Target CPU Type --------------------------- -The DPDK supports CPU microarchitecture-specific optimizations by means of CONFIG_RTE_MACHINE option -in the DPDK configuration file. +The DPDK supports CPU microarchitecture-specific optimizations by means of RTE_MACHINE option. The degree of optimization depends on the compiler's ability to optimize for a specific microarchitecture, therefore it is preferable to use the latest compiler versions whenever possible. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 32/37] doc: remove references to make in rawdev guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (30 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 31/37] doc: remove references to make in prog guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 33/37] doc: remove references to make in sample app guides Ciara Power ` (6 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Nipun Gupta, John McNamara, Marko Kovacevic, Rosen Xu, Tianfei zhang, Bruce Richardson, Xiaoyun Li, Jingjing Wu, Satha Rao, Mahipal Challa Make is no longer supported for compiling DPDK, references are now removed in the documentation. Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ioat.rst | 8 +------- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 7 files changed, 1 insertion(+), 85 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst index d0eee5e237..c0a08ff852 100644 --- a/doc/guides/rawdevs/ioat.rst +++ b/doc/guides/rawdevs/ioat.rst @@ -54,13 +54,7 @@ shows: Compilation ------------ -For builds done with ``make``, the driver compilation is enabled by the -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is -enabled by default in builds for x86 platforms, and disabled in other -configurations. - -For builds using ``meson`` and ``ninja``, the driver will be built when the -target platform is x86-based. +The driver will be built when the target platform is x86-based. Device Setup ------------- diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index aa7d809649..0589b70087 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ is https://www.intel.com/content/dam/support/us/en/documents/server-products/Int - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 1e1dfbe931..f93ec1ffd7 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index bbcf530a45..4f91e78ab1 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 33/37] doc: remove references to make in sample app guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (31 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 32/37] doc: remove references to make in rawdev guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-04 0:34 ` Chautru, Nicolas 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 34/37] doc: remove references to make in vdpadevs guides Ciara Power ` (5 subsequent siblings) 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, John McNamara, Marko Kovacevic, Olivier Matz, David Hunt, Ori Kam, Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Harry van Haaren, Bernard Iremonger, Konstantin Ananyev, Cristian Dumitrescu, Ferruh Yigit, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, Kirill Rybalchenko, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/sample_app_ug/bbdev_app.rst | 34 ++------ doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +++++++------------ doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +-- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +----- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +--- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 ++-- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +-- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +-- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 ++-- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 ++--- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +++------- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +-- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +---- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +++------- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +-- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 ++++---- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- 49 files changed, 194 insertions(+), 346 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..764155f983 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -31,30 +31,12 @@ Limitations Compiling the Application ------------------------- -#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along - with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* - documentation for more details on this. +DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along +with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* +documentation for more details on this. -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make Running the Application ----------------------- @@ -63,8 +45,8 @@ The application accepts a number of command line options: .. code-block:: console - $ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] / - [-p ETH_PORT_ID] [-b BBDEV_ID] + $ ./<build_dir>/examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] / + [-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID] where: @@ -84,8 +66,8 @@ issue the command: .. code-block:: console - $ ./build/bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> -c 0x38 --socket-mem=2,2 \ - --file-prefix=bbdev -- -e 0x10 -d 0x20 + $ ./<build_dir>/examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> \ + -c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20 where, NIC0PCIADDR is the PCI address of the Rx port diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index 6deb6c8112..5e3a25a317 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -52,7 +52,7 @@ To run the application in linux environment, issue the following command: .. code-block:: console - $ ./build/cmdline -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-cmdline -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..adde775d4e 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,100 +9,75 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: - - .. code-block:: console - - cd $RTE_SDK - -Build DPDK: +Enable examples compilation: .. code-block:: console - make defconfig - make + meson configure -Dexamples=all -Build the sample applications: +Build: .. code-block:: console - export RTE_TARGET=build - make -C examples + ninja -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. +Applications are output to: ``dpdk/<build_dir>/examples``. -In the example above the compiled application is written to the ``build`` subdirectory. -To have the applications written to a different location, -the ``O=/path/to/build/directory`` option may be specified in the make command. +To compile a single application +------------------------------- - .. code-block:: console - make O=/tmp +Using meson +~~~~~~~~~~~ -To build the applications for debugging use the ``DEBUG`` option. -This option adds some extra flags, disables compiler optimizations and -sets verbose output. +Go to DPDK build directory: .. code-block:: console - make DEBUG=1 - - -To compile a single application -------------------------------- + cd dpdk/<build_dir> -Set the path to DPDK source code: +Enable example app compilation: - .. code-block:: console + .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + meson configure -Dexamples=helloworld -Go to DPDK source: +Build: - .. code-block:: console + .. code-block:: console - cd $RTE_SDK + ninja -Build DPDK: - .. code-block:: console +Using Make +~~~~~~~~~~ - make defconfig - make +Pkg-config is used when building an example app standalone using make, please +see :ref:`building_app_using_installed_dpdk` for more information. Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. - +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make -To cross compile the sample application(s) ------------------------------------------- - -For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command. -In example of AARCH64 cross compiling: +To build the application for debugging use the ``DEBUG`` option. +This option adds some extra flags, disables compiler optimizations and +sets verbose output. .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk - make -C examples CROSS=aarch64-linux-gnu- - or - make CROSS=aarch64-linux-gnu- + make DEBUG=1 diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 90270e3a58..3bd03905c3 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -42,7 +42,7 @@ Running the Application .. code-block:: console - ./build/distributor_app [EAL options] -- -p PORTMASK + ./<build-dir>/examples/dpdk-distributor [EAL options] -- -p PORTMASK where, @@ -53,7 +53,7 @@ Running the Application .. code-block:: console - $ ./build/distributor_app -l 1-9,22 -n 4 -- -p f + $ ./<build-dir>/examples/dpdk-distributor -l 1-9,22 -n 4 -- -p f #. Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst index 253004dd00..7819871917 100644 --- a/doc/guides/sample_app_ug/ethtool.rst +++ b/doc/guides/sample_app_ug/ethtool.rst @@ -24,7 +24,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./ethtool-app/${RTE_TARGET}/ethtool [EAL options] + ./<build_dir>/examples/dpdk-ethtool [EAL options] Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index dc7972aa9a..b4fc587a09 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -46,7 +46,8 @@ these settings is shown below: .. code-block:: console - ./build/eventdev_pipeline --vdev event_sw0 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D + ./<build_dir>/examples/dpdk-eventdev_pipeline --vdev event_sw0 -- -r1 -t1 / + -e4 -w FF00 -s4 -n0 -c32 -W1000 -D The application has some sanity checking built-in, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 2953fddeb9..8b009244b8 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -70,9 +70,7 @@ Compiling the Application * Compile Application - .. code-block:: console - - make -C examples/fips_validation + To compile the sample application see :doc:`compiling`. * Run ``dos2unix`` on the request files @@ -92,7 +90,7 @@ The application requires a number of command line options: .. code-block:: console - ./fips_validation [EAL options] + ./dpdk-fips_validation [EAL options] -- --req-file FILE_PATH/FOLDER_PATH --rsp-file FILE_PATH/FOLDER_PATH [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder] @@ -117,7 +115,7 @@ file for crypto_aesni_mb PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_mb -- + $ ./dpdk-fips_validation --vdev crypto_aesni_mb -- --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb @@ -126,7 +124,7 @@ data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_gcm0 -- + $ ./dpdk-fips_validation --vdev crypto_aesni_gcm0 -- --req-file /PATH/TO/REQUEST/FILE/FOLDER/ --rsp-file ./PATH/TO/RESPONSE/FILE/FOLDER/ --cryptodev-id 0 --path-is-folder diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index dc40b4d6f9..2ae22739c0 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -28,8 +28,8 @@ To run the example in a ``linux`` environment: .. code-block:: console - cd ~/dpdk/examples/flow_classify - ./build/flow_classify -c 4 -n 4 -- --rule_ipv4="../ipv4_rules_file.txt" + ./<build_dir>/examples/dpdk-flow_classify -c 4 -n 4 -- / + --rule_ipv4="../ipv4_rules_file.txt" Please refer to the *DPDK Getting Started Guide*, section :doc:`../linux_gsg/build_sample_apps` diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 5e5a6cd8a0..4a4006dc8e 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -13,28 +13,7 @@ It is intended as a demonstration of the basic components RTE flow rules. Compiling the Application ------------------------- -To compile the application export the path to the DPDK source tree and go to -the example directory: - -.. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - - cd ${RTE_SDK}/examples/flow_filtering - -Set the target, for example: - -.. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - -See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. - -Build the application as follows: - -.. code-block:: console - - make +To compile the sample application see :doc:`compiling`. Running the Application @@ -44,7 +23,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/flow -l 1 -n 1 + ./<build_dir>/examples/dpdk-flow_filtering -l 1 -n 1 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 46f997a7dc..8f48533873 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -21,7 +21,7 @@ To run the example in a linux environment: .. code-block:: console - $ ./build/helloworld -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-helloworld -l 0-3 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ioat.rst b/doc/guides/sample_app_ug/ioat.rst index bab7654b8d..f35bee9d86 100644 --- a/doc/guides/sample_app_ug/ioat.rst +++ b/doc/guides/sample_app_ug/ioat.rst @@ -45,7 +45,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/ioatfwd [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] + ./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] [--[no-]mac-updating] where, @@ -81,7 +81,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw + $ ./<build_dir>/examples/dpdk-ioat -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw To run the application in a Linux environment with 2 lcores (the master lcore, plus one forwarding core), 2 ports (ports 0 and 1), hardware copying and no MAC @@ -89,7 +89,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw + $ ./<build_dir>/examples/dpdk-ioat -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index afeaff3639..92d5e4aeae 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -53,7 +53,7 @@ Application usage: .. code-block:: console - ./build/ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] where: @@ -65,7 +65,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_fragmentation -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -94,7 +94,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst index 56014be174..1d8656c637 100644 --- a/doc/guides/sample_app_ug/ip_pipeline.rst +++ b/doc/guides/sample_app_ug/ip_pipeline.rst @@ -34,7 +34,7 @@ Running the application The application startup command line is:: - ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] + dpdk-ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] The application startup arguments are: @@ -71,7 +71,7 @@ The following is an example command to run ip pipeline application configured fo .. code-block:: console - $ ./build/ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli + $ ./<build_dir>/examples/dpdk-ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli The application should start successfully and display as follows: diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index f34b9d0055..e72c8492e9 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -42,7 +42,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] + ./<build_dir>/examples/dpdk-ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] where: @@ -61,7 +61,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_reassembly -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_reassembly -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -92,7 +92,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_reassembly -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_reassembly -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. @@ -231,7 +231,8 @@ Debug logging and Statistics Collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The RTE_LIBRTE_IP_FRAG_TBL_STAT controls statistics collection for the IP Fragment Table. -This macro is disabled by default. +This macro is disabled by default, but it can be enabled by modifying the appropriate line +in ``config/rte_config.h``. To make ip_reassembly print the statistics to the standard output, the user must send either an USR1, INT or TERM signal to the process. For all of these signals, the ip_reassembly process prints Fragment table statistics for each RX queue, diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 434f484138..1f37dccf8b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -116,12 +116,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ipsec-secgw`` sub-directory. -#. [Optional] Build the application for debugging: - This option adds some extra flags, disables compiler optimizations and - is verbose:: - - make DEBUG=1 - Running the Application ----------------------- @@ -129,7 +123,7 @@ Running the Application The application has a number of command line options:: - ./build/ipsec-secgw [EAL options] -- + ./<build_dir>/examples/dpdk-ipsec-secgw [EAL options] -- -p PORTMASK -P -u PORTMASK -j FRAMESIZE -l -w REPLAY_WINOW_SIZE -e -a -c SAD_CACHE_SIZE @@ -245,7 +239,7 @@ The mapping of lcores to port/queues is similar to other l3fwd applications. For example, given the following command line to run application in poll mode:: - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ --vdev "crypto_null" -- -p 0xf -P -u 0x3 \ --config="(0,0,20),(1,0,20),(2,0,21),(3,0,21)" \ -f /path/to/config_file --transfer-mode poll \ @@ -297,7 +291,7 @@ where each option means: Similarly for example, given the following command line to run application in event app mode:: - ./build/ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ -f /path/to/config_file --transfer-mode event \ --event-schedule-type parallel \ @@ -336,7 +330,7 @@ For example, something like the following command line: .. code-block:: console - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ -w 81:00.0 -w 81:00.1 -w 81:00.2 -w 81:00.3 \ --vdev "crypto_aesni_mb" --vdev "crypto_null" \ -- \ diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index 8923a7f548..7c6e8b15cc 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -50,7 +50,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] where, @@ -67,7 +67,7 @@ Typically, to run the IPv4 Multicast sample application, issue the following com .. code-block:: console - ./build/ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 + ./<build_dir>/examples/dpdk-ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 In this command: diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..ef7936f80f 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -49,7 +49,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l2fwd-keepalive [EAL options] \ + ./<build_dir>/examples/dpdk-l2fwd-keepalive [EAL options] \ -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD] where, @@ -68,7 +68,7 @@ To run the application in linux environment with 4 lcores, 16 ports .. code-block:: console - ./build/l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 + ./<build_dir>/examples/dpdk-l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index aac4ebd8d4..ef441cc1e5 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -96,7 +96,7 @@ The ``kni`` example application requires a number of command line options: .. code-block:: console - kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] + dpdk-kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] Where: @@ -168,8 +168,8 @@ interface ``vEth1_0`` with the kernel thread bound to lcore 9. .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" The following example is identical, except an additional ``lcore_kthread`` core is specified per physical port. In this case, ``kni`` will create @@ -186,8 +186,8 @@ The kernel thread for each interface will be bound as follows: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" The following example can be used to test the interface between the ``kni`` test application and the ``rte_kni`` kernel module. In this example, @@ -206,8 +206,8 @@ disabled by **not** specifying the ``-m`` flag to ``kni``: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo carrier=on - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo carrier=on + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" KNI Operations -------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 0a813200ba..c1be2d7dff 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -70,13 +70,13 @@ To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" or to enable CAT and CDP on cpus 1,3: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" If CDP is not supported it will fail with following error message: diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 962752f21c..e2c0f9f1ec 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / + ./<build_dir>/examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / [--cdev_type HW/SW/ANY] [--chain HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] / [--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] / [--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size SIZE] / @@ -162,7 +162,7 @@ To run the application in linux environment with 2 lcores, 2 ports and 2 crypto .. code-block:: console - $ ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ + $ ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ --vdev "crypto_aesni_mb1" -- -p 0x3 --chain CIPHER_HASH \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index d536eee819..11c9d4b2ee 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -52,7 +52,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE + ./<build_dir>/examples/dpdk-l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE where, @@ -75,20 +75,20 @@ issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll Eventdev mode with 4 lcores, 16 ports , sched method ordered and MAC address updating enabled, issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered or .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -105,7 +105,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Explanation ----------- diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 8d0c38721f..1a854abb23 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -81,7 +81,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] + ./<build_dir>/examples/dpdk-l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] where, @@ -96,7 +96,7 @@ thousands separator printing, issue the command: .. code-block:: console - $ ./build/l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l + $ ./<build_dir>/examples/dpdk-l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index c0e8488e79..5a13de215e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK + ./<build_dir>/examples/dpdk-l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating [--portmap="(port, port)[,(port, port)]"] @@ -111,7 +111,7 @@ updating enabled, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p ffff To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and @@ -119,7 +119,7 @@ vice versa, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936..7acbd7404e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -51,7 +51,7 @@ Running the Application The application has a number of command line options:: - ./l3fwd [EAL options] -- -p PORTMASK + ./dpdk-l3fwd [EAL options] -- -p PORTMASK [-P] [-E] [-L] @@ -111,7 +111,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: @@ -138,13 +138,13 @@ Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered or .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered In this command: @@ -166,7 +166,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered In case of eventdev mode, *--config* option is not used for ethernet port configuration. Instead each ethernet port will be configured with mentioned diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..d3c901f8d8 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_graph.rst b/doc/guides/sample_app_ug/l3_forward_graph.rst index df50827bab..75617e3af1 100644 --- a/doc/guides/sample_app_ug/l3_forward_graph.rst +++ b/doc/guides/sample_app_ug/l3_forward_graph.rst @@ -44,7 +44,7 @@ Running the Application The application has a number of command line options similar to l3fwd:: - ./l3fwd-graph [EAL options] -- -p PORTMASK + ./dpdk-l3fwd-graph [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--eth-dest=X,MM:MM:MM:MM:MM:MM] @@ -79,7 +79,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 0cc6f2e62e..4f997108ba 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -88,7 +88,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -378,7 +378,7 @@ See :doc:`Power Management<../prog_guide/power_man>` chapter in the DPDK Program .. code-block:: console - ./l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 + ./<build_dir>/examples/dpdk-l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 Where, @@ -407,7 +407,7 @@ app with the training flag set to “1”, and the other parameters set to .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P This will run the training algorithm for x seconds on each core (cores 2 and 3), and then print out the recommended threshold values for those @@ -432,7 +432,7 @@ then be started without the training mode so traffic can start immediately. .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P Telemetry Mode -------------- @@ -449,13 +449,9 @@ cycles it took is measured and compared with minimum and maximum reference cycles and accordingly busy rate is set to either 0% or 50% or 100%. - .. Note:: - - * The CONFIG_RTE_LIBRTE_TELEMETRY should be set in order to get the stats in DPDK telemetry. - .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry + ./<build_dir>/examples/dpdk-l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry The new stats ``empty_poll`` , ``full_poll`` and ``busy_percent`` can be viewed by running the script ``/usertools/dpdk-telemetry-client.py`` and selecting the menu option ``Send for global Metrics``. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 04c40f2854..75bfd78505 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] + ./<build_dir>/examples/dpdk-link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] where, @@ -54,7 +54,7 @@ issue the command: .. code-block:: console - $ ./build/link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index f2a79a6397..8b2858b971 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -41,7 +41,7 @@ passing at least two cores in the coremask/corelist, as follows: .. code-block:: console - ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary For the first DPDK process run, the proc-type flag can be omitted or set to auto, since all DPDK processes will default to being a primary instance, @@ -50,7 +50,7 @@ The process should start successfully and display a command prompt as follows: .. code-block:: console - $ ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + $ ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary EAL: coremask set to 3 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 0 @@ -78,7 +78,7 @@ again run the same binary setting at least two cores in the coremask/corelist: .. code-block:: console - ./build/simple_mp -l 2-3 -n 4 --proc-type=secondary + ./<build_dir>/examples/dpdk-simple_mp -l 2-3 -n 4 --proc-type=secondary When running a secondary process such as that shown above, the proc-type parameter can again be specified as auto. However, omitting the parameter altogether will cause the process to try and start as a primary rather than secondary process. @@ -184,10 +184,10 @@ the following commands can be used (assuming run as root): .. code-block:: console - # ./build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 - # ./build/symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 - # ./build/symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 - # ./build/symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 .. note:: @@ -284,9 +284,9 @@ the following commands could be used: .. code-block:: console - # ./mp_server/build/mp_server -l 1-2 -n 4 -- -p 3 -n 2 - # ./mp_client/build/mp_client -l 3 -n 4 --proc-type=auto -- -n 0 - # ./mp_client/build/mp_client -l 4 -n 4 --proc-type=auto -- -n 1 + # ./<build_dir>/examples/dpdk-mp_server -l 1-2 -n 4 -- -p 3 -n 2 + # ./<build_dir>/examples/dpdk-mp_client -l 3 -n 4 --proc-type=auto -- -n 0 + # ./<build_dir>/examples/dpdk-mp_client -l 4 -n 4 --proc-type=auto -- -n 1 .. note:: diff --git a/doc/guides/sample_app_ug/ntb.rst b/doc/guides/sample_app_ug/ntb.rst index 93fb752f25..f80b221db7 100644 --- a/doc/guides/sample_app_ug/ntb.rst +++ b/doc/guides/sample_app_ug/ntb.rst @@ -32,7 +32,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./build/ntb_fwd -c 0xf -n 6 -- -i + ./<build_dir>/examples/dpdk-ntb -c 0xf -n 6 -- -i Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/packet_ordering.rst b/doc/guides/sample_app_ug/packet_ordering.rst index 1c8ee5d040..5a4e0a9d28 100644 --- a/doc/guides/sample_app_ug/packet_ordering.rst +++ b/doc/guides/sample_app_ug/packet_ordering.rst @@ -43,7 +43,8 @@ The application execution command line is: .. code-block:: console - ./packet_ordering [EAL options] -- -p PORTMASK [--disable-reorder] [--insight-worker] + ./<build_dir>/examples/dpdk-packet_ordering [EAL options] -- -p PORTMASK / + [--disable-reorder] [--insight-worker] The -c EAL CPU_COREMASK option has to contain at least 3 CPU cores. The first CPU core in the core mask is the master core and would be assigned to diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..2a50eb4270 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -55,7 +55,7 @@ Running the Application The application has a number of command line options:: - ./build/l3fwd-thread [EAL options] -- + ./<build_dir>/examples/dpdk-l3fwd-thread [EAL options] -- -p PORTMASK [-P] --rx(port,queue,lcore,thread)[,(port,queue,lcore,thread)] --tx(lcore,thread)[,(lcore,thread)] @@ -141,14 +141,14 @@ in ``--rx/--tx`` are used to affinitize threads to the selected scheduler. For example, the following places every l-thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" The following places RX l-threads on lcore 0 and TX l-threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(2,1)" @@ -164,7 +164,7 @@ place every RX and TX thread on different lcores. For example, the following places every EAL thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -176,7 +176,7 @@ parameter is used. The following places RX EAL threads on lcore 0 and TX EAL threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -190,13 +190,13 @@ and its corresponding EAL threads command line can be realized as follows: a) Start every thread on different scheduler (1:1):: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" EAL thread equivalent:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -205,13 +205,13 @@ b) Start all threads on one core (N:1). Start 4 L-threads on lcore 0:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(0,0)(0,1)" Start 4 EAL threads on cpu-set 0:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -220,14 +220,14 @@ c) Start threads on different cores (N:M). Start 2 L-threads for RX on lcore 0, and 2 L-threads for TX on lcore 1:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(1,1)" Start 2 EAL threads for RX on cpu-set 0, and 2 EAL threads for TX on cpu-set 1:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -1146,33 +1146,15 @@ in the performance-thread folder To build and run the pthread shim example -#. Go to the example applications folder - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim - - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the DPDK Getting Started Guide for possible RTE_TARGET values. - #. Build the application: - .. code-block:: console - - make + To compile the sample application see :doc:`compiling`. #. To run the pthread_shim example .. code-block:: console - lthread-pthread-shim -c core_mask -n number_of_channels + dpdk-pthread-shim -c core_mask -n number_of_channels .. _lthread_diagnostics: diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 12b4f13d5b..a58b6f35bf 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -57,13 +57,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. -.. note:: - To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 - and then recompile DPDK: - - .. code-block:: console - - CONFIG_RTE_LIBRTE_IEEE1588=y Running the Application ----------------------- @@ -72,7 +65,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/ptpclient -l 1 -n 4 -- -p 0x1 -T 0 + ./<build_dir>/examples/dpdk-ptpclient -l 1 -n 4 -- -p 0x1 -T 0 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst index d75f7da52c..6b6853a0e9 100644 --- a/doc/guides/sample_app_ug/qos_metering.rst +++ b/doc/guides/sample_app_ug/qos_metering.rst @@ -48,7 +48,7 @@ The application execution command line is as below: .. code-block:: console - ./qos_meter [EAL options] -- -p PORTMASK + ./dpdk-qos_meter [EAL options] -- -p PORTMASK The application is constrained to use a single core in the EAL core mask and 2 ports only in the application port mask (first port from the port mask is used for RX and the other port in the core mask is used for TX). diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..801f5e1286 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,8 +42,8 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, - which can be done by changing the configuration file for the specific target to be compiled. + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the relevant + entry in the ``config/rte_config.h`` file. Running the Application ----------------------- @@ -57,7 +57,7 @@ The application has a number of command line options: .. code-block:: console - ./qos_sched [EAL options] -- <APP PARAMS> + ./<build_dir>/examples/dpdk-qos_sched [EAL options] -- <APP PARAMS> Mandatory application parameters include: @@ -315,7 +315,7 @@ The following is an example command with a single packet flow configuration: .. code-block:: console - ./qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg This example uses a single packet flow configuration which creates one RX thread on lcore 5 reading from port 3 and a worker thread on lcore 7 writing to port 2. @@ -324,7 +324,7 @@ Another example with 2 packet flow configurations using different ports but shar .. code-block:: console - ./qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg Note that independent cores for the packet flow configurations for each of the RX, WT and TX thread are also supported, providing flexibility to balance the work. diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..62d1f39d7e 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- @@ -40,7 +33,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/rxtx_callbacks -l 1 -n 4 -- [-t] + ./<build_dir>/examples/dpdk-rxtx_callbacks -l 1 -n 4 -- [-t] Use -t to enable hardware timestamping. If not supported by the NIC, an error will be displayed. diff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst index 12208f4258..f27d1ccfce 100644 --- a/doc/guides/sample_app_ug/server_node_efd.rst +++ b/doc/guides/sample_app_ug/server_node_efd.rst @@ -93,7 +93,7 @@ and the back-end node. The frontend server (server) has the following command line options:: - ./server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS + ./<build_dir>/examples/dpdk-server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS Where, diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..9202be6ea9 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -20,26 +20,9 @@ is application specific, and not a part of the service cores API. Compiling the Application ------------------------- -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make +The application is located in the ``service_cores`` sub-directory. Running the Application ----------------------- @@ -50,7 +33,7 @@ pass a service core-mask as an EAL argument at startup time. .. code-block:: console - $ ./build/service_cores + $ ./<build_dir>/examples/dpdk-service_cores Explanation diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 34f6f9aea7..263d8debc8 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -25,7 +25,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/basicfwd -l 1 -n 4 + ./<build_dir>/examples/dpdk-skeleton -l 1 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..86ced036ce 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,36 +90,17 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- -#. Go to the examples directory: +Run the tep_termination sample code: - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination - -#. Run the tep_termination sample code: - - .. code-block:: console +.. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- - -p 0x1 --dev-basename tep-termination --nb-devices 4 - --udp-port 4789 --filter-type 1 + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + -p 0x1 --dev-basename tep-termination --nb-devices 4 + --udp-port 4789 --filter-type 1 .. note:: @@ -139,7 +120,7 @@ The default value is 2. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 **Tunneling UDP port.** @@ -149,7 +130,7 @@ The default value is 4789. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 **Filter Type.** @@ -160,7 +141,7 @@ The default value is 1, which means the filter type of inner MAC and tenant ID i .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 --filter-type 1 **TX Checksum.** @@ -170,7 +151,7 @@ The default value is 0, which means the checksum offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --tx-checksum **TCP segment size.** @@ -180,7 +161,7 @@ The default value is 0, which means TSO offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --tx-checksum --tso-segsz 800 **Decapsulation option.** @@ -190,7 +171,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --decap 1 **Encapsulation option.** @@ -200,7 +181,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --encap 1 diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..d57d08fb2c 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/<build_dir>/app`` directory. Running the Application @@ -45,7 +45,7 @@ The application execution command line is: .. code-block:: console - ./test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE + ./dpdk-test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE The -c or -l EAL CPU coremask/corelist option has to contain exactly 3 CPU cores. The first CPU core in the core mask is assigned for core A, the second for core B and the third for core C. diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index 98d762d238..94cee9819d 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -21,7 +21,7 @@ To run the example in linux environment: .. code-block:: console - $ ./build/timer -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-timer -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index d66a724827..a8bedbab53 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -29,7 +29,7 @@ Start the vdpa example .. code-block:: console - ./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + ./dpdk-vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] where @@ -51,7 +51,7 @@ Take IFCVF driver for example: .. code-block:: console - ./vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ + ./dpdk-vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ -w 0000:06:00.3,vdpa=1 -w 0000:06:00.4,vdpa=1 \ -- --interactive diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..bacf7898f9 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -38,7 +38,7 @@ Start the vswitch example .. code-block:: console - ./vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ + ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ -- --socket-file /tmp/sock0 --client \ ... @@ -78,13 +78,13 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. .. code-block:: console - ./x86_64-native-gcc/app/testpmd -l 0-1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-1 -- -i > start tx_first Inject packets @@ -192,11 +192,6 @@ Common Issues max queue number is larger than 128, device start will fail due to insufficient mbuf. - Change the default number to make it work as below, just set the number - according to the NIC's property. :: - - make EXTRA_CFLAGS="-DMAX_QUEUES=320" - * Option "builtin-net-driver" is incompatible with QEMU QEMU vhost net device start will fail if protocol feature is not negotiated. diff --git a/doc/guides/sample_app_ug/vhost_blk.rst b/doc/guides/sample_app_ug/vhost_blk.rst index 681de6f3e1..788eef0d5f 100644 --- a/doc/guides/sample_app_ug/vhost_blk.rst +++ b/doc/guides/sample_app_ug/vhost_blk.rst @@ -36,7 +36,7 @@ Start the vhost_blk example .. code-block:: console - ./vhost_blk -m 1024 + ./dpdk-vhost_blk -m 1024 .. _vhost_blk_app_run_vm: diff --git a/doc/guides/sample_app_ug/vhost_crypto.rst b/doc/guides/sample_app_ug/vhost_crypto.rst index bbc25bde1c..7ae7addac4 100644 --- a/doc/guides/sample_app_ug/vhost_crypto.rst +++ b/doc/guides/sample_app_ug/vhost_crypto.rst @@ -28,7 +28,7 @@ Start the vhost_crypto example .. code-block:: console - ./vhost_crypto [EAL options] -- + ./dpdk-vhost_crypto [EAL options] -- --config (lcore,cdev-id,queue-id)[,(lcore,cdev-id,queue-id)] --socket-file lcore,PATH [--zero-copy] diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..35afdac63f 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -274,7 +271,7 @@ than the EAL options: .. code-block:: console - ./build/vm_power_mgr [EAL options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] The application requires exactly two cores to run. One core for the CLI and the other for the channel endpoint monitor. For example, to run on @@ -282,7 +279,7 @@ cores 0 and 1 on a system with four memory channels, issue the command: .. code-block:: console - ./build/vm_power_mgr -l 0-1 -n 4 + ./<build_dir>/examples/dpdk-vm_power_mgr -l 0-1 -n 4 After successful initialization, the VM Power Manager CLI prompt appears: @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -515,14 +509,14 @@ The standard EAL command line parameters are necessary: .. code-block:: console - ./build/vm_power_mgr [EAL options] -- [guest options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] -- [guest options] The guest example uses a channel for each lcore enabled. For example, to run on cores 0, 1, 2 and 3: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 .. _sending_policy: @@ -593,7 +587,7 @@ host, use a command like the following: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: @@ -707,7 +701,7 @@ To start the application and configure the power policy, and send it to the host .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c908074eb0 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,13 +26,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss + ./<build_dir>/examples/dpdk-vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss where, NP can be 16 or 32, TC can be 4 or 8, rss is disabled by default. @@ -72,7 +72,7 @@ To run the example in a linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index c3a3439e51..a1a8e77de2 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,13 +24,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_app [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss + ./<build_dir>/examples/dpdk-vmdq [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss where, NP can be 8, 16 or 32, rss is disabled by default. @@ -56,7 +56,7 @@ To run the example in a Linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_app -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 33/37] doc: remove references to make in sample app guides 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 33/37] doc: remove references to make in sample app guides Ciara Power @ 2020-09-04 0:34 ` Chautru, Nicolas 0 siblings, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-04 0:34 UTC (permalink / raw) To: Power, Ciara, dev Cc: Mcnamara, John, Kovacevic, Marko, Olivier Matz, Hunt, David, Ori Kam, Richardson, Bruce, Nicolau, Radu, Akhil Goyal, Kantecki, Tomasz, Sunil Kumar Kori, Pavan Nikhilesh, Van Haaren, Harry, Iremonger, Bernard, Ananyev, Konstantin, Dumitrescu, Cristian, Yigit, Ferruh, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Burakov, Anatoly, Li, Xiaoyun, Wu, Jingjing, Pattan, Reshma, Rybalchenko, Kirill, Singh, Jasvinder, Marohn, Byron, Wang, Yipeng1, Robert Sanford, Carrillo, Erik G, Maxime Coquelin, Xia, Chenbo, Wang, Zhihong Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 34/37] doc: remove references to make in vdpadevs guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (32 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 33/37] doc: remove references to make in sample app guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides Ciara Power ` (4 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Xiao Wang, John McNamara, Marko Kovacevic, Matan Azrad, Viacheslav Ovsiienko Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/vdpadevs/ifc.rst | 13 ------------ doc/guides/vdpadevs/mlx5.rst | 40 +++--------------------------------- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst index 12a2a342e6..f968489a75 100644 --- a/doc/guides/vdpadevs/ifc.rst +++ b/doc/guides/vdpadevs/ifc.rst @@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and device state report/restore, this driver enables its vDPA functionality. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux) - - Toggle compilation of the ``librte_pmd_ifc`` driver. - - IFCVF vDPA Implementation ------------------------- diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..2717459b6f 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -65,42 +63,10 @@ Prerequisites Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (33 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 34/37] doc: remove references to make in vdpadevs guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-04 0:32 ` Chautru, Nicolas 2020-09-04 9:04 ` Pattan, Reshma 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 36/37] doc: remove references to make in testpmd guides Ciara Power ` (3 subsequent siblings) 38 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Declan Doherty, Reshma Pattan, Maryam Tahhan, Nicolas Chautru, Jerin Jacob Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/tools/comp_perf.rst | 10 ++------- doc/guides/tools/cryptoperf.rst | 20 +++-------------- doc/guides/tools/pdump.rst | 15 ++++++------- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 36 +++++++++---------------------- doc/guides/tools/testeventdev.rst | 21 ++++++++---------- 6 files changed, 31 insertions(+), 73 deletions(-) diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst index ee585d1024..1b33dc4e91 100644 --- a/doc/guides/tools/comp_perf.rst +++ b/doc/guides/tools/comp_perf.rst @@ -100,13 +100,7 @@ Application Options Compiling the Tool ------------------ -**Step 1: PMD setting** - -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which -can be disabled by default in the build configuration file ``common_base``. -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: - - CONFIG_RTE_LIBRTE_PMD_ISAL=y +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. Running the Tool @@ -116,5 +110,5 @@ The tool has a number of command line options. Here is the sample command line: .. code-block:: console - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index 28b729dbda..e7ea2ba1a5 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum throughput. Compiling the Application ------------------------- -**Step 1: PMD setting** -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The crypto device drivers PMD which should be tested can be enabled by setting:: - - CONFIG_RTE_LIBRTE_PMD_<name>=y - -Setting example for open ssl PMD:: - - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y - -**Step 2: Linearization setting** +**Step 1: Linearization setting** It is possible linearized input segmented packets just before crypto operation for devices which doesn't support scatter-gather, and allows to measure @@ -56,13 +45,10 @@ To set on the linearization options add below definition to the #define CPERF_LINEARIZATION_ENABLE -**Step 3: Build the application** +**Step 2: Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-crypto-perf`` application. +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 8a499c6c5b..70f03db9cc 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports framework initialization code. Refer ``app/test-pmd/testpmd.c`` code to see how this is done. - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled - by default in the build configuration files, - owing to an external dependency on the libpcap development files - which must be installed on the board. - Once the libpcap development files are installed, the libpcap based PMD - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool depends on libpcap based PMD which must be + installed on the board. + Once the libpcap development files are installed, recompile the DPDK. * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when the primary application exits. @@ -37,7 +34,7 @@ The tool has a number of command line options: .. code-block:: console - ./build/app/dpdk-pdump -- + ./<build_dir>/app/dpdk-pdump -- [--multi] --pdump '(port=<port id> | device_id=<pci id or vdev name>), (queue=<queue_id>), @@ -120,5 +117,5 @@ Example .. code-block:: console - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 0390b9c589..9772d97ef0 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,7 +17,7 @@ The application has a number of command line options: .. code-block:: console - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 393c3e9d0d..1fea7e0aa4 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -13,25 +13,10 @@ parameters passed to a python running script. Compiling the Application ------------------------- -**Step 1: PMD setting** +**Build the application** -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The bbdevice drivers PMD which should be tested can be enabled by setting +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` - -Setting example for (*baseband_turbo_sw*) PMD - - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` - -**Step 2: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-bbdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -60,7 +45,7 @@ The following are the command-line options: ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` Indicates the path to the bbdev test app. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with "*/build/app/testbbdev*". + on "../.." concatenated with "*/build/app/testbbdev*". ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` Specifies EAL arguments which are passed to the test app. For more details, @@ -82,9 +67,8 @@ The following are the command-line options: ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR [TEST_VECTOR ...]`` Specifies paths to the test vector files. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default - data file. + on "../.." concatenated with "*/app/test-bbdev/test_vectors/bbdev_null.data*" +and indicates default data file. **Example usage:** @@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes and processing parameters while still keeping their number limited as part of sanity regression. -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linux-icc target: +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output +to the build directory: :: @@ -268,7 +252,7 @@ x86_64-native-linux-icc target: |-- test-bbdev |-- test_vectors - |-- x86_64-native-linux-icc + |-- build |-- app |-- testbbdev @@ -277,7 +261,7 @@ All bbdev devices .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -291,7 +275,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/* -n 64 -b 8 32 diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst index 2ed67a6340..00387ec4ed 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -15,11 +15,8 @@ Compiling the Application **Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-eventdev`` application. +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -251,7 +248,7 @@ Example command to run order queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ --test=order_queue --plcores 1 --wlcores 2,3 @@ -314,7 +311,7 @@ Example command to run order ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=order_atq --plcores 1 --wlcores 2,3 @@ -414,7 +411,7 @@ Example command to run perf queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf queue test with ethernet ports: @@ -428,7 +425,7 @@ Example command to run perf queue test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ --prod_type_timerdev --fwd_latency @@ -514,14 +511,14 @@ Example command to run perf ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf ``all types queue`` test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ --stlist=a --prod_type_timerdev --fwd_latency @@ -633,7 +630,7 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a @@ -725,5 +722,5 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides Ciara Power @ 2020-09-04 0:32 ` Chautru, Nicolas 2020-09-04 9:04 ` Pattan, Reshma 1 sibling, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-04 0:32 UTC (permalink / raw) To: Power, Ciara, dev Cc: Mcnamara, John, Kovacevic, Marko, Doherty, Declan, Pattan, Reshma, Tahhan, Maryam, Jerin Jacob Hi Ciara, Fine with me for test-bbdev. (Ignore my parallel comment to point more explicitly to the build stage directory, that is already fine below). Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > Sent: Thursday, September 3, 2020 8:27 AM > To: dev@dpdk.org > Cc: Power, Ciara <ciara.power@intel.com>; Mcnamara, John > <john.mcnamara@intel.com>; Kovacevic, Marko > <marko.kovacevic@intel.com>; Doherty, Declan <declan.doherty@intel.com>; > Pattan, Reshma <reshma.pattan@intel.com>; Tahhan, Maryam > <maryam.tahhan@intel.com>; Chautru, Nicolas <nicolas.chautru@intel.com>; > Jerin Jacob <jerinj@marvell.com> > Subject: [PATCH v3 35/37] doc: remove reference to make in tools guides > > Make is no longer supported for compiling DPDK, references are now removed > in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/tools/comp_perf.rst | 10 ++------- > doc/guides/tools/cryptoperf.rst | 20 +++-------------- > doc/guides/tools/pdump.rst | 15 ++++++------- > doc/guides/tools/proc_info.rst | 2 +- > doc/guides/tools/testbbdev.rst | 36 +++++++++---------------------- > doc/guides/tools/testeventdev.rst | 21 ++++++++---------- > 6 files changed, 31 insertions(+), 73 deletions(-) > > diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst > index ee585d1024..1b33dc4e91 100644 > --- a/doc/guides/tools/comp_perf.rst > +++ b/doc/guides/tools/comp_perf.rst > @@ -100,13 +100,7 @@ Application Options Compiling the Tool > ------------------ > > -**Step 1: PMD setting** > - > -The ``dpdk-test-compress-perf`` tool depends on compression device drivers > PMD which -can be disabled by default in the build configuration file > ``common_base``. > -The compression device drivers PMD which should be tested can be enabled > by setting e.g.:: > - > - CONFIG_RTE_LIBRTE_PMD_ISAL=y > +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. > > > Running the Tool > @@ -116,5 +110,5 @@ The tool has a number of command line options. Here > is the sample command line: > > .. code-block:: console > > - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat -- > input-file test.txt --seg-sz 8192 > + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name > + compress_qat --input-file test.txt --seg-sz 8192 > --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max- > num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst > b/doc/guides/tools/cryptoperf.rst index 28b729dbda..e7ea2ba1a5 100644 > --- a/doc/guides/tools/cryptoperf.rst > +++ b/doc/guides/tools/cryptoperf.rst > @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure > maximum throughput. > Compiling the Application > ------------------------- > > -**Step 1: PMD setting** > > -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which > -are disabled by default in the build configuration file ``common_base``. > -The crypto device drivers PMD which should be tested can be enabled by > setting:: > - > - CONFIG_RTE_LIBRTE_PMD_<name>=y > - > -Setting example for open ssl PMD:: > - > - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y > - > -**Step 2: Linearization setting** > +**Step 1: Linearization setting** > > It is possible linearized input segmented packets just before crypto operation > for devices which doesn't support scatter-gather, and allows to measure @@ - > 56,13 +45,10 @@ To set on the linearization options add below definition to the > > #define CPERF_LINEARIZATION_ENABLE > > -**Step 3: Build the application** > +**Step 2: Build the application** > > -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the > -``dpdk-test-crypto-perf`` application. > +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. > > -Initially, the user must select a DPDK target to choose the correct target type - > and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed in > the system prior to this, as described in the earlier chapters in this Getting > Started Guide. > diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index > 8a499c6c5b..70f03db9cc 100644 > --- a/doc/guides/tools/pdump.rst > +++ b/doc/guides/tools/pdump.rst > @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling > packet capture on dpdk ports > framework initialization code. Refer ``app/test-pmd/testpmd.c`` > code to see how this is done. > > - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is > disabled > - by default in the build configuration files, > - owing to an external dependency on the libpcap development files > - which must be installed on the board. > - Once the libpcap development files are installed, the libpcap based PMD > - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and > recompiling the DPDK. > + * The ``dpdk-pdump`` tool depends on libpcap based PMD which must be > + installed on the board. > + Once the libpcap development files are installed, recompile the DPDK. > > * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when > the primary application exits. > @@ -37,7 +34,7 @@ The tool has a number of command line options: > > .. code-block:: console > > - ./build/app/dpdk-pdump -- > + ./<build_dir>/app/dpdk-pdump -- > [--multi] > --pdump '(port=<port id> | device_id=<pci id or vdev name>), > (queue=<queue_id>), @@ -120,5 +117,5 @@ Example > > .. code-block:: console > > - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx- > dev=/tmp/rx.pcap' > - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump > 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx- > dev=/tmp/rx-2.pcap' > + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx- > dev=/tmp/rx.pcap' > + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump > 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx- > dev=/tmp/rx-2.pcap' > diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst > index 0390b9c589..9772d97ef0 100644 > --- a/doc/guides/tools/proc_info.rst > +++ b/doc/guides/tools/proc_info.rst > @@ -17,7 +17,7 @@ The application has a number of command line options: > > .. code-block:: console > > - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats > | > + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | > + --xstats | > --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | > --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] > > diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst > index 393c3e9d0d..1fea7e0aa4 100644 > --- a/doc/guides/tools/testbbdev.rst > +++ b/doc/guides/tools/testbbdev.rst > @@ -13,25 +13,10 @@ parameters passed to a python running script. > Compiling the Application > ------------------------- > > -**Step 1: PMD setting** > +**Build the application** > > -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are > disabled by default in the build configuration file ``common_base``. > -The bbdevice drivers PMD which should be tested can be enabled by setting > +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. > > - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` > - > -Setting example for (*baseband_turbo_sw*) PMD > - > - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` > - > -**Step 2: Build the application** > - > -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the > -``dpdk-test-bbdev`` application. > - > -Initially, the user must select a DPDK target to choose the correct target type - > and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed in > the system prior to this, as described in the earlier chapters in this Getting > Started Guide. > @@ -60,7 +45,7 @@ The following are the command-line options: > > ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` > Indicates the path to the bbdev test app. If not specified path is set based > - on *$RTE_SDK* environment variable concatenated with > "*/build/app/testbbdev*". > + on "../.." concatenated with "*/build/app/testbbdev*". > > ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` > Specifies EAL arguments which are passed to the test app. For more details, > @@ -82,9 +67,8 @@ The following are the command-line options: > > ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR > [TEST_VECTOR ...]`` > Specifies paths to the test vector files. If not specified path is set based > - on *$RTE_SDK* environment variable concatenated with > - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default > - data file. > + on "../.." concatenated with "*/app/test- > bbdev/test_vectors/bbdev_null.data*" > +and indicates default data file. > > **Example usage:** > > @@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes > and processing parameters while still keeping their number limited as part of > sanity regression. > > -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64- > native-linux-icc target: > +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and > +output to the build directory: > > :: > > @@ -268,7 +252,7 @@ x86_64-native-linux-icc target: > |-- test-bbdev > |-- test_vectors > > - |-- x86_64-native-linux-icc > + |-- build > |-- app > |-- testbbdev > > @@ -277,7 +261,7 @@ All bbdev devices > > .. code-block:: console > > - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev > + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev > -v turbo_dec_default.data > > It runs all available tests using the test vector filled based on @@ -291,7 > +275,7 @@ baseband turbo_sw device > > .. code-block:: console > > - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev > + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev > -e="--vdev=baseband_turbo_sw" -t 120 -c validation > -v ./test_vectors/* -n 64 -b 8 32 > > diff --git a/doc/guides/tools/testeventdev.rst > b/doc/guides/tools/testeventdev.rst > index 2ed67a6340..00387ec4ed 100644 > --- a/doc/guides/tools/testeventdev.rst > +++ b/doc/guides/tools/testeventdev.rst > @@ -15,11 +15,8 @@ Compiling the Application > > **Build the application** > > -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the > -``dpdk-test-eventdev`` application. > +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. > > -Initially, the user must select a DPDK target to choose the correct target type - > and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed in > the system prior to this, as described in the earlier chapters in this Getting > Started Guide. > @@ -251,7 +248,7 @@ Example command to run order queue test: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ > + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ > --test=order_queue --plcores 1 --wlcores 2,3 > > > @@ -314,7 +311,7 @@ Example command to run order ``all types queue`` test: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ > + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ > --test=order_atq --plcores 1 --wlcores 2,3 > > > @@ -414,7 +411,7 @@ Example command to run perf queue test: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ > + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 > + --vdev=event_sw0 -- \ > --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 > > Example command to run perf queue test with ethernet ports: > @@ -428,7 +425,7 @@ Example command to run perf queue test with event > timer adapter: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ > + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- > + \ > --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ > --prod_type_timerdev --fwd_latency > > @@ -514,14 +511,14 @@ Example command to run perf ``all types queue`` > test: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ > + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ > --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 > > Example command to run perf ``all types queue`` test with event timer > adapter: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ > + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- > + \ > --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ > --stlist=a --prod_type_timerdev --fwd_latency > > @@ -633,7 +630,7 @@ Example command to run pipeline queue test: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ > + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 > + --vdev=event_sw0 -- \ > --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a > > > @@ -725,5 +722,5 @@ Example command to run pipeline queue test: > > .. code-block:: console > > - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ > + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 > + --vdev=event_sw0 -- \ > --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a > -- > 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides Ciara Power 2020-09-04 0:32 ` Chautru, Nicolas @ 2020-09-04 9:04 ` Pattan, Reshma 2020-09-04 13:34 ` Bruce Richardson 1 sibling, 1 reply; 300+ messages in thread From: Pattan, Reshma @ 2020-09-04 9:04 UTC (permalink / raw) To: Power, Ciara, dev Cc: Mcnamara, John, Kovacevic, Marko, Doherty, Declan, Tahhan, Maryam, Chautru, Nicolas, Jerin Jacob > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index > + * The ``dpdk-pdump`` tool depends on libpcap based PMD which must be > + installed on the board. > + Once the libpcap development files are installed, recompile the DPDK. > Might be rewrite the sentence as below The ``dpdk-pdump`` tool depends on DPDK pcap PMD, so the system should have libpcap development files installed and the pcap PMD enabled in the build. Thanks, Reshma ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides 2020-09-04 9:04 ` Pattan, Reshma @ 2020-09-04 13:34 ` Bruce Richardson 2020-09-04 13:54 ` Pattan, Reshma 0 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-09-04 13:34 UTC (permalink / raw) To: Pattan, Reshma Cc: Power, Ciara, dev, Mcnamara, John, Kovacevic, Marko, Doherty, Declan, Tahhan, Maryam, Chautru, Nicolas, Jerin Jacob On Fri, Sep 04, 2020 at 09:04:48AM +0000, Pattan, Reshma wrote: > > > > -----Original Message----- From: Power, Ciara <ciara.power@intel.com> > > > > diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst > > index + * The ``dpdk-pdump`` tool depends on libpcap based PMD > > which must be + installed on the board. + Once the > > libpcap development files are installed, recompile the DPDK. > > > > Might be rewrite the sentence as below > > The ``dpdk-pdump`` tool depends on DPDK pcap PMD, so the system should > have libpcap development files installed and the pcap PMD enabled in the > build. > Sounds good, though I'd suggest changing "enabled" to "not disabled" since all drivers are enabled if their dependencies are present, unless they are explicitly disabled. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides 2020-09-04 13:34 ` Bruce Richardson @ 2020-09-04 13:54 ` Pattan, Reshma 0 siblings, 0 replies; 300+ messages in thread From: Pattan, Reshma @ 2020-09-04 13:54 UTC (permalink / raw) To: Richardson, Bruce Cc: Power, Ciara, dev, Mcnamara, John, Kovacevic, Marko, Doherty, Declan, Tahhan, Maryam, Chautru, Nicolas, Jerin Jacob > -----Original Message----- > From: Bruce Richardson <bruce.richardson@intel.com> > > > > The ``dpdk-pdump`` tool depends on DPDK pcap PMD, so the system > > should have libpcap development files installed and the pcap PMD > > enabled in the build. > > > Sounds good, though I'd suggest changing "enabled" to "not disabled" since all > drivers are enabled if their dependencies are present, unless they are explicitly > disabled. Good point. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 36/37] doc: remove references to make in testpmd guides 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (34 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 37/37] doc: update quick build doc to remove make references Ciara Power ` (2 subsequent siblings) 38 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev Cc: Ciara Power, Wenzhuo Lu, Beilei Xing, Bernard Iremonger, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v3: Added back in ieee1588 description. --- doc/guides/testpmd_app_ug/run_app.rst | 6 +++--- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index d1e4ee3e7a..ac4f0d9212 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the previous section, with .. code-block:: console - sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 + sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 The command line options are: @@ -59,13 +59,13 @@ The command line options are: * ``--nb-cores=N`` Set the number of forwarding cores, - where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the configuration file. + where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the configuration file. The default value is 1. * ``--nb-ports=N`` Set the number of forwarding ports, - where 1 <= N <= "number of ports" on the board or ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` from the configuration file. The default value is the number of ports on the board. * ``--coremask=0xXX`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 90cf252df5..6856e3b909 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command .. code-block:: console - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt Interactive-mode selected CLI commands to be read from /home/ubuntu/flow-create-commands.txt Configuring Port 0 (socket 0) @@ -329,7 +329,7 @@ The available information categories are: * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. +* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. * ``noisy``: Noisy neighbor simulation. Simulate more realistic behavior of a guest machine engaged in receiving @@ -379,11 +379,6 @@ Example for the io forwarding engine, with some packet drops on the tx side:: TX-packets: 548595568 TX-dropped: 128 TX-total: 548595696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. note:: - - Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" stats, like: - - CPU cycles/packet=xx.dd (total cycles=xxxx / total RX packets=xxxx) at xxx MHz clock clear fwd ~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v3 37/37] doc: update quick build doc to remove make references 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (35 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 36/37] doc: remove references to make in testpmd guides Ciara Power @ 2020-09-03 15:27 ` Ciara Power 2020-09-06 13:19 ` Thomas Monjalon 2020-09-06 21:58 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon 38 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-03 15:27 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/build-sdk-quick.txt | 55 ++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index bcfa7d6fe1..423104094e 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -1,34 +1,21 @@ -Basic build - make defconfig && make - or - make config T=x86_64-native-linux-gcc && make -Build commands - config get configuration from target template (T=) - defconfig auto-select target template based on arch, OS, etc. - all same as build (default rule) - build build in a configured directory - clean remove files but keep configuration - install T= configure, build and install a target in DESTDIR - install install optionally staged in DESTDIR - examples build examples for given targets (T=) - examples_clean clean examples for given targets (T=) - test compile tests and run basic unit tests - test-* run specific subset of unit tests - tags|etags|gtags generate tags database for given targets (T=) - cscope generate cscope database for given targets (T=) -Build variables - EXTRA_CPPFLAGS preprocessor options - EXTRA_CFLAGS compiler options - EXTRA_LDFLAGS linker options - EXTRA_LDLIBS linker library options - RTE_KERNELDIR linux headers path - RTE_DEVEL_BUILD stricter options (default: y in git tree) - CROSS toolchain prefix - V verbose - D debug dependencies - O build directory (default: build/ - install T= default: ./) - DESTDIR staging install directory (default: empty) - prefix root install directory (default: /usr/local) - T target template - used with config or install - format: <arch-machine-execenv-toolchain> - templates in config/defconfig_* +For many platforms, compiling and installing DPDK should work using the +following set of commands:: + + meson build + cd build + ninja + ninja install + +This will compile DPDK in the ``build`` subdirectory, and then install the +resulting libraries, drivers and header files onto the system - generally +in /usr/local. A package-config file, ``libdpdk.pc``, for DPDK will also +be installed to allow ease of compiling and linking with applications. + +After installation, to use DPDK, the necessary CFLAG and LDFLAG variables +can be got from pkg-config:: + + pkg-config --cflags libdpdk + pkg-config --libs libdpdk + +More detail on each of these steps can be got from the +"Installing DPDK Using the meson build system" section of the programming guides. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 37/37] doc: update quick build doc to remove make references 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 37/37] doc: update quick build doc to remove make references Ciara Power @ 2020-09-06 13:19 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-06 13:19 UTC (permalink / raw) To: Ciara Power, dev; +Cc: Thomas Monjalon, John McNamara, Marko Kovacevic On Thu Sep 3, 2020 at 6:27 PM CEST, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/build-sdk-quick.txt | 55 ++++++++++++++++------------------------- > 1 file changed, 21 insertions(+), 34 deletions(-) This file was printed in "make help". Instead of copy pasting the intro of build-sdk-meson.rst, I think it would be better to just remove this file, avoiding duplicates. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (36 preceding siblings ...) 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 37/37] doc: update quick build doc to remove make references Ciara Power @ 2020-09-06 21:58 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon 38 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-06 21:58 UTC (permalink / raw) To: Ciara Power, dev On Thu Sep 3, 2020 at 6:26 PM CEST, Ciara Power wrote: > v3: Fixed comments on v2. > v2: > - Fixed comments on v1. > - Removed additional make references. > - Added some meson replacements where necessary. > - Added dummy root Makefile. > > As previously decided [1] and communicated via deprecation notice [2], > the > make build system is to be removed in the 20.11 release. > > This patchset removes support for compiling DPDK with the legacy make > build system. Some make support is maintained for example applications, > where pkg-config is used rather than the legacy make method. > > References to the make build system are removed from all documentation, > please review to see if replacement meson instructions are needed in > some cases. I think it deserves a bit more reviews in some scripts, apps and docs. I am going to squash and merge some patches while keeping some parts untouched so we can discuss how to follow-up on those details. Please wait for the merge of the main parts, but keep replying, thanks. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power ` (37 preceding siblings ...) 2020-09-06 21:58 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 01/31] doc: build without using make Thomas Monjalon ` (32 more replies) 38 siblings, 33 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power The first 13 commits of this series are pushed to the main branch, making the make-based build an old story. The last 18 commits (devtools, app and doc) are pending for more reviews, especially because the doc rework is still in progress. This is a big change which requires to be split but must be completed soon. *All*, please make the documentation update your highest priority. I will be reluctant to merge some driver changes if the related doc is not updated. v4: rearrange commits and fix as commented v3: Fixed comments on v2. v2: - Fixed comments on v1. - Removed additional make references. - Added some meson replacements where necessary. - Added dummy root Makefile. As previously decided [1] and communicated via deprecation notice [2], the make build system is to be removed in the 20.11 release. This patchset removes support for compiling DPDK with the legacy make build system. Some make support is maintained for example applications, where pkg-config is used rather than the legacy make method. References to the make build system are removed from all documentation, please review to see if replacement meson instructions are needed in some cases. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 Bruce Richardson (5): doc: build without using make examples/multi_process: convert to pkg-config-based build examples/vm_power: convert to pkg-config-based build examples/ethtool: convert to pkg-config-based build build: create dummy Makefile Ciara Power (23): examples: remove legacy sections of makefiles examples: remove old build system references build: remove makefiles buildtools: remove scripts used only with make config: remove default configs used with make devtools: remove legacy flags from includes check app: remove references to make-based config doc: remove references to make from Linux guide doc: remove references to make from FreeBSD guide doc: remove references to make from howto guides doc: remove references to make from prog guide doc: remove references to make from platforms guides doc: remove references to make from mempool guide doc: remove references to make from NICs guides doc: remove references to make from vdpadevs guides doc: remove references to make from bbdevs guides doc: remove references to make from cryptodevs guides doc: remove references to make from compressdevs guides doc: remove references to make from eventdevs guides doc: remove references to make from rawdevs guides doc: remove references to make from app guides doc: remove reference to make from tools guides doc: remove references to make from contributing guide Kevin Laatz (3): examples/ka-agent: convert to pkg-config-based build examples/server_node_efd: convert to pkg-config-based build examples/performance-thread: convert to pkg-config-based build GNUmakefile | 17 - MAINTAINERS | 25 +- Makefile | 7 +- app/Makefile | 34 - app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 - app/test-bbdev/test-bbdev.py | 11 +- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 - app/test-eventdev/Makefile | 32 - app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 - app/test-pipeline/Makefile | 33 - app/test-pmd/Makefile | 73 -- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ----- app/test/test_cryptodev.c | 89 +- app/test/test_cryptodev_asym.c | 18 +- buildtools/Makefile | 9 - buildtools/auto-config-h.sh | 108 -- buildtools/call-sphinx-build.py | 5 +- buildtools/gen-build-mk.sh | 23 - buildtools/gen-config-h.sh | 15 - buildtools/pmdinfogen/Makefile | 20 - buildtools/relpath.sh | 76 -- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - config/rte_config.h | 4 - devtools/build-tags.sh | 15 +- devtools/check-includes.sh | 11 +- devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 315 ----- doc/build-sdk-quick.txt | 34 - doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 +- doc/guides/bbdevs/fpga_lte_fec.rst | 7 +- doc/guides/bbdevs/turbo_sw.rst | 15 - doc/guides/compressdevs/isal.rst | 4 - doc/guides/compressdevs/octeontx.rst | 24 +- doc/guides/compressdevs/zlib.rst | 4 - doc/guides/conf.py | 7 +- doc/guides/contributing/coding_style.rst | 48 +- doc/guides/contributing/design.rst | 127 +- doc/guides/contributing/documentation.rst | 31 +- doc/guides/contributing/patches.rst | 49 - doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 - doc/guides/cryptodevs/caam_jr.rst | 30 - doc/guides/cryptodevs/ccp.rst | 14 +- doc/guides/cryptodevs/dpaa2_sec.rst | 25 - doc/guides/cryptodevs/dpaa_sec.rst | 25 - doc/guides/cryptodevs/kasumi.rst | 11 +- doc/guides/cryptodevs/mvsam.rst | 10 +- doc/guides/cryptodevs/nitrox.rst | 7 - doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +- doc/guides/cryptodevs/octeontx2.rst | 8 +- doc/guides/cryptodevs/openssl.rst | 6 +- doc/guides/cryptodevs/qat.rst | 67 +- doc/guides/cryptodevs/scheduler.rst | 8 - doc/guides/cryptodevs/snow3g.rst | 10 +- doc/guides/cryptodevs/virtio.rst | 18 +- doc/guides/cryptodevs/zuc.rst | 10 +- doc/guides/eventdevs/dpaa.rst | 20 - doc/guides/eventdevs/dpaa2.rst | 20 - doc/guides/eventdevs/octeontx.rst | 24 - doc/guides/eventdevs/octeontx2.rst | 8 - doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/freebsd_gsg/intro.rst | 4 +- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +- doc/guides/howto/packet_capture_framework.rst | 21 +- doc/guides/howto/pvp_reference_benchmark.rst | 27 +- doc/guides/howto/vfd.rst | 4 +- .../virtio_user_for_container_networking.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 84 +- doc/guides/linux_gsg/build_sample_apps.rst | 69 +- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 48 +- doc/guides/linux_gsg/enable_func.rst | 13 +- doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/linux_drivers.rst | 18 +- doc/guides/linux_gsg/sys_reqs.rst | 16 +- doc/guides/mempool/octeontx.rst | 28 +- doc/guides/mempool/octeontx2.rst | 10 +- doc/guides/meson.build | 3 +- doc/guides/nics/ark.rst | 26 - doc/guides/nics/atlantic.rst | 4 - doc/guides/nics/axgbe.rst | 15 - doc/guides/nics/bnx2x.rst | 27 - doc/guides/nics/bnxt.rst | 5 +- doc/guides/nics/build_and_test.rst | 8 +- doc/guides/nics/cxgbe.rst | 36 +- doc/guides/nics/dpaa.rst | 27 +- doc/guides/nics/dpaa2.rst | 26 +- doc/guides/nics/ena.rst | 16 - doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 - doc/guides/nics/fail_safe.rst | 20 +- doc/guides/nics/features.rst | 9 - doc/guides/nics/fm10k.rst | 4 - doc/guides/nics/hinic.rst | 9 - doc/guides/nics/hns3.rst | 10 - doc/guides/nics/i40e.rst | 44 +- doc/guides/nics/ice.rst | 25 +- doc/guides/nics/igc.rst | 18 +- doc/guides/nics/intel_vf.rst | 13 +- doc/guides/nics/ionic.rst | 8 - doc/guides/nics/ipn3ke.rst | 12 +- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 - doc/guides/nics/memif.rst | 10 +- doc/guides/nics/mlx4.rst | 55 +- doc/guides/nics/mlx5.rst | 62 +- doc/guides/nics/mvneta.rst | 36 +- doc/guides/nics/mvpp2.rst | 43 +- doc/guides/nics/nfb.rst | 19 +- doc/guides/nics/nfp.rst | 4 - doc/guides/nics/null.rst | 6 +- doc/guides/nics/octeontx.rst | 19 +- doc/guides/nics/octeontx2.rst | 13 +- doc/guides/nics/pcap_ring.rst | 24 +- doc/guides/nics/qede.rst | 17 +- doc/guides/nics/sfc_efx.rst | 15 - doc/guides/nics/softnic.rst | 13 +- doc/guides/nics/szedata2.rst | 18 +- doc/guides/nics/thunderx.rst | 25 +- doc/guides/nics/vdev_netvsc.rst | 6 - doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- doc/guides/platform/bluefield.rst | 22 - doc/guides/platform/octeontx.rst | 33 +- doc/guides/platform/octeontx2.rst | 32 - doc/guides/prog_guide/build_app.rst | 56 +- .../prog_guide/dev_kit_build_system.rst | 331 ----- .../prog_guide/dev_kit_root_make_help.rst | 188 --- .../prog_guide/env_abstraction_layer.rst | 17 +- .../prog_guide/ext_app_lib_make_help.rst | 98 -- doc/guides/prog_guide/graph_lib.rst | 6 +- doc/guides/prog_guide/index.rst | 3 - doc/guides/prog_guide/intro.rst | 2 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../prog_guide/kernel_nic_interface.rst | 14 +- .../link_bonding_poll_mode_drv_lib.rst | 15 +- doc/guides/prog_guide/lto.rst | 12 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/profile_app.rst | 17 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 - doc/guides/rawdevs/dpaa2_qdma.rst | 21 - doc/guides/rawdevs/ifpga.rst | 10 - doc/guides/rawdevs/ioat.rst | 8 +- doc/guides/rawdevs/ntb.rst | 6 - doc/guides/rawdevs/octeontx2_dma.rst | 12 - doc/guides/rawdevs/octeontx2_ep.rst | 8 - doc/guides/rel_notes/deprecation.rst | 7 - doc/guides/sample_app_ug/bbdev_app.rst | 34 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 89 +- doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 +- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 +- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- doc/guides/tools/comp_perf.rst | 10 +- doc/guides/tools/cryptoperf.rst | 20 +- doc/guides/tools/pdump.rst | 15 +- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 36 +- doc/guides/tools/testeventdev.rst | 21 +- doc/guides/vdpadevs/ifc.rst | 13 - doc/guides/vdpadevs/mlx5.rst | 40 +- drivers/Makefile | 34 - drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 - drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 - drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 - drivers/bus/fslmc/Makefile | 47 - drivers/bus/ifpga/Makefile | 28 - drivers/bus/pci/Makefile | 33 - drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/pci/linux/pci_vfio.c | 1 - drivers/bus/vdev/Makefile | 27 - drivers/bus/vmbus/Makefile | 33 - drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 - drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 - drivers/common/iavf/Makefile | 27 - drivers/common/mlx5/Makefile | 404 ------ drivers/common/mvep/Makefile | 35 - drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 - drivers/common/qat/Makefile | 74 -- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 - drivers/compress/octeontx/Makefile | 26 - drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 - drivers/crypto/aesni_gcm/Makefile | 43 - drivers/crypto/aesni_mb/Makefile | 42 - drivers/crypto/armv8/Makefile | 36 - drivers/crypto/caam_jr/Makefile | 39 - drivers/crypto/ccp/Makefile | 32 - drivers/crypto/dpaa2_sec/Makefile | 45 - drivers/crypto/dpaa_sec/Makefile | 38 - drivers/crypto/kasumi/Makefile | 42 - drivers/crypto/mvsam/Makefile | 40 - drivers/crypto/nitrox/Makefile | 30 - drivers/crypto/null/Makefile | 27 - drivers/crypto/octeontx/Makefile | 36 - drivers/crypto/octeontx2/Makefile | 49 - drivers/crypto/openssl/Makefile | 26 - drivers/crypto/scheduler/Makefile | 34 - drivers/crypto/snow3g/Makefile | 43 - drivers/crypto/virtio/Makefile | 33 - drivers/crypto/zuc/Makefile | 42 - drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 - drivers/event/dpaa2/Makefile | 41 - drivers/event/dsw/Makefile | 26 - drivers/event/octeontx/Makefile | 51 - drivers/event/octeontx2/Makefile | 47 - drivers/event/opdl/Makefile | 29 - drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 - drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 - drivers/mempool/dpaa2/Makefile | 31 - drivers/mempool/octeontx/Makefile | 39 - drivers/mempool/octeontx2/Makefile | 40 - drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 -- drivers/net/af_packet/Makefile | 27 - drivers/net/af_xdp/Makefile | 26 - drivers/net/ark/Makefile | 39 - drivers/net/atlantic/Makefile | 34 - drivers/net/avp/Makefile | 29 - drivers/net/axgbe/Makefile | 33 - drivers/net/bnx2x/Makefile | 33 - drivers/net/bnxt/Makefile | 63 - drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 - drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 - drivers/net/cxgbe/Makefile | 57 - drivers/net/dpaa/Makefile | 41 - drivers/net/dpaa2/Makefile | 47 - drivers/net/e1000/Makefile | 79 -- drivers/net/ena/Makefile | 30 - drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 - drivers/net/failsafe/Makefile | 43 - drivers/net/fm10k/Makefile | 77 -- drivers/net/hinic/Makefile | 67 - drivers/net/hns3/Makefile | 42 - drivers/net/i40e/Makefile | 112 -- drivers/net/i40e/i40e_rxtx.c | 1 - drivers/net/iavf/Makefile | 54 - drivers/net/ice/Makefile | 96 -- drivers/net/igc/Makefile | 40 - drivers/net/ionic/Makefile | 31 - drivers/net/ipn3ke/Makefile | 38 - drivers/net/ixgbe/Makefile | 110 -- drivers/net/kni/Makefile | 30 - drivers/net/liquidio/Makefile | 30 - drivers/net/memif/Makefile | 26 - drivers/net/mlx4/Makefile | 142 -- drivers/net/mlx5/Makefile | 82 -- drivers/net/mvneta/Makefile | 39 - drivers/net/mvpp2/Makefile | 42 - drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 - drivers/net/nfp/Makefile | 41 - drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 - drivers/net/octeontx2/Makefile | 63 - drivers/net/pcap/Makefile | 32 - drivers/net/pfe/Makefile | 31 - drivers/net/qede/Makefile | 109 -- drivers/net/ring/Makefile | 29 - drivers/net/sfc/Makefile | 133 -- drivers/net/softnic/Makefile | 54 - drivers/net/szedata2/Makefile | 30 - drivers/net/tap/Makefile | 97 -- drivers/net/thunderx/Makefile | 41 - drivers/net/vdev_netvsc/Makefile | 30 - drivers/net/vhost/Makefile | 31 - drivers/net/virtio/Makefile | 82 -- drivers/net/vmxnet3/Makefile | 53 - drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 - drivers/raw/dpaa2_qdma/Makefile | 36 - drivers/raw/ifpga/Makefile | 39 - drivers/raw/ifpga/base/Makefile | 32 - drivers/raw/ioat/Makefile | 28 - drivers/raw/ntb/Makefile | 28 - drivers/raw/octeontx2_dma/Makefile | 34 - drivers/raw/octeontx2_ep/Makefile | 42 - drivers/raw/skeleton/Makefile | 26 - drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 - drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 - drivers/vdpa/mlx5/Makefile | 58 - examples/Makefile | 90 -- examples/bbdev_app/Makefile | 23 +- examples/bond/Makefile | 34 +- examples/bpf/t2.c | 6 +- examples/bpf/t3.c | 10 +- examples/cmdline/Makefile | 29 +- examples/distributor/Makefile | 30 +- examples/ethtool/Makefile | 26 +- examples/ethtool/ethtool-app/Makefile | 56 +- examples/ethtool/lib/Makefile | 62 +- examples/eventdev_pipeline/Makefile | 23 +- examples/fips_validation/Makefile | 34 +- examples/flow_classify/Makefile | 29 +- examples/flow_filtering/Makefile | 23 +- examples/helloworld/Makefile | 23 +- examples/ioat/Makefile | 22 +- examples/ip_fragmentation/Makefile | 29 +- examples/ip_pipeline/Makefile | 36 +- examples/ip_reassembly/Makefile | 29 +- examples/ipsec-secgw/Makefile | 36 +- examples/ipsec-secgw/test/common_defs.sh | 4 +- examples/ipv4_multicast/Makefile | 29 +- examples/kni/Makefile | 27 +- examples/l2fwd-cat/Makefile | 38 +- examples/l2fwd-crypto/Makefile | 28 +- examples/l2fwd-event/Makefile | 22 +- examples/l2fwd-jobstats/Makefile | 23 +- examples/l2fwd-keepalive/Makefile | 23 +- examples/l2fwd-keepalive/ka-agent/Makefile | 51 +- examples/l2fwd/Makefile | 23 +- examples/l3fwd-acl/Makefile | 28 +- examples/l3fwd-graph/Makefile | 23 +- examples/l3fwd-power/Makefile | 36 +- examples/l3fwd/Makefile | 23 +- examples/link_status_interrupt/Makefile | 22 +- examples/multi_process/Makefile | 21 +- .../multi_process/client_server_mp/Makefile | 19 +- .../client_server_mp/mp_client/Makefile | 44 +- .../client_server_mp/mp_server/Makefile | 53 +- examples/multi_process/hotplug_mp/Makefile | 46 +- examples/multi_process/simple_mp/Makefile | 44 +- examples/multi_process/symmetric_mp/Makefile | 44 +- examples/ntb/Makefile | 32 +- examples/packet_ordering/Makefile | 22 +- examples/performance-thread/Makefile | 21 +- examples/performance-thread/common/common.mk | 6 +- .../performance-thread/l3fwd-thread/Makefile | 47 +- .../performance-thread/pthread_shim/Makefile | 56 +- examples/ptpclient/Makefile | 28 +- examples/qos_meter/Makefile | 28 +- examples/qos_sched/Makefile | 31 +- examples/rxtx_callbacks/Makefile | 31 +- examples/server_node_efd/Makefile | 18 +- examples/server_node_efd/node/Makefile | 46 +- examples/server_node_efd/server/Makefile | 53 +- examples/service_cores/Makefile | 28 +- examples/skeleton/Makefile | 29 +- examples/tep_termination/Makefile | 27 +- examples/timer/Makefile | 28 +- examples/vdpa/Makefile | 32 +- examples/vhost/Makefile | 30 +- examples/vhost_blk/Makefile | 31 +- examples/vhost_crypto/Makefile | 31 +- examples/vm_power_manager/Makefile | 76 +- examples/vm_power_manager/guest_cli/Makefile | 50 +- examples/vmdq/Makefile | 23 +- examples/vmdq_dcb/Makefile | 31 +- kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 - lib/Makefile | 138 -- lib/librte_acl/Makefile | 65 - lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 - lib/librte_cfgfile/Makefile | 26 - lib/librte_cmdline/Makefile | 34 - lib/librte_compressdev/Makefile | 27 - lib/librte_cryptodev/Makefile | 30 - lib/librte_distributor/Makefile | 28 - lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 -- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 -- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 - lib/librte_eventdev/Makefile | 47 - lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 - lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 - lib/librte_ip_frag/Makefile | 27 - lib/librte_ipsec/Makefile | 29 - lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 - lib/librte_mbuf/Makefile | 26 - lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_mempool/rte_mempool.h | 2 +- lib/librte_meter/Makefile | 27 - lib/librte_metrics/Makefile | 30 - lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 - lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 - lib/librte_port/Makefile | 59 - lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 - lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 - lib/librte_ring/rte_ring_elem.h | 3 +- lib/librte_sched/Makefile | 29 - lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 - lib/librte_table/Makefile | 59 - lib/librte_telemetry/Makefile | 30 - lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 - mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 - mk/arch/i686/rte.vars.mk | 36 - mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 - mk/arch/x86_x32/rte.vars.mk | 40 - mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 - mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 - mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 - mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 - mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 --- mk/internal/rte.extvars.mk | 55 - mk/internal/rte.install-post.mk | 71 - mk/internal/rte.install-pre.mk | 32 - mk/machine/armv7a/rte.vars.mk | 36 - mk/machine/armv8a/rte.vars.mk | 31 - mk/machine/default/rte.vars.mk | 30 - mk/machine/dpaa/rte.vars.mk | 37 - mk/machine/emag/rte.vars.mk | 32 - mk/machine/hsw/rte.vars.mk | 30 - mk/machine/ivb/rte.vars.mk | 30 - mk/machine/n1sdp/rte.vars.mk | 34 - mk/machine/native/rte.vars.mk | 39 - mk/machine/nhm/rte.vars.mk | 30 - mk/machine/octeontx2/rte.vars.mk | 34 - mk/machine/power8/rte.vars.mk | 30 - mk/machine/silvermont/rte.vars.mk | 30 - mk/machine/snb/rte.vars.mk | 30 - mk/machine/thunderx/rte.vars.mk | 31 - mk/machine/thunderx2/rte.vars.mk | 34 - mk/machine/wsm/rte.vars.mk | 30 - mk/machine/xgene1/rte.vars.mk | 31 - mk/rte.app.mk | 509 -------- mk/rte.bsdmodule.mk | 89 -- mk/rte.combinedlib.mk | 30 - mk/rte.cpuflags.mk | 124 -- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 - mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 - mk/rte.extsubdir.mk | 39 - mk/rte.gnuconfigure.mk | 44 - mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 -- mk/rte.hostlib.mk | 86 -- mk/rte.install.mk | 28 - mk/rte.lib.mk | 156 --- mk/rte.module.mk | 86 -- mk/rte.obj.mk | 82 -- mk/rte.sdkbuild.mk | 77 -- mk/rte.sdkconfig.mk | 142 -- mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 -- mk/rte.sdkexamples.mk | 50 - mk/rte.sdkgcov.mk | 39 - mk/rte.sdkinstall.mk | 152 --- mk/rte.sdkroot.mk | 115 -- mk/rte.sdktest.mk | 76 -- mk/rte.shared.mk | 108 -- mk/rte.subdir.mk | 65 - mk/rte.vars.mk | 102 -- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 -- mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 - mk/toolchain/gcc/rte.toolchain-compat.mk | 120 -- mk/toolchain/gcc/rte.vars.mk | 109 -- mk/toolchain/icc/rte.toolchain-compat.mk | 58 - mk/toolchain/icc/rte.vars.mk | 62 - 616 files changed, 1213 insertions(+), 20010 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100755 buildtools/relpath.sh delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc delete mode 100755 devtools/test-build.sh delete mode 100644 doc/build-sdk-quick.txt delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst delete mode 100644 doc/guides/prog_guide/ext_app_lib_make_help.rst delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 01/31] doc: build without using make 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 02/31] examples: remove legacy sections of makefiles Thomas Monjalon ` (31 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Bruce Richardson <bruce.richardson@intel.com> When building the DPDK guide documents, the DPDK version information was pulled using "make showversion", which meant there was a dependency on the DPDK make-based build system. Change this to have the version info passed in from meson itself. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- buildtools/call-sphinx-build.py | 5 ++++- doc/guides/conf.py | 7 +------ doc/guides/meson.build | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index 85c9e01563..fa6f26b376 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -9,7 +9,10 @@ from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion -(sphinx, src, dst) = sys.argv[1:] # assign parameters to variables +(sphinx, version, src, dst) = sys.argv[1:] # assign parameters to variables + +# set the version in environment for sphinx to pick up +os.environ['DPDK_VERSION'] = version # for sphinx version >= 1.7 add parallelism using "-j auto" ver = run([sphinx, '--version'], stdout=PIPE, diff --git a/doc/guides/conf.py b/doc/guides/conf.py index d8fe5cccd7..9ebc26ed3f 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -2,7 +2,6 @@ # Copyright(c) 2010-2015 Intel Corporation from __future__ import print_function -import subprocess from docutils import nodes from distutils.version import LooseVersion from sphinx import __version__ as sphinx_version @@ -38,11 +37,7 @@ html_show_copyright = False highlight_language = 'none' -# If MAKEFLAGS is exported by the user, garbage text might end up in version -version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'], - env=dict(environ, MAKEFLAGS="")) -version = version.decode('utf-8').rstrip() -release = version +release = environ['DPDK_VERSION'] master_doc = 'index' diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 732e7ad3a9..daab139c4e 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -11,7 +11,8 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk') html_guides = custom_target('html_guides', input: files('index.rst'), output: 'html', - command: [sphinx_wrapper, sphinx, meson.current_source_dir(), meson.current_build_dir()], + command: [sphinx_wrapper, sphinx, meson.project_version(), + meson.current_source_dir(), meson.current_build_dir()], depfile: '.html.d', build_by_default: get_option('enable_docs'), install: get_option('enable_docs'), -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 02/31] examples: remove legacy sections of makefiles 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 01/31] doc: build without using make Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 03/31] examples/ka-agent: convert to pkg-config-based build Thomas Monjalon ` (30 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Nicolas Chautru From: Ciara Power <ciara.power@intel.com> The example app makefiles contained sections using the legacy method of compiling with make. These are no longer needed, and are removed, leaving only the section that uses pkg-config for the make build. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- examples/bbdev_app/Makefile | 23 ++------------- examples/bond/Makefile | 34 ++-------------------- examples/cmdline/Makefile | 29 ++----------------- examples/distributor/Makefile | 30 ++----------------- examples/eventdev_pipeline/Makefile | 23 ++------------- examples/fips_validation/Makefile | 34 ++-------------------- examples/flow_classify/Makefile | 29 ++----------------- examples/flow_filtering/Makefile | 23 ++------------- examples/helloworld/Makefile | 23 ++------------- examples/ioat/Makefile | 22 ++------------ examples/ip_fragmentation/Makefile | 29 ++----------------- examples/ip_pipeline/Makefile | 36 ++--------------------- examples/ip_reassembly/Makefile | 29 ++----------------- examples/ipsec-secgw/Makefile | 36 ++--------------------- examples/ipv4_multicast/Makefile | 29 ++----------------- examples/kni/Makefile | 27 ++---------------- examples/l2fwd-cat/Makefile | 38 ++----------------------- examples/l2fwd-crypto/Makefile | 28 ++---------------- examples/l2fwd-event/Makefile | 22 ++------------ examples/l2fwd-jobstats/Makefile | 23 ++------------- examples/l2fwd-keepalive/Makefile | 23 ++------------- examples/l2fwd/Makefile | 23 ++------------- examples/l3fwd-acl/Makefile | 28 ++---------------- examples/l3fwd-graph/Makefile | 23 ++------------- examples/l3fwd-power/Makefile | 36 ++--------------------- examples/l3fwd/Makefile | 23 ++------------- examples/link_status_interrupt/Makefile | 22 ++------------ examples/ntb/Makefile | 32 ++------------------- examples/packet_ordering/Makefile | 22 ++------------ examples/ptpclient/Makefile | 28 ++---------------- examples/qos_meter/Makefile | 28 ++---------------- examples/qos_sched/Makefile | 31 ++------------------ examples/rxtx_callbacks/Makefile | 31 ++------------------ examples/service_cores/Makefile | 28 ++---------------- examples/skeleton/Makefile | 29 ++----------------- examples/tep_termination/Makefile | 27 ++---------------- examples/timer/Makefile | 28 ++---------------- examples/vdpa/Makefile | 32 ++------------------- examples/vhost/Makefile | 30 ++----------------- examples/vhost_blk/Makefile | 31 ++------------------ examples/vhost_crypto/Makefile | 31 ++------------------ examples/vmdq/Makefile | 23 ++------------- examples/vmdq_dcb/Makefile | 31 ++------------------ 43 files changed, 129 insertions(+), 1078 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 3c8eb75a4e..2f156736d1 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -8,7 +8,9 @@ APP = bbdev SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 4e4289e151..4e560f574c 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -8,7 +8,9 @@ APP = bond_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,33 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -LDLIBS += -lrte_pmd_bond -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 7325097722..d8f51fb39b 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -8,7 +8,9 @@ APP = cmdline SRCS-y := main.c commands.c parse_obj_list.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -# binary name -APP = cmdline - -# all source are stored in SRCS-y -SRCS-y := main.c commands.c parse_obj_list.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 6e3fef9813..4116064581 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -8,7 +8,9 @@ APP = distributor_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,29 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 95a8d0884a..05c6f865ad 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -10,7 +10,9 @@ SRCS-y += pipeline_worker_generic.c SRCS-y += pipeline_worker_tx.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index b44ca2ee62..7ba9bcfea6 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -18,7 +18,9 @@ SRCS-y += fips_validation_xts.c SRCS-y += main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -47,33 +49,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -INC += $(sort $(wildcard *.h)) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 161d576b60..4c215daf1b 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -8,7 +8,9 @@ APP = flow_classify SRCS-y := flow_classify.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 010a1383e2..0577e52985 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -6,7 +6,9 @@ APP = flow SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -35,22 +37,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 94a1074cf6..2eef6e4527 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -8,7 +8,9 @@ APP = helloworld SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile index 86308854ea..9645c27d2f 100644 --- a/examples/ioat/Makefile +++ b/examples/ioat/Makefile @@ -8,7 +8,9 @@ APP = ioatfwd SRCS-y := ioatfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 3f4db3f59d..f6baf635bb 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -9,7 +9,9 @@ APP = ip_fragmentation SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,28 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 1116bb6c18..d25e39a464 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -21,7 +21,9 @@ SRCS-y += tmgr.c SRCS-y += cryptodev.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -57,35 +59,3 @@ build: clean: rm -f build/$(APP)* build/*.o test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -INC += $(sort $(wildcard *.h)) - -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := $(SRCS-y) - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index be9e541bd6..479b802907 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -9,7 +9,9 @@ APP = ip_reassembly SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index b5ccbca858..5e6cb51eac 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -23,7 +23,9 @@ SRCS-y += flow.c CFLAGS += -gdwarf-2 # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -54,35 +56,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -$(error "RTE_LIBRTE_IPSEC is required to build ipsec-secgw") -endif -endif - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -gdwarf-2 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_sa.o += -diag-disable=vec -endif - -ifeq ($(DEBUG),1) -CFLAGS += -DIPSEC_DEBUG -fstack-protector-all -O0 -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index 0ed78c1cc2..fb1ebdd433 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -9,7 +9,9 @@ APP = ipv4_multicast SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,28 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 8fcb67c619..fa9fa85319 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -8,7 +8,9 @@ APP = kni SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,26 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index d767a10d7d..c5f82fb548 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-cat SRCS-y := l2fwd-cat.c cat.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,37 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -ifeq ($(PQOS_INSTALL_PATH),) -$(error "Please define PQOS_INSTALL_PATH environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -CFLAGS += -I$(PQOS_INSTALL_PATH)/../include - -LDLIBS += -L$(PQOS_INSTALL_PATH) -LDLIBS += -lpqos - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index cdbb91a1e6..4953ee2b95 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-crypto SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile index ddee388ae6..109b7caa4e 100644 --- a/examples/l2fwd-event/Makefile +++ b/examples/l2fwd-event/Makefile @@ -14,7 +14,9 @@ SRCS-y += l2fwd_event_generic.c SRCS-y += l2fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -43,21 +45,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index bdb83c3e1c..d3ff2d3ee9 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-jobstats SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 9fd9db4974..c327efab36 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -8,7 +8,9 @@ APP = l2fwd-keepalive SRCS-y := main.c shm.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 15105ac57e..b180deb862 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -8,7 +8,9 @@ APP = l2fwd SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,22 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Add flag to allow experimental API as l2fwd uses rte_ethdev_set_ptype API -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 6644a2cf1e..eeb6288dae 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-acl SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-graph/Makefile b/examples/l3fwd-graph/Makefile index f3cf275ece..368ac21147 100644 --- a/examples/l3fwd-graph/Makefile +++ b/examples/l3fwd-graph/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-graph SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index ac1ccdcf61..d69854c9f8 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -8,7 +8,9 @@ APP = l3fwd-power SRCS-y := main.c perf_core.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,35 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lm -lrte_telemetry - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -endif diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index b25a515813..d87eafcd0c 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c SRCS-y += l3fwd_event_generic.c l3fwd_event_internal_port.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,22 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(USER_FLAGS) -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index f16916faa9..b9b02124a4 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -8,7 +8,9 @@ APP = link_status_interrupt SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile index 81ec6017f5..4675570fd2 100644 --- a/examples/ntb/Makefile +++ b/examples/ntb/Makefile @@ -8,8 +8,9 @@ APP = ntb_fwd SRCS-y := ntb_fwd.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,30 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared rmdir --ignore-fail-on-non-empty build - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) -$(info This application can only operate in a linuxapp environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -O2 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index f99b69dc25..e8d6c57b72 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -8,7 +8,9 @@ APP = packet_ordering SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,21 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index a9555fc66a..86059d8b28 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -8,7 +8,9 @@ APP = ptpclient SRCS-y := ptpclient.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 165e07ee25..7a53818296 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -8,7 +8,9 @@ APP = qos_meter SRCS-y := main.c rte_policer.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -39,27 +41,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 0dd7d91055..408074a9f5 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -8,7 +8,9 @@ APP = qos_sched SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index 10e5f14d5c..bac3015d34 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -8,7 +8,9 @@ APP = rxtx_callbacks SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) - -# rte_eth_read_clock is experimental -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index e742d88f61..beb7ea0b82 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -8,7 +8,9 @@ APP = service_cores SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index 5f5acf7159..ca52abba42 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -8,7 +8,9 @@ APP = basicfwd SRCS-y := basicfwd.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,28 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -EXTRA_CFLAGS += -O3 -g -Wfatal-errors - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 548ca3cee3..443bcb190e 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -8,7 +8,9 @@ APP = tep_termination SRCS-y := main.c vxlan_setup.c vxlan.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,26 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/timer/Makefile b/examples/timer/Makefile index b40b65995e..0f6523afa6 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -8,7 +8,9 @@ APP = timer SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,27 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index bc0b6793e6..c4b2184ead 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,31 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -D_GNU_SOURCE -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # linuxapp - -endif # pkg-config diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index ef6f3550f3..cec59d0e0f 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -8,7 +8,9 @@ APP = vhost-switch SRCS-y := main.c virtio_net.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -41,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile index 3952791784..792591386e 100644 --- a/examples/vhost_blk/Makefile +++ b/examples/vhost_blk/Makefile @@ -8,8 +8,9 @@ APP = vhost-blk SRCS-y := blk.c vhost_blk.c vhost_blk_compat.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -42,29 +43,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif -endif diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index 28e3e4de74..27abd91998 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -9,7 +9,9 @@ SRCS-y := main.c CFLAGS += -DALLOW_EXPERIMENTAL_API # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -38,30 +40,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -else - -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # Linux - -endif # pkg-config diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index b73373d3f5..de527281eb 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -8,7 +8,9 @@ APP = vmdq_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,22 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -EXTRA_CFLAGS += -O3 - -include $(RTE_SDK)/mk/rte.extapp.mk -endif diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 8d8baf729b..9c9049d85e 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -8,7 +8,9 @@ APP = vmdq_dcb_app SRCS-y := main.c # Build using pkg-config variables if possible -ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif all: shared .PHONY: shared static @@ -37,30 +39,3 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared test -d build && rmdir -p build || true - -else # Build using legacy build system - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_main.o += -diag-disable=vec -endif -EXTRA_CFLAGS += -O3 -g - -include $(RTE_SDK)/mk/rte.extapp.mk -endif -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 03/31] examples/ka-agent: convert to pkg-config-based build 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 01/31] doc: build without using make Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 02/31] examples: remove legacy sections of makefiles Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 04/31] examples/server_node_efd: " Thomas Monjalon ` (29 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/l2fwd-keepalive/ka-agent/Makefile | 51 ++++++++++++++++------ 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile index 8d5061b178..700137c2e2 100644 --- a/examples/l2fwd-keepalive/ka-agent/Makefile +++ b/examples/l2fwd-keepalive/ka-agent/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = ka-agent @@ -16,7 +7,39 @@ APP = ka-agent # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../ -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt -include $(RTE_SDK)/mk/rte.extapp.mk +CFLAGS += -I.. + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +LDFLAGS += -lpthread -lrt + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 04/31] examples/server_node_efd: convert to pkg-config-based build 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (2 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 03/31] examples/ka-agent: convert to pkg-config-based build Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 05/31] examples/performance-thread: " Thomas Monjalon ` (28 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/server_node_efd/Makefile | 18 +++----- examples/server_node_efd/node/Makefile | 46 ++++++++++++++------ examples/server_node_efd/server/Makefile | 53 +++++++++++++++--------- 3 files changed, 73 insertions(+), 44 deletions(-) diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile index cc2ea8b566..e4a4a94a79 100644 --- a/examples/server_node_efd/Makefile +++ b/examples/server_node_efd/Makefile @@ -1,16 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := node server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/server_node_efd/node/Makefile b/examples/server_node_efd/node/Makefile index ecc551e1d6..a4efef42dc 100644 --- a/examples/server_node_efd/node/Makefile +++ b/examples/server_node_efd/node/Makefile @@ -1,12 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = node @@ -14,8 +7,37 @@ APP = node # all source are stored in SRCS-y SRCS-y := node.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared -include $(RTE_SDK)/mk/rte.extapp.mk +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index acbd12ae23..106e1abd74 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -1,19 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = server @@ -21,10 +7,37 @@ APP = server # all source are stored in SRCS-y SRCS-y := main.c init.c args.c -INC := $(sort $(wildcard *.h)) +CFLAGS += -I../shared -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 05/31] examples/performance-thread: convert to pkg-config-based build 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (3 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 04/31] examples/server_node_efd: " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 06/31] examples/multi_process: " Thomas Monjalon ` (27 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- examples/performance-thread/Makefile | 21 +++---- examples/performance-thread/common/common.mk | 6 +- .../performance-thread/l3fwd-thread/Makefile | 47 +++++++++++----- .../performance-thread/pthread_shim/Makefile | 56 +++++++++++++------ 4 files changed, 83 insertions(+), 47 deletions(-) diff --git a/examples/performance-thread/Makefile b/examples/performance-thread/Makefile index 08158914c3..ef88722d3c 100644 --- a/examples/performance-thread/Makefile +++ b/examples/performance-thread/Makefile @@ -1,21 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := l3fwd-thread pthread_shim -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) $(CONFIG_RTE_ARCH_ARM64)),) +ifeq ($(filter $(shell uname -m),x86_64 arm64),) $(error This application is only supported for x86_64 and arm64 targets) endif -DIRS-y += l3fwd-thread -DIRS-y += pthread_shim - - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/performance-thread/common/common.mk b/examples/performance-thread/common/common.mk index 5e2b18a9ff..a33e2ab038 100644 --- a/examples/performance-thread/common/common.mk +++ b/examples/performance-thread/common/common.mk @@ -8,9 +8,9 @@ MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))) -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) +ifeq ($(shell uname -m),x86_64) ARCH_PATH += $(MKFILE_PATH)/arch/x86 -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) +else ifeq ($(shell uname -m),arm64) ARCH_PATH += $(MKFILE_PATH)/arch/arm64 endif @@ -18,4 +18,4 @@ VPATH := $(MKFILE_PATH) $(ARCH_PATH) SRCS-y += lthread.c lthread_sched.c lthread_cond.c lthread_tls.c lthread_mutex.c lthread_diag.c ctx.c -INCLUDES += -I$(MKFILE_PATH) -I$(ARCH_PATH) +CFLAGS += -I$(MKFILE_PATH) -I$(ARCH_PATH) diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile index c6cf05a438..ca1a5d087e 100644 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ b/examples/performance-thread/l3fwd-thread/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = l3fwd-thread @@ -16,9 +7,39 @@ APP = l3fwd-thread # all source are stored in SRCS-y SRCS-y := main.c -include $(RTE_SDK)/examples/performance-thread/common/common.mk +include ../common/common.mk -CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -include $(RTE_SDK)/mk/rte.extapp.mk +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/performance-thread/pthread_shim/Makefile b/examples/performance-thread/pthread_shim/Makefile index cdadf2cb77..6b19ff63fe 100644 --- a/examples/performance-thread/pthread_shim/Makefile +++ b/examples/performance-thread/pthread_shim/Makefile @@ -1,33 +1,55 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = lthread_pthread_shim # all source are stored in SRCS-y -SRCS-y := main.c pthread_shim.c -INCLUDES := -I$(RTE_SDK)/$(RTE_TARGET)/include -I$(SRCDIR) -include $(RTE_SDK)/examples/performance-thread/common/common.mk +SRCS-y := main.c pthread_shim.c + +include ../common/common.mk -CFLAGS += -g -O3 $(USER_FLAGS) $(INCLUDES) -CFLAGS += $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -D_GNU_SOURCE +LDFLAGS += "-Wl,--copy-dt-needed-entries" + +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) LDFLAGS += -lpthread +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + # workaround for a gcc bug with noreturn attribute # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell gcc -dumpversion),-gt 0) CFLAGS_main.o += -Wno-return-type endif -include $(RTE_SDK)/mk/rte.extapp.mk +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 06/31] examples/multi_process: convert to pkg-config-based build 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (4 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 05/31] examples/performance-thread: " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 07/31] examples/vm_power: " Thomas Monjalon ` (26 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Bruce Richardson <bruce.richardson@intel.com> Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/multi_process/Makefile | 21 ++------ .../multi_process/client_server_mp/Makefile | 19 ++----- .../client_server_mp/mp_client/Makefile | 44 +++++++++++---- .../client_server_mp/mp_server/Makefile | 53 +++++++++++-------- examples/multi_process/hotplug_mp/Makefile | 46 +++++++++++----- examples/multi_process/simple_mp/Makefile | 44 ++++++++++----- examples/multi_process/symmetric_mp/Makefile | 44 ++++++++++----- 7 files changed, 168 insertions(+), 103 deletions(-) diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index 7f7e68d912..f0a999745a 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -1,18 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := client_server_mp hotplug_mp simple_mp symmetric_mp -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index fe7a8af605..e8debdfd9a 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -1,16 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := mp_client mp_server -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile index 7c447feba3..b723e545b7 100644 --- a/examples/multi_process/client_server_mp/mp_client/Makefile +++ b/examples/multi_process/client_server_mp/mp_client/Makefile @@ -1,21 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = mp_client # all source are stored in SRCS-y SRCS-y := client.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared -include $(RTE_SDK)/mk/rte.extapp.mk +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index 50ebf1d7da..f49260a256 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -1,34 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - # binary name APP = mp_server # all source are stored in SRCS-y SRCS-y := main.c init.c args.c -INC := $(sort $(wildcard *.h)) +CFLAGS += -I../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -# for newer gcc, e.g. 4.4, no-strict-aliasing may not be necessary -# and so the next line can be removed in those cases. -EXTRA_CFLAGS += -fno-strict-aliasing +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -include $(RTE_SDK)/mk/rte.extapp.mk +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile index 1fd7aa085c..2c023a73d8 100644 --- a/examples/multi_process/hotplug_mp/Makefile +++ b/examples/multi_process/hotplug_mp/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2014 Intel Corporation # binary name APP = hotplug_mp @@ -16,8 +7,35 @@ APP = hotplug_mp # all source are stored in SRCS-y SRCS-y := main.c commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile index f88b499bdc..410f8b5368 100644 --- a/examples/multi_process/simple_mp/Makefile +++ b/examples/multi_process/simple_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = simple_mp # all source are stored in SRCS-y SRCS-y := main.c mp_commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile index b7544489bb..df69ecabe7 100644 --- a/examples/multi_process/symmetric_mp/Makefile +++ b/examples/multi_process/symmetric_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = symmetric_mp # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 07/31] examples/vm_power: convert to pkg-config-based build 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (5 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 06/31] examples/multi_process: " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 08/31] examples/ethtool: " Thomas Monjalon ` (25 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Bruce Richardson <bruce.richardson@intel.com> Convert the makefiles to build using pkg-config rather than the old build system. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/vm_power_manager/Makefile | 76 ++++++++++---------- examples/vm_power_manager/guest_cli/Makefile | 50 ++++++++----- 2 files changed, 67 insertions(+), 59 deletions(-) diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile index 65c2ad179e..87b9744d8c 100644 --- a/examples/vm_power_manager/Makefile +++ b/examples/vm_power_manager/Makefile @@ -1,65 +1,61 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2020 Intel Corporation -ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -$(error vm_power_manager requires libvirt >= 0.9.3) -else - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = vm_power_mgr # all source are stored in SRCS-y SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c SRCS-y += channel_monitor.c parse.c -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) +ifeq ($(shell uname -m),x86_64) SRCS-y += oob_monitor_x86.c else SRCS-y += oob_monitor_nop.c endif -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) -LDLIBS += -lvirt +PKGCONF ?= pkg-config -JANSSON := $(shell pkg-config --exists jansson; echo $$?) +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +ifneq ($(shell $(PKGCONF) --atleast-version=0.9.3 libvirt; echo $$?), 0) +$(error vm_power_manager requires libvirt >= 0.9.3) +endif +LDFLAGS += $(shell $(PKGCONF) --libs libvirt) + +JANSSON := $(shell $(PKGCONF) --exists jansson; echo $$?) ifeq ($(JANSSON), 0) -LDLIBS += $(shell pkg-config --libs jansson) +LDFLAGS += $(shell $(PKGCONF) --libs jansson) CFLAGS += -DUSE_JANSSON endif -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) +# for shared library builds, we need to explicitly link these PMDs +LDFLAGS_SHARED += -lrte_pmd_ixgbe -lrte_pmd_i40e -lrte_pmd_bnxt -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e -endif +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif +build: + @mkdir -p $@ -endif - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -endif - -include $(RTE_SDK)/mk/rte.extapp.mk - -endif # libvirt check +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/vm_power_manager/guest_cli/Makefile b/examples/vm_power_manager/guest_cli/Makefile index 67cf081936..b84deec574 100644 --- a/examples/vm_power_manager/guest_cli/Makefile +++ b/examples/vm_power_manager/guest_cli/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = guest_vm_power_mgr @@ -16,14 +7,35 @@ APP = guest_vm_power_mgr # all source are stored in SRCS-y SRCS-y := main.c vm_power_cli_guest.c parse.c -CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 08/31] examples/ethtool: convert to pkg-config-based build 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (6 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 07/31] examples/vm_power: " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 09/31] examples: remove old build system references Thomas Monjalon ` (24 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Bruce Richardson <bruce.richardson@intel.com> Remove references to the old DPDK build system from the makefiles, and use pkg-config provided flags instead. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/ethtool/Makefile | 26 +++-------- examples/ethtool/ethtool-app/Makefile | 56 +++++++++++++++--------- examples/ethtool/lib/Makefile | 62 ++++++++++++++++----------- 3 files changed, 79 insertions(+), 65 deletions(-) diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile index d3b97bb50b..a1a80c44e6 100644 --- a/examples/ethtool/Makefile +++ b/examples/ethtool/Makefile @@ -1,23 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := lib ethtool-app -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -else - -DIRS-y += lib ethtool-app -endif - -DEPDIRS-ethtool-app := lib - -include $(RTE_SDK)/mk/rte.extsubdir.mk +ethtool-app: lib +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile index 20ac0d3240..5ebeb200a8 100644 --- a/examples/ethtool/ethtool-app/Makefile +++ b/examples/ethtool/ethtool-app/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2010-2020 Intel Corporation # binary name APP = ethtool @@ -16,17 +7,40 @@ APP = ethtool # all source are stored in SRCS-y SRCS-y := main.c ethapp.c -CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../lib +LDFLAGS += -L../lib/build +LDFLAGS_STATIC = -l:librte_ethtool.a +LDFLAGS_SHARED = -lrte_ethtool -LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib -LDLIBS += -lrte_ethtool - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -include $(RTE_SDK)/mk/rte.extapp.mk +all: shared +.PHONY: shared static +shared: build/$(APP)-shared + ln -sf $(APP)-shared build/$(APP) +static: build/$(APP)-static + ln -sf $(APP)-static build/$(APP) + +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED += $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC += $(shell $(PKGCONF) --static --libs libdpdk) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile index 6494741270..3bc2b9d8ba 100644 --- a/examples/ethtool/lib/Makefile +++ b/examples/ethtool/lib/Makefile @@ -1,37 +1,49 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation +# Copyright(c) 2015-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif +ifneq ($(shell uname),Linux) +$(error This application can only operate in a linux environment) +endif + +PKGCONF ?= pkg-config # library name -LIB = librte_ethtool.a - -LIBABIVER := 0.1 - -# all source are stored in SRC-Y -SRCS-y := rte_ethtool.c +LIB = librte_ethtool.so +LIB_STATIC = librte_ethtool.a +SRCS = rte_ethtool.c CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) +CFLAGS += -fPIC CFLAGS += -DALLOW_EXPERIMENTAL_API -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif +PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS += -Wl,--no-undefined $(LDFLAGS_SHARED) + +# check for ixgbe by grepping pre-processor output +ifneq ($(shell $(CC) $(CFLAGS) -dM -E - < /dev/null | grep IXGBE),) +LDFLAGS += -lrte_pmd_ixgbe endif -LDLIBS += -lrte_eal -lrte_ethdev -include $(RTE_SDK)/mk/rte.extlib.mk +.PHONY: all clean static shared +all shared: build/$(LIB) +static: build/$(LIB_STATIC) + +clean: + rm -f build/$(LIB) + test -d build && rmdir -p build || true + +build: + @mkdir -p $@ + +build/%.so: $(SRCS) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) -o $@ -shared $(SRCS) $(LDFLAGS) + +build/%.a: $(SRCS) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) -c $(SRCS) -o build/$(SRCS).o + $(AR) -cr $@ build/*.o -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 09/31] examples: remove old build system references 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (7 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 08/31] examples/ethtool: " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 10/31] build: create dummy Makefile Thomas Monjalon ` (23 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Remove the references to RTE_SDK and RTE_TARGET environment variables from the build instructions in the comments of the various BPF files, and in the ipsec-secgw common definition script. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- examples/bpf/t2.c | 6 ++++-- examples/bpf/t3.c | 10 ++++++---- examples/ipsec-secgw/test/common_defs.sh | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/bpf/t2.c b/examples/bpf/t2.c index 9878eaf7bd..b9bce746c0 100644 --- a/examples/bpf/t2.c +++ b/examples/bpf/t2.c @@ -9,8 +9,10 @@ * (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED). * Doesn't touch contents of packet data. * To compile: - * clang -O2 -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * clang -O2 -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file, e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include <stdint.h> diff --git a/examples/bpf/t3.c b/examples/bpf/t3.c index f58ff64b3b..66faf80cc5 100644 --- a/examples/bpf/t3.c +++ b/examples/bpf/t3.c @@ -8,13 +8,15 @@ * Dump the mbuf into stdout if it is an ARP packet (aka tcpdump 'arp'). * * To compile on x86: - * clang -O2 -U __GNUC__ -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t3.c + * clang -O2 -U __GNUC__ -target bpf -Wno-int-to-void-pointer-cast -c t3.c * * To compile on ARM: - * clang -O2 -I/usr/include/aarch64-linux-gnu \ - * -I${RTE_SDK}/${RTE_TARGET}/include -target bpf \ + * clang -O2 -I/usr/include/aarch64-linux-gnu -target bpf \ * -Wno-int-to-void-pointer-cast -c t3.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file to above commands, + * e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include <stdint.h> diff --git a/examples/ipsec-secgw/test/common_defs.sh b/examples/ipsec-secgw/test/common_defs.sh index df680805b8..f22eb3ab12 100644 --- a/examples/ipsec-secgw/test/common_defs.sh +++ b/examples/ipsec-secgw/test/common_defs.sh @@ -34,8 +34,8 @@ LOCAL_IPV4=192.168.31.92 REMOTE_IPV6=fd12:3456:789a:0031:0000:0000:0000:0014 LOCAL_IPV6=fd12:3456:789a:0031:0000:0000:0000:0092 -DPDK_PATH=${RTE_SDK:-${PWD}} -DPDK_BUILD=${RTE_TARGET:-x86_64-native-linux-gcc} +DPDK_PATH=${PWD} +DPDK_BUILD="build" DPDK_VARS="" # by default ipsec-secgw can't deal with multi-segment packets -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 10/31] build: create dummy Makefile 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (8 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 09/31] examples: remove old build system references Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 11/31] build: remove makefiles Thomas Monjalon ` (22 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Bruce Richardson <bruce.richardson@intel.com> This patch modifies the root Makefile to act as a dummy Makefile for when the make support is removed from DPDK in subsequent patches. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 571277aa5a..4a9c17a9de 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2020 Intel Corporation -.error Error please compile using GNU Make (gmake) +.PHONY: all +all: + @echo "To build DPDK please use meson and ninja as described at" + @echo " https://core.dpdk.org/doc/quick-start/" -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 11/31] build: remove makefiles 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (9 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 10/31] build: create dummy Makefile Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 12/31] buildtools: remove scripts used only with make Thomas Monjalon ` (21 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Ruifeng Wang From: Ciara Power <ciara.power@intel.com> A decision was made [1] to no longer support Make in DPDK, this patch removes all Makefiles that do not make use of pkg-config, along with the mk directory previously used by make. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com> --- GNUmakefile | 17 - MAINTAINERS | 11 +- app/Makefile | 34 -- app/pdump/Makefile | 18 - app/proc-info/Makefile | 14 - app/test-acl/Makefile | 17 - app/test-bbdev/Makefile | 30 -- app/test-cmdline/Makefile | 24 - app/test-compress-perf/Makefile | 19 - app/test-crypto-perf/Makefile | 28 - app/test-eventdev/Makefile | 32 -- app/test-fib/Makefile | 18 - app/test-flow-perf/Makefile | 26 - app/test-pipeline/Makefile | 33 -- app/test-pmd/Makefile | 73 --- app/test-regex/Makefile | 13 - app/test-sad/Makefile | 17 - app/test/Makefile | 310 ----------- buildtools/Makefile | 9 - buildtools/pmdinfogen/Makefile | 20 - devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 315 ----------- doc/build-sdk-quick.txt | 34 -- doc/guides/contributing/coding_style.rst | 48 +- doc/guides/contributing/patches.rst | 49 -- doc/guides/freebsd_gsg/intro.rst | 4 +- doc/guides/linux_gsg/build_dpdk.rst | 68 +-- doc/guides/linux_gsg/build_sample_apps.rst | 51 +- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 48 +- doc/guides/linux_gsg/intro.rst | 2 +- doc/guides/linux_gsg/sys_reqs.rst | 10 +- doc/guides/prog_guide/build_app.rst | 56 +- .../prog_guide/dev_kit_build_system.rst | 331 ------------ .../prog_guide/dev_kit_root_make_help.rst | 188 ------- .../prog_guide/ext_app_lib_make_help.rst | 98 ---- doc/guides/prog_guide/index.rst | 3 - doc/guides/prog_guide/intro.rst | 2 +- doc/guides/prog_guide/overview.rst | 12 +- doc/guides/prog_guide/source_org.rst | 23 +- doc/guides/rel_notes/deprecation.rst | 7 - drivers/Makefile | 34 -- drivers/baseband/Makefile | 18 - drivers/baseband/fpga_5gnr_fec/Makefile | 28 - drivers/baseband/fpga_lte_fec/Makefile | 25 - drivers/baseband/null/Makefile | 21 - drivers/baseband/turbo_sw/Makefile | 52 -- drivers/bus/Makefile | 15 - drivers/bus/dpaa/Makefile | 48 -- drivers/bus/fslmc/Makefile | 47 -- drivers/bus/ifpga/Makefile | 28 - drivers/bus/pci/Makefile | 33 -- drivers/bus/pci/bsd/Makefile | 4 - drivers/bus/pci/linux/Makefile | 6 - drivers/bus/vdev/Makefile | 27 - drivers/bus/vmbus/Makefile | 33 -- drivers/bus/vmbus/linux/Makefile | 3 - drivers/common/Makefile | 39 -- drivers/common/cpt/Makefile | 24 - drivers/common/dpaax/Makefile | 30 -- drivers/common/iavf/Makefile | 27 - drivers/common/mlx5/Makefile | 404 -------------- drivers/common/mvep/Makefile | 35 -- drivers/common/octeontx/Makefile | 22 - drivers/common/octeontx2/Makefile | 39 -- drivers/common/qat/Makefile | 74 --- drivers/compress/Makefile | 10 - drivers/compress/isal/Makefile | 27 - drivers/compress/octeontx/Makefile | 26 - drivers/compress/zlib/Makefile | 25 - drivers/crypto/Makefile | 31 -- drivers/crypto/aesni_gcm/Makefile | 43 -- drivers/crypto/aesni_mb/Makefile | 42 -- drivers/crypto/armv8/Makefile | 36 -- drivers/crypto/caam_jr/Makefile | 39 -- drivers/crypto/ccp/Makefile | 32 -- drivers/crypto/dpaa2_sec/Makefile | 45 -- drivers/crypto/dpaa_sec/Makefile | 38 -- drivers/crypto/kasumi/Makefile | 42 -- drivers/crypto/mvsam/Makefile | 40 -- drivers/crypto/nitrox/Makefile | 30 -- drivers/crypto/null/Makefile | 27 - drivers/crypto/octeontx/Makefile | 36 -- drivers/crypto/octeontx2/Makefile | 49 -- drivers/crypto/openssl/Makefile | 26 - drivers/crypto/scheduler/Makefile | 34 -- drivers/crypto/snow3g/Makefile | 43 -- drivers/crypto/virtio/Makefile | 33 -- drivers/crypto/zuc/Makefile | 42 -- drivers/event/Makefile | 20 - drivers/event/dpaa/Makefile | 39 -- drivers/event/dpaa2/Makefile | 41 -- drivers/event/dsw/Makefile | 26 - drivers/event/octeontx/Makefile | 51 -- drivers/event/octeontx2/Makefile | 47 -- drivers/event/opdl/Makefile | 29 - drivers/event/skeleton/Makefile | 24 - drivers/event/sw/Makefile | 29 - drivers/mempool/Makefile | 18 - drivers/mempool/bucket/Makefile | 25 - drivers/mempool/dpaa/Makefile | 30 -- drivers/mempool/dpaa2/Makefile | 31 -- drivers/mempool/octeontx/Makefile | 39 -- drivers/mempool/octeontx2/Makefile | 40 -- drivers/mempool/ring/Makefile | 19 - drivers/mempool/stack/Makefile | 22 - drivers/net/Makefile | 84 --- drivers/net/af_packet/Makefile | 27 - drivers/net/af_xdp/Makefile | 26 - drivers/net/ark/Makefile | 39 -- drivers/net/atlantic/Makefile | 34 -- drivers/net/avp/Makefile | 29 - drivers/net/axgbe/Makefile | 33 -- drivers/net/bnx2x/Makefile | 33 -- drivers/net/bnxt/Makefile | 63 --- drivers/net/bnxt/hcapi/Makefile | 5 - drivers/net/bnxt/tf_core/Makefile | 31 -- drivers/net/bnxt/tf_ulp/Makefile | 20 - drivers/net/bonding/Makefile | 36 -- drivers/net/cxgbe/Makefile | 57 -- drivers/net/dpaa/Makefile | 41 -- drivers/net/dpaa2/Makefile | 47 -- drivers/net/e1000/Makefile | 79 --- drivers/net/ena/Makefile | 30 -- drivers/net/enetc/Makefile | 23 - drivers/net/enic/Makefile | 68 --- drivers/net/failsafe/Makefile | 43 -- drivers/net/fm10k/Makefile | 77 --- drivers/net/hinic/Makefile | 67 --- drivers/net/hns3/Makefile | 42 -- drivers/net/i40e/Makefile | 112 ---- drivers/net/iavf/Makefile | 54 -- drivers/net/ice/Makefile | 96 ---- drivers/net/igc/Makefile | 40 -- drivers/net/ionic/Makefile | 31 -- drivers/net/ipn3ke/Makefile | 38 -- drivers/net/ixgbe/Makefile | 110 ---- drivers/net/kni/Makefile | 30 -- drivers/net/liquidio/Makefile | 30 -- drivers/net/memif/Makefile | 26 - drivers/net/mlx4/Makefile | 142 ----- drivers/net/mlx5/Makefile | 82 --- drivers/net/mvneta/Makefile | 39 -- drivers/net/mvpp2/Makefile | 42 -- drivers/net/netvsc/Makefile | 21 - drivers/net/nfb/Makefile | 40 -- drivers/net/nfp/Makefile | 41 -- drivers/net/null/Makefile | 24 - drivers/net/octeontx/Makefile | 53 -- drivers/net/octeontx2/Makefile | 63 --- drivers/net/pcap/Makefile | 32 -- drivers/net/pfe/Makefile | 31 -- drivers/net/qede/Makefile | 109 ---- drivers/net/ring/Makefile | 29 - drivers/net/sfc/Makefile | 133 ----- drivers/net/softnic/Makefile | 54 -- drivers/net/szedata2/Makefile | 30 -- drivers/net/tap/Makefile | 97 ---- drivers/net/thunderx/Makefile | 41 -- drivers/net/vdev_netvsc/Makefile | 30 -- drivers/net/vhost/Makefile | 31 -- drivers/net/virtio/Makefile | 82 --- drivers/net/vmxnet3/Makefile | 53 -- drivers/raw/Makefile | 18 - drivers/raw/dpaa2_cmdif/Makefile | 35 -- drivers/raw/dpaa2_qdma/Makefile | 36 -- drivers/raw/ifpga/Makefile | 39 -- drivers/raw/ifpga/base/Makefile | 32 -- drivers/raw/ioat/Makefile | 28 - drivers/raw/ntb/Makefile | 28 - drivers/raw/octeontx2_dma/Makefile | 34 -- drivers/raw/octeontx2_ep/Makefile | 42 -- drivers/raw/skeleton/Makefile | 26 - drivers/regex/Makefile | 8 - drivers/regex/mlx5/Makefile | 41 -- drivers/vdpa/Makefile | 12 - drivers/vdpa/ifc/Makefile | 33 -- drivers/vdpa/mlx5/Makefile | 58 -- examples/Makefile | 90 ---- kernel/Makefile | 9 - kernel/freebsd/Makefile | 9 - kernel/freebsd/contigmem/Makefile | 24 - kernel/freebsd/nic_uio/Makefile | 24 - kernel/linux/Makefile | 9 - kernel/linux/igb_uio/Makefile | 25 - kernel/linux/kni/Makefile | 34 -- lib/Makefile | 138 ----- lib/librte_acl/Makefile | 65 --- lib/librte_bbdev/Makefile | 25 - lib/librte_bitratestats/Makefile | 20 - lib/librte_bpf/Makefile | 40 -- lib/librte_cfgfile/Makefile | 26 - lib/librte_cmdline/Makefile | 34 -- lib/librte_compressdev/Makefile | 27 - lib/librte_cryptodev/Makefile | 30 -- lib/librte_distributor/Makefile | 28 - lib/librte_eal/Makefile | 12 - lib/librte_eal/freebsd/Makefile | 104 ---- lib/librte_eal/include/Makefile | 19 - lib/librte_eal/linux/Makefile | 112 ---- lib/librte_efd/Makefile | 21 - lib/librte_ethdev/Makefile | 46 -- lib/librte_eventdev/Makefile | 47 -- lib/librte_fib/Makefile | 22 - lib/librte_flow_classify/Makefile | 23 - lib/librte_graph/Makefile | 28 - lib/librte_gro/Makefile | 23 - lib/librte_gso/Makefile | 25 - lib/librte_hash/Makefile | 31 -- lib/librte_ip_frag/Makefile | 27 - lib/librte_ipsec/Makefile | 29 - lib/librte_jobstats/Makefile | 21 - lib/librte_kni/Makefile | 20 - lib/librte_kvargs/Makefile | 21 - lib/librte_latencystats/Makefile | 22 - lib/librte_lpm/Makefile | 29 - lib/librte_mbuf/Makefile | 26 - lib/librte_member/Makefile | 22 - lib/librte_mempool/Makefile | 24 - lib/librte_meter/Makefile | 27 - lib/librte_metrics/Makefile | 30 -- lib/librte_net/Makefile | 25 - lib/librte_node/Makefile | 33 -- lib/librte_pci/Makefile | 19 - lib/librte_pdump/Makefile | 20 - lib/librte_pipeline/Makefile | 28 - lib/librte_port/Makefile | 59 -- lib/librte_power/Makefile | 24 - lib/librte_rawdev/Makefile | 24 - lib/librte_rcu/Makefile | 20 - lib/librte_regexdev/Makefile | 32 -- lib/librte_reorder/Makefile | 21 - lib/librte_rib/Makefile | 22 - lib/librte_ring/Makefile | 30 -- lib/librte_sched/Makefile | 29 - lib/librte_security/Makefile | 24 - lib/librte_stack/Makefile | 27 - lib/librte_table/Makefile | 59 -- lib/librte_telemetry/Makefile | 30 -- lib/librte_timer/Makefile | 20 - lib/librte_vhost/Makefile | 54 -- mk/arch/arm/rte.vars.mk | 16 - mk/arch/arm64/rte.vars.mk | 37 -- mk/arch/i686/rte.vars.mk | 36 -- mk/arch/ppc_64/rte.vars.mk | 17 - mk/arch/x86_64/rte.vars.mk | 36 -- mk/arch/x86_x32/rte.vars.mk | 40 -- mk/exec-env/bsdapp | 1 - mk/exec-env/freebsd/rte.app.mk | 8 - mk/exec-env/freebsd/rte.vars.mk | 36 -- mk/exec-env/linux/rte.app.mk | 8 - mk/exec-env/linux/rte.vars.mk | 44 -- mk/exec-env/linuxapp | 1 - mk/internal/rte.build-post.mk | 34 -- mk/internal/rte.build-pre.mk | 7 - mk/internal/rte.clean-post.mk | 34 -- mk/internal/rte.clean-pre.mk | 4 - mk/internal/rte.compile-post.mk | 5 - mk/internal/rte.compile-pre.mk | 164 ------ mk/internal/rte.extvars.mk | 55 -- mk/internal/rte.install-post.mk | 71 --- mk/internal/rte.install-pre.mk | 32 -- mk/machine/armv7a/rte.vars.mk | 36 -- mk/machine/armv8a/rte.vars.mk | 31 -- mk/machine/default/rte.vars.mk | 30 -- mk/machine/dpaa/rte.vars.mk | 37 -- mk/machine/emag/rte.vars.mk | 32 -- mk/machine/hsw/rte.vars.mk | 30 -- mk/machine/ivb/rte.vars.mk | 30 -- mk/machine/n1sdp/rte.vars.mk | 34 -- mk/machine/native/rte.vars.mk | 39 -- mk/machine/nhm/rte.vars.mk | 30 -- mk/machine/octeontx2/rte.vars.mk | 34 -- mk/machine/power8/rte.vars.mk | 30 -- mk/machine/silvermont/rte.vars.mk | 30 -- mk/machine/snb/rte.vars.mk | 30 -- mk/machine/thunderx/rte.vars.mk | 31 -- mk/machine/thunderx2/rte.vars.mk | 34 -- mk/machine/wsm/rte.vars.mk | 30 -- mk/machine/xgene1/rte.vars.mk | 31 -- mk/rte.app.mk | 509 ------------------ mk/rte.bsdmodule.mk | 89 --- mk/rte.combinedlib.mk | 30 -- mk/rte.cpuflags.mk | 124 ----- mk/rte.extapp.mk | 24 - mk/rte.extlib.mk | 26 - mk/rte.extobj.mk | 24 - mk/rte.extshared.mk | 26 - mk/rte.extsubdir.mk | 39 -- mk/rte.gnuconfigure.mk | 44 -- mk/rte.helper.mk | 10 - mk/rte.hostapp.mk | 93 ---- mk/rte.hostlib.mk | 86 --- mk/rte.install.mk | 28 - mk/rte.lib.mk | 156 ------ mk/rte.module.mk | 86 --- mk/rte.obj.mk | 82 --- mk/rte.sdkbuild.mk | 77 --- mk/rte.sdkconfig.mk | 142 ----- mk/rte.sdkdepdirs.mk | 9 - mk/rte.sdkdoc.mk | 104 ---- mk/rte.sdkexamples.mk | 50 -- mk/rte.sdkgcov.mk | 39 -- mk/rte.sdkinstall.mk | 152 ------ mk/rte.sdkroot.mk | 115 ---- mk/rte.sdktest.mk | 76 --- mk/rte.shared.mk | 108 ---- mk/rte.subdir.mk | 65 --- mk/rte.vars.mk | 102 ---- mk/target/generic/rte.app.mk | 13 - mk/target/generic/rte.vars.mk | 132 ----- mk/toolchain/clang/rte.toolchain-compat.mk | 22 - mk/toolchain/clang/rte.vars.mk | 60 --- mk/toolchain/gcc/rte.toolchain-compat.mk | 120 ----- mk/toolchain/gcc/rte.vars.mk | 109 ---- mk/toolchain/icc/rte.toolchain-compat.mk | 58 -- mk/toolchain/icc/rte.vars.mk | 62 --- 316 files changed, 26 insertions(+), 14324 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 app/Makefile delete mode 100644 app/pdump/Makefile delete mode 100644 app/proc-info/Makefile delete mode 100644 app/test-acl/Makefile delete mode 100644 app/test-bbdev/Makefile delete mode 100644 app/test-cmdline/Makefile delete mode 100644 app/test-compress-perf/Makefile delete mode 100644 app/test-crypto-perf/Makefile delete mode 100644 app/test-eventdev/Makefile delete mode 100644 app/test-fib/Makefile delete mode 100644 app/test-flow-perf/Makefile delete mode 100644 app/test-pipeline/Makefile delete mode 100644 app/test-pmd/Makefile delete mode 100644 app/test-regex/Makefile delete mode 100644 app/test-sad/Makefile delete mode 100644 app/test/Makefile delete mode 100644 buildtools/Makefile delete mode 100644 buildtools/pmdinfogen/Makefile delete mode 100755 devtools/test-build.sh delete mode 100644 doc/build-sdk-quick.txt delete mode 100644 doc/guides/prog_guide/dev_kit_build_system.rst delete mode 100644 doc/guides/prog_guide/dev_kit_root_make_help.rst delete mode 100644 doc/guides/prog_guide/ext_app_lib_make_help.rst delete mode 100644 drivers/Makefile delete mode 100644 drivers/baseband/Makefile delete mode 100644 drivers/baseband/fpga_5gnr_fec/Makefile delete mode 100644 drivers/baseband/fpga_lte_fec/Makefile delete mode 100644 drivers/baseband/null/Makefile delete mode 100644 drivers/baseband/turbo_sw/Makefile delete mode 100644 drivers/bus/Makefile delete mode 100644 drivers/bus/dpaa/Makefile delete mode 100644 drivers/bus/fslmc/Makefile delete mode 100644 drivers/bus/ifpga/Makefile delete mode 100644 drivers/bus/pci/Makefile delete mode 100644 drivers/bus/pci/bsd/Makefile delete mode 100644 drivers/bus/pci/linux/Makefile delete mode 100644 drivers/bus/vdev/Makefile delete mode 100644 drivers/bus/vmbus/Makefile delete mode 100644 drivers/bus/vmbus/linux/Makefile delete mode 100644 drivers/common/Makefile delete mode 100644 drivers/common/cpt/Makefile delete mode 100644 drivers/common/dpaax/Makefile delete mode 100644 drivers/common/iavf/Makefile delete mode 100644 drivers/common/mlx5/Makefile delete mode 100644 drivers/common/mvep/Makefile delete mode 100644 drivers/common/octeontx/Makefile delete mode 100644 drivers/common/octeontx2/Makefile delete mode 100644 drivers/common/qat/Makefile delete mode 100644 drivers/compress/Makefile delete mode 100644 drivers/compress/isal/Makefile delete mode 100644 drivers/compress/octeontx/Makefile delete mode 100644 drivers/compress/zlib/Makefile delete mode 100644 drivers/crypto/Makefile delete mode 100644 drivers/crypto/aesni_gcm/Makefile delete mode 100644 drivers/crypto/aesni_mb/Makefile delete mode 100644 drivers/crypto/armv8/Makefile delete mode 100644 drivers/crypto/caam_jr/Makefile delete mode 100644 drivers/crypto/ccp/Makefile delete mode 100644 drivers/crypto/dpaa2_sec/Makefile delete mode 100644 drivers/crypto/dpaa_sec/Makefile delete mode 100644 drivers/crypto/kasumi/Makefile delete mode 100644 drivers/crypto/mvsam/Makefile delete mode 100644 drivers/crypto/nitrox/Makefile delete mode 100644 drivers/crypto/null/Makefile delete mode 100644 drivers/crypto/octeontx/Makefile delete mode 100644 drivers/crypto/octeontx2/Makefile delete mode 100644 drivers/crypto/openssl/Makefile delete mode 100644 drivers/crypto/scheduler/Makefile delete mode 100644 drivers/crypto/snow3g/Makefile delete mode 100644 drivers/crypto/virtio/Makefile delete mode 100644 drivers/crypto/zuc/Makefile delete mode 100644 drivers/event/Makefile delete mode 100644 drivers/event/dpaa/Makefile delete mode 100644 drivers/event/dpaa2/Makefile delete mode 100644 drivers/event/dsw/Makefile delete mode 100644 drivers/event/octeontx/Makefile delete mode 100644 drivers/event/octeontx2/Makefile delete mode 100644 drivers/event/opdl/Makefile delete mode 100644 drivers/event/skeleton/Makefile delete mode 100644 drivers/event/sw/Makefile delete mode 100644 drivers/mempool/Makefile delete mode 100644 drivers/mempool/bucket/Makefile delete mode 100644 drivers/mempool/dpaa/Makefile delete mode 100644 drivers/mempool/dpaa2/Makefile delete mode 100644 drivers/mempool/octeontx/Makefile delete mode 100644 drivers/mempool/octeontx2/Makefile delete mode 100644 drivers/mempool/ring/Makefile delete mode 100644 drivers/mempool/stack/Makefile delete mode 100644 drivers/net/Makefile delete mode 100644 drivers/net/af_packet/Makefile delete mode 100644 drivers/net/af_xdp/Makefile delete mode 100644 drivers/net/ark/Makefile delete mode 100644 drivers/net/atlantic/Makefile delete mode 100644 drivers/net/avp/Makefile delete mode 100644 drivers/net/axgbe/Makefile delete mode 100644 drivers/net/bnx2x/Makefile delete mode 100644 drivers/net/bnxt/Makefile delete mode 100644 drivers/net/bnxt/hcapi/Makefile delete mode 100644 drivers/net/bnxt/tf_core/Makefile delete mode 100644 drivers/net/bnxt/tf_ulp/Makefile delete mode 100644 drivers/net/bonding/Makefile delete mode 100644 drivers/net/cxgbe/Makefile delete mode 100644 drivers/net/dpaa/Makefile delete mode 100644 drivers/net/dpaa2/Makefile delete mode 100644 drivers/net/e1000/Makefile delete mode 100644 drivers/net/ena/Makefile delete mode 100644 drivers/net/enetc/Makefile delete mode 100644 drivers/net/enic/Makefile delete mode 100644 drivers/net/failsafe/Makefile delete mode 100644 drivers/net/fm10k/Makefile delete mode 100644 drivers/net/hinic/Makefile delete mode 100644 drivers/net/hns3/Makefile delete mode 100644 drivers/net/i40e/Makefile delete mode 100644 drivers/net/iavf/Makefile delete mode 100644 drivers/net/ice/Makefile delete mode 100644 drivers/net/igc/Makefile delete mode 100644 drivers/net/ionic/Makefile delete mode 100644 drivers/net/ipn3ke/Makefile delete mode 100644 drivers/net/ixgbe/Makefile delete mode 100644 drivers/net/kni/Makefile delete mode 100644 drivers/net/liquidio/Makefile delete mode 100644 drivers/net/memif/Makefile delete mode 100644 drivers/net/mlx4/Makefile delete mode 100644 drivers/net/mlx5/Makefile delete mode 100644 drivers/net/mvneta/Makefile delete mode 100644 drivers/net/mvpp2/Makefile delete mode 100644 drivers/net/netvsc/Makefile delete mode 100644 drivers/net/nfb/Makefile delete mode 100644 drivers/net/nfp/Makefile delete mode 100644 drivers/net/null/Makefile delete mode 100644 drivers/net/octeontx/Makefile delete mode 100644 drivers/net/octeontx2/Makefile delete mode 100644 drivers/net/pcap/Makefile delete mode 100644 drivers/net/pfe/Makefile delete mode 100644 drivers/net/qede/Makefile delete mode 100644 drivers/net/ring/Makefile delete mode 100644 drivers/net/sfc/Makefile delete mode 100644 drivers/net/softnic/Makefile delete mode 100644 drivers/net/szedata2/Makefile delete mode 100644 drivers/net/tap/Makefile delete mode 100644 drivers/net/thunderx/Makefile delete mode 100644 drivers/net/vdev_netvsc/Makefile delete mode 100644 drivers/net/vhost/Makefile delete mode 100644 drivers/net/virtio/Makefile delete mode 100644 drivers/net/vmxnet3/Makefile delete mode 100644 drivers/raw/Makefile delete mode 100644 drivers/raw/dpaa2_cmdif/Makefile delete mode 100644 drivers/raw/dpaa2_qdma/Makefile delete mode 100644 drivers/raw/ifpga/Makefile delete mode 100644 drivers/raw/ifpga/base/Makefile delete mode 100644 drivers/raw/ioat/Makefile delete mode 100644 drivers/raw/ntb/Makefile delete mode 100644 drivers/raw/octeontx2_dma/Makefile delete mode 100644 drivers/raw/octeontx2_ep/Makefile delete mode 100644 drivers/raw/skeleton/Makefile delete mode 100644 drivers/regex/Makefile delete mode 100644 drivers/regex/mlx5/Makefile delete mode 100644 drivers/vdpa/Makefile delete mode 100644 drivers/vdpa/ifc/Makefile delete mode 100644 drivers/vdpa/mlx5/Makefile delete mode 100644 examples/Makefile delete mode 100644 kernel/Makefile delete mode 100644 kernel/freebsd/Makefile delete mode 100644 kernel/freebsd/contigmem/Makefile delete mode 100644 kernel/freebsd/nic_uio/Makefile delete mode 100644 kernel/linux/Makefile delete mode 100644 kernel/linux/igb_uio/Makefile delete mode 100644 kernel/linux/kni/Makefile delete mode 100644 lib/Makefile delete mode 100644 lib/librte_acl/Makefile delete mode 100644 lib/librte_bbdev/Makefile delete mode 100644 lib/librte_bitratestats/Makefile delete mode 100644 lib/librte_bpf/Makefile delete mode 100644 lib/librte_cfgfile/Makefile delete mode 100644 lib/librte_cmdline/Makefile delete mode 100644 lib/librte_compressdev/Makefile delete mode 100644 lib/librte_cryptodev/Makefile delete mode 100644 lib/librte_distributor/Makefile delete mode 100644 lib/librte_eal/Makefile delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/include/Makefile delete mode 100644 lib/librte_eal/linux/Makefile delete mode 100644 lib/librte_efd/Makefile delete mode 100644 lib/librte_ethdev/Makefile delete mode 100644 lib/librte_eventdev/Makefile delete mode 100644 lib/librte_fib/Makefile delete mode 100644 lib/librte_flow_classify/Makefile delete mode 100644 lib/librte_graph/Makefile delete mode 100644 lib/librte_gro/Makefile delete mode 100644 lib/librte_gso/Makefile delete mode 100644 lib/librte_hash/Makefile delete mode 100644 lib/librte_ip_frag/Makefile delete mode 100644 lib/librte_ipsec/Makefile delete mode 100644 lib/librte_jobstats/Makefile delete mode 100644 lib/librte_kni/Makefile delete mode 100644 lib/librte_kvargs/Makefile delete mode 100644 lib/librte_latencystats/Makefile delete mode 100644 lib/librte_lpm/Makefile delete mode 100644 lib/librte_mbuf/Makefile delete mode 100644 lib/librte_member/Makefile delete mode 100644 lib/librte_mempool/Makefile delete mode 100644 lib/librte_meter/Makefile delete mode 100644 lib/librte_metrics/Makefile delete mode 100644 lib/librte_net/Makefile delete mode 100644 lib/librte_node/Makefile delete mode 100644 lib/librte_pci/Makefile delete mode 100644 lib/librte_pdump/Makefile delete mode 100644 lib/librte_pipeline/Makefile delete mode 100644 lib/librte_port/Makefile delete mode 100644 lib/librte_power/Makefile delete mode 100644 lib/librte_rawdev/Makefile delete mode 100644 lib/librte_rcu/Makefile delete mode 100644 lib/librte_regexdev/Makefile delete mode 100644 lib/librte_reorder/Makefile delete mode 100644 lib/librte_rib/Makefile delete mode 100644 lib/librte_ring/Makefile delete mode 100644 lib/librte_sched/Makefile delete mode 100644 lib/librte_security/Makefile delete mode 100644 lib/librte_stack/Makefile delete mode 100644 lib/librte_table/Makefile delete mode 100644 lib/librte_telemetry/Makefile delete mode 100644 lib/librte_timer/Makefile delete mode 100644 lib/librte_vhost/Makefile delete mode 100644 mk/arch/arm/rte.vars.mk delete mode 100644 mk/arch/arm64/rte.vars.mk delete mode 100644 mk/arch/i686/rte.vars.mk delete mode 100644 mk/arch/ppc_64/rte.vars.mk delete mode 100644 mk/arch/x86_64/rte.vars.mk delete mode 100644 mk/arch/x86_x32/rte.vars.mk delete mode 120000 mk/exec-env/bsdapp delete mode 100644 mk/exec-env/freebsd/rte.app.mk delete mode 100644 mk/exec-env/freebsd/rte.vars.mk delete mode 100644 mk/exec-env/linux/rte.app.mk delete mode 100644 mk/exec-env/linux/rte.vars.mk delete mode 120000 mk/exec-env/linuxapp delete mode 100644 mk/internal/rte.build-post.mk delete mode 100644 mk/internal/rte.build-pre.mk delete mode 100644 mk/internal/rte.clean-post.mk delete mode 100644 mk/internal/rte.clean-pre.mk delete mode 100644 mk/internal/rte.compile-post.mk delete mode 100644 mk/internal/rte.compile-pre.mk delete mode 100644 mk/internal/rte.extvars.mk delete mode 100644 mk/internal/rte.install-post.mk delete mode 100644 mk/internal/rte.install-pre.mk delete mode 100644 mk/machine/armv7a/rte.vars.mk delete mode 100644 mk/machine/armv8a/rte.vars.mk delete mode 100644 mk/machine/default/rte.vars.mk delete mode 100644 mk/machine/dpaa/rte.vars.mk delete mode 100644 mk/machine/emag/rte.vars.mk delete mode 100644 mk/machine/hsw/rte.vars.mk delete mode 100644 mk/machine/ivb/rte.vars.mk delete mode 100644 mk/machine/n1sdp/rte.vars.mk delete mode 100644 mk/machine/native/rte.vars.mk delete mode 100644 mk/machine/nhm/rte.vars.mk delete mode 100644 mk/machine/octeontx2/rte.vars.mk delete mode 100644 mk/machine/power8/rte.vars.mk delete mode 100644 mk/machine/silvermont/rte.vars.mk delete mode 100644 mk/machine/snb/rte.vars.mk delete mode 100644 mk/machine/thunderx/rte.vars.mk delete mode 100644 mk/machine/thunderx2/rte.vars.mk delete mode 100644 mk/machine/wsm/rte.vars.mk delete mode 100644 mk/machine/xgene1/rte.vars.mk delete mode 100644 mk/rte.app.mk delete mode 100644 mk/rte.bsdmodule.mk delete mode 100644 mk/rte.combinedlib.mk delete mode 100644 mk/rte.cpuflags.mk delete mode 100644 mk/rte.extapp.mk delete mode 100644 mk/rte.extlib.mk delete mode 100644 mk/rte.extobj.mk delete mode 100644 mk/rte.extshared.mk delete mode 100644 mk/rte.extsubdir.mk delete mode 100644 mk/rte.gnuconfigure.mk delete mode 100644 mk/rte.helper.mk delete mode 100644 mk/rte.hostapp.mk delete mode 100644 mk/rte.hostlib.mk delete mode 100644 mk/rte.install.mk delete mode 100644 mk/rte.lib.mk delete mode 100644 mk/rte.module.mk delete mode 100644 mk/rte.obj.mk delete mode 100644 mk/rte.sdkbuild.mk delete mode 100644 mk/rte.sdkconfig.mk delete mode 100644 mk/rte.sdkdepdirs.mk delete mode 100644 mk/rte.sdkdoc.mk delete mode 100644 mk/rte.sdkexamples.mk delete mode 100644 mk/rte.sdkgcov.mk delete mode 100644 mk/rte.sdkinstall.mk delete mode 100644 mk/rte.sdkroot.mk delete mode 100644 mk/rte.sdktest.mk delete mode 100644 mk/rte.shared.mk delete mode 100644 mk/rte.subdir.mk delete mode 100644 mk/rte.vars.mk delete mode 100644 mk/target/generic/rte.app.mk delete mode 100644 mk/target/generic/rte.vars.mk delete mode 100644 mk/toolchain/clang/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/clang/rte.vars.mk delete mode 100644 mk/toolchain/gcc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/gcc/rte.vars.mk delete mode 100644 mk/toolchain/icc/rte.toolchain-compat.mk delete mode 100644 mk/toolchain/icc/rte.vars.mk diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index e8de422df8..0000000000 --- a/GNUmakefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# Head Makefile for compiling rte SDK -# - -RTE_SDK := $(CURDIR) -export RTE_SDK - -# -# directory list -# - -ROOTDIRS-y := buildtools lib kernel drivers app - -include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/MAINTAINERS b/MAINTAINERS index ed163f5d59..d8a51b0af1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,8 +90,6 @@ F: devtools/checkpatches.sh F: devtools/get-maintainer.sh F: devtools/git-log-fixes.sh F: devtools/load-devel-config -F: devtools/test-build.sh -F: devtools/test-meson-builds.sh F: devtools/words-case.txt F: license/ F: .editorconfig @@ -100,18 +98,12 @@ F: .editorconfig Build System ------------ M: Thomas Monjalon <thomas@monjalon.net> -F: GNUmakefile F: Makefile F: config/ -F: mk/ F: buildtools/auto-config-h.sh F: buildtools/gen-build-mk.sh F: buildtools/gen-config-h.sh F: buildtools/relpath.sh -F: doc/build-sdk-quick.txt -F: doc/guides/prog_guide/build_app.rst -F: doc/guides/prog_guide/dev_kit_* -F: doc/guides/prog_guide/ext_app_lib_make_help.rst Meson build M: Bruce Richardson <bruce.richardson@intel.com> @@ -124,6 +116,7 @@ F: buildtools/gen-pmdinfo-cfile.sh F: buildtools/list-dir-globs.py F: buildtools/pkg-config/ F: buildtools/symlink-drivers-solibs.sh +F: devtools/test-meson-builds.sh Public CI M: Aaron Conole <aconole@redhat.com> @@ -354,7 +347,6 @@ Memory pool M: Olivier Matz <olivier.matz@6wind.com> M: Andrew Rybchenko <arybchenko@solarflare.com> F: lib/librte_mempool/ -F: drivers/mempool/Makefile F: drivers/mempool/ring/ F: doc/guides/prog_guide/mempool_lib.rst F: app/test/test_mempool* @@ -1519,7 +1511,6 @@ Test Applications ----------------- Unit tests framework -F: app/test/Makefile F: app/test/autotest* F: app/test/commands.c F: app/test/get-coremask.sh diff --git a/app/Makefile b/app/Makefile deleted file mode 100644 index 453c4fed6d..0000000000 --- a/app/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_APP_TEST) += test -DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd -DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib -DIRS-$(CONFIG_RTE_TEST_FLOW_PERF) += test-flow-perf -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += test-sad -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += test-regex - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -DIRS-$(CONFIG_RTE_APP_COMPRESS_PERF) += test-compress-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_APP_CRYPTO_PERF) += test-crypto-perf -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -DIRS-$(CONFIG_RTE_APP_EVENTDEV) += test-eventdev -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/app/pdump/Makefile b/app/pdump/Makefile deleted file mode 100644 index e6b9eea91b..0000000000 --- a/app/pdump/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) - -APP = dpdk-pdump - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/proc-info/Makefile b/app/proc-info/Makefile deleted file mode 100644 index 214f3f54a1..0000000000 --- a/app/proc-info/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-procinfo - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-acl/Makefile b/app/test-acl/Makefile deleted file mode 100644 index 5f26294cf1..0000000000 --- a/app/test-acl/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) - -APP = testacl - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile deleted file mode 100644 index dc29557f37..0000000000 --- a/app/test-bbdev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -APP = testbbdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_TEST_BBDEV) += main.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c -SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c - -LDLIBS += -lm -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC),y) -LDLIBS += -lrte_pmd_bbdev_fpga_5gnr_fec -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-cmdline/Makefile b/app/test-cmdline/Makefile deleted file mode 100644 index 3e7421906b..0000000000 --- a/app/test-cmdline/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y) - -# -# library name -# -APP = cmdline_test - -# -# all sources are stored in SRCS-y -# -SRCS-y += cmdline_test.c -SRCS-y += commands.c - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-compress-perf/Makefile b/app/test-compress-perf/Makefile deleted file mode 100644 index 2bff531836..0000000000 --- a/app/test-compress-perf/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-compress-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += comp_perf_options_parse.c -SRCS-y += comp_perf_test_verify.c -SRCS-y += comp_perf_test_throughput.c -SRCS-y += comp_perf_test_cyclecount.c -SRCS-y += comp_perf_test_common.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-crypto-perf/Makefile b/app/test-crypto-perf/Makefile deleted file mode 100644 index 0dced790f0..0000000000 --- a/app/test-crypto-perf/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -APP = dpdk-test-crypto-perf - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 - -# all source are stored in SRCS-y -SRCS-y := main.c -SRCS-y += cperf_ops.c -SRCS-y += cperf_options_parsing.c -SRCS-y += cperf_test_vectors.c -SRCS-y += cperf_test_throughput.c -SRCS-y += cperf_test_latency.c -SRCS-y += cperf_test_pmd_cyclecount.c -SRCS-y += cperf_test_verify.c -SRCS-y += cperf_test_vector_parsing.c -SRCS-y += cperf_test_common.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-eventdev/Makefile b/app/test-eventdev/Makefile deleted file mode 100644 index e600e21c41..0000000000 --- a/app/test-eventdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-eventdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := evt_main.c -SRCS-y += evt_options.c -SRCS-y += evt_test.c -SRCS-y += parser.c - -SRCS-y += test_order_common.c -SRCS-y += test_order_queue.c -SRCS-y += test_order_atq.c - -SRCS-y += test_perf_common.c -SRCS-y += test_perf_queue.c -SRCS-y += test_perf_atq.c - -SRCS-y += test_pipeline_common.c -SRCS-y += test_pipeline_queue.c -SRCS-y += test_pipeline_atq.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-fib/Makefile b/app/test-fib/Makefile deleted file mode 100644 index 2ea799c0e9..0000000000 --- a/app/test-fib/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_FIB),y) - -APP = testfib - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-flow-perf/Makefile b/app/test-flow-perf/Makefile deleted file mode 100644 index 4f2db75910..0000000000 --- a/app/test-flow-perf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_FLOW_PERF),y) - -# -# library name -# -APP = dpdk-test-flow-perf - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y += actions_gen.c -SRCS-y += flow_gen.c -SRCS-y += items_gen.c -SRCS-y += main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pipeline/Makefile b/app/test-pipeline/Makefile deleted file mode 100644 index fc3a504409..0000000000 --- a/app/test-pipeline/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_PIPELINE),y) - -# -# library name -# -APP = testpipeline - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# all source are stored in SRCS-y -# -SRCS-y := main.c -SRCS-y += config.c -SRCS-y += init.c -SRCS-y += runtime.c -SRCS-y += pipeline_stub.c -SRCS-y += pipeline_hash.c -SRCS-y += pipeline_lpm.c -SRCS-y += pipeline_lpm_ipv6.c - -# include ACL lib if available -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += pipeline_acl.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile deleted file mode 100644 index e739797f8a..0000000000 --- a/app/test-pmd/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_TEST_PMD),y) - -# -# library name -# -APP = testpmd - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-deprecated-declarations - -# -# all source are stored in SRCS-y -# -SRCS-y := testpmd.c -SRCS-y += parameters.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_tm.c -SRCS-y += config.c -SRCS-y += iofwd.c -SRCS-y += macfwd.c -SRCS-y += macswap.c -SRCS-y += flowgen.c -SRCS-y += rxonly.c -SRCS-y += txonly.c -SRCS-y += csumonly.c -SRCS-y += icmpecho.c -SRCS-y += noisy_vnf.c -SRCS-y += 5tswap.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c -SRCS-y += util.c - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS)$(CONFIG_RTE_LIBRTE_DPAA_PMD),yy) -LDLIBS += -lrte_pmd_dpaa -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) -LDLIBS += -lrte_pmd_ixgbe -endif - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y) -LDLIBS += -lrte_pmd_i40e -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y) -LDLIBS += -lrte_pmd_bnxt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC),y) -LDLIBS += -lrte_pmd_softnic -endif - -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test-regex/Makefile b/app/test-regex/Makefile deleted file mode 100644 index bb8f150871..0000000000 --- a/app/test-regex/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -APP = dpdk-test-regex - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/test-sad/Makefile b/app/test-sad/Makefile deleted file mode 100644 index 9b5a7ddc61..0000000000 --- a/app/test-sad/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) - -APP = testsad - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y -SRCS-y := main.c - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/app/test/Makefile b/app/test/Makefile deleted file mode 100644 index f4065271e4..0000000000 --- a/app/test/Makefile +++ /dev/null @@ -1,310 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_APP_TEST),y) - -# default rule -all: - -# Define an externally linked resource. A linked resource is an arbitrary -# file that is linked into the test binary. The application refers to this -# resource by name. The linked generates identifiers beg_<name> and end_<name> -# for referencing by the C code. -# -# Parameters: <unique name>, <file to be linked> -define linked_resource -SRCS-y += $(1).res.o -$(1).res.o: $(2) - @ echo ' MKRES $$@' - $Q [ "$$(<D)" = . ] || ln -fs $$< - $Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \ - --rename-section \ - .data=.rodata,alloc,load,data,contents,readonly \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1) \ - --redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1) \ - $$(<F) $$@ -endef - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -define linked_tar_resource -$(1).tar: $(2) - @ echo ' TAR $$@' - $Q tar -C $$(dir $$<) -cf $$@ $$(notdir $$<) -$(call linked_resource,$(1),$(1).tar) -endef -else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR -linked_tar_resource = -endif # CONFIG_RTE_APP_TEST_RESOURCE_TAR - -# -# library name -# -APP = test - -# -# all sources are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c -SRCS-y += test.c -SRCS-y += resource.c -SRCS-y += test_resource.c -test_resource.res: test_resource.c - @ cp $< $@ -$(eval $(call linked_resource,test_resource_c,test_resource.res)) -$(eval $(call linked_tar_resource,test_resource_tar,test_resource.c)) -SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_cfgfile.c -$(eval $(call linked_tar_resource,test_cfgfiles,test_cfgfiles)) -SRCS-y += test_prefetch.c -SRCS-y += test_byteorder.c -SRCS-y += test_per_lcore.c -SRCS-y += test_atomic.c -SRCS-y += test_barrier.c -SRCS-y += test_malloc.c -SRCS-y += test_cycles.c -SRCS-y += test_mcslock.c -SRCS-y += test_spinlock.c -SRCS-y += test_ticketlock.c -SRCS-y += test_memory.c -SRCS-y += test_memzone.c -SRCS-y += test_bitmap.c -SRCS-y += test_bitops.c -SRCS-y += test_reciprocal_division.c -SRCS-y += test_reciprocal_division_perf.c -SRCS-y += test_fbarray.c -SRCS-y += test_external_mem.c -SRCS-y += test_rand_perf.c - -SRCS-y += test_ring.c -SRCS-y += test_ring_mpmc_stress.c -SRCS-y += test_ring_hts_stress.c -SRCS-y += test_ring_perf.c -SRCS-y += test_ring_mt_peek_stress.c -SRCS-y += test_ring_rts_stress.c -SRCS-y += test_ring_st_peek_stress.c -SRCS-y += test_ring_stress.c -SRCS-y += test_pmd_perf.c - -ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y) -SRCS-y += test_table.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test_table_pipeline.c -SRCS-y += test_table_tables.c -SRCS-y += test_table_ports.c -SRCS-y += test_table_combined.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_table_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += test_flow_classify.c -endif - -SRCS-y += test_rwlock.c -SRCS-y += test_lcores.c - -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack.c -SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_racecond.c -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_secondary.c - -SRCS-y += test_mempool.c -SRCS-y += test_mempool_perf.c - -SRCS-y += test_mbuf.c -SRCS-y += test_logs.c - -SRCS-y += test_memcpy.c -SRCS-y += test_memcpy_perf.c - - -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd.c -SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_thash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_functions.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c -SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c -SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += test_telemetry_json.c - -SRCS-y += test_debug.c -SRCS-y += test_errno.c -SRCS-y += test_tailq.c -SRCS-y += test_string_fns.c -SRCS-y += test_cpuflags.c -SRCS-y += test_mp_secondary.c -SRCS-y += test_eal_flags.c -SRCS-y += test_eal_fs.c -SRCS-y += test_alarm.c -SRCS-y += test_interrupts.c -SRCS-y += test_version.c -SRCS-y += test_func_reentrancy.c -SRCS-y += test_trace.c -SRCS-y += test_trace_register.c -SRCS-y += test_trace_perf.c -SRCS-y += test_service_cores.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-y += sample_packet_forward.c -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_portlist.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_lib.c - -SRCS-$(CONFIG_RTE_LIBRTE_NET) += test_crc.c - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -SRCS-y += test_red.c -SRCS-y += test_sched.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_METER) += test_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_KNI) += test_kni.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power.c test_power_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power_kvm_vm.c -SRCS-y += test_common.c - -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c - -SRCS-y += virtual_pmd.c -SRCS-y += packet_burst_generator.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_cryptodev_security_pdcp.c - -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -SRCS-y += test_eventdev.c -SRCS-y += test_event_ring.c -SRCS-y += test_event_eth_rx_adapter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c -SRCS-y += test_event_timer_adapter.c -SRCS-y += test_event_crypto_adapter.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH), y) -SRCS-y += test_graph.c -SRCS-y += test_graph_perf.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -SRCS-y += test_rawdev.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c - -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += test_bpf.c - -SRCS-$(CONFIG_RTE_LIBRTE_RCU) += test_rcu_qsbr.c test_rcu_qsbr_perf.c - -SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_security.c - -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec.c test_ipsec_perf.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec_sad.c -ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y) -LDLIBS += -lrte_ipsec -endif - -CFLAGS += -O3 -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm - -ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) -LDLIBS += -lpthread -endif - -ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y) -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -LDLIBS += -lz -endif -endif - -# Disable VTA for memcpy test -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_test_memcpy.o += -fno-var-tracking-assignments -CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments -endif -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) -LDLIBS += -lrte_pmd_bond -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y) -LDLIBS += -lrte_pmd_null -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y) -LDLIBS += -lrte_pmd_ring -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y) -LDLIBS += -lrte_pmd_crypto_scheduler -endif - -endif - -ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y) -LDLIBS += -larchive -endif - -include $(RTE_SDK)/mk/rte.app.mk - -endif diff --git a/buildtools/Makefile b/buildtools/Makefile deleted file mode 100644 index 7f76fd7d65..0000000000 --- a/buildtools/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += pmdinfogen - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/buildtools/pmdinfogen/Makefile b/buildtools/pmdinfogen/Makefile deleted file mode 100644 index a97a7648fe..0000000000 --- a/buildtools/pmdinfogen/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -HOSTAPP = dpdk-pmdinfogen - -# -# all sources are stored in SRCS-y -# -SRCS-y += pmdinfogen.c - -HOST_CFLAGS += $(HOST_WERROR_FLAGS) -g -HOST_CFLAGS += -I$(RTE_OUTPUT)/include - -include $(RTE_SDK)/mk/rte.hostapp.mk diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 6d468d6731..210c8dcf25 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -50,7 +50,7 @@ commit_version () # <hash> head -n1) if [ -z "$tag" ] ; then # before -rc1 tag of release in progress - make showversion | cut -d'.' -f-2 + cat VERSION | cut -d'.' -f-2 else echo $tag | sed 's,^v,,' | sed 's,-rc.*,,' fi diff --git a/devtools/test-build.sh b/devtools/test-build.sh deleted file mode 100755 index f013656024..0000000000 --- a/devtools/test-build.sh +++ /dev/null @@ -1,315 +0,0 @@ -#! /bin/sh -e -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. - -default_path=$PATH - -# Load config options: -# - ARMV8_CRYPTO_LIB_PATH -# - DPDK_ABI_REF_DIR -# - DPDK_ABI_REF_VERSION -# - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) -# - DPDK_BUILD_TEST_DIR -# - DPDK_DEP_ARCHIVE -# - DPDK_DEP_BPF (y/[n]) -# - DPDK_DEP_CFLAGS -# - DPDK_DEP_ELF (y/[n]) -# - DPDK_DEP_FDT (y/[n]) -# - DPDK_DEP_ISAL (y/[n]) -# - DPDK_DEP_JSON (y/[n]) -# - DPDK_DEP_LDFLAGS -# - DPDK_DEP_MLX (y/[n]) -# - DPDK_DEP_NFB (y/[n]) -# - DPDK_DEP_NUMA ([y]/n) -# - DPDK_DEP_PCAP (y/[n]) -# - DPDK_DEP_SSL (y/[n]) -# - DPDK_DEP_IPSEC_MB (y/[n]) -# - DPDK_DEP_SZE (y/[n]) -# - DPDK_DEP_ZLIB (y/[n]) -# - DPDK_MAKE_JOBS (int) -# - DPDK_NOTIFY (notify-send) -# - FLEXRAN_SDK -# - LIBMUSDK_PATH -devtools_dir=$(dirname $(readlink -f $0)) -. $devtools_dir/load-devel-config - -print_usage () { - echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]" -} - -print_help () { - echo 'Test building several targets with different options' - echo - print_usage - cat <<- END_OF_HELP - - options: - -h this help - -jX use X parallel jobs in "make" - -s short test only first config without tests|examples|doc - -v verbose build - - config: defconfig[[~][+]option1[[~][+]option2...]] - Example: x86_64-native-linux-gcc+debug~RXTX_CALLBACKS - The lowercase options are defined inside $(basename $0). - The uppercase options can be the end of a defconfig option - to enable if prefixed with '+' or to disable if prefixed with '~'. - Default is to automatically enable most of the options. - The external dependencies are setup with DPDK_DEP_* variables. - If no config on command line, DPDK_BUILD_TEST_CONFIGS is used. - END_OF_HELP -} - -[ -z $MAKE ] && command -v gmake > /dev/null && MAKE=gmake -[ -z $MAKE ] && command -v make > /dev/null && MAKE=make -[ -z $MAKE ] && echo "Cannot find make or gmake" && exit 1 - -J=$DPDK_MAKE_JOBS -builds_dir=${DPDK_BUILD_TEST_DIR:-.} -short=false -unset verbose -while getopts hj:sv ARG ; do - case $ARG in - j ) J=$OPTARG ;; - s ) short=true ;; - v ) verbose='V=1' ;; - h ) print_help ; exit 0 ;; - ? ) print_usage ; exit 1 ;; - esac -done -shift $(($OPTIND - 1)) -configs=${*:-$DPDK_BUILD_TEST_CONFIGS} - -success=false -on_exit () -{ - if $success ; then - [ "$DPDK_NOTIFY" != notify-send ] || \ - notify-send -u low --icon=dialog-information 'DPDK build' 'finished' - elif [ -z "$signal" ] ; then - [ -z "$dir" ] || echo "failed to build $dir" >&2 - [ "$DPDK_NOTIFY" != notify-send ] || \ - notify-send -u low --icon=dialog-error 'DPDK build' 'failed' - fi -} -# catch manual interrupt to ignore notification -trap "signal=INT ; trap - INT ; kill -INT $$" INT -# notify result on exit -trap on_exit EXIT - -cd $devtools_dir/.. - -reset_env () -{ - export PATH=$default_path - unset CROSS - unset DPDK_DEP_ARCHIVE - unset DPDK_DEP_BPF - unset DPDK_DEP_CFLAGS - unset DPDK_DEP_ELF - unset DPDK_DEP_FDT - unset DPDK_DEP_ISAL - unset DPDK_DEP_JSON - unset DPDK_DEP_LDFLAGS - unset DPDK_DEP_MLX - unset DPDK_DEP_NFB - unset DPDK_DEP_NUMA - unset DPDK_DEP_PCAP - unset DPDK_DEP_SSL - unset DPDK_DEP_IPSEC_MB - unset DPDK_DEP_SZE - unset DPDK_DEP_ZLIB - unset ARMV8_CRYPTO_LIB_PATH - unset FLEXRAN_SDK - unset LIBMUSDK_PATH - unset PQOS_INSTALL_PATH -} - -config () # <directory> <target> <options> -{ - reconfig=false - if git rev-parse 2>&- && [ -n "$(git diff HEAD~ -- config)" ] ; then - echo 'Default config may have changed' - reconfig=true - fi - if [ ! -e $1/.config ] || $reconfig ; then - echo "================== Configure $1" - ${MAKE} T=$2 O=$1 config - - echo 'Customize configuration' - # Built-in options (lowercase) - ! echo $3 | grep -q '+default' || \ - sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config - ! echo $3 | grep -q '+kmods' || \ - sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config - echo $3 | grep -q '+next' || \ - sed -ri="" 's,(NEXT_ABI=)y,\1n,' $1/.config - ! echo $3 | grep -q '+shared' || \ - sed -ri="" 's,(SHARED_LIB=)n,\1y,' $1/.config - ! echo $3 | grep -q '+debug' || ( \ - sed -ri="" 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config - sed -ri="" 's,(_DEBUG.*=)n,\1y,' $1/.config - sed -ri="" 's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config - sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) - - # Automatic configuration - ! echo $2 | grep -q 'arm64' || \ - sed -ri="" 's,(ARM_USE_WFE=)n,\1y,' $1/.config - test "$DPDK_DEP_NUMA" != n || \ - sed -ri="" 's,(NUMA.*=)y,\1n,' $1/.config - sed -ri="" 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config - sed -ri="" 's,(BYPASS=)n,\1y,' $1/.config - test "$DPDK_DEP_ARCHIVE" != y || \ - sed -ri="" 's,(RESOURCE_TAR=)n,\1y,' $1/.config - test "$DPDK_DEP_BPF" != y || \ - sed -ri="" 's,(PMD_AF_XDP=)n,\1y,' $1/.config - test "$DPDK_DEP_FDT" != y || \ - sed -ri="" 's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config - test "$DPDK_DEP_FDT" != y || \ - sed -ri="" 's,(IPN3KE_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ISAL" != y || \ - sed -ri="" 's,(PMD_ISAL=)n,\1y,' $1/.config - test "$DPDK_DEP_MLX" != y || \ - sed -ri="" 's,(MLX.*_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_NFB" != y || \ - sed -ri="" 's,(NFB_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_SZE" != y || \ - sed -ri="" 's,(PMD_SZEDATA2=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(BNX2X_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(PMD_ZLIB=)n,\1y,' $1/.config - test "$DPDK_DEP_ZLIB" != y || \ - sed -ri="" 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config - test "$DPDK_DEP_PCAP" != y || \ - sed -ri="" 's,(PCAP=)n,\1y,' $1/.config - test -z "$ARMV8_CRYPTO_LIB_PATH" || \ - sed -ri="" 's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_AESNI_MB=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_ZUC=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_KASUMI=)n,\1y,' $1/.config - test "$DPDK_DEP_IPSEC_MB" != y || \ - sed -ri="" 's,(PMD_SNOW3G=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(PMD_CCP=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(PMD_OPENSSL=)n,\1y,' $1/.config - test "$DPDK_DEP_SSL" != y || \ - sed -ri="" 's,(QAT_SYM=)n,\1y,' $1/.config - test -z "$FLEXRAN_SDK" || \ - sed -ri="" 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config - sed -ri="" 's,(SCHED_.*=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(PMD_MVSAM_CRYPTO=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(MVPP2_PMD=)n,\1y,' $1/.config - test -z "$LIBMUSDK_PATH" || \ - sed -ri="" 's,(MVNETA_PMD=)n,\1y,' $1/.config - test "$DPDK_DEP_ELF" != y || \ - sed -ri="" 's,(BPF_ELF=)n,\1y,' $1/.config - test "$DPDK_DEP_JSON" != y || \ - sed -ri="" 's,(TELEMETRY=)n,\1y,' $1/.config - build_config_hook $1 $2 $3 - - # Explicit enabler/disabler (uppercase) - for option in $(echo $3 | sed 's,[~+], &,g') ; do - pattern=$(echo $option | cut -c2-) - if echo $option | grep -q '^~' ; then - sed -ri="" "s,($pattern=)y,\1n," $1/.config - elif echo $option | grep -q '^+' ; then - sed -ri="" "s,($pattern=)n,\1y," $1/.config - fi - done - fi -} - -# default empty hook to override in devel config -build_config_hook () # <directory> <target> <options> -{ - : -} - -for conf in $configs ; do - target=$(echo $conf | sed 's,[~+].*,,') - # reload config with DPDK_TARGET set - DPDK_TARGET=$target - reset_env - . $devtools_dir/load-devel-config - - options=$(echo $conf | sed 's,[^~+]*,,') - dir=$builds_dir/$conf - config $dir $target $options - - echo "================== Build $conf" - ${MAKE} -j$J EXTRA_CFLAGS="-Wfatal-errors -g $DPDK_DEP_CFLAGS" \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir - ! $short || break - export RTE_TARGET=$target - rm -rf $dir/install - ${MAKE} install O=$dir DESTDIR=$dir/install prefix= - echo "================== Build examples for $conf" - export RTE_SDK=$(readlink -f $dir)/install/share/dpdk - ln -sTf $(pwd)/lib $RTE_SDK/lib # workaround for vm_power_manager - grep -q 'SHARED_LIB=n' $dir/.config || # skip examples with static libs - ${MAKE} -j$J -sC examples \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \ - O=$(readlink -f $dir)/examples - unset RTE_TARGET - grep -q 'SHARED_LIB=n' $dir/.config || # skip ABI check with static libs - if [ -n "$DPDK_ABI_REF_VERSION" ]; then - abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION - if [ ! -d $abirefdir/$conf ]; then - # clone current sources - if [ ! -d $abirefdir/src ]; then - git clone --local --no-hardlinks \ - --single-branch \ - -b $DPDK_ABI_REF_VERSION \ - $(pwd) $abirefdir/src - fi - - cd $abirefdir/src - - rm -rf $abirefdir/build - config $abirefdir/build $target $options - - echo -n "================== Build $conf " - echo "($DPDK_ABI_REF_VERSION)" - ${MAKE} -j$J \ - EXTRA_CFLAGS="-Wno-error -g $DPDK_DEP_CFLAGS" \ - EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \ - O=$abirefdir/build - export RTE_TARGET=$target - ${MAKE} install O=$abirefdir/build \ - DESTDIR=$abirefdir/$conf \ - prefix= - unset RTE_TARGET - $devtools_dir/gen-abi.sh $abirefdir/$conf - - # back to current workdir - cd $devtools_dir/.. - fi - - echo "================== Check ABI $conf" - $devtools_dir/gen-abi.sh $dir/install - $devtools_dir/check-abi.sh $abirefdir/$conf $dir/install - fi - echo "################## $conf done." - unset dir -done - -if ! $short ; then - mkdir -p .check - echo "================== Build doxygen HTML API" - ${MAKE} doc-api-html >/dev/null 2>.check/doc.txt - echo "================== Build sphinx HTML guides" - ${MAKE} doc-guides-html >/dev/null 2>>.check/doc.txt - echo "================== Check docs" - diff -u /dev/null .check/doc.txt -fi - -success=true diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt deleted file mode 100644 index bcfa7d6fe1..0000000000 --- a/doc/build-sdk-quick.txt +++ /dev/null @@ -1,34 +0,0 @@ -Basic build - make defconfig && make - or - make config T=x86_64-native-linux-gcc && make -Build commands - config get configuration from target template (T=) - defconfig auto-select target template based on arch, OS, etc. - all same as build (default rule) - build build in a configured directory - clean remove files but keep configuration - install T= configure, build and install a target in DESTDIR - install install optionally staged in DESTDIR - examples build examples for given targets (T=) - examples_clean clean examples for given targets (T=) - test compile tests and run basic unit tests - test-* run specific subset of unit tests - tags|etags|gtags generate tags database for given targets (T=) - cscope generate cscope database for given targets (T=) -Build variables - EXTRA_CPPFLAGS preprocessor options - EXTRA_CFLAGS compiler options - EXTRA_LDFLAGS linker options - EXTRA_LDLIBS linker library options - RTE_KERNELDIR linux headers path - RTE_DEVEL_BUILD stricter options (default: y in git tree) - CROSS toolchain prefix - V verbose - D debug dependencies - O build directory (default: build/ - install T= default: ./) - DESTDIR staging install directory (default: empty) - prefix root install directory (default: /usr/local) - T target template - used with config or install - format: <arch-machine-execenv-toolchain> - templates in config/defconfig_* diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index b55075eaa2..0be9546a6a 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -773,53 +773,13 @@ The ``pep8`` tool can be used for testing compliance with the guidelines. Integrating with the Build System --------------------------------- -DPDK supports being built in two different ways: +DPDK is built using the tools ``meson`` and ``ninja``. -* using ``make`` - or more specifically "GNU make", i.e. ``gmake`` on FreeBSD -* using the tools ``meson`` and ``ninja`` - -Any new library or driver to be integrated into DPDK should support being -built with both systems. While building using ``make`` is a legacy approach, and -most build-system enhancements are being done using ``meson`` and ``ninja`` -there are no plans at this time to deprecate the legacy ``make`` build system. - -Therefore all new component additions should include both a ``Makefile`` and a -``meson.build`` file, and should be added to the component lists in both the -``Makefile`` and ``meson.build`` files in the relevant top-level directory: +Therefore all new component additions should include a ``meson.build`` file, +and should be added to the component lists in the ``meson.build`` files in the +relevant top-level directory: either ``lib`` directory or a ``driver`` subdirectory. -Makefile Contents -~~~~~~~~~~~~~~~~~ - -The ``Makefile`` for the component should be of the following format, where -``<name>`` corresponds to the name of the library in question, e.g. hash, -lpm, etc. For drivers, the same format of Makefile is used. - -.. code-block:: none - - # pull in basic DPDK definitions, including whether library is to be - # built or not - include $(RTE_SDK)/mk/rte.vars.mk - - # library name - LIB = librte_<name>.a - - # any library cflags needed. Generally add "-O3 $(WERROR_FLAGS)" - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - # the symbol version information for the library - EXPORT_MAP := rte_<name>_version.map - - # all source filenames are stored in SRCS-y - SRCS-$(CONFIG_RTE_LIBRTE_<NAME>) += rte_<name>.c - - # install includes - SYMLINK-$(CONFIG_RTE_LIBRTE_<NAME>)-include += rte_<name>.h - - # pull in rules to build the library - include $(RTE_SDK)/mk/rte.lib.mk - Meson Build File Contents - Libraries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 425bb874f8..9ff60944c3 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -464,55 +464,6 @@ and the -r option allows the user specify a ``git log`` range. Checking Compilation -------------------- -Makefile System -~~~~~~~~~~~~~~~ - -Compilation of patches and changes should be tested using the ``test-build.sh`` script in the ``devtools`` -directory of the DPDK repo:: - - devtools/test-build.sh x86_64-native-linux-gcc+next+shared - -The script usage is:: - - test-build.sh [-h] [-jX] [-s] [config1 [config2] ...]] - -Where: - -* ``-h``: help, usage. -* ``-jX``: use X parallel jobs in "make". -* ``-s``: short test with only first config and without examples/doc. -* ``config``: default config name plus config switches delimited with a ``+`` sign. - -Examples of configs are:: - - x86_64-native-linux-gcc - x86_64-native-linux-gcc+next+shared - x86_64-native-linux-clang+shared - -The builds can be modified via the following environmental variables: - -* ``DPDK_BUILD_TEST_CONFIGS`` (target1+option1+option2 target2) -* ``DPDK_BUILD_TEST_DIR`` -* ``DPDK_DEP_CFLAGS`` -* ``DPDK_DEP_LDFLAGS`` -* ``DPDK_DEP_PCAP`` (y/[n]) -* ``DPDK_NOTIFY`` (notify-send) - -These can be set from the command line or in the config files shown above in the :ref:`contrib_checkpatch`. - -The recommended configurations and options to test compilation prior to submitting patches are:: - - x86_64-native-linux-gcc+shared+next - x86_64-native-linux-clang+shared - i686-native-linux-gcc - - export DPDK_DEP_ZLIB=y - export DPDK_DEP_PCAP=y - export DPDK_DEP_SSL=y - -Meson System -~~~~~~~~~~~~ - Compilation of patches is to be tested with ``devtools/test-meson-builds.sh`` script. The script internally checks for dependencies, then builds for several diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst index 63160ce64f..b2e57909ee 100644 --- a/doc/guides/freebsd_gsg/intro.rst +++ b/doc/guides/freebsd_gsg/intro.rst @@ -39,8 +39,8 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system (including the commands - that can be used in the root DPDK Makefile to build the development - kit and an application) and guidelines for porting an application + that can be used to build the development kit and an application) + and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index c536e354ef..a895e1b0f4 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -31,7 +31,7 @@ The DPDK is composed of several directories: * examples: Source code of DPDK application examples -* config, buildtools, mk: Framework-related makefiles, scripts and configuration +* config, buildtools: Framework-related scripts and configuration Compiling and Installing DPDK System-wide ----------------------------------------- @@ -39,11 +39,6 @@ Compiling and Installing DPDK System-wide DPDK can be configured, built and installed on your system using the tools ``meson`` and ``ninja``. -.. note:: - - The older makefile-based build system used in older DPDK releases is - still present and its use is described in section - `Installation of DPDK Target Environment using Make`_. DPDK Configuration ~~~~~~~~~~~~~~~~~~ @@ -156,64 +151,3 @@ build system is shown below: dpdk = dependency('libdpdk') sources = files('main.c') executable('dpdk-app', sources, dependencies: dpdk) - - -Installation of DPDK Target Environment using Make --------------------------------------------------- - -.. note:: - - The building of DPDK using make will be deprecated in a future release. It - is therefore recommended that DPDK installation is done using meson and - ninja as described above. - -Get a native target environment automatically:: - - make defconfig O=mybuild - -.. note:: - - Within the configuration files, the ``RTE_MACHINE`` configuration value is set to native, - which means that the compiled software is tuned for the platform on which it is built. - -Or get a specific target environment:: - - make config T=x86_64-native-linux-gcc O=mybuild - -The format of a DPDK target is "ARCH-MACHINE-EXECENV-TOOLCHAIN". -Available targets can be found with:: - - make help - -Customize the target configuration in the generated ``.config`` file. -Example for enabling the pcap PMD:: - - sed -ri 's,(PMD_PCAP=).*,\1y,' mybuild/.config - -Compile the target:: - - make -j4 O=mybuild - -.. warning:: - - Any kernel modules to be used, e.g. ``igb_uio``, ``kni``, must be compiled with the - same kernel as the one running on the target. - If the DPDK is not being built on the target machine, - the ``RTE_KERNELDIR`` environment variable should be used to point the compilation at a copy of the kernel version to be used on the target machine. - -Install the target in a separate directory:: - - make install O=mybuild DESTDIR=myinstall prefix= - -The environment is ready to build a DPDK application:: - - RTE_SDK=$(pwd)/myinstall/share/dpdk RTE_TARGET=x86_64-native-linux-gcc make -C myapp - -In addition, the make clean command can be used to remove any existing compiled files for a subsequent full, clean rebuild of the code. - -Browsing the Installed DPDK Environment Target ----------------------------------------------- - -Once a target is created it contains all libraries, including poll-mode drivers, and header files for the DPDK environment that are required to build customer applications. -In addition, the test applications are built under the app directory, which may be used for testing. -A kmod directory is also present that contains kernel modules which may be loaded if needed. diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2f606535c3..2882883f95 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -15,56 +15,7 @@ It also provides a pointer to where sample applications are stored. Compiling a Sample Application ------------------------------ -Once an DPDK target environment directory has been created (such as ``x86_64-native-linux-gcc``), -it contains all libraries and header files required to build an application. - -When compiling an application in the Linux* environment on the DPDK, the following variables must be exported: - -* ``RTE_SDK`` - Points to the DPDK installation directory. - -* ``RTE_TARGET`` - Points to the DPDK target environment directory. - -The following is an example of creating the ``helloworld`` application, which runs in the DPDK Linux environment. -This example may be found in the ``${RTE_SDK}/examples`` directory. - -The directory contains the ``main.c`` file. This file, when combined with the libraries in the DPDK target environment, -calls the various functions to initialize the DPDK environment, -then launches an entry point (dispatch application) for each core to be utilized. -By default, the binary is generated in the build directory. - -.. code-block:: console - - cd examples/helloworld/ - export RTE_SDK=$HOME/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - - make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map - - ls build/app - helloworld helloworld.map - -.. note:: - - In the above example, ``helloworld`` was in the directory structure of the DPDK. - However, it could have been located outside the directory structure to keep the DPDK structure intact. - In the following case, the ``helloworld`` application is copied to a new directory as a new starting point. - - .. code-block:: console - - export RTE_SDK=/home/user/DPDK - cp -r $(RTE_SDK)/examples/helloworld my_rte_app - cd my_rte_app/ - export RTE_TARGET=x86_64-native-linux-gcc - - make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map +Please refer to :ref:`building_app_using_installed_dpdk` for detail on compiling sample apps. Running a Sample Application ---------------------------- diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index c5875a6d57..8a1d0e88b0 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -67,7 +67,7 @@ Augment the cross toolchain with NUMA support .. note:: - This way is optional, an alternative is to use extra CFLAGS and LDFLAGS, depicted in :ref:`configure_and_cross_compile_dpdk_build` below. + This way is optional, an alternative is to use extra CFLAGS and LDFLAGS. Copy the NUMA header files and lib to the cross compiler's directories: @@ -79,8 +79,8 @@ Copy the NUMA header files and lib to the cross compiler's directories: .. _configure_and_cross_compile_dpdk_build: -Cross Compiling DPDK using Meson --------------------------------- +Cross Compiling DPDK +-------------------- Meson depends on pkgconfig to find the dependencies. The package ``pkg-config-aarch64-linux-gnu`` is required for aarch64. @@ -99,45 +99,3 @@ command:: meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ninja -C arm64-build - -Configure and Cross Compile DPDK using Make -------------------------------------------- -To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc. - -.. code-block:: console - - make config T=arm64-armv8a-linux-gcc - -To cross-compile, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -To cross-compile, including the kernel modules, the kernel source tree needs to be specified by setting -RTE_KERNELDIR: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- RTE_KERNELDIR=<kernel_src_rootdir> CROSS_COMPILE=aarch64-linux-gnu- - -To compile for non-NUMA targets, without compiling the kernel modules, use the following command: - -.. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n - -.. note:: - - 1. EXTRA_CFLAGS and EXTRA_LDFLAGS should be added to include the NUMA headers and link the library respectively, - if the above step :ref:`augment_the_cross_toolchain_with_numa_support` was skipped therefore the toolchain was not - augmented with NUMA support. - - 2. "-isystem <numa_install_dir>/include" should be add to EXTRA_CFLAGS, otherwise the numa.h file will get a lot of compiling - errors of Werror=cast-qual, Werror=strict-prototypes and Werror=old-style-definition. - - An example is given below: - - .. code-block:: console - - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" diff --git a/doc/guides/linux_gsg/intro.rst b/doc/guides/linux_gsg/intro.rst index 94877f4ae2..890169e97f 100644 --- a/doc/guides/linux_gsg/intro.rst +++ b/doc/guides/linux_gsg/intro.rst @@ -23,7 +23,7 @@ The following is a list of DPDK documents in the suggested reading order: * The software architecture and how to use it (through examples), specifically in a Linux application (linux) environment - * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development kit and + * The content of the DPDK, the build system (including the commands that can be used to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index a124656bcb..6b9f573fce 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -37,7 +37,7 @@ Compilation of the DPDK The setup commands and installed packages needed on various systems may be different. For details on Linux distributions and the versions tested, please consult the DPDK Release Notes. -* General development tools including ``make``, and a supported C compiler such as ``gcc`` (version 4.9+) or ``clang`` (version 3.4+). +* General development tools including a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+). * For RHEL/Fedora systems these can be installed using ``dnf groupinstall "Development Tools"`` @@ -82,12 +82,8 @@ Compilation of the DPDK **Additional Libraries** A number of DPDK components, such as libraries and poll-mode drivers (PMDs) have additional dependencies. -For DPDK builds using meson, the presence or absence of these dependencies will be -automatically detected enabling or disabling the relevant components appropriately. - -For builds using make, these components are disabled in the default configuration and -need to be enabled manually by changing the relevant setting to "y" in the build configuration file -i.e. the ``.config`` file in the build folder. +For DPDK builds, the presence or absence of these dependencies will be automatically detected +enabling or disabling the relevant components appropriately. In each case, the relevant library development package (``-devel`` or ``-dev``) is needed to build the DPDK components. diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index bffa55bbef..84196a8e03 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -9,19 +9,12 @@ Building Your Own Application Compiling a Sample Application in the Development Kit Directory --------------------------------------------------------------- -When compiling a sample application (for example, hello world), the following variables must be exported: -RTE_SDK and RTE_TARGET. +To compile a sample application with make (for example, hello world): .. code-block:: console ~/DPDK$ cd examples/helloworld/ - ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc ~/DPDK/examples/helloworld$ make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map The binary is generated in the build directory by default: @@ -30,6 +23,8 @@ The binary is generated in the build directory by default: ~/DPDK/examples/helloworld$ ls build/app helloworld helloworld.map +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling with meson. + Build Your Own Application Outside the Development Kit ------------------------------------------------------ @@ -39,13 +34,7 @@ The sample application (Hello World) can be duplicated in a new directory as a s ~$ cp -r DPDK/examples/helloworld my_rte_app ~$ cd my_rte_app/ - ~/my_rte_app$ export RTE_SDK=/home/user/DPDK - ~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc ~/my_rte_app$ make - CC main.o - LD helloworld - INSTALL-APP helloworld - INSTALL-MAP helloworld.map Customizing Makefiles --------------------- @@ -53,47 +42,10 @@ Customizing Makefiles Application Makefile ~~~~~~~~~~~~~~~~~~~~ -The default makefile provided with the Hello World sample application is a good starting point. It includes: - -* $(RTE_SDK)/mk/rte.vars.mk at the beginning - -* $(RTE_SDK)/mk/rte.extapp.mk at the end +The default makefile provided with the Hello World sample application is a good starting point. The user must define several variables: * APP: Contains the name of the application. * SRCS-y: List of source files (\*.c, \*.S). - -Library Makefile -~~~~~~~~~~~~~~~~ - -It is also possible to build a library in the same way: - -* Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -* Include $(RTE_SDK)/mk/rte.extlib.mk at the end. - -The only difference is that APP should be replaced by LIB, which contains the name of the library. For example, libfoo.a. - -Customize Makefile Actions -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be defined to customize Makefile actions. The most common are listed below. Refer to -:ref:`Makefile Description <Makefile_Description>` section in -:ref:`Development Kit Build System <Development_Kit_Build_System>` - -chapter for details. - -* VPATH: The path list where the build system will search for sources. By default, - RTE_SRCDIR will be included in VPATH. - -* CFLAGS_my_file.o: The specific flags to add for C compilation of my_file.c. - -* CFLAGS: The flags to use for C compilation. - -* LDFLAGS: The flags to use for linking. - -* CPPFLAGS: The flags to use to provide flags to the C preprocessor (only useful when assembling .S files) - -* LDLIBS: A list of libraries to link with (for example, -L /path/to/libfoo - lfoo) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst deleted file mode 100644 index 74dba4dd16..0000000000 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ /dev/null @@ -1,331 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Build_System: - -Development Kit Build System -============================ - -The DPDK requires a build system for compilation activities and so on. -This section describes the constraints and the mechanisms used in the DPDK framework. - -There are two use-cases for the framework: - -* Compilation of the DPDK libraries and sample applications; - the framework generates specific binary libraries, - include files and sample applications - -* Compilation of an external application or library, using an installed binary DPDK - -Building the Development Kit Binary ------------------------------------ - -The following provides details on how to build the DPDK binary. - -Build Directory Concept -~~~~~~~~~~~~~~~~~~~~~~~ - -After installation, a build directory structure is created. -Each build directory contains include files, libraries, and applications. - -A build directory is specific to a configuration that includes architecture + execution environment + toolchain. -It is possible to have several build directories sharing the same sources with different configurations. - -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, -we use: - -.. code-block:: console - - cd ${RTE_SDK} - make config T=x86_64-native-linux-gcc O=my_sdk_build_dir - -This creates a new my_sdk_build_dir directory. After that, we can compile by doing: - -.. code-block:: console - - cd my_sdk_build_dir - make - -which is equivalent to: - -.. code-block:: console - - make O=my_sdk_build_dir - -Refer to -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` -for details about make commands that can be used from the root of DPDK. - -Building External Applications ------------------------------- - -Since DPDK is in essence a development kit, the first objective of end users will be to create an application using this SDK. -To compile an application, the user must set the RTE_SDK and RTE_TARGET environment variables. - -.. code-block:: console - - export RTE_SDK=/opt/DPDK - export RTE_TARGET=x86_64-native-linux-gcc - cd /path/to/my_app - -For a new application, the user must create their own Makefile that includes some .mk files, such as -${RTE_SDK}/mk/rte.vars.mk, and ${RTE_SDK}/mk/ rte.app.mk. -This is described in -:ref:`Building Your Own Application <Building_Your_Own_Application>`. - -Depending on the chosen target (architecture, machine, executive environment, toolchain) defined in the Makefile or as an environment variable, -the applications and libraries will compile using the appropriate .h files and will link with the appropriate .a files. -These files are located in ${RTE_SDK}/arch-machine-execenv-toolchain, which is referenced internally by ${RTE_BIN_SDK}. - -To compile their application, the user just has to call make. -The compilation result will be located in /path/to/my_app/build directory. - -Sample applications are provided in the examples directory. - -.. _Makefile_Description: - -Makefile Description --------------------- - -General Rules For DPDK Makefiles -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -In the DPDK, Makefiles always follow the same scheme: - -#. Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. - -#. Define specific variables for RTE build system. - -#. Include a specific $(RTE_SDK)/mk/rte.XYZ.mk, where XYZ can be app, lib, extapp, extlib, obj, gnuconfigure, - and so on, depending on what kind of object you want to build. - :ref:`See Makefile Types <Makefile_Types>` below. - -#. Include user-defined rules and variables. - - The following is a very simple example of an external application Makefile: - - .. code-block:: make - - include $(RTE_SDK)/mk/rte.vars.mk - - # binary name - APP = helloworld - - # all source are stored in SRCS-y - SRCS-y := main.c - - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) - - include $(RTE_SDK)/mk/rte.extapp.mk - -.. _Makefile_Types: - -Makefile Types -~~~~~~~~~~~~~~ - -Depending on the .mk file which is included at the end of the user Makefile, the Makefile will have a different role. -Note that it is not possible to build a library and an application in the same Makefile. -For that, the user must create two separate Makefiles, possibly in two different directories. - -In any case, the rte.vars.mk file must be included in the user Makefile as soon as possible. - -Application -^^^^^^^^^^^ - -These Makefiles generate a binary application. - -* rte.app.mk: Application in the development kit framework - -* rte.extapp.mk: External application - -* rte.hostapp.mk: prerequisite tool to build dpdk - -Library -^^^^^^^ - -Generate a .a library. - -* rte.lib.mk: Library in the development kit framework - -* rte.extlib.mk: external library - -* rte.hostlib.mk: host library in the development kit framework - -Install -^^^^^^^ - -* rte.install.mk: Does not build anything, it is only used to create links or copy files to the installation directory. - This is useful for including files in the development kit framework. - -Kernel Module -^^^^^^^^^^^^^ - -* rte.module.mk: Build a kernel module in the development kit framework. - -Objects -^^^^^^^ - -* rte.obj.mk: Object aggregation (merge several .o in one) in the development kit framework. - -* rte.extobj.mk: Object aggregation (merge several .o in one) outside the development kit framework. - -Misc -^^^^ - -* rte.gnuconfigure.mk: Build an application that is configure-based. - -* rte.subdir.mk: Build several directories in the development kit framework. - -.. _Internally_Generated_Build_Tools: - -Internally Generated Build Tools -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -``app/dpdk-pmdinfogen`` - - -``dpdk-pmdinfogen`` scans an object (.o) file for various well known symbol names. -These well known symbol names are defined by various macros and used to export -important information about hardware support and usage for pmd files. For -instance the macro: - -.. code-block:: c - - RTE_PMD_REGISTER_PCI(name, drv) - -Creates the following symbol: - -.. code-block:: c - - static char this_pmd_name0[] __attribute__((used)) = "<name>"; - - -Which ``dpdk-pmdinfogen`` scans for. Using this information other relevant -bits of data can be exported from the object file and used to produce a -hardware support description, that ``dpdk-pmdinfogen`` then encodes into a -JSON formatted string in the following format: - -.. code-block:: c - - static char <name_pmd_string>="PMD_INFO_STRING=\"{'name' : '<name>', ...}\""; - - -These strings can then be searched for by external tools to determine the -hardware support of a given library or application. - - -.. _Useful_Variables_Provided_by_the_Build_System: - -Useful Variables Provided by the Build System -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* RTE_SDK: The absolute path to the DPDK sources. - When compiling the development kit, this variable is automatically set by the framework. - It has to be defined by the user as an environment variable if compiling an external application. - -* RTE_SRCDIR: The path to the root of the sources. When compiling the development kit, RTE_SRCDIR = RTE_SDK. - When compiling an external application, the variable points to the root of external application sources. - -* RTE_OUTPUT: The path to which output files are written. - Typically, it is $(RTE_SRCDIR)/build, but it can be overridden by the O= option in the make command line. - -* RTE_TARGET: A string identifying the target for which we are building. - The format is arch-machine-execenv-toolchain. - When compiling the SDK, the target is deduced by the build system from the configuration (.config). - When building an external application, it must be specified by the user in the Makefile or as an environment variable. - -* RTE_SDK_BIN: References $(RTE_SDK)/$(RTE_TARGET). - -* RTE_ARCH: Defines the architecture (i686, x86_64). - It is the same value as CONFIG_RTE_ARCH but without the double-quotes around the string. - -* RTE_MACHINE: Defines the machine. - It is the same value as CONFIG_RTE_MACHINE but without the double-quotes around the string. - -* RTE_TOOLCHAIN: Defines the toolchain (gcc , icc). - It is the same value as CONFIG_RTE_TOOLCHAIN but without the double-quotes around the string. - -* RTE_EXEC_ENV: Defines the executive environment (linux). - It is the same value as CONFIG_RTE_EXEC_ENV but without the double-quotes around the string. - -* RTE_KERNELDIR: This variable contains the absolute path to the kernel sources that will be used to compile the kernel modules. - The kernel headers must be the same as the ones that will be used on the target machine (the machine that will run the application). - By default, the variable is set to /lib/modules/$(shell uname -r)/build, - which is correct when the target machine is also the build machine. - -* RTE_DEVEL_BUILD: Stricter options (stop on warning). It defaults to y in a git tree. - -Variables that Can be Set/Overridden in a Makefile Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* VPATH: The path list that the build system will search for sources. By default, RTE_SRCDIR will be included in VPATH. - -* CFLAGS: Flags to use for C compilation. The user should use += to append data in this variable. - -* LDFLAGS: Flags to use for linking. The user should use += to append data in this variable. - -* ASFLAGS: Flags to use for assembly. The user should use += to append data in this variable. - -* CPPFLAGS: Flags to use to give flags to C preprocessor (only useful when assembling .S files). - The user should use += to append data in this variable. - -* LDLIBS: In an application, the list of libraries to link with (for example, -L /path/to/libfoo -lfoo ). - The user should use += to append data in this variable. - -* SRC-y: A list of source files (.c, .S, or .o if the source is a binary) in case of application, library or object Makefiles. - The sources must be available from VPATH. - -* INSTALL-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be copied in $(RTE_OUTPUT)/$(INSTPATH). Can be used in almost any RTE Makefile. - -* SYMLINK-y-$(INSTPATH): A list of files to be installed in $(INSTPATH). - The files must be available from VPATH and will be linked (symbolically) in $(RTE_OUTPUT)/$(INSTPATH). - This variable can be used in almost any DPDK Makefile. - -* PREBUILD: A list of prerequisite actions to be taken before building. The user should use += to append data in this variable. - -* POSTBUILD: A list of actions to be taken after the main build. The user should use += to append data in this variable. - -* PREINSTALL: A list of prerequisite actions to be taken before installing. The user should use += to append data in this variable. - -* POSTINSTALL: A list of actions to be taken after installing. The user should use += to append data in this variable. - -* PRECLEAN: A list of prerequisite actions to be taken before cleaning. The user should use += to append data in this variable. - -* POSTCLEAN: A list of actions to be taken after cleaning. The user should use += to append data in this variable. - -* DEPDIRS-$(DIR): Only used in the development kit framework to specify if the build of the current directory depends on build of another one. - This is needed to support parallel builds correctly. - -Variables that can be Set/Overridden by the User on the Command Line Only -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some variables can be used to configure the build system behavior. They are documented in -:ref:`Development Kit Root Makefile Help <Development_Kit_Root_Makefile_Help>` and -:ref:`External Application/Library Makefile Help <External_Application/Library_Makefile_Help>` - - * WERROR_CFLAGS: By default, this is set to a specific value that depends on the compiler. - Users are encouraged to use this variable as follows: - - CFLAGS += $(WERROR_CFLAGS) - -This avoids the use of different cases depending on the compiler (icc or gcc). -Also, this variable can be overridden from the command line, which allows bypassing of the flags for testing purposes. - -Variables that Can be Set/Overridden by the User in a Makefile or Command Line -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* CFLAGS_my_file.o: Specific flags to add for C compilation of my_file.c. - -* LDFLAGS_my_app: Specific flags to add when linking my_app. - -* EXTRA_CFLAGS: The content of this variable is appended after CFLAGS when compiling. - -* EXTRA_LDFLAGS: The content of this variable is appended after LDFLAGS when linking. - -* EXTRA_LDLIBS: The content of this variable is appended after LDLIBS when linking. - -* EXTRA_ASFLAGS: The content of this variable is appended after ASFLAGS when assembling. - -* EXTRA_CPPFLAGS: The content of this variable is appended after CPPFLAGS when using a C preprocessor on assembly files. diff --git a/doc/guides/prog_guide/dev_kit_root_make_help.rst b/doc/guides/prog_guide/dev_kit_root_make_help.rst deleted file mode 100644 index a30db7d5b4..0000000000 --- a/doc/guides/prog_guide/dev_kit_root_make_help.rst +++ /dev/null @@ -1,188 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _Development_Kit_Root_Makefile_Help: - -Development Kit Root Makefile Help -================================== - -The DPDK provides a root level Makefile with targets for configuration, building, cleaning, testing, installation and others. -These targets are explained in the following sections. - -Configuration Targets ---------------------- - -The configuration target requires the name of the target, which is specified using T=mytarget and it is mandatory. -The list of available targets are in $(RTE_SDK)/config (remove the defconfig _ prefix). - -Configuration targets also support the specification of the name of the output directory, using O=mybuilddir. -This is an optional parameter, the default output directory is build. - -* Config - - This will create a build directory, and generates a configuration from a template. - A Makefile is also created in the new build directory. - - Example: - - .. code-block:: console - - make config O=mybuild T=x86_64-native-linux-gcc - -Build Targets -------------- - -Build targets support the optional specification of the name of the output directory, using O=mybuilddir. -The default output directory is build. - -* all, build or just make - - Build the DPDK in the output directory previously created by a make config. - - Example: - - .. code-block:: console - - make O=mybuild - -* clean - - Clean all objects created using make build. - - Example: - - .. code-block:: console - - make clean O=mybuild - -* %_sub - - Build a subdirectory only, without managing dependencies on other directories. - - Example: - - .. code-block:: console - - make lib/librte_eal_sub O=mybuild - -* %_clean - - Clean a subdirectory only. - - Example: - - .. code-block:: console - - make lib/librte_eal_clean O=mybuild - -Install Targets ---------------- - -* Install - - The list of available targets are in $(RTE_SDK)/config (remove the defconfig\_ prefix). - - The GNU standards variables may be used: - http://gnu.org/prep/standards/html_node/Directory-Variables.html and - http://gnu.org/prep/standards/html_node/DESTDIR.html - - Example: - - .. code-block:: console - - make install DESTDIR=myinstall prefix=/usr - -Test Targets ------------- - -* test - - Launch automatic tests for a build directory specified using O=mybuilddir. - It is optional, the default output directory is build. - - Example: - - .. code-block:: console - - make test O=mybuild - -Documentation Targets ---------------------- - -* doc - - Generate the documentation (API and guides). - -* doc-api-html - - Generate the Doxygen API documentation in html. - -* doc-guides-html - - Generate the guides documentation in html. - -* doc-guides-pdf - - Generate the guides documentation in pdf. - -Misc Targets ------------- - -* help - - Show a quick help. - -Other Useful Command-line Variables ------------------------------------ - -The following variables can be specified on the command line: - -* V= - - Enable verbose build (show full compilation command line, and some intermediate commands). - -* D= - - Enable dependency debugging. This provides some useful information about why a target is built or not. - -* EXTRA_CFLAGS=, EXTRA_LDFLAGS=, EXTRA_LDLIBS=, EXTRA_ASFLAGS=, EXTRA_CPPFLAGS= - - Append specific compilation, link or asm flags. - -* CROSS= - - Specify a cross toolchain header that will prefix all gcc/binutils applications. This only works when using gcc. - -Make in a Build Directory -------------------------- - -All targets described above are called from the SDK root $(RTE_SDK). -It is possible to run the same Makefile targets inside the build directory. -For instance, the following command: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - make O=mybuild - -is equivalent to: - -.. code-block:: console - - cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linux-gcc - cd mybuild - - # no need to specify O= now - make - -Compiling for Debug -------------------- - -To compile the DPDK and sample applications with debugging information included and the optimization level set to 0, -the EXTRA_CFLAGS environment variable should be set before compiling as follows: - -.. code-block:: console - - export EXTRA_CFLAGS='-O0 -g' diff --git a/doc/guides/prog_guide/ext_app_lib_make_help.rst b/doc/guides/prog_guide/ext_app_lib_make_help.rst deleted file mode 100644 index 4312778dc9..0000000000 --- a/doc/guides/prog_guide/ext_app_lib_make_help.rst +++ /dev/null @@ -1,98 +0,0 @@ -.. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2010-2014 Intel Corporation. - -.. _External_Application/Library_Makefile_help: - -External Application/Library Makefile help -========================================== - -External applications or libraries should include specific Makefiles from RTE_SDK, located in mk directory. -These Makefiles are: - -* ${RTE_SDK}/mk/rte.extapp.mk: Build an application - -* ${RTE_SDK}/mk/rte.extlib.mk: Build a static library - -* ${RTE_SDK}/mk/rte.extobj.mk: Build objects (.o) - -Prerequisites -------------- - -The following variables must be defined: - -* ${RTE_SDK}: Points to the root directory of the DPDK. - -* ${RTE_TARGET}: Reference the target to be used for compilation (for example, x86_64-native-linux-gcc). - -Build Targets -------------- - -Build targets support the specification of the name of the output directory, using O=mybuilddir. -This is optional; the default output directory is build. - -* all, "nothing" (meaning just make) - - Build the application or the library in the specified output directory. - - Example: - - .. code-block:: console - - make O=mybuild - -* clean - - Clean all objects created using make build. - - Example: - - .. code-block:: console - - make clean O=mybuild - -Help Targets ------------- - -* help - - Show this help. - -Other Useful Command-line Variables ------------------------------------ - -The following variables can be specified at the command line: - -* S= - - Specify the directory in which the sources are located. By default, it is the current directory. - -* M= - - Specify the Makefile to call once the output directory is created. By default, it uses $(S)/Makefile. - -* V= - - Enable verbose build (show full compilation command line and some intermediate commands). - -* D= - - Enable dependency debugging. This provides some useful information about why a target must be rebuilt or not. - -* EXTRA_CFLAGS=, EXTRA_LDFLAGS=, EXTRA_ASFLAGS=, EXTRA_CPPFLAGS= - - Append specific compilation, link or asm flags. - -* CROSS= - - Specify a cross-toolchain header that will prefix all gcc/binutils applications. This only works when using gcc. - -Make from Another Directory ---------------------------- - -It is possible to run the Makefile from another directory, by specifying the output and the source dir. For example: - -.. code-block:: console - - export RTE_SDK=/path/to/DPDK - export RTE_TARGET=x86_64-native-linux-icc - make -f /path/to/my_app/Makefile S=/path/to/my_app O=/path/to/build_dir diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst index 0454768de3..45c7dec88d 100644 --- a/doc/guides/prog_guide/index.rst +++ b/doc/guides/prog_guide/index.rst @@ -62,12 +62,9 @@ Programmer's Guide ipsec_lib graph_lib source_org - dev_kit_build_system - dev_kit_root_make_help build-sdk-meson meson_ut build_app - ext_app_lib_make_help perf_opt_guidelines writing_efficient_code lto diff --git a/doc/guides/prog_guide/intro.rst b/doc/guides/prog_guide/intro.rst index 5b319d36d9..44877bd3e3 100644 --- a/doc/guides/prog_guide/intro.rst +++ b/doc/guides/prog_guide/intro.rst @@ -34,7 +34,7 @@ The following is a list of DPDK documents in the suggested reading order: specifically in a Linux* application (linux) environment * The content of the DPDK, the build system - (including the commands that can be used in the root DPDK Makefile to build the development kit and an application) + (including the commands that can be used in the root DPDK to build the development kit and an application) and guidelines for porting an application * Optimizations used in the software and those that should be considered for new development diff --git a/doc/guides/prog_guide/overview.rst b/doc/guides/prog_guide/overview.rst index 986c896908..537a568f1e 100644 --- a/doc/guides/prog_guide/overview.rst +++ b/doc/guides/prog_guide/overview.rst @@ -18,7 +18,7 @@ The framework creates a set of libraries for specific environments through the creation of an Environment Abstraction Layer (EAL), which may be specific to a mode of the Intel® architecture (32-bit or 64-bit), Linux* user space compilers or a specific platform. -These environments are created through the use of make files and configuration files. +These environments are created through the use of meson files and configuration files. Once the EAL library is created, the user may link with the library to create their own applications. Other libraries, outside of EAL, including the Hash, Longest Prefix Match (LPM) and rings libraries are also provided. @@ -38,21 +38,13 @@ Development Environment ----------------------- The DPDK project installation requires Linux and the associated toolchain, -such as one or more compilers, assembler, make utility, +such as one or more compilers, assembler, meson utility, editor and various libraries to create the DPDK components and libraries. Once these libraries are created for the specific environment and architecture, they may then be used to create the user's data plane application. When creating applications for the Linux user space, the glibc library is used. -For DPDK applications, two environmental variables (RTE_SDK and RTE_TARGET) -must be configured before compiling the applications. -The following are examples of how the variables can be set: - -.. code-block:: console - - export RTE_SDK=/home/user/DPDK - export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started Guide* for information on setting up the development environment. diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 31c153a1b7..8d531bd9ef 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -8,29 +8,10 @@ Source Organization This section describes the organization of sources in the DPDK framework. -Makefiles and Config --------------------- - -.. note:: - - In the following descriptions, - ``RTE_SDK`` is the environment variable that points to the base directory into which the tarball was extracted. - See - :ref:`Useful_Variables_Provided_by_the_Build_System` - for descriptions of other variables. - -Makefiles that are provided by the DPDK libraries and applications are located in ``$(RTE_SDK)/mk``. - -Config templates are located in ``$(RTE_SDK)/config``. The templates describe the options that are enabled for each target. -The config file also contains items that can be enabled and disabled for many of the DPDK libraries, -including debug options. -The user should look at the config file and become familiar with these options. -The config file is also used to create a header file, which will be located in the new build directory. - Libraries --------- -Libraries are located in subdirectories of ``$(RTE_SDK)/lib``. +Libraries are located in subdirectories of ``dpdk/lib``. By convention a library refers to any code that provides an API to an application. Typically, it generates an archive file (``.a``), but a kernel module would also go in the same directory. @@ -55,7 +36,7 @@ Applications ------------ Applications are source files that contain a ``main()`` function. -They are located in the ``$(RTE_SDK)/app`` and ``$(RTE_SDK)/examples`` directories. +They are located in the ``dpdk/app`` and ``dpdk/examples`` directories. The app directory contains sample applications that are used to test DPDK (such as autotests) or the Poll Mode Drivers (test-pmd). diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 345c38d5b6..279eccb04a 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -11,13 +11,6 @@ here. Deprecation Notices ------------------- -* make: Support for building DPDK with "make" has been deprecated and - support will be removed in the 20.11 release. From 20.11 onwards, DPDK - should be built using meson and ninja. For basic instructions see the - `Quick-start Guide <https://core.dpdk.org/doc/quick-start/>`_ on the - website or the `Getting Started Guide - <https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html>`_ document. - * meson: The minimum supported version of meson for configuring and building DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For those users with a version earlier than 0.47.1, an updated copy of meson diff --git a/drivers/Makefile b/drivers/Makefile deleted file mode 100644 index 7f06162dc4..0000000000 --- a/drivers/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += common -DIRS-y += bus -DEPDIRS-bus := common -DIRS-y += mempool -DEPDIRS-mempool := common bus -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -DIRS-y += common/mlx5 -DEPDIRS-common/mlx5 := bus -endif -DIRS-y += net -DEPDIRS-net := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband -DEPDIRS-baseband := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto -DEPDIRS-crypto := common bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat -DEPDIRS-common/qat := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress -DEPDIRS-compress := bus mempool -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex -DEPDIRS-regex := common bus common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa -DEPDIRS-vdpa := common bus mempool common/mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event -DEPDIRS-event := common bus mempool net crypto -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw -DEPDIRS-raw := common bus mempool net event - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/Makefile b/drivers/baseband/Makefile deleted file mode 100644 index dcc0969175..0000000000 --- a/drivers/baseband/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -core-libs := librte_eal librte_mbuf librte_mempool librte_ring -core-libs += librte_bbdev librte_kvargs librte_cfgfile - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null -DEPDIRS-null = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw -DEPDIRS-turbo_sw = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec -DEPDIRS-fpga_lte_fec = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += fpga_5gnr_fec -DEPDIRS-fpga_5gnr_fec = $(core-libs) - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/fpga_5gnr_fec/Makefile b/drivers/baseband/fpga_5gnr_fec/Makefile deleted file mode 100644 index 7b7017c6dc..0000000000 --- a/drivers/baseband/fpga_5gnr_fec/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_5gnr_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_5gnr_fec_version.map - -# library version -LIBABIVER := 1 - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += rte_fpga_5gnr_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC)-include += rte_pmd_fpga_5gnr_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/fpga_lte_fec/Makefile b/drivers/baseband/fpga_lte_fec/Makefile deleted file mode 100644 index 30caafe3db..0000000000 --- a/drivers/baseband/fpga_lte_fec/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_fpga_lte_fec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/null/Makefile b/drivers/baseband/null/Makefile deleted file mode 100644 index 0ee500166d..0000000000 --- a/drivers/baseband/null/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk -# library name -LIB = librte_pmd_bbdev_null.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_null_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += bbdev_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/baseband/turbo_sw/Makefile b/drivers/baseband/turbo_sw/Makefile deleted file mode 100644 index c2a6fe0f81..0000000000 --- a/drivers/baseband/turbo_sw/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_bbdev_turbo_sw.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs -LDLIBS += -lrte_bbdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_bbdev_turbo_sw_version.map - -# external library dependencies if available -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -ifeq ($(FLEXRAN_SDK),) -$(error "Please define FLEXRAN_SDK environment variable") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_common -CFLAGS += -I$(FLEXRAN_SDK)/lib_turbo -CFLAGS += -I$(FLEXRAN_SDK)/lib_crc -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -LDLIBS += -L$(FLEXRAN_SDK)/lib_crc -lcrc -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -LDLIBS += -L$(FLEXRAN_SDK)/lib_common -lcommon -LDLIBS += -lstdc++ -lirc -limf -lipps -lsvml -endif - -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),n) -$(error "CONFIG_RTE_BBDEV_SDK_AVX512 requires CONFIG_RTE_BBDEV_SDK_AVX2 set") -endif -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += bbdev_turbo_software.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile deleted file mode 100644 index cea3b55e60..0000000000 --- a/drivers/bus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc -endif -DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev -DIRS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile deleted file mode 100644 index ba40b21166..0000000000 --- a/drivers/bus/dpaa/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_BUS_DPAA=$(RTE_SDK)/drivers/bus/dpaa - -# -# library name -# -LIB = librte_bus_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual -CFLAGS += -I$(RTE_BUS_DPAA)/ -CFLAGS += -I$(RTE_BUS_DPAA)/include -CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_bus_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - dpaa_bus.c - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \ - base/fman/fman.c \ - base/fman/fman_hw.c \ - base/fman/netcfg_layer.c \ - base/qbman/process.c \ - base/qbman/bman.c \ - base/qbman/bman_driver.c \ - base/qbman/qman.c \ - base/qbman/qman_driver.c \ - base/qbman/dpaa_alloc.c \ - base/qbman/dpaa_sys.c - -# Link Pthread -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile deleted file mode 100644 index b98d758ee0..0000000000 --- a/drivers/bus/fslmc/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_fslmc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_common_dpaax - -# versioning export map -EXPORT_MAP := rte_bus_fslmc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - qbman/qbman_portal.c \ - qbman/qbman_debug.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ - mc/dpmng.c \ - mc/dpbp.c \ - mc/dpio.c \ - mc/mc_sys.c \ - mc/dpcon.c \ - mc/dpci.c \ - mc/dpdmai.c - -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpci.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c -SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile deleted file mode 100644 index 1df369103c..0000000000 --- a/drivers/bus/ifpga/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_bus_ifpga_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_bus.c -SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_common.c - -# -# Export include files -# -SYMLINK-$(CONFIG_RTE_LIBRTE_IFPGA_BUS)-include += rte_bus_ifpga.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile deleted file mode 100644 index f4102d0a7f..0000000000 --- a/drivers/bus/pci/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_pci.a -EXPORT_MAP := rte_bus_pci_version.map - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -SYSTEM := bsd -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_pci -lrte_kvargs - -include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c -SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI_BUS)-include += rte_bus_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/pci/bsd/Makefile b/drivers/bus/pci/bsd/Makefile deleted file mode 100644 index c1b54c05ef..0000000000 --- a/drivers/bus/pci/bsd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c diff --git a/drivers/bus/pci/linux/Makefile b/drivers/bus/pci/linux/Makefile deleted file mode 100644 index 90404468b0..0000000000 --- a/drivers/bus/pci/linux/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -SRCS += pci.c -SRCS += pci_uio.c -SRCS += pci_vfio.c diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile deleted file mode 100644 index 01747f03a4..0000000000 --- a/drivers/bus/vdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_bus_vdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_bus_vdev_version.map - -SRCS-y += vdev.c -SRCS-y += vdev_params.c - -LDLIBS += -lrte_eal -lrte_kvargs - -# -# Export include files -# -SYMLINK-y-include += rte_bus_vdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/Makefile b/drivers/bus/vmbus/Makefile deleted file mode 100644 index 335df6a0ba..0000000000 --- a/drivers/bus/vmbus/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_bus_vmbus.a -EXPORT_MAP := rte_bus_vmbus_version.map - -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 $(WERROR_FLAGS) - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) -SYSTEM := linux -endif -ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) -$(error "VMBUS not implemented for BSD yet") -endif - -CFLAGS += -I$(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev - -include $(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM)/Makefile -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) := $(addprefix $(SYSTEM)/,$(SRCS)) -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_channel.c vmbus_bufring.c -SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common_uio.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_bus_vmbus.h -SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_vmbus_reg.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/vmbus/linux/Makefile b/drivers/bus/vmbus/linux/Makefile deleted file mode 100644 index ef0d30b2d3..0000000000 --- a/drivers/bus/vmbus/linux/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -SRCS += vmbus_bus.c vmbus_uio.c diff --git a/drivers/common/Makefile b/drivers/common/Makefile deleted file mode 100644 index cfb6b4dc88..0000000000 --- a/drivers/common/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifneq (,$(findstring y,$(CPT-y))) -DIRS-y += cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -DIRS-y += octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -DIRS-y += octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -DIRS-y += mvep -endif - -ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y) -DIRS-y += dpaax -endif - -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifneq (,$(findstring y,$(IAVF-y))) -DIRS-y += iavf -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/common/cpt/Makefile b/drivers/common/cpt/Makefile deleted file mode 100644 index cab9da73c8..0000000000 --- a/drivers/common/cpt/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_cpt.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -EXPORT_MAP := rte_common_cpt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += cpt_fpm_tables.c -SRCS-y += cpt_pmd_ops_helper.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile deleted file mode 100644 index 2f4b924fda..0000000000 --- a/drivers/common/dpaax/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_dpaax.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib - -# versioning export map -EXPORT_MAP := rte_common_dpaax_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/iavf/Makefile b/drivers/common/iavf/Makefile deleted file mode 100644 index f06dafd408..0000000000 --- a/drivers/common/iavf/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_iavf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -Wno-cast-qual - -EXPORT_MAP := rte_common_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += iavf_adminq.c -SRCS-y += iavf_common.c -SRCS-y += iavf_impl.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile deleted file mode 100644 index 4edd541042..0000000000 --- a/drivers/common/mlx5/Makefile +++ /dev/null @@ -1,404 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_common_mlx5.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx5_glue.so -LIB_GLUE_VERSION = 20.02.0 - -# Sources. -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-y += linux/mlx5_glue.c -endif -SRCS-y += mlx5_devx_cmds.c -SRCS-y += mlx5_common.c -SRCS-y += linux/mlx5_common_os.c -SRCS-y += linux/mlx5_nl.c -SRCS-y += linux/mlx5_common_verbs.c -SRCS-y += mlx5_common_mp.c -SRCS-y += mlx5_common_mr.c -SRCS-y += mlx5_malloc.c -SRCS-y += mlx5_common_pci.c -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-y-lib += $(LIB_GLUE) -endif -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(SRCDIR)/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_linux/mlx5_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx5 -endif - -LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual -UPEDANTIC - -EXPORT_MAP := rte_common_mlx5_version.map - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx5_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx5_autoconf.h.new: FORCE - -mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_RELAXED_ORDERING \ - infiniband/verbs.h \ - enum IBV_ACCESS_RELAXED_ORDERING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_TUNNEL_SUPPORT \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_MPLS_SUPPORT \ - infiniband/verbs.h \ - enum IBV_FLOW_SPEC_MPLS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_WQ_FLAG_RX_END_PADDING \ - infiniband/verbs.h \ - enum IBV_WQ_FLAG_RX_END_PADDING \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_SWP \ - infiniband/mlx5dv.h \ - type 'struct mlx5dv_sw_parsing_caps' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_MPW \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_COMP \ - infiniband/mlx5dv.h \ - enum MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX5_MOD_CQE_128B_PAD \ - infiniband/mlx5dv.h \ - enum MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DV_SUPPORT \ - infiniband/mlx5dv.h \ - func mlx5dv_create_flow_action_packet_reformat \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_NIC_RX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ESWITCH \ - infiniband/mlx5dv.h \ - enum MLX5DV_DR_DOMAIN_TYPE_FDB \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_VLAN \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_push_vlan \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_DEVX_PORT \ - infiniband/mlx5dv.h \ - func mlx5dv_query_devx_port \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_OBJ \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_create \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_FLOW_DEVX_COUNTERS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS \ - infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_DEFAULT_MISS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_ASYNC \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_obj_query_async \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_QP \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_qp_query \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DEVX_UAR_OFFSET \ - infiniband/mlx5dv.h \ - field "struct mlx5dv_devx_uar.mmap_off" \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_PP_ALLOC \ - infiniband/mlx5dv.h \ - func mlx5dv_pp_alloc \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_dest_devx_tir \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVX_EVENT \ - infiniband/mlx5dv.h \ - func mlx5dv_devx_get_event \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_action_create_flow_meter \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_DR_FLOW_DUMP \ - infiniband/mlx5dv.h \ - func mlx5dv_dump_dr_domain \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD \ - infiniband/mlx5dv.h \ - enum MLX5_MMAP_GET_NC_PAGES_CMD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_VAR \ - infiniband/mlx5dv.h \ - func mlx5dv_alloc_var \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5DV_DR_MEM_RECLAIM \ - infiniband/mlx5dv.h \ - func mlx5dv_dr_domain_set_reclaim_device_memory \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_ENHANCED_MPSW \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_ENHANCED_MPSW \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_SEND_EN \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_SEND_EN \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_MLX5_OPCODE_WAIT \ - infiniband/mlx5dv.h \ - enum MLX5_OPCODE_WAIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_25G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_50G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_ETHTOOL_LINK_MODE_100G \ - /usr/include/linux/ethtool.h \ - enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V42 \ - infiniband/verbs.h \ - type 'struct ibv_counter_set_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_DEVICE_COUNTERS_SET_V45 \ - infiniband/verbs.h \ - type 'struct ibv_counters_init_attr' \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NL_NLDEV \ - rdma/rdma_netlink.h \ - enum RDMA_NL_NLDEV \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_CMD_PORT_GET \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_CMD_PORT_GET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_DEV_NAME \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_DEV_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_PORT_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_PORT_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX \ - rdma/rdma_netlink.h \ - enum RDMA_NLDEV_ATTR_NDEV_INDEX \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_NUM_VF \ - linux/if_link.h \ - enum IFLA_NUM_VF \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_EXT_MASK \ - linux/if_link.h \ - enum IFLA_EXT_MASK \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_SWITCH_ID \ - linux/if_link.h \ - enum IFLA_PHYS_SWITCH_ID \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IFLA_PHYS_PORT_NAME \ - linux/if_link.h \ - enum IFLA_PHYS_PORT_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_DEVLINK \ - linux/devlink.h \ - define DEVLINK_GENL_NAME \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_40000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_40000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseKR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseKR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseCR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseCR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseSR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseSR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_SUPPORTED_56000baseLR4_Full \ - /usr/include/linux/ethtool.h \ - define SUPPORTED_56000baseLR4_Full \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_STATIC_ASSERT \ - /usr/include/assert.h \ - define static_assert \ - $(AUTOCONF_OUTPUT) - -# Create mlx5_autoconf.h or update it in case it differs from the new one. - -mlx5_autoconf.h: mlx5_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -$(SRCS-y:.c=.o): mlx5_autoconf.h -endif - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): linux/mlx5_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx5 - -linux/mlx5_glue.o: mlx5_autoconf.h - -endif - -clean_mlx5: FORCE - $Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new - $Q rm -f -- linux/mlx5_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx5 diff --git a/drivers/common/mvep/Makefile b/drivers/common/mvep/Makefile deleted file mode 100644 index f91d295e5c..0000000000 --- a/drivers/common/mvep/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_common_mvep.a - -# versioning export map -EXPORT_MAP := rte_common_mvep_version.map - -# external library dependencies -CFLAGS += -I$($RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_kvargs - -# library source files -SRCS-y += mvep_common.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx/Makefile b/drivers/common/octeontx/Makefile deleted file mode 100644 index 5e67df0583..0000000000 --- a/drivers/common/octeontx/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -EXPORT_MAP := rte_common_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += octeontx_mbox.c - -LDLIBS += -lrte_eal - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/octeontx2/Makefile b/drivers/common/octeontx2/Makefile deleted file mode 100644 index 260da8dd3e..0000000000 --- a/drivers/common/octeontx2/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_common_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_common_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-y += otx2_dev.c -SRCS-y += otx2_irq.c -SRCS-y += otx2_mbox.c -SRCS-y += otx2_common.c -SRCS-y += otx2_sec_idev.c - -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile deleted file mode 100644 index 85d4207099..0000000000 --- a/drivers/common/qat/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# build directories -QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat -QAT_COMPRESS_DIR := $(RTE_SDK)/drivers/compress/qat -VPATH=$(QAT_CRYPTO_DIR):$(QAT_COMPRESS_DIR) - -# external library include paths -CFLAGS += -I$(SRCDIR)/qat_adf -CFLAGS += -I$(SRCDIR) -CFLAGS += -I$(QAT_CRYPTO_DIR) -CFLAGS += -I$(QAT_COMPRESS_DIR) - - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) - LDLIBS += -lrte_compressdev - SRCS-y += qat_comp.c - SRCS-y += qat_comp_pmd.c - build_qat = yes -endif - -# library symmetric crypto source files -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto - CFLAGS += -DBUILD_QAT_ASYM - SRCS-y += qat_asym.c - SRCS-y += qat_asym_pmd.c - build_qat = yes -endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),y) - LDLIBS += -lrte_cryptodev - LDLIBS += -lcrypto -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) - LDLIBS += -lrte_net -endif - CFLAGS += -DBUILD_QAT_SYM - SRCS-y += qat_sym.c - SRCS-y += qat_sym_session.c - SRCS-y += qat_sym_pmd.c - build_qat = yes -endif -endif - -ifdef build_qat - - # library name - LIB = librte_pmd_qat.a - - # build flags - CFLAGS += $(WERROR_FLAGS) - CFLAGS += -O3 - - # library common source files - SRCS-y += qat_device.c - SRCS-y += qat_common.c - SRCS-y += qat_logs.c - SRCS-y += qat_qp.c - - LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool - LDLIBS += -lrte_pci -lrte_bus_pci - - # export include files - SYMLINK-y-include += - - # versioning export map - EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/Makefile b/drivers/compress/Makefile deleted file mode 100644 index 286ea6ee84..0000000000 --- a/drivers/compress/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/compress/isal/Makefile b/drivers/compress/isal/Makefile deleted file mode 100644 index 1e225ab434..0000000000 --- a/drivers/compress/isal/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_isal_comp.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# external library dependencies -LDLIBS += -lisal -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_isal_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd_ops.c - -# export include files -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/octeontx/Makefile b/drivers/compress/octeontx/Makefile deleted file mode 100644 index 9ba1db791e..0000000000 --- a/drivers/compress/octeontx/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_zip.a - -# build flags -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/compress/octeontx/include - -# external library include paths -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_pci -lrte_bus_pci - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_compress_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/zlib/Makefile b/drivers/compress/zlib/Makefile deleted file mode 100644 index 9f695f7d9a..0000000000 --- a/drivers/compress/zlib/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium Networks - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zlib.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zlib_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lz -LDLIBS += -lrte_compressdev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile deleted file mode 100644 index 47a2a9e794..0000000000 --- a/drivers/crypto/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi -DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += zuc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += mvsam -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec -endif # CONFIG_RTE_LIBRTE_PMD_DPAA_SEC -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile deleted file mode 100644 index 01cb4fddfe..0000000000 --- a/drivers/crypto/aesni_gcm/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_gcm.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_gcm_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile deleted file mode 100644 index f0dc82f395..0000000000 --- a/drivers/crypto/aesni_mb/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_aesni_mb.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_aesni_mb_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.52 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.52 is required") -endif - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/armv8/Makefile b/drivers/crypto/armv8/Makefile deleted file mode 100644 index 0e3bc9fb70..0000000000 --- a/drivers/crypto/armv8/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(ARMV8_CRYPTO_LIB_PATH),) -$(error "Please define ARMV8_CRYPTO_LIB_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_armv8.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_armv8_version.map - -# external library dependencies -CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH) -LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile deleted file mode 100644 index 89d3238172..0000000000 --- a/drivers/crypto/caam_jr/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_caam_jr.a - -# build flags -CFLAGS += -D _GNU_SOURCE - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -# versioning export map -EXPORT_MAP := rte_pmd_caam_jr_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_uio.c -# library dependencies - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile deleted file mode 100644 index 3f5da2adf3..0000000000 --- a/drivers/crypto/ccp/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_ccp.a - -# build flags -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += $(WERROR_FLAGS) - -# external library include paths -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -# versioning export map -EXPORT_MAP := rte_pmd_ccp_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += rte_ccp_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile deleted file mode 100644 index a0a2795575..0000000000 --- a/drivers/crypto/dpaa2_sec/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -# -# library name -# -LIB = librte_pmd_dpaa2_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -CFLAGS += -Wno-implicit-fallthrough -endif -endif - -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2/ - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec_dpseci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += mc/dpseci.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile deleted file mode 100644 index ea266962a3..0000000000 --- a/drivers/crypto/dpaa_sec/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa_sec.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa_sec_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c - -# library dependencies - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/kasumi/Makefile b/drivers/crypto/kasumi/Makefile deleted file mode 100644 index a7d0d079d2..0000000000 --- a/drivers/crypto/kasumi/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_kasumi.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_kasumi_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/mvsam/Makefile b/drivers/crypto/mvsam/Makefile deleted file mode 100644 index f0641ae7d9..0000000000 --- a/drivers/crypto/mvsam/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvsam_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC - -# versioning export map -EXPORT_MAP := rte_pmd_mvsam_version.map - -# external library dependencies -LDLIBS += -L$(LIBMUSDK_PATH)/lib -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/nitrox/Makefile b/drivers/crypto/nitrox/Makefile deleted file mode 100644 index 535121196b..0000000000 --- a/drivers/crypto/nitrox/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_nitrox.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_nitrox_version.map - -# external library dependencies -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_cryptodev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_device.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_reqmgr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_qp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/null/Makefile b/drivers/crypto/null/Makefile deleted file mode 100644 index 4595055f01..0000000000 --- a/drivers/crypto/null/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - - -# library name -LIB = librte_pmd_null_crypto.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_null_crypto_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd_ops.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx/Makefile b/drivers/crypto/octeontx/Makefile deleted file mode 100644 index 296755ee90..0000000000 --- a/drivers/crypto/octeontx/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_ops.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/octeontx2/Makefile b/drivers/crypto/octeontx2/Makefile deleted file mode 100644 index 14152c6117..0000000000 --- a/drivers/crypto/octeontx2/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_octeontx2_crypto.a - -# build flags -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_security -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_common_cpt -lrte_common_octeontx2 - -VPATH += $(RTE_SDK)/drivers/crypto/octeontx2 - -CFLAGS += -O3 -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -# PMD code -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_capabilities.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_hw_access.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_sec.c - -# export include files -SYMLINK-y-include += - -# versioning export map -EXPORT_MAP := rte_pmd_octeontx2_crypto_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/openssl/Makefile b/drivers/crypto/openssl/Makefile deleted file mode 100644 index b85c816551..0000000000 --- a/drivers/crypto/openssl/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_openssl.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_openssl_version.map - -# external library dependencies -LDLIBS += -lcrypto -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/scheduler/Makefile b/drivers/crypto/scheduler/Makefile deleted file mode 100644 index 67aac024c4..0000000000 --- a/drivers/crypto/scheduler/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_crypto_scheduler.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -lrte_kvargs -lrte_reorder -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_crypto_scheduler_version.map - -# -# Export include files -# -SYMLINK-y-include += rte_cryptodev_scheduler_operations.h -SYMLINK-y-include += rte_cryptodev_scheduler.h - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += rte_cryptodev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_roundrobin.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pkt_size_distr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_failover.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_multicore.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile deleted file mode 100644 index 469aefaa56..0000000000 --- a/drivers/crypto/snow3g/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_snow3g.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_snow3g_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile deleted file mode 100644 index 32e2e4d5e9..0000000000 --- a/drivers/crypto/virtio/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio_crypto.a - -# -# include virtio_crypto.h -# -CFLAGS += -I$(RTE_SDK)/lib/librte_vhost -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_virtio_crypto_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c - -# this lib depends upon: -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_pci -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/zuc/Makefile b/drivers/crypto/zuc/Makefile deleted file mode 100644 index 529b47f25e..0000000000 --- a/drivers/crypto/zuc/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_zuc.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# versioning export map -EXPORT_MAP := rte_pmd_zuc_version.map - -# external library dependencies -LDLIBS += -lIPSec_MB -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -H := \# -IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \ - $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ - head -n1 | cut -d'"' -f2) - -# Detect library version -IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) -IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) - -ifeq ($(IMB_VERSION),) -$(error "IPSec_MB version >= 0.53 is required") -endif - -ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) -$(error "IPSec_MB version >= 0.53 is required") -endif -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd_ops.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/Makefile b/drivers/event/Makefile deleted file mode 100644 index 86be41b9eb..0000000000 --- a/drivers/event/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += octeontx2 -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile deleted file mode 100644 index a39dc27c62..0000000000 --- a/drivers/event/dpaa/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa_event.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -LDLIBS += -lrte_pmd_dpaa_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec - -EXPORT_MAP := rte_pmd_dpaa_event_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa_eventdev.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile deleted file mode 100644 index 75cf197c5c..0000000000 --- a/drivers/event/dpaa2/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017,2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2_event.a - -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 -LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc - -LDLIBS += -lrte_pmd_dpaa2_sec -CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_hw_dpcon.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev_selftest.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile deleted file mode 100644 index f6e7dda1fd..0000000000 --- a/drivers/event/dsw/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Ericsson AB - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_dsw_event.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -Wno-format-nonliteral -endif - -LDLIBS += -lrte_eal -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool -LDLIBS += -lrte_ring -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_dsw_event_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += \ - dsw_evdev.c dsw_event.c dsw_xstats.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile deleted file mode 100644 index c1233e098d..0000000000 --- a/drivers/event/octeontx/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx_ssovf.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/ - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_ethdev - -EXPORT_MAP := rte_pmd_octeontx_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_probe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_probe.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_ssovf_worker.o += -fno-prefetch-loop-arrays -CFLAGS_timvf_worker.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -else -CFLAGS_ssovf_worker.o += -O3 -ffast-math -CFLAGS_timvf_worker.o += -O3 -ffast-math -endif - -else -CFLAGS_ssovf_worker.o += -Ofast -CFLAGS_timvf_worker.o += -Ofast -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/octeontx2/Makefile b/drivers/event/octeontx2/Makefile deleted file mode 100644 index 9d67b00c69..0000000000 --- a/drivers/event/octeontx2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2_event.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/event/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_event_version.map - -# -# all source are stored in SRCS-y -# - -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker_dual.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_adptr.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_selftest.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_irq.c - -LDLIBS += -lrte_eal -lrte_bus_pci -lrte_pci -lrte_kvargs -LDLIBS += -lrte_mempool -lrte_eventdev -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile deleted file mode 100644 index 71713b00ae..0000000000 --- a/drivers/event/opdl/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_opdl_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_pmd_opdl_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_init.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_test.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/skeleton/Makefile b/drivers/event/skeleton/Makefile deleted file mode 100644 index dc85ad3c4b..0000000000 --- a/drivers/event/skeleton/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_skeleton_event.a - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_skeleton_event_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton_eventdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/event/sw/Makefile b/drivers/event/sw/Makefile deleted file mode 100644 index 8ea5cceb8b..0000000000 --- a/drivers/event/sw/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pmd_sw_event.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -lrte_ring -LDLIBS += -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_bus_vdev - -# versioning export map -EXPORT_MAP := rte_pmd_sw_event_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_worker.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_scheduler.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_xstats.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_selftest.c - -# export include files -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile deleted file mode 100644 index 29ef73bf44..0000000000 --- a/drivers/mempool/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += bucket -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2 -endif -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring -DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += octeontx2 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/mempool/bucket/Makefile b/drivers/mempool/bucket/Makefile deleted file mode 100644 index c766c35b2c..0000000000 --- a/drivers/mempool/bucket/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright (c) 2017-2018 Solarflare Communications Inc. -# All rights reserved. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_bucket.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_bucket_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += rte_mempool_bucket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile deleted file mode 100644 index 144969c627..0000000000 --- a/drivers/mempool/dpaa/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile deleted file mode 100644 index 04db6d27de..0000000000 --- a/drivers/mempool/dpaa2/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include - -# versioning export map -EXPORT_MAP := rte_mempool_dpaa2_version.map - -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_common_dpaax - -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)-include := rte_dpaa2_mempool.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx/Makefile b/drivers/mempool/octeontx/Makefile deleted file mode 100644 index 9c840620d9..0000000000 --- a/drivers/mempool/octeontx/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ - -EXPORT_MAP := rte_mempool_octeontx_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx_fpavf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += rte_mempool_octeontx.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_rte_mempool_octeontx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_rte_mempool_octeontx.o += -Ofast -else -CFLAGS_rte_mempool_octeontx.o += -O3 -ffast-math -endif - -else -CFLAGS_rte_mempool_octeontx.o += -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_bus_pci -lrte_common_octeontx - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/octeontx2/Makefile b/drivers/mempool/octeontx2/Makefile deleted file mode 100644 index 3828219b11..0000000000 --- a/drivers/mempool/octeontx2/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/bus/pci -CFLAGS += -O3 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_mempool_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += \ - otx2_mempool_ops.c \ - otx2_mempool.c \ - otx2_mempool_irq.c \ - otx2_mempool_debug.c - -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_kvargs -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/ring/Makefile b/drivers/mempool/ring/Makefile deleted file mode 100644 index 8624502da9..0000000000 --- a/drivers/mempool/ring/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring - -EXPORT_MAP := rte_mempool_ring_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += rte_mempool_ring.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile deleted file mode 100644 index ccfd970400..0000000000 --- a/drivers/mempool/stack/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_mempool_stack.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# Headers -CFLAGS += -I$(RTE_SDK)/lib/librte_mempool -LDLIBS += -lrte_eal -lrte_mempool -lrte_stack - -EXPORT_MAP := rte_mempool_stack_version.map - -SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/Makefile b/drivers/net/Makefile deleted file mode 100644 index 361974eacf..0000000000 --- a/drivers/net/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# set in mk/toolchain/xxx/rte.toolchain-compat.mk -ifeq ($(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD),d) - $(warning thunderx pmd is not supported by old compilers) -endif - -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet -DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += af_xdp -DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark -DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic -DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp -DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe -DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding -DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2 -endif -DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 -DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena -DIRS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc -DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic -DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe -DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k -DIRS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic -DIRS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3 -DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e -DIRS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf -DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice -DIRS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc -DIRS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic -DIRS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke -DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe -DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio -DIRS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif -DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5 -DIRS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta -DIRS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mvpp2 -DIRS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += netvsc -DIRS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb -DIRS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp -DIRS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx -DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += octeontx2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap -DIRS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe -DIRS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede -DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring -DIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += szedata2 -DIRS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap -DIRS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += thunderx -DIRS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc -DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio -DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3 - -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += kni -endif - -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += softnic -endif # $(CONFIG_RTE_LIBRTE_SCHED) - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost -endif # $(CONFIG_RTE_LIBRTE_VHOST) - -ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y) -ifeq ($(CONFIG_RTE_LIBRTE_CFGFILE),n) -$(error "RTE_LIBRTE_CFGFILE must be enabled in configuration!") -endif -endif - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/net/af_packet/Makefile b/drivers/net/af_packet/Makefile deleted file mode 100644 index 91dbf0a692..0000000000 --- a/drivers/net/af_packet/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 John W. Linville <linville@redhat.com> -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_packet.a - -EXPORT_MAP := rte_pmd_af_packet_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += rte_eth_af_packet.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/af_xdp/Makefile b/drivers/net/af_xdp/Makefile deleted file mode 100644 index 55db6085ac..0000000000 --- a/drivers/net/af_xdp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_af_xdp.a - -EXPORT_MAP := rte_pmd_af_xdp_version.map - -CFLAGS += -O3 - -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libbpf || echo "-lbpf") - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += rte_eth_af_xdp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile deleted file mode 100644 index c02080bdd0..0000000000 --- a/drivers/net/ark/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2018 Atomic Rules LLC - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ark.a - -CFLAGS += -O3 -I./ -CFLAGS += $(WERROR_FLAGS) -Werror - -EXPORT_MAP := rte_pmd_ark_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ddm.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_mpu.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktchkr.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktgen.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_rqp.c -SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c - -# this lib depends upon: -LDLIBS += -lpthread -ifdef CONFIG_RTE_EXEC_ENV_LINUX -LDLIBS += -ldl -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/atlantic/Makefile b/drivers/net/atlantic/Makefile deleted file mode 100644 index 0d0d0a502d..0000000000 --- a/drivers/net/atlantic/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Aquantia Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_atlantic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_atlantic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/hw_atl - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_hw_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_llh.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils_fw2x.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_b0.c -SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += rte_pmd_atlantic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/avp/Makefile b/drivers/net/avp/Makefile deleted file mode 100644 index 075247b13a..0000000000 --- a/drivers/net/avp/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2017, Wind River Systems, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_avp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_avp_version.map - -# install public header files to enable compilation of the hypervisor level -# dpdk application -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_common.h -SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_fifo.h - -# -# all source files are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/axgbe/Makefile b/drivers/net/axgbe/Makefile deleted file mode 100644 index e421d0da11..0000000000 --- a/drivers/net/axgbe/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_axgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_axgbe_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_ethdev -lrte_net - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_mdio.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_phy_impl.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_i2c.c -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx_vec_sse.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile deleted file mode 100644 index 451434cc18..0000000000 --- a/drivers/net/bnx2x/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2014 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnx2x.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DZLIB_CONST -LDLIBS += -lz -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_bnx2x_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += ecore_sp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += elink.c -SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_vfpf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile deleted file mode 100644 index 0c5b74918d..0000000000 --- a/drivers/net/bnxt/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bnxt.a - -EXPORT_MAP := rte_pmd_bnxt_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -pthread - -EXPORT_MAP := rte_pmd_bnxt_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_cpr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_hwrm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ring.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_reps.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64), y) -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD), y) -CFLAGS += -I$(SRCDIR) -I$(SRCDIR)/tf_ulp -I$(SRCDIR)/tf_core -I$(SRCDIR)/hcapi -include $(SRCDIR)/tf_ulp/Makefile -include $(SRCDIR)/tf_core/Makefile -include $(SRCDIR)/hcapi/Makefile -endif - -# -# Export include files -# -SYMLINK-y-include += -SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include += rte_pmd_bnxt.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/bnxt/hcapi/Makefile b/drivers/net/bnxt/hcapi/Makefile deleted file mode 100644 index a5bb398ad7..0000000000 --- a/drivers/net/bnxt/hcapi/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += hcapi/hcapi_cfa_p4.c diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile deleted file mode 100644 index 84840366ab..0000000000 --- a/drivers/net/bnxt/tf_core/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/bitalloc.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/rand.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/stack.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/ll.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_core.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_rm.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tfp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device_p4.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_util.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_if_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_global_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_identifier.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_hash.c diff --git a/drivers/net/bnxt/tf_ulp/Makefile b/drivers/net/bnxt/tf_ulp/Makefile deleted file mode 100644 index abb68150d1..0000000000 --- a/drivers/net/bnxt/tf_ulp/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# Copyright(c) Broadcom Limited. -# All rights reserved. - -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_class.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_act.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_rte_parser.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_matcher.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mapper.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mark_mgr.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_flow_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_port_db.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_def_rules.c -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_fc_mgr.c diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile deleted file mode 100644 index 728551a846..0000000000 --- a/drivers/net/bonding/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_bond.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_bond_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_8023ad.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_alb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_flow.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_bond.h -SYMLINK-y-include += rte_eth_bond_8023ad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile deleted file mode 100644 index 53b2bb56dc..0000000000 --- a/drivers/net/cxgbe/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014-2018 Chelsio Communications. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_cxgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_cxgbe_version.map - -# -# CFLAGS for gcc/clang -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_main.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += clip_tbl.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += mps_tcam.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += l2t.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += smt.c -SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4vf_hw.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile deleted file mode 100644 index d7bbc0e158..0000000000 --- a/drivers/net/dpaa/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk -RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa - -# -# library name -# -LIB = librte_pmd_dpaa.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK_DPAA)/ -CFLAGS += -I$(RTE_SDK_DPAA)/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ -CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_pmd_dpaa_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c - -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_mempool_dpaa -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile deleted file mode 100644 index 6f38c18b9b..0000000000 --- a/drivers/net/dpaa2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2016-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_dpaa2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal -CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 - -# versioning export map -EXPORT_MAP := rte_pmd_dpaa2_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_sparser.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c -SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c -SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += dpaa2_ptp.c - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_common_dpaax - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_PMD)-include := rte_pmd_dpaa2.h -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile deleted file mode 100644 index f186f8d0e9..0000000000 --- a/drivers/net/e1000/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_e1000.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_e1000_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 177 -diag-disable 181 -CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259 -else -# -# CFLAGS for gcc/clang -# -CFLAGS_BASE_DRIVER = -Wno-uninitialized -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-misleading-indentation -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -endif - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_base.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_80003es2lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82540.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82541.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82542.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82543.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82571.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82575.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_i210.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_api.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_ich8lan.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile deleted file mode 100644 index 8ccff36db7..0000000000 --- a/drivers/net/ena/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2015-2019 Amazon.com, Inc. or its affiliates. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ena.a -CFLAGS += $(WERROR_FLAGS) -O2 -INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ena_version.map - -VPATH += $(SRCDIR)/base -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c -SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c - -CFLAGS += $(INCLUDES) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_timer - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile deleted file mode 100644 index 7276026e37..0000000000 --- a/drivers/net/enetc/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enetc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax -EXPORT_MAP := rte_pmd_enetc_version.map -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_dpaax - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile deleted file mode 100644 index d098a474a1..0000000000 --- a/drivers/net/enic/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2008-2017 Cisco Systems, Inc. All rights reserved. -# Copyright 2007 Nuova Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_enic.a - -EXPORT_MAP := rte_pmd_enic_version.map - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/src - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_fm_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_cq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c - -# The current implementation assumes 64-bit pointers -CC_AVX2_SUPPORT=0 -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -# Figure out if the compiler supports avx2. The extra check using -# -march=core-avx2 is necessary to support users who build for the -# 'default' machine (corei7 which has no avx2) and run the binary on -# newer CPUs that have avx2. -# This part is verbatim from i40e makefile. -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_enic_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_enic_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile deleted file mode 100644 index 464fd0515d..0000000000 --- a/drivers/net/failsafe/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_pmd_failsafe.a - -EXPORT_MAP := rte_pmd_failsafe_version.map - -# Sources are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_args.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_eal.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif - -# No exported include files - -# Basic CFLAGS: -CFLAGS += -std=gnu99 -Wextra -CFLAGS += -O3 -CFLAGS += -I. -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=700 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -CFLAGS += -pedantic -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile deleted file mode 100644 index d486389928..0000000000 --- a/drivers/net/fm10k/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_fm10k.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_fm10k_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) - -# -## CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -else -# -# CFLAGS for gcc -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of cid-fm10k.2017.01.24.tar.gz -# -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_rxtx.c - -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_tlv.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) += fm10k_rxtx_vec.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile deleted file mode 100644 index 87fd843e41..0000000000 --- a/drivers/net/hinic/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Huawei Technologies Co., Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hinic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -CFLAGS += -D__ARM64_NEON__ -else ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -CFLAGS += -D__X86_64_SSE__ -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_hinic_version.map - -# -# CFLAGS for 32-bits platforms -# -ifneq ($(CONFIG_RTE_ARCH_64),y) -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS += -diag-disable 2259 -else -# -# CFLAGS for gcc -# -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -endif -endif - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_api_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cmdq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_eqs.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwif.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mgmt.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_niccfg.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_nicio.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_wq.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_tx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/hns3/Makefile b/drivers/net/hns3/Makefile deleted file mode 100644 index d7798a4706..0000000000 --- a/drivers/net/hns3/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018-2019 Hisilicon Limited. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_hns3.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Experimantal APIs: -# - rte_mp_action_register -# - rte_mp_action_unregister -# - rte_mp_reply -# - rte_mp_request_sync - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_hns3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_cmd.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_regs.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mp.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile deleted file mode 100644 index 43f10941b2..0000000000 --- a/drivers/net/i40e/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_i40e.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF -CFLAGS += -DX722_A0_SUPPORT - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_i40e_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER = -diag-disable 593 -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER = -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-format -CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast -CFLAGS_BASE_DRIVER += -Wno-format-nonliteral -CFLAGS_BASE_DRIVER += -Wno-format-security -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -CFLAGS_i40e_lan_hmc.o += -Wno-error -endif -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# base driver is based on the package of dpdk-i40e.2016.04.18.12.tar.gz. -# -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_adminq.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_common.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_diag.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_lan_hmc.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c - -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_sse.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += rte_pmd_i40e.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_vf_representor.c - -ifeq ($(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR),y) -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_i40e_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_i40e_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_avx2.c - CFLAGS_i40e_rxtx.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_I40E_PMD)-include := rte_pmd_i40e.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/iavf/Makefile b/drivers/net/iavf/Makefile deleted file mode 100644 index 792cbb7f79..0000000000 --- a/drivers/net/iavf/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_iavf.a - -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf -CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_common_iavf - -EXPORT_MAP := rte_pmd_iavf_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_hash.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c -endif - -ifeq ($(CONFIG_RTE_LIBRTE_IAVF_PMD), y) - ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 - else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_iavf_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_iavf_rxtx_vec_avx2.o += -mavx2 - endif - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_avx2.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile deleted file mode 100644 index 34cd4024b3..0000000000 --- a/drivers/net/ice/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ice.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/iavf - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_hash -LDLIBS += -lrte_net -lrte_common_iavf -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ice_version.map - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings -# -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable -else -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -endif - -endif -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_controlq.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_common.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flex_pipe.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl_ctrl.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx.c -ifeq ($(CONFIG_RTE_ARCH_X86), y) -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c -endif - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_hash.c -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_ice_rxtx_vec_avx2.o += -march=core-avx2 - else - CFLAGS_ice_rxtx_vec_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_avx2.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_generic_flow.c - -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_parent.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ICE_PMD)-include := rte_pmd_ice.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/igc/Makefile b/drivers/net/igc/Makefile deleted file mode 100644 index d6d7959d2d..0000000000 --- a/drivers/net/igc/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019-2020 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_igc.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mbuf -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_pmd_igc_version.map - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_base.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_i225.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_manage.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_nvm.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_osdep.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_logs.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_txrx.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile deleted file mode 100644 index 7442e2c5cb..0000000000 --- a/drivers/net/ionic/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ionic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ionic_version.map - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_mac_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_lif.c -SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_main.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ipn3ke/Makefile b/drivers/net/ipn3ke/Makefile deleted file mode 100644 index 40696dbde8..0000000000 --- a/drivers/net/ipn3ke/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ipn3ke.a - -# -# Add the experimenatal APIs called from this PMD -# rte_eth_switch_domain_alloc() -# rte_eth_dev_create() -# rte_eth_dev_destroy() -# rte_eth_switch_domain_free() -# -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lrte_bus_vdev -LDLIBS += -lpthread - -EXPORT_MAP := rte_pmd_ipn3ke_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_representor.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_flow.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile deleted file mode 100644 index aebf3b286c..0000000000 --- a/drivers/net/ixgbe/Makefile +++ /dev/null @@ -1,110 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ixgbe.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_ixgbe_version.map - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -CFLAGS_ixgbe_rxtx.o += -diag-disable 3656 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -CFLAGS_ixgbe_common.o += -Wno-unused-but-set-variable -CFLAGS_ixgbe_x550.o += -Wno-unused-but-set-variable -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_ixgbe_x550.o += -Wno-maybe-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 50 && echo 1), 1) -CFLAGS_ixgbe_common.o += -Wno-logical-not-parentheses -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_pci -LDLIBS += -lpthread - -# -# Add extra flags for base driver files (also known as shared code) -# to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x540.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x550.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_api.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_hv_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82599.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82598.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_mbx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_fdir.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_pf.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_flow.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_neon.c -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_sse.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_BYPASS),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_bypass.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599_bypass.c -endif -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ipsec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += rte_pmd_ixgbe.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf_representor.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)-include := rte_pmd_ixgbe.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile deleted file mode 100644 index 0694ffd021..0000000000 --- a/drivers/net/kni/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_kni.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_kni_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += rte_eth_kni.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile deleted file mode 100644 index d7fda7f527..0000000000 --- a/drivers/net/liquidio/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_lio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_liquidio_version.map - -VPATH += $(RTE_SDK)/drivers/net/liquidio/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_23xx_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_mbox.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/memif/Makefile b/drivers/net/memif/Makefile deleted file mode 100644 index 3bf4ddce4c..0000000000 --- a/drivers/net/memif/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 Cisco Systems, Inc. All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_memif.a - -EXPORT_MAP := rte_pmd_memif_version.map - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs -lrte_net -LDLIBS += -lrte_hash -LDLIBS += -lrte_bus_vdev - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += rte_eth_memif.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif_socket.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile deleted file mode 100644 index 02e9b2ec07..0000000000 --- a/drivers/net/mlx4/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012 6WIND S.A. -# Copyright 2012 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx4.a -LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION) -LIB_GLUE_BASE = librte_pmd_mlx4_glue.so -LIB_GLUE_VERSION = 18.02.0 - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_flow.c -ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_glue.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_utils.c - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib += $(LIB_GLUE) -endif - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I. -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -CFLAGS += -DMLX4_GLUE='"$(LIB_GLUE)"' -CFLAGS += -DMLX4_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' -CFLAGS_mlx4_glue.o += -fPIC -LDLIBS += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -else -LDLIBS += -libverbs -lmlx4 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx4_version.map -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX4_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX4_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up mlx4_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS += -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -mlx4_autoconf.h.new: FORCE - -mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q : > '$@' - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_BUF_ALLOCATORS \ - infiniband/mlx4dv.h \ - enum MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_UAR_MMAP_OFFSET \ - infiniband/mlx4dv.h \ - enum MLX4DV_QP_MASK_UAR_MMAP_OFFSET \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_IBV_MLX4_WQE_LSO_SEG \ - infiniband/mlx4dv.h \ - type 'struct mlx4_wqe_lso_seg' \ - $(AUTOCONF_OUTPUT) - -# Create mlx4_autoconf.h or update it in case it differs from the new one. - -mlx4_autoconf.h: mlx4_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD):.c=.o): mlx4_autoconf.h - -# Generate dependency plug-in for rdma-core when the PMD must not be linked -# directly, so that applications do not inherit this dependency. - -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) - -$(LIB): $(LIB_GLUE) - -ifeq ($(LINK_USING_CC),1) -GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -else -GLUE_LDFLAGS := $(LDFLAGS) -endif -$(LIB_GLUE): mlx4_glue.o - $Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \ - -Wl,-h,$(LIB_GLUE) \ - -shared -o $@ $< -libverbs -lmlx4 - -mlx4_glue.o: mlx4_autoconf.h - -endif - -clean_mlx4: FORCE - $Q rm -f -- mlx4_autoconf.h mlx4_autoconf.h.new - $Q rm -f -- mlx4_glue.o $(LIB_GLUE_BASE)* - -clean: clean_mlx4 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile deleted file mode 100644 index 568c772415..0000000000 --- a/drivers/net/mlx5/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015 6WIND S.A. -# Copyright 2015 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txpp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c -ifneq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) \ - $(CONFIG_RTE_ARCH_PPC_64) \ - $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx_vec.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxmode.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_vlan.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rss.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mr.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk - diff --git a/drivers/net/mvneta/Makefile b/drivers/net/mvneta/Makefile deleted file mode 100644 index 41e50479ff..0000000000 --- a/drivers/net/mvneta/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd. -# Copyright(c) 2018 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvneta.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvneta_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_SIZE=64 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta_ethdev.c mvneta_rxtx.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/mvpp2/Makefile b/drivers/net/mvpp2/Makefile deleted file mode 100644 index 8a3ec93a60..0000000000 --- a/drivers/net/mvpp2/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Marvell International Ltd. -# Copyright(c) 2017 Semihalf. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),config) -ifeq ($(LIBMUSDK_PATH),) -$(error "Please define LIBMUSDK_PATH environment variable") -endif -endif -endif - -# library name -LIB = librte_pmd_mvpp2.a - -# versioning export map -EXPORT_MAP := rte_pmd_mvpp2_version.map - -# external library dependencies -CFLAGS += -I$(RTE_SDK)/drivers/common/mvep -CFLAGS += -I$(LIBMUSDK_PATH)/include -CFLAGS += -DMVCONF_TYPES_PUBLIC -CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -O3 -LDLIBS += -L$(LIBMUSDK_PATH)/lib -LDLIBS += -lmusdk -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile -LDLIBS += -lrte_bus_vdev -lrte_common_mvep - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_qos.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_mtr.c -SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_tm.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/netvsc/Makefile b/drivers/net/netvsc/Makefile deleted file mode 100644 index da8991584a..0000000000 --- a/drivers/net/netvsc/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_pmd_netvsc.a - -CFLAGS += -O3 $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_netvsc_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rndis.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_nvs.c -SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_vf.c - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vmbus - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfb/Makefile b/drivers/net/nfb/Makefile deleted file mode 100644 index e92d29dcd3..0000000000 --- a/drivers/net/nfb/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Cesnet -# Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com> -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfb.a - -INCLUDES :=-I$(SRCDIR) - - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags netcope-common) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs -LDLIBS += -lrte_ethdev -lrte_net -LDLIBS += -lrte_bus_pci -LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) - -EXPORT_MAP := rte_pmd_nfb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rxmode.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/nfp/Makefile b/drivers/net/nfp/Makefile deleted file mode 100644 index 289b3a60e3..0000000000 --- a/drivers/net/nfp/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_nfp.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_nfp_version.map - -VPATH += $(SRCDIR)/nfpcore - -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cppcore.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cpp_pcie_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mutex.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_resource.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mip.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nffw.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_hwinfo.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_rtsym.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_cmds.c -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_eth.c - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_net.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile deleted file mode 100644 index f51150c131..0000000000 --- a/drivers/net/null/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 IGEL Co.,Ltd. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_null.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_null_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx/Makefile b/drivers/net/octeontx/Makefile deleted file mode 100644 index c4db878009..0000000000 --- a/drivers/net/octeontx/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ - -EXPORT_MAP := rte_pmd_octeontx_version.map - -OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkovf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkivf.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_bgx.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev_ops.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_octeontx_rxtx.o += -fno-prefetch-loop-arrays - -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -else -CFLAGS_octeontx_rxtx.o += -O3 -ffast-math -endif - -else -CFLAGS_octeontx_rxtx.o += -O3 -Ofast -endif - -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_common_octeontx -LDLIBS += -lrte_mempool_octeontx -LDLIBS += -lrte_eventdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_vdev - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile deleted file mode 100644 index 0de43e36af..0000000000 --- a/drivers/net/octeontx2/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_octeontx2.a - -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/cpt -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2 -CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2 -CFLAGS += -O3 -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -flax-vector-conversions -endif - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_pmd_octeontx2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \ - otx2_rx.c \ - otx2_tx.c \ - otx2_tm.c \ - otx2_rss.c \ - otx2_mac.c \ - otx2_ptp.c \ - otx2_flow.c \ - otx2_link.c \ - otx2_vlan.c \ - otx2_stats.c \ - otx2_mcast.c \ - otx2_lookup.c \ - otx2_ethdev.c \ - otx2_flow_ctrl.c \ - otx2_flow_parse.c \ - otx2_flow_utils.c \ - otx2_ethdev_irq.c \ - otx2_ethdev_ops.c \ - otx2_ethdev_sec.c \ - otx2_ethdev_debug.c \ - otx2_ethdev_devargs.c - -LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal -lrte_net -LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf -lrte_mempool -lm -LDLIBS += -lrte_cryptodev -lrte_eventdev -lrte_security - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile deleted file mode 100644 index f243d1a0fa..0000000000 --- a/drivers/net/pcap/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright(c) 2014 6WIND S.A. -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pcap.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lpcap -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_pcap_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += rte_eth_pcap.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/pfe/Makefile b/drivers/net/pfe/Makefile deleted file mode 100644 index 75d30b01aa..0000000000 --- a/drivers/net/pfe/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019 NXP -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_pfe.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -Wno-pointer-arith -CFLAGS += -I$(RTE_SDK)/drivers/net/pfe/base/ -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -EXPORT_MAP := rte_pmd_pfe_version.map - -# Interfaces with DPDK -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hal.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif_lib.c -SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif.c - -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_bus_dpaa -LDLIBS += -lrte_common_dpaax -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_ethdev -lrte_kvargs - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile deleted file mode 100644 index 0e8a67b0da..0000000000 --- a/drivers/net/qede/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 - 2018 Cavium Inc. -# All rights reserved. -# www.cavium.com - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_qede.a - -CFLAGS += -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_qede_version.map - -# -# OS -# -OS_TYPE := $(shell uname -s) - -# -# CFLAGS -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes -CFLAGS_BASE_DRIVER += -Wno-cast-qual -CFLAGS_BASE_DRIVER += -Wno-unused-function -CFLAGS_BASE_DRIVER += -Wno-unused-variable -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -CFLAGS_BASE_DRIVER += -Wno-missing-prototypes - -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-value -ifeq ($(OS_TYPE),Linux) -ifeq ($(shell clang -Wno-shift-negative-value -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -endif -endif -endif - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -CFLAGS += -Wno-format-nonliteral -endif -CFLAGS_BASE_DRIVER += -Wno-missing-declarations -ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-maybe-uninitialized -endif -CFLAGS_BASE_DRIVER += -Wno-strict-prototypes -ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-shift-negative-value -ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1) -CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough -endif -endif -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS_BASE_DRIVER += -Wno-format-extra-args -CFLAGS_BASE_DRIVER += -Wno-visibility -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-invalid-source-encoding -CFLAGS_BASE_DRIVER += -Wno-sometimes-uninitialized -ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0) -CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion -endif -else #ICC -CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant -endif - -# -# Add extra flags for base ecore driver files -# to disable warnings in them -# -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_cxt.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_l2.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sp_commands.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_fw_funcs.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_spq.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_mcp.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_int.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dcbx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += bcm_osal.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sriov.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_vf.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile deleted file mode 100644 index d6a3dec350..0000000000 --- a/drivers/net/ring/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ring.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_ring_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += rte_eth_ring.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_ring.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile deleted file mode 100644 index 20bf343814..0000000000 --- a/drivers/net/sfc/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# -# Copyright(c) 2019-2020 Xilinx, Inc. -# Copyright(c) 2016-2019 Solarflare Communications Inc. -# -# This software was jointly developed between OKTET Labs (under contract -# for Solarflare) and Solarflare Communications, Inc. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_sfc_efx.a - -CFLAGS += -I$(SRCDIR)/base/ -CFLAGS += -I$(SRCDIR) -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by rte_eth_link to uint64_t casts -CFLAGS += -Wno-strict-aliasing - -# Enable extra warnings -CFLAGS += -Wextra - -# More warnings not enabled by above aggregators -CFLAGS += -Wdisabled-optimization - -# Extra CFLAGS for base driver files -CFLAGS_BASE_DRIVER += -Wno-sign-compare -CFLAGS_BASE_DRIVER += -Wno-unused-parameter -CFLAGS_BASE_DRIVER += -Wno-unused-variable - -# Compiler and version dependent flags -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wnested-externs -CFLAGS_BASE_DRIVER += -Wno-empty-body -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -CFLAGS += -Waggregate-return -CFLAGS += -Wbad-function-cast -CFLAGS_BASE_DRIVER += -Wno-empty-body -else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable -# Suppress ICC false positive warning on 'bulk' may be used before its -# value is set -CFLAGS_sfc_ef10_tx.o += -diag-disable 3656 -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -lrte_pci - -# -# List of base driver object files for which -# special CFLAGS above should be applied -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(BASE_DRIVER_OBJS), \ - $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -EXPORT_MAP := rte_pmd_sfc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_kvargs.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_dp.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_essb_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_tx.c - -VPATH += $(SRCDIR)/base - -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_bootcfg.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_crc32.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_lic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_port.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tunnel.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += mcdi_mon.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_sram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_ev.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_evb.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_filter.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_intr.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_image.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mac.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mcdi.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nvram.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_phy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_proxy.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_vpd.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += hunt_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford_nic.c -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford2_nic.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile deleted file mode 100644 index dabbe13a5f..0000000000 --- a/drivers/net/softnic/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_softnic.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_pipeline -lrte_port -lrte_table -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched -LDLIBS += -lrte_cryptodev -LDLIBS += -lrte_bus_vdev - -EXPORT_MAP := rte_pmd_softnic_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_swq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_link.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_meter.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cryptodev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_softnic.h - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info Softnic PMD can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -all: -clean: -else - -include $(RTE_SDK)/mk/rte.lib.mk - -endif diff --git a/drivers/net/szedata2/Makefile b/drivers/net/szedata2/Makefile deleted file mode 100644 index 675d0938a2..0000000000 --- a/drivers/net/szedata2/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 CESNET - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_szedata2.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lsze2 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_szedata2_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += rte_eth_szedata2.c - -# -# Export include files -# -SYMLINK-y-include += - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile deleted file mode 100644 index cbf87af401..0000000000 --- a/drivers/net/tap/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_tap.a - -EXPORT_MAP := rte_pmd_tap_version.map - -# -# TAP_MAX_QUEUES must be a power of 2 -# -ifeq ($(TAP_MAX_QUEUES),) - TAP_MAX_QUEUES = 16 -endif -CFLAGS += -O3 -CFLAGS += -I$(SRCDIR) -CFLAGS += -I. -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash -LDLIBS += -lrte_bus_vdev -lrte_gso - -CFLAGS += -DTAP_MAX_QUEUES=$(TAP_MAX_QUEUES) - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += rte_eth_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_flow.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_netlink.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_tcmsgs.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_bpf_api.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_intr.c - -include $(RTE_SDK)/mk/rte.lib.mk - -# Generate and clean-up tap_autoconf.h. - -export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error - -ifndef V -AUTOCONF_OUTPUT := >/dev/null -endif - -tap_autoconf.h.new: FORCE - -tap_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh - $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_TC_FLOWER \ - linux/pkt_cls.h \ - enum TCA_FLOWER_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_VLAN_ID \ - linux/pkt_cls.h \ - enum TCA_FLOWER_KEY_VLAN_PRIO \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF \ - linux/pkt_cls.h \ - enum TCA_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_BPF_FD \ - linux/pkt_cls.h \ - enum TCA_BPF_FD \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_UNSPEC \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ - HAVE_TC_ACT_BPF_FD \ - linux/tc_act/tc_bpf.h \ - enum TCA_ACT_BPF_FD \ - $(AUTOCONF_OUTPUT) - -# Create tap_autoconf.h or update it in case it differs from the new one. - -tap_autoconf.h: tap_autoconf.h.new - $Q [ -f '$@' ] && \ - cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \ - mv '$<' '$@' - -$(SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP):.c=.o): tap_autoconf.h - -clean_tap: FORCE - $Q rm -f -- tap_autoconf.h tap_autoconf.h.new - -clean: clean_tap diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile deleted file mode 100644 index 149638a499..0000000000 --- a/drivers/net/thunderx/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_thunderx_nicvf.a - -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -EXPORT_MAP := rte_pmd_thunderx_version.map - -OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) -$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) - -VPATH += $(SRCDIR)/base - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_hw.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_mbox.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_bsvf.c -SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_svf.c - -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_nicvf_rxtx.o += -fno-prefetch-loop-arrays -endif -CFLAGS_nicvf_rxtx.o += -Ofast - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vdev_netvsc/Makefile b/drivers/net/vdev_netvsc/Makefile deleted file mode 100644 index 01d26fb798..0000000000 --- a/drivers/net/vdev_netvsc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 6WIND S.A. -# Copyright 2017 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Properties of the generated library. -LIB = librte_pmd_vdev_netvsc.a -EXPORT_MAP := rte_pmd_vdev_netvsc_version.map - -# Additional compilation flags. -CFLAGS += -O3 -CFLAGS += -g -CFLAGS += -Wall -Wextra -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += $(WERROR_FLAGS) - -# Dependencies. -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_ethdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_net - -# Source files. -SRCS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vhost/Makefile b/drivers/net/vhost/Makefile deleted file mode 100644 index 0461e29f2c..0000000000 --- a/drivers/net/vhost/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vhost.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_vhost -LDLIBS += -lrte_bus_vdev - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_pmd_vhost_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += rte_eth_vhost.c - -# -# Export include files -# -SYMLINK-y-include += rte_eth_vhost.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile deleted file mode 100644 index 102b1deab8..0000000000 --- a/drivers/net/virtio/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_virtio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -LDLIBS += -lrte_bus_vdev -endif - -EXPORT_MAP := rte_pmd_virtio_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c - -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_sse.c -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_altivec.c -else ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_neon.c -endif - -ifneq ($(FORCE_DISABLE_AVX512), y) - CC_AVX512_SUPPORT=\ - $(shell $(CC) -march=native -dM -E - </dev/null 2>&1 | \ - sed '/./{H;$$!d} ; x ; /AVX512F/!d; /AVX512BW/!d; /AVX512VL/!d' | \ - grep -q AVX512 && echo 1) -endif - -ifeq ($(CC_AVX512_SUPPORT), 1) -CFLAGS += -DCC_AVX512_SUPPORT -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_packed_avx.c - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVIRTIO_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVIRTIO_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVIRTIO_ICC_UNROLL_PRAGMA -endif -endif - -CFLAGS_virtio_rxtx_packed_avx.o += -mavx512f -mavx512bw -mavx512vl -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -CFLAGS_virtio_rxtx_packed_avx.o += -Wno-zero-length-bounds -endif -endif - -ifeq ($(CONFIG_RTE_VIRTIO_USER),y) -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_user.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel_tap.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/virtio_user_dev.c -SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user_ethdev.c -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile deleted file mode 100644 index 4390fedee0..0000000000 --- a/drivers/net/vmxnet3/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_vmxnet3_uio.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -# -# CFLAGS for icc -# -CFLAGS_BASE_DRIVER = -diag-disable 174 -diag-disable 593 -diag-disable 869 -CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259 - -else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) -# -# CFLAGS for clang -# -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -else -# -# CFLAGS for gcc -# -ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) -CFLAGS += -Wno-deprecated -endif -CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value -CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args - -endif -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -LDLIBS += -lrte_bus_pci - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_vmxnet3_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_rxtx.c -SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_ethdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile deleted file mode 100644 index 80b043eb14..0000000000 --- a/drivers/raw/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# DIRS-$(<configuration>) += <directory> -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma -endif -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma -DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += octeontx2_ep - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile deleted file mode 100644 index 227ec4896e..0000000000 --- a/drivers/raw/dpaa2_cmdif/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_cmdif.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_eal -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV)-include += rte_pmd_dpaa2_cmdif.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile deleted file mode 100644 index 7b2abdddb4..0000000000 --- a/drivers/raw/dpaa2_qdma/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_dpaa2_qdma.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc -CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - -LDLIBS += -lrte_bus_fslmc -LDLIBS += -lrte_eal -LDLIBS += -lrte_mempool -LDLIBS += -lrte_mempool_dpaa2 -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_ring -LDLIBS += -lrte_common_dpaax - -EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV)-include += rte_pmd_dpaa2_qdma.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile deleted file mode 100644 index 371e127f19..0000000000 --- a/drivers/raw/ifpga/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ifpga.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev -CFLAGS += -I$(RTE_SDK)/drivers/net/i40e -CFLAGS += -I$(RTE_SDK)/drivers/net/ipn3ke -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_bus_ifpga -LDLIBS += -lpthread -LDLIBS += -lfdt -LDLIBS += -lrte_pmd_i40e -LDLIBS += -lrte_pmd_ipn3ke - -EXPORT_MAP := rte_rawdev_ifpga_version.map - -VPATH += $(SRCDIR)/base - -include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ifpga/base/Makefile b/drivers/raw/ifpga/base/Makefile deleted file mode 100644 index c5bbcbd5f8..0000000000 --- a/drivers/raw/ifpga/base/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -#SPDX-License-Identifier: BSD-3-Clause -#Copyright(c) 2010-2018 Intel Corporation - -ifneq ($(CONFIG_RTE_LIBRTE_EAL),) -OSDEP := osdep_rte -else -OSDEP := osdep_raw -endif - -CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev/base/$(OSDEP) - -SRCS-y += ifpga_api.c -SRCS-y += ifpga_enumerate.c -SRCS-y += ifpga_feature_dev.c -SRCS-y += ifpga_fme.c -SRCS-y += ifpga_fme_iperf.c -SRCS-y += ifpga_fme_dperf.c -SRCS-y += ifpga_fme_error.c -SRCS-y += ifpga_port.c -SRCS-y += ifpga_port_error.c -SRCS-y += opae_hw_api.c -SRCS-y += opae_ifpga_hw_api.c -SRCS-y += opae_debug.c -SRCS-y += ifpga_fme_pr.c -SRCS-y += opae_spi.c -SRCS-y += opae_spi_transaction.c -SRCS-y += opae_intel_max10.c -SRCS-y += opae_i2c.c -SRCS-y += opae_at24_eeprom.c -SRCS-y += opae_eth_group.c - -SRCS-y += $(wildcard $(SRCDIR)/base/$(OSDEP)/*.c) diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile deleted file mode 100644 index 1609fe5e6c..0000000000 --- a/drivers/raw/ioat/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_ioat.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lrte_eal -lrte_rawdev -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_mbuf -lrte_mempool - -# versioning export map -EXPORT_MAP := rte_rawdev_ioat_version.map - -# library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev_test.c - -# export include files -SYMLINK-y-include += rte_ioat_rawdev.h -SYMLINK-y-include += rte_ioat_spec.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/ntb/Makefile b/drivers/raw/ntb/Makefile deleted file mode 100644 index 8f0bff9b02..0000000000 --- a/drivers/raw/ntb/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_ntb.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -LDLIBS += -lrte_pci -lrte_bus_pci -LDLIBS += -lrte_rawdev - -EXPORT_MAP := rte_rawdev_ntb_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb_hw_intel.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV)-include := rte_pmd_ntb.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_dma/Makefile b/drivers/raw/octeontx2_dma/Makefile deleted file mode 100644 index c64ca3497a..0000000000 --- a/drivers/raw/octeontx2_dma/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev_octeontx2_dma.a - -CFLAGS += -O3 $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_dma/ -LDLIBS += -lrte_eal -lrte_rawdev -lrte_bus_pci -lrte_mbuf -LDLIBS += -lrte_common_octeontx2 -lrte_mempool - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_dma_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_msg.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/octeontx2_ep/Makefile b/drivers/raw/octeontx2_ep/Makefile deleted file mode 100644 index 1a54bf56f0..0000000000 --- a/drivers/raw/octeontx2_ep/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name -LIB = librte_rawdev_octeontx2_ep.a - -# Build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ -CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_ep/ - -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_mempool -LDLIBS += -lrte_common_octeontx2 - -ifneq ($(CONFIG_RTE_ARCH_64),y) -CFLAGS += -Wno-int-to-pointer-cast -CFLAGS += -Wno-pointer-to-int-cast -ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -diag-disable 2259 -endif -endif - -EXPORT_MAP := rte_rawdev_octeontx2_ep_version.map - -# -# All source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_enqdeq.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_test.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_vf.c - - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile deleted file mode 100644 index 2ac66fbd45..0000000000 --- a/drivers/raw/skeleton/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_rawdev_skeleton.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -LDLIBS += -lrte_rawdev -LDLIBS += -lrte_bus_vdev -LDLIBS += -lrte_kvargs - -EXPORT_MAP := rte_rawdev_skeleton_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev_test.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/regex/Makefile b/drivers/regex/Makefile deleted file mode 100644 index 906b20546f..0000000000 --- a/drivers/regex/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/regex/mlx5/Makefile b/drivers/regex/mlx5/Makefile deleted file mode 100644 index 11e3325feb..0000000000 --- a/drivers/regex/mlx5/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_regex.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_rxp.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_devx.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_control.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_fastpath.c - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5/linux -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_mbuf -lrte_regexdev -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_bus_pci -LDLIBS += -lrte_pci - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_regex_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile deleted file mode 100644 index 6e8835948e..0000000000 --- a/drivers/vdpa/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc -endif - -DIRS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5 - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/vdpa/ifc/Makefile b/drivers/vdpa/ifc/Makefile deleted file mode 100644 index b468bfdbdd..0000000000 --- a/drivers/vdpa/ifc/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pmd_ifc.a - -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci -LDLIBS += -lrte_kvargs - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -# -# Add extra flags for base driver source files to disable warnings in them -# -BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))) - -VPATH += $(SRCDIR)/base - -EXPORT_MAP := rte_pmd_ifc_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile deleted file mode 100644 index d46699fbc9..0000000000 --- a/drivers/vdpa/mlx5/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# Library name. -LIB = librte_pmd_mlx5_vdpa.a - -# Sources. -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_mem.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_event.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_virtq.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_steer.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_lm.c - - -# Basic CFLAGS. -CFLAGS += -O3 -CFLAGS += -std=c11 -Wall -Wextra -CFLAGS += -g -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5 -CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux -CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5_vdpa -CFLAGS += -I$(RTE_SDK)/lib/librte_sched -CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5 -CFLAGS += -D_BSD_SOURCE -CFLAGS += -D_DEFAULT_SOURCE -CFLAGS += -D_XOPEN_SOURCE=600 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -Wno-strict-prototypes -LDLIBS += -lrte_common_mlx5 -LDLIBS += -lrte_eal -lrte_vhost -lrte_kvargs -lrte_pci -lrte_sched -LDLIBS += -pthread - -# A few warnings cannot be avoided in external headers. -CFLAGS += -Wno-error=cast-qual - -EXPORT_MAP := rte_pmd_mlx5_vdpa_version.map - -# DEBUG which is usually provided on the command-line may enable -# CONFIG_RTE_LIBRTE_MLX5_DEBUG. -ifeq ($(DEBUG),1) -CONFIG_RTE_LIBRTE_MLX5_DEBUG := y -endif - -# User-defined CFLAGS. -ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) -CFLAGS += -pedantic -ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) -CFLAGS += -DPEDANTIC -endif -AUTO_CONFIG_CFLAGS += -Wno-pedantic -else -CFLAGS += -UPEDANTIC -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/examples/Makefile b/examples/Makefile deleted file mode 100644 index b7e99a2f78..0000000000 --- a/examples/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 6WIND S.A. - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond -DIRS-y += cmdline -ifeq ($(CONFIG_RTE_LIBRTE_POWER),y) -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor -endif -DIRS-y += ethtool -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify -DIRS-y += flow_filtering -DIRS-y += helloworld -ifeq ($(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += ip_pipeline -ifeq ($(CONFIG_RTE_LIBRTE_LPM),y) -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_reassembly -DIRS-$(CONFIG_RTE_IP_FRAG) += ip_fragmentation -endif -ifeq ($(CONFIG_RTE_LIBRTE_ACL)$(CONFIG_RTE_LIBRTE_HASH)$(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_SECURITY),yyyy) -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += ipsec-secgw -endif -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += ipv4_multicast -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni -DIRS-y += l2fwd -DIRS-y += l2fwd-event -ifneq ($(PQOS_INSTALL_PATH),) -DIRS-y += l2fwd-cat -endif -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += l2fwd-crypto -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += l2fwd-jobstats -DIRS-y += l2fwd-keepalive -DIRS-y += l2fwd-keepalive/ka-agent -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += l3fwd -endif -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl -ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy) -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power -endif -ifeq ($(CONFIG_RTE_LIBRTE_GRAPH),y) -DIRS-y += l3fwd-graph -endif -DIRS-y += link_status_interrupt -DIRS-y += multi_process -DIRS-y += ntb -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -DIRS-y += performance-thread -endif -DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient -DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched -DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks -DIRS-y += service_cores -DIRS-y += skeleton -ifeq ($(CONFIG_RTE_LIBRTE_HASH),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination -endif -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vdpa vhost_blk -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto -endif -DIRS-y += vmdq -DIRS-y += vmdq_dcb -ifeq ($(CONFIG_RTE_LIBRTE_POWER), y) -ifeq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) -DIRS-y += vm_power_manager -else -$(info vm_power_manager requires libvirt >= 0.9.3) -endif -endif - -DIRS-y += eventdev_pipeline - -include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/kernel/Makefile b/kernel/Makefile deleted file mode 100644 index 5d51fd94bb..0000000000 --- a/kernel/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/Makefile b/kernel/freebsd/Makefile deleted file mode 100644 index 522d3f68ff..0000000000 --- a/kernel/freebsd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += contigmem -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += nic_uio - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/freebsd/contigmem/Makefile b/kernel/freebsd/contigmem/Makefile deleted file mode 100644 index 428a7edee5..0000000000 --- a/kernel/freebsd/contigmem/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = contigmem - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := contigmem.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/freebsd/nic_uio/Makefile b/kernel/freebsd/nic_uio/Makefile deleted file mode 100644 index 376ef3a3ab..0000000000 --- a/kernel/freebsd/nic_uio/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = nic_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := nic_uio.c - -include $(RTE_SDK)/mk/rte.bsdmodule.mk diff --git a/kernel/linux/Makefile b/kernel/linux/Makefile deleted file mode 100644 index c2c45a3e67..0000000000 --- a/kernel/linux/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EAL_IGB_UIO) += igb_uio -DIRS-$(CONFIG_RTE_KNI_KMOD) += kni - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/kernel/linux/igb_uio/Makefile b/kernel/linux/igb_uio/Makefile deleted file mode 100644 index f83bcc7c69..0000000000 --- a/kernel/linux/igb_uio/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = igb_uio -MODULE_PATH = drivers/net/igb_uio - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=100 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -Winline -Wall -Werror -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h - -# -# all source are stored in SRCS-y -# -SRCS-y := igb_uio.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile deleted file mode 100644 index 595bac2612..0000000000 --- a/kernel/linux/kni/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# module name and path -# -MODULE = rte_kni - -# -# CFLAGS -# -MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 -MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -MODULE_CFLAGS += -Wall -Werror - --include /etc/lsb-release - -ifeq ($(DISTRIB_ID),Ubuntu) -MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE)) -UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \ - | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1) -MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))" -endif - -# -# all source are stored in SRCS-y -# -SRCS-y := kni_misc.c -SRCS-y += kni_net.c - -include $(RTE_SDK)/mk/rte.module.mk diff --git a/lib/Makefile b/lib/Makefile deleted file mode 100644 index 8f5b68a2d4..0000000000 --- a/lib/Makefile +++ /dev/null @@ -1,138 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DIRS-y += librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal -DEPDIRS-librte_eal := librte_kvargs librte_telemetry -DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci -DEPDIRS-librte_pci := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring -DEPDIRS-librte_ring := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_STACK) += librte_stack -DEPDIRS-librte_stack := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += librte_mempool -DEPDIRS-librte_mempool := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf -DEPDIRS-librte_mbuf := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer -DEPDIRS-librte_timer := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile -DEPDIRS-librte_cfgfile := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline -DEPDIRS-librte_cmdline := librte_eal librte_net -DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev -DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring -DEPDIRS-librte_ethdev += librte_mbuf -DEPDIRS-librte_ethdev += librte_kvargs -DEPDIRS-librte_ethdev += librte_meter -DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev -DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev -DEPDIRS-librte_cryptodev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_cryptodev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_SECURITY) += librte_security -DEPDIRS-librte_security := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_security += librte_ethdev -DEPDIRS-librte_security += librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += librte_compressdev -DEPDIRS-librte_compressdev := librte_eal librte_mempool librte_ring librte_mbuf -DEPDIRS-librte_compressdev += librte_kvargs -DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += librte_regexdev -DEPDIRS-librte_regexdev := librte_eal librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += librte_eventdev -DEPDIRS-librte_eventdev := librte_eal librte_ring librte_ethdev librte_hash \ - librte_mempool librte_timer librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += librte_rawdev -DEPDIRS-librte_rawdev := librte_eal librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost -DEPDIRS-librte_vhost := librte_eal librte_mempool librte_mbuf librte_ethdev \ - librte_net librte_hash librte_cryptodev -DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash -DEPDIRS-librte_hash := librte_eal librte_ring -DIRS-$(CONFIG_RTE_LIBRTE_EFD) += librte_efd -DEPDIRS-librte_efd := librte_eal librte_ring librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RIB) += librte_rib -DEPDIRS-librte_rib := librte_eal librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_FIB) += librte_fib -DEPDIRS-librte_fib := librte_eal librte_rib -DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm -DEPDIRS-librte_lpm := librte_eal librte_hash librte_rcu -DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl -DEPDIRS-librte_acl := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_MEMBER) += librte_member -DEPDIRS-librte_member := librte_eal librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_NET) += librte_net -DEPDIRS-librte_net := librte_mbuf librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += librte_ip_frag -DEPDIRS-librte_ip_frag := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_ip_frag += librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_GRO) += librte_gro -DEPDIRS-librte_gro := librte_eal librte_mbuf librte_ethdev librte_net -DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += librte_jobstats -DEPDIRS-librte_jobstats := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_METRICS) += librte_metrics -DEPDIRS-librte_metrics := librte_eal librte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -DEPDIRS-librte_metrics += librte_telemetry -endif -DIRS-$(CONFIG_RTE_LIBRTE_BITRATE) += librte_bitratestats -DEPDIRS-librte_bitratestats := librte_eal librte_metrics librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += librte_latencystats -DEPDIRS-librte_latencystats := librte_eal librte_metrics librte_ethdev librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_POWER) += librte_power -DEPDIRS-librte_power := librte_eal librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_METER) += librte_meter -DEPDIRS-librte_meter := librte_eal -DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += librte_flow_classify -DEPDIRS-librte_flow_classify := librte_net librte_table librte_acl -DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched -DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net -DEPDIRS-librte_sched += librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor -DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port -DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_port += librte_ip_frag librte_sched librte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -DEPDIRS-librte_port += librte_kni -endif -DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table -DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_table += librte_port librte_lpm librte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -DEPDIRS-librte_table += librte_acl -endif -DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline -DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_pipeline += librte_table librte_port -DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder -DEPDIRS-librte_reorder := librte_eal librte_mempool librte_mbuf -DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += librte_pdump -DEPDIRS-librte_pdump := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_GSO) += librte_gso -DEPDIRS-librte_gso := librte_eal librte_mbuf librte_ethdev librte_net -DEPDIRS-librte_gso += librte_mempool -DIRS-$(CONFIG_RTE_LIBRTE_BPF) += librte_bpf -DEPDIRS-librte_bpf := librte_eal librte_mempool librte_mbuf librte_ethdev -DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += librte_ipsec -DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security \ - librte_net librte_hash -DIRS-$(CONFIG_RTE_LIBRTE_RCU) += librte_rcu -DEPDIRS-librte_rcu := librte_eal librte_ring - -DIRS-$(CONFIG_RTE_LIBRTE_GRAPH) += librte_graph -DEPDIRS-librte_graph := librte_eal - -DIRS-$(CONFIG_RTE_LIBRTE_NODE) += librte_node -DEPDIRS-librte_node := librte_graph librte_lpm librte_ethdev librte_mbuf - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni -endif -DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev -DEPDIRS-librte_kni += librte_pci - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile deleted file mode 100644 index f4332b0448..0000000000 --- a/lib/librte_acl/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_acl.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_acl_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += tb_mem.c - -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += rte_acl.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_bld.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_gen.c -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c -CFLAGS_acl_run_neon.o += -flax-vector-conversions -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_acl_run_neon.o += -Wno-maybe-uninitialized -endif -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c -else -SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c -endif - -# -# If the compiler supports AVX2 instructions, -# then add support for AVX2 classify method. -# - -#check if flag for AVX2 is already on, if not set it up manually -ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2) - CC_AVX2_SUPPORT=1 -else - CC_AVX2_SUPPORT=\ - $(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \ - grep -q AVX2 && echo 1) - ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) - CFLAGS_acl_run_avx2.o += -march=core-avx2 - else - CFLAGS_acl_run_avx2.o += -mavx2 - endif - endif -endif - -ifeq ($(CC_AVX2_SUPPORT), 1) - SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_avx2.c - CFLAGS_rte_acl.o += -DCC_AVX2_SUPPORT -endif - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include := rte_acl_osdep.h -SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include += rte_acl.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bbdev/Makefile b/lib/librte_bbdev/Makefile deleted file mode 100644 index 9d7576b358..0000000000 --- a/lib/librte_bbdev/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bbdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -# library source files -SRCS-y += rte_bbdev.c - -# export include files -SYMLINK-y-include += rte_bbdev_op.h -SYMLINK-y-include += rte_bbdev.h -SYMLINK-y-include += rte_bbdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_bbdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bitratestats/Makefile b/lib/librte_bitratestats/Makefile deleted file mode 100644 index 4862c44b83..0000000000 --- a/lib/librte_bitratestats/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bitratestats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev - -EXPORT_MAP := rte_bitratestats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) := rte_bitrate.c - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_BITRATE)-include += rte_bitrate.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_bpf/Makefile b/lib/librte_bpf/Makefile deleted file mode 100644 index 3be6750432..0000000000 --- a/lib/librte_bpf/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_bpf.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_net -lrte_eal -LDLIBS += -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_ethdev -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -LDLIBS += -lelf -endif - -EXPORT_MAP := rte_bpf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_exec.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_pkt.c -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_validate.c -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load_elf.c -endif -ifeq ($(CONFIG_RTE_ARCH_X86_64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c -else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_arm64.c -endif - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += bpf_def.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf_ethdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile deleted file mode 100644 index 7c10a4e56c..0000000000 --- a/lib/librte_cfgfile/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_cfgfile.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(SRCDIR)/../librte_eal/include -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_cfgfile_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_CFGFILE) += rte_cfgfile.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_CFGFILE)-include += rte_cfgfile.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile deleted file mode 100644 index 619d9a2426..0000000000 --- a/lib/librte_cmdline/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cmdline.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -EXPORT_MAP := rte_cmdline_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := cmdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_cirbuf.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_etheraddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_ipaddr.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_num.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_string.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_rdline.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c -SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c - -LDLIBS += -lrte_net -lrte_eal - -# install includes -INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h -INCS += cmdline_parse_etheraddr.h cmdline_parse_string.h cmdline_rdline.h -INCS += cmdline_vt100.h cmdline_socket.h cmdline_cirbuf.h cmdline_parse_portlist.h -SYMLINK-$(CONFIG_RTE_LIBRTE_CMDLINE)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_compressdev/Makefile b/lib/librte_compressdev/Makefile deleted file mode 100644 index 53679d69b8..0000000000 --- a/lib/librte_compressdev/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_compressdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_kvargs - -# library source files -SRCS-y += rte_compressdev.c rte_compressdev_pmd.c rte_comp.c - -# export include files -SYMLINK-y-include += rte_comp.h -SYMLINK-y-include += rte_compressdev.h -# export include files (for PMDs) -SYMLINK-y-include += rte_compressdev_pmd.h -SYMLINK-y-include += rte_compressdev_internal.h - -# versioning export map -EXPORT_MAP := rte_compressdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile deleted file mode 100644 index 73e77a27c6..0000000000 --- a/lib/librte_cryptodev/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_cryptodev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf -LDLIBS += -lrte_kvargs - -# library source files -SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c - -# export include files -SYMLINK-y-include += rte_crypto.h -SYMLINK-y-include += rte_crypto_asym.h -SYMLINK-y-include += rte_crypto_sym.h -SYMLINK-y-include += rte_cryptodev.h -SYMLINK-y-include += rte_cryptodev_pmd.h -SYMLINK-y-include += rte_cryptodev_trace.h -SYMLINK-y-include += rte_cryptodev_trace_fp.h - -# versioning export map -EXPORT_MAP := rte_cryptodev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile deleted file mode 100644 index fc32fb3a8f..0000000000 --- a/lib/librte_distributor/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_distributor.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_distributor_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c -else -SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_generic.c -endif - - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR)-include := rte_distributor.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile deleted file mode 100644 index 2fda40d230..0000000000 --- a/lib/librte_eal/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += include -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DEPDIRS-linux := include -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd -DEPDIRS-freebsd := include - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile deleted file mode 100644 index 9a89556742..0000000000 --- a/lib/librte_eal/freebsd/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lexecinfo -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry - -EXPORT_MAP := ../rte_eal_version.map - -# specific to freebsd exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -CFLAGS_eal_hpet.o += -Wno-return-type -endif - -INC := rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/include/Makefile b/lib/librte_eal/include/Makefile deleted file mode 100644 index eb99190d10..0000000000 --- a/lib/librte_eal/include/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := \ - $(sort $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/*.h))) - -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include/generic := \ - $(sort $(addprefix generic/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/include/generic/*.h)))) - -ARCH_DIR ?= $(RTE_ARCH) -SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \ - $(sort $(addprefix ../$(ARCH_DIR)/include/, $(notdir \ - $(wildcard $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include/*.h)))) - -include $(RTE_SDK)/mk/rte.install.mk diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile deleted file mode 100644 index 9939b3d147..0000000000 --- a/lib/librte_eal/linux/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_eal.a - -ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) -VPATH += $(RTE_SDK)/lib/librte_eal/unix -VPATH += $(RTE_SDK)/lib/librte_eal/common - -CFLAGS += -I$(SRCDIR)/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -ldl -LDLIBS += -lpthread -LDLIBS += -lgcc_s -LDLIBS += -lrt -LDLIBS += -lrte_kvargs -LDLIBS += -lrte_telemetry -ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) -LDLIBS += -lnuma -endif - -EXPORT_MAP := ../rte_eal_version.map - -# specific to linux exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio_mp_sync.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_dev.c - -# from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_config.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dynmem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_mcfg.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_points.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_random.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_reciprocal.c - -# from unix dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_file.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_timer.c - -# from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_hypervisor.c -SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c -SRCS-y += rte_cycles.c - -CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST) - -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_eal_thread.o += -Wno-return-type -endif - -INC := rte_kni_common.h -INC += rte_os.h - -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC)) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_efd/Makefile b/lib/librte_efd/Makefile deleted file mode 100644 index 2dc97132e0..0000000000 --- a/lib/librte_efd/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_efd.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring -lrte_hash - -EXPORT_MAP := rte_efd_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_EFD) := rte_efd.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_EFD)-include := rte_efd.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile deleted file mode 100644 index 47747150b2..0000000000 --- a/lib/librte_ethdev/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_ethdev.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf -lrte_kvargs -lrte_meter -lrte_telemetry - -EXPORT_MAP := rte_ethdev_version.map - -SRCS-y += ethdev_private.c -SRCS-y += rte_ethdev.c -SRCS-y += rte_class_eth.c -SRCS-y += rte_flow.c -SRCS-y += rte_tm.c -SRCS-y += rte_mtr.c -SRCS-y += ethdev_profile.c -SRCS-y += ethdev_trace_points.c - -# -# Export include files -# -SYMLINK-y-include += rte_ethdev.h -SYMLINK-y-include += rte_ethdev_driver.h -SYMLINK-y-include += rte_ethdev_core.h -SYMLINK-y-include += rte_ethdev_pci.h -SYMLINK-y-include += rte_ethdev_trace.h -SYMLINK-y-include += rte_ethdev_trace_fp.h -SYMLINK-y-include += rte_ethdev_vdev.h -SYMLINK-y-include += rte_eth_ctrl.h -SYMLINK-y-include += rte_dev_info.h -SYMLINK-y-include += rte_flow.h -SYMLINK-y-include += rte_flow_driver.h -SYMLINK-y-include += rte_tm.h -SYMLINK-y-include += rte_tm_driver.h -SYMLINK-y-include += rte_mtr.h -SYMLINK-y-include += rte_mtr_driver.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile deleted file mode 100644 index 0715256bb4..0000000000 --- a/lib/librte_eventdev/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 Cavium, Inc -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_eventdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -CFLAGS += -DLINUX -else -CFLAGS += -DBSD -endif -LDLIBS += -lrte_eal -lrte_ring -lrte_ethdev -lrte_hash -lrte_mempool -lrte_timer -LDLIBS += -lrte_mbuf -lrte_cryptodev -lpthread - -# library source files -SRCS-y += rte_eventdev.c -SRCS-y += rte_event_ring.c -SRCS-y += eventdev_trace_points.c -SRCS-y += rte_event_eth_rx_adapter.c -SRCS-y += rte_event_timer_adapter.c -SRCS-y += rte_event_crypto_adapter.c -SRCS-y += rte_event_eth_tx_adapter.c - -# export include files -SYMLINK-y-include += rte_eventdev.h -SYMLINK-y-include += rte_eventdev_pmd.h -SYMLINK-y-include += rte_eventdev_pmd_pci.h -SYMLINK-y-include += rte_eventdev_pmd_vdev.h -SYMLINK-y-include += rte_eventdev_trace.h -SYMLINK-y-include += rte_eventdev_trace_fp.h -SYMLINK-y-include += rte_event_ring.h -SYMLINK-y-include += rte_event_eth_rx_adapter.h -SYMLINK-y-include += rte_event_timer_adapter.h -SYMLINK-y-include += rte_event_timer_adapter_pmd.h -SYMLINK-y-include += rte_event_crypto_adapter.h -SYMLINK-y-include += rte_event_eth_tx_adapter.h - -# versioning export map -EXPORT_MAP := rte_eventdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_fib/Makefile b/lib/librte_fib/Makefile deleted file mode 100644 index 1dd2a495b1..0000000000 --- a/lib/librte_fib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_fib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_rib - -EXPORT_MAP := rte_fib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FIB) := rte_fib.c rte_fib6.c dir24_8.c trie.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FIB)-include := rte_fib.h rte_fib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_flow_classify/Makefile b/lib/librte_flow_classify/Makefile deleted file mode 100644 index ca3cae82dd..0000000000 --- a/lib/librte_flow_classify/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_flow_classify.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) - -EXPORT_MAP := rte_flow_classify_version.map - -LDLIBS += -lrte_eal -lrte_ethdev -lrte_net -lrte_table -lrte_acl - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify.c -SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify_parse.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY)-include := rte_flow_classify.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_graph/Makefile b/lib/librte_graph/Makefile deleted file mode 100644 index b66279c675..0000000000 --- a/lib/librte_graph/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_graph.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_graph_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += node.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_debug.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_stats.c -SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_populate.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph.h -SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph_worker.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gro/Makefile b/lib/librte_gro/Makefile deleted file mode 100644 index e848687acd..0000000000 --- a/lib/librte_gro/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gro.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net - -EXPORT_MAP := rte_gro_version.map - -# source files -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += rte_gro.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_vxlan_tcp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GRO)-include += rte_gro.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile deleted file mode 100644 index a34846e920..0000000000 --- a/lib/librte_gso/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_gso.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net -LDLIBS += -lrte_mempool - -EXPORT_MAP := rte_gso_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c -SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile deleted file mode 100644 index ec9f864992..0000000000 --- a/lib/librte_hash/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_hash.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_hash_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_HASH) := rte_cuckoo_hash.c -SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h -endif -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ip_frag/Makefile b/lib/librte_ip_frag/Makefile deleted file mode 100644 index 6b80d9f1f2..0000000000 --- a/lib/librte_ip_frag/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ip_frag.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_hash - -EXPORT_MAP := rte_ip_frag_version.map - -#source files -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_reassembly.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ip_frag_common.c -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += ip_frag_internal.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_IP_FRAG)-include += rte_ip_frag.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ipsec/Makefile b/lib/librte_ipsec/Makefile deleted file mode 100644 index e4c69646b0..0000000000 --- a/lib/librte_ipsec/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ipsec.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_cryptodev -lrte_security -lrte_hash - -EXPORT_MAP := rte_ipsec_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_inb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_outb.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += sa.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ses.c -SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ipsec_sad.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_group.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sa.h -SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sad.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_jobstats/Makefile b/lib/librte_jobstats/Makefile deleted file mode 100644 index b30d046829..0000000000 --- a/lib/librte_jobstats/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_jobstats.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_jobstats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_JOBSTATS) := rte_jobstats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_JOBSTATS)-include := rte_jobstats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile deleted file mode 100644 index 9d440aa135..0000000000 --- a/lib/librte_kni/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kni.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_kni_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KNI) := rte_kni.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_KNI)-include := rte_kni.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile deleted file mode 100644 index 24b1c3c5b9..0000000000 --- a/lib/librte_kvargs/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_kvargs.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include - -EXPORT_MAP := rte_kvargs_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c - -# install includes -INCS := rte_kvargs.h -SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS) - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_latencystats/Makefile b/lib/librte_latencystats/Makefile deleted file mode 100644 index b19e0b1788..0000000000 --- a/lib/librte_latencystats/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_latencystats.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lm -LDLIBS += -lpthread -LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev -lrte_mbuf - -EXPORT_MAP := rte_latencystats_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) := rte_latencystats.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LATENCY_STATS)-include := rte_latencystats.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile deleted file mode 100644 index 6f06c5c034..0000000000 --- a/lib/librte_lpm/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_lpm.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_hash -lrte_rcu - -EXPORT_MAP := rte_lpm_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_LPM) := rte_lpm.c rte_lpm6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include := rte_lpm.h rte_lpm6.h - -ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h -else ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h -else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile deleted file mode 100644 index 41ea5496e3..0000000000 --- a/lib/librte_mbuf/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mbuf.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 - -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_mbuf_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c rte_mbuf_pool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MBUF) += rte_mbuf_dyn.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_ptype.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_pool_ops.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_dyn.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_member/Makefile b/lib/librte_member/Makefile deleted file mode 100644 index ef9e2faeaf..0000000000 --- a/lib/librte_member/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_member.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 - -LDLIBS += -lm -LDLIBS += -lrte_eal -lrte_hash - -EXPORT_MAP := rte_member_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += rte_member.c rte_member_ht.c rte_member_vbf.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMBER)-include := rte_member.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile deleted file mode 100644 index 432d6217ec..0000000000 --- a/lib/librte_mempool/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_mempool.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_mempool_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops_default.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += mempool_trace_points.c -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace.h -SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace_fp.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile deleted file mode 100644 index 48366e82b0..0000000000 --- a/lib/librte_meter/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_meter.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_meter_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_METER) := rte_meter.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_METER)-include := rte_meter.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_metrics/Makefile b/lib/librte_metrics/Makefile deleted file mode 100644 index 1264d3bbb0..0000000000 --- a/lib/librte_metrics/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_metrics.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_metrics_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_METRICS) := rte_metrics.c - -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -SRCS-y += rte_metrics_telemetry.c -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics_telemetry.h - -LDLIBS += -lrte_ethdev -lrte_telemetry -LDLIBS += -ljansson - -CFLAGS += -I$(RTE_SDK)/lib/librte_telemetry/ -endif - -# Install header file -SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile deleted file mode 100644 index 9830e771b3..0000000000 --- a/lib/librte_net/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -LIB = librte_net.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_mbuf -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_net_version.map -SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c -SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h rte_higig.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_gtp.h rte_vxlan.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ecpri.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_node/Makefile b/lib/librte_node/Makefile deleted file mode 100644 index 3ec02104d3..0000000000 --- a/lib/librte_node/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2020 Marvell International Ltd. -# - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_node.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -# Strict-aliasing rules are violated by uint8_t[] to context size casts. -CFLAGS += -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_graph -lrte_mbuf -lrte_lpm -lrte_ethdev -lrte_mempool - -EXPORT_MAP := rte_node_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += null.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += log.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_rx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_tx.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_ctrl.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_lookup.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_rewrite.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_cls.c -SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_drop.c - -# install header files -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_ip4_api.h -SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_eth_api.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pci/Makefile b/lib/librte_pci/Makefile deleted file mode 100644 index 7943f30cab..0000000000 --- a/lib/librte_pci/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 6WIND S.A. - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pci.a - -CFLAGS := -I$(SRCDIR) $(CFLAGS) -CFLAGS += $(WERROR_FLAGS) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_pci_version.map - -SRCS-$(CONFIG_RTE_LIBRTE_PCI) += rte_pci.c - -SYMLINK-$(CONFIG_RTE_LIBRTE_PCI)-include += rte_pci.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile deleted file mode 100644 index ece8aaacc1..0000000000 --- a/lib/librte_pdump/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_pdump.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev - -EXPORT_MAP := rte_pdump_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) := rte_pdump.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_PDUMP)-include := rte_pdump.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile deleted file mode 100644 index cfbbd18282..0000000000 --- a/lib/librte_pipeline/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_pipeline.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table -LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev - -EXPORT_MAP := rte_pipeline_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := rte_pipeline.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_port_in_action.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_table_action.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PIPELINE)-include += rte_pipeline.h rte_port_in_action.h rte_table_action.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile deleted file mode 100644 index 57d2aedbc5..0000000000 --- a/lib/librte_port/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_port.a -ifeq ($(CONFIG_RTE_PORT_PCAP),y) -LDLIBS += -lpcap -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -LDLIBS += -lrte_ip_frag -lrte_sched -lrte_cryptodev -lrte_eventdev -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -LDLIBS += -lrte_kni -endif - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -EXPORT_MAP := rte_port_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ring.c -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_frag.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ras.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sched.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_fd.c -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_kni.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_source_sink.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sym_crypto.c -SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_eventdev.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ring.h -ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_frag.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ras.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sched.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_fd.h -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_kni.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_source_sink.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sym_crypto.h -SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_eventdev.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile deleted file mode 100644 index 3b067b615f..0000000000 --- a/lib/librte_power/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_power.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing -LDLIBS += -lrte_eal -lrte_timer - -EXPORT_MAP := rte_power_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c power_acpi_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_kvm_vm.c guest_channel.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += rte_power_empty_poll.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_pstate_cpufreq.c -SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_common.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_POWER)-include := rte_power.h rte_power_empty_poll.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rawdev/Makefile b/lib/librte_rawdev/Makefile deleted file mode 100644 index 99f5d2a471..0000000000 --- a/lib/librte_rawdev/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017 NXP - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rawdev.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_telemetry - -# library source files -SRCS-y += rte_rawdev.c - -# export include files -SYMLINK-y-include += rte_rawdev.h -SYMLINK-y-include += rte_rawdev_pmd.h - -# versioning export map -EXPORT_MAP := rte_rawdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rcu/Makefile b/lib/librte_rcu/Makefile deleted file mode 100644 index 553bca2ef4..0000000000 --- a/lib/librte_rcu/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Arm Limited - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rcu.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal -lrte_ring - -EXPORT_MAP := rte_rcu_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RCU) := rte_rcu_qsbr.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RCU)-include := rte_rcu_qsbr.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_regexdev/Makefile b/lib/librte_regexdev/Makefile deleted file mode 100644 index c123fcaf5c..0000000000 --- a/lib/librte_regexdev/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2019 Marvell International Ltd. -# Copyright 2020 Mellanox Technologies, Ltd - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_regexdev.a - -EXPORT_MAP := rte_regex_version.map - -# library version -LIBABIVER := 1 - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mbuf - -# library source files -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REGEXDEV) := rte_regexdev.c - -# export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_core.h -SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_driver.h - -# versioning export map -EXPORT_MAP := rte_regexdev_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_reorder/Makefile b/lib/librte_reorder/Makefile deleted file mode 100644 index 1914411d52..0000000000 --- a/lib/librte_reorder/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_reorder.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf - -EXPORT_MAP := rte_reorder_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_REORDER) := rte_reorder.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_REORDER)-include := rte_reorder.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_rib/Makefile b/lib/librte_rib/Makefile deleted file mode 100644 index be80ce5d3f..0000000000 --- a/lib/librte_rib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com> -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_rib.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -LDLIBS += -lrte_eal -lrte_mempool - -EXPORT_MAP := rte_rib_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RIB) := rte_rib.c rte_rib6.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_RIB)-include := rte_rib.h rte_rib6.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile deleted file mode 100644 index 83a9d0840e..0000000000 --- a/lib/librte_ring/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_ring.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_ring_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \ - rte_ring_core.h \ - rte_ring_elem.h \ - rte_ring_generic.h \ - rte_ring_c11_mem.h \ - rte_ring_hts.h \ - rte_ring_hts_c11_mem.h \ - rte_ring_peek.h \ - rte_ring_peek_c11_mem.h \ - rte_ring_rts.h \ - rte_ring_rts_c11_mem.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile deleted file mode 100644 index aee93a1205..0000000000 --- a/lib/librte_sched/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_sched.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) - -LDLIBS += -lm -LDLIBS += -lrt -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net -LDLIBS += -lrte_timer - -EXPORT_MAP := rte_sched_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include := rte_sched.h rte_sched_common.h rte_red.h rte_approx.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_security/Makefile b/lib/librte_security/Makefile deleted file mode 100644 index 825eaeff8e..0000000000 --- a/lib/librte_security/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017-2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_security.a - -# build flags -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool - -# library source files -SRCS-y += rte_security.c - -# export include files -SYMLINK-y-include += rte_security.h -SYMLINK-y-include += rte_security_driver.h - -# versioning export map -EXPORT_MAP := rte_security_version.map - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_stack/Makefile b/lib/librte_stack/Makefile deleted file mode 100644 index 020ef102b5..0000000000 --- a/lib/librte_stack/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_stack.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_stack_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_STACK) := rte_stack.c \ - rte_stack_std.c \ - rte_stack_lf.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_STACK)-include := rte_stack.h \ - rte_stack_std.h \ - rte_stack_lf.h \ - rte_stack_lf_generic.h \ - rte_stack_lf_c11.h \ - rte_stack_lf_stubs.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_table/Makefile b/lib/librte_table/Makefile deleted file mode 100644 index 6ad8a6b17d..0000000000 --- a/lib/librte_table/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -LIB = librte_table.a - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_port -LDLIBS += -lrte_lpm -lrte_hash -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -LDLIBS += -lrte_acl -endif - -EXPORT_MAP := rte_table_version.map - -# -# all source are stored in SRCS-y -# -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm_ipv6.c -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_acl.c -endif -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_cuckoo.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key8.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key16.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key32.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_ext.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_lru.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_array.c -SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_stub.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm_ipv6.h -ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_acl.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_cuckoo.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func_arm64.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h -ifeq ($(CONFIG_RTE_ARCH_X86),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_x86.h -endif -ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_arm64.h -endif -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_array.h -SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_stub.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_telemetry/Makefile b/lib/librte_telemetry/Makefile deleted file mode 100644 index c62cbd86dc..0000000000 --- a/lib/librte_telemetry/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_telemetry.a - -ARCH_DIR ?= $(RTE_ARCH) - -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -CFLAGS += -I$(RTE_SDK)/lib/librte_metrics/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include -CFLAGS += -pthread - -LDLIBS += -lpthread - -EXPORT_MAP := rte_telemetry_version.map - -# library source files -SRCS-y += telemetry.c -SRCS-y += telemetry_data.c -SRCS-y += telemetry_legacy.c - -# export include files -SYMLINK-y-include := rte_telemetry.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile deleted file mode 100644 index 7e95d120c0..0000000000 --- a/lib/librte_timer/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_timer.a - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal - -EXPORT_MAP := rte_timer_version.map - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_TIMER) := rte_timer.c - -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_TIMER)-include := rte_timer.h - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile deleted file mode 100644 index 4f2f3e47da..0000000000 --- a/lib/librte_vhost/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -# library name -LIB = librte_vhost.a - -EXPORT_MAP := rte_vhost_version.map - -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -I vhost_user -CFLAGS += -fno-strict-aliasing -LDLIBS += -lpthread - -ifeq ($(RTE_TOOLCHAIN), gcc) -ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) -CFLAGS += -DVHOST_GCC_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), clang) -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1) -CFLAGS += -DVHOST_CLANG_UNROLL_PRAGMA -endif -endif - -ifeq ($(RTE_TOOLCHAIN), icc) -ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) -CFLAGS += -DVHOST_ICC_UNROLL_PRAGMA -endif -endif - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -LDLIBS += -lnuma -endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net - -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \ - vhost_user.c virtio_net.c vdpa.c - -# install includes -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h \ - rte_vdpa_dev.h rte_vhost_async.h - -# only compile vhost crypto when cryptodev is enabled -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -LDLIBS += -lrte_cryptodev -lrte_hash -SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto.c -SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost_crypto.h -endif - -include $(RTE_SDK)/mk/rte.lib.mk diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk deleted file mode 100644 index dc8c10a24c..0000000000 --- a/mk/arch/arm/rte.vars.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -ARCH ?= arm -CROSS ?= - -CPU_CFLAGS ?= -marm -munaligned-access -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-littlearm -RTE_OBJCOPY_ARCH = arm - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk deleted file mode 100644 index a75b80c222..0000000000 --- a/mk/arch/arm64/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= arm64 -# common arch dir in eal headers -ARCH_DIR := arm -CROSS ?= - -CPU_CFLAGS ?= -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-littleaarch64 -RTE_OBJCOPY_ARCH = aarch64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk deleted file mode 100644 index c867883f15..0000000000 --- a/mk/arch/i686/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= i386 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m32 -D_FILE_OFFSET_BITS=64 -CPU_LDFLAGS ?= -melf_i386 -CPU_ASFLAGS ?= -felf - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-i386 -RTE_OBJCOPY_ARCH = i386 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk deleted file mode 100644 index 9f7ab22f42..0000000000 --- a/mk/arch/ppc_64/rte.vars.mk +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -ARCH ?= powerpc -ARCH_DIR := ppc -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-powerpcle -RTE_OBJCOPY_ARCH = powerpc:common64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk deleted file mode 100644 index e1689be9b4..0000000000 --- a/mk/arch/x86_64/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -# common arch dir in eal headers -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -m64 -CPU_LDFLAGS ?= -CPU_ASFLAGS ?= -felf64 - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf64-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_x32/rte.vars.mk b/mk/arch/x86_x32/rte.vars.mk deleted file mode 100644 index c59b37a2c8..0000000000 --- a/mk/arch/x86_x32/rte.vars.mk +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32 -# - -ARCH ?= x86_64 -ARCH_DIR := x86 -CROSS ?= - -CPU_CFLAGS ?= -mx32 -CPU_LDFLAGS ?= -melf32_x86_64 -#CPU_ASFLAGS ?= -felf64 -# x32 is supported by Linux distribution with gcc4.8 and newer in some -# cases there is backported support in gcc4.6 -ifneq ($(shell echo | $(CC) $(CPU_CFLAGS) -E - 2>/dev/null 1>/dev/null && echo 0), 0) - $(error This version of GCC does not support x32 ABI) -endif - -export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS - -RTE_OBJCOPY_TARGET = elf32-x86-64 -RTE_OBJCOPY_ARCH = i386:x86-64 - -export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp deleted file mode 120000 index 69f5cba2c2..0000000000 --- a/mk/exec-env/bsdapp +++ /dev/null @@ -1 +0,0 @@ -freebsd/ \ No newline at end of file diff --git a/mk/exec-env/freebsd/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/freebsd/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk deleted file mode 100644 index 630eb55f73..0000000000 --- a/mk/exec-env/freebsd/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/include - -EXECENV_LDFLAGS = -EXECENV_LDLIBS = -lexecinfo -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -BSDMAKE=/usr/bin/make - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS diff --git a/mk/exec-env/linux/rte.app.mk b/mk/exec-env/linux/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/linux/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk deleted file mode 100644 index 41ef4195b0..0000000000 --- a/mk/exec-env/linux/rte.vars.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2019 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linux, freebsd -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -# include in every library to build -EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/include - -EXECENV_LDLIBS = -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -# For shared libraries -EXECENV_LDFLAGS += -export-dynamic -# Add library to the group to resolve symbols -EXECENV_LDLIBS += -ldl - -# EXECENV_LDLIBS-y applies to lib.so and app linking -# while EXECENV_LDLIBS applies only to app linking. -EXECENV_LDLIBS += $(EXECENV_LDLIBS-y) - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp deleted file mode 120000 index ce5e2c77b2..0000000000 --- a/mk/exec-env/linuxapp +++ /dev/null @@ -1 +0,0 @@ -linux/ \ No newline at end of file diff --git a/mk/internal/rte.build-post.mk b/mk/internal/rte.build-post.mk deleted file mode 100644 index a6b6a9a46a..0000000000 --- a/mk/internal/rte.build-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# build helper .mk - -# fast way, no need to do prebuild and postbuild -ifeq ($(PREBUILD)$(POSTBUILD),) - -_postbuild: $(_BUILD) - @touch _postbuild - -else # slower way - -_prebuild: $(PREBUILD) - @touch _prebuild - -ifneq ($(_BUILD),) -$(_BUILD): _prebuild -else -_BUILD = _prebuild -endif - -_build: $(_BUILD) - @touch _build - -ifneq ($(POSTBUILD),) -$(POSTBUILD): _build -else -POSTBUILD = _build -endif - -_postbuild: $(POSTBUILD) - @touch _postbuild -endif \ No newline at end of file diff --git a/mk/internal/rte.build-pre.mk b/mk/internal/rte.build-pre.mk deleted file mode 100644 index 137612f19b..0000000000 --- a/mk/internal/rte.build-pre.mk +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_BUILD_TARGETS := _prebuild _build _postbuild - -comma := , -linkerprefix = $(subst -Wl$(comma)-L,-L,$(addprefix -Wl$(comma),$1)) diff --git a/mk/internal/rte.clean-post.mk b/mk/internal/rte.clean-post.mk deleted file mode 100644 index 77685edd99..0000000000 --- a/mk/internal/rte.clean-post.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# clean helper .mk - -# fast way, no need to do preclean and postclean -ifeq ($(PRECLEAN)$(POSTCLEAN),) - -_postclean: $(_CLEAN) - @touch _postclean - -else # slower way - -_preclean: $(PRECLEAN) - @touch _preclean - -ifneq ($(_CLEAN),) -$(_CLEAN): _preclean -else -_CLEAN = _preclean -endif - -_clean: $(_CLEAN) - @touch _clean - -ifneq ($(POSTCLEAN),) -$(POSTCLEAN): _clean -else -POSTCLEAN = _clean -endif - -_postclean: $(POSTCLEAN) - @touch _postclean -endif diff --git a/mk/internal/rte.clean-pre.mk b/mk/internal/rte.clean-pre.mk deleted file mode 100644 index e21607bff9..0000000000 --- a/mk/internal/rte.clean-pre.mk +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -_CLEAN_TARGETS := _preclean _clean _postclean diff --git a/mk/internal/rte.compile-post.mk b/mk/internal/rte.compile-post.mk deleted file mode 100644 index 01525bee1b..0000000000 --- a/mk/internal/rte.compile-post.mk +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# no rule no build these files -$(DEPS-y) $(CMDS-y): diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk deleted file mode 100644 index df05b55769..0000000000 --- a/mk/internal/rte.compile-pre.mk +++ /dev/null @@ -1,164 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# Common to rte.lib.mk, rte.app.mk, rte.obj.mk -# - -SRCS-all := $(SRCS-y) $(SRCS-n) $(SRCS-) - -# convert source to obj file -src2obj = $(strip $(patsubst %.c,%.o,\ - $(patsubst %.S,%_s.o,$(1)))) - -# add a dot in front of the file name -dotfile = $(strip $(foreach f,$(1),\ - $(join $(dir $f),.$(notdir $f)))) - -# convert source/obj files into dot-dep filename (does not -# include .S files) -src2dep = $(strip $(call dotfile,$(patsubst %.c,%.o.d, \ - $(patsubst %.S,,$(1))))) -obj2dep = $(strip $(call dotfile,$(patsubst %.o,%.o.d,$(1)))) - -# convert source/obj files into dot-cmd filename -src2cmd = $(strip $(call dotfile,$(patsubst %.c,%.o.cmd, \ - $(patsubst %.S,%_s.o.cmd,$(1))))) -obj2cmd = $(strip $(call dotfile,$(patsubst %.o,%.o.cmd,$(1)))) - -OBJS-y := $(call src2obj,$(SRCS-y)) -OBJS-n := $(call src2obj,$(SRCS-n)) -OBJS- := $(call src2obj,$(SRCS-)) -OBJS-all := $(filter-out $(SRCS-all),$(OBJS-y) $(OBJS-n) $(OBJS-)) - -DEPS-y := $(call src2dep,$(SRCS-y)) -DEPS-n := $(call src2dep,$(SRCS-n)) -DEPS- := $(call src2dep,$(SRCS-)) -DEPS-all := $(DEPS-y) $(DEPS-n) $(DEPS-) -DEPSTMP-all := $(DEPS-all:%.d=%.d.tmp) - -CMDS-y := $(call src2cmd,$(SRCS-y)) -CMDS-n := $(call src2cmd,$(SRCS-n)) -CMDS- := $(call src2cmd,$(SRCS-)) -CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-) - --include $(DEPS-y) $(CMDS-y) - -# command to compile a .c file to generate an object -ifeq ($(USE_HOST),1) -C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \ - $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)") -else -C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \ - $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $< -C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight -C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)") -endif -CHECK_SYMBOLS_SCRIPT = $(RTE_SDK)/buildtools/check-symbols.sh -CHECK_SYMBOLS = $(CHECK_SYMBOLS_SCRIPT) $(SRCDIR)/$(EXPORT_MAP) $@ - -PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c -PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c -PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@ -PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \ - echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ - $(PMDINFO_GEN) && \ - echo "$(if $V,$(PMDINFO_CC), CC $@.pmd.o)" && \ - $(PMDINFO_CC) && \ - echo "$(if $V,$(PMDINFO_LD), LD $@)" && \ - $(PMDINFO_LD) && \ - mv -f $@.o $@; fi -C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)' -C_TO_O_DO = @set -e; \ - echo $(C_TO_O_DISP); \ - $(C_TO_O) && \ - $(PMDINFO_TO_O) && \ - $(CHECK_SYMBOLS) && \ - echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \ - sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \ - rm -f $(call obj2dep,$(@)).tmp - -# return an empty string if string are equal -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -# return a non-empty string if the dst file does not exist -file_missing = $(call compare,$(wildcard $@),$@) - -# return a non-empty string if cmdline changed -cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1))) - -# return a non-empty string if a dependency file does not exist -depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@)) - -# return an empty string if no prereq is newer than target -# - $^ -> names of all the prerequisites -# - $(wildcard $^) -> every existing prereq -# - $(filter-out $(wildcard $^),$^) -> every prereq that don't -# exist (filter-out removes existing ones from the list) -# - $? -> names of all the prerequisites newer than target -depfile_newer = $(strip $(filter-out FORCE,$? \ - $(filter-out $(wildcard $^),$^))) - -# return 1 if parameter is a non-empty string, else 0 -boolean = $(if $1,1,0) - -# -# Compile .c file if needed -# Note: dep_$$@ is from the .d file and DEP_$$@ can be specified by -# user (by default it is empty) -# -.SECONDEXPANSION: -%.o: %.c $$(wildcard $$(dep_$$@)) $$(DEP_$$(@)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer))") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(C_TO_O)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(C_TO_O_DO)) - -# command to assemble a .S file to generate an object -ifeq ($(USE_HOST),1) -S_TO_O = $(CPP) $(HOST_CPPFLAGS) $($(@)_CPPFLAGS) $(HOST_EXTRA_CPPFLAGS) $< $(@).tmp && \ - $(HOSTAS) $(HOST_ASFLAGS) $($(@)_ASFLAGS) $(HOST_EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," HOSTAS $(@)") -else -S_TO_O = $(CPP) $(CPPFLAGS) $($(@)_CPPFLAGS) $(EXTRA_CPPFLAGS) $< -o $(@).tmp && \ - $(AS) $(ASFLAGS) $($(@)_ASFLAGS) $(EXTRA_ASFLAGS) -o $@ $(@).tmp -S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight -S_TO_O_DISP = $(if $(V),"$(S_TO_O_STR)"," AS $(@)") -endif - -S_TO_O_CMD = "cmd_$@ = $(S_TO_O_STR)" -S_TO_O_DO = @set -e; \ - echo $(S_TO_O_DISP); \ - $(S_TO_O) && \ - echo $(S_TO_O_CMD) > $(call obj2cmd,$(@)) - -# -# Compile .S file if needed -# Note: DEP_$$@ can be specified by user (by default it is empty) -# -%_s.o: %.S $$(DEP_$$@) FORCE - @[ ! -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(S_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(S_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(S_TO_O_DO)) diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk deleted file mode 100644 index 98c860628a..0000000000 --- a/mk/internal/rte.extvars.mk +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# directory where sources are located -# -ifdef S -ifeq ("$(origin S)", "command line") -RTE_SRCDIR := $(abspath $(S)) -endif -endif -RTE_SRCDIR ?= $(CURDIR) -export RTE_SRCDIR - -# -# Makefile to call once $(RTE_OUTPUT) is created -# -ifdef M -ifeq ("$(origin M)", "command line") -RTE_EXTMK := $(abspath $(M)) -endif -endif -RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST))) -export RTE_EXTMK - -# RTE_SDK_BIN must point to .config, include/ and lib/. -RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET) -ifeq ($(wildcard $(RTE_SDK_BIN)/.config),) -$(error Cannot find .config in $(RTE_SDK_BIN)) -endif - -# -# Output files wil go in a separate directory: default output is -# $(RTE_SRCDIR)/build -# Output dir can be given as command line using "O=" -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# if we are building an external application, include SDK -# configuration and include project configuration if any -include $(RTE_SDK_BIN)/.config -ifneq ($(wildcard $(RTE_OUTPUT)/.config),) - include $(RTE_OUTPUT)/.config -endif -# remove double-quotes from config names -RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) -RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) -RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) -RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk deleted file mode 100644 index a1aa0ca4ff..0000000000 --- a/mk/internal/rte.install-post.mk +++ /dev/null @@ -1,71 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install helper .mk - -# -# generate rules to install files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define install_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " INSTALL-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)cp -rf $$(<) $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(INSTALL-DIRS-y),\ - $(foreach file,$(INSTALL-y-$(dir)),\ - $(eval $(call install_rule,$(dir),$(file))))) - - -# -# generate rules to install symbolic links of files in RTE_OUTPUT. -# -# arg1: relative install dir in RTE_OUTPUT -# arg2: relative file name in a source dir (VPATH) -# -define symlink_rule -$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2) - @echo " SYMLINK-FILE $(addprefix $(1)/,$(notdir $(2)))" - @[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1) - $(Q)ln -nsf `$(RTE_SDK)/buildtools/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \ - $(RTE_OUTPUT)/$(1) -endef - -$(foreach dir,$(SYMLINK-DIRS-y),\ - $(foreach file,$(SYMLINK-y-$(dir)),\ - $(eval $(call symlink_rule,$(dir),$(file))))) - - -# fast way, no need to do preinstall and postinstall -ifeq ($(PREINSTALL)$(POSTINSTALL),) - -_postinstall: $(_INSTALL) - @touch _postinstall - -else # slower way - -_preinstall: $(PREINSTALL) - @touch _preinstall - -ifneq ($(_INSTALL),) -$(_INSTALL): _preinstall -else -_INSTALL = _preinstall -endif - -_install: $(_INSTALL) - @touch _install - -ifneq ($(POSTINSTALL),) -$(POSTINSTALL): _install -else -POSTINSTALL = _install -endif - -_postinstall: $(POSTINSTALL) - @touch _postinstall -endif diff --git a/mk/internal/rte.install-pre.mk b/mk/internal/rte.install-pre.mk deleted file mode 100644 index 4786d3b28b..0000000000 --- a/mk/internal/rte.install-pre.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# get all variables starting with "INSTALL-y-", and extract the -# installation dir and path -# -INSTALL-y := $(filter INSTALL-y-%,$(.VARIABLES)) -INSTALL-n := $(filter INSTALL-n-%,$(.VARIABLES)) -INSTALL- := $(filter INSTALL--%,$(.VARIABLES)) -INSTALL-DIRS-y := $(patsubst INSTALL-y-%,%,$(INSTALL-y)) -INSTALL-FILES-y := $(foreach i,$(INSTALL-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) -INSTALL-FILES-all := $(foreach i,$(INSTALL-DIRS-y) $(INSTALL-DIRS-n) $(INSTALL-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i))))) - -_INSTALL_TARGETS := _preinstall _install _postinstall - -# -# get all variables starting with "SYMLINK-y-", and extract the -# installation dir and path -# -SYMLINK-y := $(filter SYMLINK-y-%,$(.VARIABLES)) -SYMLINK-n := $(filter SYMLINK-n-%,$(.VARIABLES)) -SYMLINK- := $(filter SYMLINK--%,$(.VARIABLES)) -SYMLINK-DIRS-y := $(patsubst SYMLINK-y-%,%,$(SYMLINK-y)) -SYMLINK-FILES-y := $(foreach i,$(SYMLINK-DIRS-y),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) -SYMLINK-FILES-all := $(foreach i,$(SYMLINK-DIRS-y) $(SYMLINK-DIRS-n) $(SYMLINK-DIRS-),\ - $(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i))))) - -_SYMLINK_TARGETS := _presymlink _symlink _postsymlink diff --git a/mk/machine/armv7a/rte.vars.mk b/mk/machine/armv7a/rte.vars.mk deleted file mode 100644 index 44ebd68dae..0000000000 --- a/mk/machine/armv7a/rte.vars.mk +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All rights reserved. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv7-a - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -MACHINE_CFLAGS += -mfpu=neon diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk deleted file mode 100644 index 5e3ffc3adf..0000000000 --- a/mk/machine/armv8a/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk deleted file mode 100644 index df08d3b038..0000000000 --- a/mk/machine/default/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=corei7 diff --git a/mk/machine/dpaa/rte.vars.mk b/mk/machine/dpaa/rte.vars.mk deleted file mode 100644 index 75df626ff2..0000000000 --- a/mk/machine/dpaa/rte.vars.mk +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. -# Copyright 2017 NXP - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%) -endif - -# To avoid TLS corruption issue. -MACHINE_CFLAGS += -mtls-dialect=trad diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk deleted file mode 100644 index 50342dfa27..0000000000 --- a/mk/machine/emag/rte.vars.mk +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag) diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk deleted file mode 100644 index 39099e760e..0000000000 --- a/mk/machine/hsw/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx2 diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk deleted file mode 100644 index 5b6563742a..0000000000 --- a/mk/machine/ivb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=core-avx-i diff --git a/mk/machine/n1sdp/rte.vars.mk b/mk/machine/n1sdp/rte.vars.mk deleted file mode 100644 index 6d69de03c9..0000000000 --- a/mk/machine/n1sdp/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=neoverse-n1) diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk deleted file mode 100644 index 8c96e3fa04..0000000000 --- a/mk/machine/native/rte.vars.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=native - -# On FreeBSD systems, sometimes the correct CPU type is not picked up. -# To get everything to compile, we need SSE4.2 support, so check if that is -# reported by compiler. If not, check if the CPU actually supports it, and if -# so, set the compilation target to be a corei7, minimum target with SSE4.2. -SSE42_SUPPORT=$(shell $(CC) -march=native -dM -E - </dev/null | grep SSE4_2) -ifeq ($(SSE42_SUPPORT),) - MACHINE_CFLAGS = -march=corei7 -endif diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk deleted file mode 100644 index 91de5d9bed..0000000000 --- a/mk/machine/nhm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.mk deleted file mode 100644 index e209cf4920..0000000000 --- a/mk/machine/octeontx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto+lse) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2) diff --git a/mk/machine/power8/rte.vars.mk b/mk/machine/power8/rte.vars.mk deleted file mode 100644 index 00e0834b8a..0000000000 --- a/mk/machine/power8/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = diff --git a/mk/machine/silvermont/rte.vars.mk b/mk/machine/silvermont/rte.vars.mk deleted file mode 100644 index e4f3fe42bd..0000000000 --- a/mk/machine/silvermont/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=silvermont diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk deleted file mode 100644 index efe2f32d70..0000000000 --- a/mk/machine/snb/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7-avx diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk deleted file mode 100644 index 047741668c..0000000000 --- a/mk/machine/thunderx/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a+crc+crypto -mcpu=thunderx diff --git a/mk/machine/thunderx2/rte.vars.mk b/mk/machine/thunderx2/rte.vars.mk deleted file mode 100644 index b80dc8680c..0000000000 --- a/mk/machine/thunderx2/rte.vars.mk +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -include $(RTE_SDK)/mk/rte.helper.mk - -MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1-a+crc+crypto) -MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99) diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk deleted file mode 100644 index e9bc3f9848..0000000000 --- a/mk/machine/wsm/rte.vars.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS = -march=corei7 -maes -mpclmul diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk deleted file mode 100644 index e632f3139b..0000000000 --- a/mk/machine/xgene1/rte.vars.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -MACHINE_CFLAGS += -march=armv8-a diff --git a/mk/rte.app.mk b/mk/rte.app.mk deleted file mode 100644 index a544259970..0000000000 --- a/mk/rte.app.mk +++ /dev/null @@ -1,509 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation. -# Copyright(c) 2014-2015 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(APP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_INSTALL += $(RTE_OUTPUT)/app/$(APP) $(RTE_OUTPUT)/app/$(APP).map -POSTINSTALL += target-appinstall -_CLEAN = doclean -POSTCLEAN += target-appclean - -ifeq ($(NO_LDSCRIPT),) -LDSCRIPT = $(RTE_LDSCRIPT) -endif - -# Link only the libraries used in the application -LDFLAGS += --as-needed - -# default path for libs -_LDLIBS-y += -L$(RTE_SDK_BIN)/lib - -# -# Order is important: from higher level to lower level -# -_LDLIBS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += -lrte_flow_classify -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += -lrte_pipeline -_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += -lrte_table -_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += -lrte_port -_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += --no-whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PDUMP) += -lrte_pdump -_LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor -_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter -_LDLIBS-$(CONFIG_RTE_LIBRTE_FIB) += -lrte_fib -_LDLIBS-$(CONFIG_RTE_LIBRTE_RIB) += -lrte_rib -_LDLIBS-$(CONFIG_RTE_LIBRTE_LPM) += -lrte_lpm -_LDLIBS-$(CONFIG_RTE_LIBRTE_ACL) += -lrte_acl -_LDLIBS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += -lrte_jobstats -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -lrte_metrics -ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += -ljansson -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS) += --no-whole-archive -_LDLIBS-$(CONFIG_RTE_LIBRTE_BITRATE) += -lrte_bitratestats -_LDLIBS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += -lrte_latencystats -_LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power - -_LDLIBS-$(CONFIG_RTE_LIBRTE_EFD) += -lrte_efd -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lrte_bpf -ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF) += -lelf -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPSEC) += -lrte_ipsec - -_LDLIBS-y += --whole-archive - -_LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE) += -lrte_cfgfile -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRO) += -lrte_gro -_LDLIBS-$(CONFIG_RTE_LIBRTE_GSO) += -lrte_gso -_LDLIBS-$(CONFIG_RTE_LIBRTE_HASH) += -lrte_hash -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lrte_member -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost -_LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs -_LDLIBS-y += -lrte_telemetry -_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf -_LDLIBS-$(CONFIG_RTE_LIBRTE_NET) += -lrte_net -_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lrte_ethdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_BBDEV) += -lrte_bbdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += -lrte_cryptodev -_LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY) += -lrte_security -_LDLIBS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += -lrte_compressdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += -lrte_regexdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += -lrte_eventdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV) += -lrte_rawdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool -_LDLIBS-$(CONFIG_RTE_LIBRTE_STACK) += -lrte_stack -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += -lrte_mempool_octeontx2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI) += -lrte_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrte_eal -_LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline -_LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -_LDLIBS-$(CONFIG_RTE_LIBRTE_RCU) += -lrte_rcu -_LDLIBS-$(CONFIG_RTE_LIBRTE_GRAPH) += -lrte_graph -_LDLIBS-$(CONFIG_RTE_LIBRTE_NODE) += -lrte_node - -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni -endif - -OTX-CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) -OTX-CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -ifeq ($(findstring y,$(OTX-CPT-y)),y) -_LDLIBS-y += -lrte_common_cpt -endif - -ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy) -_LDLIBS-y += -lrte_common_octeontx -endif -OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) -OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) -ifeq ($(findstring y,$(OCTEONTX2-y)),y) -_LDLIBS-y += -lrte_common_octeontx2 -endif - -MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD) -MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) -ifneq (,$(findstring y,$(MVEP-y))) -_LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk -endif - -DPAAX-y := $(CONFIG_RTE_LIBRTE_DPAA_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_FSLMC_BUS) -DPAAX-y += $(CONFIG_RTE_LIBRTE_ENETC_PMD) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) -DPAAX-y += $(CONFIG_RTE_LIBRTE_PFE_PMD) -ifeq ($(findstring y,$(DPAAX-y)),y) - _LDLIBS-y += -lrte_common_dpaax -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += -lrte_bus_vdev -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += -lrte_bus_fslmc -endif - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# plugins (link only if static libraries) - -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket -_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += -lrte_mempool_dpaa2 -endif - -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += -lrte_pmd_af_xdp -lbpf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += -lrte_pmd_ark -_LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += -lrte_pmd_atlantic -_LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += -lrte_pmd_avp -_LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += -lrte_pmd_axgbe -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz -_LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += -lrte_pmd_bnxt -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond -_LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += -lrte_pmd_dpaa -endif -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += -lrte_pmd_enetc -_LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic -_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += -lrte_pmd_failsafe -_LDLIBS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += -lrte_pmd_hinic -_LDLIBS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += -lrte_pmd_hns3 -_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e -_LDLIBS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += -lrte_pmd_iavf -_LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += -lrte_pmd_ice -IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD) -IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD) -ifeq ($(findstring y,$(IAVF-y)),y) -_LDLIBS-y += -lrte_common_iavf -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += -lrte_pmd_igc -_LDLIBS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += -lrte_pmd_ionic -_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe -ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += -lrte_pmd_kni -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += -lrte_pmd_lio -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += -lrte_pmd_memif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4 -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -lrte_common_mlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -lrte_pmd_mlx5 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += -lrte_pmd_mlx5_vdpa -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += -lrte_pmd_mlx5_regex -ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y) -_LDLIBS-y += -ldl -else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y) -LIBS_IBVERBS_STATIC = $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh) -_LDLIBS-y += --no-whole-archive -_LDLIBS-y += $(LIBS_IBVERBS_STATIC) -_LDLIBS-y += --whole-archive -else -ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y) -_LDLIBS-y += -libverbs -lmlx5 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs -lmlx4 -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += -lrte_pmd_mvpp2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += -lrte_pmd_mvneta -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += -lrte_pmd_nfp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += -lrte_pmd_octeontx2 -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap -lpcap -_LDLIBS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += -lrte_pmd_pfe -_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += -lrte_pmd_qede -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring -ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += -lrte_pmd_softnic -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += -lrte_pmd_sfc_efx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lrte_pmd_szedata2 -lsze2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += -lrte_pmd_nfb -_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += -lrte_pmd_tap -_LDLIBS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += -lrte_pmd_thunderx_nicvf -_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += -lrte_pmd_vdev_netvsc -_LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio -ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += -lrte_pmd_vhost -ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc -endif # $(CONFIG_RTE_EAL_VFIO) -endif # $(CONFIG_RTE_LIBRTE_VHOST) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio - -_LDLIBS-$(CONFIG_RTE_LIBRTE_VMBUS) += -lrte_bus_vmbus -_LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += -lrte_pmd_netvsc - -ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += -lrte_pmd_bbdev_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += -lrte_pmd_bbdev_fpga_5gnr_fec - -# TURBO SOFTWARE PMD is dependent on the FLEXRAN library -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y) -# Dependency on the FLEXRAN SDK library if available -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_crc -lcrc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_turbo -lturbo -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_common -lcommon -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lirc -limf -lstdc++ -lipps -lsvml -ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr -endif # CONFIG_RTE_BBDEV_SDK_AVX512 -endif # CONFIG_RTE_BBDEV_SDK_AVX2 -endif # CONFIG_RTE_LIBRTE_BBDEV - -ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lrte_pmd_aesni_mb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lrte_pmd_aesni_gcm -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += -lrte_pmd_ccp -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_SYM) += -lrte_pmd_qat -lcrypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM) += -lrte_pmd_qat -lcrypto -endif # CONFIG_RTE_LIBRTE_PMD_QAT -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lrte_pmd_zuc -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -lrte_pmd_armv8 -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mvsam_crypto -lmusdk -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += -lrte_pmd_nitrox -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += -lrte_pmd_octeontx_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += -lrte_pmd_octeontx2_crypto -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += -lrte_pmd_crypto_scheduler -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_pmd_dpaa2_sec -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += -lrte_pmd_dpaa_sec -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += -lrte_pmd_caam_jr -endif # CONFIG_RTE_LIBRTE_SECURITY -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += -lrte_pmd_virtio_crypto -endif # CONFIG_RTE_LIBRTE_CRYPTODEV - -ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lrte_pmd_isal_comp -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lisal -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += -lrte_pmd_octeontx_zip -# Link QAT driver if it has not been linked yet -ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),n) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -endif # CONFIG_RTE_LIBRTE_PMD_QAT_SYM -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lrte_pmd_zlib -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lz -endif # CONFIG_RTE_LIBRTE_COMPRESSDEV - -ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += -lrte_pmd_skeleton_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += -lrte_pmd_sw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += -lrte_pmd_dsw_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += -lrte_pmd_octeontx_ssovf -ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += -lrte_pmd_dpaa_event -endif # CONFIG_RTE_LIBRTE_DPAA_BUS -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += -lrte_pmd_dpaa2_event -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS - -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += -lrte_mempool_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += -lrte_pmd_octeontx -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += -lrte_pmd_octeontx2_event -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event -endif # CONFIG_RTE_LIBRTE_EVENTDEV - -ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_rawdev_skeleton -ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_rawdev_dpaa2_cmdif -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_rawdev_dpaa2_qdma -endif # CONFIG_RTE_LIBRTE_FSLMC_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga -ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += -lrte_rawdev_ifpga -lfdt -_LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += -lrte_pmd_ipn3ke -endif # CONFIG_RTE_LIBRTE_IFPGA_BUS -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += -lrte_rawdev_ioat -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_rawdev_ntb -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += -lrte_rawdev_octeontx2_dma -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += -lrte_rawdev_octeontx2_ep -endif # CONFIG_RTE_LIBRTE_RAWDEV - -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += --no-whole-archive - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -# The static libraries do not know their dependencies. -# So linking with static library requires explicit dependencies. -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrt -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) -_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt -_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lm -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma -endif -_LDLIBS-$(CONFIG_RTE_PORT_PCAP) += -lpcap -endif # !CONFIG_RTE_BUILD_SHARED_LIBS - -_LDLIBS-y += $(EXECENV_LDLIBS) - -LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS) $(EXTRA_LDLIBS) - -# all the words except the first one -allbutfirst = $(wordlist 2,$(words $(1)),$(1)) - -# Eliminate duplicates without sorting, only keep the last occurrence -filter-libs = \ - $(if $(1),$(strip\ - $(if \ - $(and \ - $(filter $(firstword $(1)),$(call allbutfirst,$(1))),\ - $(filter -l%,$(firstword $(1)))),\ - ,\ - $(firstword $(1))) \ - $(call filter-libs,$(call allbutfirst,$(1))))) - -LDLIBS := $(call filter-libs,$(LDLIBS)) - -MAPFLAGS = -Map=$@.map --cref - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS)) -else -O_TO_EXE = $(LD) -o $@ $(OBJS-y) \ - $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - $(MAPFLAGS) -endif -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," LD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(APP).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Compile executable file if needed -# -$(APP): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(APP)) $(LDSCRIPT) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP): $(APP) - @echo " INSTALL-APP $(APP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP) $(RTE_OUTPUT)/app - -# -# install app map file in $(RTE_OUTPUT)/app -# -$(RTE_OUTPUT)/app/$(APP).map: $(APP) - @echo " INSTALL-MAP $(APP).map" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(APP).map $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(APP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(APP).cmd $(APP).map - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk -else -include $(RTE_SDK)/mk/target/generic/rte.app.mk -endif - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.bsdmodule.mk b/mk/rte.bsdmodule.mk deleted file mode 100644 index df8bf9ef35..0000000000 --- a/mk/rte.bsdmodule.mk +++ /dev/null @@ -1,89 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# DPDK uses a more up-to-date gcc, so clear the override here. -unexport CC -override CFLAGS = $(MODULE_CFLAGS) - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - $(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)if [ ! -f $(notdir BSDmakefile) ]; then ln -nfs $(SRCDIR)/BSDmakefile . ; fi - $(Q)MAKEFLAGS= $(BSDMAKE) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - $(Q)echo INSTALL-MODULE $(MODULE).ko - $(Q)[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - $(Q)cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - $(Q)MAKEFLAGS= $(BSDMAKE) install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - $(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - $(Q)$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - $(Q)if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.combinedlib.mk b/mk/rte.combinedlib.mk deleted file mode 100644 index 9d0f935358..0000000000 --- a/mk/rte.combinedlib.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -default: all - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXT:=.so -else -EXT:=.a -endif - -RTE_LIBNAME := dpdk -COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT) - -LIBS := $(filter-out $(COMBINEDLIB), $(sort $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT))))) - -all: FORCE - $(Q)echo "GROUP ( $(LIBS) )" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -# -# Clean all generated files -# -.PHONY: clean -clean: - $(Q)rm -f $(RTE_OUTPUT)/lib/$(COMBINEDLIB) - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk deleted file mode 100644 index fa87535312..0000000000 --- a/mk/rte.cpuflags.mk +++ /dev/null @@ -1,124 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# this makefile is called from the generic rte.vars.mk and is -# used to set the RTE_CPUFLAG_* environment variables giving details -# of what instruction sets the target cpu supports. - -AUTO_CPUFLAGS := $(shell $(CC) $(MACHINE_CFLAGS) $(WERROR_FLAGS) $(EXTRA_CFLAGS) -dM -E - < /dev/null) - -# adding flags to CPUFLAGS - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE__),) -CPUFLAGS += SSE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE2__),) -CPUFLAGS += SSE2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE3__),) -CPUFLAGS += SSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSSE3__),) -CPUFLAGS += SSSE3 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_1__),) -CPUFLAGS += SSE4_1 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_2__),) -CPUFLAGS += SSE4_2 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AES__),) -CPUFLAGS += AES -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PCLMUL__),) -CPUFLAGS += PCLMULQDQ -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) -CPUFLAGS += RDRAND -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) -CPUFLAGS += RDSEED -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),) -CPUFLAGS += FSGSBASE -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__F16C__),) -CPUFLAGS += F16C -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX),y) -CPUFLAGS += AVX2 -endif -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),) -ifeq ($(CONFIG_RTE_ENABLE_AVX512),y) -CPUFLAGS += AVX512F -else -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(FORCE_DISABLE_AVX512),y) -MACHINE_CFLAGS += -mno-avx512f -endif -endif -endif - -# IBM Power CPU flags -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC64__),) -CPUFLAGS += PPC64 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__PPC32__),) -CPUFLAGS += PPC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__vector),) -CPUFLAGS += ALTIVEC -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),) -CPUFLAGS += VSX -endif - -# ARM flags -ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),) -CPUFLAGS += NEON -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRC32),) -CPUFLAGS += CRC32 -endif - -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRYPTO),) -CPUFLAGS += AES -CPUFLAGS += PMULL -CPUFLAGS += SHA1 -CPUFLAGS += SHA2 -endif - -MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS)) - -# To strip whitespace -comma:= , -empty:= -space:= $(empty) $(empty) -CPUFLAGSTMP1 := $(addprefix RTE_CPUFLAG_,$(CPUFLAGS)) -CPUFLAGSTMP2 := $(subst $(space),$(comma),$(CPUFLAGSTMP1)) -CPUFLAGS_LIST := -DRTE_COMPILE_TIME_CPUFLAGS=$(CPUFLAGSTMP2) diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk deleted file mode 100644 index 427bb52306..0000000000 --- a/mk/rte.extapp.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.app.mk -endif diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk deleted file mode 100644 index 977873325d..0000000000 --- a/mk/rte.extlib.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -EXTLIB_BUILD := y - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.lib.mk -endif diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk deleted file mode 100644 index c761a5de1e..0000000000 --- a/mk/rte.extobj.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.obj.mk -endif diff --git a/mk/rte.extshared.mk b/mk/rte.extshared.mk deleted file mode 100644 index 64269e1a85..0000000000 --- a/mk/rte.extshared.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -# we must create the output dir first and recall the same Makefile -# from this directory -ifeq ($(NOT_FIRST_CALL),) - -NOT_FIRST_CALL = 1 -export NOT_FIRST_CALL - -all: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) - @echo $(RTE_OUTPUT)/lib must be added to /etc/ld.so.conf or \ - LD_LIBRARY_PATH variable to allow binary to link with dynamic library - -%:: - $(Q)mkdir -p $(RTE_OUTPUT) - $(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \ - S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR) -else -include $(RTE_SDK)/mk/rte.shared.mk -endif diff --git a/mk/rte.extsubdir.mk b/mk/rte.extsubdir.mk deleted file mode 100644 index 0f8ef94c50..0000000000 --- a/mk/rte.extsubdir.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -MAKEFLAGS += --no-print-directory - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -# output directory -O ?= $(CURDIR) -BASE_OUTPUT ?= $(abspath $(O)) -CUR_SUBDIR ?= . - -.PHONY: all -all: $(DIRS-y) - -.PHONY: clean -clean: $(DIRS-y) - -.PHONY: $(DIRS-y) -$(DIRS-y): - @echo "== $@" - $(Q)$(MAKE) -C $(@) \ - M=$(CURDIR)/$(@)/Makefile \ - O=$(BASE_OUTPUT)/$(CUR_SUBDIR)/$(@)/$(RTE_TARGET) \ - BASE_OUTPUT=$(BASE_OUTPUT) \ - CUR_SUBDIR=$(CUR_SUBDIR)/$(@) \ - S=$(CURDIR)/$(@) \ - $(filter-out $(DIRS-y),$(MAKECMDGOALS)) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) diff --git a/mk/rte.gnuconfigure.mk b/mk/rte.gnuconfigure.mk deleted file mode 100644 index 72e99aafc3..0000000000 --- a/mk/rte.gnuconfigure.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.build-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) -_BUILD = configure -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -configure: - $(Q)cd $(CONFIGURE_PATH) ; \ - ./configure --prefix $(CONFIGURE_PREFIX) $(CONFIGURE_ARGS) ; \ - make ; \ - make install - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)cd $(CONFIGURE_PATH) ; make clean - $(Q)rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.build-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.helper.mk b/mk/rte.helper.mk deleted file mode 100644 index 6e7fd03d7f..0000000000 --- a/mk/rte.helper.mk +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd - -# rte_cc_has_argument -# Usage: MACHINE_CFLAGS += $(call rte_cc_has_argument, -mno-avx512f) -# Return the argument if the argument is supported by the compiler. -# -define rte_cc_has_argument - $(shell $(CC) -E $(1) -xc /dev/null 1>/dev/null 2>/dev/null && echo $(1)) -endef diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk deleted file mode 100644 index 68e32b5780..0000000000 --- a/mk/rte.hostapp.mk +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTAPP) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/app/$(HOSTAPP) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_EXE = $(HOSTCC) $(HOST_LDFLAGS) $(LDFLAGS_$(@)) \ - $(EXTRA_HOST_LDFLAGS) -o $@ $(OBJS-y) $(LDLIBS) -O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight -O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)"," HOSTLD $(@)") -O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)" -O_TO_EXE_DO = @set -e; \ - echo $(O_TO_EXE_DISP); \ - $(O_TO_EXE) && \ - echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTAPP).cmd - -# list of .a files that are linked to this application -LDLIBS_FILES := $(sort $(wildcard \ - $(addprefix $(RTE_OUTPUT)/lib/, \ - $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))))) - -# -# Compile executable file if needed -# -$(HOSTAPP): $(OBJS-y) $(LDLIBS_FILES) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_EXE_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_EXE_DO)) - -# -# install app in $(RTE_OUTPUT)/hostapp -# -$(RTE_OUTPUT)/app/$(HOSTAPP): $(HOSTAPP) - @echo " INSTALL-HOSTAPP $(HOSTAPP)" - @[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app - $(Q)cp -f $(HOSTAPP) $(RTE_OUTPUT)/app - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTAPP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) .$(HOSTAPP).cmd - - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.hostlib.mk b/mk/rte.hostlib.mk deleted file mode 100644 index 0ccaa55f09..0000000000 --- a/mk/rte.hostlib.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# tell rte.compile-pre.mk to use HOSTCC instead of CC -USE_HOST := 1 -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(HOSTLIB) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/hostlib/$(HOSTLIB) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_A = $(AR) crus $(HOSTLIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," HOSTAR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - --include .$(HOSTLIB).cmd - -# -# Archive objects in .a file if needed -# -$(HOSTLIB): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$@ -> $< " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) - -# -# install lib in $(RTE_OUTPUT)/hostlib -# -$(RTE_OUTPUT)/hostlib/$(HOSTLIB): $(HOSTLIB) - @echo " INSTALL-HOSTLIB $(HOSTLIB)" - @[ -d $(RTE_OUTPUT)/hostlib ] || mkdir -p $(RTE_OUTPUT)/hostlib - $(Q)cp -f $(HOSTLIB) $(RTE_OUTPUT)/hostlib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(HOSTLIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.install.mk b/mk/rte.install.mk deleted file mode 100644 index e56daf457c..0000000000 --- a/mk/rte.install.mk +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# install-only makefile (no build target) - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: _postinstall - @true - -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(INSTALL-FILES-all) - @rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk deleted file mode 100644 index 229ae16814..0000000000 --- a/mk/rte.lib.mk +++ /dev/null @@ -1,156 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -EXTLIB_BUILD ?= n - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION) -SOVER := $(basename $(LIBABIVER)) - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB)) -LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) -ifeq ($(EXTLIB_BUILD),n) -CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) -endif -endif - - -_BUILD = $(LIB) -PREINSTALL = $(SYMLINK-FILES-y) -_INSTALL = $(INSTALL-FILES-y) $(RTE_OUTPUT)/lib/$(LIB) -_CLEAN = doclean - -LDLIBS += $(EXECENV_LDLIBS-y) - -.PHONY: all -all: install - -.PHONY: install -ifeq ($(SYMLINK-FILES-y),) -install: build _postinstall -else -install: _preinstall build _postinstall -build: _preinstall -endif - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -# Override the definition of LD here, since we're linking with CC -LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS) -_CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -else -_CPU_LDFLAGS := $(CPU_LDFLAGS) -endif - -O_TO_A = $(AR) crDs $(LIB) $(OBJS-y) -O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight -O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," AR $(@)") -O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)" -O_TO_A_DO = @set -e; \ - echo $(O_TO_A_DISP); \ - $(O_TO_A) && \ - echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) - -ifneq ($(CC_SUPPORTS_Z),false) -NO_UNDEFINED := -z defs -endif - -O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \ - -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -o $(LIB) -O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight -O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") -O_TO_S_DO = @set -e; \ - echo $(O_TO_S_DISP); \ - $(O_TO_S) && \ - echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) - --include .$(LIB).cmd - -# -# Archive objects in .a file if needed -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE -ifeq ($(LIBABIVER),) - @echo "Must Specify a $(LIB) ABI version" - @false -endif - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_S_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_S_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_S_DO)) - -else -$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_A_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_A_DO)) -endif - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(LIB): $(LIB) - @echo " INSTALL-LIB $(LIB)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) - $(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/') - $(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \ - ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \ - fi -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(LIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) .$(LIB).cmd $(INSTALL-FILES-all) *.pmd.c *.pmd.o - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.module.mk b/mk/rte.module.mk deleted file mode 100644 index 1ada528a00..0000000000 --- a/mk/rte.module.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -##### if sourced from kernel Kbuild system -ifneq ($(KERNELRELEASE),) -override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS) -obj-m += $(MODULE).o -ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%))) -$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o)) -endif - -##### if launched from rte build system -else - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(MODULE).ko -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \ - $(RTE_OUTPUT)/kmod/$(MODULE).ko -_CLEAN = doclean - -SRCS_LINKS = $(addsuffix _link,$(SRCS-y)) - -compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1))) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -# Link all sources in build directory -%_link: FORCE - $(if $(call compare,$(notdir $*),$*),\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\ - @if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi) - -# build module -$(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - -# install module in $(RTE_OUTPUT)/kmod -$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - @echo INSTALL-MODULE $(MODULE).ko - @[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod - @cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod - -# install module -modules_install: - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ - modules_install - -.PHONY: clean -clean: _postclean - -# do a make clean and remove links -.PHONY: doclean -doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi - $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \ - $(INSTALL-FILES-all) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: - -endif diff --git a/mk/rte.obj.mk b/mk/rte.obj.mk deleted file mode 100644 index 1641a52e75..0000000000 --- a/mk/rte.obj.mk +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -ifneq ($(OBJ),) -_BUILD = $(OBJ) -else -_BUILD = $(OBJS-y) -endif -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = doclean - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -ifneq ($(OBJ),) -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -O_TO_O = $(LD) -r -o $(OBJ) $(OBJS-y) -O_TO_O_STR = $(subst ','\'',$(O_TO_O)) #'# fix syntax highlight -O_TO_O_DISP = $(if $(V),"$(O_TO_O_STR)"," LD $(@)") -O_TO_O_CMD = "cmd_$@ = $(O_TO_O_STR)" -O_TO_O_DO = @set -e; \ - echo $(O_TO_O_DISP); \ - $(O_TO_O) && \ - echo $(O_TO_O_CMD) > $(call exe2cmd,$(@)) - --include .$(OBJ).cmd - -# -# Archive objects in .a file if needed -# -$(OBJ): $(OBJS-y) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_O_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_O_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_O_DO)) -endif - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - @rm -rf $(OBJ) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk deleted file mode 100644 index d1d57b6695..0000000000 --- a/mk/rte.sdkbuild.mk +++ /dev/null @@ -1,77 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation - -# -# include rte.vars.mk if config file exists -# -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif - -# allow exec-env specific targets --include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.custom.mk - -buildtools: | lib -kernel: | lib -drivers: | lib buildtools -app: | lib buildtools drivers -test: | lib buildtools drivers - -# -# build and clean targets -# - -CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-)) - -.PHONY: build -build: $(ROOTDIRS-y) - @echo "Build complete [$(RTE_TARGET)]" - @echo "==== NOTE ====" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html for instructions" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "==============" - -.PHONY: clean -clean: $(CLEANDIRS) - @rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod - @[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include - @$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean - @echo Clean complete - -.SECONDEXPANSION: -.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-) -$(ROOTDIRS-y) $(ROOTDIRS-): - @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ - @echo "== Build $@" - $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = drivers ]; then \ - $(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \ - fi - -%_clean: - @echo "== Clean $*" - $(Q)if [ -f $(RTE_SRCDIR)/$*/Makefile -a -d $(BUILDDIR)/$* ]; then \ - $(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* clean ; \ - fi - -RTE_MAKE_SUBTARGET ?= all - -%_sub: $(addsuffix _sub,$(*)) - @echo $(addsuffix _sub,$(*)) - @[ -d $(BUILDDIR)/$* ] || mkdir -p $(BUILDDIR)/$* - @echo "== Build $*" - $(Q)$(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* \ - $(RTE_MAKE_SUBTARGET) - -.PHONY: all -all: build - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk deleted file mode 100644 index f538649f22..0000000000 --- a/mk/rte.sdkconfig.mk +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -.PHONY: showversion -showversion: - @cat $(RTE_SRCDIR)/VERSION - -.PHONY: showversionum -showversionum: - @cat $(RTE_SRCDIR)/VERSION | awk -F '.' '{print $$1$$2}' - -INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ - $(filter-out %app-gcc,$(filter-out %~,\ - $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_*))))))) -INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS)) - -.PHONY: showconfigs -showconfigs: - @$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);) - -.PHONY: notemplate -notemplate: - @printf "No template specified. Use 'make defconfig' or " - @echo "use T=template from the following list:" - @$(MAKE) -rR showconfigs | sed 's,^, ,' - -.PHONY: defconfig -defconfig: - @$(MAKE) config T=$(shell \ - uname -m | awk '{ \ - if ($$0 == "aarch64") { \ - print "arm64-armv8a"} \ - else if ($$0 == "armv7l") { \ - print "arm-armv7a"} \ - else if ($$0 == "ppc64") { \ - print "ppc_64-power8"} \ - else if ($$0 == "amd64") { \ - print "x86_64-native"} \ - else { \ - printf "%s-native", $$0} }' \ - )-$(shell \ - uname | awk '{ \ - if ($$0 == "Linux") { \ - print "linux"} \ - else { \ - print "freebsd"} }' \ - )-$(shell \ - ${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \ - '{ \ - if ($$1 == "cc") { \ - print "gcc" } \ - else { \ - print $$1 } \ - }' \ - ) - -.PHONY: config -ifeq ($(RTE_CONFIG_TEMPLATE),) -config: notemplate -else -config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile - @echo "Configuration done using" \ - $(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE))) -endif - -$(RTE_OUTPUT): - $(Q)mkdir -p $@ - -ifdef NODOTCONF -$(RTE_OUTPUT)/.config: ; -else -# Generate config from template, if there are duplicates keep only the last. -# To do so the temp config is checked for duplicate keys with cut/sort/uniq -# Then for each of those identified duplicates as long as there are more than -# just one left the last match is removed. -# Part of the config includes the version information taken from "VERSION" -# in the repo. This needs to be split into the various parts using sed and awk. -# To ensure correct version comparison, we append ".99" to the version number -# so that the version of a release is higher than that of its rc's. -$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT) - $(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \ - $(CPP) -undef -P -x assembler-with-cpp \ - `cat $(RTE_SRCDIR)/VERSION | \ - sed -e 's/-rc/.-rc./' -e 's/$$/..99/' | \ - awk -F '.' '{print "-D__YEAR="int($$1), "-D__MONTH="int($$2), "-D__MINOR="int($$3), "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \ - -ffreestanding \ - -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \ - config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \ - echo "$$config" | awk -F '=' 'BEGIN {i=1} \ - /^#/ {pos[i++]=$$0} \ - !/^#/ {if (!s[$$1]) {pos[i]=$$0; s[$$1]=i++} \ - else {pos[s[$$1]]=$$0}} END \ - {for (j=1; j<i; j++) print pos[j]}' \ - > $(RTE_OUTPUT)/.config_tmp ; \ - if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \ - cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config.orig ; \ - fi ; \ - rm -f $(RTE_OUTPUT)/.config_tmp ; \ - else \ - $(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \ - fi -endif - -# generate a Makefile for this build directory -# use a relative path so it will continue to work even if we move the directory -SDK_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_SRCDIR)) \ - $(abspath $(RTE_OUTPUT))) -OUTPUT_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_OUTPUT)) \ - $(abspath $(RTE_SRCDIR))) -$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT) - $(Q)$(RTE_SDK)/buildtools/gen-build-mk.sh $(SDK_RELPATH) > $@ - -# clean installed files, and generate a new config header file -# if NODOTCONF variable is defined, don't try to rebuild .config -$(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config - $(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \ - $(RTE_OUTPUT)/lib \ - $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build - $(Q)mkdir -p $(RTE_OUTPUT)/include - $(Q)$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \ - > $(RTE_OUTPUT)/include/rte_config.h - -# generate the rte_config.h -.PHONY: headerconfig -headerconfig: $(RTE_OUTPUT)/include/rte_config.h - @true - -# check that .config is present, and if yes, check that rte_config.h -# is up to date -.PHONY: checkconfig -checkconfig: - @if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - echo "No .config in build directory"; \ - exit 1; \ - fi - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk \ - headerconfig NODOTCONF=1 - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk deleted file mode 100644 index 7adeb0e11b..0000000000 --- a/mk/rte.sdkdepdirs.mk +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk deleted file mode 100644 index fd77e41867..0000000000 --- a/mk/rte.sdkdoc.mk +++ /dev/null @@ -1,104 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation. -# Copyright(c) 2013-2015 6WIND S.A. - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with doc target") -endif -endif - -RTE_SPHINX_BUILD = sphinx-build -RTE_PDFLATEX_VERBOSE := --interaction=nonstopmode - -ifndef V -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif -ifeq '$V' '0' -RTE_SPHINX_VERBOSE := -q -RTE_PDFLATEX_VERBOSE := --interaction=batchmode -RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1 -endif - -RTE_PDF_DPI ?= 300 - -RTE_GUIDES := $(filter %/, $(wildcard $(RTE_SDK)/doc/guides/*/)) - -API_EXAMPLES := $(RTE_OUTPUT)/doc/html/examples.dox - -.PHONY: help -help: - @cat $(RTE_SDK)/doc/build-sdk-quick.txt - @$(MAKE) -rR showconfigs | sed 's,^,\t\t\t\t,' - -.PHONY: all -all: api-html guides-html guides-pdf - -.PHONY: clean -clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean - -.PHONY: api-html -api-html: $(API_EXAMPLES) - @echo 'doxygen for API...' - $(Q)mkdir -p $(RTE_OUTPUT)/doc/html - $(Q)(sed -e "s|@VERSION@|`$(MAKE) -rRs showversion`|" \ - -e "s|@API_EXAMPLES@|$(API_EXAMPLES)|" \ - -e "s|@OUTPUT@|$(RTE_OUTPUT)/doc|" \ - -e "s|@HTML_OUTPUT@|html/api|" \ - -e "s|@TOPDIR@|./|g" \ - -e "s|@STRIP_FROM_PATH@|./|g" \ - $(RTE_SDK)/doc/api/doxy-api.conf.in)| \ - doxygen - - $(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css - -.PHONY: api-html-clean -api-html-clean: - $(Q)rm -f $(API_EXAMPLES) - $(Q)rm -rf $(RTE_OUTPUT)/doc/html/api/search - $(Q)rm -f $(RTE_OUTPUT)/doc/html/api/* - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true - -$(API_EXAMPLES): api-html-clean - $(Q)mkdir -p $(@D) - $(Q)doc/api/generate_examples.sh examples $(API_EXAMPLES) - -guides-pdf-clean: guides-pdf-img-clean -guides-pdf-img-clean: - $(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf - -guides-%-clean: - $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides - $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true - -guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ; -guides-pdf-%: - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \ - $(RTE_OUTPUT)/doc/pdf/guides/$* - $(if $^,$(Q)rm -f $^) - @echo 'pdflatex processing $@...' - $(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \ - LATEXOPTS=$(RTE_PDFLATEX_VERBOSE) - $(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \ - $(RTE_OUTPUT)/doc/pdf/guides/$*.pdf - -guides-html-prepare: - $(Q)install -D -m0644 $(RTE_SDK)/doc/guides/custom.css \ - $(RTE_OUTPUT)/doc/html/guides/_static/css/custom.css - -guides-%-prepare: ; - -guides-%: guides-%-prepare - @echo 'sphinx processing $@...' - $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \ - $(RTE_OUTPUT)/doc/$*/guides - -# Each PDF depends on generated images *.pdf from *.svg -$(foreach guide, $(RTE_GUIDES), $(foreach img, $(wildcard $(guide)img/*.svg), \ - $(eval guides-pdf-$(notdir $(guide:/=)): $(img:svg=pdf)))) -%.pdf: %.svg - $(Q)inkscape -d $(RTE_PDF_DPI) -D -f $< -A $@ $(RTE_INKSCAPE_VERBOSE) diff --git a/mk/rte.sdkexamples.mk b/mk/rte.sdkexamples.mk deleted file mode 100644 index 5eeec36494..0000000000 --- a/mk/rte.sdkexamples.mk +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2014 6WIND S.A. - -# examples application are seen as external applications which are -# not part of SDK. -BUILDING_RTE_SDK := -export BUILDING_RTE_SDK - -# Build directory is given with O= -O ?= $(RTE_SDK)/examples - -# Target for which examples should be built. -T ?= * - -# list all available configurations -EXAMPLES_CONFIGS := $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_$(T))) -EXAMPLES_TARGETS := $(addsuffix _examples,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples -examples: $(EXAMPLES_TARGETS) - -%_examples: - @echo ================== Build examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*); \ - fi - -EXAMPLES_CLEAN_TARGETS := $(addsuffix _examples_clean,\ - $(filter-out %~,$(EXAMPLES_CONFIGS))) - -.PHONY: examples_clean -examples_clean: $(EXAMPLES_CLEAN_TARGETS) - -%_examples_clean: - @echo ================== Clean examples for $* - $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \ - echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \ - echo -n "Please install DPDK first (make install) or use another " ; \ - echo "target argument (T=target)." ; \ - false ; \ - else \ - $(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*) clean; \ - fi diff --git a/mk/rte.sdkgcov.mk b/mk/rte.sdkgcov.mk deleted file mode 100644 index ab528b18b8..0000000000 --- a/mk/rte.sdkgcov.mk +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifdef T -ifeq ("$(origin T)", "command line") -$(error "Cannot use T= with gcov target") -endif -endif - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -INPUTDIR = $(RTE_OUTPUT) -OUTPUTDIR = $(RTE_OUTPUT)/gcov - -.PHONY: gcovclean -gcovclean: - $(Q)find $(INPUTDIR)/build -name "*.gcno" -o -name "*.gcda" -exec rm {} \; - $(Q)rm -rf $(OUTPUTDIR) - -.PHONY: gcov -gcov: - $(Q)for APP in test ; do \ - mkdir -p $(OUTPUTDIR)/$$APP ; cd $(OUTPUTDIR)/$$APP ; \ - for FIC in `strings $(RTE_OUTPUT)/app/$$APP | grep gcda | sed s,gcda,o,` ; do \ - SUBDIR=`basename $$FIC`;\ - mkdir $$SUBDIR ;\ - cd $$SUBDIR ;\ - $(GCOV) $(RTE_OUTPUT)/app/$$APP -o $$FIC > gcov.log; \ - cd - >/dev/null;\ - done ; \ - cd - >/dev/null; \ - done diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk deleted file mode 100644 index 32bed5d951..0000000000 --- a/mk/rte.sdkinstall.mk +++ /dev/null @@ -1,152 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation. -# Copyright 2015 6WIND S.A. - -# Configuration, compilation and installation can be done at once -# with make install T=<config> - -ifdef T # config, build and install combined -# The build directory is T and may be prepended with O -O ?= . -RTE_OUTPUT := $O/$T -else # standard install -# Build directory is given with O= -O ?= build -RTE_OUTPUT := $O -endif - -ifneq ($(MAKECMDGOALS),pre_install) -include $(RTE_SDK)/mk/rte.vars.mk -endif - -ifdef T # defaults with T= will install an almost flat staging tree -export prefix ?= -kerneldir ?= $(prefix)/kmod -else -ifeq ($(RTE_EXEC_ENV),linuxapp) -RTE_EXEC_ENV=linux -endif -ifeq ($(RTE_EXEC_ENV),linux) -kerneldir ?= $(RTE_KERNELDIR:/build=/extra/dpdk) -else -kerneldir ?= /boot/modules -endif -prefix ?= /usr/local -endif -exec_prefix ?= $(prefix) -bindir ?= $(exec_prefix)/bin -sbindir ?= $(exec_prefix)/sbin -libdir ?= $(exec_prefix)/lib -includedir ?= $(prefix)/include/dpdk -datarootdir ?= $(prefix)/share -docdir ?= $(datarootdir)/doc/dpdk -datadir ?= $(datarootdir)/dpdk -mandir ?= $(datarootdir)/man -sdkdir ?= $(datadir) -targetdir ?= $(datadir)/$(RTE_TARGET) - -# The install directories may be staged in DESTDIR - -# Create the directory $1 if not exists -rte_mkdir = test -d $1 || mkdir -p $1 - -# Create the relative symbolic link $2 -> $1 -# May be replaced with --relative option of ln from coreutils-8.16 -rte_symlink = ln -snf $$($(RTE_SDK)/buildtools/relpath.sh $1 $(dir $2)) $2 - -.PHONY: pre_install -pre_install: -ifdef T - $(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \ - $(MAKE) config O=$(RTE_OUTPUT); \ - else \ - if [ -f $(RTE_OUTPUT)/.config.orig ] ; then \ - tmp_build=$(RTE_OUTPUT)/.config.tmp; \ - $(MAKE) config O=$$tmp_build; \ - if ! cmp -s $(RTE_OUTPUT)/.config.orig $$tmp_build/.config ; then \ - echo "Conflict: local config and template config have both changed"; \ - exit 1; \ - fi; \ - fi; \ - echo "Using local configuration"; \ - fi - $(Q)$(MAKE) all O=$(RTE_OUTPUT) -endif - -.PHONY: install -install: -ifeq ($(DESTDIR)$(if $T,,+),) - @echo Installation cannot run with T defined and DESTDIR undefined -else - @echo ================== Installing $(DESTDIR)$(prefix)/ - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-kmod - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk - $(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-doc - @echo Installation in $(DESTDIR)$(prefix)/ complete -endif - -# when installing we want recursive copies preserving timestamps only, no -# preservation of user/group ids or permissions -CP_FLAGS=-dR --preserve=timestamps -TAR_X_FLAGS=--strip-components=1 --keep-newer-files --no-same-owner --no-same-permissions - -install-runtime: - $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp $(CP_FLAGS) $O/lib/* $(DESTDIR)$(libdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $O --exclude 'app/*.map' \ - --exclude app/dpdk-pmdinfogen \ - --exclude 'app/cmdline*' --exclude app/test \ - --exclude app/testacl --exclude app/testpipeline app | \ - tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools) - $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \ - tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ - $(DESTDIR)$(sbindir)/dpdk-devbind) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-pmdinfo.py, \ - $(DESTDIR)$(bindir)/dpdk-pmdinfo) -ifneq ($(wildcard $O/doc/man/*/*.1),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man1) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1 -endif -ifneq ($(wildcard $O/doc/man/*/*.8),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man8) - $(Q)cp $(CP_FLAGS) $O/doc/man/*/*.8 $(DESTDIR)$(mandir)/man8 -endif - -install-kmod: -ifneq ($(wildcard $O/kmod/*),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) - $(Q)cp $(CP_FLAGS) $O/kmod/* $(DESTDIR)$(kerneldir) -endif - -install-sdk: - $(Q)$(call rte_mkdir, $(DESTDIR)$(includedir)) - $(Q)tar -chf - -C $O include | \ - tar -xf - -C $(DESTDIR)$(includedir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) - $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) - $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app - $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) - $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) - -install-doc: -ifneq ($(wildcard $O/doc/html),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)) - $(Q)tar -cf - -C $O/doc --exclude 'html/guides/.*' html | \ - tar -xf - -C $(DESTDIR)$(docdir) $(TAR_X_FLAGS) -endif -ifneq ($(wildcard $O/doc/*/*/*pdf),) - $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides) - $(Q)cp $(CP_FLAGS) $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides -endif - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/examples $(DESTDIR)$(datadir) diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk deleted file mode 100644 index fbee6e96d9..0000000000 --- a/mk/rte.sdkroot.mk +++ /dev/null @@ -1,115 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -MAKEFLAGS += --no-print-directory - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif - -RTE_SRCDIR = $(CURDIR) -export RTE_SRCDIR - -BUILDING_RTE_SDK := 1 -export BUILDING_RTE_SDK - -# -# We can specify the configuration template when doing the "make -# config". For instance: make config T=x86_64-native-linux-gcc -# -RTE_CONFIG_TEMPLATE := -ifdef T -ifeq ("$(origin T)", "command line") -RTE_CONFIG_TEMPLATE := $(RTE_SRCDIR)/config/defconfig_$(T) -endif -endif -export RTE_CONFIG_TEMPLATE - -# -# Default output is $(RTE_SRCDIR)/build -# output files wil go in a separate directory -# -ifdef O -ifeq ("$(origin O)", "command line") -RTE_OUTPUT := $(abspath $(O)) -endif -endif -RTE_OUTPUT ?= $(RTE_SRCDIR)/build -export RTE_OUTPUT - -# the directory where intermediate build files are stored, like *.o, -# *.d, *.cmd, ... -BUILDDIR = $(RTE_OUTPUT)/build -export BUILDDIR - -export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n - -.PHONY: default test-build -default test-build: all - -.PHONY: warning -warning: - @echo - @echo "=========================== WARNING ============================" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "================================================================" - @echo - @test "$(MAKE_PAUSE)" = n || ( \ - echo "This deprecation warning can be passed by adding MAKE_PAUSE=n"; \ - echo "to 'make' command line or as an exported environment variable."; \ - echo "Press enter to continue..."; read junk) - -.PHONY: config defconfig showconfigs showversion showversionum -config: warning -config defconfig showconfigs showversion showversionum: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk $@ - -.PHONY: cscope gtags tags etags -cscope gtags tags etags: - $(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T - -.PHONY: test test-fast test-perf coverage test-drivers test-dump -test test-fast test-perf coverage test-drivers test-dump: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@ - -.PHONY: install -install: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ -install-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@ - -.PHONY: doc help -doc: doc-all -help: doc-help -doc-%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkdoc.mk $* - -.PHONY: gcov gcovclean -gcov gcovclean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkgcov.mk $@ - -.PHONY: examples examples_clean -examples examples_clean: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkexamples.mk $@ - -# all other build targets -%: - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkroot.mk warning - $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkbuild.mk $@ diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk deleted file mode 100644 index 803018ba3a..0000000000 --- a/mk/rte.sdktest.mk +++ /dev/null @@ -1,76 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -ifeq (,$(wildcard $(RTE_OUTPUT)/.config)) - $(error "need a make config first") -else - include $(RTE_SDK)/mk/rte.vars.mk -endif -ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) - $(error "need a make config first") -endif - -DATE := $(shell date '+%Y%m%d-%H%M') -AUTOTEST_DIR := $(RTE_OUTPUT)/autotest-$(DATE) - -DIR := $(shell basename $(RTE_OUTPUT)) - -# -# test: launch auto-tests, very simple for now. -# -.PHONY: test test-fast test-perf test-drivers test-dump coverage - -PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\ - reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\ - barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\ - eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\ - distributor_perf,ring_pmd_perf,pmd_perf,ring_perf -DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\ - cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\ - cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\ - cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\ - cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc -DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\ - dump_log_types,dump_ring,dump_physmem,dump_memzone - -SPACESTR:= -SPACESTR+= -STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST)) -STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST)) -STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST)) - -coverage: BLACKLIST=-$(STRIPPED_PERFLIST) -test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST) -test-perf: WHITELIST=$(STRIPPED_PERFLIST) -test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST) -test-dump: WHITELIST=$(STRIPPED_DUMPLIST) - -test test-fast test-perf test-drivers test-dump: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST); \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ; \ - fi - -# this is a special target to ease the pain of running coverage tests -# this runs all the autotests, cmdline_test script and dpdk-procinfo -coverage: - @mkdir -p $(AUTOTEST_DIR) ; \ - cd $(AUTOTEST_DIR) ; \ - if [ -f $(RTE_OUTPUT)/app/test ]; then \ - python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \ - $(RTE_OUTPUT)/app/cmdline_test; \ - ulimit -S -n 100 ; \ - python $(RTE_SDK)/app/test/autotest.py \ - $(RTE_OUTPUT)/app/test \ - $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST) ; \ - $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \ - else \ - echo "No test found, please do a 'make' first, or specify O=" ;\ - fi diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk deleted file mode 100644 index 2b501ddb84..0000000000 --- a/mk/rte.shared.mk +++ /dev/null @@ -1,108 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2012-2013 6WIND S.A. - -include $(RTE_SDK)/mk/internal/rte.compile-pre.mk -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -# VPATH contains at least SRCDIR -VPATH += $(SRCDIR) - -_BUILD = $(SHARED) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/lib/$(SHARED) -_CLEAN = doclean - -# Set fPIC in CFLAGS for .so generation -CFLAGS += -fPIC - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) - -ifeq ($(LINK_USING_CC),1) -override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) -O_TO_SO = $(CC) $(call linkerprefix,$(LDFLAGS)) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(call linkerprefix,$(LDLIBS)) -else -O_TO_SO = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -shared -o $@ $(OBJS-y) $(LDLIBS) -endif - -O_TO_SO_STR = $(subst ','\'',$(O_TO_SO)) #'# fix syntax highlight -O_TO_SO_DISP = $(if $(V),"$(O_TO_SO_STR)"," LD $(@)") -O_TO_SO_CMD = "cmd_$@ = $(O_TO_SO_STR)" -O_TO_SO_DO = @set -e; \ - echo $(O_TO_SO_DISP); \ - $(O_TO_SO) && \ - echo $(O_TO_SO_CMD) > $(call exe2cmd,$(@)) - --include .$(SHARED).cmd - -# path where libraries are retrieved -LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS))) -LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS))) - -# list of .a files that are linked to this application -LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))) -LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS))) - -# list of found libraries files (useful for deps). If not found, the -# library is silently ignored and dep won't be checked -LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES))))) - -# -# Archive objects in .so file if needed -# -$(SHARED): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(SHARED)) FORCE - @[ -d $(dir $@) ] || mkdir -p $(dir $@) - $(if $(D),\ - @echo -n "$< -> $@ " ; \ - echo -n "file_missing=$(call boolean,$(file_missing)) " ; \ - echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_SO_STR))) " ; \ - echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \ - echo "depfile_newer=$(call boolean,$(depfile_newer)) ") - $(if $(or \ - $(file_missing),\ - $(call cmdline_changed,$(O_TO_SO_STR)),\ - $(depfile_missing),\ - $(depfile_newer)),\ - $(O_TO_SO_DO)) - -# -# install lib in $(RTE_OUTPUT)/lib -# -$(RTE_OUTPUT)/lib/$(SHARED): $(SHARED) - @echo " INSTALL-SHARED $(SHARED)" - @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib - $(Q)cp -f $(SHARED) $(RTE_OUTPUT)/lib - -# -# Clean all generated files -# -.PHONY: clean -clean: _postclean - -.PHONY: doclean -doclean: - $(Q)rm -rf $(SHARED) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \ - $(CMDS-all) $(INSTALL-FILES-all) - $(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -include $(RTE_SDK)/mk/internal/rte.compile-post.mk -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.subdir.mk b/mk/rte.subdir.mk deleted file mode 100644 index d6e64a2460..0000000000 --- a/mk/rte.subdir.mk +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# .mk to build subdirectories -# - -include $(RTE_SDK)/mk/internal/rte.install-pre.mk -include $(RTE_SDK)/mk/internal/rte.clean-pre.mk -include $(RTE_SDK)/mk/internal/rte.build-pre.mk - -ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES))) - -CLEANDIRS = $(addsuffix _clean,$(DIRS-y) $(DIRS-n) $(DIRS-)) - -VPATH += $(SRCDIR) -_BUILD = $(DIRS-y) -_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) -_CLEAN = $(CLEANDIRS) - -.PHONY: all -all: install - -.PHONY: install -install: build _postinstall - -_postinstall: build - -.PHONY: build -build: _postbuild - -.SECONDEXPANSION: -.PHONY: $(DIRS-y) -$(DIRS-y): - @[ -d $(CURDIR)/$@ ] || mkdir -p $(CURDIR)/$@ - @echo "== Build $S/$@" - @$(MAKE) S=$S/$@ -f $(SRCDIR)/$@/Makefile -C $(CURDIR)/$@ all - -.PHONY: clean -clean: _postclean - -%_clean: - @echo "== Clean $S/$*" - @if [ -f $(SRCDIR)/$*/Makefile -a -d $(CURDIR)/$* ]; then \ - $(MAKE) S=$S/$* -f $(SRCDIR)/$*/Makefile -C $(CURDIR)/$* clean ; \ - fi - @rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) - -define depdirs_rule -$(DEPDIRS-$(1)): - -$(1): | $(DEPDIRS-$(1)) - -$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1)))) -endef - -$(foreach dir,$(ALL_DEPDIRS),\ - $(eval $(call depdirs_rule,$(dir)))) - -include $(RTE_SDK)/mk/internal/rte.install-post.mk -include $(RTE_SDK)/mk/internal/rte.clean-post.mk -include $(RTE_SDK)/mk/internal/rte.build-post.mk - -.PHONY: FORCE -FORCE: diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk deleted file mode 100644 index 07b0db127f..0000000000 --- a/mk/rte.vars.mk +++ /dev/null @@ -1,102 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# To be included at the beginning of all RTE user Makefiles. This -# .mk will define the RTE environment variables by including the -# config file of SDK. It also includes the config file from external -# application if any. -# - -ifeq ($(RTE_SDK),) -$(error RTE_SDK is not defined) -endif -ifeq ($(wildcard $(RTE_SDK)),) -$(error RTE_SDK variable points to an invalid location) -endif - -# define Q to '@' or not. $(Q) is used to prefix all shell commands to -# be executed silently. -Q=@ -ifeq '$V' '0' -override V= -endif -ifdef V -ifeq ("$(origin V)", "command line") -Q= -endif -endif -export Q - -# if we are building SDK, only includes SDK configuration -ifneq ($(BUILDING_RTE_SDK),) - include $(RTE_OUTPUT)/.config - # remove double-quotes from config names - RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%) - RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%) - RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%) - RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) - RTE_SDK_BIN := $(RTE_OUTPUT) -endif - -RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN) - -ifeq ($(BUILDING_RTE_SDK),) -# if we are building an external app/lib, include internal/rte.extvars.mk that will -# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...) -include $(RTE_SDK)/mk/internal/rte.extvars.mk -endif - -CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD) -ifneq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y) - CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_EM_PMD) -endif - -ifeq ($(RTE_ARCH),) -$(error RTE_ARCH is not defined) -endif - -ifeq ($(RTE_MACHINE),) -$(error RTE_MACHINE is not defined) -endif - -ifeq ($(RTE_EXEC_ENV),) -$(error RTE_EXEC_ENV is not defined) -endif - -ifeq ($(RTE_TOOLCHAIN),) -$(error RTE_TOOLCHAIN is not defined) -endif - -# can be overridden by make command line or exported environment variable -RTE_KERNELDIR ?= /lib/modules/$(shell uname -r)/build - -export RTE_TARGET -export RTE_ARCH -export RTE_MACHINE -export RTE_EXEC_ENV -export RTE_TOOLCHAIN - -# developer build automatically enabled in a git tree -ifneq ($(wildcard $(RTE_SDK)/.git),) -RTE_DEVEL_BUILD ?= y -endif - -# SRCDIR is the current source directory -ifdef S -SRCDIR := $(abspath $(RTE_SRCDIR)/$(S)) -else -SRCDIR := $(RTE_SRCDIR) -endif - -# helper: return y if option is set to y, else return an empty string -testopt = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -# helper: return an empty string if option is set, else return y -not = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y) - -ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk),) -include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk -else -include $(RTE_SDK)/mk/target/generic/rte.vars.mk -endif diff --git a/mk/target/generic/rte.app.mk b/mk/target/generic/rte.app.mk deleted file mode 100644 index ed82656f18..0000000000 --- a/mk/target/generic/rte.app.mk +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# define Makefile targets that are specific to an environment. -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.app.mk - -.PHONY: exec-env-appinstall -target-appinstall: exec-env-appinstall - -.PHONY: exec-env-appclean -target-appclean: exec-env-appclean diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk deleted file mode 100644 index 11b0418e55..0000000000 --- a/mk/target/generic/rte.vars.mk +++ /dev/null @@ -1,132 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# This .mk is the generic target rte.var.mk ; it includes .mk for -# the specified machine, architecture, toolchain (compiler) and -# executive environment. -# - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# -ifneq ($(wildcard $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk),) -include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk -else -MACHINE_CFLAGS := -march=$(RTE_MACHINE) -endif - -# -# arch: -# -# - define ARCH variable (overridden by cmdline or by previous -# optional define in machine .mk) -# - define CROSS variable (overridden by cmdline or previous define -# in machine .mk) -# - define CPU_CFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_LDFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - define CPU_ASFLAGS variable (overridden by cmdline or previous -# define in machine .mk) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk - -# Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are -# provided by Kbuild framework. -ifeq ($(KERNELRELEASE),) - -# now that the environment is mostly set up, including the machine type we will -# be passing to the compiler, set up the specific CPU flags based on that info. -include $(RTE_SDK)/mk/rte.cpuflags.mk - -# merge all CFLAGS -CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS) -CFLAGS += $(TARGET_CFLAGS) - -# merge all LDFLAGS -LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFLAGS) -LDFLAGS += $(TARGET_LDFLAGS) - -# merge all ASFLAGS -ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS) -ASFLAGS += $(TARGET_ASFLAGS) - -# add default include and lib paths -CFLAGS += -I$(RTE_OUTPUT)/include -LDFLAGS += -L$(RTE_OUTPUT)/lib - -# add in flag for supporting function versioning. The define is used in meson -# builds to ensure that the user has properly flagged the unit in question as -# using function versioning so it can be built twice - once for static lib and -# then a second time for the shared lib. Since make only builds one library -# type at a time, such precautions aren't necessary, so we can globally define -# the flag -CFLAGS += -DRTE_USE_FUNCTION_VERSIONING - -# always include rte_config.h: the one in $(RTE_OUTPUT)/include is -# the configuration of SDK when $(BUILDING_RTE_SDK) is true, or the -# configuration of the application if $(BUILDING_RTE_SDK) is not -# defined. -ifeq ($(BUILDING_RTE_SDK),1) -# building sdk -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += -DALLOW_INTERNAL_API -else -# if we are building an external application, include SDK's lib and -# includes too -CFLAGS += -I$(RTE_SDK_BIN)/include -ifneq ($(wildcard $(RTE_OUTPUT)/include/rte_config.h),) -CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -endif -CFLAGS += -include $(RTE_SDK_BIN)/include/rte_config.h -LDFLAGS += -L$(RTE_SDK_BIN)/lib -endif - -# always define _GNU_SOURCE -CFLAGS += -D_GNU_SOURCE - -# define __BSD_VISIBLE when building for FreeBSD -ifeq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),y) -CFLAGS += -D__BSD_VISIBLE -endif - -export CFLAGS -export LDFLAGS - -endif diff --git a/mk/toolchain/clang/rte.toolchain-compat.mk b/mk/toolchain/clang/rte.toolchain-compat.mk deleted file mode 100644 index e6189b498d..0000000000 --- a/mk/toolchain/clang/rte.toolchain-compat.mk +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out CLANG version - -CLANG_VERSION := $(shell $(CC) -v 2>&1 | \ - sed -n "s/.*version \([0-9]*\.[0-9]*\).*/\1/p") - -CLANG_MAJOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f1 -d.) - -CLANG_MINOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f2 -d.) - -ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -lt 35 && echo 1), 1) - CC_SUPPORTS_Z := false -endif diff --git a/mk/toolchain/clang/rte.vars.mk b/mk/toolchain/clang/rte.vars.mk deleted file mode 100644 index d441f6d8f3..0000000000 --- a/mk/toolchain/clang/rte.vars.mk +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)clang -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = clang -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers - -# disable packed member unalign warnings -ifeq ($(shell test $(CLANG_MAJOR_VERSION) -ge 4 && echo 1), 1) -WERROR_FLAGS += -Wno-address-of-packed-member -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk deleted file mode 100644 index 98dca3e786..0000000000 --- a/mk/toolchain/gcc/rte.toolchain-compat.mk +++ /dev/null @@ -1,120 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -#find out GCC version - -GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1) -GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1) -GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(CC) -E -x c - | tail -n 1) -GCC_VERSION = $(GCC_MAJOR)$(GCC_MINOR) - -HOST_GCC_MAJOR = $(shell echo __GNUC__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(HOSTCC) -E -x c - | tail -n 1) -HOST_GCC_VERSION = $(HOST_GCC_MAJOR)$(HOST_GCC_MINOR) - -LD_VERSION = $(shell $(LD) -v) -# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97 -ifeq ($(CONFIG_RTE_ARCH_X86), y) -ifneq ($(filter 2.30%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.30. See Bug 97) -endif -endif -ifneq ($(filter 2.31%,$(LD_VERSION)),) -FORCE_DISABLE_AVX512 := y -# print warning only once for librte_eal -ifneq ($(filter %librte_eal,$(CURDIR)),) -$(warning AVX512 support disabled because of binutils 2.31. See Bug 249) -endif -endif -endif - -# if GCC is older than 4.x -ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1) - MACHINE_CFLAGS = -$(warning You are using GCC < 4.x. This is neither supported, nor tested.) - - -else -# GCC graceful degradation -# GCC 4.2.x - added support for generic target -# GCC 4.3.x - added support for core2, ssse3, sse4.1, sse4.2 -# GCC 4.4.x - added support for avx, aes, pclmul -# GCC 4.5.x - added support for atom -# GCC 4.6.x - added support for corei7, corei7-avx -# GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2 -# GCC 4.9.x - added support for armv8-a+crc -# - ifeq ($(shell test $(GCC_VERSION) -le 49 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc,-march=armv8-a+crc -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc+crypto,-march=armv8-a+crc+crypto -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -le 47 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=core-avx2,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 46 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-march=core2 -maes -mpclmul -mavx,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=corei7,-march=core2 -maes -mpclmul,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 45 && echo 1), 1) - MACHINE_CFLAGS := $(patsubst -march=atom,-march=core2 -mssse3,$(MACHINE_CFLAGS)) - endif - ifeq ($(shell test $(GCC_VERSION) -lt 44 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -mavx -mpclmul -maes,$(MACHINE_CFLAGS)) - ifneq ($(findstring SSE4_2, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.2 - endif - ifneq ($(findstring SSE4_1, $(CPUFLAGS)),) - MACHINE_CFLAGS += -msse4.1 - endif - endif - ifeq ($(shell test $(GCC_VERSION) -lt 43 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -msse% -mssse%,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS := $(patsubst -march=core2,-march=generic,$(MACHINE_CFLAGS)) - MACHINE_CFLAGS += -msse3 - endif - ifeq ($(shell test $(GCC_VERSION) -lt 42 && echo 1), 1) - MACHINE_CFLAGS := $(filter-out -march% -mtune% -msse%,$(MACHINE_CFLAGS)) - endif - - ifeq ($(shell test $(GCC_VERSION) -lt 74 && echo 1), 1) - CONFIG_RTE_ENABLE_LTO=n - endif - - # Disable thunderx PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable OPDL PMD for gcc < 4.7 - ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - - # Disable OCTEON drivers and libs for arm64 gcc < 4.8.6 - ifeq ($(RTE_ARCH), arm64) - ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d - CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX_PMD=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=d - CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=d - CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=d - CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=d - endif - endif - -endif diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk deleted file mode 100644 index 928f0e0830..0000000000 --- a/mk/toolchain/gcc/rte.vars.mk +++ /dev/null @@ -1,109 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -CC = $(CROSS)gcc -KERNELCC = $(CROSS)gcc -CPP = $(CROSS)cpp -# for now, we don't use as but nasm. -# AS = $(CROSS)as -AS = nasm -AR = $(CROSS)ar -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy -OBJDUMP = $(CROSS)objdump -STRIP = $(CROSS)strip -READELF = $(CROSS)readelf -GCOV = $(CROSS)gcov - -ifeq ("$(origin CC)", "command line") -HOSTCC = $(CC) -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_ASFLAGS = -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = - -ifeq ($(CONFIG_RTE_LIBRTE_GCOV),y) -TOOLCHAIN_CFLAGS += --coverage -TOOLCHAIN_LDFLAGS += --coverage -ifeq (,$(findstring -O0,$(EXTRA_CFLAGS))) - $(warning "EXTRA_CFLAGS doesn't contains -O0, coverage will be inaccurate with optimizations enabled") -endif -endif - -WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith -WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual -WERROR_FLAGS += -Wformat-nonliteral -Wformat-security -WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - -ifeq ($(RTE_DEVEL_BUILD),y) -WERROR_FLAGS += -Werror -endif - -# There are many issues reported for strict alignment architectures -# which are not necessarily fatal. Report as warnings. -ifeq ($(CONFIG_RTE_ARCH_STRICT_ALIGN),y) -WERROR_FLAGS += -Wno-error=cast-align -endif - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -# workaround for GCC bug 81440 -ifeq ($(shell test $(GCC_VERSION) -lt 80 && echo 1), 1) -WERROR_FLAGS += -Wno-lto-type-mismatch -endif -endif - -# disable warning for non-initialised fields -WERROR_FLAGS += -Wno-missing-field-initializers -# workaround GCC bug with warning "may be used uninitialized" -ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) -WERROR_FLAGS += -Wno-uninitialized -endif - -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) -# FIXME: Bugzilla 396 -WERROR_FLAGS += -Wno-zero-length-bounds -endif - -HOST_WERROR_FLAGS := $(WERROR_FLAGS) - -ifeq ($(shell test $(HOST_GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -HOST_WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -HOST_WERROR_FLAGS += -Wno-format-truncation -endif - -ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -# Tell GCC only to error for switch fallthroughs without a suitable comment -WERROR_FLAGS += -Wimplicit-fallthrough=2 -# Ignore errors for snprintf truncation -WERROR_FLAGS += -Wno-format-truncation -endif - -# disable packed member unalign warnings -WERROR_FLAGS += -Wno-address-of-packed-member - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk deleted file mode 100644 index 2d663b34ad..0000000000 --- a/mk/toolchain/icc/rte.toolchain-compat.mk +++ /dev/null @@ -1,58 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# CPUID-related options -# -# This was added to support compiler versions which might not support all the -# flags we need -# - -# find out ICC version - -ICC_MAJOR_VERSION = $(shell icc -dumpversion | cut -f1 -d.) - -ifeq ($(shell test $(ICC_MAJOR_VERSION) -lt 12 && echo 1), 1) - MACHINE_CFLAGS = -xSSE4.2 -$(warning You are not using ICC 12.x or higher. This is neither supported, nor tested.) - -else -# proceed to adjust compiler flags - - ICC_MINOR_VERSION = $(shell icc -dumpversion | cut -f2 -d.) - -# replace GCC flags with ICC flags - # if icc version >= 12 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 12 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -march=atom,-xSSSE3_ATOM -march=atom,$(MACHINE_CFLAGS)) - # nehalem/westmere - MACHINE_CFLAGS := $(patsubst -march=corei7,-xSSE4.2 -march=corei7,$(MACHINE_CFLAGS)) - # sandy bridge - MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-xAVX,$(MACHINE_CFLAGS)) - # ivy bridge - MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-xCORE-AVX-I,$(MACHINE_CFLAGS)) - # hsw - MACHINE_CFLAGS := $(patsubst -march=core-avx2,-xCORE-AVX2,$(MACHINE_CFLAGS)) - # remove westmere flags - MACHINE_CFLAGS := $(filter-out -mpclmul -maes,$(MACHINE_CFLAGS)) - endif - # if icc version == 12.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 12 && test $(ICC_MINOR_VERSION) -eq 0 && echo 1), 1) - # Atom - MACHINE_CFLAGS := $(patsubst -xSSSE3_ATOM,-xSSE3_ATOM,$(MACHINE_CFLAGS)) - # remove march options - MACHINE_CFLAGS := $(patsubst -march=%,-xSSE3,$(MACHINE_CFLAGS)) - endif - - # Disable thunderx PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d - endif - - # Disable event/opdl PMD for icc <= 16.0 - ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1) - CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d - endif - -endif diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk deleted file mode 100644 index 1729f3d849..0000000000 --- a/mk/toolchain/icc/rte.vars.mk +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# toolchain: -# -# - define CC, LD, AR, AS, ... (overridden by cmdline value) -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - -# Warning: we do not use CROSS environment variable as icc is mainly a -# x86->x86 compiler - -CC = icc -KERNELCC = gcc -CPP = cpp -AS = nasm -AR = ar -LD = ld -OBJCOPY = objcopy -OBJDUMP = objdump -STRIP = strip -READELF = readelf - -ifeq ($(KERNELRELEASE),) -HOSTCC = icc -else -HOSTCC = gcc -endif -HOSTAS = as - -TOOLCHAIN_CFLAGS = -TOOLCHAIN_LDFLAGS = -TOOLCHAIN_ASFLAGS = - -# Turn off some ICC warnings - -# Remark #271 : trailing comma is nonstandard -# Warning #1478 : function "<func_name>" (declared at line N of "<filename>") -# error #13368: loop was not vectorized with "vector always assert" -# error #15527: loop was not vectorized: function call to fprintf cannot be vectorize -# was declared "deprecated" -# Warning #11074, 11076: to prevent "inline-max-size" warnings. -WERROR_FLAGS := -Wall -w2 -diag-disable 271 -diag-warning 1478 -WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527 -WERROR_FLAGS += -diag-disable 188 -WERROR_FLAGS += -diag-disable 11074 -diag-disable 11076 -Wdeprecated - -# process cpu flags -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk - -ifeq ($(CONFIG_RTE_ENABLE_LTO),y) -# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX' -# exported in symbol table and without this option only internal -# representation is present. -TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects -TOOLCHAIN_LDFLAGS += -flto -endif - -export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF -export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 12/31] buildtools: remove scripts used only with make 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (10 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 11/31] build: remove makefiles Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 13/31] config: remove default configs used " Thomas Monjalon ` (20 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, scripts used with make are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 4 -- buildtools/auto-config-h.sh | 108 ------------------------------------ buildtools/gen-build-mk.sh | 23 -------- buildtools/gen-config-h.sh | 15 ----- buildtools/relpath.sh | 76 ------------------------- 5 files changed, 226 deletions(-) delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100755 buildtools/relpath.sh diff --git a/MAINTAINERS b/MAINTAINERS index d8a51b0af1..37f1f1fc56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -100,10 +100,6 @@ Build System M: Thomas Monjalon <thomas@monjalon.net> F: Makefile F: config/ -F: buildtools/auto-config-h.sh -F: buildtools/gen-build-mk.sh -F: buildtools/gen-config-h.sh -F: buildtools/relpath.sh Meson build M: Bruce Richardson <bruce.richardson@intel.com> diff --git a/buildtools/auto-config-h.sh b/buildtools/auto-config-h.sh deleted file mode 100755 index 5b613c35fc..0000000000 --- a/buildtools/auto-config-h.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2015 6WIND S.A. -# -# Crude script to detect whether particular types, macros and functions are -# defined by trying to compile a file with a given header. Can be used to -# perform cross-platform checks since the resulting object file is not -# executed. -# -# Set VERBOSE=1 in the environment to display compiler output and errors. -# -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS and EXTRA_CFLAGS are taken from the -# environment. -# -# AUTO_CONFIG_CFLAGS may append additional CFLAGS without modifying the -# above variables. - -file=${1:?output file name required (config.h)} -macro=${2:?output macro name required (HAVE_*)} -include=${3:?include name required (foo.h)} -type=${4:?object type required (define, enum, type, field, func)} -name=${5:?define/type/function name required} - -: ${CC:=cc} - -temp=$(mktemp -t dpdk.${0##*/}.c.XXXXXX) - -case $type in -define) - code="\ -#ifndef $name -#error $name not defined -#endif -" - ;; -enum) - code="\ -long test____ = $name; -" - ;; -type) - code="\ -$name test____; -" - ;; -field) - code="\ -void test____(void) -{ - ${name%%.*} test_____; - - (void)test_____.${name#*.}; -} -" - ;; -func) - code="\ -void (*test____)() = (void (*)())$name; -" - ;; -*) - unset error - : ${error:?unknown object type \"$type\"} - exit -esac - -if [ "${VERBOSE}" = 1 ] -then - err=2 - out=1 - eol=' -' -else - exec 3> /dev/null || - exit - err=3 - out=3 - eol=' ' -fi && -printf 'Looking for %s %s in %s.%s' \ - "${name}" "${type}" "${include}" "${eol}" && -printf "\ -#include <%s> - -%s -" "$include" "$code" > "${temp}" && -if ${CC} ${CPPFLAGS} ${EXTRA_CPPFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ - ${AUTO_CONFIG_CFLAGS} \ - -xc -c -o ${temp}.o "${temp}" 1>&${out} 2>&${err} -then - rm -f "${temp}" "${temp}.o" - printf "\ -#ifndef %s -#define %s 1 -#endif /* %s */ - -" "${macro}" "${macro}" "${macro}" >> "${file}" && - printf 'Defining %s.\n' "${macro}" -else - rm -f "${temp}" "${temp}.o" - printf "\ -/* %s is not defined. */ - -" "${macro}" >> "${file}" && - printf 'Not defining %s.\n' "${macro}" -fi - -exit diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh deleted file mode 100755 index 636920b638..0000000000 --- a/buildtools/gen-build-mk.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# Auto-generate a Makefile in build directory -# Args: -# $1: path of project src root - -echo "# Automatically generated by gen-build-mk.sh" -echo -echo "ifdef O" -echo "ifeq (\"\$(origin O)\", \"command line\")" -echo "\$(error \"Cannot specify O= as you are already in a build directory\")" -echo "endif" -echo "endif" -echo -echo "MAKEFLAGS += --no-print-directory" -echo -echo "all:" -echo " @\$(MAKE) -C $1 O=\$(CURDIR)" -echo -echo "%::" -echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@" diff --git a/buildtools/gen-config-h.sh b/buildtools/gen-config-h.sh deleted file mode 100755 index a8c2006339..0000000000 --- a/buildtools/gen-config-h.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -echo "#ifndef __RTE_CONFIG_H" -echo "#define __RTE_CONFIG_H" -grep CONFIG_ $1 | -grep -v '^[ \t]*#' | -sed 's,CONFIG_\(.*\)=y.*$,#undef \1\ -#define \1 1,' | -sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' | -sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\ -#define \1 \2,' | -sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,' -echo "#endif /* __RTE_CONFIG_H */" diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh deleted file mode 100755 index 02953837a2..0000000000 --- a/buildtools/relpath.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# print the relative path of $1 from $2 directory -# $1 and $2 MUST be absolute paths -# - -if [ $# -ne 2 ]; then - echo "Bad arguments" - echo "Usage:" - echo " $0 path1 path2" - exit 1 -fi - -# get the real absolute path, derefencing symlinks -ABS1="$(dirname $(readlink -f $1))/$(basename $1)" -ABS2=$(readlink -f $2) - -# remove leading slash -REL1=${ABS1#/} -REL2=${ABS2#/} - -left1=${REL1%%/*} -right1=${REL1#*/} -prev_right1=$REL1 -prev_left1= - -left2=${REL2%%/*} -right2=${REL2#*/} -prev_right2=$REL2 -prev_left2= - -prefix= - -while [ "${right1}" != "" -a "${right2}" != "" ]; do - - if [ "$left1" != "$left2" ]; then - break - fi - - prev_left1=$left1 - left1=$left1/${right1%%/*} - prev_right1=$right1 - right1=${prev_right1#*/} - if [ "$right1" = "$prev_right1" ]; then - right1="" - fi - - prev_left2=$left2 - left2=$left2/${right2%%/*} - prev_right2=$right2 - right2=${prev_right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -if [ "${left1}" != "${left2}" ]; then - right2=${prev_right2} - right1=${prev_right1} -fi - -while [ "${right2}" != "" ]; do - prefix=${prefix}../ - prev_right2=$right2 - right2=${right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -echo ${prefix}${right1} - -exit 0 -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 13/31] config: remove default configs used with make 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (11 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 12/31] buildtools: remove scripts used only with make Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 14/31] devtools: remove legacy flags from includes check Thomas Monjalon ` (19 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is not supported for compiling DPDK, the config files are no longer needed. Signed-off-by: Ciara Power <ciara.power@intel.com> --- MAINTAINERS | 10 +- config/common_armv8a_linux | 43 - config/common_base | 1154 ----------------- config/common_freebsd | 15 - config/common_linux | 68 - config/defconfig_arm-armv7a-linux-gcc | 1 - config/defconfig_arm-armv7a-linuxapp-gcc | 49 - config/defconfig_arm64-armada-linux-gcc | 1 - config/defconfig_arm64-armada-linuxapp-gcc | 41 - config/defconfig_arm64-armv8a-linux-clang | 1 - config/defconfig_arm64-armv8a-linux-gcc | 1 - config/defconfig_arm64-armv8a-linuxapp-clang | 8 - config/defconfig_arm64-armv8a-linuxapp-gcc | 9 - config/defconfig_arm64-bluefield-linux-gcc | 1 - config/defconfig_arm64-bluefield-linuxapp-gcc | 18 - config/defconfig_arm64-dpaa-linux-gcc | 1 - config/defconfig_arm64-dpaa-linuxapp-gcc | 31 - config/defconfig_arm64-emag-linux-gcc | 1 - config/defconfig_arm64-emag-linuxapp-gcc | 11 - config/defconfig_arm64-n1sdp-linux-gcc | 1 - config/defconfig_arm64-n1sdp-linuxapp-gcc | 14 - config/defconfig_arm64-octeontx2-linux-gcc | 1 - config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 - config/defconfig_arm64-stingray-linux-gcc | 1 - config/defconfig_arm64-stingray-linuxapp-gcc | 14 - config/defconfig_arm64-thunderx-linux-gcc | 1 - config/defconfig_arm64-thunderx-linuxapp-gcc | 17 - config/defconfig_arm64-thunderx2-linux-gcc | 1 - config/defconfig_arm64-thunderx2-linuxapp-gcc | 12 - config/defconfig_arm64-xgene1-linux-gcc | 1 - config/defconfig_arm64-xgene1-linuxapp-gcc | 8 - config/defconfig_i686-native-linux-gcc | 1 - config/defconfig_i686-native-linux-icc | 1 - config/defconfig_i686-native-linuxapp-gcc | 66 - config/defconfig_i686-native-linuxapp-icc | 66 - config/defconfig_ppc_64-power8-linux-gcc | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 35 - config/defconfig_x86_64-native-bsdapp-clang | 14 - config/defconfig_x86_64-native-bsdapp-gcc | 14 - config/defconfig_x86_64-native-freebsd-clang | 1 - config/defconfig_x86_64-native-freebsd-gcc | 1 - config/defconfig_x86_64-native-linux-clang | 1 - config/defconfig_x86_64-native-linux-gcc | 1 - config/defconfig_x86_64-native-linux-icc | 1 - config/defconfig_x86_64-native-linuxapp-clang | 14 - config/defconfig_x86_64-native-linuxapp-gcc | 14 - config/defconfig_x86_64-native-linuxapp-icc | 29 - config/defconfig_x86_x32-native-linux-gcc | 1 - config/defconfig_x86_x32-native-linuxapp-gcc | 46 - config/rte_config.h | 4 - devtools/build-tags.sh | 15 +- drivers/bus/pci/linux/pci_vfio.c | 1 - drivers/net/i40e/i40e_rxtx.c | 1 - lib/librte_mempool/rte_mempool.h | 2 +- lib/librte_ring/rte_ring_elem.h | 3 +- 55 files changed, 6 insertions(+), 1880 deletions(-) delete mode 100644 config/common_armv8a_linux delete mode 100644 config/common_base delete mode 100644 config/common_freebsd delete mode 100644 config/common_linux delete mode 120000 config/defconfig_arm-armv7a-linux-gcc delete mode 100644 config/defconfig_arm-armv7a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armada-linux-gcc delete mode 100644 config/defconfig_arm64-armada-linuxapp-gcc delete mode 120000 config/defconfig_arm64-armv8a-linux-clang delete mode 120000 config/defconfig_arm64-armv8a-linux-gcc delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang delete mode 100644 config/defconfig_arm64-armv8a-linuxapp-gcc delete mode 120000 config/defconfig_arm64-bluefield-linux-gcc delete mode 100644 config/defconfig_arm64-bluefield-linuxapp-gcc delete mode 120000 config/defconfig_arm64-dpaa-linux-gcc delete mode 100644 config/defconfig_arm64-dpaa-linuxapp-gcc delete mode 120000 config/defconfig_arm64-emag-linux-gcc delete mode 100644 config/defconfig_arm64-emag-linuxapp-gcc delete mode 120000 config/defconfig_arm64-n1sdp-linux-gcc delete mode 100644 config/defconfig_arm64-n1sdp-linuxapp-gcc delete mode 120000 config/defconfig_arm64-octeontx2-linux-gcc delete mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-stingray-linux-gcc delete mode 100644 config/defconfig_arm64-stingray-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx-linuxapp-gcc delete mode 120000 config/defconfig_arm64-thunderx2-linux-gcc delete mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc delete mode 120000 config/defconfig_arm64-xgene1-linux-gcc delete mode 100644 config/defconfig_arm64-xgene1-linuxapp-gcc delete mode 120000 config/defconfig_i686-native-linux-gcc delete mode 120000 config/defconfig_i686-native-linux-icc delete mode 100644 config/defconfig_i686-native-linuxapp-gcc delete mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 120000 config/defconfig_ppc_64-power8-linux-gcc delete mode 100644 config/defconfig_ppc_64-power8-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-bsdapp-clang delete mode 100644 config/defconfig_x86_64-native-bsdapp-gcc delete mode 120000 config/defconfig_x86_64-native-freebsd-clang delete mode 120000 config/defconfig_x86_64-native-freebsd-gcc delete mode 120000 config/defconfig_x86_64-native-linux-clang delete mode 120000 config/defconfig_x86_64-native-linux-gcc delete mode 120000 config/defconfig_x86_64-native-linux-icc delete mode 100644 config/defconfig_x86_64-native-linuxapp-clang delete mode 100644 config/defconfig_x86_64-native-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-native-linuxapp-icc delete mode 120000 config/defconfig_x86_x32-native-linux-gcc delete mode 100644 config/defconfig_x86_x32-native-linuxapp-gcc diff --git a/MAINTAINERS b/MAINTAINERS index 37f1f1fc56..3b16d7a4b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -94,18 +94,12 @@ F: devtools/words-case.txt F: license/ F: .editorconfig - Build System ------------- -M: Thomas Monjalon <thomas@monjalon.net> +M: Bruce Richardson <bruce.richardson@intel.com> F: Makefile -F: config/ - -Meson build -M: Bruce Richardson <bruce.richardson@intel.com> F: meson.build F: meson_options.txt -F: config/rte_config.h +F: config/ F: buildtools/binutils-avx512-check.sh F: buildtools/call-sphinx-build.py F: buildtools/gen-pmdinfo-cfile.sh diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux deleted file mode 100644 index e942657a0f..0000000000 --- a/config/common_armv8a_linux +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv8a" - -CONFIG_RTE_ARCH="arm64" -CONFIG_RTE_ARCH_ARM64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_FORCE_INTRINSICS=y - -# Maximum available cache line size in arm64 implementations. -# Setting to maximum available cache line size in generic config -# to address minimum DMA alignment across all arm64 implementations. -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_USE_C11_MEM_MODEL=y - -# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) -# to determine the best threshold in code. Refer to notes in source file -# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info. -CONFIG_RTE_ARCH_ARM64_MEMCPY=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048 -#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512 -# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're -# strong reasons. -#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF -#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n - -CONFIG_RTE_LIBRTE_IONIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n - -# -# NXP PFE PMD Driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=y diff --git a/config/common_base b/config/common_base deleted file mode 100644 index fbf0ee70c8..0000000000 --- a/config/common_base +++ /dev/null @@ -1,1154 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2017 Intel Corporation - -# -# String that appears before the version number -# -CONFIG_RTE_VER_PREFIX="DPDK" - -# -# Version information completed when this file is processed for a build -# -CONFIG_RTE_VER_YEAR=__YEAR -CONFIG_RTE_VER_MONTH=__MONTH -CONFIG_RTE_VER_MINOR=__MINOR -CONFIG_RTE_VER_SUFFIX=__SUFFIX -CONFIG_RTE_VER_RELEASE=__RELEASE - -# -# define executive environment -# RTE_EXEC_ENV values are the directories in mk/exec-env/ -# -CONFIG_RTE_EXEC_ENV= - -# -# define the architecture we compile for. -# RTE_ARCH values are the directories in mk/arch/ -# -CONFIG_RTE_ARCH= - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE values are the directories in mk/machine/ -# -CONFIG_RTE_MACHINE= - -# -# The compiler we use. -# RTE_TOOLCHAIN values are the directories in mk/toolchain/ -# -CONFIG_RTE_TOOLCHAIN= - -# -# Use intrinsics or assembly code for key routines -# -CONFIG_RTE_FORCE_INTRINSICS=n - -# -# Machine forces strict alignment constraints. -# -CONFIG_RTE_ARCH_STRICT_ALIGN=n - -# -# Enable link time optimization -# -CONFIG_RTE_ENABLE_LTO=n - -# -# Compile to share library -# -CONFIG_RTE_BUILD_SHARED_LIB=n - -# -# Use newest code breaking previous ABI -# -CONFIG_RTE_NEXT_ABI=y - -# -# Machine's cache line size -# -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# -# Memory model -# -CONFIG_RTE_USE_C11_MEM_MODEL=n - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_LIBRTE_EAL=y -CONFIG_RTE_MAX_LCORE=128 -CONFIG_RTE_MAX_NUMA_NODES=8 -CONFIG_RTE_MAX_HEAPS=32 -CONFIG_RTE_MAX_MEMSEG_LISTS=64 -# each memseg list will be limited to either RTE_MAX_MEMSEG_PER_LIST pages -# or RTE_MAX_MEM_MB_PER_LIST megabytes worth of memory, whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_LIST=8192 -CONFIG_RTE_MAX_MEM_MB_PER_LIST=32768 -# a "type" is a combination of page size and NUMA node. total number of memseg -# lists per type will be limited to either RTE_MAX_MEMSEG_PER_TYPE pages (split -# over multiple lists of RTE_MAX_MEMSEG_PER_LIST pages), or -# RTE_MAX_MEM_MB_PER_TYPE megabytes of memory (split over multiple lists of -# RTE_MAX_MEM_MB_PER_LIST), whichever is smaller -CONFIG_RTE_MAX_MEMSEG_PER_TYPE=32768 -CONFIG_RTE_MAX_MEM_MB_PER_TYPE=131072 -# global maximum usable amount of VA, in megabytes -CONFIG_RTE_MAX_MEM_MB=524288 -CONFIG_RTE_MAX_MEMZONE=2560 -CONFIG_RTE_MAX_TAILQ=32 -CONFIG_RTE_ENABLE_ASSERT=n -CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO -CONFIG_RTE_ENABLE_TRACE_FP=n -CONFIG_RTE_LOG_HISTORY=256 -CONFIG_RTE_BACKTRACE=y -CONFIG_RTE_LIBEAL_USE_HPET=n -CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n -CONFIG_RTE_EAL_IGB_UIO=n -CONFIG_RTE_EAL_VFIO=n -CONFIG_RTE_MAX_VFIO_GROUPS=64 -CONFIG_RTE_MAX_VFIO_CONTAINERS=64 -CONFIG_RTE_MALLOC_DEBUG=n -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_USE_LIBBSD=n -# Use WFE instructions to implement the rte_wait_for_equal_xxx APIs, -# calling these APIs put the cores in low power state while waiting -# for the memory address to become equal to the expected value. -# This is supported only by aarch64. -CONFIG_RTE_ARM_USE_WFE=n - -# -# Recognize/ignore the AVX/AVX512 CPU flags for performance/power testing. -# AVX512 is marked as experimental for now, will enable it after enough -# field test and possible optimization. -# -CONFIG_RTE_ENABLE_AVX=y -CONFIG_RTE_ENABLE_AVX512=n - -# Use ARM LSE ATOMIC instructions -CONFIG_RTE_ARM_FEATURE_ATOMICS=n - -# Default driver path (or "" to disable) -CONFIG_RTE_EAL_PMD_PATH="" - -# -# Compile Environment Abstraction Layer to support Vmware TSC map -# -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y - -# -# Compile the PCI library -# -CONFIG_RTE_LIBRTE_PCI=y - -# -# Compile the argument parser library -# -CONFIG_RTE_LIBRTE_KVARGS=y - -# -# Compile generic ethernet library -# -CONFIG_RTE_LIBRTE_ETHER=y -CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n -CONFIG_RTE_MAX_ETHPORTS=32 -CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 -CONFIG_RTE_LIBRTE_IEEE1588=n -CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16 -CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y -CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE=n - -# -# Turn off Tx preparation stage -# -# Warning: rte_eth_tx_prepare() can be safely disabled only if using a -# driver which do not implement any Tx preparation. -# -CONFIG_RTE_ETHDEV_TX_PREPARE_NOOP=n - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n - -# -# Compile the Intel FPGA bus -# -CONFIG_RTE_LIBRTE_IFPGA_BUS=y - -# -# Compile PCI bus driver -# -CONFIG_RTE_LIBRTE_PCI_BUS=y - -# -# Compile the vdev bus -# -CONFIG_RTE_LIBRTE_VDEV_BUS=y - -# -# Compile ARK PMD -# -CONFIG_RTE_LIBRTE_ARK_PMD=y -CONFIG_RTE_LIBRTE_ARK_PAD_TX=y -CONFIG_RTE_LIBRTE_ARK_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS=n -CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE=n - -# -# Compile Aquantia Atlantic PMD driver -# -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=y - -# -# Compile AMD PMD -# -CONFIG_RTE_LIBRTE_AXGBE_PMD=y -CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG=n - -# -# Compile burst-oriented Broadcom PMD driver -# -CONFIG_RTE_LIBRTE_BNX2X_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n -CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC=n - -# -# Compile burst-oriented Broadcom BNXT PMD driver -# -CONFIG_RTE_LIBRTE_BNXT_PMD=y - -# -# Compile burst-oriented Chelsio Terminator (CXGBE) PMD -# -CONFIG_RTE_LIBRTE_CXGBE_PMD=y - -# -# Compile burst-oriented NXP PFE PMD driver -# -CONFIG_RTE_LIBRTE_PFE_PMD=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n - -# -# Compile NXP DPAA2 FSL-MC Bus -# -CONFIG_RTE_LIBRTE_FSLMC_BUS=n - -# -# Compile Support Libraries for NXP DPAA2 -# -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y - -# -# Compile burst-oriented NXP DPAA2 PMD driver -# -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n - -# -# Compile NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# -# Compile burst-oriented Amazon ENA PMD driver -# -CONFIG_RTE_LIBRTE_ENA_PMD=y -CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n - -# -# Compile burst-oriented Cisco ENIC PMD driver -# -CONFIG_RTE_LIBRTE_ENIC_PMD=y - -# -# Compile burst-oriented IGB & EM PMD drivers -# -CONFIG_RTE_LIBRTE_EM_PMD=y -CONFIG_RTE_LIBRTE_IGB_PMD=y -CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n -CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n - -# -# Compile burst-oriented HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# Compile burst-oriented HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n - -# -# Compile Pensando IONIC PMD driver -# -CONFIG_RTE_LIBRTE_IONIC_PMD=y - -# -# Compile burst-oriented IXGBE PMD driver -# -CONFIG_RTE_LIBRTE_IXGBE_PMD=y -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n -CONFIG_RTE_LIBRTE_IXGBE_BYPASS=n - -# -# Compile burst-oriented I40E PMD driver -# -CONFIG_RTE_LIBRTE_I40E_PMD=y -CONFIG_RTE_LIBRTE_I40E_DEBUG_RX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX=n -CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y -CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64 -CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4 - -# -# Compile burst-oriented FM10K PMD -# -CONFIG_RTE_LIBRTE_FM10K_PMD=y -CONFIG_RTE_LIBRTE_FM10K_DEBUG_RX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX=n -CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE=y -CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y - -# -# Compile burst-oriented ICE PMD driver -# -CONFIG_RTE_LIBRTE_ICE_PMD=y -CONFIG_RTE_LIBRTE_ICE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_ICE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n - -# Compile burst-oriented IAVF PMD driver -# -CONFIG_RTE_LIBRTE_IAVF_PMD=y -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC=n -CONFIG_RTE_LIBRTE_IAVF_16BYTE_RX_DESC=n -# -# Compile burst-oriented IPN3KE PMD driver -# -CONFIG_RTE_LIBRTE_IPN3KE_PMD=n - -# -# Compile burst-oriented IGC PMD drivers -# -CONFIG_RTE_LIBRTE_IGC_PMD=y -CONFIG_RTE_LIBRTE_IGC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_IGC_DEBUG_TX=n - -# -# Compile burst-oriented Mellanox ConnectX-3 (MLX4) PMD -# -CONFIG_RTE_LIBRTE_MLX4_PMD=n -CONFIG_RTE_LIBRTE_MLX4_DEBUG=n - -# -# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5, -# ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_PMD=n -CONFIG_RTE_LIBRTE_MLX5_DEBUG=n - -# -# Compile regex-oriented Mellanox PMD -# -CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD=n - -# -# Compile vdpa-oriented Mellanox ConnectX-6 & BlueField (MLX5) PMD -# -CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=n - -# Linking method for mlx4/5 dependency on ibverbs and related libraries -# Default linking is dynamic by linker. -# Other options are: dynamic by dlopen at run-time, or statically embedded. -CONFIG_RTE_IBVERBS_LINK_DLOPEN=n -CONFIG_RTE_IBVERBS_LINK_STATIC=n - -# -# Compile burst-oriented Netronome NFP PMD driver -# -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n - -# QLogic 10G/25G/40G/50G/100G PMD -# -CONFIG_RTE_LIBRTE_QEDE_PMD=y -CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n -CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n -#Provides abs path/name of the firmware file. -#Empty string denotes driver will use default firmware -CONFIG_RTE_LIBRTE_QEDE_FW="" - -# -# Compile burst-oriented Solarflare libefx-based PMD -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=y -CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n - -# -# Compile software PMD backed by SZEDATA2 device -# -CONFIG_RTE_LIBRTE_PMD_SZEDATA2=n - -# -# Compile software PMD backed by NFB device -# -CONFIG_RTE_LIBRTE_NFB_PMD=n - -# -# Compile burst-oriented Cavium Thunderx NICVF PMD driver -# -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=y -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX=n -CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX=n - -# -# Compile burst-oriented Cavium LiquidIO PMD driver -# -CONFIG_RTE_LIBRTE_LIO_PMD=y -CONFIG_RTE_LIBRTE_LIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX=n -CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n - -# -# Compile burst-oriented Cavium OCTEONTX network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX_PMD=y - -# -# Compile burst-oriented Marvell OCTEON TX2 network PMD driver -# -CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=y - -# -# Compile WRS accelerated virtual port (AVP) guest PMD driver -# -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_RX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_TX=n -CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n - -# -# Compile burst-oriented VIRTIO PMD driver -# -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n - -# -# Compile virtio device emulation inside virtio PMD driver -# -CONFIG_RTE_VIRTIO_USER=n - -# -# Compile burst-oriented VMXNET3 PMD driver -# -CONFIG_RTE_LIBRTE_VMXNET3_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_RX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n - -# -# Compile software PMD backed by AF_PACKET sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=n - -# -# Compile software PMD backed by AF_XDP sockets (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_AF_XDP=n - -# -# Compile Memory Interface PMD driver (Linux only) -# -CONFIG_RTE_LIBRTE_PMD_MEMIF=n - -# -# Compile link bonding PMD library -# -CONFIG_RTE_LIBRTE_PMD_BOND=y -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n -CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n - -# -# Compile fail-safe PMD -# -CONFIG_RTE_LIBRTE_PMD_FAILSAFE=y - -# -# Compile Marvell PMD driver -# -CONFIG_RTE_LIBRTE_MVPP2_PMD=n - -# -# Compile Marvell MVNETA PMD driver -# -CONFIG_RTE_LIBRTE_MVNETA_PMD=n - -# -# Compile support for VMBus library -# -CONFIG_RTE_LIBRTE_VMBUS=n - -# -# Compile native PMD for Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_NETVSC_PMD=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_RX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_TX=n -CONFIG_RTE_LIBRTE_NETVSC_DEBUG_DUMP=n - -# -# Compile virtual device driver for NetVSC on Hyper-V/Azure -# -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=n - -# -# Compile null PMD -# -CONFIG_RTE_LIBRTE_PMD_NULL=y - -# -# Compile software PMD backed by PCAP files -# -CONFIG_RTE_LIBRTE_PMD_PCAP=n - -# -# Compile example software rings based PMD -# -CONFIG_RTE_LIBRTE_PMD_RING=y -CONFIG_RTE_PMD_RING_MAX_RX_RINGS=16 -CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 - -# -# Compile SOFTNIC PMD -# -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=n - -# -# Compile the TAP PMD -# It is enabled by default for Linux only. -# -CONFIG_RTE_LIBRTE_PMD_TAP=n - -# -# Do prefetch of packet data within PMD driver receive function -# -CONFIG_RTE_PMD_PACKET_PREFETCH=y - -# Compile generic wireless base band device library -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_BBDEV=y -CONFIG_RTE_LIBRTE_BBDEV_DEBUG=n -CONFIG_RTE_BBDEV_MAX_DEVS=128 -CONFIG_RTE_BBDEV_OFFLOAD_COST=y -CONFIG_RTE_BBDEV_SDK_AVX2=n -CONFIG_RTE_BBDEV_SDK_AVX512=n - -# -# Compile PMD for NULL bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL=y - -# -# Compile PMD for turbo software bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y - -# -# Compile PMD for Intel FPGA LTE FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y - -# -# Compile PMD for Intel FPGA 5GNR FEC bbdev device -# -CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC=y - -# -# Compile generic crypto device library -# -CONFIG_RTE_LIBRTE_CRYPTODEV=y -CONFIG_RTE_CRYPTO_MAX_DEVS=64 - -# -# Compile PMD for ARMv8 Crypto device -# -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n - -# -# Compile NXP CAAM JR crypto Driver -# -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE=n - -# -# Compile NXP DPAA2 crypto sec driver for CAAM HW -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n - -# -# NXP DPAA caam - crypto driver -# -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4 - -# -# Compile PMD for Cavium OCTEON TX crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y - -# -# Compile PMD for Marvell OCTEON TX2 crypto device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y - -# -# Compile PMD for QuickAssist based devices - see docs for details -# -CONFIG_RTE_LIBRTE_PMD_QAT=y -CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n -CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n -# -# Max. number of QuickAssist devices, which can be detected and attached -# -CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 -CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -# -# Compile PMD for virtio crypto devices -# -CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y -# -# Number of maximum virtio crypto devices -# -CONFIG_RTE_MAX_VIRTIO_CRYPTO=32 - -# -# Compile PMD for AESNI backed device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# Compile PMD for Software backed device -# -CONFIG_RTE_LIBRTE_PMD_OPENSSL=n - -# -# Compile PMD for AESNI GCM device -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# Compile PMD for SNOW 3G device -# -CONFIG_RTE_LIBRTE_PMD_SNOW3G=n -CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG=n - -# -# Compile PMD for KASUMI device -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# Compile PMD for ZUC device -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# Compile PMD for Crypto Scheduler device -# -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y - -# -# Compile PMD for NULL Crypto device -# -CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=y - -# -# Compile PMD for AMD CCP crypto device -# -CONFIG_RTE_LIBRTE_PMD_CCP=n - -# -# Compile PMD for Marvell Crypto device -# -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=n - -# -# Compile PMD for NITROX crypto device -# -CONFIG_RTE_LIBRTE_PMD_NITROX=y - -# -# Compile generic security library -# -CONFIG_RTE_LIBRTE_SECURITY=y - -# -# Compile generic compression device library -# -CONFIG_RTE_LIBRTE_COMPRESSDEV=y -CONFIG_RTE_COMPRESS_MAX_DEVS=64 - -# -# Compile compressdev unit test -# -CONFIG_RTE_COMPRESSDEV_TEST=n - -# -# Compile PMD for Octeontx ZIPVF compression device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF=y - -# -# Compile PMD for ISA-L compression device -# -CONFIG_RTE_LIBRTE_PMD_ISAL=n - -# -# Compile PMD for ZLIB compression device -# -CONFIG_RTE_LIBRTE_PMD_ZLIB=n - -# -# Compile RegEx device support -# -CONFIG_RTE_LIBRTE_REGEXDEV=y -CONFIG_RTE_LIBRTE_REGEXDEV_DEBUG=n -CONFIG_RTE_MAX_REGEXDEV_DEVS=32 - -# -# Compile generic event device library -# -CONFIG_RTE_LIBRTE_EVENTDEV=y -CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n -CONFIG_RTE_EVENT_MAX_DEVS=16 -CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64 -CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32 -CONFIG_RTE_EVENT_ETH_INTR_RING_SIZE=1024 -CONFIG_RTE_EVENT_CRYPTO_ADAPTER_MAX_INSTANCE=32 -CONFIG_RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE=32 - -# -# Compile PMD for skeleton event device -# -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG=n - -# -# Compile PMD for software event device -# -CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y - -# -# Compile PMD for distributed software event device -# -CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV=y - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y - -# -# Compile PMD for octeontx2 sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=y - -# -# Compile PMD for OPDL event device -# -CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=y - -# -# Compile PMD for NXP DPAA event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n - -# -# Compile PMD for NXP DPAA2 event device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n - -# -# Compile raw device support -# EXPERIMENTAL: API may change without prior notice -# -CONFIG_RTE_LIBRTE_RAWDEV=y -CONFIG_RTE_RAWDEV_MAX_DEVS=64 -CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV=y - -# -# Compile PMD for NXP DPAA2 CMDIF raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n - -# -# Compile PMD for NXP DPAA2 QDMA raw device -# -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n - -# -# Compile PMD for Intel FPGA raw device -# -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n - -# -# Compile PMD for Intel IOAT raw device -# -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=y - -# -# Compile PMD for octeontx2 DMA raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=y - -# -# Compile PMD for octeontx2 EP raw device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=y - -# -# Compile PMD for NTB raw device -# -CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV=y - -# -# Compile librte_ring -# -CONFIG_RTE_LIBRTE_RING=y - -# -# Compile librte_stack -# -CONFIG_RTE_LIBRTE_STACK=y - -# -# Compile librte_mempool -# -CONFIG_RTE_LIBRTE_MEMPOOL=y -CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512 -CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n - -# -# Compile Mempool drivers -# -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET=y -CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB=64 -CONFIG_RTE_DRIVER_MEMPOOL_RING=y -CONFIG_RTE_DRIVER_MEMPOOL_STACK=y - -# -# Compile PMD for octeontx fpa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=y - -# -# Compile PMD for octeontx2 npa mempool device -# -CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=y - -# -# Compile librte_mbuf -# -CONFIG_RTE_LIBRTE_MBUF=y -CONFIG_RTE_LIBRTE_MBUF_DEBUG=n -CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="ring_mp_mc" -CONFIG_RTE_MBUF_REFCNT_ATOMIC=y -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# -# Compile librte_timer -# -CONFIG_RTE_LIBRTE_TIMER=y -CONFIG_RTE_LIBRTE_TIMER_DEBUG=n - -# -# Compile librte_cfgfile -# -CONFIG_RTE_LIBRTE_CFGFILE=y - -# -# Compile librte_cmdline -# -CONFIG_RTE_LIBRTE_CMDLINE=y -CONFIG_RTE_LIBRTE_CMDLINE_DEBUG=n - -# -# Compile librte_hash -# -CONFIG_RTE_LIBRTE_HASH=y -CONFIG_RTE_LIBRTE_HASH_DEBUG=n - -# -# Compile librte_efd -# -CONFIG_RTE_LIBRTE_EFD=y - -# -# Compile librte_member -# -CONFIG_RTE_LIBRTE_MEMBER=y - -# -# Compile librte_jobstats -# -CONFIG_RTE_LIBRTE_JOBSTATS=y - -# -# Compile the device metrics library -# -CONFIG_RTE_LIBRTE_METRICS=y - -# -# Compile the bitrate statistics library -# -CONFIG_RTE_LIBRTE_BITRATE=y - -# -# Compile the latency statistics library -# -CONFIG_RTE_LIBRTE_LATENCY_STATS=y - -# -# Compile librte_telemetry legacy support -# -CONFIG_RTE_LIBRTE_TELEMETRY=n - -# -# Compile librte_rcu -# -CONFIG_RTE_LIBRTE_RCU=y -CONFIG_RTE_LIBRTE_RCU_DEBUG=n - -# -# Compile librte_rib -# -CONFIG_RTE_LIBRTE_RIB=y - -# -# Compile librte_fib -# -CONFIG_RTE_LIBRTE_FIB=y -CONFIG_RTE_LIBRTE_FIB_DEBUG=n - -# -# Compile librte_lpm -# -CONFIG_RTE_LIBRTE_LPM=y -CONFIG_RTE_LIBRTE_LPM_DEBUG=n - -# -# Compile librte_acl -# -CONFIG_RTE_LIBRTE_ACL=y -CONFIG_RTE_LIBRTE_ACL_DEBUG=n - -# -# Compile librte_power -# -CONFIG_RTE_LIBRTE_POWER=n -CONFIG_RTE_LIBRTE_POWER_DEBUG=n -CONFIG_RTE_MAX_LCORE_FREQS=64 - -# -# Compile librte_net -# -CONFIG_RTE_LIBRTE_NET=y - -# -# Compile librte_ip_frag -# -CONFIG_RTE_LIBRTE_IP_FRAG=y -CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n -CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4 -CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n - -# -# Compile GRO library -# -CONFIG_RTE_LIBRTE_GRO=y - -# -# Compile GSO library -# -CONFIG_RTE_LIBRTE_GSO=y - -# -# Compile librte_meter -# -CONFIG_RTE_LIBRTE_METER=y - -# -# Compile librte_classify -# -CONFIG_RTE_LIBRTE_FLOW_CLASSIFY=y - -# -# Compile librte_sched -# -CONFIG_RTE_LIBRTE_SCHED=y -CONFIG_RTE_SCHED_DEBUG=n -CONFIG_RTE_SCHED_RED=n -CONFIG_RTE_SCHED_COLLECT_STATS=n -CONFIG_RTE_SCHED_SUBPORT_TC_OV=n -CONFIG_RTE_SCHED_PORT_N_GRINDERS=8 -CONFIG_RTE_SCHED_VECTOR=n - -# -# Compile the distributor library -# -CONFIG_RTE_LIBRTE_DISTRIBUTOR=y - -# -# Compile the reorder library -# -CONFIG_RTE_LIBRTE_REORDER=y - -# -# Compile librte_port -# -CONFIG_RTE_LIBRTE_PORT=y -CONFIG_RTE_PORT_STATS_COLLECT=n -CONFIG_RTE_PORT_PCAP=n - -# -# Compile librte_table -# -CONFIG_RTE_LIBRTE_TABLE=y -CONFIG_RTE_TABLE_STATS_COLLECT=n - -# -# Compile librte_pipeline -# -CONFIG_RTE_LIBRTE_PIPELINE=y -CONFIG_RTE_PIPELINE_STATS_COLLECT=n - -# -# Compile librte_kni -# -CONFIG_RTE_LIBRTE_KNI=n -CONFIG_RTE_LIBRTE_PMD_KNI=n -CONFIG_RTE_KNI_KMOD=n -CONFIG_RTE_KNI_PREEMPT_DEFAULT=y - -# -# Compile the pdump library -# -CONFIG_RTE_LIBRTE_PDUMP=y - -# -# Compile vhost user library -# -CONFIG_RTE_LIBRTE_VHOST=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n -CONFIG_RTE_LIBRTE_VHOST_DEBUG=n - -# -# Compile vhost PMD -# To compile, CONFIG_RTE_LIBRTE_VHOST should be enabled. -# -CONFIG_RTE_LIBRTE_PMD_VHOST=n - -# -# Compile IFC driver -# To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO -# should be enabled. -# -CONFIG_RTE_LIBRTE_IFC_PMD=n - -# -# Compile librte_bpf -# -CONFIG_RTE_LIBRTE_BPF=y -# allow load BPF from ELF files (requires libelf) -CONFIG_RTE_LIBRTE_BPF_ELF=n - -# -# Compile librte_ipsec -# -CONFIG_RTE_LIBRTE_IPSEC=y - -# -# Compile librte_graph -# -CONFIG_RTE_LIBRTE_GRAPH=y -CONFIG_RTE_GRAPH_BURST_SIZE=256 -CONFIG_RTE_LIBRTE_GRAPH_STATS=y - -# -# Compile librte_node -# -CONFIG_RTE_LIBRTE_NODE=y - -# -# Compile the test application -# -CONFIG_RTE_APP_TEST=y -CONFIG_RTE_APP_TEST_RESOURCE_TAR=n - -# -# Compile the procinfo application -# -CONFIG_RTE_PROC_INFO=n - -# -# Compile the PMD test application -# -CONFIG_RTE_TEST_PMD=y -CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n -CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n - -# -# Compile the rte flow perf application -# -CONFIG_RTE_TEST_FLOW_PERF=y - -# -# Compile the bbdev test application -# -CONFIG_RTE_TEST_BBDEV=y - -# -# Compile the compression performance application -# -CONFIG_RTE_APP_COMPRESS_PERF=y - -# -# Compile the crypto performance application -# -CONFIG_RTE_APP_CRYPTO_PERF=y - -# -# Compile the eventdev application -# -CONFIG_RTE_APP_EVENTDEV=y diff --git a/config/common_freebsd b/config/common_freebsd deleted file mode 100644 index 456b394c4d..0000000000 --- a/config/common_freebsd +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="bsdapp" -CONFIG_RTE_EXEC_ENV_BSDAPP=y -CONFIG_RTE_EXEC_ENV_FREEBSD=y - -# -# FreeBSD contiguous memory driver settings -# -CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64 -CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2 -CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024 diff --git a/config/common_linux b/config/common_linux deleted file mode 100644 index 816810671a..0000000000 --- a/config/common_linux +++ /dev/null @@ -1,68 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="linuxapp" -CONFIG_RTE_EXEC_ENV_LINUX=y -CONFIG_RTE_EXEC_ENV_LINUXAPP=y - -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y -CONFIG_RTE_EAL_VFIO=y -CONFIG_RTE_LIBRTE_KNI=y -CONFIG_RTE_LIBRTE_PMD_KNI=y -CONFIG_RTE_LIBRTE_VHOST=y -CONFIG_RTE_LIBRTE_VHOST_NUMA=y -CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n -CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFC_PMD=y -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y -CONFIG_RTE_LIBRTE_PMD_MEMIF=y -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y -CONFIG_RTE_LIBRTE_PMD_TAP=y -CONFIG_RTE_LIBRTE_AVP_PMD=y -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y -CONFIG_RTE_LIBRTE_NFP_PMD=y -CONFIG_RTE_LIBRTE_POWER=y -CONFIG_RTE_VIRTIO_USER=y -CONFIG_RTE_PROC_INFO=y - -CONFIG_RTE_LIBRTE_VMBUS=y -CONFIG_RTE_LIBRTE_NETVSC_PMD=y - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=y - -# NXP DPAA BUS and drivers -CONFIG_RTE_LIBRTE_DPAA_BUS=y -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y - -# NXP FSLMC BUS and DPAA2 drivers -CONFIG_RTE_LIBRTE_FSLMC_BUS=y -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA2_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y - -# -# NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=y - -# -# HINIC PMD driver -# -CONFIG_RTE_LIBRTE_HINIC_PMD=y - -# -# Hisilicon HNS3 PMD driver -# -CONFIG_RTE_LIBRTE_HNS3_PMD=y diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc deleted file mode 120000 index 84619de43a..0000000000 --- a/config/defconfig_arm-armv7a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm-armv7a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc deleted file mode 100644 index ac91120868..0000000000 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2015 RehiveTech. All right reserved. - -#include "common_linux" - -CONFIG_RTE_MACHINE="armv7a" - -CONFIG_RTE_ARCH="arm" -CONFIG_RTE_ARCH_ARM=y -CONFIG_RTE_ARCH_ARMv7=y -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a9" - -# Accelerate memcpy operations. Consider enabling for Cortex-A15. -# For Cortex-A7 and Cortex-A9, It might accelerate short data copies (< 64 B). -CONFIG_RTE_ARCH_ARM_NEON_MEMCPY=n - -CONFIG_RTE_FORCE_INTRINSICS=y -CONFIG_RTE_ARCH_STRICT_ALIGN=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# NUMA is not supported on ARM -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# ARM doesn't have support for vmware TSC map -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# KNI is not supported on 32-bit -CONFIG_RTE_LIBRTE_KNI=n - -# cannot use those on ARM -CONFIG_RTE_LIBRTE_ARK_PMD=n -CONFIG_RTE_LIBRTE_EM_PMD=n -CONFIG_RTE_LIBRTE_IGB_PMD=n -CONFIG_RTE_LIBRTE_CXGBE_PMD=n -CONFIG_RTE_LIBRTE_E1000_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_QEDE_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_arm64-armada-linux-gcc b/config/defconfig_arm64-armada-linux-gcc deleted file mode 120000 index 64ce2a5687..0000000000 --- a/config/defconfig_arm64-armada-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armada-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armada-linuxapp-gcc b/config/defconfig_arm64-armada-linuxapp-gcc deleted file mode 100644 index a49bebe374..0000000000 --- a/config/defconfig_arm64-armada-linuxapp-gcc +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Enable PMDs -CONFIG_RTE_LIBRTE_MVEP_COMMON=y -CONFIG_RTE_LIBRTE_MVPP2_PMD=y -CONFIG_RTE_LIBRTE_MVNETA_PMD=y -CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y - -# Disable NXP as it is conflict with MUSDK -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_COMMON_DPAAX=n -CONFIG_RTE_LIBRTE_FSLMC_BUS=n -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA2_PMD=n -CONFIG_RTE_LIBRTE_DPAA_BUS=n -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n -CONFIG_RTE_LIBRTE_DPAA_PMD=n -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n -CONFIG_RTE_LIBRTE_PFE_PMD=n -CONFIG_RTE_LIBRTE_ENETC_PMD=n - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang deleted file mode 120000 index 196808b982..0000000000 --- a/config/defconfig_arm64-armv8a-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linux-gcc b/config/defconfig_arm64-armv8a-linux-gcc deleted file mode 120000 index 0949519562..0000000000 --- a/config/defconfig_arm64-armv8a-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-armv8a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang b/config/defconfig_arm64-armv8a-linuxapp-clang deleted file mode 100644 index d3b4dad532..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-clang +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc deleted file mode 100644 index 58c4a4029a..0000000000 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "common_armv8a_linux" - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_MAX_LCORE=256 diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc deleted file mode 120000 index dad37d5e79..0000000000 --- a/config/defconfig_arm64-bluefield-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-bluefield-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-bluefield-linuxapp-gcc b/config/defconfig_arm64-bluefield-linuxapp-gcc deleted file mode 100644 index b496538819..0000000000 --- a/config/defconfig_arm64-bluefield-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019 Mellanox Technologies, Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Mellanox BlueField -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# UMA architecture -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# PMD for ConnectX-5 -CONFIG_RTE_LIBRTE_MLX5_PMD=y diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc deleted file mode 120000 index dc05caacf3..0000000000 --- a/config/defconfig_arm64-dpaa-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-dpaa-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc deleted file mode 100644 index 4ae4cd8502..0000000000 --- a/config/defconfig_arm64-dpaa-linuxapp-gcc +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016 Freescale Semiconductor, Inc. -# Copyright 2017-2019 NXP - -#include "defconfig_arm64-armv8a-linux-gcc" - -# NXP (Freescale) - Soc Architecture for DPAA or DPAA2 support -# DPAA - FMAN, QMAN & BMAN support (e.g. LS1043, LS1046) -# DPAA2 - WRIOP and QBMAN (e.g. LS1088, LS2088, LX2160 etc) -# -CONFIG_RTE_MACHINE="dpaa" -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# -# Compile Environment Abstraction Layer -# -CONFIG_RTE_MAX_LCORE=16 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_PKTMBUF_HEADROOM=128 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Enable PHY mode when using VM-VFIO target -CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n - -# NXP DPAA Bus -CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=n -CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc deleted file mode 120000 index 21894a31a8..0000000000 --- a/config/defconfig_arm64-emag-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-emag-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc deleted file mode 100644 index 1db654c899..0000000000 --- a/config/defconfig_arm64-emag-linuxapp-gcc +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Ampere Computing -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="emag" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=32 diff --git a/config/defconfig_arm64-n1sdp-linux-gcc b/config/defconfig_arm64-n1sdp-linux-gcc deleted file mode 120000 index 103bbea90f..0000000000 --- a/config/defconfig_arm64-n1sdp-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-n1sdp-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-n1sdp-linuxapp-gcc b/config/defconfig_arm64-n1sdp-linuxapp-gcc deleted file mode 100644 index f9138093b5..0000000000 --- a/config/defconfig_arm64-n1sdp-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Arm Ltd. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="n1sdp" -CONFIG_RTE_MAX_LCORE=4 -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_CACHE_LINE_SIZE=64 - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n diff --git a/config/defconfig_arm64-octeontx2-linux-gcc b/config/defconfig_arm64-octeontx2-linux-gcc deleted file mode 120000 index e251505311..0000000000 --- a/config/defconfig_arm64-octeontx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-octeontx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc deleted file mode 100644 index 0d83becf54..0000000000 --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="octeontx2" - -CONFIG_RTE_MAX_NUMA_NODES=1 -CONFIG_RTE_MAX_LCORE=36 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -# Max supported NIX LFs -CONFIG_RTE_MAX_VFIO_GROUPS=128 diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc deleted file mode 120000 index 829dd65f05..0000000000 --- a/config/defconfig_arm64-stingray-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-stingray-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc deleted file mode 100644 index 2a6f6cee28..0000000000 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) Broadcom 2017-2018. All rights reserved. -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -# Broadcom - Stingray -CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" - -# Doesn't support NUMA -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n -CONFIG_RTE_LIBRTE_VHOST_NUMA=n - -CONFIG_RTE_EAL_IGB_UIO=y diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc deleted file mode 120000 index 1b9c4ad211..0000000000 --- a/config/defconfig_arm64-thunderx-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc deleted file mode 100644 index 946906b67a..0000000000 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx" - -CONFIG_RTE_USE_C11_MEM_MODEL=n -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=96 -CONFIG_RTE_MAX_VFIO_GROUPS=128 - -# -# Compile PMD for octeontx sso event device -# -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y diff --git a/config/defconfig_arm64-thunderx2-linux-gcc b/config/defconfig_arm64-thunderx2-linux-gcc deleted file mode 120000 index b40a760b1d..0000000000 --- a/config/defconfig_arm64-thunderx2-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-thunderx2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc b/config/defconfig_arm64-thunderx2-linuxapp-gcc deleted file mode 100644 index af4a89c480..0000000000 --- a/config/defconfig_arm64-thunderx2-linuxapp-gcc +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Marvell International Ltd -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="thunderx2" - -CONFIG_RTE_CACHE_LINE_SIZE=64 -CONFIG_RTE_MAX_NUMA_NODES=2 -CONFIG_RTE_MAX_LCORE=256 -CONFIG_RTE_ARM_FEATURE_ATOMICS=y diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc deleted file mode 120000 index d5e8b5e550..0000000000 --- a/config/defconfig_arm64-xgene1-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_arm64-xgene1-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-xgene1-linuxapp-gcc b/config/defconfig_arm64-xgene1-linuxapp-gcc deleted file mode 100644 index fbf576c4aa..0000000000 --- a/config/defconfig_arm64-xgene1-linuxapp-gcc +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015 Cavium, Inc -# - -#include "defconfig_arm64-armv8a-linux-gcc" - -CONFIG_RTE_MACHINE="xgene1" -CONFIG_RTE_CACHE_LINE_SIZE=64 diff --git a/config/defconfig_i686-native-linux-gcc b/config/defconfig_i686-native-linux-gcc deleted file mode 120000 index 927141d5dd..0000000000 --- a/config/defconfig_i686-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_i686-native-linux-icc b/config/defconfig_i686-native-linux-icc deleted file mode 120000 index e6a466b3e3..0000000000 --- a/config/defconfig_i686-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_i686-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc deleted file mode 100644 index 61ea1606f4..0000000000 --- a/config/defconfig_i686-native-linuxapp-gcc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc deleted file mode 100644 index 7f614d3467..0000000000 --- a/config/defconfig_i686-native-linuxapp-icc +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AES-NI multi-buffer PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n - -# -# AES-NI GCM PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n - -# -# KASUMI PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_KASUMI=n - -# -# ZUC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_PMD_ZUC=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc deleted file mode 120000 index 580c92e12e..0000000000 --- a/config/defconfig_ppc_64-power8-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_ppc_64-power8-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc deleted file mode 100644 index c917c47746..0000000000 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) IBM Corporation 2014. - -#include "common_linux" - -CONFIG_RTE_MACHINE="power8" - -CONFIG_RTE_ARCH="ppc_64" -CONFIG_RTE_ARCH_PPC_64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_MAX_LCORE=1536 -CONFIG_RTE_MAX_NUMA_NODES=32 -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# Note: Power doesn't have this support -CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n - -# Note: Initially, all of the PMD drivers compilation are turned off on Power -# Will turn on them only after the successful testing on Power -CONFIG_RTE_LIBRTE_ATLANTIC_PMD=n -CONFIG_RTE_LIBRTE_IXGBE_PMD=n -CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_ENIC_PMD=n -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n -CONFIG_RTE_LIBRTE_HINIC_PMD=n -CONFIG_RTE_LIBRTE_HNS3_PMD=n -CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n -CONFIG_RTE_LIBRTE_IONIC_PMD=n diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang deleted file mode 100644 index 7204738e14..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc deleted file mode 100644 index b24e2e6d5a..0000000000 --- a/config/defconfig_x86_64-native-bsdapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_freebsd" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang deleted file mode 120000 index 76115fd5a6..0000000000 --- a/config/defconfig_x86_64-native-freebsd-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-freebsd-gcc b/config/defconfig_x86_64-native-freebsd-gcc deleted file mode 120000 index 72dd4b44be..0000000000 --- a/config/defconfig_x86_64-native-freebsd-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-bsdapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-clang b/config/defconfig_x86_64-native-linux-clang deleted file mode 120000 index 3bcf89d6a4..0000000000 --- a/config/defconfig_x86_64-native-linux-clang +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-gcc b/config/defconfig_x86_64-native-linux-gcc deleted file mode 120000 index d707965941..0000000000 --- a/config/defconfig_x86_64-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-icc b/config/defconfig_x86_64-native-linux-icc deleted file mode 120000 index a36b47131a..0000000000 --- a/config/defconfig_x86_64-native-linux-icc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_64-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang deleted file mode 100644 index 7508c0f2da..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-clang +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="clang" -CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc deleted file mode 100644 index db67066a57..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc deleted file mode 100644 index 8aa7af7e20..0000000000 --- a/config/defconfig_x86_64-native-linuxapp-icc +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y -CONFIG_RTE_ARCH_X86=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# Solarflare PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# HINIC PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD build is not supported using icc toolchain -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc deleted file mode 120000 index 7ea00cecb3..0000000000 --- a/config/defconfig_x86_x32-native-linux-gcc +++ /dev/null @@ -1 +0,0 @@ -defconfig_x86_x32-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc deleted file mode 100644 index c188f4331c..0000000000 --- a/config/defconfig_x86_x32-native-linuxapp-gcc +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -#include "common_linux" - -CONFIG_RTE_MACHINE="native" - -CONFIG_RTE_ARCH="x86_x32" -CONFIG_RTE_ARCH_X86_X32=y -CONFIG_RTE_ARCH_X86=y - -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n - -# -# Solarflare PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n - -# -# AVP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_AVP_PMD=n - -# -# NFP PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_NFP_PMD=n - -# 32-bit doesn't break up memory in lists, but does have VA allocation limit -CONFIG_RTE_MAX_MEM_MB=2048 - -# -# HINIC PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HINIC_PMD=n - -# -# HNS3 PMD is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_HNS3_PMD=n diff --git a/config/rte_config.h b/config/rte_config.h index 9bb915347c..0bae630fd9 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -8,10 +8,6 @@ * Header file containing DPDK compilation parameters. Also include the * meson-generated header file containing the detected parameters that * are variable across builds or build environments. - * - * NOTE: This file is only used for meson+ninja builds. For builds done - * using make/gmake, the rte_config.h file is autogenerated from the - * defconfig_* files in the config directory. */ #ifndef _RTE_CONFIG_H_ #define _RTE_CONFIG_H_ diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index 276fff647b..8fa01ad177 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -19,8 +19,8 @@ arm_64=true print_usage() { echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]" - echo "Valid configs are:" - make showconfigs | sed 's,^,\t,' + echo "Examples of valid configs are: " + echo "x86_64-bsd, arm64-linux, ppc_64-linux" } # Move to the root of the git tree @@ -125,18 +125,7 @@ ppc_64_sources() find_sources "$source_dirs" '*altivec*.[chS]' } -check_valid_target() -{ - if [ ! -f "config/defconfig_$1" ] ; then - echo "Invalid config: $1" - print_usage - exit 0 - fi -} - if [ -n "$2" ]; then - check_valid_target $2 - echo $2 | grep -q "linux" || linux=false echo $2 | grep -q "bsd" || bsd=false echo $2 | grep -q "x86_64-" || x86_64=false diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 07e072e13f..c15ed3bade 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -34,7 +34,6 @@ * This code tries to determine if the PCI device is bound to VFIO driver, * and initialize it (map BARs, set up interrupts) if that's the case. * - * This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y". */ #ifdef VFIO_PRESENT diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index fe7f9200c1..60b33d20a1 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -3438,7 +3438,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev) } #ifndef RTE_LIBRTE_I40E_INC_VECTOR -/* Stubs needed for linkage when CONFIG_RTE_LIBRTE_I40E_INC_VECTOR is set to 'n' */ int i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev) { diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 9e0ee052b3..6ad7e31170 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -970,7 +970,7 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); * If cache_size is non-zero, the rte_mempool library will try to * limit the accesses to the common lockless pool, by maintaining a * per-lcore object cache. This argument must be lower or equal to - * CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose + * RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose * cache_size to have "n modulo cache_size == 0": if this is * not the case, some elements will always stay in the pool and will * never be used. The access to the per-lcore table is of course diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h index 69dc51746c..938b398fc0 100644 --- a/lib/librte_ring/rte_ring_elem.h +++ b/lib/librte_ring/rte_ring_elem.h @@ -373,8 +373,7 @@ __rte_ring_dequeue_elems(struct rte_ring *r, uint32_t cons_head, * (powerpc/arm). * There are 2 choices for the users * 1.use rmb() memory barrier - * 2.use one-direction load_acquire/store_release barrier,defined by - * CONFIG_RTE_USE_C11_MEM_MODEL=y + * 2.use one-direction load_acquire/store_release barrier * It depends on performance test results. * By default, move common functions to rte_ring_generic.h */ -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 14/31] devtools: remove legacy flags from includes check 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (12 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 13/31] config: remove default configs used " Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 15/31] app: remove references to make-based config Thomas Monjalon ` (18 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported, the test script for make builds is no longer required. Uses of make in other tool scripts are replaced. Signed-off-by: Ciara Power <ciara.power@intel.com> --- devtools/check-includes.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh index 749b9b26d2..940cf0eb2a 100755 --- a/devtools/check-includes.sh +++ b/devtools/check-includes.sh @@ -17,8 +17,7 @@ # # SUMMARY=1 is the same as -s. # -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and -# EXTRA_CXXFLAGS are taken into account. +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account. # # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict # C/C++ compilation flags. @@ -130,16 +129,16 @@ trap 'rm -f "$temp_cc" "$temp_cxx"' EXIT compile_cc () { ${CC} -I"$include_dir" \ - ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} ${EXTRA_CPPFLAGS} \ - ${PEDANTIC_CFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ + ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} \ + ${PEDANTIC_CFLAGS} ${CFLAGS} \ -c -o /dev/null "${temp_cc}" } compile_cxx () { ${CXX} -I"$include_dir" \ - ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} ${EXTRA_CPPFLAGS} \ - ${PEDANTIC_CXXFLAGS} ${CXXFLAGS} ${EXTRA_CXXFLAGS} \ + ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} \ + ${PEDANTIC_CXXFLAGS} ${CXXFLAGS} \ -c -o /dev/null "${temp_cxx}" } -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 15/31] app: remove references to make-based config 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (13 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 14/31] devtools: remove legacy flags from includes check Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-14 17:11 ` Laatz, Kevin 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 16/31] doc: remove references to make from Linux guide Thomas Monjalon ` (17 subsequent siblings) 32 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options are no longer in use. Signed-off-by: Ciara Power <ciara.power@intel.com> --- app/test-bbdev/test-bbdev.py | 11 +---- app/test/test_cryptodev.c | 89 +++++++++------------------------- app/test/test_cryptodev_asym.c | 18 ++----- 3 files changed, 28 insertions(+), 90 deletions(-) diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index 5ae2dc6c49..bfd8a4dcc8 100755 --- a/app/test-bbdev/test-bbdev.py +++ b/app/test-bbdev/test-bbdev.py @@ -20,15 +20,8 @@ def kill(process): print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) print("Please use Python 3 instead", file=sys.stderr) -if "RTE_SDK" in os.environ: - dpdk_path = os.environ["RTE_SDK"] -else: - dpdk_path = "../.." - -if "RTE_TARGET" in os.environ: - dpdk_target = os.environ["RTE_TARGET"] -else: - dpdk_target = "x86_64-native-linux-gcc" +dpdk_path = "../.." +dpdk_target = "build" parser = argparse.ArgumentParser( description='BBdev Unit Test Application', diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 70bf6fe2c1..153d001194 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both " - "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM " - "are enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n"); return TEST_FAILED; } @@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12814,9 +12800,7 @@ test_cryptodev_null(void) RTE_STR(CRYPTODEV_NAME_NULL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NULL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NULL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12830,9 +12814,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12846,9 +12828,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12862,9 +12842,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_ZUC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12878,9 +12856,7 @@ test_cryptodev_armv8(void) RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12894,9 +12870,7 @@ test_cryptodev_mrvl(void) RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12912,16 +12886,13 @@ test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n"); return TEST_SKIPPED; } if (rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) { - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be" - " enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_scheduler_testsuite); @@ -12938,9 +12909,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12954,9 +12923,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12970,9 +12937,7 @@ test_cryptodev_ccp(void) RTE_STR(CRYPTODEV_NAME_CCP_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CCP is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CCP PMD must be loaded.\n"); return TEST_FAILED; } @@ -12985,10 +12950,7 @@ test_cryptodev_octeontx(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13000,10 +12962,7 @@ test_cryptodev_octeontx2(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13016,9 +12975,7 @@ test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded.\n"); return TEST_FAILED; } @@ -13032,9 +12989,7 @@ test_cryptodev_nitrox(void) RTE_STR(CRYPTODEV_NAME_NITROX_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NITROX PMD must be loaded.\n"); return TEST_FAILED; } diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index dc62ed7bf3..85cd076059 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -2336,9 +2336,7 @@ test_cryptodev_openssl_asym(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_FAILED; } @@ -2352,9 +2350,7 @@ test_cryptodev_qat_asym(void) RTE_STR(CRYPTODEV_NAME_QAT_ASYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_QAT_ASYM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_FAILED; } @@ -2367,10 +2363,7 @@ test_cryptodev_octeontx_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); @@ -2382,10 +2375,7 @@ test_cryptodev_octeontx2_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n"); return TEST_FAILED; } -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 15/31] app: remove references to make-based config 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 15/31] app: remove references to make-based config Thomas Monjalon @ 2020-09-14 17:11 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-14 17:11 UTC (permalink / raw) To: Thomas Monjalon, dev; +Cc: david.marchand, bruce.richardson, ciara.power On 07/09/2020 23:06, Thomas Monjalon wrote: > From: Ciara Power <ciara.power@intel.com> > > Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options > are no longer in use. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > app/test-bbdev/test-bbdev.py | 11 +---- > app/test/test_cryptodev.c | 89 +++++++++------------------------- > app/test/test_cryptodev_asym.c | 18 ++----- > 3 files changed, 28 insertions(+), 90 deletions(-) [...] Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 16/31] doc: remove references to make from Linux guide 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (14 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 15/31] app: remove references to make-based config Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 17/31] doc: remove references to make from FreeBSD guide Thomas Monjalon ` (16 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> --- doc/guides/linux_gsg/build_dpdk.rst | 16 +++++++++++----- doc/guides/linux_gsg/build_sample_apps.rst | 18 +++--------------- doc/guides/linux_gsg/enable_func.rst | 13 +++++-------- doc/guides/linux_gsg/linux_drivers.rst | 18 +++++++++++------- doc/guides/linux_gsg/sys_reqs.rst | 6 +----- 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index a895e1b0f4..85d04520bf 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -76,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` to update its cache to take distributions, `/usr/local/lib` and `/usr/local/lib64` should be added to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. +.. _adjusting_build_options: + Adjusting Build Options ~~~~~~~~~~~~~~~~~~~~~~~ @@ -112,6 +114,9 @@ dependencies are met on the current system are built. When `-Dexamples=all` is set as a meson option, meson will check each example application to see if it can be built, and add all which can be built to the list of tasks in the ninja build configuration file. +.. _building_app_using_installed_dpdk: + + Building Applications Using Installed DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -135,11 +140,12 @@ and the sources for that build are stored in ``$(SRCS-y)``. .. note:: - Unlike with the older make build system, the meson system is not - designed to be used directly from a build directory. Instead it is - recommended that it be installed either system-wide or to a known - location in the user's home directory. The install location can be set - using the `--prefix` meson option (default: `/usr/local`). + Unlike with the make build system present used in older DPDK releases, + the meson system is not designed to be used directly from a build + directory. Instead it is recommended that it be installed either + system-wide or to a known location in the user's home directory. + The install location can be set using the `--prefix` meson option + (default: `/usr/local`). an equivalent build recipe for a simple DPDK application using meson as a build system is shown below: diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2882883f95..f4bf0e71e5 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -Compiling and Running Sample Applications +Running Sample Applications ========================================= The chapter describes how to compile and run applications in an DPDK environment. @@ -119,7 +119,7 @@ Copy the DPDK application binary to your target, then run the application as fol (assuming the platform has four memory channels per processor socket, and that cores 0-3 are present and are to be used for running the application):: - ./helloworld -l 0-3 -n 4 + ./dpdk-helloworld -l 0-3 -n 4 .. note:: @@ -183,19 +183,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization Additional Sample Applications ------------------------------ -Additional sample applications are included in the ${RTE_SDK}/examples directory. +Additional sample applications are included in the DPDK examples directory. These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. In addition, see the *DPDK Sample Applications User Guide* for a description of the application, specific instructions on compilation and execution and some explanation of the code. - -Additional Test Applications ----------------------------- - -In addition, there are two other applications that are built when the libraries are created. -The source files for these are in the DPDK/app directory and are called test and testpmd. -Once the libraries are created, they can be found in the build/app directory. - -* The test application provides a variety of specific tests for the various functions in the DPDK. - -* The testpmd application provides a number of different packet throughput tests and - examples of features such as how to use the Flow Director found in the Intel® 82599 10 Gigabit Ethernet Controller. diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index b2bda80bb7..08f55d8543 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -41,7 +41,9 @@ Enabling HPET in the DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, HPET support is disabled in the DPDK build configuration files. -To use HPET, the ``CONFIG_RTE_LIBEAL_USE_HPET`` setting should be changed to ``y``, which will enable the HPET settings at compile time. +To use HPET, use the following meson build option which will enable the HPET settings at compile time:: + + meson configure -Duse_hpet=true For an application to use the ``rte_get_hpet_cycles()`` and ``rte_get_hpet_hz()`` API calls, and optionally to make the HPET the default time source for the rte_timer library, @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module ---------------------------------- To run the DPDK Kernel NIC Interface (KNI) sample application, an extra kernel module (the kni module) must be loaded into the running kernel. -The module is found in the kmod sub-directory of the DPDK target directory. -Similar to the loading of the ``igb_uio`` module, this module should be loaded using the insmod command as shown below -(assuming that the current directory is the DPDK target directory): - -.. code-block:: console - - insmod kmod/rte_kni.ko +The module is found in the kernel/linux sub-directory of the DPDK build directory. +This can be enabled in the same way as the ``igb_uio`` module, please see :ref:`load_uio` for details. .. note:: diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst index 185074013a..349be1c906 100644 --- a/doc/guides/linux_gsg/linux_drivers.rst +++ b/doc/guides/linux_gsg/linux_drivers.rst @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in order to work properly. Depends on the PMD being used, a corresponding kernel driver should be load and bind to the network ports. +.. _load_uio: + + UIO --- @@ -28,19 +31,20 @@ can provide the uio capability. This module can be loaded using the command: ``uio_pci_generic`` module doesn't support the creation of virtual functions. As an alternative to the ``uio_pci_generic``, the DPDK also includes the igb_uio -module which can be found in the kmod subdirectory referred to above. It can +module which can be found in the kernel/linux subdirectory referred to above. It can be loaded as shown below: .. code-block:: console sudo modprobe uio - sudo insmod kmod/igb_uio.ko + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko .. note:: - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. - It is planned to move ``igb_uio`` module to a different git repository. + Building DPDK Linux kernel modules is disabled by default starting from DPDK v20.02. + To enable them again, the config option "enable_kmods" needs to be set in the meson + build configuration. See :ref:`adjusting_build_options` for details on how to set/clear + build options. It is planned to move ``igb_uio`` module to a different git repository. .. note:: @@ -104,11 +108,11 @@ parameter ``--vfio-vf-token``. 3. echo 2 > /sys/bus/pci/devices/0000:86:00.0/sriov_numvfs 4. Start the PF: - ./x86_64-native-linux-gcc/app/testpmd -l 22-25 -n 4 -w 86:00.0 \ + ./<build_dir>/app/dpdk-testpmd -l 22-25 -n 4 -w 86:00.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=pf -- -i 5. Start the VF: - ./x86_64-native-linux-gcc/app/testpmd -l 26-29 -n 4 -w 86:02.0 \ + ./<build_dir>/app/dpdk-testpmd -l 26-29 -n 4 -w 86:02.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=vf0 -- -i Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index 6b9f573fce..625fb58066 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -43,11 +43,7 @@ Compilation of the DPDK * For Ubuntu/Debian systems these can be installed using ``apt install build-essential`` -* Python, recommended version 3.5+. - - * Python v3.5+ is needed to build DPDK using meson and ninja - - * Python 2.7+ or 3.2+, to use various helper scripts included in the DPDK package. +* Python, v3.5 or later. * Meson (version 0.47.1+) and ninja -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 17/31] doc: remove references to make from FreeBSD guide 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (15 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 16/31] doc: remove references to make from Linux guide Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 18/31] doc: remove references to make from howto guides Thomas Monjalon ` (15 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index e31c966b98..1e5a8cfe9e 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -122,7 +122,7 @@ up time. This can be achieved by placing lines similar to the following into An error such as:: - kldload: can't load ./x86_64-native-freebsd-gcc/kmod/contigmem.ko: + kldload: can't load ./<build_dir>/kernel/freebsd/contigmem.ko: Exec format error is generally attributed to not having enough contiguous memory -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 18/31] doc: remove references to make from howto guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (16 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 17/31] doc: remove references to make from FreeBSD guide Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-14 16:53 ` Laatz, Kevin 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 19/31] doc: remove references to make from prog guide Thomas Monjalon ` (14 subsequent siblings) 32 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +-- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +-- doc/guides/howto/packet_capture_framework.rst | 21 +++------------ doc/guides/howto/pvp_reference_benchmark.rst | 27 +++++-------------- doc/guides/howto/vfd.rst | 4 +-- .../virtio_user_for_container_networking.rst | 2 +- 6 files changed, 16 insertions(+), 46 deletions(-) diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst index 07563b3e24..02ba1cdf5d 100644 --- a/doc/guides/howto/lm_bond_virtio_sriov.rst +++ b/doc/guides/howto/lm_bond_virtio_sriov.rst @@ -591,7 +591,7 @@ Set up DPDK in the Virtual Machine rmmod virtio-pci ixgbevf modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -613,7 +613,7 @@ Run testpmd in the Virtual Machine. # use for bonding of virtio and vf tests in VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-3 -n 4 --socket-mem 350 -- --i --port-topology=chained .. _lm_bond_virtio_sriov_switch_conf: diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst index ecb7832906..330ff5a9c8 100644 --- a/doc/guides/howto/lm_virtio_vhost_user.rst +++ b/doc/guides/howto/lm_virtio_vhost_user.rst @@ -421,7 +421,7 @@ setup_dpdk_virtio_in_vm.sh rmmod virtio-pci modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -437,5 +437,5 @@ run_testpmd_in_vm.sh # Run testpmd for use with vhost_user sample app. # test system has 8 cpus (0-7), use cpus 2-7 for VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-5 -n 4 --socket-mem 350 -- --burst=64 --i diff --git a/doc/guides/howto/packet_capture_framework.rst b/doc/guides/howto/packet_capture_framework.rst index 946a21c8ed..d457989607 100644 --- a/doc/guides/howto/packet_capture_framework.rst +++ b/doc/guides/howto/packet_capture_framework.rst @@ -52,11 +52,7 @@ Some things to note: initialization code. Refer to the ``app/test-pmd/testpmd.c`` code and look for ``pdump`` keyword to see how this is done. -* The ``dpdk-pdump`` tool depends on the libpcap based PMD which is disabled - by default in the build configuration files, owing to an external dependency - on the libpcap development files. Once the libpcap development files are - installed, the libpcap based PMD can be enabled by setting - ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` and recompiling the DPDK. +* The ``dpdk-pdump`` tool depends on the libpcap based PMD. Test Environment @@ -73,17 +69,6 @@ for packet capturing on the DPDK port in Packet capturing on a DPDK port using the dpdk-pdump tool. -Configuration -------------- - -Modify the DPDK primary application to initialize the packet capture framework -as mentioned in the above notes and enable the following config options and -build DPDK:: - - CONFIG_RTE_LIBRTE_PMD_PCAP=y - CONFIG_RTE_LIBRTE_PDUMP=y - - Running the Application ----------------------- @@ -93,11 +78,11 @@ inspect them using ``tcpdump``. #. Launch testpmd as the primary application:: - sudo ./app/testpmd -c 0xf0 -n 4 -- -i --port-topology=chained + sudo ./<build_dir>/app/dpdk-testpmd -c 0xf0 -n 4 -- -i --port-topology=chained #. Launch the pdump tool as follows:: - sudo ./build/app/dpdk-pdump -- \ + sudo ./<build_dir>/app/dpdk-pdump -- \ --pdump 'port=0,queue=*,rx-dev=/tmp/capture.pcap' #. Send traffic to dpdk_port0 from traffic generator. diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst index 64b1f4d8ec..1d4a4b0232 100644 --- a/doc/guides/howto/pvp_reference_benchmark.rst +++ b/doc/guides/howto/pvp_reference_benchmark.rst @@ -99,14 +99,7 @@ Build Qemu: DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -117,7 +110,7 @@ Testpmd launch .. code-block:: console modprobe vfio-pci - $RTE_SDK/install/sbin/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 + ./dpdk/usertools/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 .. Note:: @@ -129,7 +122,7 @@ Testpmd launch .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ --vdev 'net_vhost0,iface=/tmp/vhost-user1' \ --vdev 'net_vhost1,iface=/tmp/vhost-user2' -- \ --portmask=f -i --rxq=1 --txq=1 \ @@ -309,18 +302,10 @@ Guest tuning echo "obase=16;$(( 0x$(cat $i) & ~$clear_mask ))" | bc > $i done - DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -340,13 +325,13 @@ Bind the virtio-net devices to DPDK: .. code-block:: console - $RTE_SDK/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 + ./dpdk/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 Start testpmd: .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ --proc-type auto --file-prefix pg -- \ --portmask=3 --forward-mode=macswap --port-topology=chained \ --disable-rss -i --rxq=1 --txq=1 \ diff --git a/doc/guides/howto/vfd.rst b/doc/guides/howto/vfd.rst index 0ec0a0478d..5a62e6ff5a 100644 --- a/doc/guides/howto/vfd.rst +++ b/doc/guides/howto/vfd.rst @@ -83,7 +83,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the PF in the host:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 #. Bind the VF port to ``igb_uio`` in the VM:: @@ -91,7 +91,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the VF in the VM:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 Common functions of IXGBE and I40E diff --git a/doc/guides/howto/virtio_user_for_container_networking.rst b/doc/guides/howto/virtio_user_for_container_networking.rst index 412b29664b..5eab360a1c 100644 --- a/doc/guides/howto/virtio_user_for_container_networking.rst +++ b/doc/guides/howto/virtio_user_for_container_networking.rst @@ -64,7 +64,7 @@ some minor changes. FROM ubuntu:latest WORKDIR /usr/src/dpdk COPY . /usr/src/dpdk - ENV PATH "$PATH:/usr/src/dpdk/x86_64-native-linux-gcc/app/" + ENV PATH "$PATH:/usr/src/dpdk/<build_dir>/app/" EOT #. Build a Docker image. -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 18/31] doc: remove references to make from howto guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 18/31] doc: remove references to make from howto guides Thomas Monjalon @ 2020-09-14 16:53 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-14 16:53 UTC (permalink / raw) To: Thomas Monjalon, dev; +Cc: david.marchand, bruce.richardson, ciara.power On 07/09/2020 23:06, Thomas Monjalon wrote: > From: Ciara Power <ciara.power@intel.com> > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +-- > doc/guides/howto/lm_virtio_vhost_user.rst | 4 +-- > doc/guides/howto/packet_capture_framework.rst | 21 +++------------ > doc/guides/howto/pvp_reference_benchmark.rst | 27 +++++-------------- > doc/guides/howto/vfd.rst | 4 +-- > .../virtio_user_for_container_networking.rst | 2 +- > 6 files changed, 16 insertions(+), 46 deletions(-) > [...] Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 19/31] doc: remove references to make from prog guide 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (17 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 18/31] doc: remove references to make from howto guides Thomas Monjalon @ 2020-09-07 22:06 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 20/31] doc: remove references to make from platforms guides Thomas Monjalon ` (13 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:06 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/prog_guide/env_abstraction_layer.rst | 17 ++++++----------- doc/guides/prog_guide/graph_lib.rst | 6 ++---- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 ----- doc/guides/prog_guide/kernel_nic_interface.rst | 14 +++++++------- .../link_bonding_poll_mode_drv_lib.rst | 15 ++++++++------- doc/guides/prog_guide/lto.rst | 12 +----------- doc/guides/prog_guide/mbuf_lib.rst | 4 ++-- doc/guides/prog_guide/mempool_lib.rst | 7 +++---- doc/guides/prog_guide/profile_app.rst | 17 +++-------------- doc/guides/prog_guide/qos_framework.rst | 10 +--------- doc/guides/prog_guide/rcu_lib.rst | 7 +++---- doc/guides/prog_guide/trace_lib.rst | 3 +-- .../prog_guide/writing_efficient_code.rst | 3 +-- 13 files changed, 38 insertions(+), 82 deletions(-) diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index f64ae953d1..936c885081 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -201,16 +201,16 @@ each segment is strictly one physical page. It is possible to change the amount of virtual memory being preallocated at startup by editing the following config variables: -* ``CONFIG_RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have -* ``CONFIG_RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each +* ``RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have +* ``RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each segment list can address -* ``CONFIG_RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can +* ``RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can have -* ``CONFIG_RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type +* ``RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type can have (where "type" is defined as "page size + NUMA node" combination) -* ``CONFIG_RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each +* ``RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each memory type can address -* ``CONFIG_RTE_MAX_MEM_MB`` places a global maximum on the amount of memory +* ``RTE_MAX_MEM_MB`` places a global maximum on the amount of memory DPDK can reserve Normally, these options do not need to be changed. @@ -715,11 +715,6 @@ However, they can be used in configuration code. Refer to the rte_malloc() function description in the *DPDK API Reference* manual for more information. -Cookies -~~~~~~~ - -When CONFIG_RTE_MALLOC_DEBUG is enabled, the allocated memory contains -overwrite protection fields to help identify buffer overflows. Alignment and NUMA Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 669d77c740..c922d10f3d 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -45,13 +45,11 @@ Performance tuning parameters ----------------------------- - Test with various burst size values (256, 128, 64, 32) using - CONFIG_RTE_GRAPH_BURST_SIZE config option. + RTE_GRAPH_BURST_SIZE config option. The testing shows, on x86 and arm64 servers, The sweet spot is 256 burst size. While on arm64 embedded SoCs, it is either 64 or 128. -- Disable node statistics (using ``CONFIG_RTE_LIBRTE_GRAPH_STATS`` config option) +- Disable node statistics (using ``RTE_LIBRTE_GRAPH_STATS`` config option) if not needed. -- Use arm64 optimized memory copy for arm64 architecture by - selecting ``CONFIG_RTE_ARCH_ARM64_MEMCPY``. Programming model ----------------- diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst index 6ac1bba649..314d4adbb8 100644 --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst @@ -103,8 +103,3 @@ Debug logging and Statistics Collection The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. This macro is not enabled by default. - -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. -This macro is disabled by default. -Note that while logging contains a lot of detailed information, -it slows down packet processing and might cause the loss of a lot of packets. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 32d09ccf82..de5d75bd4c 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -65,7 +65,7 @@ disabled, and the default carrier state of KNI interfaces is set to *off*. .. code-block:: console - # insmod kmod/rte_kni.ko + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko .. _kni_loopback_mode: @@ -77,14 +77,14 @@ by specifying the ``lo_mode`` parameter: .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo The ``lo_mode_fifo`` loopback option will loop back ring enqueue/dequeue operations in kernel space. .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb The ``lo_mode_fifo_skb`` loopback option will loop back ring enqueue/dequeue operations and sk buffer copies in kernel space. @@ -105,7 +105,7 @@ Single kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=single + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=single This mode will create only one kernel thread for all KNI interfaces to receive data on the kernel side. By default, this kernel thread is not @@ -122,7 +122,7 @@ kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=multiple + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple This mode will create a separate kernel thread for each KNI interface to receive data on the kernel side. The core affinity of each ``kni_thread`` @@ -163,13 +163,13 @@ To set the default carrier state to *on*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=on + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=on To set the default carrier state to *off*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=off + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=off If the ``carrier`` parameter is not specified, the default carrier state of KNI interfaces will be set to *off*. diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst index 2459fd243e..244dca56c4 100644 --- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst +++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst @@ -28,8 +28,9 @@ bonded device and its slave devices. .. note:: The Link Bonding PMD Library is enabled by default in the build - configuration files, the library can be disabled by setting - ``CONFIG_RTE_LIBRTE_PMD_BOND=n`` and recompiling the DPDK. + configuration, the library can be disabled using the meson option + "-Ddisable_drivers=net/bond". + Link Bonding Modes Overview --------------------------- @@ -377,7 +378,7 @@ Device names and bonding options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' Link Bonding EAL Options ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -477,22 +478,22 @@ Create a bonded device in round robin mode with two slaves specified by their PC .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained Create a bonded device in round robin mode with two slaves specified by their PCI address and an overriding MAC address: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained Create a bonded device in active backup mode with two slaves specified, and a primary slave specified by their PCI addresses: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained Create a bonded device in balance mode with two slaves specified by their PCI addresses, and a transmission policy of layer 3 + 4 forwarding: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index 277a6f1090..f79c449598 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -26,17 +26,7 @@ need to explicitly initialize variable in order to silence the compiler. Please note that turning LTO on causes considerable extension of build time. -When using make based build, link time optimization can be enabled for -the whole DPDK by setting: - -.. code-block:: console - - CONFIG_RTE_ENABLE_LTO=y - -in config file. - -For the meson based build it can be enabled by setting meson built-in -'b_lto' option: +Link time optimization can be enabled by setting meson built-in 'b_lto' option: .. code-block:: console diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index c3dbfb9221..2f190b40e4 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), -the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). +In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, +bad type, and so on). Use Cases --------- diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index e3e1f940be..f0bdcd3be1 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -17,14 +17,13 @@ This library is used by the :ref:`Mbuf Library <Mbuf_Library>`. Cookies ------- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. +In debug mode, cookies are added at the beginning and end of allocated blocks. The allocated objects then contain overwrite protection fields to help debugging buffer overflows. Stats ----- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), -statistics about get from/put in the pool are stored in the mempool structure. +In debug mode, statistics about get from/put in the pool are stored in the mempool structure. Statistics are per-lcore to avoid concurrent access to statistics counters. Memory Alignment Constraints on x86 architecture @@ -90,7 +89,7 @@ the speed at which a core can access its own cache for a specific memory pool wi The cache is composed of a small, per-core table of pointers and its length (used as a stack). This internal cache can be enabled or disabled at creation of the pool. -The maximum size of the cache is static and is defined at compilation time (CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE). +The maximum size of the cache is static and is defined at compilation time (RTE_MEMPOOL_CACHE_MAX_SIZE). :numref:`figure_mempool` shows a cache in operation. diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index e5d0e9079e..7093681983 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -33,14 +33,6 @@ Refer to the for details about application profiling. -Profiling with VTune -~~~~~~~~~~~~~~~~~~~~ - -To allow VTune attaching to the DPDK application, reconfigure and recompile -the DPDK with ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` and -``CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE`` enabled. - - Profiling on ARM64 ------------------ @@ -76,8 +68,7 @@ cycle counter for user space access by configuring the PMU from the privileged mode (kernel space). By default the ``rte_rdtsc()`` implementation uses a portable ``cntvct_el0`` -scheme. Application can choose the PMU based implementation with -``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``. +scheme. The example below shows the steps to configure the PMU based cycle counter on an ARMv8 machine. @@ -88,10 +79,8 @@ an ARMv8 machine. cd armv8_pmu_cycle_counter_el0 make sudo insmod pmu_el0_cycle_counter.ko - cd $DPDK_DIR - make config T=arm64-armv8a-linux-gcc - echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config - make + +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling DPDK with meson. .. warning:: diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst index a159709450..4e4ea33ccb 100644 --- a/doc/guides/prog_guide/qos_framework.rst +++ b/doc/guides/prog_guide/qos_framework.rst @@ -1525,15 +1525,7 @@ Integration with the DPDK QoS Scheduler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ RED functionality in the DPDK QoS scheduler is disabled by default. -To enable it, use the DPDK configuration parameter: - -:: - - CONFIG_RTE_SCHED_RED=y - -This parameter must be set to y. -The parameter is found in the build configuration files in the DPDK/config directory, -for example, DPDK/config/common_linux. +The parameter is found in the build configuration files in the DPDK/config directory. RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure that is passed to the scheduler on initialization. RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) diff --git a/doc/guides/prog_guide/rcu_lib.rst b/doc/guides/prog_guide/rcu_lib.rst index d142d0c79d..d0aef3bc16 100644 --- a/doc/guides/prog_guide/rcu_lib.rst +++ b/doc/guides/prog_guide/rcu_lib.rst @@ -186,10 +186,9 @@ they entered a quiescent state. This API checks if a writer has triggered a quiescent state query and update the state accordingly. The ``rte_rcu_qsbr_lock()`` and ``rte_rcu_qsbr_unlock()`` are empty functions. -However, when ``CONFIG_RTE_LIBRTE_RCU_DEBUG`` is enabled, these APIs aid -in debugging issues. One can mark the access to shared data structures on the -reader side using these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if -all the locks are unlocked. +However, these APIs can aid in debugging issues. One can mark the access to +shared data structures on the reader side using these APIs. The +``rte_rcu_qsbr_quiescent()`` will check if all the locks are unlocked. Resource reclamation framework for DPDK --------------------------------------- diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 9bbfd165d8..fbadf9fde9 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -135,8 +135,7 @@ In order to avoid performance impact in fast path code, the library introduced the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``. ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using -``CONFIG_RTE_ENABLE_TRACE_FP`` configuration parameter. -The ``enable_trace_fp`` option shall be used for the same for meson build. +the ``enable_trace_fp`` option for meson build. Event record mode ----------------- diff --git a/doc/guides/prog_guide/writing_efficient_code.rst b/doc/guides/prog_guide/writing_efficient_code.rst index 2639ef7bf6..db2f1ddbc2 100644 --- a/doc/guides/prog_guide/writing_efficient_code.rst +++ b/doc/guides/prog_guide/writing_efficient_code.rst @@ -258,8 +258,7 @@ For instance: Setting the Target CPU Type --------------------------- -The DPDK supports CPU microarchitecture-specific optimizations by means of CONFIG_RTE_MACHINE option -in the DPDK configuration file. +The DPDK supports CPU microarchitecture-specific optimizations by means of RTE_MACHINE option. The degree of optimization depends on the compiler's ability to optimize for a specific microarchitecture, therefore it is preferable to use the latest compiler versions whenever possible. -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 20/31] doc: remove references to make from platforms guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (18 preceding siblings ...) 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 19/31] doc: remove references to make from prog guide Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-14 16:52 ` Laatz, Kevin 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 21/31] doc: remove references to make from mempool guide Thomas Monjalon ` (12 subsequent siblings) 32 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/platform/bluefield.rst | 22 --------------------- doc/guides/platform/octeontx.rst | 33 +------------------------------ doc/guides/platform/octeontx2.rst | 32 ------------------------------ 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..9c20ce437d 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. The above steps would rebuild the modules and the required intermediate binaries. Once the target is ready for native compilation, the OCTEON TX platform -drivers can be compiled with the following steps, +drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details. -.. code-block:: console - - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: The above steps will prepare build system with numa additions. Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" - If NUMA support is not required, it can be disabled as explained in :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. -Following steps could be used in that case. - -.. code-block:: console - - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- - - SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 13255eec5c..232f628366 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -498,27 +498,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -529,17 +508,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 20/31] doc: remove references to make from platforms guides 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 20/31] doc: remove references to make from platforms guides Thomas Monjalon @ 2020-09-14 16:52 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-14 16:52 UTC (permalink / raw) To: Thomas Monjalon, dev; +Cc: david.marchand, bruce.richardson, ciara.power On 07/09/2020 23:07, Thomas Monjalon wrote: > From: Ciara Power <ciara.power@intel.com> > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/platform/bluefield.rst | 22 --------------------- > doc/guides/platform/octeontx.rst | 33 +------------------------------ > doc/guides/platform/octeontx2.rst | 32 ------------------------------ > 3 files changed, 1 insertion(+), 86 deletions(-) > [...] Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 21/31] doc: remove references to make from mempool guide 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (19 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 20/31] doc: remove references to make from platforms guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-14 16:52 ` Laatz, Kevin 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 22/31] doc: remove references to make from NICs guides Thomas Monjalon ` (11 subsequent siblings) 32 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/mempool/octeontx.rst | 28 +++------------------------- doc/guides/mempool/octeontx2.rst | 10 +--------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..33c40d5b17 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -30,33 +30,11 @@ Prerequisites See :doc: `../platform/octeontx.rst` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) - - Set default mempool ops to octeontx_fpavf. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. Driver Compilation -~~~~~~~~~~~~~~~~~~ +------------------ -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc +See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK. Initialization @@ -70,5 +48,5 @@ Example: .. code-block:: console - ./build/app/test -c 0xf --base-virtaddr=0x100000000000 \ + ./<build_dir>/app/test/dpdk-test -c 0xf --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..53f09a52db 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -97,4 +89,4 @@ Standalone mempool device Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device:: - echo "mempool_autotest" | build/app/test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" + echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 21/31] doc: remove references to make from mempool guide 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 21/31] doc: remove references to make from mempool guide Thomas Monjalon @ 2020-09-14 16:52 ` Laatz, Kevin 0 siblings, 0 replies; 300+ messages in thread From: Laatz, Kevin @ 2020-09-14 16:52 UTC (permalink / raw) To: Thomas Monjalon, dev; +Cc: david.marchand, bruce.richardson, ciara.power On 07/09/2020 23:07, Thomas Monjalon wrote: > From: Ciara Power <ciara.power@intel.com> > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > doc/guides/mempool/octeontx.rst | 28 +++------------------------- > doc/guides/mempool/octeontx2.rst | 10 +--------- > 2 files changed, 4 insertions(+), 34 deletions(-) > [...] Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 22/31] doc: remove references to make from NICs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (20 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 21/31] doc: remove references to make from mempool guide Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 23/31] doc: remove references to make from vdpadevs guides Thomas Monjalon ` (10 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> --- doc/guides/nics/ark.rst | 26 ------------- doc/guides/nics/atlantic.rst | 4 -- doc/guides/nics/axgbe.rst | 15 -------- doc/guides/nics/bnx2x.rst | 27 ------------- doc/guides/nics/bnxt.rst | 5 +-- doc/guides/nics/build_and_test.rst | 8 +++- doc/guides/nics/cxgbe.rst | 36 +++++------------ doc/guides/nics/dpaa.rst | 27 +------------ doc/guides/nics/dpaa2.rst | 26 +------------ doc/guides/nics/ena.rst | 16 -------- doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 ----- doc/guides/nics/fail_safe.rst | 20 ++-------- doc/guides/nics/features.rst | 9 ----- doc/guides/nics/fm10k.rst | 4 -- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ----- doc/guides/nics/i40e.rst | 44 ++++++--------------- doc/guides/nics/ice.rst | 25 ++---------- doc/guides/nics/igc.rst | 18 +-------- doc/guides/nics/intel_vf.rst | 13 +------ doc/guides/nics/ionic.rst | 8 ---- doc/guides/nics/ipn3ke.rst | 12 +----- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 ------------- doc/guides/nics/memif.rst | 10 ++--- doc/guides/nics/mlx4.rst | 55 ++------------------------ doc/guides/nics/mlx5.rst | 62 ++---------------------------- doc/guides/nics/mvneta.rst | 36 ++++------------- doc/guides/nics/mvpp2.rst | 43 ++++----------------- doc/guides/nics/nfb.rst | 19 +-------- doc/guides/nics/nfp.rst | 4 -- doc/guides/nics/null.rst | 6 +-- doc/guides/nics/octeontx.rst | 19 +-------- doc/guides/nics/octeontx2.rst | 13 +------ doc/guides/nics/pcap_ring.rst | 24 ++++++------ doc/guides/nics/qede.rst | 17 +------- doc/guides/nics/sfc_efx.rst | 15 -------- doc/guides/nics/softnic.rst | 13 +------ doc/guides/nics/szedata2.rst | 18 +-------- doc/guides/nics/thunderx.rst | 25 +----------- doc/guides/nics/vdev_netvsc.rst | 6 --- doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- 44 files changed, 102 insertions(+), 693 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 06e8c33746..d7d679b452 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -119,32 +119,6 @@ Data Path Interface Ingress RX and Egress TX operation is by the nominal DPDK API . The driver supports single-port, multi-queue for both RX and TX. -Configuration Information -------------------------- - -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug - logging and internal checking of RX ingress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug - logging and internal checking of TX egress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables debug - logging of detailed packet and performance statistics gathered in - the PMD and FPGA. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables debug - logging of detailed PMD events and status. - Building DPDK ------------- diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..3c163df7a8 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -72,33 +72,6 @@ Prerequisites `linux-firmware git repository <https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/bnx2x/bnx2x-e2-7.13.11.0.fw>`_ to get the required firmware. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) - - Toggle display of register reads and writes. - .. _bnx2x_driver-compilation: diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 129a16cfc7..4b172fdaac 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode @@ -612,7 +609,7 @@ Basic stats include: * oerrors By default, per-queue stats for 16 queues are supported. For more than 16 -queues, BNXT PMD should be compiled with ``CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS`` +queues, BNXT PMD should be compiled with ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` set to the desired number of queues. Extended Stats diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index 3138c0f880..03ce358553 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -66,10 +66,14 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. #. Load ``igb_uio`` or ``vfio-pci`` driver: + Before compiling, make sure to enable kmods for the meson build:: + + meson configure -Denable_kmods=true + .. code-block:: console modprobe uio - insmod ./x86_64-native-linux-gcc/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko or @@ -106,7 +110,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..442ab1511c 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -87,35 +87,19 @@ Prerequisites :ref:`linux-installation` for Linux and section :ref:`freebsd-installation` for FreeBSD. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. For example, .. code-block:: console - testpmd -w 02:00.4,keep_ovlan=1 -- -i + dpdk-testpmd -w 02:00.4,keep_ovlan=1 -- -i Common Runtime Options -^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~ - ``keep_ovlan`` (default **0**) @@ -133,7 +117,7 @@ Common Runtime Options coalesce limit has been reached. CXGBE VF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``force_link_up`` (default **0**) @@ -142,7 +126,7 @@ CXGBE VF Only Runtime Options to send traffic to each other even when the physical link is down. CXGBE PF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``filtermode`` (default **0**) @@ -317,7 +301,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88 -- -i - ``filtermask`` (default **0**) @@ -344,7 +328,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i .. _driver-compilation: @@ -689,7 +673,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ + cp <build_dir>/kernel/freebsd/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -770,13 +754,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko + kldload <build_dir>/kernel/freebsd/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 17839a920e..eba8bfe600 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -195,31 +195,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ @@ -264,7 +239,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5a..b64bc6311b 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ @@ -473,7 +449,7 @@ for details. .. code-block:: console - ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx + ./dpdk-testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... EAL: Registered [pci] bus. diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index bec97c3326..4bdc3182fc 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 3c896eeffa..6203f4d799 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -113,5 +113,3 @@ Driver compilation and testing Follow instructions available in the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` to launch **testpmd** - -To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..be6a034279 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,8 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index b4a92f663b..b7bc5a566b 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- @@ -128,7 +116,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i @@ -142,7 +130,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -w 81:00.0 -- -i @@ -150,7 +138,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 -w ff:ff.f \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 -w ff:ff.f \ --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i #. Start testpmd, automatically probing the device 84:00.0 and using it with @@ -158,7 +146,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index edd21c4d8e..6172a0fa4b 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -812,8 +812,6 @@ ARMv7 Support armv7 architecture. -Use ``defconfig_arm-armv7a-*-*``. - .. _nic_features_armv8: @@ -822,8 +820,6 @@ ARMv8 Support armv8a (64bit) architecture. -Use ``defconfig_arm64-armv8a-*-*`` - .. _nic_features_power8: @@ -832,7 +828,6 @@ Power8 Support PowerPC architecture. -Use ``defconfig_ppc_64-power8-*-*`` .. _nic_features_x86-32: @@ -841,8 +836,6 @@ x86-32 Support 32bits x86 architecture. -Use ``defconfig_x86_x32-native-*-*`` and ``defconfig_i686-native-*-*``. - .. _nic_features_x86-64: @@ -851,8 +844,6 @@ x86-64 Support 64bits x86 architecture. -Use ``defconfig_x86_64-native-*-*``. - .. _nic_features_usage_doc: diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index b7430f6c4e..945fe97441 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -155,35 +155,13 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. +The following options can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -354,7 +332,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --forward-mode=mac + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --forward-mode=mac ... testpmd> set promisc 0 off @@ -389,8 +367,9 @@ Start ``testpmd`` with ``--disable-rss`` and ``--pkt-filter-mode=perfect``: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --disable-rss --pkt-filter-mode=perfect \ - --rxq=8 --txq=8 --nb-cores=8 --nb-ports=1 + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --disable-rss \ + --pkt-filter-mode=perfect --rxq=8 --txq=8 --nb-cores=8 \ + --nb-ports=1 Add a rule to direct ``ipv4-udp`` packet whose ``dst_ip=2.2.2.5, src_ip=2.2.2.3, src_port=32, dst_port=32`` to queue 1: @@ -648,8 +627,7 @@ For all available versions of the i40e driver, these drivers don't support 16 byte RX descriptor. If the Linux i40e kernel driver is used as host driver, while DPDK i40e PMD is used as the VF driver, DPDK cannot choose 16 byte receive descriptor. The reason is that the RX descriptor is already set to 32 byte by -the i40e kernel driver. That is to say, user should keep -``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n`` in config file. +the i40e kernel driver. In the future, if the Linux i40e driver supports 16 byte RX descriptor, user should make sure the DPDK VF uses the same RX descriptor mode, 16 byte or 32 byte, as the PF driver. @@ -760,7 +738,9 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +In ``config/rte_config.h`` set the following to use 16 bytes size RX descriptors:: + + #define RTE_LIBRTE_I40E_16BYTE_RX_DESC 1 Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -813,7 +793,7 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup. 7. The command line of running l3fwd would be something like the following:: - ./l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ + ./dpdk-l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ -- -p 0x3 --config '(0,0,18),(0,1,19),(1,0,20),(1,1,21)' This means that the application uses core 18 for port 0, queue pair 0 forwarding, core 19 for port 0, queue pair 1 forwarding, diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb0..9d3fcd1c9c 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -23,23 +23,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -106,14 +89,14 @@ Runtime Config Options .. code-block:: console - testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' + dpdk-testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-13 are VLAN extraction, other queues run with no protocol extraction. .. code-block:: console - testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' + dpdk-testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. @@ -253,7 +236,7 @@ responses for the same from PF. #. Bind the VF0, and run testpmd with 'cap=dcf' devarg:: - testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i + dpdk-testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i #. Monitor the VF2 interface network traffic:: @@ -282,7 +265,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i + ./app/dpdk-testpmd -l 0-15 -n 4 -- -i ... testpmd> rx_vlan add 10 0 diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3b096236bf 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ @@ -67,7 +53,7 @@ outer VLAN to 0x9100: .. code-block:: console - ./app/testpmd -l 4-8 -- -i + ./app/dpdk-testpmd -l 4-8 -- -i ... testpmd> vlan set filter on 0 @@ -94,7 +80,7 @@ Start ``testpmd``: .. code-block:: console - ./testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss + ./dpdk-testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss Add a rule to direct packet whose ``ether-type=0x801`` to queue 1: diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..723a9c0fa2 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,6 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +520,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..5d4534e4da 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +77,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop HQoS and flow acceleration ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,7 +88,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port, enable FPGA HQoS and .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap Limitations or Known issues --------------------------- diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 90d3040cf5..80ba459d49 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -97,13 +97,13 @@ It is possible to test PMD quickly using KNI kernel module loopback feature: .. code-block:: console - insmod build/kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb * Start testpmd with no physical device but two KNI virtual devices: .. code-block:: console - ./testpmd --vdev net_kni0 --vdev net_kni1 -- -i + ./dpdk-testpmd --vdev net_kni0 --vdev net_kni1 -- -i .. code-block:: console diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index ddeebed25c..6c6227f979 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -213,15 +213,15 @@ In this example we run two instances of testpmd application and transmit packets First create ``master`` interface:: - #./build/app/testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i + #./<build_dir>/app/dpdk-testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i Now create ``slave`` interface (master must be already running so the slave will connect):: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i You can also enable ``zero-copy`` on ``slave`` interface:: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i Start forwarding packets:: @@ -257,7 +257,7 @@ To see socket filename use show memif command:: Now create memif interface by running testpmd with these command line options:: - #./testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i + #./dpdk-testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i Testpmd should now create memif slave interface and try to connect to master. In testpmd set forward option to icmpecho and start forwarding:: @@ -280,7 +280,7 @@ The situation is analogous to cross connecting 2 ports of the NIC by cable. To set the loopback, just use the same socket and id with different roles:: - #./testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i + #./dpdk-testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i Then start the communication:: diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 1f1e2f6c77..d077ada7e2 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,43 +51,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +65,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +203,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 211c0c5a6c..9c32893fc6 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -328,50 +323,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -383,10 +337,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1109,12 +1059,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..e8abde42da 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -81,20 +75,9 @@ Prerequisites Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. @@ -107,7 +90,7 @@ be passed as part of EAL arguments. .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ -c 3 -- -i --p 3 -a @@ -126,16 +109,13 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +following command: .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + Usage Example ------------- @@ -160,7 +140,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ -i --p 3 -a --txd 256 --rxd 128 --rxq=1 --txq=1 --nb-cores=1 @@ -168,4 +148,4 @@ In order to run l2fwd example application following command can be used: .. code-block:: console - ./l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 + ./dpdk-l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..6fbce8358e 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -143,22 +123,15 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +command below. For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`. .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make Usage Example ------------- @@ -185,7 +158,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ --burst=128 --txd=2048 --rxd=1024 --rxq=2 --txq=2 --nb-cores=2 \ -i -a --rss-udp @@ -373,7 +346,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ -c 7 -- -i -a --disable-hw-vlan-strip --rxq=3 --txq=3 .. _flowapi: @@ -486,7 +459,7 @@ Before proceeding run testpmd user application: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip Example #1 ^^^^^^^^^^ @@ -578,7 +551,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 2. Create meter profile: @@ -657,7 +630,7 @@ For a detailed usage description please refer to "Traffic Management" section in .. code-block:: console - ./testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ + ./dpdk-testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ -i -p 3 --disable-hw-vlan-strip --rxq 3 --txq 3 --txd 1024 --rxd 1024 2. Stop all ports: diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..ecea3ecff0 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./<build_dir>/app/dpdk-testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. @@ -133,7 +118,7 @@ transmit queue: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 5f2a0698f6..6aa58f4358 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..e75abd96d2 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..c01ae09bb3 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./<build_dir>/app/dpdk-testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index bb591a8b7e..903b52b802 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document @@ -74,7 +63,7 @@ use arm64-octeontx2-linux-gcc as target. .. code-block:: console - ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 + ./<build_dir>/app/dpdk-testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 EAL: Detected 24 lcore(s) EAL: Detected 1 NUMA nodes EAL: Multi-process socket /var/run/dpdk/rte/mp_socket diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index cf230ae40a..67bd23ea4a 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx @@ -225,7 +223,7 @@ Multiple devices may be specified, separated by commas. .. code-block:: console - ./testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i + ./dpdk-testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i EAL: Detected lcore 1 as core 1 on socket 0 ... diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index 5b2f868952..6df0066dd4 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -111,22 +111,9 @@ Performance note Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index be1c2fe1d6..6ee5190f3c 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -271,21 +271,6 @@ Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_PMD`` (default **y**) - - Enable compilation of Solarflare libefx-based poll-mode driver. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG`` (default **n**) - - Enable compilation of the extra run-time consistency checks. - - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..695ebed91f 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- @@ -130,7 +121,7 @@ Soft NIC testing .. code-block:: console - ./testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i + ./dpdk-testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i --portmask=0x2 .. code-block:: console @@ -375,7 +366,7 @@ commands. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -c 0x7 -s 0x4 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0x7 -s 0x4 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..9cf3f39eb5 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..a928a790e3 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ @@ -70,8 +50,7 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linux-gcc as target. +Use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling. Linux ----- @@ -178,7 +157,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst index d36f3120b2..ee802ec4a8 100644 --- a/doc/guides/nics/vhost.rst +++ b/doc/guides/nics/vhost.rst @@ -90,7 +90,7 @@ This section demonstrates vhost PMD with testpmd DPDK sample application. .. code-block:: console - ./testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i + ./dpdk-testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i Other basic DPDK preparations like hugepage enabling here. Please refer to the *DPDK Getting Started Guide* for detailed instructions. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 0daf25b22d..a51b389685 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -110,7 +110,7 @@ Host2VM communication example .. code-block:: console - examples/kni/build/app/kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" + <build_dir>/examples/dpdk-kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" This command generates one network device vEth0 for physical port. If specify more physical ports, the generated network device will be vEth1, vEth2, and so on. @@ -340,7 +340,7 @@ Here we use l3fwd-power as an example to show how to get started. .. code-block:: console - $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ + $ dpdk-l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ --no-numa --parse-ptype -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 23/31] doc: remove references to make from vdpadevs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (21 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 22/31] doc: remove references to make from NICs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 24/31] doc: remove references to make from bbdevs guides Thomas Monjalon ` (9 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/vdpadevs/ifc.rst | 13 ------------ doc/guides/vdpadevs/mlx5.rst | 40 +++--------------------------------- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst index 12a2a342e6..f968489a75 100644 --- a/doc/guides/vdpadevs/ifc.rst +++ b/doc/guides/vdpadevs/ifc.rst @@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and device state report/restore, this driver enables its vDPA functionality. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux) - - Toggle compilation of the ``librte_pmd_ifc`` driver. - - IFCVF vDPA Implementation ------------------------- diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..2717459b6f 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -65,42 +63,10 @@ Prerequisites Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 24/31] doc: remove references to make from bbdevs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (22 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 23/31] doc: remove references to make from vdpadevs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 25/31] doc: remove references to make from cryptodevs guides Thomas Monjalon ` (8 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- doc/guides/bbdevs/turbo_sw.rst | 15 --------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index 6760391e8c..8e00c4ef22 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd8086:0d8f diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index fdc8a76981..14ffa0ee14 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd1172: diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..3b93157890 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -151,13 +143,6 @@ Example: export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 25/31] doc: remove references to make from cryptodevs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (23 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 24/31] doc: remove references to make from bbdevs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 26/31] doc: remove references to make from compressdevs guides Thomas Monjalon ` (7 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ------------- doc/guides/cryptodevs/ccp.rst | 14 +++--- doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- doc/guides/cryptodevs/kasumi.rst | 11 +---- doc/guides/cryptodevs/mvsam.rst | 10 +---- doc/guides/cryptodevs/nitrox.rst | 7 --- doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +----- doc/guides/cryptodevs/octeontx2.rst | 8 +--- doc/guides/cryptodevs/openssl.rst | 6 +-- doc/guides/cryptodevs/qat.rst | 67 +++++++---------------------- doc/guides/cryptodevs/scheduler.rst | 8 ---- doc/guides/cryptodevs/snow3g.rst | 10 +---- doc/guides/cryptodevs/virtio.rst | 18 ++------ doc/guides/cryptodevs/zuc.rst | 10 +---- 19 files changed, 39 insertions(+), 235 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 74e0de63ad..013615e2d0 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. @@ -117,5 +115,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm" diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 15388d20ab..fd533ca65b 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. @@ -152,7 +150,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo "sha1-hmac" Extra notes diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index a43fe92de9..9ca1979994 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -77,7 +75,7 @@ e.g. for the 0x1456 device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1022 1456" > /sys/bus/pci/drivers/igb_uio/new_id Another way to bind the CCP devices to DPDK UIO driver is by using the ``dpdk-devbind.py`` script. @@ -86,8 +84,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. @@ -109,7 +105,7 @@ To validate ccp pmd, l2fwd-crypto example can be used with following command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff @@ -124,7 +120,7 @@ following: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..5770a60cb2 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. @@ -117,7 +108,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "kasumi-f8" Extra notes on KASUMI F9 diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..6188c1248c 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: @@ -105,7 +97,7 @@ operation: .. code-block:: console - ./l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ + ./dpdk-l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ --auth_op GENERATE --auth_algo sha1-hmac \ diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 85f5212b64..2f0565b49e 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -33,13 +33,6 @@ Limitations * 3DES Cipher Only combination is not supported. * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/null.rst b/doc/guides/cryptodevs/null.rst index c980e0ac84..aac5904b1d 100644 --- a/doc/guides/cryptodevs/null.rst +++ b/doc/guides/cryptodevs/null.rst @@ -67,5 +67,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "null" diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..d813cb2974 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- @@ -135,7 +127,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_autotest The asymmetric crypto operations on OCTEON TX crypto PMD may be verified by running the test @@ -143,5 +135,5 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_asym_autotest diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index 432146db04..bb4af3a04d 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. @@ -148,7 +144,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_autotest The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test @@ -156,7 +152,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_asym_autotest diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..ca0f0b43f3 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: @@ -93,7 +93,7 @@ To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" --vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index e5d2cf4997..6714a7a8a2 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -483,7 +456,6 @@ To complete the installation follow the instructions in insmod ./drivers/crypto/qat/qat_common/intel_qat.ko insmod ./drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko - .. Note:: If you see the following warning in ``/var/log/messages`` it can be ignored: @@ -644,7 +616,7 @@ e.g. for the C62x device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vvd:37c9 @@ -660,27 +632,20 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -704,7 +669,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 7004ca431a..ee23b25b73 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..13341c39c4 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "snow3g-uea2" diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..83d8e32397 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,27 +83,17 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "cryptodev_virtio_autotest" to test + cd to <build_dir> + meson test cryptodev_virtio_autotest The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test-crypto-perf - type the command "make" to compile - run the tests with the following command: + cd to <build_dir> - ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ + ./app/dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ --ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \ --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \ --auth-op generate --auth-key-sz 64 --digest-sz 12 \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..907840ef05 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "zuc-eea3" -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 26/31] doc: remove references to make from compressdevs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (24 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 25/31] doc: remove references to make from cryptodevs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 27/31] doc: remove references to make from eventdevs guides Thomas Monjalon ` (6 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..8c658721b9 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -56,21 +56,6 @@ Steps To Setup Platform SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. -Installation ------------- - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "compressdev_autotest" to test + cd to <build_dir> + meson test compressdev_autotest diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 27/31] doc: remove references to make from eventdevs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (25 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 26/31] doc: remove references to make from compressdevs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 28/31] doc: remove references to make from rawdevs guides Thomas Monjalon ` (5 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/eventdevs/dpaa.rst | 20 -------------------- doc/guides/eventdevs/dpaa2.rst | 20 -------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 8 -------- 4 files changed, 72 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..6fbee91d9e 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -43,26 +43,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..b992ae649e 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -52,26 +52,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 9a3646db0d..f7a4cdd586 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..7f9eceb01f 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 28/31] doc: remove references to make from rawdevs guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (26 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 27/31] doc: remove references to make from eventdevs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 29/31] doc: remove references to make from app guides Thomas Monjalon ` (4 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ioat.rst | 8 +------- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 7 files changed, 1 insertion(+), 85 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst index d0eee5e237..c0a08ff852 100644 --- a/doc/guides/rawdevs/ioat.rst +++ b/doc/guides/rawdevs/ioat.rst @@ -54,13 +54,7 @@ shows: Compilation ------------ -For builds done with ``make``, the driver compilation is enabled by the -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is -enabled by default in builds for x86 platforms, and disabled in other -configurations. - -For builds using ``meson`` and ``ninja``, the driver will be built when the -target platform is x86-based. +The driver will be built when the target platform is x86-based. Device Setup ------------- diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index aa7d809649..0589b70087 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ is https://www.intel.com/content/dam/support/us/en/documents/server-products/Int - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 1e1dfbe931..f93ec1ffd7 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index bbcf530a45..4f91e78ab1 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 29/31] doc: remove references to make from app guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (27 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 28/31] doc: remove references to make from rawdevs guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 30/31] doc: remove reference to make from tools guides Thomas Monjalon ` (3 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Nicolas Chautru From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- doc/guides/sample_app_ug/bbdev_app.rst | 34 ++----- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 89 +++++++------------ doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +-- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +----- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +-- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +-- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +-- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +-- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 ++- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 ++--- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +++------ doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +-- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +---- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +++------ doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +-- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +++---- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- 51 files changed, 202 insertions(+), 359 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..764155f983 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -31,30 +31,12 @@ Limitations Compiling the Application ------------------------- -#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along - with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* - documentation for more details on this. +DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along +with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* +documentation for more details on this. -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make Running the Application ----------------------- @@ -63,8 +45,8 @@ The application accepts a number of command line options: .. code-block:: console - $ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] / - [-p ETH_PORT_ID] [-b BBDEV_ID] + $ ./<build_dir>/examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] / + [-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID] where: @@ -84,8 +66,8 @@ issue the command: .. code-block:: console - $ ./build/bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> -c 0x38 --socket-mem=2,2 \ - --file-prefix=bbdev -- -e 0x10 -d 0x20 + $ ./<build_dir>/examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> \ + -c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20 where, NIC0PCIADDR is the PCI address of the Rx port diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index 6deb6c8112..5e3a25a317 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -52,7 +52,7 @@ To run the application in linux environment, issue the following command: .. code-block:: console - $ ./build/cmdline -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-cmdline -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..adde775d4e 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,100 +9,75 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: - - .. code-block:: console - - cd $RTE_SDK - -Build DPDK: +Enable examples compilation: .. code-block:: console - make defconfig - make + meson configure -Dexamples=all -Build the sample applications: +Build: .. code-block:: console - export RTE_TARGET=build - make -C examples + ninja -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. - - -In the example above the compiled application is written to the ``build`` subdirectory. -To have the applications written to a different location, -the ``O=/path/to/build/directory`` option may be specified in the make command. - - .. code-block:: console - - make O=/tmp - -To build the applications for debugging use the ``DEBUG`` option. -This option adds some extra flags, disables compiler optimizations and -sets verbose output. - - .. code-block:: console - - make DEBUG=1 +Applications are output to: ``dpdk/<build_dir>/examples``. To compile a single application ------------------------------- -Set the path to DPDK source code: + +Using meson +~~~~~~~~~~~ + +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: +Enable example app compilation: - .. code-block:: console + .. code-block:: console - cd $RTE_SDK + meson configure -Dexamples=helloworld -Build DPDK: +Build: - .. code-block:: console + .. code-block:: console + + ninja + + +Using Make +~~~~~~~~~~ - make defconfig - make +Pkg-config is used when building an example app standalone using make, please +see :ref:`building_app_using_installed_dpdk` for more information. Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. - +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make -To cross compile the sample application(s) ------------------------------------------- - -For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command. -In example of AARCH64 cross compiling: +To build the application for debugging use the ``DEBUG`` option. +This option adds some extra flags, disables compiler optimizations and +sets verbose output. .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk - make -C examples CROSS=aarch64-linux-gnu- - or - make CROSS=aarch64-linux-gnu- + make DEBUG=1 diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 90270e3a58..3bd03905c3 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -42,7 +42,7 @@ Running the Application .. code-block:: console - ./build/distributor_app [EAL options] -- -p PORTMASK + ./<build-dir>/examples/dpdk-distributor [EAL options] -- -p PORTMASK where, @@ -53,7 +53,7 @@ Running the Application .. code-block:: console - $ ./build/distributor_app -l 1-9,22 -n 4 -- -p f + $ ./<build-dir>/examples/dpdk-distributor -l 1-9,22 -n 4 -- -p f #. Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst index 253004dd00..7819871917 100644 --- a/doc/guides/sample_app_ug/ethtool.rst +++ b/doc/guides/sample_app_ug/ethtool.rst @@ -24,7 +24,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./ethtool-app/${RTE_TARGET}/ethtool [EAL options] + ./<build_dir>/examples/dpdk-ethtool [EAL options] Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index dc7972aa9a..b4fc587a09 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -46,7 +46,8 @@ these settings is shown below: .. code-block:: console - ./build/eventdev_pipeline --vdev event_sw0 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D + ./<build_dir>/examples/dpdk-eventdev_pipeline --vdev event_sw0 -- -r1 -t1 / + -e4 -w FF00 -s4 -n0 -c32 -W1000 -D The application has some sanity checking built-in, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 2953fddeb9..8b009244b8 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -70,9 +70,7 @@ Compiling the Application * Compile Application - .. code-block:: console - - make -C examples/fips_validation + To compile the sample application see :doc:`compiling`. * Run ``dos2unix`` on the request files @@ -92,7 +90,7 @@ The application requires a number of command line options: .. code-block:: console - ./fips_validation [EAL options] + ./dpdk-fips_validation [EAL options] -- --req-file FILE_PATH/FOLDER_PATH --rsp-file FILE_PATH/FOLDER_PATH [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder] @@ -117,7 +115,7 @@ file for crypto_aesni_mb PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_mb -- + $ ./dpdk-fips_validation --vdev crypto_aesni_mb -- --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb @@ -126,7 +124,7 @@ data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_gcm0 -- + $ ./dpdk-fips_validation --vdev crypto_aesni_gcm0 -- --req-file /PATH/TO/REQUEST/FILE/FOLDER/ --rsp-file ./PATH/TO/RESPONSE/FILE/FOLDER/ --cryptodev-id 0 --path-is-folder diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index dc40b4d6f9..2ae22739c0 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -28,8 +28,8 @@ To run the example in a ``linux`` environment: .. code-block:: console - cd ~/dpdk/examples/flow_classify - ./build/flow_classify -c 4 -n 4 -- --rule_ipv4="../ipv4_rules_file.txt" + ./<build_dir>/examples/dpdk-flow_classify -c 4 -n 4 -- / + --rule_ipv4="../ipv4_rules_file.txt" Please refer to the *DPDK Getting Started Guide*, section :doc:`../linux_gsg/build_sample_apps` diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 5e5a6cd8a0..4a4006dc8e 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -13,28 +13,7 @@ It is intended as a demonstration of the basic components RTE flow rules. Compiling the Application ------------------------- -To compile the application export the path to the DPDK source tree and go to -the example directory: - -.. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - - cd ${RTE_SDK}/examples/flow_filtering - -Set the target, for example: - -.. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - -See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. - -Build the application as follows: - -.. code-block:: console - - make +To compile the sample application see :doc:`compiling`. Running the Application @@ -44,7 +23,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/flow -l 1 -n 1 + ./<build_dir>/examples/dpdk-flow_filtering -l 1 -n 1 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 46f997a7dc..8f48533873 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -21,7 +21,7 @@ To run the example in a linux environment: .. code-block:: console - $ ./build/helloworld -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-helloworld -l 0-3 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ioat.rst b/doc/guides/sample_app_ug/ioat.rst index bab7654b8d..f35bee9d86 100644 --- a/doc/guides/sample_app_ug/ioat.rst +++ b/doc/guides/sample_app_ug/ioat.rst @@ -45,7 +45,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/ioatfwd [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] + ./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] [--[no-]mac-updating] where, @@ -81,7 +81,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw + $ ./<build_dir>/examples/dpdk-ioat -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw To run the application in a Linux environment with 2 lcores (the master lcore, plus one forwarding core), 2 ports (ports 0 and 1), hardware copying and no MAC @@ -89,7 +89,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw + $ ./<build_dir>/examples/dpdk-ioat -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index afeaff3639..92d5e4aeae 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -53,7 +53,7 @@ Application usage: .. code-block:: console - ./build/ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] where: @@ -65,7 +65,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_fragmentation -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -94,7 +94,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst index 56014be174..1d8656c637 100644 --- a/doc/guides/sample_app_ug/ip_pipeline.rst +++ b/doc/guides/sample_app_ug/ip_pipeline.rst @@ -34,7 +34,7 @@ Running the application The application startup command line is:: - ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] + dpdk-ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] The application startup arguments are: @@ -71,7 +71,7 @@ The following is an example command to run ip pipeline application configured fo .. code-block:: console - $ ./build/ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli + $ ./<build_dir>/examples/dpdk-ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli The application should start successfully and display as follows: diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index f34b9d0055..e72c8492e9 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -42,7 +42,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] + ./<build_dir>/examples/dpdk-ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] where: @@ -61,7 +61,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_reassembly -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_reassembly -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -92,7 +92,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_reassembly -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_reassembly -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. @@ -231,7 +231,8 @@ Debug logging and Statistics Collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The RTE_LIBRTE_IP_FRAG_TBL_STAT controls statistics collection for the IP Fragment Table. -This macro is disabled by default. +This macro is disabled by default, but it can be enabled by modifying the appropriate line +in ``config/rte_config.h``. To make ip_reassembly print the statistics to the standard output, the user must send either an USR1, INT or TERM signal to the process. For all of these signals, the ip_reassembly process prints Fragment table statistics for each RX queue, diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 434f484138..1f37dccf8b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -116,12 +116,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ipsec-secgw`` sub-directory. -#. [Optional] Build the application for debugging: - This option adds some extra flags, disables compiler optimizations and - is verbose:: - - make DEBUG=1 - Running the Application ----------------------- @@ -129,7 +123,7 @@ Running the Application The application has a number of command line options:: - ./build/ipsec-secgw [EAL options] -- + ./<build_dir>/examples/dpdk-ipsec-secgw [EAL options] -- -p PORTMASK -P -u PORTMASK -j FRAMESIZE -l -w REPLAY_WINOW_SIZE -e -a -c SAD_CACHE_SIZE @@ -245,7 +239,7 @@ The mapping of lcores to port/queues is similar to other l3fwd applications. For example, given the following command line to run application in poll mode:: - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ --vdev "crypto_null" -- -p 0xf -P -u 0x3 \ --config="(0,0,20),(1,0,20),(2,0,21),(3,0,21)" \ -f /path/to/config_file --transfer-mode poll \ @@ -297,7 +291,7 @@ where each option means: Similarly for example, given the following command line to run application in event app mode:: - ./build/ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ -f /path/to/config_file --transfer-mode event \ --event-schedule-type parallel \ @@ -336,7 +330,7 @@ For example, something like the following command line: .. code-block:: console - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ -w 81:00.0 -w 81:00.1 -w 81:00.2 -w 81:00.3 \ --vdev "crypto_aesni_mb" --vdev "crypto_null" \ -- \ diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index 8923a7f548..7c6e8b15cc 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -50,7 +50,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] where, @@ -67,7 +67,7 @@ Typically, to run the IPv4 Multicast sample application, issue the following com .. code-block:: console - ./build/ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 + ./<build_dir>/examples/dpdk-ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 In this command: diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..ef7936f80f 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -49,7 +49,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l2fwd-keepalive [EAL options] \ + ./<build_dir>/examples/dpdk-l2fwd-keepalive [EAL options] \ -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD] where, @@ -68,7 +68,7 @@ To run the application in linux environment with 4 lcores, 16 ports .. code-block:: console - ./build/l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 + ./<build_dir>/examples/dpdk-l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index aac4ebd8d4..ef441cc1e5 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -96,7 +96,7 @@ The ``kni`` example application requires a number of command line options: .. code-block:: console - kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] + dpdk-kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] Where: @@ -168,8 +168,8 @@ interface ``vEth1_0`` with the kernel thread bound to lcore 9. .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" The following example is identical, except an additional ``lcore_kthread`` core is specified per physical port. In this case, ``kni`` will create @@ -186,8 +186,8 @@ The kernel thread for each interface will be bound as follows: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" The following example can be used to test the interface between the ``kni`` test application and the ``rte_kni`` kernel module. In this example, @@ -206,8 +206,8 @@ disabled by **not** specifying the ``-m`` flag to ``kni``: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo carrier=on - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo carrier=on + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" KNI Operations -------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 0a813200ba..c1be2d7dff 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -70,13 +70,13 @@ To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" or to enable CAT and CDP on cpus 1,3: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" If CDP is not supported it will fail with following error message: diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 962752f21c..e2c0f9f1ec 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / + ./<build_dir>/examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / [--cdev_type HW/SW/ANY] [--chain HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] / [--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] / [--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size SIZE] / @@ -162,7 +162,7 @@ To run the application in linux environment with 2 lcores, 2 ports and 2 crypto .. code-block:: console - $ ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ + $ ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ --vdev "crypto_aesni_mb1" -- -p 0x3 --chain CIPHER_HASH \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index d536eee819..11c9d4b2ee 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -52,7 +52,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE + ./<build_dir>/examples/dpdk-l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE where, @@ -75,20 +75,20 @@ issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll Eventdev mode with 4 lcores, 16 ports , sched method ordered and MAC address updating enabled, issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered or .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -105,7 +105,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Explanation ----------- diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 8d0c38721f..1a854abb23 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -81,7 +81,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] + ./<build_dir>/examples/dpdk-l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] where, @@ -96,7 +96,7 @@ thousands separator printing, issue the command: .. code-block:: console - $ ./build/l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l + $ ./<build_dir>/examples/dpdk-l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index c0e8488e79..5a13de215e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK + ./<build_dir>/examples/dpdk-l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating [--portmap="(port, port)[,(port, port)]"] @@ -111,7 +111,7 @@ updating enabled, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p ffff To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and @@ -119,7 +119,7 @@ vice versa, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936..7acbd7404e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -51,7 +51,7 @@ Running the Application The application has a number of command line options:: - ./l3fwd [EAL options] -- -p PORTMASK + ./dpdk-l3fwd [EAL options] -- -p PORTMASK [-P] [-E] [-L] @@ -111,7 +111,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: @@ -138,13 +138,13 @@ Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered or .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered In this command: @@ -166,7 +166,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered In case of eventdev mode, *--config* option is not used for ethernet port configuration. Instead each ethernet port will be configured with mentioned diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..d3c901f8d8 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_graph.rst b/doc/guides/sample_app_ug/l3_forward_graph.rst index df50827bab..75617e3af1 100644 --- a/doc/guides/sample_app_ug/l3_forward_graph.rst +++ b/doc/guides/sample_app_ug/l3_forward_graph.rst @@ -44,7 +44,7 @@ Running the Application The application has a number of command line options similar to l3fwd:: - ./l3fwd-graph [EAL options] -- -p PORTMASK + ./dpdk-l3fwd-graph [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--eth-dest=X,MM:MM:MM:MM:MM:MM] @@ -79,7 +79,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 0cc6f2e62e..4f997108ba 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -88,7 +88,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -378,7 +378,7 @@ See :doc:`Power Management<../prog_guide/power_man>` chapter in the DPDK Program .. code-block:: console - ./l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 + ./<build_dir>/examples/dpdk-l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 Where, @@ -407,7 +407,7 @@ app with the training flag set to “1”, and the other parameters set to .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P This will run the training algorithm for x seconds on each core (cores 2 and 3), and then print out the recommended threshold values for those @@ -432,7 +432,7 @@ then be started without the training mode so traffic can start immediately. .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P Telemetry Mode -------------- @@ -449,13 +449,9 @@ cycles it took is measured and compared with minimum and maximum reference cycles and accordingly busy rate is set to either 0% or 50% or 100%. - .. Note:: - - * The CONFIG_RTE_LIBRTE_TELEMETRY should be set in order to get the stats in DPDK telemetry. - .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry + ./<build_dir>/examples/dpdk-l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry The new stats ``empty_poll`` , ``full_poll`` and ``busy_percent`` can be viewed by running the script ``/usertools/dpdk-telemetry-client.py`` and selecting the menu option ``Send for global Metrics``. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 04c40f2854..75bfd78505 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] + ./<build_dir>/examples/dpdk-link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] where, @@ -54,7 +54,7 @@ issue the command: .. code-block:: console - $ ./build/link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index f2a79a6397..8b2858b971 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -41,7 +41,7 @@ passing at least two cores in the coremask/corelist, as follows: .. code-block:: console - ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary For the first DPDK process run, the proc-type flag can be omitted or set to auto, since all DPDK processes will default to being a primary instance, @@ -50,7 +50,7 @@ The process should start successfully and display a command prompt as follows: .. code-block:: console - $ ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + $ ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary EAL: coremask set to 3 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 0 @@ -78,7 +78,7 @@ again run the same binary setting at least two cores in the coremask/corelist: .. code-block:: console - ./build/simple_mp -l 2-3 -n 4 --proc-type=secondary + ./<build_dir>/examples/dpdk-simple_mp -l 2-3 -n 4 --proc-type=secondary When running a secondary process such as that shown above, the proc-type parameter can again be specified as auto. However, omitting the parameter altogether will cause the process to try and start as a primary rather than secondary process. @@ -184,10 +184,10 @@ the following commands can be used (assuming run as root): .. code-block:: console - # ./build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 - # ./build/symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 - # ./build/symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 - # ./build/symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 .. note:: @@ -284,9 +284,9 @@ the following commands could be used: .. code-block:: console - # ./mp_server/build/mp_server -l 1-2 -n 4 -- -p 3 -n 2 - # ./mp_client/build/mp_client -l 3 -n 4 --proc-type=auto -- -n 0 - # ./mp_client/build/mp_client -l 4 -n 4 --proc-type=auto -- -n 1 + # ./<build_dir>/examples/dpdk-mp_server -l 1-2 -n 4 -- -p 3 -n 2 + # ./<build_dir>/examples/dpdk-mp_client -l 3 -n 4 --proc-type=auto -- -n 0 + # ./<build_dir>/examples/dpdk-mp_client -l 4 -n 4 --proc-type=auto -- -n 1 .. note:: diff --git a/doc/guides/sample_app_ug/ntb.rst b/doc/guides/sample_app_ug/ntb.rst index 93fb752f25..f80b221db7 100644 --- a/doc/guides/sample_app_ug/ntb.rst +++ b/doc/guides/sample_app_ug/ntb.rst @@ -32,7 +32,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./build/ntb_fwd -c 0xf -n 6 -- -i + ./<build_dir>/examples/dpdk-ntb -c 0xf -n 6 -- -i Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/packet_ordering.rst b/doc/guides/sample_app_ug/packet_ordering.rst index 1c8ee5d040..5a4e0a9d28 100644 --- a/doc/guides/sample_app_ug/packet_ordering.rst +++ b/doc/guides/sample_app_ug/packet_ordering.rst @@ -43,7 +43,8 @@ The application execution command line is: .. code-block:: console - ./packet_ordering [EAL options] -- -p PORTMASK [--disable-reorder] [--insight-worker] + ./<build_dir>/examples/dpdk-packet_ordering [EAL options] -- -p PORTMASK / + [--disable-reorder] [--insight-worker] The -c EAL CPU_COREMASK option has to contain at least 3 CPU cores. The first CPU core in the core mask is the master core and would be assigned to diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..2a50eb4270 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -55,7 +55,7 @@ Running the Application The application has a number of command line options:: - ./build/l3fwd-thread [EAL options] -- + ./<build_dir>/examples/dpdk-l3fwd-thread [EAL options] -- -p PORTMASK [-P] --rx(port,queue,lcore,thread)[,(port,queue,lcore,thread)] --tx(lcore,thread)[,(lcore,thread)] @@ -141,14 +141,14 @@ in ``--rx/--tx`` are used to affinitize threads to the selected scheduler. For example, the following places every l-thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" The following places RX l-threads on lcore 0 and TX l-threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(2,1)" @@ -164,7 +164,7 @@ place every RX and TX thread on different lcores. For example, the following places every EAL thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -176,7 +176,7 @@ parameter is used. The following places RX EAL threads on lcore 0 and TX EAL threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -190,13 +190,13 @@ and its corresponding EAL threads command line can be realized as follows: a) Start every thread on different scheduler (1:1):: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" EAL thread equivalent:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -205,13 +205,13 @@ b) Start all threads on one core (N:1). Start 4 L-threads on lcore 0:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(0,0)(0,1)" Start 4 EAL threads on cpu-set 0:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -220,14 +220,14 @@ c) Start threads on different cores (N:M). Start 2 L-threads for RX on lcore 0, and 2 L-threads for TX on lcore 1:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(1,1)" Start 2 EAL threads for RX on cpu-set 0, and 2 EAL threads for TX on cpu-set 1:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -1146,33 +1146,15 @@ in the performance-thread folder To build and run the pthread shim example -#. Go to the example applications folder - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim - - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the DPDK Getting Started Guide for possible RTE_TARGET values. - #. Build the application: - .. code-block:: console - - make + To compile the sample application see :doc:`compiling`. #. To run the pthread_shim example .. code-block:: console - lthread-pthread-shim -c core_mask -n number_of_channels + dpdk-pthread-shim -c core_mask -n number_of_channels .. _lthread_diagnostics: diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 12b4f13d5b..a58b6f35bf 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -57,13 +57,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. -.. note:: - To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 - and then recompile DPDK: - - .. code-block:: console - - CONFIG_RTE_LIBRTE_IEEE1588=y Running the Application ----------------------- @@ -72,7 +65,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/ptpclient -l 1 -n 4 -- -p 0x1 -T 0 + ./<build_dir>/examples/dpdk-ptpclient -l 1 -n 4 -- -p 0x1 -T 0 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst index d75f7da52c..6b6853a0e9 100644 --- a/doc/guides/sample_app_ug/qos_metering.rst +++ b/doc/guides/sample_app_ug/qos_metering.rst @@ -48,7 +48,7 @@ The application execution command line is as below: .. code-block:: console - ./qos_meter [EAL options] -- -p PORTMASK + ./dpdk-qos_meter [EAL options] -- -p PORTMASK The application is constrained to use a single core in the EAL core mask and 2 ports only in the application port mask (first port from the port mask is used for RX and the other port in the core mask is used for TX). diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..801f5e1286 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,8 +42,8 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, - which can be done by changing the configuration file for the specific target to be compiled. + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the relevant + entry in the ``config/rte_config.h`` file. Running the Application ----------------------- @@ -57,7 +57,7 @@ The application has a number of command line options: .. code-block:: console - ./qos_sched [EAL options] -- <APP PARAMS> + ./<build_dir>/examples/dpdk-qos_sched [EAL options] -- <APP PARAMS> Mandatory application parameters include: @@ -315,7 +315,7 @@ The following is an example command with a single packet flow configuration: .. code-block:: console - ./qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg This example uses a single packet flow configuration which creates one RX thread on lcore 5 reading from port 3 and a worker thread on lcore 7 writing to port 2. @@ -324,7 +324,7 @@ Another example with 2 packet flow configurations using different ports but shar .. code-block:: console - ./qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg Note that independent cores for the packet flow configurations for each of the RX, WT and TX thread are also supported, providing flexibility to balance the work. diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..62d1f39d7e 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- @@ -40,7 +33,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/rxtx_callbacks -l 1 -n 4 -- [-t] + ./<build_dir>/examples/dpdk-rxtx_callbacks -l 1 -n 4 -- [-t] Use -t to enable hardware timestamping. If not supported by the NIC, an error will be displayed. diff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst index 12208f4258..f27d1ccfce 100644 --- a/doc/guides/sample_app_ug/server_node_efd.rst +++ b/doc/guides/sample_app_ug/server_node_efd.rst @@ -93,7 +93,7 @@ and the back-end node. The frontend server (server) has the following command line options:: - ./server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS + ./<build_dir>/examples/dpdk-server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS Where, diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..9202be6ea9 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -20,26 +20,9 @@ is application specific, and not a part of the service cores API. Compiling the Application ------------------------- -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make +The application is located in the ``service_cores`` sub-directory. Running the Application ----------------------- @@ -50,7 +33,7 @@ pass a service core-mask as an EAL argument at startup time. .. code-block:: console - $ ./build/service_cores + $ ./<build_dir>/examples/dpdk-service_cores Explanation diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 34f6f9aea7..263d8debc8 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -25,7 +25,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/basicfwd -l 1 -n 4 + ./<build_dir>/examples/dpdk-skeleton -l 1 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..86ced036ce 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,36 +90,17 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- -#. Go to the examples directory: +Run the tep_termination sample code: - .. code-block:: console +.. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination - -#. Run the tep_termination sample code: - - .. code-block:: console - - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- - -p 0x1 --dev-basename tep-termination --nb-devices 4 - --udp-port 4789 --filter-type 1 + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + -p 0x1 --dev-basename tep-termination --nb-devices 4 + --udp-port 4789 --filter-type 1 .. note:: @@ -139,7 +120,7 @@ The default value is 2. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 **Tunneling UDP port.** @@ -149,7 +130,7 @@ The default value is 4789. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 **Filter Type.** @@ -160,7 +141,7 @@ The default value is 1, which means the filter type of inner MAC and tenant ID i .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 --filter-type 1 **TX Checksum.** @@ -170,7 +151,7 @@ The default value is 0, which means the checksum offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --tx-checksum **TCP segment size.** @@ -180,7 +161,7 @@ The default value is 0, which means TSO offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --tx-checksum --tso-segsz 800 **Decapsulation option.** @@ -190,7 +171,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --decap 1 **Encapsulation option.** @@ -200,7 +181,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --encap 1 diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..d57d08fb2c 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/<build_dir>/app`` directory. Running the Application @@ -45,7 +45,7 @@ The application execution command line is: .. code-block:: console - ./test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE + ./dpdk-test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE The -c or -l EAL CPU coremask/corelist option has to contain exactly 3 CPU cores. The first CPU core in the core mask is assigned for core A, the second for core B and the third for core C. diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index 98d762d238..94cee9819d 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -21,7 +21,7 @@ To run the example in linux environment: .. code-block:: console - $ ./build/timer -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-timer -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index d66a724827..a8bedbab53 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -29,7 +29,7 @@ Start the vdpa example .. code-block:: console - ./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + ./dpdk-vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] where @@ -51,7 +51,7 @@ Take IFCVF driver for example: .. code-block:: console - ./vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ + ./dpdk-vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ -w 0000:06:00.3,vdpa=1 -w 0000:06:00.4,vdpa=1 \ -- --interactive diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..bacf7898f9 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -38,7 +38,7 @@ Start the vswitch example .. code-block:: console - ./vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ + ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ -- --socket-file /tmp/sock0 --client \ ... @@ -78,13 +78,13 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. .. code-block:: console - ./x86_64-native-gcc/app/testpmd -l 0-1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-1 -- -i > start tx_first Inject packets @@ -192,11 +192,6 @@ Common Issues max queue number is larger than 128, device start will fail due to insufficient mbuf. - Change the default number to make it work as below, just set the number - according to the NIC's property. :: - - make EXTRA_CFLAGS="-DMAX_QUEUES=320" - * Option "builtin-net-driver" is incompatible with QEMU QEMU vhost net device start will fail if protocol feature is not negotiated. diff --git a/doc/guides/sample_app_ug/vhost_blk.rst b/doc/guides/sample_app_ug/vhost_blk.rst index 681de6f3e1..788eef0d5f 100644 --- a/doc/guides/sample_app_ug/vhost_blk.rst +++ b/doc/guides/sample_app_ug/vhost_blk.rst @@ -36,7 +36,7 @@ Start the vhost_blk example .. code-block:: console - ./vhost_blk -m 1024 + ./dpdk-vhost_blk -m 1024 .. _vhost_blk_app_run_vm: diff --git a/doc/guides/sample_app_ug/vhost_crypto.rst b/doc/guides/sample_app_ug/vhost_crypto.rst index bbc25bde1c..7ae7addac4 100644 --- a/doc/guides/sample_app_ug/vhost_crypto.rst +++ b/doc/guides/sample_app_ug/vhost_crypto.rst @@ -28,7 +28,7 @@ Start the vhost_crypto example .. code-block:: console - ./vhost_crypto [EAL options] -- + ./dpdk-vhost_crypto [EAL options] -- --config (lcore,cdev-id,queue-id)[,(lcore,cdev-id,queue-id)] --socket-file lcore,PATH [--zero-copy] diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..35afdac63f 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -274,7 +271,7 @@ than the EAL options: .. code-block:: console - ./build/vm_power_mgr [EAL options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] The application requires exactly two cores to run. One core for the CLI and the other for the channel endpoint monitor. For example, to run on @@ -282,7 +279,7 @@ cores 0 and 1 on a system with four memory channels, issue the command: .. code-block:: console - ./build/vm_power_mgr -l 0-1 -n 4 + ./<build_dir>/examples/dpdk-vm_power_mgr -l 0-1 -n 4 After successful initialization, the VM Power Manager CLI prompt appears: @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -515,14 +509,14 @@ The standard EAL command line parameters are necessary: .. code-block:: console - ./build/vm_power_mgr [EAL options] -- [guest options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] -- [guest options] The guest example uses a channel for each lcore enabled. For example, to run on cores 0, 1, 2 and 3: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 .. _sending_policy: @@ -593,7 +587,7 @@ host, use a command like the following: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: @@ -707,7 +701,7 @@ To start the application and configure the power policy, and send it to the host .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c908074eb0 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,13 +26,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss + ./<build_dir>/examples/dpdk-vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss where, NP can be 16 or 32, TC can be 4 or 8, rss is disabled by default. @@ -72,7 +72,7 @@ To run the example in a linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index c3a3439e51..a1a8e77de2 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,13 +24,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_app [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss + ./<build_dir>/examples/dpdk-vmdq [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss where, NP can be 8, 16 or 32, rss is disabled by default. @@ -56,7 +56,7 @@ To run the example in a Linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_app -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index d1e4ee3e7a..ac4f0d9212 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the previous section, with .. code-block:: console - sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 + sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 The command line options are: @@ -59,13 +59,13 @@ The command line options are: * ``--nb-cores=N`` Set the number of forwarding cores, - where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the configuration file. + where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the configuration file. The default value is 1. * ``--nb-ports=N`` Set the number of forwarding ports, - where 1 <= N <= "number of ports" on the board or ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` from the configuration file. The default value is the number of ports on the board. * ``--coremask=0xXX`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 90cf252df5..6856e3b909 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command .. code-block:: console - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt Interactive-mode selected CLI commands to be read from /home/ubuntu/flow-create-commands.txt Configuring Port 0 (socket 0) @@ -329,7 +329,7 @@ The available information categories are: * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. +* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. * ``noisy``: Noisy neighbor simulation. Simulate more realistic behavior of a guest machine engaged in receiving @@ -379,11 +379,6 @@ Example for the io forwarding engine, with some packet drops on the tx side:: TX-packets: 548595568 TX-dropped: 128 TX-total: 548595696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. note:: - - Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" stats, like: - - CPU cycles/packet=xx.dd (total cycles=xxxx / total RX packets=xxxx) at xxx MHz clock clear fwd ~~~~~~~~~ -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 30/31] doc: remove reference to make from tools guides 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (28 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 29/31] doc: remove references to make from app guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide Thomas Monjalon ` (2 subsequent siblings) 32 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev Cc: david.marchand, bruce.richardson, ciara.power, Kevin Laatz, Nicolas Chautru From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- doc/guides/tools/comp_perf.rst | 10 ++------- doc/guides/tools/cryptoperf.rst | 20 +++-------------- doc/guides/tools/pdump.rst | 15 ++++++------- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 36 +++++++++---------------------- doc/guides/tools/testeventdev.rst | 21 ++++++++---------- 6 files changed, 31 insertions(+), 73 deletions(-) diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst index ee585d1024..1b33dc4e91 100644 --- a/doc/guides/tools/comp_perf.rst +++ b/doc/guides/tools/comp_perf.rst @@ -100,13 +100,7 @@ Application Options Compiling the Tool ------------------ -**Step 1: PMD setting** - -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which -can be disabled by default in the build configuration file ``common_base``. -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: - - CONFIG_RTE_LIBRTE_PMD_ISAL=y +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. Running the Tool @@ -116,5 +110,5 @@ The tool has a number of command line options. Here is the sample command line: .. code-block:: console - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index 28b729dbda..e7ea2ba1a5 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum throughput. Compiling the Application ------------------------- -**Step 1: PMD setting** -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The crypto device drivers PMD which should be tested can be enabled by setting:: - - CONFIG_RTE_LIBRTE_PMD_<name>=y - -Setting example for open ssl PMD:: - - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y - -**Step 2: Linearization setting** +**Step 1: Linearization setting** It is possible linearized input segmented packets just before crypto operation for devices which doesn't support scatter-gather, and allows to measure @@ -56,13 +45,10 @@ To set on the linearization options add below definition to the #define CPERF_LINEARIZATION_ENABLE -**Step 3: Build the application** +**Step 2: Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-crypto-perf`` application. +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 8a499c6c5b..70f03db9cc 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports framework initialization code. Refer ``app/test-pmd/testpmd.c`` code to see how this is done. - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled - by default in the build configuration files, - owing to an external dependency on the libpcap development files - which must be installed on the board. - Once the libpcap development files are installed, the libpcap based PMD - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool depends on libpcap based PMD which must be + installed on the board. + Once the libpcap development files are installed, recompile the DPDK. * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when the primary application exits. @@ -37,7 +34,7 @@ The tool has a number of command line options: .. code-block:: console - ./build/app/dpdk-pdump -- + ./<build_dir>/app/dpdk-pdump -- [--multi] --pdump '(port=<port id> | device_id=<pci id or vdev name>), (queue=<queue_id>), @@ -120,5 +117,5 @@ Example .. code-block:: console - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 0390b9c589..9772d97ef0 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,7 +17,7 @@ The application has a number of command line options: .. code-block:: console - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 393c3e9d0d..1fea7e0aa4 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -13,25 +13,10 @@ parameters passed to a python running script. Compiling the Application ------------------------- -**Step 1: PMD setting** +**Build the application** -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The bbdevice drivers PMD which should be tested can be enabled by setting +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` - -Setting example for (*baseband_turbo_sw*) PMD - - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` - -**Step 2: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-bbdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -60,7 +45,7 @@ The following are the command-line options: ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` Indicates the path to the bbdev test app. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with "*/build/app/testbbdev*". + on "../.." concatenated with "*/build/app/testbbdev*". ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` Specifies EAL arguments which are passed to the test app. For more details, @@ -82,9 +67,8 @@ The following are the command-line options: ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR [TEST_VECTOR ...]`` Specifies paths to the test vector files. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default - data file. + on "../.." concatenated with "*/app/test-bbdev/test_vectors/bbdev_null.data*" +and indicates default data file. **Example usage:** @@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes and processing parameters while still keeping their number limited as part of sanity regression. -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linux-icc target: +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output +to the build directory: :: @@ -268,7 +252,7 @@ x86_64-native-linux-icc target: |-- test-bbdev |-- test_vectors - |-- x86_64-native-linux-icc + |-- build |-- app |-- testbbdev @@ -277,7 +261,7 @@ All bbdev devices .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -291,7 +275,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/* -n 64 -b 8 32 diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst index 2ed67a6340..00387ec4ed 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -15,11 +15,8 @@ Compiling the Application **Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-eventdev`` application. +See :doc:`../linux_gsg/build_dpdk.rst` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -251,7 +248,7 @@ Example command to run order queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ --test=order_queue --plcores 1 --wlcores 2,3 @@ -314,7 +311,7 @@ Example command to run order ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=order_atq --plcores 1 --wlcores 2,3 @@ -414,7 +411,7 @@ Example command to run perf queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf queue test with ethernet ports: @@ -428,7 +425,7 @@ Example command to run perf queue test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ --prod_type_timerdev --fwd_latency @@ -514,14 +511,14 @@ Example command to run perf ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf ``all types queue`` test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ --stlist=a --prod_type_timerdev --fwd_latency @@ -633,7 +630,7 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a @@ -725,5 +722,5 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (29 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 30/31] doc: remove reference to make from tools guides Thomas Monjalon @ 2020-09-07 22:07 ` Thomas Monjalon 2020-09-08 10:16 ` Thomas Monjalon 2020-09-08 8:16 ` [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK Bruce Richardson 2020-09-08 13:02 ` David Marchand 32 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-07 22:07 UTC (permalink / raw) To: dev; +Cc: david.marchand, bruce.richardson, ciara.power, Louise Kilheeney From: Ciara Power <ciara.power@intel.com> Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> --- doc/guides/contributing/design.rst | 127 ++-------------------- doc/guides/contributing/documentation.rst | 31 +----- 2 files changed, 13 insertions(+), 145 deletions(-) diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..6ce0de97ac 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,22 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. - In this case, the code is split into two separate files that are architecture or environment specific. - This should only apply inside the EAL library. - -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -73,111 +65,6 @@ Adding a new static field or flag must be an exception matching many criteria like (non exhaustive): wide usage, performance, size. -Library Statistics ------------------- - -Description -~~~~~~~~~~~ - -This document describes the guidelines for DPDK library-level statistics counter -support. This includes guidelines for turning library statistics on and off and -requirements for preventing ABI changes when implementing statistics. - - -Mechanism to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are -collected for all the instances of every object type provided by the library. -When this flag is cleared, none of the counters supported by the current library -are collected for any instance of any object type provided by the library: - -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - - -Prevention of ABI changes due to library statistics support -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The layout of data structures and prototype of functions that are part of the -library API should not be affected by whether the collection of statistics -counters is turned on or off for the current library. In practical terms, this -means that space should always be allocated in the API data structures for -statistics counters and the statistics related API functions are always built -into the code, regardless of whether the statistics counter collection is turned -on or off for the current library. - -When the collection of statistics counters for the current library is turned -off, the counters retrieved through the statistics related API functions should -have a default value of zero. - - -Motivation to allow the application to turn library statistics on and off -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -It is highly recommended that each library provides statistics counters to allow -an application to monitor the library-level run-time events. Typical counters -are: number of packets received/dropped/transmitted, number of buffers -allocated/freed, number of occurrences for specific events, etc. - -However, the resources consumed for library-level statistics counter collection -have to be spent out of the application budget and the counters collected by -some libraries might not be relevant to the current application. In order to -avoid any unwanted waste of resources and/or performance impacts, the -application should decide at build time whether the collection of library-level -statistics counters should be turned on or off for each library individually. - -Library-level statistics counters can be relevant or not for specific -applications: - -* For Application A, counters maintained by Library X are always relevant and - the application needs to use them to implement certain features, such as traffic - accounting, logging, application-level statistics, etc. In this case, - the application requires that collection of statistics counters for Library X is - always turned on. - -* For Application B, counters maintained by Library X are only useful during the - application debug stage and are not relevant once debug phase is over. In this - case, the application may decide to turn on the collection of Library X - statistics counters during the debug phase and at a later stage turn them off. - -* For Application C, counters maintained by Library X are not relevant at all. - It might be that the application maintains its own set of statistics counters - that monitor a different set of run-time events (e.g. number of connection - requests, number of active users, etc). It might also be that the application - uses multiple libraries (Library X, Library Y, etc) and it is interested in the - statistics counters of Library Y, but not in those of Library X. In this case, - the application may decide to turn the collection of statistics counters off for - Library X and on for Library Y. - -The statistics collection consumes a certain amount of CPU resources (cycles, -cache bandwidth, memory bandwidth, etc) that depends on: - -* Number of libraries used by the current application that have statistics - counters collection turned on. - -* Number of statistics counters maintained by each library per object type - instance (e.g. per port, table, pipeline, thread, etc). - -* Number of instances created for each object type supported by each library. - -* Complexity of the statistics logic collection for each counter: when only - some occurrences of a specific event are valid, additional logic is typically - needed to decide whether the current occurrence of the event should be counted - or not. For example, in the event of packet reception, when only TCP packets - with destination port within a certain range should be recorded, conditional - branches are usually required. When processing a burst of packets that have been - validated for header integrity, counting the number of bits set in a bitmask - might be needed. - PF and VF Considerations ------------------------ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 375ea64ba8..768453126f 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -222,25 +222,14 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: +To enable doc building:: - make doc + meson configure -Denable_docs=true -* Generate the Doxygen API documentation in Html:: +See :doc:`../linux_gsg/build_dpdk` for more detail on compiling DPDK with meson. - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -255,10 +244,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -308,7 +293,7 @@ Line Length Long literal command lines can be shown wrapped with backslashes. For example:: - testpmd -l 2-3 -n 4 \ + dpdk-testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ --txd=1024 --rxd=1024 @@ -460,7 +445,7 @@ Code and Literal block sections For long literal lines that exceed that limit try to wrap the text at sensible locations. For example a long command line could be documented like this and still work if copied directly from the docs:: - build/app/testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ + ./<build_dir>/app/dpdk-testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ --vdev=net_pcap1,iface=eth1 \ -- -i --nb-cores=2 --nb-ports=2 \ --total-num-mbufs=2048 @@ -743,9 +728,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. -- 2.28.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide Thomas Monjalon @ 2020-09-08 10:16 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-08 10:16 UTC (permalink / raw) To: ciara.power; +Cc: dev, david.marchand, bruce.richardson, Louise Kilheeney On Tue Sep 8, 2020 at 2:07 AM CEST, Thomas Monjalon wrote: > From: Ciara Power <ciara.power@intel.com> > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> > --- > doc/guides/contributing/design.rst | 127 ++-------------------- > doc/guides/contributing/documentation.rst | 31 +----- > 2 files changed, 13 insertions(+), 145 deletions(-) As reported by David, an update is missing in patches.rst: devtools/test-build.sh reference should be removed ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (30 preceding siblings ...) 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide Thomas Monjalon @ 2020-09-08 8:16 ` Bruce Richardson 2020-09-08 9:05 ` Thomas Monjalon 2020-09-08 13:02 ` David Marchand 32 siblings, 1 reply; 300+ messages in thread From: Bruce Richardson @ 2020-09-08 8:16 UTC (permalink / raw) To: Thomas Monjalon; +Cc: dev, david.marchand, ciara.power On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: > The first 13 commits of this series are pushed to the main branch, > making the make-based build an old story. > > The last 18 commits (devtools, app and doc) are pending > for more reviews, especially because the doc rework is > still in progress. This is a big change which requires > to be split but must be completed soon. > *All*, please make the documentation update your highest priority. > I will be reluctant to merge some driver changes if the related doc > is not updated. > Thanks for the apply of the code patches, I think it will make all our subsequent patch submissions a bit cleaner. In terms of docs, I believe the Linux and FreeBSD GSG guides to be ready for merge, or if not 100% they are at least good enough IMHO to be applied now and have some minor tweaks in subsequent patches later. While I'm sure the Linux GSG could do with more major rework, that should be separate from the doc updates in this patch. /Bruce ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-08 8:16 ` [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK Bruce Richardson @ 2020-09-08 9:05 ` Thomas Monjalon 2020-09-15 14:02 ` David Marchand 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-08 9:05 UTC (permalink / raw) To: Bruce Richardson; +Cc: dev, david.marchand, ciara.power 08/09/2020 10:16, Bruce Richardson: > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: > > The first 13 commits of this series are pushed to the main branch, > > making the make-based build an old story. > > > > The last 18 commits (devtools, app and doc) are pending > > for more reviews, especially because the doc rework is > > still in progress. This is a big change which requires > > to be split but must be completed soon. > > *All*, please make the documentation update your highest priority. > > I will be reluctant to merge some driver changes if the related doc > > is not updated. > > > Thanks for the apply of the code patches, I think it will make all our > subsequent patch submissions a bit cleaner. > > In terms of docs, I believe the Linux and FreeBSD GSG guides to be ready > for merge, or if not 100% they are at least good enough IMHO to be applied > now and have some minor tweaks in subsequent patches later. While I'm sure > the Linux GSG could do with more major rework, that should be separate from > the doc updates in this patch. Of course I am not expecting any major rework in these patches, but I don't want to apply clean-up half done, which can drop some relevant informations or introduce mistakes. I will review the Linux and FreeBSD user guides first, as you suggest. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-08 9:05 ` Thomas Monjalon @ 2020-09-15 14:02 ` David Marchand 2020-09-15 15:08 ` Power, Ciara 0 siblings, 1 reply; 300+ messages in thread From: David Marchand @ 2020-09-15 14:02 UTC (permalink / raw) To: Thomas Monjalon, Nicolas Chautru; +Cc: Bruce Richardson, dev, Ciara Power On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon <thomas@monjalon.net> wrote: > > 08/09/2020 10:16, Bruce Richardson: > > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: > > > The first 13 commits of this series are pushed to the main branch, > > > making the make-based build an old story. > > > > > > The last 18 commits (devtools, app and doc) are pending > > > for more reviews, especially because the doc rework is > > > still in progress. This is a big change which requires > > > to be split but must be completed soon. > > > *All*, please make the documentation update your highest priority. > > > I will be reluctant to merge some driver changes if the related doc > > > is not updated. > > > > > Thanks for the apply of the code patches, I think it will make all our > > subsequent patch submissions a bit cleaner. > > > > In terms of docs, I believe the Linux and FreeBSD GSG guides to be ready > > for merge, or if not 100% they are at least good enough IMHO to be applied > > now and have some minor tweaks in subsequent patches later. While I'm sure > > the Linux GSG could do with more major rework, that should be separate from > > the doc updates in this patch. > > Of course I am not expecting any major rework in these patches, > but I don't want to apply clean-up half done, > which can drop some relevant informations or introduce mistakes. > > I will review the Linux and FreeBSD user guides first, as you suggest. I could not find a patch in patchwork for app/test-bbdev/test-bbdev.py which still references RTE_SDK and RTE_TARGET. -- David Marchand ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 14:02 ` David Marchand @ 2020-09-15 15:08 ` Power, Ciara 2020-09-15 15:44 ` Thomas Monjalon 2020-09-16 14:58 ` David Marchand 0 siblings, 2 replies; 300+ messages in thread From: Power, Ciara @ 2020-09-15 15:08 UTC (permalink / raw) To: David Marchand, Thomas Monjalon, Chautru, Nicolas; +Cc: Richardson, Bruce, dev Hi David, >-----Original Message----- >From: David Marchand <david.marchand@redhat.com> >Sent: Tuesday 15 September 2020 15:03 >To: Thomas Monjalon <thomas@monjalon.net>; Chautru, Nicolas ><nicolas.chautru@intel.com> >Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev <dev@dpdk.org>; >Power, Ciara <ciara.power@intel.com> >Subject: Re: [PATCH v4 00/31] remove make support in DPDK > >On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon <thomas@monjalon.net> >wrote: >> >> 08/09/2020 10:16, Bruce Richardson: >> > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: >> > > The first 13 commits of this series are pushed to the main branch, >> > > making the make-based build an old story. >> > > >> > > The last 18 commits (devtools, app and doc) are pending for more >> > > reviews, especially because the doc rework is still in progress. >> > > This is a big change which requires to be split but must be >> > > completed soon. >> > > *All*, please make the documentation update your highest priority. >> > > I will be reluctant to merge some driver changes if the related >> > > doc is not updated. >> > > >> > Thanks for the apply of the code patches, I think it will make all >> > our subsequent patch submissions a bit cleaner. >> > >> > In terms of docs, I believe the Linux and FreeBSD GSG guides to be >> > ready for merge, or if not 100% they are at least good enough IMHO >> > to be applied now and have some minor tweaks in subsequent patches >> > later. While I'm sure the Linux GSG could do with more major rework, >> > that should be separate from the doc updates in this patch. >> >> Of course I am not expecting any major rework in these patches, but I >> don't want to apply clean-up half done, which can drop some relevant >> informations or introduce mistakes. >> >> I will review the Linux and FreeBSD user guides first, as you suggest. > >I could not find a patch in patchwork for app/test-bbdev/test-bbdev.py which >still references RTE_SDK and RTE_TARGET. > > >-- >David Marchand Changes to test-bbdev.py were made in patch 15: https://patchwork.dpdk.org/patch/76796/ to remove the references to RTE_SDK and RTE_TARGET. Thanks, Ciara ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 15:08 ` Power, Ciara @ 2020-09-15 15:44 ` Thomas Monjalon 2020-09-15 15:57 ` Richardson, Bruce 2020-09-16 14:58 ` David Marchand 1 sibling, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-15 15:44 UTC (permalink / raw) To: David Marchand, Chautru, Nicolas, Power, Ciara; +Cc: Richardson, Bruce, dev 15/09/2020 17:08, Power, Ciara: > Hi David, > > > >-----Original Message----- > >From: David Marchand <david.marchand@redhat.com> > >Sent: Tuesday 15 September 2020 15:03 > >To: Thomas Monjalon <thomas@monjalon.net>; Chautru, Nicolas > ><nicolas.chautru@intel.com> > >Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev <dev@dpdk.org>; > >Power, Ciara <ciara.power@intel.com> > >Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > >On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon <thomas@monjalon.net> > >wrote: > >> > >> 08/09/2020 10:16, Bruce Richardson: > >> > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: > >> > > The first 13 commits of this series are pushed to the main branch, > >> > > making the make-based build an old story. > >> > > > >> > > The last 18 commits (devtools, app and doc) are pending for more > >> > > reviews, especially because the doc rework is still in progress. > >> > > This is a big change which requires to be split but must be > >> > > completed soon. > >> > > *All*, please make the documentation update your highest priority. > >> > > I will be reluctant to merge some driver changes if the related > >> > > doc is not updated. > >> > > > >> > Thanks for the apply of the code patches, I think it will make all > >> > our subsequent patch submissions a bit cleaner. > >> > > >> > In terms of docs, I believe the Linux and FreeBSD GSG guides to be > >> > ready for merge, or if not 100% they are at least good enough IMHO > >> > to be applied now and have some minor tweaks in subsequent patches > >> > later. While I'm sure the Linux GSG could do with more major rework, > >> > that should be separate from the doc updates in this patch. > >> > >> Of course I am not expecting any major rework in these patches, but I > >> don't want to apply clean-up half done, which can drop some relevant > >> informations or introduce mistakes. > >> > >> I will review the Linux and FreeBSD user guides first, as you suggest. > > > >I could not find a patch in patchwork for app/test-bbdev/test-bbdev.py which > >still references RTE_SDK and RTE_TARGET. > > > > > >-- > >David Marchand > > > Changes to test-bbdev.py were made in patch 15: https://patchwork.dpdk.org/patch/76796/ to remove the references to RTE_SDK and RTE_TARGET. I did not merge this patch because it is hardcoding "build" as a directory. I'm sure we can do better. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 15:44 ` Thomas Monjalon @ 2020-09-15 15:57 ` Richardson, Bruce 2020-09-15 16:10 ` Thomas Monjalon 0 siblings, 1 reply; 300+ messages in thread From: Richardson, Bruce @ 2020-09-15 15:57 UTC (permalink / raw) To: Thomas Monjalon, David Marchand, Chautru, Nicolas, Power, Ciara; +Cc: dev > -----Original Message----- > From: Thomas Monjalon <thomas@monjalon.net> > Sent: Tuesday, September 15, 2020 4:44 PM > To: David Marchand <david.marchand@redhat.com>; Chautru, Nicolas > <nicolas.chautru@intel.com>; Power, Ciara <ciara.power@intel.com> > Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev <dev@dpdk.org> > Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > 15/09/2020 17:08, Power, Ciara: > > Hi David, > > > > > > >-----Original Message----- > > >From: David Marchand <david.marchand@redhat.com> > > >Sent: Tuesday 15 September 2020 15:03 > > >To: Thomas Monjalon <thomas@monjalon.net>; Chautru, Nicolas > > ><nicolas.chautru@intel.com> > > >Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev > > ><dev@dpdk.org>; Power, Ciara <ciara.power@intel.com> > > >Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > > >On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon <thomas@monjalon.net> > > >wrote: > > >> > > >> 08/09/2020 10:16, Bruce Richardson: > > >> > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: > > >> > > The first 13 commits of this series are pushed to the main > > >> > > branch, making the make-based build an old story. > > >> > > > > >> > > The last 18 commits (devtools, app and doc) are pending for > > >> > > more reviews, especially because the doc rework is still in > progress. > > >> > > This is a big change which requires to be split but must be > > >> > > completed soon. > > >> > > *All*, please make the documentation update your highest > priority. > > >> > > I will be reluctant to merge some driver changes if the related > > >> > > doc is not updated. > > >> > > > > >> > Thanks for the apply of the code patches, I think it will make > > >> > all our subsequent patch submissions a bit cleaner. > > >> > > > >> > In terms of docs, I believe the Linux and FreeBSD GSG guides to > > >> > be ready for merge, or if not 100% they are at least good enough > > >> > IMHO to be applied now and have some minor tweaks in subsequent > > >> > patches later. While I'm sure the Linux GSG could do with more > > >> > major rework, that should be separate from the doc updates in this > patch. > > >> > > >> Of course I am not expecting any major rework in these patches, but > > >> I don't want to apply clean-up half done, which can drop some > > >> relevant informations or introduce mistakes. > > >> > > >> I will review the Linux and FreeBSD user guides first, as you > suggest. > > > > > >I could not find a patch in patchwork for > > >app/test-bbdev/test-bbdev.py which still references RTE_SDK and > RTE_TARGET. > > > > > > > > >-- > > >David Marchand > > > > > > Changes to test-bbdev.py were made in patch 15: > https://patchwork.dpdk.org/patch/76796/ to remove the references to > RTE_SDK and RTE_TARGET. > > I did not merge this patch because it is hardcoding "build" as a > directory. > I'm sure we can do better. > We probably can, but is it really worth holding up the patch over something as trivial as that? It is really likely to cause people issues? ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 15:57 ` Richardson, Bruce @ 2020-09-15 16:10 ` Thomas Monjalon 2020-09-15 16:39 ` Chautru, Nicolas 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-09-15 16:10 UTC (permalink / raw) To: David Marchand, Chautru, Nicolas, Power, Ciara, Richardson, Bruce; +Cc: dev 15/09/2020 17:57, Richardson, Bruce: > > > -----Original Message----- > > From: Thomas Monjalon <thomas@monjalon.net> > > Sent: Tuesday, September 15, 2020 4:44 PM > > To: David Marchand <david.marchand@redhat.com>; Chautru, Nicolas > > <nicolas.chautru@intel.com>; Power, Ciara <ciara.power@intel.com> > > Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev <dev@dpdk.org> > > Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > 15/09/2020 17:08, Power, Ciara: > > > Hi David, > > > > > > > > > >-----Original Message----- > > > >From: David Marchand <david.marchand@redhat.com> > > > >Sent: Tuesday 15 September 2020 15:03 > > > >To: Thomas Monjalon <thomas@monjalon.net>; Chautru, Nicolas > > > ><nicolas.chautru@intel.com> > > > >Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev > > > ><dev@dpdk.org>; Power, Ciara <ciara.power@intel.com> > > > >Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > > > > >On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon <thomas@monjalon.net> > > > >wrote: > > > >> > > > >> 08/09/2020 10:16, Bruce Richardson: > > > >> > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote: > > > >> > > The first 13 commits of this series are pushed to the main > > > >> > > branch, making the make-based build an old story. > > > >> > > > > > >> > > The last 18 commits (devtools, app and doc) are pending for > > > >> > > more reviews, especially because the doc rework is still in > > progress. > > > >> > > This is a big change which requires to be split but must be > > > >> > > completed soon. > > > >> > > *All*, please make the documentation update your highest > > priority. > > > >> > > I will be reluctant to merge some driver changes if the related > > > >> > > doc is not updated. > > > >> > > > > > >> > Thanks for the apply of the code patches, I think it will make > > > >> > all our subsequent patch submissions a bit cleaner. > > > >> > > > > >> > In terms of docs, I believe the Linux and FreeBSD GSG guides to > > > >> > be ready for merge, or if not 100% they are at least good enough > > > >> > IMHO to be applied now and have some minor tweaks in subsequent > > > >> > patches later. While I'm sure the Linux GSG could do with more > > > >> > major rework, that should be separate from the doc updates in this > > patch. > > > >> > > > >> Of course I am not expecting any major rework in these patches, but > > > >> I don't want to apply clean-up half done, which can drop some > > > >> relevant informations or introduce mistakes. > > > >> > > > >> I will review the Linux and FreeBSD user guides first, as you > > suggest. > > > > > > > >I could not find a patch in patchwork for > > > >app/test-bbdev/test-bbdev.py which still references RTE_SDK and > > RTE_TARGET. > > > > > > > > > > > >-- > > > >David Marchand > > > > > > > > > Changes to test-bbdev.py were made in patch 15: > > https://patchwork.dpdk.org/patch/76796/ to remove the references to > > RTE_SDK and RTE_TARGET. > > > > I did not merge this patch because it is hardcoding "build" as a > > directory. > > I'm sure we can do better. > > > > We probably can, but is it really worth holding up the patch over something as trivial as that? It is really likely to cause people issues? I give one more week to Nicolas to better fix this script. If not, I will merge that patch as is. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 16:10 ` Thomas Monjalon @ 2020-09-15 16:39 ` Chautru, Nicolas 2020-09-15 16:42 ` Thomas Monjalon 0 siblings, 1 reply; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-15 16:39 UTC (permalink / raw) To: Thomas Monjalon, David Marchand, Power, Ciara, Richardson, Bruce; +Cc: dev Hi, > From: Thomas Monjalon <thomas@monjalon.net> > Sent: Tuesday, September 15, 2020 9:11 AM > To: David Marchand <david.marchand@redhat.com>; Chautru, Nicolas > <nicolas.chautru@intel.com>; Power, Ciara <ciara.power@intel.com>; > Richardson, Bruce <bruce.richardson@intel.com> > Cc: dev <dev@dpdk.org> > Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > 15/09/2020 17:57, Richardson, Bruce: > > > > > -----Original Message----- > > > From: Thomas Monjalon <thomas@monjalon.net> > > > Sent: Tuesday, September 15, 2020 4:44 PM > > > To: David Marchand <david.marchand@redhat.com>; Chautru, Nicolas > > > <nicolas.chautru@intel.com>; Power, Ciara <ciara.power@intel.com> > > > Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev > > > <dev@dpdk.org> > > > Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > > > 15/09/2020 17:08, Power, Ciara: > > > > Hi David, > > > > > > > > > > > > >-----Original Message----- > > > > >From: David Marchand <david.marchand@redhat.com> > > > > >Sent: Tuesday 15 September 2020 15:03 > > > > >To: Thomas Monjalon <thomas@monjalon.net>; Chautru, Nicolas > > > > ><nicolas.chautru@intel.com> > > > > >Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev > > > > ><dev@dpdk.org>; Power, Ciara <ciara.power@intel.com> > > > > >Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > > > > > > >On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon > > > > ><thomas@monjalon.net> > > > > >wrote: > > > > >> > > > > >> 08/09/2020 10:16, Bruce Richardson: > > > > >> > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon > wrote: > > > > >> > > The first 13 commits of this series are pushed to the main > > > > >> > > branch, making the make-based build an old story. > > > > >> > > > > > > >> > > The last 18 commits (devtools, app and doc) are pending for > > > > >> > > more reviews, especially because the doc rework is still in > > > progress. > > > > >> > > This is a big change which requires to be split but must be > > > > >> > > completed soon. > > > > >> > > *All*, please make the documentation update your highest > > > priority. > > > > >> > > I will be reluctant to merge some driver changes if the > > > > >> > > related doc is not updated. > > > > >> > > > > > > >> > Thanks for the apply of the code patches, I think it will > > > > >> > make all our subsequent patch submissions a bit cleaner. > > > > >> > > > > > >> > In terms of docs, I believe the Linux and FreeBSD GSG guides > > > > >> > to be ready for merge, or if not 100% they are at least good > > > > >> > enough IMHO to be applied now and have some minor tweaks in > > > > >> > subsequent patches later. While I'm sure the Linux GSG could > > > > >> > do with more major rework, that should be separate from the > > > > >> > doc updates in this > > > patch. > > > > >> > > > > >> Of course I am not expecting any major rework in these patches, > > > > >> but I don't want to apply clean-up half done, which can drop > > > > >> some relevant informations or introduce mistakes. > > > > >> > > > > >> I will review the Linux and FreeBSD user guides first, as you > > > suggest. > > > > > > > > > >I could not find a patch in patchwork for > > > > >app/test-bbdev/test-bbdev.py which still references RTE_SDK and > > > RTE_TARGET. > > > > > > > > > > > > > > >-- > > > > >David Marchand > > > > > > > > > > > > Changes to test-bbdev.py were made in patch 15: > > > https://patchwork.dpdk.org/patch/76796/ to remove the references to > > > RTE_SDK and RTE_TARGET. > > > > > > I did not merge this patch because it is hardcoding "build" as a > > > directory. > > > I'm sure we can do better. > > > > > > > We probably can, but is it really worth holding up the patch over something as > trivial as that? It is really likely to cause people issues? > > I give one more week to Nicolas to better fix this script. > If not, I will merge that patch as is. > Hi Thomas, Ciara, I had raised that concern a couple of weeks ago but I was personally satisfied with document pointing to `build` as default staging build directory and seeing limited reason in practice for it to be impactful for bbdev users. Also the argument to the script `-p` can be used to bypass default path to any location. See reply here https://patches.dpdk.org/patch/76426/ The only request I had was to change the default name of the binary (mentioned on same link above) and I don't see that change being made (I may just miss the superseding patch though) Thanks Nic ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 16:39 ` Chautru, Nicolas @ 2020-09-15 16:42 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-15 16:42 UTC (permalink / raw) To: David Marchand, Power, Ciara, Richardson, Bruce, Chautru, Nicolas; +Cc: dev 15/09/2020 18:39, Chautru, Nicolas: > Hi, > > > From: Thomas Monjalon <thomas@monjalon.net> > > Sent: Tuesday, September 15, 2020 9:11 AM > > To: David Marchand <david.marchand@redhat.com>; Chautru, Nicolas > > <nicolas.chautru@intel.com>; Power, Ciara <ciara.power@intel.com>; > > Richardson, Bruce <bruce.richardson@intel.com> > > Cc: dev <dev@dpdk.org> > > Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > 15/09/2020 17:57, Richardson, Bruce: > > > > > > > -----Original Message----- > > > > From: Thomas Monjalon <thomas@monjalon.net> > > > > Sent: Tuesday, September 15, 2020 4:44 PM > > > > To: David Marchand <david.marchand@redhat.com>; Chautru, Nicolas > > > > <nicolas.chautru@intel.com>; Power, Ciara <ciara.power@intel.com> > > > > Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev > > > > <dev@dpdk.org> > > > > Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > > > > > 15/09/2020 17:08, Power, Ciara: > > > > > Hi David, > > > > > > > > > > > > > > > >-----Original Message----- > > > > > >From: David Marchand <david.marchand@redhat.com> > > > > > >Sent: Tuesday 15 September 2020 15:03 > > > > > >To: Thomas Monjalon <thomas@monjalon.net>; Chautru, Nicolas > > > > > ><nicolas.chautru@intel.com> > > > > > >Cc: Richardson, Bruce <bruce.richardson@intel.com>; dev > > > > > ><dev@dpdk.org>; Power, Ciara <ciara.power@intel.com> > > > > > >Subject: Re: [PATCH v4 00/31] remove make support in DPDK > > > > > > > > > > > >On Tue, Sep 8, 2020 at 11:05 AM Thomas Monjalon > > > > > ><thomas@monjalon.net> > > > > > >wrote: > > > > > >> > > > > > >> 08/09/2020 10:16, Bruce Richardson: > > > > > >> > On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon > > wrote: > > > > > >> > > The first 13 commits of this series are pushed to the main > > > > > >> > > branch, making the make-based build an old story. > > > > > >> > > > > > > > >> > > The last 18 commits (devtools, app and doc) are pending for > > > > > >> > > more reviews, especially because the doc rework is still in > > > > progress. > > > > > >> > > This is a big change which requires to be split but must be > > > > > >> > > completed soon. > > > > > >> > > *All*, please make the documentation update your highest > > > > priority. > > > > > >> > > I will be reluctant to merge some driver changes if the > > > > > >> > > related doc is not updated. > > > > > >> > > > > > > > >> > Thanks for the apply of the code patches, I think it will > > > > > >> > make all our subsequent patch submissions a bit cleaner. > > > > > >> > > > > > > >> > In terms of docs, I believe the Linux and FreeBSD GSG guides > > > > > >> > to be ready for merge, or if not 100% they are at least good > > > > > >> > enough IMHO to be applied now and have some minor tweaks in > > > > > >> > subsequent patches later. While I'm sure the Linux GSG could > > > > > >> > do with more major rework, that should be separate from the > > > > > >> > doc updates in this > > > > patch. > > > > > >> > > > > > >> Of course I am not expecting any major rework in these patches, > > > > > >> but I don't want to apply clean-up half done, which can drop > > > > > >> some relevant informations or introduce mistakes. > > > > > >> > > > > > >> I will review the Linux and FreeBSD user guides first, as you > > > > suggest. > > > > > > > > > > > >I could not find a patch in patchwork for > > > > > >app/test-bbdev/test-bbdev.py which still references RTE_SDK and > > > > RTE_TARGET. > > > > > > > > > > > > > > > > > >-- > > > > > >David Marchand > > > > > > > > > > > > > > > Changes to test-bbdev.py were made in patch 15: > > > > https://patchwork.dpdk.org/patch/76796/ to remove the references to > > > > RTE_SDK and RTE_TARGET. > > > > > > > > I did not merge this patch because it is hardcoding "build" as a > > > > directory. > > > > I'm sure we can do better. > > > > > > > > > > We probably can, but is it really worth holding up the patch over something as > > trivial as that? It is really likely to cause people issues? > > > > I give one more week to Nicolas to better fix this script. > > If not, I will merge that patch as is. > > > > Hi Thomas, Ciara, > I had raised that concern a couple of weeks ago but I was personally satisfied with document pointing to `build` as default staging build directory and seeing limited reason in practice for it to be impactful for bbdev users. > Also the argument to the script `-p` can be used to bypass default path to any location. > See reply here https://patches.dpdk.org/patch/76426/ > The only request I had was to change the default name of the binary (mentioned on same link above) and I don't see that change being made (I may just miss the superseding patch though) You're right, I remember it was the other reason for not merging. In any case, I will wait for Ack from Nicolas. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-15 15:08 ` Power, Ciara 2020-09-15 15:44 ` Thomas Monjalon @ 2020-09-16 14:58 ` David Marchand 1 sibling, 0 replies; 300+ messages in thread From: David Marchand @ 2020-09-16 14:58 UTC (permalink / raw) To: Power, Ciara; +Cc: Thomas Monjalon, Chautru, Nicolas, Richardson, Bruce, dev On Tue, Sep 15, 2020 at 5:08 PM Power, Ciara <ciara.power@intel.com> wrote: > >I could not find a patch in patchwork for app/test-bbdev/test-bbdev.py which > >still references RTE_SDK and RTE_TARGET. > Changes to test-bbdev.py were made in patch 15: https://patchwork.dpdk.org/patch/76796/ to remove the references to RTE_SDK and RTE_TARGET. Err, indeed, and I thought I had checked this series... Thanks Ciara. -- David Marchand ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon ` (31 preceding siblings ...) 2020-09-08 8:16 ` [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK Bruce Richardson @ 2020-09-08 13:02 ` David Marchand 32 siblings, 0 replies; 300+ messages in thread From: David Marchand @ 2020-09-08 13:02 UTC (permalink / raw) To: Thomas Monjalon; +Cc: dev, Bruce Richardson, Ciara Power On Tue, Sep 8, 2020 at 12:07 AM Thomas Monjalon <thomas@monjalon.net> wrote: > > The first 13 commits of this series are pushed to the main branch, > making the make-based build an old story. > [snip] > doc/guides/rawdevs/octeontx2_ep.rst | 8 - > doc/guides/rel_notes/deprecation.rst | 7 - > doc/guides/sample_app_ug/bbdev_app.rst | 34 +- [snip] Patch 11 applied on the main branch dropped the deprecation notice but we are missing an update in the 20.11 release notes to announce the removal. Can this be fixed with the rest of the patches? Thanks. -- David Marchand ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 00/20] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (22 preceding siblings ...) 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 01/20] devtools: remove legacy flags from includes check Ciara Power ` (20 more replies) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power 25 siblings, 21 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power This patchset includes the remaining 18 patches that were not merged along with the others in v4, pending rework and more review. *All*, please make the documentation update your highest priority. v5: - Added patch to update cheatsheet. - Added patch to update release notes. - Fixed outstanding comments on v3/v4. v4: rearrange commits and fix as commented v3: Fixed comments on v2. v2: - Fixed comments on v1. - Removed additional make references. - Added some meson replacements where necessary. - Added dummy root Makefile. As previously decided [1] and communicated via deprecation notice [2], the make build system is to be removed in the 20.11 release. This patchset removes support for compiling DPDK with the legacy make build system. Some make support is maintained for example applications, where pkg-config is used rather than the legacy make method. References to the make build system are removed from all documentation, please review to see if replacement meson instructions are needed in some cases. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 Ciara Power (19): devtools: remove legacy flags from includes check app: remove references to make-based config doc: remove references to make from Linux guide doc: remove references to make from FreeBSD guide doc: remove references to make from howto guides doc: remove references to make from prog guide doc: remove references to make from platforms guides doc: remove references to make from mempool guide doc: remove references to make from NICs guides doc: remove references to make from vdpadevs guides doc: remove references to make from bbdevs guides doc: remove references to make from cryptodevs guides doc: remove references to make from compressdevs guides doc: remove references to make from eventdevs guides doc: remove references to make from rawdevs guides doc: remove references to make from app guides doc: remove reference to make from tools guides doc: remove references to make from contributing guide doc: add to release notes to reflect removal of make Kevin Laatz (1): doc: update patch cheatsheet to use meson app/test-bbdev/test-bbdev.py | 13 +- app/test/test_cryptodev.c | 89 +-- app/test/test_cryptodev_asym.c | 18 +- devtools/check-includes.sh | 11 +- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 +- doc/guides/bbdevs/fpga_lte_fec.rst | 7 +- doc/guides/bbdevs/turbo_sw.rst | 23 +- doc/guides/compressdevs/isal.rst | 4 - doc/guides/compressdevs/octeontx.rst | 24 +- doc/guides/compressdevs/zlib.rst | 4 - doc/guides/contributing/design.rst | 41 +- doc/guides/contributing/documentation.rst | 31 +- .../contributing/img/patch_cheatsheet.svg | 582 ++++++++---------- doc/guides/contributing/patches.rst | 6 +- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 - doc/guides/cryptodevs/caam_jr.rst | 30 - doc/guides/cryptodevs/ccp.rst | 14 +- doc/guides/cryptodevs/dpaa2_sec.rst | 25 - doc/guides/cryptodevs/dpaa_sec.rst | 25 - doc/guides/cryptodevs/kasumi.rst | 11 +- doc/guides/cryptodevs/mvsam.rst | 10 +- doc/guides/cryptodevs/nitrox.rst | 7 - doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +- doc/guides/cryptodevs/octeontx2.rst | 8 +- doc/guides/cryptodevs/openssl.rst | 6 +- doc/guides/cryptodevs/qat.rst | 67 +- doc/guides/cryptodevs/scheduler.rst | 8 - doc/guides/cryptodevs/snow3g.rst | 10 +- doc/guides/cryptodevs/virtio.rst | 20 +- doc/guides/cryptodevs/zuc.rst | 10 +- doc/guides/eventdevs/dpaa.rst | 20 - doc/guides/eventdevs/dpaa2.rst | 20 - doc/guides/eventdevs/octeontx.rst | 24 - doc/guides/eventdevs/octeontx2.rst | 8 - doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +- doc/guides/howto/packet_capture_framework.rst | 21 +- doc/guides/howto/pvp_reference_benchmark.rst | 27 +- doc/guides/howto/vfd.rst | 4 +- .../virtio_user_for_container_networking.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 16 +- doc/guides/linux_gsg/build_sample_apps.rst | 18 +- doc/guides/linux_gsg/enable_func.rst | 13 +- doc/guides/linux_gsg/linux_drivers.rst | 18 +- doc/guides/linux_gsg/sys_reqs.rst | 6 +- doc/guides/mempool/octeontx.rst | 28 +- doc/guides/mempool/octeontx2.rst | 10 +- doc/guides/nics/ark.rst | 26 - doc/guides/nics/atlantic.rst | 4 - doc/guides/nics/axgbe.rst | 15 - doc/guides/nics/bnx2x.rst | 27 - doc/guides/nics/bnxt.rst | 5 +- doc/guides/nics/build_and_test.rst | 8 +- doc/guides/nics/cxgbe.rst | 36 +- doc/guides/nics/dpaa.rst | 27 +- doc/guides/nics/dpaa2.rst | 26 +- doc/guides/nics/ena.rst | 16 - doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 - doc/guides/nics/fail_safe.rst | 20 +- doc/guides/nics/features.rst | 9 - doc/guides/nics/fm10k.rst | 4 - doc/guides/nics/hinic.rst | 9 - doc/guides/nics/hns3.rst | 10 - doc/guides/nics/i40e.rst | 44 +- doc/guides/nics/ice.rst | 25 +- doc/guides/nics/igc.rst | 18 +- doc/guides/nics/intel_vf.rst | 13 +- doc/guides/nics/ionic.rst | 8 - doc/guides/nics/ipn3ke.rst | 12 +- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 - doc/guides/nics/memif.rst | 10 +- doc/guides/nics/mlx4.rst | 55 +- doc/guides/nics/mlx5.rst | 62 +- doc/guides/nics/mvneta.rst | 36 +- doc/guides/nics/mvpp2.rst | 43 +- doc/guides/nics/nfb.rst | 19 +- doc/guides/nics/nfp.rst | 4 - doc/guides/nics/null.rst | 6 +- doc/guides/nics/octeontx.rst | 19 +- doc/guides/nics/octeontx2.rst | 13 +- doc/guides/nics/pcap_ring.rst | 24 +- doc/guides/nics/qede.rst | 17 +- doc/guides/nics/sfc_efx.rst | 15 - doc/guides/nics/softnic.rst | 13 +- doc/guides/nics/szedata2.rst | 18 +- doc/guides/nics/thunderx.rst | 25 +- doc/guides/nics/vdev_netvsc.rst | 6 - doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- doc/guides/platform/bluefield.rst | 22 - doc/guides/platform/octeontx.rst | 33 +- doc/guides/platform/octeontx2.rst | 32 - .../prog_guide/env_abstraction_layer.rst | 17 +- doc/guides/prog_guide/graph_lib.rst | 6 +- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 - .../prog_guide/kernel_nic_interface.rst | 14 +- .../link_bonding_poll_mode_drv_lib.rst | 15 +- doc/guides/prog_guide/lto.rst | 12 +- doc/guides/prog_guide/mbuf_lib.rst | 4 +- doc/guides/prog_guide/mempool_lib.rst | 7 +- doc/guides/prog_guide/profile_app.rst | 17 +- doc/guides/prog_guide/qos_framework.rst | 10 +- doc/guides/prog_guide/rcu_lib.rst | 7 +- doc/guides/prog_guide/trace_lib.rst | 3 +- .../prog_guide/writing_efficient_code.rst | 3 +- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 - doc/guides/rawdevs/dpaa2_qdma.rst | 21 - doc/guides/rawdevs/ifpga.rst | 10 - doc/guides/rawdevs/ioat.rst | 8 +- doc/guides/rawdevs/ntb.rst | 6 - doc/guides/rawdevs/octeontx2_dma.rst | 12 - doc/guides/rawdevs/octeontx2_ep.rst | 8 - doc/guides/rel_notes/release_20_11.rst | 3 + doc/guides/sample_app_ug/bbdev_app.rst | 34 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +-- doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 +- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 +- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- doc/guides/tools/comp_perf.rst | 10 +- doc/guides/tools/cryptoperf.rst | 20 +- doc/guides/tools/pdump.rst | 15 +- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 38 +- doc/guides/tools/testeventdev.rst | 21 +- doc/guides/vdpadevs/ifc.rst | 13 - doc/guides/vdpadevs/mlx5.rst | 40 +- 178 files changed, 812 insertions(+), 2374 deletions(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 01/20] devtools: remove legacy flags from includes check 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 02/20] app: remove references to make-based config Ciara Power ` (19 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Thomas Monjalon Make is no longer supported, the test script for make builds is no longer required. Uses of make in other tool scripts are replaced. Signed-off-by: Ciara Power <ciara.power@intel.com> --- devtools/check-includes.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh index 749b9b26d2..940cf0eb2a 100755 --- a/devtools/check-includes.sh +++ b/devtools/check-includes.sh @@ -17,8 +17,7 @@ # # SUMMARY=1 is the same as -s. # -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and -# EXTRA_CXXFLAGS are taken into account. +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account. # # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict # C/C++ compilation flags. @@ -130,16 +129,16 @@ trap 'rm -f "$temp_cc" "$temp_cxx"' EXIT compile_cc () { ${CC} -I"$include_dir" \ - ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} ${EXTRA_CPPFLAGS} \ - ${PEDANTIC_CFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ + ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} \ + ${PEDANTIC_CFLAGS} ${CFLAGS} \ -c -o /dev/null "${temp_cc}" } compile_cxx () { ${CXX} -I"$include_dir" \ - ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} ${EXTRA_CPPFLAGS} \ - ${PEDANTIC_CXXFLAGS} ${CXXFLAGS} ${EXTRA_CXXFLAGS} \ + ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} \ + ${PEDANTIC_CXXFLAGS} ${CXXFLAGS} \ -c -o /dev/null "${temp_cxx}" } -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 02/20] app: remove references to make-based config 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 01/20] devtools: remove legacy flags from includes check Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 14:28 ` Chautru, Nicolas 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide Ciara Power ` (18 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Nicolas Chautru, Declan Doherty Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options are no longer in use. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v5: updated binary name to dpdk-test-bbdev --- app/test-bbdev/test-bbdev.py | 13 ++--- app/test/test_cryptodev.c | 89 +++++++++------------------------- app/test/test_cryptodev_asym.c | 18 ++----- 3 files changed, 29 insertions(+), 91 deletions(-) diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index 5ae2dc6c49..2d1f1dfc55 100755 --- a/app/test-bbdev/test-bbdev.py +++ b/app/test-bbdev/test-bbdev.py @@ -20,22 +20,15 @@ def kill(process): print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) print("Please use Python 3 instead", file=sys.stderr) -if "RTE_SDK" in os.environ: - dpdk_path = os.environ["RTE_SDK"] -else: - dpdk_path = "../.." - -if "RTE_TARGET" in os.environ: - dpdk_target = os.environ["RTE_TARGET"] -else: - dpdk_target = "x86_64-native-linux-gcc" +dpdk_path = "../.." +dpdk_target = "build" parser = argparse.ArgumentParser( description='BBdev Unit Test Application', formatter_class=argparse.ArgumentDefaultsHelpFormatter) parser.add_argument("-p", "--testapp-path", help="specifies path to the bbdev test app", - default=dpdk_path + "/" + dpdk_target + "/app/testbbdev") + default=dpdk_path + "/" + dpdk_target + "/app/dpdk-test-bbdev") parser.add_argument("-e", "--eal-params", help="EAL arguments which are passed to the test app", default="--vdev=baseband_null0") diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 70bf6fe2c1..153d001194 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both " - "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM " - "are enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n"); return TEST_FAILED; } @@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void) RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void) RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12814,9 +12800,7 @@ test_cryptodev_null(void) RTE_STR(CRYPTODEV_NAME_NULL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NULL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NULL PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12830,9 +12814,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12846,9 +12828,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12862,9 +12842,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_ZUC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12878,9 +12856,7 @@ test_cryptodev_armv8(void) RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12894,9 +12870,7 @@ test_cryptodev_mrvl(void) RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12912,16 +12886,13 @@ test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n"); return TEST_SKIPPED; } if (rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) { - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be" - " enabled in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); return TEST_SKIPPED; } return unit_test_suite_runner(&cryptodev_scheduler_testsuite); @@ -12938,9 +12909,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12954,9 +12923,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded.\n"); return TEST_SKIPPED; } @@ -12970,9 +12937,7 @@ test_cryptodev_ccp(void) RTE_STR(CRYPTODEV_NAME_CCP_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CCP is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CCP PMD must be loaded.\n"); return TEST_FAILED; } @@ -12985,10 +12950,7 @@ test_cryptodev_octeontx(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13000,10 +12962,7 @@ test_cryptodev_octeontx2(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_testsuite); @@ -13016,9 +12975,7 @@ test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/) RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded.\n"); return TEST_FAILED; } @@ -13032,9 +12989,7 @@ test_cryptodev_nitrox(void) RTE_STR(CRYPTODEV_NAME_NITROX_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "NITROX PMD must be loaded.\n"); return TEST_FAILED; } diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index dc62ed7bf3..85cd076059 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -2336,9 +2336,7 @@ test_cryptodev_openssl_asym(void) RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); return TEST_FAILED; } @@ -2352,9 +2350,7 @@ test_cryptodev_qat_asym(void) RTE_STR(CRYPTODEV_NAME_QAT_ASYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_QAT_ASYM is enabled " - "in config file to run this testsuite.\n"); + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); return TEST_FAILED; } @@ -2367,10 +2363,7 @@ test_cryptodev_octeontx_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); return TEST_FAILED; } return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); @@ -2382,10 +2375,7 @@ test_cryptodev_octeontx2_asym(void) gbl_driver_id = rte_cryptodev_driver_id_get( RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); if (gbl_driver_id == -1) { - RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded. Check if " - "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " - "enabled in config file to run this " - "testsuite.\n"); + RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n"); return TEST_FAILED; } -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 02/20] app: remove references to make-based config 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 02/20] app: remove references to make-based config Ciara Power @ 2020-09-21 14:28 ` Chautru, Nicolas 0 siblings, 0 replies; 300+ messages in thread From: Chautru, Nicolas @ 2020-09-21 14:28 UTC (permalink / raw) To: Power, Ciara, dev, Thomas Monjalon; +Cc: Doherty, Declan Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> Thanks for the update Nic > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > Sent: Monday, September 21, 2020 6:59 AM > To: dev@dpdk.org > Cc: Power, Ciara <ciara.power@intel.com>; Chautru, Nicolas > <nicolas.chautru@intel.com>; Doherty, Declan <declan.doherty@intel.com> > Subject: [PATCH v5 02/20] app: remove references to make-based config > > Make is no longer supported, RTE_SDK, RTE_TARGET and CONFIG options are > no longer in use. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > > --- > v5: updated binary name to dpdk-test-bbdev > --- > app/test-bbdev/test-bbdev.py | 13 ++--- > app/test/test_cryptodev.c | 89 +++++++++------------------------- > app/test/test_cryptodev_asym.c | 18 ++----- > 3 files changed, 29 insertions(+), 91 deletions(-) > > diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index > 5ae2dc6c49..2d1f1dfc55 100755 > --- a/app/test-bbdev/test-bbdev.py > +++ b/app/test-bbdev/test-bbdev.py > @@ -20,22 +20,15 @@ def kill(process): > print("WARNING: Python 2 is deprecated for use in DPDK, and will not work > in future releases.", file=sys.stderr) > print("Please use Python 3 instead", file=sys.stderr) > > -if "RTE_SDK" in os.environ: > - dpdk_path = os.environ["RTE_SDK"] > -else: > - dpdk_path = "../.." > - > -if "RTE_TARGET" in os.environ: > - dpdk_target = os.environ["RTE_TARGET"] > -else: > - dpdk_target = "x86_64-native-linux-gcc" > +dpdk_path = "../.." > +dpdk_target = "build" > > parser = argparse.ArgumentParser( > description='BBdev Unit Test Application', > formatter_class=argparse.ArgumentDefaultsHelpFormatter) > parser.add_argument("-p", "--testapp-path", > help="specifies path to the bbdev test app", > - default=dpdk_path + "/" + dpdk_target + "/app/testbbdev") > + default=dpdk_path + "/" + dpdk_target + > + "/app/dpdk-test-bbdev") > parser.add_argument("-e", "--eal-params", > help="EAL arguments which are passed to the test app", > default="--vdev=baseband_null0") diff --git > a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index > 70bf6fe2c1..153d001194 100644 > --- a/app/test/test_cryptodev.c > +++ b/app/test/test_cryptodev.c > @@ -12688,9 +12688,7 @@ test_cryptodev_qat(void /*argv __rte_unused, > int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that > both " > - "CONFIG_RTE_LIBRTE_PMD_QAT and > CONFIG_RTE_LIBRTE_PMD_QAT_SYM " > - "are enabled in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12704,9 +12702,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, > int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO > is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -12720,9 +12716,7 @@ test_cryptodev_aesni_mb(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12739,9 +12733,7 @@ test_cryptodev_cpu_aesni_mb(void) > RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12759,9 +12751,7 @@ test_cryptodev_openssl(void) > RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if > " > - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12775,9 +12765,7 @@ test_cryptodev_aesni_gcm(void) > RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12794,9 +12782,7 @@ test_cryptodev_cpu_aesni_gcm(void) > RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12814,9 +12800,7 @@ test_cryptodev_null(void) > RTE_STR(CRYPTODEV_NAME_NULL_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_NULL is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "NULL PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12830,9 +12814,7 @@ test_cryptodev_sw_snow3g(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_SNOW3G is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12846,9 +12828,7 @@ test_cryptodev_sw_kasumi(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_KASUMI_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_KASUMI is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12862,9 +12842,7 @@ test_cryptodev_sw_zuc(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_ZUC_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "ZUC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12878,9 +12856,7 @@ test_cryptodev_armv8(void) > RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_ARMV8 is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12894,9 +12870,7 @@ test_cryptodev_mrvl(void) > RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if > " > - "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO > is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12912,16 +12886,13 @@ test_cryptodev_scheduler(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. > Check if " > - "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > if (rte_cryptodev_driver_id_get( > > RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) { > - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB > must be" > - " enabled in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded.\n"); > return TEST_SKIPPED; > } > return unit_test_suite_runner(&cryptodev_scheduler_testsuite); > @@ -12938,9 +12909,7 @@ test_cryptodev_dpaa2_sec(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12954,9 +12923,7 @@ test_cryptodev_dpaa_sec(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded.\n"); > return TEST_SKIPPED; > } > > @@ -12970,9 +12937,7 @@ test_cryptodev_ccp(void) > RTE_STR(CRYPTODEV_NAME_CCP_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_CCP is enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "CCP PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -12985,10 +12950,7 @@ test_cryptodev_octeontx(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > > RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check > if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); > return TEST_FAILED; > } > return unit_test_suite_runner(&cryptodev_testsuite); > @@ -13000,10 +12962,7 @@ test_cryptodev_octeontx2(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. > Check if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded.\n"); > return TEST_FAILED; > } > return unit_test_suite_runner(&cryptodev_testsuite); > @@ -13016,9 +12975,7 @@ test_cryptodev_caam_jr(void /*argv > __rte_unused, int argc __rte_unused*/) > RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check > if " > - "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -13032,9 +12989,7 @@ test_cryptodev_nitrox(void) > RTE_STR(CRYPTODEV_NAME_NITROX_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_NITROX is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "NITROX PMD must be loaded.\n"); > return TEST_FAILED; > } > > diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c > index dc62ed7bf3..85cd076059 100644 > --- a/app/test/test_cryptodev_asym.c > +++ b/app/test/test_cryptodev_asym.c > @@ -2336,9 +2336,7 @@ test_cryptodev_openssl_asym(void) > RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if > " > - "CONFIG_RTE_LIBRTE_PMD_OPENSSL is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -2352,9 +2350,7 @@ test_cryptodev_qat_asym(void) > RTE_STR(CRYPTODEV_NAME_QAT_ASYM_PMD)); > > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if " > - "CONFIG_RTE_LIBRTE_PMD_QAT_ASYM is > enabled " > - "in config file to run this testsuite.\n"); > + RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n"); > return TEST_FAILED; > } > > @@ -2367,10 +2363,7 @@ test_cryptodev_octeontx_asym(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > > RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check > if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded.\n"); > return TEST_FAILED; > } > return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite); > @@ -2382,10 +2375,7 @@ test_cryptodev_octeontx2_asym(void) > gbl_driver_id = rte_cryptodev_driver_id_get( > RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)); > if (gbl_driver_id == -1) { > - RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded. > Check if " > - > "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is " > - "enabled in config file to run this " > - "testsuite.\n"); > + RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n"); > return TEST_FAILED; > } > > -- > 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 01/20] devtools: remove legacy flags from includes check Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 02/20] app: remove references to make-based config Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-30 22:09 ` Thomas Monjalon 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 04/20] doc: remove references to make from FreeBSD guide Ciara Power ` (17 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> --- doc/guides/linux_gsg/build_dpdk.rst | 16 +++++++++++----- doc/guides/linux_gsg/build_sample_apps.rst | 18 +++--------------- doc/guides/linux_gsg/enable_func.rst | 13 +++++-------- doc/guides/linux_gsg/linux_drivers.rst | 18 +++++++++++------- doc/guides/linux_gsg/sys_reqs.rst | 6 +----- 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index a895e1b0f4..85d04520bf 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -76,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` to update its cache to take distributions, `/usr/local/lib` and `/usr/local/lib64` should be added to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. +.. _adjusting_build_options: + Adjusting Build Options ~~~~~~~~~~~~~~~~~~~~~~~ @@ -112,6 +114,9 @@ dependencies are met on the current system are built. When `-Dexamples=all` is set as a meson option, meson will check each example application to see if it can be built, and add all which can be built to the list of tasks in the ninja build configuration file. +.. _building_app_using_installed_dpdk: + + Building Applications Using Installed DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -135,11 +140,12 @@ and the sources for that build are stored in ``$(SRCS-y)``. .. note:: - Unlike with the older make build system, the meson system is not - designed to be used directly from a build directory. Instead it is - recommended that it be installed either system-wide or to a known - location in the user's home directory. The install location can be set - using the `--prefix` meson option (default: `/usr/local`). + Unlike with the make build system present used in older DPDK releases, + the meson system is not designed to be used directly from a build + directory. Instead it is recommended that it be installed either + system-wide or to a known location in the user's home directory. + The install location can be set using the `--prefix` meson option + (default: `/usr/local`). an equivalent build recipe for a simple DPDK application using meson as a build system is shown below: diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2882883f95..f4bf0e71e5 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: BSD-3-Clause Copyright(c) 2010-2014 Intel Corporation. -Compiling and Running Sample Applications +Running Sample Applications ========================================= The chapter describes how to compile and run applications in an DPDK environment. @@ -119,7 +119,7 @@ Copy the DPDK application binary to your target, then run the application as fol (assuming the platform has four memory channels per processor socket, and that cores 0-3 are present and are to be used for running the application):: - ./helloworld -l 0-3 -n 4 + ./dpdk-helloworld -l 0-3 -n 4 .. note:: @@ -183,19 +183,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization Additional Sample Applications ------------------------------ -Additional sample applications are included in the ${RTE_SDK}/examples directory. +Additional sample applications are included in the DPDK examples directory. These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. In addition, see the *DPDK Sample Applications User Guide* for a description of the application, specific instructions on compilation and execution and some explanation of the code. - -Additional Test Applications ----------------------------- - -In addition, there are two other applications that are built when the libraries are created. -The source files for these are in the DPDK/app directory and are called test and testpmd. -Once the libraries are created, they can be found in the build/app directory. - -* The test application provides a variety of specific tests for the various functions in the DPDK. - -* The testpmd application provides a number of different packet throughput tests and - examples of features such as how to use the Flow Director found in the Intel® 82599 10 Gigabit Ethernet Controller. diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index b2bda80bb7..08f55d8543 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -41,7 +41,9 @@ Enabling HPET in the DPDK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, HPET support is disabled in the DPDK build configuration files. -To use HPET, the ``CONFIG_RTE_LIBEAL_USE_HPET`` setting should be changed to ``y``, which will enable the HPET settings at compile time. +To use HPET, use the following meson build option which will enable the HPET settings at compile time:: + + meson configure -Duse_hpet=true For an application to use the ``rte_get_hpet_cycles()`` and ``rte_get_hpet_hz()`` API calls, and optionally to make the HPET the default time source for the rte_timer library, @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module ---------------------------------- To run the DPDK Kernel NIC Interface (KNI) sample application, an extra kernel module (the kni module) must be loaded into the running kernel. -The module is found in the kmod sub-directory of the DPDK target directory. -Similar to the loading of the ``igb_uio`` module, this module should be loaded using the insmod command as shown below -(assuming that the current directory is the DPDK target directory): - -.. code-block:: console - - insmod kmod/rte_kni.ko +The module is found in the kernel/linux sub-directory of the DPDK build directory. +This can be enabled in the same way as the ``igb_uio`` module, please see :ref:`load_uio` for details. .. note:: diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst index 185074013a..349be1c906 100644 --- a/doc/guides/linux_gsg/linux_drivers.rst +++ b/doc/guides/linux_gsg/linux_drivers.rst @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in order to work properly. Depends on the PMD being used, a corresponding kernel driver should be load and bind to the network ports. +.. _load_uio: + + UIO --- @@ -28,19 +31,20 @@ can provide the uio capability. This module can be loaded using the command: ``uio_pci_generic`` module doesn't support the creation of virtual functions. As an alternative to the ``uio_pci_generic``, the DPDK also includes the igb_uio -module which can be found in the kmod subdirectory referred to above. It can +module which can be found in the kernel/linux subdirectory referred to above. It can be loaded as shown below: .. code-block:: console sudo modprobe uio - sudo insmod kmod/igb_uio.ko + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko .. note:: - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. - It is planned to move ``igb_uio`` module to a different git repository. + Building DPDK Linux kernel modules is disabled by default starting from DPDK v20.02. + To enable them again, the config option "enable_kmods" needs to be set in the meson + build configuration. See :ref:`adjusting_build_options` for details on how to set/clear + build options. It is planned to move ``igb_uio`` module to a different git repository. .. note:: @@ -104,11 +108,11 @@ parameter ``--vfio-vf-token``. 3. echo 2 > /sys/bus/pci/devices/0000:86:00.0/sriov_numvfs 4. Start the PF: - ./x86_64-native-linux-gcc/app/testpmd -l 22-25 -n 4 -w 86:00.0 \ + ./<build_dir>/app/dpdk-testpmd -l 22-25 -n 4 -w 86:00.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=pf -- -i 5. Start the VF: - ./x86_64-native-linux-gcc/app/testpmd -l 26-29 -n 4 -w 86:02.0 \ + ./<build_dir>/app/dpdk-testpmd -l 26-29 -n 4 -w 86:02.0 \ --vfio-vf-token=14d63f20-8445-11ea-8900-1f9ce7d5650d --file-prefix=vf0 -- -i Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index 6b9f573fce..625fb58066 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -43,11 +43,7 @@ Compilation of the DPDK * For Ubuntu/Debian systems these can be installed using ``apt install build-essential`` -* Python, recommended version 3.5+. - - * Python v3.5+ is needed to build DPDK using meson and ninja - - * Python 2.7+ or 3.2+, to use various helper scripts included in the DPDK package. +* Python, v3.5 or later. * Meson (version 0.47.1+) and ninja -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide Ciara Power @ 2020-09-30 22:09 ` Thomas Monjalon 2020-10-01 8:31 ` Power, Ciara 2020-10-01 8:36 ` Power, Ciara 0 siblings, 2 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-09-30 22:09 UTC (permalink / raw) To: Ciara Power; +Cc: dev, John McNamara, Marko Kovacevic Hi, Below are some comments. If you agree, I will do the changes myself while pushing to the main branch. 21/09/2020 15:59, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> > --- > doc/guides/linux_gsg/build_dpdk.rst | 16 +++++++++++----- > doc/guides/linux_gsg/build_sample_apps.rst | 18 +++--------------- > doc/guides/linux_gsg/enable_func.rst | 13 +++++-------- > doc/guides/linux_gsg/linux_drivers.rst | 18 +++++++++++------- > doc/guides/linux_gsg/sys_reqs.rst | 6 +----- > 5 files changed, 31 insertions(+), 40 deletions(-) > > diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst > index a895e1b0f4..85d04520bf 100644 > --- a/doc/guides/linux_gsg/build_dpdk.rst > +++ b/doc/guides/linux_gsg/build_dpdk.rst > @@ -76,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` to update its cache to take > distributions, `/usr/local/lib` and `/usr/local/lib64` should be added > to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. > > +.. _adjusting_build_options: > + extra blank line > > Adjusting Build Options > ~~~~~~~~~~~~~~~~~~~~~~~ > @@ -112,6 +114,9 @@ dependencies are met on the current system are built. > When `-Dexamples=all` is set as a meson option, meson will check each example application to see if it can be built, > and add all which can be built to the list of tasks in the ninja build configuration file. > > +.. _building_app_using_installed_dpdk: > + > + extra blank line > Building Applications Using Installed DPDK > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > @@ -135,11 +140,12 @@ and the sources for that build are stored in ``$(SRCS-y)``. > > .. note:: > > - Unlike with the older make build system, the meson system is not > - designed to be used directly from a build directory. Instead it is > - recommended that it be installed either system-wide or to a known > - location in the user's home directory. The install location can be set > - using the `--prefix` meson option (default: `/usr/local`). > + Unlike with the make build system present used in older DPDK releases, > + the meson system is not designed to be used directly from a build > + directory. Instead it is recommended that it be installed either > + system-wide or to a known location in the user's home directory. > + The install location can be set using the `--prefix` meson option > + (default: `/usr/local`). I prefer the first version. The words "system present used" look weird. Anyway, if any reword is needed, better to change only the impacted line and keep the rest of the line wrapping untouched. > > an equivalent build recipe for a simple DPDK application using meson as a > build system is shown below: > diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst > index 2882883f95..f4bf0e71e5 100644 > --- a/doc/guides/linux_gsg/build_sample_apps.rst > +++ b/doc/guides/linux_gsg/build_sample_apps.rst > @@ -1,7 +1,7 @@ > .. SPDX-License-Identifier: BSD-3-Clause > Copyright(c) 2010-2014 Intel Corporation. > > -Compiling and Running Sample Applications > +Running Sample Applications > ========================================= Underlining must be adjusted > > The chapter describes how to compile and run applications in an DPDK environment. > @@ -119,7 +119,7 @@ Copy the DPDK application binary to your target, then run the application as fol > (assuming the platform has four memory channels per processor socket, > and that cores 0-3 are present and are to be used for running the application):: > > - ./helloworld -l 0-3 -n 4 > + ./dpdk-helloworld -l 0-3 -n 4 > > .. note:: > > @@ -183,19 +183,7 @@ If the DPDK cannot allocate enough memory on each socket, the EAL initialization > Additional Sample Applications > ------------------------------ > > -Additional sample applications are included in the ${RTE_SDK}/examples directory. > +Additional sample applications are included in the DPDK examples directory. > These sample applications may be built and run in a manner similar to that described in earlier sections in this manual. > In addition, see the *DPDK Sample Applications User Guide* for a description of the application, > specific instructions on compilation and execution and some explanation of the code. > - > -Additional Test Applications > ----------------------------- > - > -In addition, there are two other applications that are built when the libraries are created. > -The source files for these are in the DPDK/app directory and are called test and testpmd. > -Once the libraries are created, they can be found in the build/app directory. > - > -* The test application provides a variety of specific tests for the various functions in the DPDK. > - > -* The testpmd application provides a number of different packet throughput tests and > - examples of features such as how to use the Flow Director found in the Intel® 82599 10 Gigabit Ethernet Controller. OK to remove the test applications from the page dedicated to samples. A lot of similar cleanup could be done if someone volunteers. > --- a/doc/guides/linux_gsg/enable_func.rst > +++ b/doc/guides/linux_gsg/enable_func.rst [...] > @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module > ---------------------------------- > > To run the DPDK Kernel NIC Interface (KNI) sample application, an extra kernel module (the kni module) must be loaded into the running kernel. > -The module is found in the kmod sub-directory of the DPDK target directory. > -Similar to the loading of the ``igb_uio`` module, this module should be loaded using the insmod command as shown below > -(assuming that the current directory is the DPDK target directory): > - > -.. code-block:: console > - > - insmod kmod/rte_kni.ko > +The module is found in the kernel/linux sub-directory of the DPDK build directory. > +This can be enabled in the same way as the ``igb_uio`` module, please see :ref:`load_uio` for details. The only relevant info in "load_uio" chapter is to use insmod. I think it is better to keep some lines above: It should be loaded using the insmod command:: insmod kmod/rte_kni.ko > --- a/doc/guides/linux_gsg/linux_drivers.rst > +++ b/doc/guides/linux_gsg/linux_drivers.rst > @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in order to work properly. > Depends on the PMD being used, a corresponding kernel driver should be load > and bind to the network ports. > > +.. _load_uio: > + > + This anchor is not need in my opinion. > UIO > --- > > @@ -28,19 +31,20 @@ can provide the uio capability. This module can be loaded using the command: > ``uio_pci_generic`` module doesn't support the creation of virtual functions. > > As an alternative to the ``uio_pci_generic``, the DPDK also includes the igb_uio > -module which can be found in the kmod subdirectory referred to above. It can > +module which can be found in the kernel/linux subdirectory referred to above. It can > be loaded as shown below: > > .. code-block:: console > > sudo modprobe uio > - sudo insmod kmod/igb_uio.ko > + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko > > .. note:: > > - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. > - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be enabled. > - It is planned to move ``igb_uio`` module to a different git repository. > + Building DPDK Linux kernel modules is disabled by default starting from DPDK v20.02. > + To enable them again, the config option "enable_kmods" needs to be set in the meson > + build configuration. See :ref:`adjusting_build_options` for details on how to set/clear > + build options. It is planned to move ``igb_uio`` module to a different git repository. In general it is better to split the lines logically to ease future patches diff. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide 2020-09-30 22:09 ` Thomas Monjalon @ 2020-10-01 8:31 ` Power, Ciara 2020-10-01 8:36 ` Power, Ciara 1 sibling, 0 replies; 300+ messages in thread From: Power, Ciara @ 2020-10-01 8:31 UTC (permalink / raw) To: Thomas Monjalon; +Cc: dev, Mcnamara, John, Kovacevic, Marko - Ciara - >-----Original Message----- >From: Thomas Monjalon <thomas@monjalon.net> >Sent: Wednesday 30 September 2020 23:09 >To: Power, Ciara <ciara.power@intel.com> >Cc: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>; Kovacevic, >Marko <marko.kovacevic@intel.com> >Subject: Re: [dpdk-dev] [PATCH v5 03/20] doc: remove references to make >from Linux guide > >Hi, > >Below are some comments. If you agree, I will do the changes myself while >pushing to the main branch. > > >21/09/2020 15:59, Ciara Power: >> Make is no longer supported for compiling DPDK, references are now >> removed in the documentation. >> >> Signed-off-by: Ciara Power <ciara.power@intel.com> >> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> >> --- >> doc/guides/linux_gsg/build_dpdk.rst | 16 +++++++++++----- >> doc/guides/linux_gsg/build_sample_apps.rst | 18 +++--------------- >> doc/guides/linux_gsg/enable_func.rst | 13 +++++-------- >> doc/guides/linux_gsg/linux_drivers.rst | 18 +++++++++++------- >> doc/guides/linux_gsg/sys_reqs.rst | 6 +----- >> 5 files changed, 31 insertions(+), 40 deletions(-) >> >> diff --git a/doc/guides/linux_gsg/build_dpdk.rst >> b/doc/guides/linux_gsg/build_dpdk.rst >> index a895e1b0f4..85d04520bf 100644 >> --- a/doc/guides/linux_gsg/build_dpdk.rst >> +++ b/doc/guides/linux_gsg/build_dpdk.rst >> @@ -76,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` >to update its cache to take >> distributions, `/usr/local/lib` and `/usr/local/lib64` should be added >> to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. >> >> +.. _adjusting_build_options: >> + > >extra blank line > >> >> Adjusting Build Options >> ~~~~~~~~~~~~~~~~~~~~~~~ >> @@ -112,6 +114,9 @@ dependencies are met on the current system are >built. >> When `-Dexamples=all` is set as a meson option, meson will check each >> example application to see if it can be built, and add all which can be built >to the list of tasks in the ninja build configuration file. >> >> +.. _building_app_using_installed_dpdk: >> + >> + > >extra blank line > >> Building Applications Using Installed DPDK >> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> >> @@ -135,11 +140,12 @@ and the sources for that build are stored in >``$(SRCS-y)``. >> >> .. note:: >> >> - Unlike with the older make build system, the meson system is not >> - designed to be used directly from a build directory. Instead it is >> - recommended that it be installed either system-wide or to a known >> - location in the user's home directory. The install location can be set >> - using the `--prefix` meson option (default: `/usr/local`). >> + Unlike with the make build system present used in older DPDK releases, >> + the meson system is not designed to be used directly from a build >> + directory. Instead it is recommended that it be installed either >> + system-wide or to a known location in the user's home directory. >> + The install location can be set using the `--prefix` meson option >> + (default: `/usr/local`). > >I prefer the first version. >The words "system present used" look weird. >Anyway, if any reword is needed, better to change only the impacted line and >keep the rest of the line wrapping untouched. > >> >> an equivalent build recipe for a simple DPDK application using meson >> as a build system is shown below: >> diff --git a/doc/guides/linux_gsg/build_sample_apps.rst >> b/doc/guides/linux_gsg/build_sample_apps.rst >> index 2882883f95..f4bf0e71e5 100644 >> --- a/doc/guides/linux_gsg/build_sample_apps.rst >> +++ b/doc/guides/linux_gsg/build_sample_apps.rst >> @@ -1,7 +1,7 @@ >> .. SPDX-License-Identifier: BSD-3-Clause >> Copyright(c) 2010-2014 Intel Corporation. >> >> -Compiling and Running Sample Applications >> +Running Sample Applications >> ========================================= > >Underlining must be adjusted > >> >> The chapter describes how to compile and run applications in an DPDK >environment. >> @@ -119,7 +119,7 @@ Copy the DPDK application binary to your target, >> then run the application as fol (assuming the platform has four >> memory channels per processor socket, and that cores 0-3 are present and >are to be used for running the application):: >> >> - ./helloworld -l 0-3 -n 4 >> + ./dpdk-helloworld -l 0-3 -n 4 >> >> .. note:: >> >> @@ -183,19 +183,7 @@ If the DPDK cannot allocate enough memory on >each >> socket, the EAL initialization Additional Sample Applications >> ------------------------------ >> >> -Additional sample applications are included in the ${RTE_SDK}/examples >directory. >> +Additional sample applications are included in the DPDK examples >directory. >> These sample applications may be built and run in a manner similar to that >described in earlier sections in this manual. >> In addition, see the *DPDK Sample Applications User Guide* for a >> description of the application, specific instructions on compilation and >execution and some explanation of the code. >> - >> -Additional Test Applications >> ----------------------------- >> - >> -In addition, there are two other applications that are built when the >libraries are created. >> -The source files for these are in the DPDK/app directory and are called test >and testpmd. >> -Once the libraries are created, they can be found in the build/app directory. >> - >> -* The test application provides a variety of specific tests for the various >functions in the DPDK. >> - >> -* The testpmd application provides a number of different packet >throughput tests and >> - examples of features such as how to use the Flow Director found in the >Intel(r) 82599 10 Gigabit Ethernet Controller. > >OK to remove the test applications from the page dedicated to samples. >A lot of similar cleanup could be done if someone volunteers. > >> --- a/doc/guides/linux_gsg/enable_func.rst >> +++ b/doc/guides/linux_gsg/enable_func.rst >[...] >> @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module >> ---------------------------------- >> >> To run the DPDK Kernel NIC Interface (KNI) sample application, an extra >kernel module (the kni module) must be loaded into the running kernel. >> -The module is found in the kmod sub-directory of the DPDK target >directory. >> -Similar to the loading of the ``igb_uio`` module, this module should >> be loaded using the insmod command as shown below -(assuming that the >current directory is the DPDK target directory): >> - >> -.. code-block:: console >> - >> - insmod kmod/rte_kni.ko >> +The module is found in the kernel/linux sub-directory of the DPDK build >directory. >> +This can be enabled in the same way as the ``igb_uio`` module, please see >:ref:`load_uio` for details. > >The only relevant info in "load_uio" chapter is to use insmod. >I think it is better to keep some lines above: > >It should be loaded using the insmod command:: > > insmod kmod/rte_kni.ko > >> --- a/doc/guides/linux_gsg/linux_drivers.rst >> +++ b/doc/guides/linux_gsg/linux_drivers.rst >> @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in >order to work properly. >> Depends on the PMD being used, a corresponding kernel driver should >> be load and bind to the network ports. >> >> +.. _load_uio: >> + >> + > >This anchor is not need in my opinion. > >> UIO >> --- >> >> @@ -28,19 +31,20 @@ can provide the uio capability. This module can be >loaded using the command: >> ``uio_pci_generic`` module doesn't support the creation of virtual >functions. >> >> As an alternative to the ``uio_pci_generic``, the DPDK also includes >> the igb_uio -module which can be found in the kmod subdirectory >> referred to above. It can >> +module which can be found in the kernel/linux subdirectory referred >> +to above. It can >> be loaded as shown below: >> >> .. code-block:: console >> >> sudo modprobe uio >> - sudo insmod kmod/igb_uio.ko >> + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko >> >> .. note:: >> >> - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. >> - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be >enabled. >> - It is planned to move ``igb_uio`` module to a different git repository. >> + Building DPDK Linux kernel modules is disabled by default starting from >DPDK v20.02. >> + To enable them again, the config option "enable_kmods" needs to be set >in the meson >> + build configuration. See :ref:`adjusting_build_options` for details on how >to set/clear >> + build options. It is planned to move ``igb_uio`` module to a different git >repository. > >In general it is better to split the lines logically to ease future patches diff. > > > > ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide 2020-09-30 22:09 ` Thomas Monjalon 2020-10-01 8:31 ` Power, Ciara @ 2020-10-01 8:36 ` Power, Ciara 2020-10-01 9:49 ` Thomas Monjalon 1 sibling, 1 reply; 300+ messages in thread From: Power, Ciara @ 2020-10-01 8:36 UTC (permalink / raw) To: Thomas Monjalon; +Cc: dev, Mcnamara, John, Kovacevic, Marko Hi Thomas, Apologies for the previous email, accidentally sent before I could fill it in! Most of these suggestions seem fine to me, left some comments inline. Thanks, Ciara >-----Original Message----- >From: Thomas Monjalon <thomas@monjalon.net> >Sent: Wednesday 30 September 2020 23:09 >To: Power, Ciara <ciara.power@intel.com> >Cc: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>; Kovacevic, >Marko <marko.kovacevic@intel.com> >Subject: Re: [dpdk-dev] [PATCH v5 03/20] doc: remove references to make >from Linux guide > >Hi, > >Below are some comments. If you agree, I will do the changes myself while >pushing to the main branch. > > >21/09/2020 15:59, Ciara Power: >> Make is no longer supported for compiling DPDK, references are now >> removed in the documentation. >> >> Signed-off-by: Ciara Power <ciara.power@intel.com> >> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> >> --- >> doc/guides/linux_gsg/build_dpdk.rst | 16 +++++++++++----- >> doc/guides/linux_gsg/build_sample_apps.rst | 18 +++--------------- >> doc/guides/linux_gsg/enable_func.rst | 13 +++++-------- >> doc/guides/linux_gsg/linux_drivers.rst | 18 +++++++++++------- >> doc/guides/linux_gsg/sys_reqs.rst | 6 +----- >> 5 files changed, 31 insertions(+), 40 deletions(-) >> >> diff --git a/doc/guides/linux_gsg/build_dpdk.rst >> b/doc/guides/linux_gsg/build_dpdk.rst >> index a895e1b0f4..85d04520bf 100644 >> --- a/doc/guides/linux_gsg/build_dpdk.rst >> +++ b/doc/guides/linux_gsg/build_dpdk.rst >> @@ -76,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` >to update its cache to take >> distributions, `/usr/local/lib` and `/usr/local/lib64` should be added >> to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. >> >> +.. _adjusting_build_options: >> + > >extra blank line Blank line here, and below, were added based on the contributing guide - " Add 2 blank lines before each section header." Okay to remove if that has changed. > >> >> Adjusting Build Options >> ~~~~~~~~~~~~~~~~~~~~~~~ >> @@ -112,6 +114,9 @@ dependencies are met on the current system are >built. >> When `-Dexamples=all` is set as a meson option, meson will check each >> example application to see if it can be built, and add all which can be built >to the list of tasks in the ninja build configuration file. >> >> +.. _building_app_using_installed_dpdk: >> + >> + > >extra blank line > >> Building Applications Using Installed DPDK >> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> >> @@ -135,11 +140,12 @@ and the sources for that build are stored in >``$(SRCS-y)``. >> >> .. note:: >> >> - Unlike with the older make build system, the meson system is not >> - designed to be used directly from a build directory. Instead it is >> - recommended that it be installed either system-wide or to a known >> - location in the user's home directory. The install location can be set >> - using the `--prefix` meson option (default: `/usr/local`). >> + Unlike with the make build system present used in older DPDK releases, >> + the meson system is not designed to be used directly from a build >> + directory. Instead it is recommended that it be installed either >> + system-wide or to a known location in the user's home directory. >> + The install location can be set using the `--prefix` meson option >> + (default: `/usr/local`). > >I prefer the first version. >The words "system present used" look weird. >Anyway, if any reword is needed, better to change only the impacted line and >keep the rest of the line wrapping untouched. > I think this was a typo on the first line, should have been either "present" or "used", not both. >> >> an equivalent build recipe for a simple DPDK application using meson >> as a build system is shown below: >> diff --git a/doc/guides/linux_gsg/build_sample_apps.rst >> b/doc/guides/linux_gsg/build_sample_apps.rst >> index 2882883f95..f4bf0e71e5 100644 >> --- a/doc/guides/linux_gsg/build_sample_apps.rst >> +++ b/doc/guides/linux_gsg/build_sample_apps.rst >> @@ -1,7 +1,7 @@ >> .. SPDX-License-Identifier: BSD-3-Clause >> Copyright(c) 2010-2014 Intel Corporation. >> >> -Compiling and Running Sample Applications >> +Running Sample Applications >> ========================================= > >Underlining must be adjusted > >> >> The chapter describes how to compile and run applications in an DPDK >environment. >> @@ -119,7 +119,7 @@ Copy the DPDK application binary to your target, >> then run the application as fol (assuming the platform has four >> memory channels per processor socket, and that cores 0-3 are present and >are to be used for running the application):: >> >> - ./helloworld -l 0-3 -n 4 >> + ./dpdk-helloworld -l 0-3 -n 4 >> >> .. note:: >> >> @@ -183,19 +183,7 @@ If the DPDK cannot allocate enough memory on >each >> socket, the EAL initialization Additional Sample Applications >> ------------------------------ >> >> -Additional sample applications are included in the ${RTE_SDK}/examples >directory. >> +Additional sample applications are included in the DPDK examples >directory. >> These sample applications may be built and run in a manner similar to that >described in earlier sections in this manual. >> In addition, see the *DPDK Sample Applications User Guide* for a >> description of the application, specific instructions on compilation and >execution and some explanation of the code. >> - >> -Additional Test Applications >> ----------------------------- >> - >> -In addition, there are two other applications that are built when the >libraries are created. >> -The source files for these are in the DPDK/app directory and are called test >and testpmd. >> -Once the libraries are created, they can be found in the build/app directory. >> - >> -* The test application provides a variety of specific tests for the various >functions in the DPDK. >> - >> -* The testpmd application provides a number of different packet >throughput tests and >> - examples of features such as how to use the Flow Director found in the >Intel(r) 82599 10 Gigabit Ethernet Controller. > >OK to remove the test applications from the page dedicated to samples. >A lot of similar cleanup could be done if someone volunteers. > >> --- a/doc/guides/linux_gsg/enable_func.rst >> +++ b/doc/guides/linux_gsg/enable_func.rst >[...] >> @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module >> ---------------------------------- >> >> To run the DPDK Kernel NIC Interface (KNI) sample application, an extra >kernel module (the kni module) must be loaded into the running kernel. >> -The module is found in the kmod sub-directory of the DPDK target >directory. >> -Similar to the loading of the ``igb_uio`` module, this module should >> be loaded using the insmod command as shown below -(assuming that the >current directory is the DPDK target directory): >> - >> -.. code-block:: console >> - >> - insmod kmod/rte_kni.ko >> +The module is found in the kernel/linux sub-directory of the DPDK build >directory. >> +This can be enabled in the same way as the ``igb_uio`` module, please see >:ref:`load_uio` for details. > >The only relevant info in "load_uio" chapter is to use insmod. >I think it is better to keep some lines above: > >It should be loaded using the insmod command:: > > insmod kmod/rte_kni.ko I think this should be the updated path: " <build_dir>/kernel/linux/kni/rte_kni.ko" > >> --- a/doc/guides/linux_gsg/linux_drivers.rst >> +++ b/doc/guides/linux_gsg/linux_drivers.rst >> @@ -12,6 +12,9 @@ Different PMDs may require different kernel drivers in >order to work properly. >> Depends on the PMD being used, a corresponding kernel driver should >> be load and bind to the network ports. >> >> +.. _load_uio: >> + >> + > >This anchor is not need in my opinion. > >> UIO >> --- >> >> @@ -28,19 +31,20 @@ can provide the uio capability. This module can be >loaded using the command: >> ``uio_pci_generic`` module doesn't support the creation of virtual >functions. >> >> As an alternative to the ``uio_pci_generic``, the DPDK also includes >> the igb_uio -module which can be found in the kmod subdirectory >> referred to above. It can >> +module which can be found in the kernel/linux subdirectory referred >> +to above. It can >> be loaded as shown below: >> >> .. code-block:: console >> >> sudo modprobe uio >> - sudo insmod kmod/igb_uio.ko >> + sudo insmod <build_dir>/kernel/linux/igb_uio/igb_uio.ko >> >> .. note:: >> >> - ``igb_uio`` module is disabled by default starting from ``DPDK v20.02``. >> - To build it, the config option ``CONFIG_RTE_EAL_IGB_UIO`` should be >enabled. >> - It is planned to move ``igb_uio`` module to a different git repository. >> + Building DPDK Linux kernel modules is disabled by default starting from >DPDK v20.02. >> + To enable them again, the config option "enable_kmods" needs to be set >in the meson >> + build configuration. See :ref:`adjusting_build_options` for details on how >to set/clear >> + build options. It is planned to move ``igb_uio`` module to a different git >repository. > >In general it is better to split the lines logically to ease future patches diff. > > > > ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide 2020-10-01 8:36 ` Power, Ciara @ 2020-10-01 9:49 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-01 9:49 UTC (permalink / raw) To: Power, Ciara; +Cc: dev, Mcnamara, John, Kovacevic, Marko 01/10/2020 10:36, Power, Ciara: >From: Thomas Monjalon <thomas@monjalon.net> > > > >Hi, > > > >Below are some comments. If you agree, I will do the changes myself while > >pushing to the main branch. > > > > > >21/09/2020 15:59, Ciara Power: > >> Make is no longer supported for compiling DPDK, references are now > >> removed in the documentation. > >> > >> Signed-off-by: Ciara Power <ciara.power@intel.com> > >> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> > >> --- > >> doc/guides/linux_gsg/build_dpdk.rst | 16 +++++++++++----- > >> doc/guides/linux_gsg/build_sample_apps.rst | 18 +++--------------- > >> doc/guides/linux_gsg/enable_func.rst | 13 +++++-------- > >> doc/guides/linux_gsg/linux_drivers.rst | 18 +++++++++++------- > >> doc/guides/linux_gsg/sys_reqs.rst | 6 +----- > >> 5 files changed, 31 insertions(+), 40 deletions(-) > >> > >> diff --git a/doc/guides/linux_gsg/build_dpdk.rst > >> b/doc/guides/linux_gsg/build_dpdk.rst > >> index a895e1b0f4..85d04520bf 100644 > >> --- a/doc/guides/linux_gsg/build_dpdk.rst > >> +++ b/doc/guides/linux_gsg/build_dpdk.rst > >> @@ -76,6 +76,8 @@ and the last step causing the dynamic loader `ld.so` > >to update its cache to take > >> distributions, `/usr/local/lib` and `/usr/local/lib64` should be added > >> to a file in `/etc/ld.so.conf.d/` before running `ldconfig`. > >> > >> +.. _adjusting_build_options: > >> + > > > >extra blank line > > Blank line here, and below, were added based on the contributing guide - " Add 2 blank lines before each section header." > Okay to remove if that has changed. Yes, the recommendation is 2 blank lines to separate a paragraph from the next title. But here it is an anchor for the next title, so it should be grouped together. > >> Adjusting Build Options > >> ~~~~~~~~~~~~~~~~~~~~~~~ > >> @@ -112,6 +114,9 @@ dependencies are met on the current system are > >built. > >> When `-Dexamples=all` is set as a meson option, meson will check each > >> example application to see if it can be built, and add all which can be built > >to the list of tasks in the ninja build configuration file. > >> > >> +.. _building_app_using_installed_dpdk: > >> + > >> + > > > >extra blank line > > > >> Building Applications Using Installed DPDK > >> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > >> > >> @@ -135,11 +140,12 @@ and the sources for that build are stored in > >``$(SRCS-y)``. > >> > >> .. note:: > >> > >> - Unlike with the older make build system, the meson system is not > >> - designed to be used directly from a build directory. Instead it is > >> - recommended that it be installed either system-wide or to a known > >> - location in the user's home directory. The install location can be set > >> - using the `--prefix` meson option (default: `/usr/local`). > >> + Unlike with the make build system present used in older DPDK releases, > >> + the meson system is not designed to be used directly from a build > >> + directory. Instead it is recommended that it be installed either > >> + system-wide or to a known location in the user's home directory. > >> + The install location can be set using the `--prefix` meson option > >> + (default: `/usr/local`). > > > >I prefer the first version. > >The words "system present used" look weird. > >Anyway, if any reword is needed, better to change only the impacted line and > >keep the rest of the line wrapping untouched. > > > I think this was a typo on the first line, should have been either "present" or "used", not both. OK will fix. [...] > >> --- a/doc/guides/linux_gsg/enable_func.rst > >> +++ b/doc/guides/linux_gsg/enable_func.rst > >[...] > >> @@ -128,13 +130,8 @@ Loading the DPDK KNI Kernel Module > >> ---------------------------------- > >> > >> To run the DPDK Kernel NIC Interface (KNI) sample application, an extra > >kernel module (the kni module) must be loaded into the running kernel. > >> -The module is found in the kmod sub-directory of the DPDK target > >directory. > >> -Similar to the loading of the ``igb_uio`` module, this module should > >> be loaded using the insmod command as shown below -(assuming that the > >current directory is the DPDK target directory): > >> - > >> -.. code-block:: console > >> - > >> - insmod kmod/rte_kni.ko > >> +The module is found in the kernel/linux sub-directory of the DPDK build > >directory. > >> +This can be enabled in the same way as the ``igb_uio`` module, please see > >:ref:`load_uio` for details. > > > >The only relevant info in "load_uio" chapter is to use insmod. > >I think it is better to keep some lines above: > > > >It should be loaded using the insmod command:: > > > > insmod kmod/rte_kni.ko > > I think this should be the updated path: > " <build_dir>/kernel/linux/kni/rte_kni.ko" Yes of course. Thanks ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 04/20] doc: remove references to make from FreeBSD guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (2 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 05/20] doc: remove references to make from howto guides Ciara Power ` (16 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Bruce Richardson, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index e31c966b98..1e5a8cfe9e 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -122,7 +122,7 @@ up time. This can be achieved by placing lines similar to the following into An error such as:: - kldload: can't load ./x86_64-native-freebsd-gcc/kmod/contigmem.ko: + kldload: can't load ./<build_dir>/kernel/freebsd/contigmem.ko: Exec format error is generally attributed to not having enough contiguous memory -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 05/20] doc: remove references to make from howto guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (3 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 04/20] doc: remove references to make from FreeBSD guide Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide Ciara Power ` (15 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +-- doc/guides/howto/lm_virtio_vhost_user.rst | 4 +-- doc/guides/howto/packet_capture_framework.rst | 21 +++------------ doc/guides/howto/pvp_reference_benchmark.rst | 27 +++++-------------- doc/guides/howto/vfd.rst | 4 +-- .../virtio_user_for_container_networking.rst | 2 +- 6 files changed, 16 insertions(+), 46 deletions(-) diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst index 07563b3e24..02ba1cdf5d 100644 --- a/doc/guides/howto/lm_bond_virtio_sriov.rst +++ b/doc/guides/howto/lm_bond_virtio_sriov.rst @@ -591,7 +591,7 @@ Set up DPDK in the Virtual Machine rmmod virtio-pci ixgbevf modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -613,7 +613,7 @@ Run testpmd in the Virtual Machine. # use for bonding of virtio and vf tests in VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-3 -n 4 --socket-mem 350 -- --i --port-topology=chained .. _lm_bond_virtio_sriov_switch_conf: diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst index ecb7832906..330ff5a9c8 100644 --- a/doc/guides/howto/lm_virtio_vhost_user.rst +++ b/doc/guides/howto/lm_virtio_vhost_user.rst @@ -421,7 +421,7 @@ setup_dpdk_virtio_in_vm.sh rmmod virtio-pci modprobe uio - insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko + insmod /root/dpdk/<build_dir>/kernel/linux/igb_uio/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -437,5 +437,5 @@ run_testpmd_in_vm.sh # Run testpmd for use with vhost_user sample app. # test system has 8 cpus (0-7), use cpus 2-7 for VM - /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ + /root/dpdk/<build_dir>/app/dpdk-testpmd \ -l 0-5 -n 4 --socket-mem 350 -- --burst=64 --i diff --git a/doc/guides/howto/packet_capture_framework.rst b/doc/guides/howto/packet_capture_framework.rst index 946a21c8ed..d457989607 100644 --- a/doc/guides/howto/packet_capture_framework.rst +++ b/doc/guides/howto/packet_capture_framework.rst @@ -52,11 +52,7 @@ Some things to note: initialization code. Refer to the ``app/test-pmd/testpmd.c`` code and look for ``pdump`` keyword to see how this is done. -* The ``dpdk-pdump`` tool depends on the libpcap based PMD which is disabled - by default in the build configuration files, owing to an external dependency - on the libpcap development files. Once the libpcap development files are - installed, the libpcap based PMD can be enabled by setting - ``CONFIG_RTE_LIBRTE_PMD_PCAP=y`` and recompiling the DPDK. +* The ``dpdk-pdump`` tool depends on the libpcap based PMD. Test Environment @@ -73,17 +69,6 @@ for packet capturing on the DPDK port in Packet capturing on a DPDK port using the dpdk-pdump tool. -Configuration -------------- - -Modify the DPDK primary application to initialize the packet capture framework -as mentioned in the above notes and enable the following config options and -build DPDK:: - - CONFIG_RTE_LIBRTE_PMD_PCAP=y - CONFIG_RTE_LIBRTE_PDUMP=y - - Running the Application ----------------------- @@ -93,11 +78,11 @@ inspect them using ``tcpdump``. #. Launch testpmd as the primary application:: - sudo ./app/testpmd -c 0xf0 -n 4 -- -i --port-topology=chained + sudo ./<build_dir>/app/dpdk-testpmd -c 0xf0 -n 4 -- -i --port-topology=chained #. Launch the pdump tool as follows:: - sudo ./build/app/dpdk-pdump -- \ + sudo ./<build_dir>/app/dpdk-pdump -- \ --pdump 'port=0,queue=*,rx-dev=/tmp/capture.pcap' #. Send traffic to dpdk_port0 from traffic generator. diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst index 64b1f4d8ec..1d4a4b0232 100644 --- a/doc/guides/howto/pvp_reference_benchmark.rst +++ b/doc/guides/howto/pvp_reference_benchmark.rst @@ -99,14 +99,7 @@ Build Qemu: DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -117,7 +110,7 @@ Testpmd launch .. code-block:: console modprobe vfio-pci - $RTE_SDK/install/sbin/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 + ./dpdk/usertools/dpdk-devbind -b vfio-pci 0000:11:00.0 0000:11:00.1 .. Note:: @@ -129,7 +122,7 @@ Testpmd launch .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,2,3,4,5 --socket-mem=1024 -n 4 \ --vdev 'net_vhost0,iface=/tmp/vhost-user1' \ --vdev 'net_vhost1,iface=/tmp/vhost-user2' -- \ --portmask=f -i --rxq=1 --txq=1 \ @@ -309,18 +302,10 @@ Guest tuning echo "obase=16;$(( 0x$(cat $i) & ~$clear_mask ))" | bc > $i done - DPDK build ~~~~~~~~~~ -Build DPDK: - - .. code-block:: console - - git clone git://dpdk.org/dpdk - cd dpdk - export RTE_SDK=$PWD - make install T=x86_64-native-linux-gcc DESTDIR=install +See :doc:`../linux_gsg/build_dpdk` for details. Testpmd launch @@ -340,13 +325,13 @@ Bind the virtio-net devices to DPDK: .. code-block:: console - $RTE_SDK/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 + ./dpdk/usertools/dpdk-devbind.py -b vfio-pci 0000:00:10.0 0000:00:11.0 Start testpmd: .. code-block:: console - $RTE_SDK/install/bin/testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ + ./dpdk/<build_dir>/app/dpdk-testpmd -l 0,1,2 --socket-mem 1024 -n 4 \ --proc-type auto --file-prefix pg -- \ --portmask=3 --forward-mode=macswap --port-topology=chained \ --disable-rss -i --rxq=1 --txq=1 \ diff --git a/doc/guides/howto/vfd.rst b/doc/guides/howto/vfd.rst index 0ec0a0478d..5a62e6ff5a 100644 --- a/doc/guides/howto/vfd.rst +++ b/doc/guides/howto/vfd.rst @@ -83,7 +83,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the PF in the host:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 #. Bind the VF port to ``igb_uio`` in the VM:: @@ -91,7 +91,7 @@ The typical procedure to achieve this is as follows: #. Run a DPDK application on the VF in the VM:: - testpmd -l 0-7 -n 4 -- -i --txqflags=0 + dpdk-testpmd -l 0-7 -n 4 -- -i --txqflags=0 Common functions of IXGBE and I40E diff --git a/doc/guides/howto/virtio_user_for_container_networking.rst b/doc/guides/howto/virtio_user_for_container_networking.rst index 412b29664b..5eab360a1c 100644 --- a/doc/guides/howto/virtio_user_for_container_networking.rst +++ b/doc/guides/howto/virtio_user_for_container_networking.rst @@ -64,7 +64,7 @@ some minor changes. FROM ubuntu:latest WORKDIR /usr/src/dpdk COPY . /usr/src/dpdk - ENV PATH "$PATH:/usr/src/dpdk/x86_64-native-linux-gcc/app/" + ENV PATH "$PATH:/usr/src/dpdk/<build_dir>/app/" EOT #. Build a Docker image. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (4 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 05/20] doc: remove references to make from howto guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-10-09 12:07 ` Ferruh Yigit 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 07/20] doc: remove references to make from platforms guides Ciara Power ` (14 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Anatoly Burakov, John McNamara, Marko Kovacevic, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Konstantin Ananyev, Ferruh Yigit, Chas Williams, Wei Hu (Xavier), Olivier Matz, Andrew Rybchenko, Cristian Dumitrescu, Jasvinder Singh, Honnappa Nagarahalli, Sunil Kumar Kori Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/prog_guide/env_abstraction_layer.rst | 17 ++++++----------- doc/guides/prog_guide/graph_lib.rst | 6 ++---- .../prog_guide/ip_fragment_reassembly_lib.rst | 5 ----- doc/guides/prog_guide/kernel_nic_interface.rst | 14 +++++++------- .../link_bonding_poll_mode_drv_lib.rst | 15 ++++++++------- doc/guides/prog_guide/lto.rst | 12 +----------- doc/guides/prog_guide/mbuf_lib.rst | 4 ++-- doc/guides/prog_guide/mempool_lib.rst | 7 +++---- doc/guides/prog_guide/profile_app.rst | 17 +++-------------- doc/guides/prog_guide/qos_framework.rst | 10 +--------- doc/guides/prog_guide/rcu_lib.rst | 7 +++---- doc/guides/prog_guide/trace_lib.rst | 3 +-- .../prog_guide/writing_efficient_code.rst | 3 +-- 13 files changed, 38 insertions(+), 82 deletions(-) diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index f64ae953d1..936c885081 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -201,16 +201,16 @@ each segment is strictly one physical page. It is possible to change the amount of virtual memory being preallocated at startup by editing the following config variables: -* ``CONFIG_RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have -* ``CONFIG_RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each +* ``RTE_MAX_MEMSEG_LISTS`` controls how many segment lists can DPDK have +* ``RTE_MAX_MEM_MB_PER_LIST`` controls how much megabytes of memory each segment list can address -* ``CONFIG_RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can +* ``RTE_MAX_MEMSEG_PER_LIST`` controls how many segments each segment can have -* ``CONFIG_RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type +* ``RTE_MAX_MEMSEG_PER_TYPE`` controls how many segments each memory type can have (where "type" is defined as "page size + NUMA node" combination) -* ``CONFIG_RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each +* ``RTE_MAX_MEM_MB_PER_TYPE`` controls how much megabytes of memory each memory type can address -* ``CONFIG_RTE_MAX_MEM_MB`` places a global maximum on the amount of memory +* ``RTE_MAX_MEM_MB`` places a global maximum on the amount of memory DPDK can reserve Normally, these options do not need to be changed. @@ -715,11 +715,6 @@ However, they can be used in configuration code. Refer to the rte_malloc() function description in the *DPDK API Reference* manual for more information. -Cookies -~~~~~~~ - -When CONFIG_RTE_MALLOC_DEBUG is enabled, the allocated memory contains -overwrite protection fields to help identify buffer overflows. Alignment and NUMA Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 669d77c740..c922d10f3d 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -45,13 +45,11 @@ Performance tuning parameters ----------------------------- - Test with various burst size values (256, 128, 64, 32) using - CONFIG_RTE_GRAPH_BURST_SIZE config option. + RTE_GRAPH_BURST_SIZE config option. The testing shows, on x86 and arm64 servers, The sweet spot is 256 burst size. While on arm64 embedded SoCs, it is either 64 or 128. -- Disable node statistics (using ``CONFIG_RTE_LIBRTE_GRAPH_STATS`` config option) +- Disable node statistics (using ``RTE_LIBRTE_GRAPH_STATS`` config option) if not needed. -- Use arm64 optimized memory copy for arm64 architecture by - selecting ``CONFIG_RTE_ARCH_ARM64_MEMCPY``. Programming model ----------------- diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst index 6ac1bba649..314d4adbb8 100644 --- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst +++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst @@ -103,8 +103,3 @@ Debug logging and Statistics Collection The RTE_LIBRTE_IP_FRAG_TBL_STAT config macro controls statistics collection for the Fragment Table. This macro is not enabled by default. - -The RTE_LIBRTE_IP_FRAG_DEBUG controls debug logging of IP fragments processing and reassembling. -This macro is disabled by default. -Note that while logging contains a lot of detailed information, -it slows down packet processing and might cause the loss of a lot of packets. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 32d09ccf82..de5d75bd4c 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -65,7 +65,7 @@ disabled, and the default carrier state of KNI interfaces is set to *off*. .. code-block:: console - # insmod kmod/rte_kni.ko + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko .. _kni_loopback_mode: @@ -77,14 +77,14 @@ by specifying the ``lo_mode`` parameter: .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo The ``lo_mode_fifo`` loopback option will loop back ring enqueue/dequeue operations in kernel space. .. code-block:: console - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb The ``lo_mode_fifo_skb`` loopback option will loop back ring enqueue/dequeue operations and sk buffer copies in kernel space. @@ -105,7 +105,7 @@ Single kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=single + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=single This mode will create only one kernel thread for all KNI interfaces to receive data on the kernel side. By default, this kernel thread is not @@ -122,7 +122,7 @@ kernel thread mode is enabled as follows: .. code-block:: console - # insmod kmod/rte_kni.ko kthread_mode=multiple + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple This mode will create a separate kernel thread for each KNI interface to receive data on the kernel side. The core affinity of each ``kni_thread`` @@ -163,13 +163,13 @@ To set the default carrier state to *on*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=on + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=on To set the default carrier state to *off*: .. code-block:: console - # insmod kmod/rte_kni.ko carrier=off + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko carrier=off If the ``carrier`` parameter is not specified, the default carrier state of KNI interfaces will be set to *off*. diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst index 2459fd243e..244dca56c4 100644 --- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst +++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst @@ -28,8 +28,9 @@ bonded device and its slave devices. .. note:: The Link Bonding PMD Library is enabled by default in the build - configuration files, the library can be disabled by setting - ``CONFIG_RTE_LIBRTE_PMD_BOND=n`` and recompiling the DPDK. + configuration, the library can be disabled using the meson option + "-Ddisable_drivers=net/bond". + Link Bonding Modes Overview --------------------------- @@ -377,7 +378,7 @@ Device names and bonding options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,bond_opt0=..,bond opt1=..'--vdev 'net_bonding1,bond _opt0=..,bond_opt1=..' Link Bonding EAL Options ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -477,22 +478,22 @@ Create a bonded device in round robin mode with two slaves specified by their PC .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained Create a bonded device in round robin mode with two slaves specified by their PCI address and an overriding MAC address: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained Create a bonded device in active backup mode with two slaves specified, and a primary slave specified by their PCI addresses: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained Create a bonded device in balance mode with two slaves specified by their PCI addresses, and a transmission policy of layer 3 + 4 forwarding: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index 277a6f1090..f79c449598 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -26,17 +26,7 @@ need to explicitly initialize variable in order to silence the compiler. Please note that turning LTO on causes considerable extension of build time. -When using make based build, link time optimization can be enabled for -the whole DPDK by setting: - -.. code-block:: console - - CONFIG_RTE_ENABLE_LTO=y - -in config file. - -For the meson based build it can be enabled by setting meson built-in -'b_lto' option: +Link time optimization can be enabled by setting meson built-in 'b_lto' option: .. code-block:: console diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index c3dbfb9221..2f190b40e4 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic Debug ----- -In debug mode (CONFIG_RTE_MBUF_DEBUG is enabled), -the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, bad type, and so on). +In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption, +bad type, and so on). Use Cases --------- diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index e3e1f940be..f0bdcd3be1 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -17,14 +17,13 @@ This library is used by the :ref:`Mbuf Library <Mbuf_Library>`. Cookies ------- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), cookies are added at the beginning and end of allocated blocks. +In debug mode, cookies are added at the beginning and end of allocated blocks. The allocated objects then contain overwrite protection fields to help debugging buffer overflows. Stats ----- -In debug mode (CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is enabled), -statistics about get from/put in the pool are stored in the mempool structure. +In debug mode, statistics about get from/put in the pool are stored in the mempool structure. Statistics are per-lcore to avoid concurrent access to statistics counters. Memory Alignment Constraints on x86 architecture @@ -90,7 +89,7 @@ the speed at which a core can access its own cache for a specific memory pool wi The cache is composed of a small, per-core table of pointers and its length (used as a stack). This internal cache can be enabled or disabled at creation of the pool. -The maximum size of the cache is static and is defined at compilation time (CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE). +The maximum size of the cache is static and is defined at compilation time (RTE_MEMPOOL_CACHE_MAX_SIZE). :numref:`figure_mempool` shows a cache in operation. diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index e5d0e9079e..7093681983 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -33,14 +33,6 @@ Refer to the for details about application profiling. -Profiling with VTune -~~~~~~~~~~~~~~~~~~~~ - -To allow VTune attaching to the DPDK application, reconfigure and recompile -the DPDK with ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` and -``CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE`` enabled. - - Profiling on ARM64 ------------------ @@ -76,8 +68,7 @@ cycle counter for user space access by configuring the PMU from the privileged mode (kernel space). By default the ``rte_rdtsc()`` implementation uses a portable ``cntvct_el0`` -scheme. Application can choose the PMU based implementation with -``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``. +scheme. The example below shows the steps to configure the PMU based cycle counter on an ARMv8 machine. @@ -88,10 +79,8 @@ an ARMv8 machine. cd armv8_pmu_cycle_counter_el0 make sudo insmod pmu_el0_cycle_counter.ko - cd $DPDK_DIR - make config T=arm64-armv8a-linux-gcc - echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config - make + +Please refer to :doc:`../linux_gsg/build_dpdk` for details on compiling DPDK with meson. .. warning:: diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst index a159709450..4e4ea33ccb 100644 --- a/doc/guides/prog_guide/qos_framework.rst +++ b/doc/guides/prog_guide/qos_framework.rst @@ -1525,15 +1525,7 @@ Integration with the DPDK QoS Scheduler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ RED functionality in the DPDK QoS scheduler is disabled by default. -To enable it, use the DPDK configuration parameter: - -:: - - CONFIG_RTE_SCHED_RED=y - -This parameter must be set to y. -The parameter is found in the build configuration files in the DPDK/config directory, -for example, DPDK/config/common_linux. +The parameter is found in the build configuration files in the DPDK/config directory. RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure that is passed to the scheduler on initialization. RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) diff --git a/doc/guides/prog_guide/rcu_lib.rst b/doc/guides/prog_guide/rcu_lib.rst index d142d0c79d..d0aef3bc16 100644 --- a/doc/guides/prog_guide/rcu_lib.rst +++ b/doc/guides/prog_guide/rcu_lib.rst @@ -186,10 +186,9 @@ they entered a quiescent state. This API checks if a writer has triggered a quiescent state query and update the state accordingly. The ``rte_rcu_qsbr_lock()`` and ``rte_rcu_qsbr_unlock()`` are empty functions. -However, when ``CONFIG_RTE_LIBRTE_RCU_DEBUG`` is enabled, these APIs aid -in debugging issues. One can mark the access to shared data structures on the -reader side using these APIs. The ``rte_rcu_qsbr_quiescent()`` will check if -all the locks are unlocked. +However, these APIs can aid in debugging issues. One can mark the access to +shared data structures on the reader side using these APIs. The +``rte_rcu_qsbr_quiescent()`` will check if all the locks are unlocked. Resource reclamation framework for DPDK --------------------------------------- diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 9bbfd165d8..fbadf9fde9 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -135,8 +135,7 @@ In order to avoid performance impact in fast path code, the library introduced the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``. ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using -``CONFIG_RTE_ENABLE_TRACE_FP`` configuration parameter. -The ``enable_trace_fp`` option shall be used for the same for meson build. +the ``enable_trace_fp`` option for meson build. Event record mode ----------------- diff --git a/doc/guides/prog_guide/writing_efficient_code.rst b/doc/guides/prog_guide/writing_efficient_code.rst index 2639ef7bf6..db2f1ddbc2 100644 --- a/doc/guides/prog_guide/writing_efficient_code.rst +++ b/doc/guides/prog_guide/writing_efficient_code.rst @@ -258,8 +258,7 @@ For instance: Setting the Target CPU Type --------------------------- -The DPDK supports CPU microarchitecture-specific optimizations by means of CONFIG_RTE_MACHINE option -in the DPDK configuration file. +The DPDK supports CPU microarchitecture-specific optimizations by means of RTE_MACHINE option. The degree of optimization depends on the compiler's ability to optimize for a specific microarchitecture, therefore it is preferable to use the latest compiler versions whenever possible. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide Ciara Power @ 2020-10-09 12:07 ` Ferruh Yigit 2020-10-09 12:12 ` Ferruh Yigit 0 siblings, 1 reply; 300+ messages in thread From: Ferruh Yigit @ 2020-10-09 12:07 UTC (permalink / raw) To: Ciara Power, dev Cc: Anatoly Burakov, John McNamara, Marko Kovacevic, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Konstantin Ananyev, Chas Williams, Wei Hu (Xavier), Olivier Matz, Andrew Rybchenko, Cristian Dumitrescu, Jasvinder Singh, Honnappa Nagarahalli, Sunil Kumar Kori On 9/21/2020 2:59 PM, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/prog_guide/env_abstraction_layer.rst | 17 ++++++----------- > doc/guides/prog_guide/graph_lib.rst | 6 ++---- > .../prog_guide/ip_fragment_reassembly_lib.rst | 5 ----- > doc/guides/prog_guide/kernel_nic_interface.rst | 14 +++++++------- > .../link_bonding_poll_mode_drv_lib.rst | 15 ++++++++------- > doc/guides/prog_guide/lto.rst | 12 +----------- > doc/guides/prog_guide/mbuf_lib.rst | 4 ++-- > doc/guides/prog_guide/mempool_lib.rst | 7 +++---- > doc/guides/prog_guide/profile_app.rst | 17 +++-------------- > doc/guides/prog_guide/qos_framework.rst | 10 +--------- > doc/guides/prog_guide/rcu_lib.rst | 7 +++---- > doc/guides/prog_guide/trace_lib.rst | 3 +-- > .../prog_guide/writing_efficient_code.rst | 3 +-- > 13 files changed, 38 insertions(+), 82 deletions(-) > For kernel_nic_interface.rst, Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide 2020-10-09 12:07 ` Ferruh Yigit @ 2020-10-09 12:12 ` Ferruh Yigit 0 siblings, 0 replies; 300+ messages in thread From: Ferruh Yigit @ 2020-10-09 12:12 UTC (permalink / raw) To: Ciara Power, dev Cc: Anatoly Burakov, John McNamara, Marko Kovacevic, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Konstantin Ananyev, Chas Williams, Wei Hu (Xavier), Olivier Matz, Andrew Rybchenko, Cristian Dumitrescu, Jasvinder Singh, Honnappa Nagarahalli, Sunil Kumar Kori On 10/9/2020 1:07 PM, Ferruh Yigit wrote: > On 9/21/2020 2:59 PM, Ciara Power wrote: >> Make is no longer supported for compiling DPDK, references are now >> removed in the documentation. >> >> Signed-off-by: Ciara Power <ciara.power@intel.com> >> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> >> --- >> doc/guides/prog_guide/env_abstraction_layer.rst | 17 ++++++----------- >> doc/guides/prog_guide/graph_lib.rst | 6 ++---- >> .../prog_guide/ip_fragment_reassembly_lib.rst | 5 ----- >> doc/guides/prog_guide/kernel_nic_interface.rst | 14 +++++++------- >> .../link_bonding_poll_mode_drv_lib.rst | 15 ++++++++------- >> doc/guides/prog_guide/lto.rst | 12 +----------- >> doc/guides/prog_guide/mbuf_lib.rst | 4 ++-- >> doc/guides/prog_guide/mempool_lib.rst | 7 +++---- >> doc/guides/prog_guide/profile_app.rst | 17 +++-------------- >> doc/guides/prog_guide/qos_framework.rst | 10 +--------- >> doc/guides/prog_guide/rcu_lib.rst | 7 +++---- >> doc/guides/prog_guide/trace_lib.rst | 3 +-- >> .../prog_guide/writing_efficient_code.rst | 3 +-- >> 13 files changed, 38 insertions(+), 82 deletions(-) >> > > For kernel_nic_interface.rst, > Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> > Ahh, I acked the wrong version, I will carry them to v6 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 07/20] doc: remove references to make from platforms guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (5 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 08/20] doc: remove references to make from mempool guide Ciara Power ` (13 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/platform/bluefield.rst | 22 --------------------- doc/guides/platform/octeontx.rst | 33 +------------------------------ doc/guides/platform/octeontx2.rst | 32 ------------------------------ 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..9c20ce437d 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. The above steps would rebuild the modules and the required intermediate binaries. Once the target is ready for native compilation, the OCTEON TX platform -drivers can be compiled with the following steps, +drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details. -.. code-block:: console - - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: The above steps will prepare build system with numa additions. Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" - If NUMA support is not required, it can be disabled as explained in :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. -Following steps could be used in that case. - -.. code-block:: console - - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- - - SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 13255eec5c..232f628366 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -498,27 +498,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -529,17 +508,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 08/20] doc: remove references to make from mempool guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (6 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 07/20] doc: remove references to make from platforms guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 09/20] doc: remove references to make from NICs guides Ciara Power ` (12 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/mempool/octeontx.rst | 28 +++------------------------- doc/guides/mempool/octeontx2.rst | 10 +--------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..33c40d5b17 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -30,33 +30,11 @@ Prerequisites See :doc: `../platform/octeontx.rst` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) - - Set default mempool ops to octeontx_fpavf. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console +------------------ - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc +See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK. Initialization @@ -70,5 +48,5 @@ Example: .. code-block:: console - ./build/app/test -c 0xf --base-virtaddr=0x100000000000 \ + ./<build_dir>/app/test/dpdk-test -c 0xf --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..53f09a52db 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -97,4 +89,4 @@ Standalone mempool device Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device:: - echo "mempool_autotest" | build/app/test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" + echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 09/20] doc: remove references to make from NICs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (7 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 08/20] doc: remove references to make from mempool guide Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-10-09 12:08 ` Ferruh Yigit 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 10/20] doc: remove references to make from vdpadevs guides Ciara Power ` (11 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Shepard Siegel, Ed Czeck, John Miller, John McNamara, Marko Kovacevic, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Wei Zhao, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Bruce Richardson, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> --- doc/guides/nics/ark.rst | 26 ------------- doc/guides/nics/atlantic.rst | 4 -- doc/guides/nics/axgbe.rst | 15 -------- doc/guides/nics/bnx2x.rst | 27 ------------- doc/guides/nics/bnxt.rst | 5 +-- doc/guides/nics/build_and_test.rst | 8 +++- doc/guides/nics/cxgbe.rst | 36 +++++------------ doc/guides/nics/dpaa.rst | 27 +------------ doc/guides/nics/dpaa2.rst | 26 +------------ doc/guides/nics/ena.rst | 16 -------- doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 ----- doc/guides/nics/fail_safe.rst | 20 ++-------- doc/guides/nics/features.rst | 9 ----- doc/guides/nics/fm10k.rst | 4 -- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ----- doc/guides/nics/i40e.rst | 44 ++++++--------------- doc/guides/nics/ice.rst | 25 ++---------- doc/guides/nics/igc.rst | 18 +-------- doc/guides/nics/intel_vf.rst | 13 +------ doc/guides/nics/ionic.rst | 8 ---- doc/guides/nics/ipn3ke.rst | 12 +----- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 ------------- doc/guides/nics/memif.rst | 10 ++--- doc/guides/nics/mlx4.rst | 55 ++------------------------ doc/guides/nics/mlx5.rst | 62 ++---------------------------- doc/guides/nics/mvneta.rst | 36 ++++------------- doc/guides/nics/mvpp2.rst | 43 ++++----------------- doc/guides/nics/nfb.rst | 19 +-------- doc/guides/nics/nfp.rst | 4 -- doc/guides/nics/null.rst | 6 +-- doc/guides/nics/octeontx.rst | 19 +-------- doc/guides/nics/octeontx2.rst | 13 +------ doc/guides/nics/pcap_ring.rst | 24 ++++++------ doc/guides/nics/qede.rst | 17 +------- doc/guides/nics/sfc_efx.rst | 15 -------- doc/guides/nics/softnic.rst | 13 +------ doc/guides/nics/szedata2.rst | 18 +-------- doc/guides/nics/thunderx.rst | 25 +----------- doc/guides/nics/vdev_netvsc.rst | 6 --- doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- 44 files changed, 102 insertions(+), 693 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 06e8c33746..d7d679b452 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -119,32 +119,6 @@ Data Path Interface Ingress RX and Egress TX operation is by the nominal DPDK API . The driver supports single-port, multi-queue for both RX and TX. -Configuration Information -------------------------- - -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug - logging and internal checking of RX ingress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug - logging and internal checking of TX egress logic within the ARK PMD driver. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables debug - logging of detailed packet and performance statistics gathered in - the PMD and FPGA. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables debug - logging of detailed PMD events and status. - Building DPDK ------------- diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..3c163df7a8 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -72,33 +72,6 @@ Prerequisites `linux-firmware git repository <https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/bnx2x/bnx2x-e2-7.13.11.0.fw>`_ to get the required firmware. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) - - Toggle display of register reads and writes. - .. _bnx2x_driver-compilation: diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 129a16cfc7..4b172fdaac 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode @@ -612,7 +609,7 @@ Basic stats include: * oerrors By default, per-queue stats for 16 queues are supported. For more than 16 -queues, BNXT PMD should be compiled with ``CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS`` +queues, BNXT PMD should be compiled with ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` set to the desired number of queues. Extended Stats diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index 3138c0f880..03ce358553 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -66,10 +66,14 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. #. Load ``igb_uio`` or ``vfio-pci`` driver: + Before compiling, make sure to enable kmods for the meson build:: + + meson configure -Denable_kmods=true + .. code-block:: console modprobe uio - insmod ./x86_64-native-linux-gcc/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko or @@ -106,7 +110,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..442ab1511c 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -87,35 +87,19 @@ Prerequisites :ref:`linux-installation` for Linux and section :ref:`freebsd-installation` for FreeBSD. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. For example, .. code-block:: console - testpmd -w 02:00.4,keep_ovlan=1 -- -i + dpdk-testpmd -w 02:00.4,keep_ovlan=1 -- -i Common Runtime Options -^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~ - ``keep_ovlan`` (default **0**) @@ -133,7 +117,7 @@ Common Runtime Options coalesce limit has been reached. CXGBE VF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``force_link_up`` (default **0**) @@ -142,7 +126,7 @@ CXGBE VF Only Runtime Options to send traffic to each other even when the physical link is down. CXGBE PF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``filtermode`` (default **0**) @@ -317,7 +301,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88 -- -i - ``filtermask`` (default **0**) @@ -344,7 +328,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i .. _driver-compilation: @@ -689,7 +673,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ + cp <build_dir>/kernel/freebsd/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -770,13 +754,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko + kldload <build_dir>/kernel/freebsd/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 17839a920e..eba8bfe600 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -195,31 +195,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ @@ -264,7 +239,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5a..b64bc6311b 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ @@ -473,7 +449,7 @@ for details. .. code-block:: console - ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx + ./dpdk-testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... EAL: Registered [pci] bus. diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index bec97c3326..4bdc3182fc 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 3c896eeffa..6203f4d799 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -113,5 +113,3 @@ Driver compilation and testing Follow instructions available in the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` to launch **testpmd** - -To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..be6a034279 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,8 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index b4a92f663b..b7bc5a566b 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- @@ -128,7 +116,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i @@ -142,7 +130,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -w 81:00.0 -- -i @@ -150,7 +138,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 -w ff:ff.f \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 -w ff:ff.f \ --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i #. Start testpmd, automatically probing the device 84:00.0 and using it with @@ -158,7 +146,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index edd21c4d8e..6172a0fa4b 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -812,8 +812,6 @@ ARMv7 Support armv7 architecture. -Use ``defconfig_arm-armv7a-*-*``. - .. _nic_features_armv8: @@ -822,8 +820,6 @@ ARMv8 Support armv8a (64bit) architecture. -Use ``defconfig_arm64-armv8a-*-*`` - .. _nic_features_power8: @@ -832,7 +828,6 @@ Power8 Support PowerPC architecture. -Use ``defconfig_ppc_64-power8-*-*`` .. _nic_features_x86-32: @@ -841,8 +836,6 @@ x86-32 Support 32bits x86 architecture. -Use ``defconfig_x86_x32-native-*-*`` and ``defconfig_i686-native-*-*``. - .. _nic_features_x86-64: @@ -851,8 +844,6 @@ x86-64 Support 64bits x86 architecture. -Use ``defconfig_x86_64-native-*-*``. - .. _nic_features_usage_doc: diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index b7430f6c4e..945fe97441 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -155,35 +155,13 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. +The following options can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -354,7 +332,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --forward-mode=mac + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --forward-mode=mac ... testpmd> set promisc 0 off @@ -389,8 +367,9 @@ Start ``testpmd`` with ``--disable-rss`` and ``--pkt-filter-mode=perfect``: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --disable-rss --pkt-filter-mode=perfect \ - --rxq=8 --txq=8 --nb-cores=8 --nb-ports=1 + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --disable-rss \ + --pkt-filter-mode=perfect --rxq=8 --txq=8 --nb-cores=8 \ + --nb-ports=1 Add a rule to direct ``ipv4-udp`` packet whose ``dst_ip=2.2.2.5, src_ip=2.2.2.3, src_port=32, dst_port=32`` to queue 1: @@ -648,8 +627,7 @@ For all available versions of the i40e driver, these drivers don't support 16 byte RX descriptor. If the Linux i40e kernel driver is used as host driver, while DPDK i40e PMD is used as the VF driver, DPDK cannot choose 16 byte receive descriptor. The reason is that the RX descriptor is already set to 32 byte by -the i40e kernel driver. That is to say, user should keep -``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n`` in config file. +the i40e kernel driver. In the future, if the Linux i40e driver supports 16 byte RX descriptor, user should make sure the DPDK VF uses the same RX descriptor mode, 16 byte or 32 byte, as the PF driver. @@ -760,7 +738,9 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +In ``config/rte_config.h`` set the following to use 16 bytes size RX descriptors:: + + #define RTE_LIBRTE_I40E_16BYTE_RX_DESC 1 Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -813,7 +793,7 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup. 7. The command line of running l3fwd would be something like the following:: - ./l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ + ./dpdk-l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ -- -p 0x3 --config '(0,0,18),(0,1,19),(1,0,20),(1,1,21)' This means that the application uses core 18 for port 0, queue pair 0 forwarding, core 19 for port 0, queue pair 1 forwarding, diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb0..9d3fcd1c9c 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -23,23 +23,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -106,14 +89,14 @@ Runtime Config Options .. code-block:: console - testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' + dpdk-testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-13 are VLAN extraction, other queues run with no protocol extraction. .. code-block:: console - testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' + dpdk-testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. @@ -253,7 +236,7 @@ responses for the same from PF. #. Bind the VF0, and run testpmd with 'cap=dcf' devarg:: - testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i + dpdk-testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i #. Monitor the VF2 interface network traffic:: @@ -282,7 +265,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i + ./app/dpdk-testpmd -l 0-15 -n 4 -- -i ... testpmd> rx_vlan add 10 0 diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3b096236bf 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ @@ -67,7 +53,7 @@ outer VLAN to 0x9100: .. code-block:: console - ./app/testpmd -l 4-8 -- -i + ./app/dpdk-testpmd -l 4-8 -- -i ... testpmd> vlan set filter on 0 @@ -94,7 +80,7 @@ Start ``testpmd``: .. code-block:: console - ./testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss + ./dpdk-testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss Add a rule to direct packet whose ``ether-type=0x801`` to queue 1: diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..723a9c0fa2 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,6 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +520,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..5d4534e4da 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +77,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop HQoS and flow acceleration ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,7 +88,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port, enable FPGA HQoS and .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap Limitations or Known issues --------------------------- diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 90d3040cf5..80ba459d49 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -97,13 +97,13 @@ It is possible to test PMD quickly using KNI kernel module loopback feature: .. code-block:: console - insmod build/kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb * Start testpmd with no physical device but two KNI virtual devices: .. code-block:: console - ./testpmd --vdev net_kni0 --vdev net_kni1 -- -i + ./dpdk-testpmd --vdev net_kni0 --vdev net_kni1 -- -i .. code-block:: console diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index ddeebed25c..6c6227f979 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -213,15 +213,15 @@ In this example we run two instances of testpmd application and transmit packets First create ``master`` interface:: - #./build/app/testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i + #./<build_dir>/app/dpdk-testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i Now create ``slave`` interface (master must be already running so the slave will connect):: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i You can also enable ``zero-copy`` on ``slave`` interface:: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i Start forwarding packets:: @@ -257,7 +257,7 @@ To see socket filename use show memif command:: Now create memif interface by running testpmd with these command line options:: - #./testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i + #./dpdk-testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i Testpmd should now create memif slave interface and try to connect to master. In testpmd set forward option to icmpecho and start forwarding:: @@ -280,7 +280,7 @@ The situation is analogous to cross connecting 2 ports of the NIC by cable. To set the loopback, just use the same socket and id with different roles:: - #./testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i + #./dpdk-testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i Then start the communication:: diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 1f1e2f6c77..d077ada7e2 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,43 +51,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +65,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +203,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 211c0c5a6c..9c32893fc6 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -328,50 +323,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -383,10 +337,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1109,12 +1059,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..e8abde42da 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -81,20 +75,9 @@ Prerequisites Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. @@ -107,7 +90,7 @@ be passed as part of EAL arguments. .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ -c 3 -- -i --p 3 -a @@ -126,16 +109,13 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +following command: .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + Usage Example ------------- @@ -160,7 +140,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ -i --p 3 -a --txd 256 --rxd 128 --rxq=1 --txq=1 --nb-cores=1 @@ -168,4 +148,4 @@ In order to run l2fwd example application following command can be used: .. code-block:: console - ./l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 + ./dpdk-l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..6fbce8358e 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -143,22 +123,15 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +command below. For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`. .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make Usage Example ------------- @@ -185,7 +158,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ --burst=128 --txd=2048 --rxd=1024 --rxq=2 --txq=2 --nb-cores=2 \ -i -a --rss-udp @@ -373,7 +346,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ -c 7 -- -i -a --disable-hw-vlan-strip --rxq=3 --txq=3 .. _flowapi: @@ -486,7 +459,7 @@ Before proceeding run testpmd user application: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip Example #1 ^^^^^^^^^^ @@ -578,7 +551,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 2. Create meter profile: @@ -657,7 +630,7 @@ For a detailed usage description please refer to "Traffic Management" section in .. code-block:: console - ./testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ + ./dpdk-testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ -i -p 3 --disable-hw-vlan-strip --rxq 3 --txq 3 --txd 1024 --rxd 1024 2. Stop all ports: diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..ecea3ecff0 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./<build_dir>/app/dpdk-testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. @@ -133,7 +118,7 @@ transmit queue: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 5f2a0698f6..6aa58f4358 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..e75abd96d2 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..c01ae09bb3 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./<build_dir>/app/dpdk-testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index bb591a8b7e..903b52b802 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document @@ -74,7 +63,7 @@ use arm64-octeontx2-linux-gcc as target. .. code-block:: console - ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 + ./<build_dir>/app/dpdk-testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 EAL: Detected 24 lcore(s) EAL: Detected 1 NUMA nodes EAL: Multi-process socket /var/run/dpdk/rte/mp_socket diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index cf230ae40a..67bd23ea4a 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx @@ -225,7 +223,7 @@ Multiple devices may be specified, separated by commas. .. code-block:: console - ./testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i + ./dpdk-testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i EAL: Detected lcore 1 as core 1 on socket 0 ... diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index 5b2f868952..6df0066dd4 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -111,22 +111,9 @@ Performance note Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index be1c2fe1d6..6ee5190f3c 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -271,21 +271,6 @@ Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_PMD`` (default **y**) - - Enable compilation of Solarflare libefx-based poll-mode driver. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG`` (default **n**) - - Enable compilation of the extra run-time consistency checks. - - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..695ebed91f 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- @@ -130,7 +121,7 @@ Soft NIC testing .. code-block:: console - ./testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i + ./dpdk-testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i --portmask=0x2 .. code-block:: console @@ -375,7 +366,7 @@ commands. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -c 0x7 -s 0x4 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0x7 -s 0x4 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..9cf3f39eb5 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..a928a790e3 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ @@ -70,8 +50,7 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linux-gcc as target. +Use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling. Linux ----- @@ -178,7 +157,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst index d36f3120b2..ee802ec4a8 100644 --- a/doc/guides/nics/vhost.rst +++ b/doc/guides/nics/vhost.rst @@ -90,7 +90,7 @@ This section demonstrates vhost PMD with testpmd DPDK sample application. .. code-block:: console - ./testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i + ./dpdk-testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i Other basic DPDK preparations like hugepage enabling here. Please refer to the *DPDK Getting Started Guide* for detailed instructions. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 0daf25b22d..a51b389685 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -110,7 +110,7 @@ Host2VM communication example .. code-block:: console - examples/kni/build/app/kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" + <build_dir>/examples/dpdk-kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" This command generates one network device vEth0 for physical port. If specify more physical ports, the generated network device will be vEth1, vEth2, and so on. @@ -340,7 +340,7 @@ Here we use l3fwd-power as an example to show how to get started. .. code-block:: console - $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ + $ dpdk-l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ --no-numa --parse-ptype -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 09/20] doc: remove references to make from NICs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 09/20] doc: remove references to make from NICs guides Ciara Power @ 2020-10-09 12:08 ` Ferruh Yigit 0 siblings, 0 replies; 300+ messages in thread From: Ferruh Yigit @ 2020-10-09 12:08 UTC (permalink / raw) To: Ciara Power, dev Cc: Shepard Siegel, Ed Czeck, John Miller, John McNamara, Marko Kovacevic, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Wei Zhao, Alfredo Cardigliano, Rosen Xu, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Bruce Richardson, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang On 9/21/2020 2:59 PM, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> > --- for kni & pcap, Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 10/20] doc: remove references to make from vdpadevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (8 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 09/20] doc: remove references to make from NICs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 11/20] doc: remove references to make from bbdevs guides Ciara Power ` (10 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Xiao Wang, John McNamara, Marko Kovacevic, Matan Azrad, Viacheslav Ovsiienko Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/vdpadevs/ifc.rst | 13 ------------ doc/guides/vdpadevs/mlx5.rst | 40 +++--------------------------------- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst index 12a2a342e6..f968489a75 100644 --- a/doc/guides/vdpadevs/ifc.rst +++ b/doc/guides/vdpadevs/ifc.rst @@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and device state report/restore, this driver enables its vDPA functionality. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux) - - Toggle compilation of the ``librte_pmd_ifc`` driver. - - IFCVF vDPA Implementation ------------------------- diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..2717459b6f 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -65,42 +63,10 @@ Prerequisites Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 11/20] doc: remove references to make from bbdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (9 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 10/20] doc: remove references to make from vdpadevs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 12/20] doc: remove references to make from cryptodevs guides Ciara Power ` (9 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Nicolas Chautru, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v5: Added meson steps to turbo_sw doc. --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 7 ++----- doc/guides/bbdevs/fpga_lte_fec.rst | 7 ++----- doc/guides/bbdevs/turbo_sw.rst | 23 ++++++++--------------- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index 6760391e8c..8e00c4ef22 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -94,7 +91,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 0d8f" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd8086:0d8f diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index fdc8a76981..14ffa0ee14 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The @@ -93,7 +90,7 @@ the UIO driver by repeating this command for every function. .. code-block:: console cd <dpdk-top-level-directory> - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1172 5052" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vd1172: diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..43c5129fd7 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -144,20 +136,21 @@ In order to enable this virtual bbdev PMD, the user may: FlexRAN SDK libraries were installed. And ``DIR_WIRELESS_SDK`` to the path where the libraries were extracted. +* Tune the meson build option pointing the location of the FlexRAN SDK libraries ``flexran_sdk`` + Example: .. code-block:: console export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ + cd build + meson configure -Dflexran_sdk=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx512-icc/install + +* For AVX512 machines with SDK libraries installed then both 4G and 5G can be enabled for full real time FEC capability. + For AVX2 machines it is possible to only enable the 4G libraries and the PMD capabilities will be limited to 4G FEC. + If no library is present then the PMD driver will still build but its capabilities will be limited accordingly. -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 12/20] doc: remove references to make from cryptodevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (10 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 11/20] doc: remove references to make from bbdevs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 13/20] doc: remove references to make from compressdevs guides Ciara Power ` (8 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Declan Doherty, Pablo de Lara, John McNamara, Marko Kovacevic, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ------------- doc/guides/cryptodevs/ccp.rst | 14 +++--- doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- doc/guides/cryptodevs/kasumi.rst | 11 +---- doc/guides/cryptodevs/mvsam.rst | 10 +---- doc/guides/cryptodevs/nitrox.rst | 7 --- doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +----- doc/guides/cryptodevs/octeontx2.rst | 8 +--- doc/guides/cryptodevs/openssl.rst | 6 +-- doc/guides/cryptodevs/qat.rst | 67 +++++++---------------------- doc/guides/cryptodevs/scheduler.rst | 8 ---- doc/guides/cryptodevs/snow3g.rst | 10 +---- doc/guides/cryptodevs/virtio.rst | 20 +++------ doc/guides/cryptodevs/zuc.rst | 10 +---- 19 files changed, 40 insertions(+), 236 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 74e0de63ad..013615e2d0 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. @@ -117,5 +115,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm" diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 15388d20ab..fd533ca65b 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. @@ -152,7 +150,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo "sha1-hmac" Extra notes diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index a43fe92de9..9ca1979994 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -77,7 +75,7 @@ e.g. for the 0x1456 device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "1022 1456" > /sys/bus/pci/drivers/igb_uio/new_id Another way to bind the CCP devices to DPDK UIO driver is by using the ``dpdk-devbind.py`` script. @@ -86,8 +84,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. @@ -109,7 +105,7 @@ To validate ccp pmd, l2fwd-crypto example can be used with following command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff @@ -124,7 +120,7 @@ following: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..5770a60cb2 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. @@ -117,7 +108,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "kasumi-f8" Extra notes on KASUMI F9 diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..6188c1248c 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: @@ -105,7 +97,7 @@ operation: .. code-block:: console - ./l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ + ./dpdk-l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ --auth_op GENERATE --auth_algo sha1-hmac \ diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 85f5212b64..2f0565b49e 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -33,13 +33,6 @@ Limitations * 3DES Cipher Only combination is not supported. * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/null.rst b/doc/guides/cryptodevs/null.rst index c980e0ac84..aac5904b1d 100644 --- a/doc/guides/cryptodevs/null.rst +++ b/doc/guides/cryptodevs/null.rst @@ -67,5 +67,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "null" diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..d813cb2974 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- @@ -135,7 +127,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_autotest The asymmetric crypto operations on OCTEON TX crypto PMD may be verified by running the test @@ -143,5 +135,5 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_asym_autotest diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index 432146db04..bb4af3a04d 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. @@ -148,7 +144,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_autotest The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test @@ -156,7 +152,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_asym_autotest diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..ca0f0b43f3 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: @@ -93,7 +93,7 @@ To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" --vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index e5d2cf4997..6714a7a8a2 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -483,7 +456,6 @@ To complete the installation follow the instructions in insmod ./drivers/crypto/qat/qat_common/intel_qat.ko insmod ./drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko - .. Note:: If you see the following warning in ``/var/log/messages`` it can be ignored: @@ -644,7 +616,7 @@ e.g. for the C62x device:: cd to the top-level DPDK directory modprobe uio - insmod ./build/kmod/igb_uio.ko + insmod ./<build_dir>/kernel/linux/igb_uio/igb_uio.ko echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id lspci -vvd:37c9 @@ -660,27 +632,20 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -704,7 +669,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 7004ca431a..ee23b25b73 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..13341c39c4 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "snow3g-uea2" diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..83d8e32397 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,27 +83,17 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "cryptodev_virtio_autotest" to test + cd to <build_dir> + meson test cryptodev_virtio_autotest The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test-crypto-perf - type the command "make" to compile - run the tests with the following command: - - ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ + cd to <build_dir> + + ./app/dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ --ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \ --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \ --auth-op generate --auth-key-sz 64 --digest-sz 12 \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..907840ef05 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "zuc-eea3" -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 13/20] doc: remove references to make from compressdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (11 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 12/20] doc: remove references to make from cryptodevs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-10-02 9:33 ` Daly, Lee 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 14/20] doc: remove references to make from eventdevs guides Ciara Power ` (7 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Lee Daly, John McNamara, Marko Kovacevic, Ashish Gupta, Sunila Sahu Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..8c658721b9 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -56,21 +56,6 @@ Steps To Setup Platform SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. -Installation ------------- - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "compressdev_autotest" to test + cd to <build_dir> + meson test compressdev_autotest diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 13/20] doc: remove references to make from compressdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 13/20] doc: remove references to make from compressdevs guides Ciara Power @ 2020-10-02 9:33 ` Daly, Lee 0 siblings, 0 replies; 300+ messages in thread From: Daly, Lee @ 2020-10-02 9:33 UTC (permalink / raw) To: Power, Ciara, dev Cc: Mcnamara, John, Kovacevic, Marko, Ashish Gupta, Sunila Sahu > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > Sent: Monday, September 21, 2020 2:59 PM > To: dev@dpdk.org > Cc: Power, Ciara <ciara.power@intel.com>; Daly, Lee <lee.daly@intel.com>; > Mcnamara, John <john.mcnamara@intel.com>; Kovacevic, Marko > <marko.kovacevic@intel.com>; Ashish Gupta <ashish.gupta@marvell.com>; > Sunila Sahu <ssahu@marvell.com> > Subject: [PATCH v5 13/20] doc: remove references to make from compressdevs > guides > > Make is no longer supported for compiling DPDK, references are now removed > in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/compressdevs/isal.rst | 4 ---- > doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- > doc/guides/compressdevs/zlib.rst | 4 ---- > 3 files changed, 2 insertions(+), 30 deletions(-) > > diff --git a/doc/guides/compressdevs/isal.rst > b/doc/guides/compressdevs/isal.rst > index af1f41f240..1d146fb4a6 100644 > --- a/doc/guides/compressdevs/isal.rst > +++ b/doc/guides/compressdevs/isal.rst > @@ -133,10 +133,6 @@ Installation > Initialization > -------------- > > -In order to enable this virtual compression PMD, user must: > - > -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. > - > To use the PMD in an application, user must: > > * Call ``rte_vdev_init("compress_isal")`` within the application. <<snip>> ISA-L change looks good, thanks for work. Acked-by: Lee Daly <lee.daly@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 14/20] doc: remove references to make from eventdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (12 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 13/20] doc: remove references to make from compressdevs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides Ciara Power ` (6 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Hemant Agrawal, Nipun Gupta, John McNamara, Marko Kovacevic, Jerin Jacob, Pavan Nikhilesh Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/eventdevs/dpaa.rst | 20 -------------------- doc/guides/eventdevs/dpaa2.rst | 20 -------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 8 -------- 4 files changed, 72 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..6fbee91d9e 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -43,26 +43,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..b992ae649e 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -52,26 +52,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 9a3646db0d..f7a4cdd586 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..7f9eceb01f 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (13 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 14/20] doc: remove references to make from eventdevs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-10-01 15:17 ` Bruce Richardson 2020-10-02 14:57 ` Xu, Rosen 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 16/20] doc: remove references to make from app guides Ciara Power ` (5 subsequent siblings) 20 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Nipun Gupta, John McNamara, Marko Kovacevic, Rosen Xu, Tianfei zhang, Bruce Richardson, Xiaoyun Li, Jingjing Wu, Satha Rao, Mahipal Challa Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ioat.rst | 8 +------- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 7 files changed, 1 insertion(+), 85 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst index c46460ff45..b1b10c7fad 100644 --- a/doc/guides/rawdevs/ioat.rst +++ b/doc/guides/rawdevs/ioat.rst @@ -54,13 +54,7 @@ shows: Compilation ------------ -For builds done with ``make``, the driver compilation is enabled by the -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is -enabled by default in builds for x86 platforms, and disabled in other -configurations. - -For builds using ``meson`` and ``ninja``, the driver will be built when the -target platform is x86-based. +The driver will be built when the target platform is x86-based. Device Setup ------------- diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index aa7d809649..0589b70087 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ is https://www.intel.com/content/dam/support/us/en/documents/server-products/Int - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 4a9794489e..6887da5278 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index b03fcf789a..fb9d346ccf 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides Ciara Power @ 2020-10-01 15:17 ` Bruce Richardson 2020-10-02 14:57 ` Xu, Rosen 1 sibling, 0 replies; 300+ messages in thread From: Bruce Richardson @ 2020-10-01 15:17 UTC (permalink / raw) To: Ciara Power Cc: dev, Nipun Gupta, John McNamara, Marko Kovacevic, Rosen Xu, Tianfei zhang, Xiaoyun Li, Jingjing Wu, Satha Rao, Mahipal Challa On Mon, Sep 21, 2020 at 02:59:26PM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- > doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- > doc/guides/rawdevs/ifpga.rst | 10 ---------- > doc/guides/rawdevs/ioat.rst | 8 +------- > doc/guides/rawdevs/ntb.rst | 6 ------ > doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ > doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- > 7 files changed, 1 insertion(+), 85 deletions(-) > <snip> > diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst > index c46460ff45..b1b10c7fad 100644 > --- a/doc/guides/rawdevs/ioat.rst > +++ b/doc/guides/rawdevs/ioat.rst > @@ -54,13 +54,7 @@ shows: > Compilation > ------------ > > -For builds done with ``make``, the driver compilation is enabled by the > -``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is > -enabled by default in builds for x86 platforms, and disabled in other > -configurations. > - > -For builds using ``meson`` and ``ninja``, the driver will be built when the > -target platform is x86-based. > +The driver will be built when the target platform is x86-based. > This change for ioat is good, but the sentence now feels a little incomplete. Can we perhaps just add on a bit to make it something like: "The driver will be enabled in the DPDK build when the target platform is x86-based; no additional build configuration steps are necessary." Otherwise for the ioat part: Acked-by: Bruce Richardson <bruce.richardson@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides Ciara Power 2020-10-01 15:17 ` Bruce Richardson @ 2020-10-02 14:57 ` Xu, Rosen 1 sibling, 0 replies; 300+ messages in thread From: Xu, Rosen @ 2020-10-02 14:57 UTC (permalink / raw) To: Power, Ciara, dev Cc: Nipun Gupta, Mcnamara, John, Kovacevic, Marko, Zhang, Tianfei, Richardson, Bruce, Li, Xiaoyun, Wu, Jingjing, Satha Rao, Mahipal Challa Hi, > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > Sent: Monday, September 21, 2020 21:59 > To: dev@dpdk.org > Cc: Power, Ciara <ciara.power@intel.com>; Nipun Gupta > <nipun.gupta@nxp.com>; Mcnamara, John <john.mcnamara@intel.com>; > Kovacevic, Marko <marko.kovacevic@intel.com>; Xu, Rosen > <rosen.xu@intel.com>; Zhang, Tianfei <tianfei.zhang@intel.com>; > Richardson, Bruce <bruce.richardson@intel.com>; Li, Xiaoyun > <xiaoyun.li@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Satha Rao > <skoteshwar@marvell.com>; Mahipal Challa <mchalla@marvell.com> > Subject: [PATCH v5 15/20] doc: remove references to make from rawdevs > guides > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- > doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- > doc/guides/rawdevs/ifpga.rst | 10 ---------- > doc/guides/rawdevs/ioat.rst | 8 +------- > doc/guides/rawdevs/ntb.rst | 6 ------ > doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ > doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- > 7 files changed, 1 insertion(+), 85 deletions(-) > > diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst > b/doc/guides/rawdevs/dpaa2_cmdif.rst > index be9805874b..7ac3963938 100644 > --- a/doc/guides/rawdevs/dpaa2_cmdif.rst > +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst > @@ -44,17 +44,6 @@ Currently supported by DPDK: > Some part of fslmc bus code (mc flib - object library) routines are > dual licensed (BSD & GPLv2). > > -Pre-Installation Configuration > ------------------------------- > - > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) > - > - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. > > Enabling logs > ------------- > @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: > Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs > can be enabled which are lower than logging ``level``. > > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the - > following ``make`` command: > - > -.. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst > b/doc/guides/rawdevs/dpaa2_qdma.rst > index 129e83d5ef..92921fafdd 100644 > --- a/doc/guides/rawdevs/dpaa2_qdma.rst > +++ b/doc/guides/rawdevs/dpaa2_qdma.rst > @@ -48,17 +48,6 @@ Currently supported by DPDK: > Some part of fslmc bus code (mc flib - object library) routines are > dual licensed (BSD & GPLv2). > > -Pre-Installation Configuration > ------------------------------- > - > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) > - > - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. > > Enabling logs > ------------- > @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: > Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs > can be enabled which are lower than logging ``level``. > > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the - > following ``make`` command: > - > -.. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst > index a3d92a62ea..dbd0d6e37d 100644 > --- a/doc/guides/rawdevs/ifpga.rst > +++ b/doc/guides/rawdevs/ifpga.rst > @@ -76,16 +76,6 @@ summarized by the following block diagram:: > | vdev_ifpga_cfg driver | | Intel FpgaDev | > +------------------------------------+ +-----------------+ > > -Build options > -------------- > - > -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) > - > - Toggle compilation of IFPGA Bus library. > - > -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) > - > - Toggle compilation of the ``ifpga_rawdev`` driver. > > Run-time parameters > ------------------- > diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst index > c46460ff45..b1b10c7fad 100644 > --- a/doc/guides/rawdevs/ioat.rst > +++ b/doc/guides/rawdevs/ioat.rst > @@ -54,13 +54,7 @@ shows: > Compilation > ------------ > > -For builds done with ``make``, the driver compilation is enabled by the - > ``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. > This is -enabled by default in builds for x86 platforms, and disabled in other - > configurations. > - > -For builds using ``meson`` and ``ninja``, the driver will be built when the - > target platform is x86-based. > +The driver will be built when the target platform is x86-based. > > Device Setup > ------------- > diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index > aa7d809649..0589b70087 100644 > --- a/doc/guides/rawdevs/ntb.rst > +++ b/doc/guides/rawdevs/ntb.rst > @@ -30,12 +30,6 @@ is > https://www.intel.com/content/dam/support/us/en/documents/server- > products/Int > - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This > is a hardware requirement. > > -Build Options > -------------- > - > -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) > - > - Toggle compilation of the ``ntb`` driver. > > Device Setup > ------------ > diff --git a/doc/guides/rawdevs/octeontx2_dma.rst > b/doc/guides/rawdevs/octeontx2_dma.rst > index 4a9794489e..6887da5278 100644 > --- a/doc/guides/rawdevs/octeontx2_dma.rst > +++ b/doc/guides/rawdevs/octeontx2_dma.rst > @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure > See :doc:`../platform/octeontx2` for setup information. > > > -Pre-Installation Configuration > ------------------------------- > - > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) > - > - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. > - > Enabling logs > ------------- > > diff --git a/doc/guides/rawdevs/octeontx2_ep.rst > b/doc/guides/rawdevs/octeontx2_ep.rst > index b03fcf789a..fb9d346ccf 100644 > --- a/doc/guides/rawdevs/octeontx2_ep.rst > +++ b/doc/guides/rawdevs/octeontx2_ep.rst > @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports > > #. Packet Output - OCTEON TX2 to Host with info pointer mode. > > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) > - > - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. > > Initialization > -------------- > -- > 2.17.1 Acked-by: Rosen Xu <rosen.xu@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 16/20] doc: remove references to make from app guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (14 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-24 13:17 ` David Hunt 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 17/20] doc: remove reference to make from tools guides Ciara Power ` (4 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, John McNamara, Marko Kovacevic, Olivier Matz, David Hunt, Ori Kam, Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Harry van Haaren, Bernard Iremonger, Konstantin Ananyev, Cristian Dumitrescu, Ferruh Yigit, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, Kirill Rybalchenko, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Wenzhuo Lu, Beilei Xing Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- doc/guides/sample_app_ug/bbdev_app.rst | 34 ++------ doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +++++++------------ doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +-- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +----- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +--- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 ++-- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +-- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +-- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 ++-- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 ++--- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +++------- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +-- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +---- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +++------- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +-- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 ++++---- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- 51 files changed, 199 insertions(+), 356 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..764155f983 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -31,30 +31,12 @@ Limitations Compiling the Application ------------------------- -#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along - with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* - documentation for more details on this. +DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along +with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* +documentation for more details on this. -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make Running the Application ----------------------- @@ -63,8 +45,8 @@ The application accepts a number of command line options: .. code-block:: console - $ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] / - [-p ETH_PORT_ID] [-b BBDEV_ID] + $ ./<build_dir>/examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] / + [-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID] where: @@ -84,8 +66,8 @@ issue the command: .. code-block:: console - $ ./build/bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> -c 0x38 --socket-mem=2,2 \ - --file-prefix=bbdev -- -e 0x10 -d 0x20 + $ ./<build_dir>/examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> \ + -c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20 where, NIC0PCIADDR is the PCI address of the Rx port diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index 6deb6c8112..5e3a25a317 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -52,7 +52,7 @@ To run the application in linux environment, issue the following command: .. code-block:: console - $ ./build/cmdline -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-cmdline -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..adde775d4e 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,100 +9,75 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: - - .. code-block:: console - - cd $RTE_SDK - -Build DPDK: +Enable examples compilation: .. code-block:: console - make defconfig - make + meson configure -Dexamples=all -Build the sample applications: +Build: .. code-block:: console - export RTE_TARGET=build - make -C examples + ninja -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. +Applications are output to: ``dpdk/<build_dir>/examples``. -In the example above the compiled application is written to the ``build`` subdirectory. -To have the applications written to a different location, -the ``O=/path/to/build/directory`` option may be specified in the make command. +To compile a single application +------------------------------- - .. code-block:: console - make O=/tmp +Using meson +~~~~~~~~~~~ -To build the applications for debugging use the ``DEBUG`` option. -This option adds some extra flags, disables compiler optimizations and -sets verbose output. +Go to DPDK build directory: .. code-block:: console - make DEBUG=1 - - -To compile a single application -------------------------------- + cd dpdk/<build_dir> -Set the path to DPDK source code: +Enable example app compilation: - .. code-block:: console + .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + meson configure -Dexamples=helloworld -Go to DPDK source: +Build: - .. code-block:: console + .. code-block:: console - cd $RTE_SDK + ninja -Build DPDK: - .. code-block:: console +Using Make +~~~~~~~~~~ - make defconfig - make +Pkg-config is used when building an example app standalone using make, please +see :ref:`building_app_using_installed_dpdk` for more information. Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. - +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make -To cross compile the sample application(s) ------------------------------------------- - -For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command. -In example of AARCH64 cross compiling: +To build the application for debugging use the ``DEBUG`` option. +This option adds some extra flags, disables compiler optimizations and +sets verbose output. .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk - make -C examples CROSS=aarch64-linux-gnu- - or - make CROSS=aarch64-linux-gnu- + make DEBUG=1 diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 90270e3a58..3bd03905c3 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -42,7 +42,7 @@ Running the Application .. code-block:: console - ./build/distributor_app [EAL options] -- -p PORTMASK + ./<build-dir>/examples/dpdk-distributor [EAL options] -- -p PORTMASK where, @@ -53,7 +53,7 @@ Running the Application .. code-block:: console - $ ./build/distributor_app -l 1-9,22 -n 4 -- -p f + $ ./<build-dir>/examples/dpdk-distributor -l 1-9,22 -n 4 -- -p f #. Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst index 253004dd00..7819871917 100644 --- a/doc/guides/sample_app_ug/ethtool.rst +++ b/doc/guides/sample_app_ug/ethtool.rst @@ -24,7 +24,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./ethtool-app/${RTE_TARGET}/ethtool [EAL options] + ./<build_dir>/examples/dpdk-ethtool [EAL options] Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index dc7972aa9a..b4fc587a09 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -46,7 +46,8 @@ these settings is shown below: .. code-block:: console - ./build/eventdev_pipeline --vdev event_sw0 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D + ./<build_dir>/examples/dpdk-eventdev_pipeline --vdev event_sw0 -- -r1 -t1 / + -e4 -w FF00 -s4 -n0 -c32 -W1000 -D The application has some sanity checking built-in, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 2953fddeb9..8b009244b8 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -70,9 +70,7 @@ Compiling the Application * Compile Application - .. code-block:: console - - make -C examples/fips_validation + To compile the sample application see :doc:`compiling`. * Run ``dos2unix`` on the request files @@ -92,7 +90,7 @@ The application requires a number of command line options: .. code-block:: console - ./fips_validation [EAL options] + ./dpdk-fips_validation [EAL options] -- --req-file FILE_PATH/FOLDER_PATH --rsp-file FILE_PATH/FOLDER_PATH [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder] @@ -117,7 +115,7 @@ file for crypto_aesni_mb PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_mb -- + $ ./dpdk-fips_validation --vdev crypto_aesni_mb -- --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb @@ -126,7 +124,7 @@ data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_gcm0 -- + $ ./dpdk-fips_validation --vdev crypto_aesni_gcm0 -- --req-file /PATH/TO/REQUEST/FILE/FOLDER/ --rsp-file ./PATH/TO/RESPONSE/FILE/FOLDER/ --cryptodev-id 0 --path-is-folder diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index dc40b4d6f9..2ae22739c0 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -28,8 +28,8 @@ To run the example in a ``linux`` environment: .. code-block:: console - cd ~/dpdk/examples/flow_classify - ./build/flow_classify -c 4 -n 4 -- --rule_ipv4="../ipv4_rules_file.txt" + ./<build_dir>/examples/dpdk-flow_classify -c 4 -n 4 -- / + --rule_ipv4="../ipv4_rules_file.txt" Please refer to the *DPDK Getting Started Guide*, section :doc:`../linux_gsg/build_sample_apps` diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 5e5a6cd8a0..4a4006dc8e 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -13,28 +13,7 @@ It is intended as a demonstration of the basic components RTE flow rules. Compiling the Application ------------------------- -To compile the application export the path to the DPDK source tree and go to -the example directory: - -.. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - - cd ${RTE_SDK}/examples/flow_filtering - -Set the target, for example: - -.. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - -See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. - -Build the application as follows: - -.. code-block:: console - - make +To compile the sample application see :doc:`compiling`. Running the Application @@ -44,7 +23,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/flow -l 1 -n 1 + ./<build_dir>/examples/dpdk-flow_filtering -l 1 -n 1 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 46f997a7dc..8f48533873 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -21,7 +21,7 @@ To run the example in a linux environment: .. code-block:: console - $ ./build/helloworld -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-helloworld -l 0-3 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ioat.rst b/doc/guides/sample_app_ug/ioat.rst index 3f7d5c34a6..eadb6efaf4 100644 --- a/doc/guides/sample_app_ug/ioat.rst +++ b/doc/guides/sample_app_ug/ioat.rst @@ -45,7 +45,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/ioatfwd [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] + ./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] [--[no-]mac-updating] where, @@ -81,7 +81,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw + $ ./<build_dir>/examples/dpdk-ioat -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw To run the application in a Linux environment with 2 lcores (the master lcore, plus one forwarding core), 2 ports (ports 0 and 1), hardware copying and no MAC @@ -89,7 +89,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw + $ ./<build_dir>/examples/dpdk-ioat -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index afeaff3639..92d5e4aeae 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -53,7 +53,7 @@ Application usage: .. code-block:: console - ./build/ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] where: @@ -65,7 +65,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_fragmentation -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -94,7 +94,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst index 56014be174..1d8656c637 100644 --- a/doc/guides/sample_app_ug/ip_pipeline.rst +++ b/doc/guides/sample_app_ug/ip_pipeline.rst @@ -34,7 +34,7 @@ Running the application The application startup command line is:: - ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] + dpdk-ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] The application startup arguments are: @@ -71,7 +71,7 @@ The following is an example command to run ip pipeline application configured fo .. code-block:: console - $ ./build/ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli + $ ./<build_dir>/examples/dpdk-ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli The application should start successfully and display as follows: diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index f34b9d0055..e72c8492e9 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -42,7 +42,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] + ./<build_dir>/examples/dpdk-ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] where: @@ -61,7 +61,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_reassembly -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_reassembly -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -92,7 +92,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_reassembly -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_reassembly -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. @@ -231,7 +231,8 @@ Debug logging and Statistics Collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The RTE_LIBRTE_IP_FRAG_TBL_STAT controls statistics collection for the IP Fragment Table. -This macro is disabled by default. +This macro is disabled by default, but it can be enabled by modifying the appropriate line +in ``config/rte_config.h``. To make ip_reassembly print the statistics to the standard output, the user must send either an USR1, INT or TERM signal to the process. For all of these signals, the ip_reassembly process prints Fragment table statistics for each RX queue, diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 434f484138..1f37dccf8b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -116,12 +116,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ipsec-secgw`` sub-directory. -#. [Optional] Build the application for debugging: - This option adds some extra flags, disables compiler optimizations and - is verbose:: - - make DEBUG=1 - Running the Application ----------------------- @@ -129,7 +123,7 @@ Running the Application The application has a number of command line options:: - ./build/ipsec-secgw [EAL options] -- + ./<build_dir>/examples/dpdk-ipsec-secgw [EAL options] -- -p PORTMASK -P -u PORTMASK -j FRAMESIZE -l -w REPLAY_WINOW_SIZE -e -a -c SAD_CACHE_SIZE @@ -245,7 +239,7 @@ The mapping of lcores to port/queues is similar to other l3fwd applications. For example, given the following command line to run application in poll mode:: - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ --vdev "crypto_null" -- -p 0xf -P -u 0x3 \ --config="(0,0,20),(1,0,20),(2,0,21),(3,0,21)" \ -f /path/to/config_file --transfer-mode poll \ @@ -297,7 +291,7 @@ where each option means: Similarly for example, given the following command line to run application in event app mode:: - ./build/ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ -f /path/to/config_file --transfer-mode event \ --event-schedule-type parallel \ @@ -336,7 +330,7 @@ For example, something like the following command line: .. code-block:: console - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ -w 81:00.0 -w 81:00.1 -w 81:00.2 -w 81:00.3 \ --vdev "crypto_aesni_mb" --vdev "crypto_null" \ -- \ diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index 8923a7f548..7c6e8b15cc 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -50,7 +50,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] where, @@ -67,7 +67,7 @@ Typically, to run the IPv4 Multicast sample application, issue the following com .. code-block:: console - ./build/ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 + ./<build_dir>/examples/dpdk-ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 In this command: diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..ef7936f80f 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -49,7 +49,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l2fwd-keepalive [EAL options] \ + ./<build_dir>/examples/dpdk-l2fwd-keepalive [EAL options] \ -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD] where, @@ -68,7 +68,7 @@ To run the application in linux environment with 4 lcores, 16 ports .. code-block:: console - ./build/l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 + ./<build_dir>/examples/dpdk-l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index aac4ebd8d4..ef441cc1e5 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -96,7 +96,7 @@ The ``kni`` example application requires a number of command line options: .. code-block:: console - kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] + dpdk-kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] Where: @@ -168,8 +168,8 @@ interface ``vEth1_0`` with the kernel thread bound to lcore 9. .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" The following example is identical, except an additional ``lcore_kthread`` core is specified per physical port. In this case, ``kni`` will create @@ -186,8 +186,8 @@ The kernel thread for each interface will be bound as follows: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" The following example can be used to test the interface between the ``kni`` test application and the ``rte_kni`` kernel module. In this example, @@ -206,8 +206,8 @@ disabled by **not** specifying the ``-m`` flag to ``kni``: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo carrier=on - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo carrier=on + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" KNI Operations -------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 0a813200ba..c1be2d7dff 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -70,13 +70,13 @@ To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" or to enable CAT and CDP on cpus 1,3: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" If CDP is not supported it will fail with following error message: diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 962752f21c..e2c0f9f1ec 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / + ./<build_dir>/examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / [--cdev_type HW/SW/ANY] [--chain HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] / [--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] / [--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size SIZE] / @@ -162,7 +162,7 @@ To run the application in linux environment with 2 lcores, 2 ports and 2 crypto .. code-block:: console - $ ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ + $ ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ --vdev "crypto_aesni_mb1" -- -p 0x3 --chain CIPHER_HASH \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index d536eee819..11c9d4b2ee 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -52,7 +52,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE + ./<build_dir>/examples/dpdk-l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE where, @@ -75,20 +75,20 @@ issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll Eventdev mode with 4 lcores, 16 ports , sched method ordered and MAC address updating enabled, issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered or .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -105,7 +105,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Explanation ----------- diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 8d0c38721f..1a854abb23 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -81,7 +81,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] + ./<build_dir>/examples/dpdk-l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] where, @@ -96,7 +96,7 @@ thousands separator printing, issue the command: .. code-block:: console - $ ./build/l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l + $ ./<build_dir>/examples/dpdk-l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index c0e8488e79..5a13de215e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK + ./<build_dir>/examples/dpdk-l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating [--portmap="(port, port)[,(port, port)]"] @@ -111,7 +111,7 @@ updating enabled, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p ffff To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and @@ -119,7 +119,7 @@ vice versa, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936..7acbd7404e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -51,7 +51,7 @@ Running the Application The application has a number of command line options:: - ./l3fwd [EAL options] -- -p PORTMASK + ./dpdk-l3fwd [EAL options] -- -p PORTMASK [-P] [-E] [-L] @@ -111,7 +111,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: @@ -138,13 +138,13 @@ Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered or .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered In this command: @@ -166,7 +166,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered In case of eventdev mode, *--config* option is not used for ethernet port configuration. Instead each ethernet port will be configured with mentioned diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..d3c901f8d8 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_graph.rst b/doc/guides/sample_app_ug/l3_forward_graph.rst index df50827bab..75617e3af1 100644 --- a/doc/guides/sample_app_ug/l3_forward_graph.rst +++ b/doc/guides/sample_app_ug/l3_forward_graph.rst @@ -44,7 +44,7 @@ Running the Application The application has a number of command line options similar to l3fwd:: - ./l3fwd-graph [EAL options] -- -p PORTMASK + ./dpdk-l3fwd-graph [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--eth-dest=X,MM:MM:MM:MM:MM:MM] @@ -79,7 +79,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 0cc6f2e62e..4f997108ba 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -88,7 +88,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -378,7 +378,7 @@ See :doc:`Power Management<../prog_guide/power_man>` chapter in the DPDK Program .. code-block:: console - ./l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 + ./<build_dir>/examples/dpdk-l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 Where, @@ -407,7 +407,7 @@ app with the training flag set to “1”, and the other parameters set to .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P This will run the training algorithm for x seconds on each core (cores 2 and 3), and then print out the recommended threshold values for those @@ -432,7 +432,7 @@ then be started without the training mode so traffic can start immediately. .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P Telemetry Mode -------------- @@ -449,13 +449,9 @@ cycles it took is measured and compared with minimum and maximum reference cycles and accordingly busy rate is set to either 0% or 50% or 100%. - .. Note:: - - * The CONFIG_RTE_LIBRTE_TELEMETRY should be set in order to get the stats in DPDK telemetry. - .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry + ./<build_dir>/examples/dpdk-l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry The new stats ``empty_poll`` , ``full_poll`` and ``busy_percent`` can be viewed by running the script ``/usertools/dpdk-telemetry-client.py`` and selecting the menu option ``Send for global Metrics``. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 04c40f2854..75bfd78505 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] + ./<build_dir>/examples/dpdk-link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] where, @@ -54,7 +54,7 @@ issue the command: .. code-block:: console - $ ./build/link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index f2a79a6397..8b2858b971 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -41,7 +41,7 @@ passing at least two cores in the coremask/corelist, as follows: .. code-block:: console - ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary For the first DPDK process run, the proc-type flag can be omitted or set to auto, since all DPDK processes will default to being a primary instance, @@ -50,7 +50,7 @@ The process should start successfully and display a command prompt as follows: .. code-block:: console - $ ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + $ ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary EAL: coremask set to 3 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 0 @@ -78,7 +78,7 @@ again run the same binary setting at least two cores in the coremask/corelist: .. code-block:: console - ./build/simple_mp -l 2-3 -n 4 --proc-type=secondary + ./<build_dir>/examples/dpdk-simple_mp -l 2-3 -n 4 --proc-type=secondary When running a secondary process such as that shown above, the proc-type parameter can again be specified as auto. However, omitting the parameter altogether will cause the process to try and start as a primary rather than secondary process. @@ -184,10 +184,10 @@ the following commands can be used (assuming run as root): .. code-block:: console - # ./build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 - # ./build/symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 - # ./build/symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 - # ./build/symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 .. note:: @@ -284,9 +284,9 @@ the following commands could be used: .. code-block:: console - # ./mp_server/build/mp_server -l 1-2 -n 4 -- -p 3 -n 2 - # ./mp_client/build/mp_client -l 3 -n 4 --proc-type=auto -- -n 0 - # ./mp_client/build/mp_client -l 4 -n 4 --proc-type=auto -- -n 1 + # ./<build_dir>/examples/dpdk-mp_server -l 1-2 -n 4 -- -p 3 -n 2 + # ./<build_dir>/examples/dpdk-mp_client -l 3 -n 4 --proc-type=auto -- -n 0 + # ./<build_dir>/examples/dpdk-mp_client -l 4 -n 4 --proc-type=auto -- -n 1 .. note:: diff --git a/doc/guides/sample_app_ug/ntb.rst b/doc/guides/sample_app_ug/ntb.rst index 93fb752f25..f80b221db7 100644 --- a/doc/guides/sample_app_ug/ntb.rst +++ b/doc/guides/sample_app_ug/ntb.rst @@ -32,7 +32,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./build/ntb_fwd -c 0xf -n 6 -- -i + ./<build_dir>/examples/dpdk-ntb -c 0xf -n 6 -- -i Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/packet_ordering.rst b/doc/guides/sample_app_ug/packet_ordering.rst index 1c8ee5d040..5a4e0a9d28 100644 --- a/doc/guides/sample_app_ug/packet_ordering.rst +++ b/doc/guides/sample_app_ug/packet_ordering.rst @@ -43,7 +43,8 @@ The application execution command line is: .. code-block:: console - ./packet_ordering [EAL options] -- -p PORTMASK [--disable-reorder] [--insight-worker] + ./<build_dir>/examples/dpdk-packet_ordering [EAL options] -- -p PORTMASK / + [--disable-reorder] [--insight-worker] The -c EAL CPU_COREMASK option has to contain at least 3 CPU cores. The first CPU core in the core mask is the master core and would be assigned to diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..2a50eb4270 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -55,7 +55,7 @@ Running the Application The application has a number of command line options:: - ./build/l3fwd-thread [EAL options] -- + ./<build_dir>/examples/dpdk-l3fwd-thread [EAL options] -- -p PORTMASK [-P] --rx(port,queue,lcore,thread)[,(port,queue,lcore,thread)] --tx(lcore,thread)[,(lcore,thread)] @@ -141,14 +141,14 @@ in ``--rx/--tx`` are used to affinitize threads to the selected scheduler. For example, the following places every l-thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" The following places RX l-threads on lcore 0 and TX l-threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(2,1)" @@ -164,7 +164,7 @@ place every RX and TX thread on different lcores. For example, the following places every EAL thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -176,7 +176,7 @@ parameter is used. The following places RX EAL threads on lcore 0 and TX EAL threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -190,13 +190,13 @@ and its corresponding EAL threads command line can be realized as follows: a) Start every thread on different scheduler (1:1):: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" EAL thread equivalent:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -205,13 +205,13 @@ b) Start all threads on one core (N:1). Start 4 L-threads on lcore 0:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(0,0)(0,1)" Start 4 EAL threads on cpu-set 0:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -220,14 +220,14 @@ c) Start threads on different cores (N:M). Start 2 L-threads for RX on lcore 0, and 2 L-threads for TX on lcore 1:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(1,1)" Start 2 EAL threads for RX on cpu-set 0, and 2 EAL threads for TX on cpu-set 1:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -1146,33 +1146,15 @@ in the performance-thread folder To build and run the pthread shim example -#. Go to the example applications folder - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim - - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the DPDK Getting Started Guide for possible RTE_TARGET values. - #. Build the application: - .. code-block:: console - - make + To compile the sample application see :doc:`compiling`. #. To run the pthread_shim example .. code-block:: console - lthread-pthread-shim -c core_mask -n number_of_channels + dpdk-pthread-shim -c core_mask -n number_of_channels .. _lthread_diagnostics: diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 12b4f13d5b..a58b6f35bf 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -57,13 +57,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. -.. note:: - To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 - and then recompile DPDK: - - .. code-block:: console - - CONFIG_RTE_LIBRTE_IEEE1588=y Running the Application ----------------------- @@ -72,7 +65,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/ptpclient -l 1 -n 4 -- -p 0x1 -T 0 + ./<build_dir>/examples/dpdk-ptpclient -l 1 -n 4 -- -p 0x1 -T 0 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst index d75f7da52c..6b6853a0e9 100644 --- a/doc/guides/sample_app_ug/qos_metering.rst +++ b/doc/guides/sample_app_ug/qos_metering.rst @@ -48,7 +48,7 @@ The application execution command line is as below: .. code-block:: console - ./qos_meter [EAL options] -- -p PORTMASK + ./dpdk-qos_meter [EAL options] -- -p PORTMASK The application is constrained to use a single core in the EAL core mask and 2 ports only in the application port mask (first port from the port mask is used for RX and the other port in the core mask is used for TX). diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..801f5e1286 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,8 +42,8 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, - which can be done by changing the configuration file for the specific target to be compiled. + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the relevant + entry in the ``config/rte_config.h`` file. Running the Application ----------------------- @@ -57,7 +57,7 @@ The application has a number of command line options: .. code-block:: console - ./qos_sched [EAL options] -- <APP PARAMS> + ./<build_dir>/examples/dpdk-qos_sched [EAL options] -- <APP PARAMS> Mandatory application parameters include: @@ -315,7 +315,7 @@ The following is an example command with a single packet flow configuration: .. code-block:: console - ./qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg This example uses a single packet flow configuration which creates one RX thread on lcore 5 reading from port 3 and a worker thread on lcore 7 writing to port 2. @@ -324,7 +324,7 @@ Another example with 2 packet flow configurations using different ports but shar .. code-block:: console - ./qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg Note that independent cores for the packet flow configurations for each of the RX, WT and TX thread are also supported, providing flexibility to balance the work. diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..62d1f39d7e 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- @@ -40,7 +33,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/rxtx_callbacks -l 1 -n 4 -- [-t] + ./<build_dir>/examples/dpdk-rxtx_callbacks -l 1 -n 4 -- [-t] Use -t to enable hardware timestamping. If not supported by the NIC, an error will be displayed. diff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst index 12208f4258..f27d1ccfce 100644 --- a/doc/guides/sample_app_ug/server_node_efd.rst +++ b/doc/guides/sample_app_ug/server_node_efd.rst @@ -93,7 +93,7 @@ and the back-end node. The frontend server (server) has the following command line options:: - ./server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS + ./<build_dir>/examples/dpdk-server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS Where, diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..9202be6ea9 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -20,26 +20,9 @@ is application specific, and not a part of the service cores API. Compiling the Application ------------------------- -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make +The application is located in the ``service_cores`` sub-directory. Running the Application ----------------------- @@ -50,7 +33,7 @@ pass a service core-mask as an EAL argument at startup time. .. code-block:: console - $ ./build/service_cores + $ ./<build_dir>/examples/dpdk-service_cores Explanation diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 34f6f9aea7..263d8debc8 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -25,7 +25,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/basicfwd -l 1 -n 4 + ./<build_dir>/examples/dpdk-skeleton -l 1 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..86ced036ce 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,36 +90,17 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- -#. Go to the examples directory: +Run the tep_termination sample code: - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination - -#. Run the tep_termination sample code: - - .. code-block:: console +.. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- - -p 0x1 --dev-basename tep-termination --nb-devices 4 - --udp-port 4789 --filter-type 1 + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + -p 0x1 --dev-basename tep-termination --nb-devices 4 + --udp-port 4789 --filter-type 1 .. note:: @@ -139,7 +120,7 @@ The default value is 2. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 **Tunneling UDP port.** @@ -149,7 +130,7 @@ The default value is 4789. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 **Filter Type.** @@ -160,7 +141,7 @@ The default value is 1, which means the filter type of inner MAC and tenant ID i .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 --filter-type 1 **TX Checksum.** @@ -170,7 +151,7 @@ The default value is 0, which means the checksum offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --tx-checksum **TCP segment size.** @@ -180,7 +161,7 @@ The default value is 0, which means TSO offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --tx-checksum --tso-segsz 800 **Decapsulation option.** @@ -190,7 +171,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --decap 1 **Encapsulation option.** @@ -200,7 +181,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --encap 1 diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..d57d08fb2c 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/<build_dir>/app`` directory. Running the Application @@ -45,7 +45,7 @@ The application execution command line is: .. code-block:: console - ./test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE + ./dpdk-test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE The -c or -l EAL CPU coremask/corelist option has to contain exactly 3 CPU cores. The first CPU core in the core mask is assigned for core A, the second for core B and the third for core C. diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index 98d762d238..94cee9819d 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -21,7 +21,7 @@ To run the example in linux environment: .. code-block:: console - $ ./build/timer -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-timer -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index d66a724827..a8bedbab53 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -29,7 +29,7 @@ Start the vdpa example .. code-block:: console - ./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + ./dpdk-vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] where @@ -51,7 +51,7 @@ Take IFCVF driver for example: .. code-block:: console - ./vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ + ./dpdk-vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ -w 0000:06:00.3,vdpa=1 -w 0000:06:00.4,vdpa=1 \ -- --interactive diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..bacf7898f9 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -38,7 +38,7 @@ Start the vswitch example .. code-block:: console - ./vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ + ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ -- --socket-file /tmp/sock0 --client \ ... @@ -78,13 +78,13 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. .. code-block:: console - ./x86_64-native-gcc/app/testpmd -l 0-1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-1 -- -i > start tx_first Inject packets @@ -192,11 +192,6 @@ Common Issues max queue number is larger than 128, device start will fail due to insufficient mbuf. - Change the default number to make it work as below, just set the number - according to the NIC's property. :: - - make EXTRA_CFLAGS="-DMAX_QUEUES=320" - * Option "builtin-net-driver" is incompatible with QEMU QEMU vhost net device start will fail if protocol feature is not negotiated. diff --git a/doc/guides/sample_app_ug/vhost_blk.rst b/doc/guides/sample_app_ug/vhost_blk.rst index 681de6f3e1..788eef0d5f 100644 --- a/doc/guides/sample_app_ug/vhost_blk.rst +++ b/doc/guides/sample_app_ug/vhost_blk.rst @@ -36,7 +36,7 @@ Start the vhost_blk example .. code-block:: console - ./vhost_blk -m 1024 + ./dpdk-vhost_blk -m 1024 .. _vhost_blk_app_run_vm: diff --git a/doc/guides/sample_app_ug/vhost_crypto.rst b/doc/guides/sample_app_ug/vhost_crypto.rst index bbc25bde1c..7ae7addac4 100644 --- a/doc/guides/sample_app_ug/vhost_crypto.rst +++ b/doc/guides/sample_app_ug/vhost_crypto.rst @@ -28,7 +28,7 @@ Start the vhost_crypto example .. code-block:: console - ./vhost_crypto [EAL options] -- + ./dpdk-vhost_crypto [EAL options] -- --config (lcore,cdev-id,queue-id)[,(lcore,cdev-id,queue-id)] --socket-file lcore,PATH [--zero-copy] diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..35afdac63f 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -274,7 +271,7 @@ than the EAL options: .. code-block:: console - ./build/vm_power_mgr [EAL options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] The application requires exactly two cores to run. One core for the CLI and the other for the channel endpoint monitor. For example, to run on @@ -282,7 +279,7 @@ cores 0 and 1 on a system with four memory channels, issue the command: .. code-block:: console - ./build/vm_power_mgr -l 0-1 -n 4 + ./<build_dir>/examples/dpdk-vm_power_mgr -l 0-1 -n 4 After successful initialization, the VM Power Manager CLI prompt appears: @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -515,14 +509,14 @@ The standard EAL command line parameters are necessary: .. code-block:: console - ./build/vm_power_mgr [EAL options] -- [guest options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] -- [guest options] The guest example uses a channel for each lcore enabled. For example, to run on cores 0, 1, 2 and 3: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 .. _sending_policy: @@ -593,7 +587,7 @@ host, use a command like the following: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: @@ -707,7 +701,7 @@ To start the application and configure the power policy, and send it to the host .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c908074eb0 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,13 +26,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss + ./<build_dir>/examples/dpdk-vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss where, NP can be 16 or 32, TC can be 4 or 8, rss is disabled by default. @@ -72,7 +72,7 @@ To run the example in a linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index c3a3439e51..a1a8e77de2 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,13 +24,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_app [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss + ./<build_dir>/examples/dpdk-vmdq [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss where, NP can be 8, 16 or 32, rss is disabled by default. @@ -56,7 +56,7 @@ To run the example in a Linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_app -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index d1e4ee3e7a..ac4f0d9212 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the previous section, with .. code-block:: console - sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 + sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 The command line options are: @@ -59,13 +59,13 @@ The command line options are: * ``--nb-cores=N`` Set the number of forwarding cores, - where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the configuration file. + where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the configuration file. The default value is 1. * ``--nb-ports=N`` Set the number of forwarding ports, - where 1 <= N <= "number of ports" on the board or ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` from the configuration file. The default value is the number of ports on the board. * ``--coremask=0xXX`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 90cf252df5..6856e3b909 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command .. code-block:: console - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt Interactive-mode selected CLI commands to be read from /home/ubuntu/flow-create-commands.txt Configuring Port 0 (socket 0) @@ -329,7 +329,7 @@ The available information categories are: * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. +* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. * ``noisy``: Noisy neighbor simulation. Simulate more realistic behavior of a guest machine engaged in receiving @@ -379,11 +379,6 @@ Example for the io forwarding engine, with some packet drops on the tx side:: TX-packets: 548595568 TX-dropped: 128 TX-total: 548595696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. note:: - - Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" stats, like: - - CPU cycles/packet=xx.dd (total cycles=xxxx / total RX packets=xxxx) at xxx MHz clock clear fwd ~~~~~~~~~ -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 16/20] doc: remove references to make from app guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 16/20] doc: remove references to make from app guides Ciara Power @ 2020-09-24 13:17 ` David Hunt 0 siblings, 0 replies; 300+ messages in thread From: David Hunt @ 2020-09-24 13:17 UTC (permalink / raw) To: Ciara Power, dev Cc: Nicolas Chautru, John McNamara, Marko Kovacevic, Olivier Matz, Ori Kam, Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Harry van Haaren, Bernard Iremonger, Konstantin Ananyev, Cristian Dumitrescu, Ferruh Yigit, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, Kirill Rybalchenko, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Wenzhuo Lu, Beilei Xing Hi Ciara, On 21/9/2020 2:59 PM, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> > --- --snip-- When checking the vm_power_manager portion of this guide, I came across a dependency on a patch set that Bruce submitted, which makes some power management library headers public. This patch set needs to be applied so vm_power_mgr and guest_cli can be build with these instruction. http://patches.dpdk.org/project/dpdk/list/?series=11745 Once that patch set is applied, new guide instructions works well. Also, one small nit, if you're pusing another version of the patch set (don't worry about it of you're not), maybe something to consider for the patch description: While make has been deprecated for DPDK, it's still applicable for some example apps, this patch set adjusts the guides to take that into consideration. Thanks, Dave. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 17/20] doc: remove reference to make from tools guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (15 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 16/20] doc: remove references to make from app guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-10-01 14:03 ` Power, Ciara 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 18/20] doc: remove references to make from contributing guide Ciara Power ` (3 subsequent siblings) 20 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev Cc: Ciara Power, John McNamara, Marko Kovacevic, Declan Doherty, Reshma Pattan, Maryam Tahhan, Nicolas Chautru, Jerin Jacob Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- v5: - Reworded sentence in pdump doc. - Replaced references to testbbdev binary with dpdk-test-bbdev. - Fixed links to linux_gsg doc. --- doc/guides/tools/comp_perf.rst | 10 ++------ doc/guides/tools/cryptoperf.rst | 20 +++------------- doc/guides/tools/pdump.rst | 15 +++++------- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 38 +++++++++---------------------- doc/guides/tools/testeventdev.rst | 21 ++++++++--------- 6 files changed, 32 insertions(+), 74 deletions(-) diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst index ee585d1024..269d7bdc9d 100644 --- a/doc/guides/tools/comp_perf.rst +++ b/doc/guides/tools/comp_perf.rst @@ -100,13 +100,7 @@ Application Options Compiling the Tool ------------------ -**Step 1: PMD setting** - -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which -can be disabled by default in the build configuration file ``common_base``. -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: - - CONFIG_RTE_LIBRTE_PMD_ISAL=y +See :doc:`../linux_gsg/build_dpdk` for compilation steps. Running the Tool @@ -116,5 +110,5 @@ The tool has a number of command line options. Here is the sample command line: .. code-block:: console - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index 28b729dbda..8aa8272c71 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum throughput. Compiling the Application ------------------------- -**Step 1: PMD setting** -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The crypto device drivers PMD which should be tested can be enabled by setting:: - - CONFIG_RTE_LIBRTE_PMD_<name>=y - -Setting example for open ssl PMD:: - - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y - -**Step 2: Linearization setting** +**Step 1: Linearization setting** It is possible linearized input segmented packets just before crypto operation for devices which doesn't support scatter-gather, and allows to measure @@ -56,13 +45,10 @@ To set on the linearization options add below definition to the #define CPERF_LINEARIZATION_ENABLE -**Step 3: Build the application** +**Step 2: Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-crypto-perf`` application. +See :doc:`../linux_gsg/build_dpdk` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 8a499c6c5b..6f9bd77ab1 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports framework initialization code. Refer ``app/test-pmd/testpmd.c`` code to see how this is done. - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled - by default in the build configuration files, - owing to an external dependency on the libpcap development files - which must be installed on the board. - Once the libpcap development files are installed, the libpcap based PMD - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool depends on DPDK pcap PMD, so the system should + have libpcap development files installed and the pcap PMD not disabled + in the build. * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when the primary application exits. @@ -37,7 +34,7 @@ The tool has a number of command line options: .. code-block:: console - ./build/app/dpdk-pdump -- + ./<build_dir>/app/dpdk-pdump -- [--multi] --pdump '(port=<port id> | device_id=<pci id or vdev name>), (queue=<queue_id>), @@ -120,5 +117,5 @@ Example .. code-block:: console - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 0390b9c589..9772d97ef0 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,7 +17,7 @@ The application has a number of command line options: .. code-block:: console - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 393c3e9d0d..0f2b1cdde7 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -13,25 +13,10 @@ parameters passed to a python running script. Compiling the Application ------------------------- -**Step 1: PMD setting** +**Build the application** -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The bbdevice drivers PMD which should be tested can be enabled by setting +See :doc:`../linux_gsg/build_dpdk` for compilation steps. - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` - -Setting example for (*baseband_turbo_sw*) PMD - - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` - -**Step 2: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-bbdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -60,7 +45,7 @@ The following are the command-line options: ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` Indicates the path to the bbdev test app. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with "*/build/app/testbbdev*". + on "../.." concatenated with "*/build/app/dpdk-test-bbdev*". ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` Specifies EAL arguments which are passed to the test app. For more details, @@ -82,9 +67,8 @@ The following are the command-line options: ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR [TEST_VECTOR ...]`` Specifies paths to the test vector files. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default - data file. + on "../.." concatenated with "*/app/test-bbdev/test_vectors/bbdev_null.data*" +and indicates default data file. **Example usage:** @@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes and processing parameters while still keeping their number limited as part of sanity regression. -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linux-icc target: +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output +to the build directory: :: @@ -268,16 +252,16 @@ x86_64-native-linux-icc target: |-- test-bbdev |-- test_vectors - |-- x86_64-native-linux-icc + |-- build |-- app - |-- testbbdev + |-- dpdk-test-bbdev All bbdev devices ~~~~~~~~~~~~~~~~~ .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -291,7 +275,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/* -n 64 -b 8 32 diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst index 2ed67a6340..1127036bb5 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -15,11 +15,8 @@ Compiling the Application **Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-eventdev`` application. +See :doc:`../linux_gsg/build_dpdk` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -251,7 +248,7 @@ Example command to run order queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ --test=order_queue --plcores 1 --wlcores 2,3 @@ -314,7 +311,7 @@ Example command to run order ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=order_atq --plcores 1 --wlcores 2,3 @@ -414,7 +411,7 @@ Example command to run perf queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf queue test with ethernet ports: @@ -428,7 +425,7 @@ Example command to run perf queue test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ --prod_type_timerdev --fwd_latency @@ -514,14 +511,14 @@ Example command to run perf ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf ``all types queue`` test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ --stlist=a --prod_type_timerdev --fwd_latency @@ -633,7 +630,7 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a @@ -725,5 +722,5 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 17/20] doc: remove reference to make from tools guides 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 17/20] doc: remove reference to make from tools guides Ciara Power @ 2020-10-01 14:03 ` Power, Ciara 0 siblings, 0 replies; 300+ messages in thread From: Power, Ciara @ 2020-10-01 14:03 UTC (permalink / raw) To: dev Cc: Mcnamara, John, Kovacevic, Marko, Doherty, Declan, Pattan, Reshma, Tahhan, Maryam, Chautru, Nicolas, Jerin Jacob, Thomas Monjalon >-----Original Message----- >From: Power, Ciara <ciara.power@intel.com> >Sent: Monday 21 September 2020 14:59 >To: dev@dpdk.org >Cc: Power, Ciara <ciara.power@intel.com>; Mcnamara, John ><john.mcnamara@intel.com>; Kovacevic, Marko ><marko.kovacevic@intel.com>; Doherty, Declan <declan.doherty@intel.com>; >Pattan, Reshma <reshma.pattan@intel.com>; Tahhan, Maryam ><maryam.tahhan@intel.com>; Chautru, Nicolas <nicolas.chautru@intel.com>; >Jerin Jacob <jerinj@marvell.com> >Subject: [PATCH v5 17/20] doc: remove reference to make from tools guides > >Make is no longer supported for compiling DPDK, references are now >removed in the documentation. > >Signed-off-by: Ciara Power <ciara.power@intel.com> >Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> >Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> > <snip> >diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst >index 393c3e9d0d..0f2b1cdde7 100644 >--- a/doc/guides/tools/testbbdev.rst >+++ b/doc/guides/tools/testbbdev.rst >@@ -13,25 +13,10 @@ parameters passed to a python running script. > Compiling the Application > ------------------------- > >-**Step 1: PMD setting** >+**Build the application** > >-The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which - >are disabled by default in the build configuration file ``common_base``. >-The bbdevice drivers PMD which should be tested can be enabled by setting >+See :doc:`../linux_gsg/build_dpdk` for compilation steps. > >- ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` >- >-Setting example for (*baseband_turbo_sw*) PMD >- >- ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` >- >-**Step 2: Build the application** >- >-Execute the ``dpdk-setup.sh`` script to build the DPDK library together with >the -``dpdk-test-bbdev`` application. >- >-Initially, the user must select a DPDK target to choose the correct target type >-and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed in >the system prior to this, as described in the earlier chapters in this Getting >Started Guide. >@@ -60,7 +45,7 @@ The following are the command-line options: > > ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` > Indicates the path to the bbdev test app. If not specified path is set based >- on *$RTE_SDK* environment variable concatenated with >"*/build/app/testbbdev*". >+ on "../.." concatenated with "*/build/app/dpdk-test-bbdev*". > > ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` > Specifies EAL arguments which are passed to the test app. For more details, >@@ -82,9 +67,8 @@ The following are the command-line options: > > ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR >[TEST_VECTOR ...]`` > Specifies paths to the test vector files. If not specified path is set based >- on *$RTE_SDK* environment variable concatenated with >- "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default >- data file. >+ on "../.." concatenated with "*/app/test- >bbdev/test_vectors/bbdev_null.data*" >+and indicates default data file. I missed an indent here, there should be a space before "and" at the start of the line I think. - Ciara > > **Example usage:** > >@@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes >and processing parameters while still keeping their number limited as part >of sanity regression. <snip> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 18/20] doc: remove references to make from contributing guide 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (16 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 17/20] doc: remove reference to make from tools guides Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 19/20] doc: add to release notes to reflect removal of make Ciara Power ` (2 subsequent siblings) 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Louise Kilheeney, John McNamara, Marko Kovacevic Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> --- v5: - Removed reference to test-build.sh used for Make. - Added point back in for handling specific code, reworded as necessary. - Added library statistics section, removing only the mention of CONFIG options. --- doc/guides/contributing/design.rst | 41 ++++++++--------------- doc/guides/contributing/documentation.rst | 31 ++++------------- doc/guides/contributing/patches.rst | 6 ++-- 3 files changed, 23 insertions(+), 55 deletions(-) diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..3e24dc1c7b 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,25 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. - In this case, the code is split into two separate files that are architecture or environment specific. - This should only apply inside the EAL library. - -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. +* Use build definition macros and conditions in the Meson build file. This is done when the differences + are more significant. In this case, the code is split into two separate files that are architecture + or environment specific. This should only apply inside the EAL library. Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -87,22 +82,14 @@ requirements for preventing ABI changes when implementing statistics. Mechanism to allow the application to turn library statistics on and off ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are +Having runtime support for enabling/disabling library statistics is recommended, +as build-time options should be avoided. However, if build-time options are used, +for example as in the table library, the options can be set using c_args. +When this flag is set, all the counters supported by current library are collected for all the instances of every object type provided by the library. When this flag is cleared, none of the counters supported by the current library are collected for any instance of any object type provided by the library: -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - Prevention of ABI changes due to library statistics support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index 375ea64ba8..768453126f 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -222,25 +222,14 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: +To enable doc building:: - make doc + meson configure -Denable_docs=true -* Generate the Doxygen API documentation in Html:: +See :doc:`../linux_gsg/build_dpdk` for more detail on compiling DPDK with meson. - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -255,10 +244,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -308,7 +293,7 @@ Line Length Long literal command lines can be shown wrapped with backslashes. For example:: - testpmd -l 2-3 -n 4 \ + dpdk-testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ --txd=1024 --rxd=1024 @@ -460,7 +445,7 @@ Code and Literal block sections For long literal lines that exceed that limit try to wrap the text at sensible locations. For example a long command line could be documented like this and still work if copied directly from the docs:: - build/app/testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ + ./<build_dir>/app/dpdk-testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ --vdev=net_pcap1,iface=eth1 \ -- -i --nb-cores=2 --nb-ports=2 \ --total-num-mbufs=2048 @@ -743,9 +728,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 9ff60944c3..9fa5a79c85 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -486,9 +486,9 @@ By default, ABI compatibility checks are disabled. To enable them, a reference version must be selected via the environment variable ``DPDK_ABI_REF_VERSION``. -The ``devtools/test-build.sh`` and ``devtools/test-meson-builds.sh`` scripts -then build this reference version in a temporary directory and store the -results in a subfolder of the current working directory. +The ``devtools/test-meson-builds.sh`` script then build this reference version +in a temporary directory and store the results in a subfolder of the current +working directory. The environment variable ``DPDK_ABI_REF_DIR`` can be set so that the results go to a different location. -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 19/20] doc: add to release notes to reflect removal of make 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (17 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 18/20] doc: remove references to make from contributing guide Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 20/20] doc: update patch cheatsheet to use meson Ciara Power 2020-10-01 15:09 ` [dpdk-dev] [PATCH v5 00/20] remove make support in DPDK Thomas Monjalon 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Ciara Power, John McNamara, Marko Kovacevic Added an entry to decribe the removal of the Make build system to the release notes for 20.11. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/rel_notes/release_20_11.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index b729bdf200..6f35831790 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -68,6 +68,9 @@ Removed Items Also, make sure to start the actual text at the margin. ======================================================= +* build: Support for the Make build system was removed for compiling DPDK, Meson + is now the primary build system. Sample applications can still be built with + Make standalone, using pkg-config. API Changes ----------- -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v5 20/20] doc: update patch cheatsheet to use meson 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (18 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 19/20] doc: add to release notes to reflect removal of make Ciara Power @ 2020-09-21 13:59 ` Ciara Power 2020-10-01 15:09 ` [dpdk-dev] [PATCH v5 00/20] remove make support in DPDK Thomas Monjalon 20 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-09-21 13:59 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz, John McNamara, Marko Kovacevic From: Kevin Laatz <kevin.laatz@intel.com> With 'make' being removed, the patch cheatsheet needs to be updated to remove any references to 'make'. These references have been replaced with meson alternatives in this patch. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- .../contributing/img/patch_cheatsheet.svg | 582 ++++++++---------- 1 file changed, 270 insertions(+), 312 deletions(-) diff --git a/doc/guides/contributing/img/patch_cheatsheet.svg b/doc/guides/contributing/img/patch_cheatsheet.svg index 85225923e1..986e4db815 100644 --- a/doc/guides/contributing/img/patch_cheatsheet.svg +++ b/doc/guides/contributing/img/patch_cheatsheet.svg @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -13,7 +11,7 @@ width="210mm" height="297mm" id="svg2985" - inkscape:version="0.48.4 r9939" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" sodipodi:docname="patch_cheatsheet.svg"> <sodipodi:namedview pagecolor="#ffffff" @@ -24,17 +22,19 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1184" - inkscape:window-height="1822" + inkscape:window-width="1920" + inkscape:window-height="1017" id="namedview274" showgrid="false" - inkscape:zoom="1.2685914" - inkscape:cx="289.93958" - inkscape:cy="509.84194" - inkscape:window-x="0" - inkscape:window-y="19" - inkscape:window-maximized="0" - inkscape:current-layer="g3272" /> + inkscape:zoom="0.89702958" + inkscape:cx="246.07409" + inkscape:cy="416.76022" + inkscape:window-x="1072" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + inkscape:snap-grids="false" /> <defs id="defs3"> <linearGradient @@ -549,347 +549,336 @@ </g> </switch> <g - transform="matrix(0.89980358,0,0,0.89980358,45.57817,-2.8793563)" + transform="matrix(0.89980358,0,0,0.89980358,57.57817,-2.8793563)" id="g4009"> <text x="325.02054" y="107.5126" id="text3212" xml:space="preserve" - style="font-size:43.11383057px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:43.1138px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none" transform="scale(1.193782,0.83767389)"><tspan x="325.02054" y="107.5126" - id="tspan3214">CHEATSHEET</tspan></text> + id="tspan3214" + style="font-family:monospace">CHEATSHEET</tspan></text> <text x="386.51117" y="58.178116" transform="scale(1.0054999,0.99453018)" id="text3212-1" xml:space="preserve" - style="font-size:42.11373901px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:42.1137px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="386.51117" y="58.178116" - id="tspan3214-7">PATCH SUBMIT</tspan></text> + id="tspan3214-7" + style="font-family:monospace">PATCH SUBMIT</tspan></text> </g> <rect - width="714.94495" - height="88.618027" - rx="20.780111" - ry="15.96909" - x="14.574773" - y="7.0045133" + width="759.50977" + height="88.591248" + rx="22.075403" + ry="15.964265" + x="14.588161" + y="7.0179014" id="rect3239" - style="fill:none;stroke:#00233b;stroke-width:0.87678075;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.903557;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="713.28113" - height="887.29156" - rx="17.656931" - ry="17.280584" - x="15.406689" - y="104.73515" + width="757.84167" + height="887.2605" + rx="18.760006" + ry="17.27998" + x="15.422211" + y="104.75068" id="rect3239-0" - style="fill:none;stroke:#00233b;stroke-width:1.00973284;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.04078;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="694.94904" - height="381.31" - rx="9.4761629" - ry="9.0904856" - x="24.336016" - y="601.75836" + width="732.82446" + height="381.28253" + rx="9.9926233" + ry="9.0898304" + x="24.349754" + y="601.77209" id="rect3239-0-9-4" - style="fill:none;stroke:#00233b;stroke-width:1.02322531;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.0507;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - d="m 386.3921,327.23442 323.14298,0" + d="M 422.0654,327.23442 H 709.53508" id="path4088" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:0.943189px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <text - x="396.18015" + x="428.18015" y="314.45731" id="text4090" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="396.18015" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="428.18015" y="314.45731" id="tspan4092" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Patch Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Patch Pre-Checks</tspan></text> <text x="43.44949" y="147.32129" id="text4090-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.44949" y="147.32129" id="tspan4092-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Commit Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Commit Pre-Checks</tspan></text> <text - x="397.1235" + x="429.1235" y="144.8549" id="text4090-4-3" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="397.1235" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="429.1235" y="144.8549" id="tspan4092-3-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Bugfix?</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Bugfix?</tspan></text> <text x="41.215897" y="634.38617" id="text4090-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="41.215897" y="634.38617" id="tspan4092-38" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Git send-email </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Git send-email </tspan></text> <path d="m 31.232443,642.80575 376.113467,0" id="path4088-7" style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" inkscape:connector-curvature="0" /> <rect - width="342.13785" - height="230.74609" - rx="10.411126" - ry="10.411126" - x="25.418407" - y="114.92036" + width="376.65033" + height="230.70007" + rx="11.461329" + ry="10.40905" + x="25.441414" + y="114.94337" id="rect3239-0-9-4-2" - style="fill:none;stroke:#00233b;stroke-width:0.93674862;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.982762;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="43.44949" y="385.8045" id="text4090-86" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.44949" y="385.8045" id="tspan4092-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Compile Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Compile Pre-Checks</tspan></text> <g - transform="translate(352.00486,-348.25973)" + transform="matrix(1.0077634,0,0,1,384.57109,-348.25973)" id="g3295"> <text x="43.87738" y="568.03088" id="text4090-8-14" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="568.03088" id="tspan4289" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Include warning/error</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Include warning/error</tspan></text> <text x="43.87738" y="537.71906" id="text4090-8-14-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="537.71906" id="tspan4289-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Fixes: line</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Fixes: line</tspan></text> <text x="43.87738" y="598.9939" id="text4090-8-14-0" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="598.9939" id="tspan4289-2" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ How to reproduce</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ How to reproduce</tspan></text> </g> <g - transform="translate(-2.6258125,-26.708615)" + transform="matrix(0.88614399,0,0,1.0199334,-5.7864591,-38.84504)" id="g4115"> <g id="g3272"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1" y="454.36987" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7" y="454.36987" x="49.093246">+ build gcc icc clang </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + xml:space="preserve" + id="text581" + y="454.36987" + x="49.093246" /> + <text + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2" y="516.59979" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79" y="516.59979" - x="49.093246">+ make test doc </tspan></text> + x="49.093246">+ meson -Denable_docs=true</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-0" y="544.71033" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-0" y="544.71033" - x="49.093246">+ make examples</tspan></text> + x="49.093246">+ meson -Dexamples=all</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-07" y="576.83533" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-3" y="576.83533" - x="49.093246">+ make shared-lib</tspan></text> + x="49.093246" + transform="matrix(1.0305467,0,0,1,-1.5447426,0)">+ meson -Ddefault_library=shared</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-07-4" y="604.88947" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-3-9" y="604.88947" x="49.093246">+ library ABI version</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-9" y="486.56659" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-3" y="486.56659" x="49.093246">+ build 32 and 64 bits</tspan></text> </g> </g> <text - x="74.388756" - y="914.65686" + x="72.598656" + y="937.21002" id="text4090-8-1-8-65-9" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.2959px;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02466" + transform="scale(1.0246575,0.97593587)"><tspan sodipodi:role="line" id="tspan3268" - x="74.388756" - y="914.65686">git send-email *.patch --annotate --to <maintainer></tspan><tspan + x="72.598656" + y="937.21002" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466">git send-email *.patch --annotate --to <maintainer></tspan><tspan sodipodi:role="line" id="tspan3272" - x="74.388756" - y="938.40686"> --cc dev@dpdk.org [ --cc other@participants.com</tspan><tspan + x="72.598656" + y="961.54565" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466"> --cc dev@dpdk.org [ --cc other@participants.com</tspan><tspan sodipodi:role="line" - x="74.388756" - y="962.15686" - id="tspan3266"> --cover-letter -v[N] --in-reply-to <message ID> ]</tspan></text> + x="72.598656" + y="985.88129" + id="tspan3266" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466"> --cover-letter -v[N] --in-reply-to <message ID> ]</tspan></text> <text x="543.47675" y="1032.3459" id="text4090-8-7-8-7-6-3-8-2-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="543.47675" y="1032.3459" id="tspan4092-8-6-3-1-8-4-4-5-3" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">harry.van.haaren@intel.com</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">harry.van.haaren@intel.com</tspan></text> <rect - width="678.14105" - height="87.351799" - rx="6.7972355" - ry="6.7972355" - x="31.865864" - y="888.44696" + width="711.56055" + height="87.327599" + rx="7.1322103" + ry="6.795352" + x="31.877964" + y="888.45905" id="rect3239-0-9-4-3" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.0242;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="543.29498" y="1018.1843" id="text4090-8-7-8-7-6-3-8-2-5-3" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="543.29498" y="1018.1843" id="tspan4092-8-6-3-1-8-4-4-5-3-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Suggestions / Updates?</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Suggestions / Updates?</tspan></text> <g id="g3268" transform="translate(0,-6)"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8" y="704.07019" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6" y="704.07019" x="41.658669">+ Patch version ( eg: -v2 ) </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-0" y="736.29175" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-2" y="736.29175" x="41.658669">+ Patch version annotations</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-6" y="766.70355" x="41.911205"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-1" y="766.70355" x="41.911205">+ Send --to maintainer </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-6-3" y="795.30548" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-1-8" y="795.30548" x="41.658669">+ Send --cc dev@dpdk.org </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-9" y="675.25287" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-9" y="675.25287" x="41.658669">+ Cover letter</tspan></text> @@ -897,73 +886,70 @@ id="g3303" transform="translate(1.0962334,-40.034939)"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-65" y="868.70337" x="41.572586"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-10" y="868.70337" x="41.572586">+ Send --in-reply-to <message ID><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:20px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan3184" /></tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-9-1" y="855.79816" x="460.18405"><tspan - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-9-7" y="855.79816" x="460.18405">****</tspan></text> </g> </g> <text - x="685.67828" + x="697.67828" y="76.55056" id="text4090-8-1-8-9-1-9" xml:space="preserve" - style="font-size:20.20989037px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="685.67828" + style="font-style:normal;font-weight:normal;font-size:20.2099px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="697.67828" y="76.55056" id="tspan4092-8-7-6-9-7-4" - style="font-size:9.09445095px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">v1.0</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:9.09445px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">v2.0</tspan></text> <rect - width="342.3053" - height="155.54948" - rx="9.2344503" - ry="9.2344503" - x="377.58942" - y="114.55766" + width="347.40179" + height="155.50351" + rx="9.3719397" + ry="9.2317209" + x="412.60239" + y="114.58065" id="rect3239-0-9-4-2-1" - style="fill:none;stroke:#00233b;stroke-width:0.76930124;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.774892;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="342.12564" - height="236.79482" - rx="10.647112" - ry="9.584527" - x="25.642178" - y="356.86249" + width="377.75555" + height="234.52185" + rx="11.755931" + ry="9.4925261" + x="25.663876" + y="356.88416" id="rect3239-0-9-4-2-0" - style="fill:none;stroke:#00233b;stroke-width:0.9489302;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.99232;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="341.98428" - height="312.73181" - rx="8.5358429" - ry="8.5358429" - x="377.96762" - y="280.45331" + width="343.53604" + height="312.67508" + rx="8.5745735" + ry="8.5342941" + x="414.29037" + y="280.48166" id="rect3239-0-9-4-2-1-9" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.00217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - d="m 387.02742,157.3408 323.14298,0" + d="M 419.35634,157.3408 H 710.1704" id="path4088-8" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:0.94866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <path d="m 36.504486,397.33869 323.142974,0" @@ -971,9 +957,9 @@ style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <path - d="m 35.494337,156.92238 323.142983,0" + d="M 35.494337,156.92238 H 372.01481" id="path4088-4" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:1.02049px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <g transform="translate(1.0962334,-30.749225)" @@ -983,45 +969,41 @@ y="214.1572" id="text4090-8-11" xml:space="preserve" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="214.1572" id="tspan4092-8-52" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Signed-off-by: </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Signed-off-by: </tspan></text> <text x="45.371201" y="243.81795" id="text4090-8-7-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="243.81795" id="tspan4092-8-6-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Suggested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Suggested-by:</tspan></text> <text x="45.371201" y="273.90939" id="text4090-8-7-8-7" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="273.90939" id="tspan4092-8-6-3-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Reported-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Reported-by:</tspan></text> <text x="45.371201" y="304.00082" id="text4090-8-7-8-7-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="304.00082" id="tspan4092-8-6-3-1-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Tested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Tested-by:</tspan></text> <g id="g3297" transform="translate(1.1147904,-7.2461378)"> @@ -1030,110 +1012,102 @@ y="368.8187" id="text4090-8-7-8-7-6-3" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="368.8187" id="tspan4092-8-6-3-1-8-4" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Previous Acks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Previous Acks</tspan></text> <text x="235.24362" y="360.3028" id="text4090-8-1-8-9-1-4" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="235.24362" y="360.3028" id="tspan4092-8-7-6-9-7-0" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <text x="45.371201" y="334.52298" id="text4090-8-7-8-7-6-3-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="334.52298" id="tspan4092-8-6-3-1-8-4-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Commit message</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Commit message</tspan></text> </g> <rect width="295.87207" height="164.50136" rx="7.3848925" ry="4.489974" - x="414.80502" + x="444.80502" y="611.47064" id="rect3239-0-9-4-2-1-9-9" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text - x="439.4429" + x="469.4429" y="638.35608" id="text4090-1-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="439.4429" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="469.4429" y="638.35608" id="tspan4092-38-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Mailing List</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Mailing List</tspan></text> <text - x="431.55353" + x="461.55353" y="675.59857" id="text4090-8-5-6-9-4-6-6-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.55353" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.55353" y="675.59857" id="tspan4092-8-5-5-3-4-0-6-2" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Acked-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Acked-by:</tspan></text> <text - x="431.39734" + x="461.39734" y="734.18231" id="text4090-8-5-6-9-4-6-6-8-5" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.39734" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.39734" y="734.18231" id="tspan4092-8-5-5-3-4-0-6-2-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Reviewed-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Reviewed-by:</tspan></text> <text - x="450.8428" + x="480.8428" y="766.5578" id="text4090-8-5-6-9-4-6-6-8-7" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="450.8428" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="480.8428" y="766.5578" id="tspan4092-8-5-5-3-4-0-6-2-11" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Nack (refuse patch)</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Nack (refuse patch)</tspan></text> <path - d="m 426.99385,647.80575 272.72607,0" + d="M 456.99385,647.80575 H 729.71992" id="path4088-7-5" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" /> <path - d="m 424.7332,742.35699 272.72607,0" + d="M 454.7332,742.35699 H 727.45927" id="path4088-7-5-2" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" /> <text - x="431.39734" + x="461.39734" y="704.78278" id="text4090-8-5-6-9-4-6-6-8-5-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.39734" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.39734" y="704.78278" id="tspan4092-8-5-5-3-4-0-6-2-1-7" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Tested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Tested-by:</tspan></text> <g transform="translate(1.0962334,-2.7492248)" id="g3613"> @@ -1142,22 +1116,21 @@ y="1007.5879" id="text4090-8-7-8-7-6-3-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.146141" y="1007.5879" id="tspan4092-8-6-3-1-8-4-4" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">Previous Acks only when fixing typos, rebased, or checkpatch issues.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">Previous Acks only when fixing typos, rebased, or checkpatch issues.</tspan></text> <text x="30.942892" y="1011.3757" id="text4090-8-7-8-7-6-3-8-4-1" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1011.3757" id="tspan4092-8-6-3-1-8-4-4-55-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <g transform="translate(1.0962334,-2.7492248)" @@ -1167,35 +1140,34 @@ y="1020.4383" id="text4090-8-7-8-7-6-3-8-4" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.176418" y="1020.4383" id="tspan4092-8-6-3-1-8-4-4-55" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">The version.map function names must be in alphabetical order.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">The version.map function names must be in alphabetical order.</tspan></text> <text x="30.942892" y="1024.2014" id="text4090-8-7-8-7-6-3-8-4-1-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1024.2014" id="tspan4092-8-6-3-1-8-4-4-55-7-2" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.247679" y="1024.2014" id="text4090-8-7-8-7-6-3-8-4-1-5-6" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.247679" y="1024.2014" id="tspan4092-8-6-3-1-8-4-4-55-7-2-8" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <g - transform="translate(1.0962334,-30.749225)" + transform="matrix(1.0211743,0,0,1,25.427515,-30.749225)" id="g3275"> <g id="g3341"> @@ -1204,67 +1176,61 @@ y="390.17807" id="text4090-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="390.17807" id="tspan4092-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Rebase to git </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Rebase to git </tspan></text> <text x="394.78601" y="420.24835" id="text4090-8-5" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="420.24835" id="tspan4092-8-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Checkpatch </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Checkpatch </tspan></text> <text x="394.78601" y="450.53394" id="text4090-8-5-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="450.53394" id="tspan4092-8-5-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ ABI breakage </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ ABI breakage </tspan></text> <text x="394.78601" y="513.13031" id="text4090-8-5-6-9-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="513.13031" id="tspan4092-8-5-5-3-4" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Maintainers file</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Maintainers file</tspan></text> <text x="394.78601" y="573.48621" id="text4090-8-5-6-9-4-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="573.48621" id="tspan4092-8-5-5-3-4-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Release notes</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Release notes</tspan></text> <text x="395.79617" y="603.98718" id="text4090-8-5-6-9-4-6-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="395.79617" y="603.98718" id="tspan4092-8-5-5-3-4-0-6" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Documentation</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Documentation</tspan></text> <g transform="translate(0,-0.83470152)" id="g3334"> @@ -1276,24 +1242,22 @@ y="468.01297" id="text4090-8-1-8-9-1-4-1" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="660.46729" y="468.01297" id="tspan4092-8-7-6-9-7-0-7" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">**</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">**</tspan></text> </g> <text x="394.78601" y="483.59955" id="text4090-8-5-6-9" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="483.59955" id="tspan4092-8-5-5-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Update version.map</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Update version.map</tspan></text> </g> <g id="g3428" @@ -1303,12 +1267,11 @@ y="541.38928" id="text4090-8-5-6-9-4-6-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="541.38928" id="tspan4092-8-5-5-3-4-0-7" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Doxygen</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Doxygen</tspan></text> <g transform="translate(-119.92979,57.949844)" id="g3267-9"> @@ -1317,28 +1280,26 @@ y="473.13675" id="text4090-8-1-8-9-1-4-1-4" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="628.93628" y="473.13675" id="tspan4092-8-7-6-9-7-0-7-8" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">***</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">***</tspan></text> </g> </g> </g> </g> <text - x="840.1828" - y="234.34692" - transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + x="861.39557" + y="213.1337" + transform="rotate(45)" id="text4090-8-5-6-9-4-6-6-8-7-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="840.1828" - y="234.34692" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="861.39557" + y="213.1337" id="tspan4092-8-5-5-3-4-0-6-2-11-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+</tspan></text> <g transform="translate(1.0962334,-2.7492248)" id="g3595"> @@ -1347,42 +1308,41 @@ y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.247679" y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.247679" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="19.552465" y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2-7" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="19.552465" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="42.830166" y="1033.2393" id="text4090-8-7-8-7-6-3-8-4-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.830166" y="1033.2393" id="tspan4092-8-6-3-1-8-4-4-55-2" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">New header files must get a new page in the API docs.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">New header files must get a new page in the API docs.</tspan></text> </g> <g transform="translate(1.0962334,-2.7492248)" @@ -1392,52 +1352,51 @@ y="1046.0962" id="text4090-8-7-8-7-6-3-8-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.212418" y="1046.0962" id="tspan4092-8-6-3-1-8-4-4-5" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">Available from patchwork, or email header. Reply to Cover letters.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">Available from patchwork, or email header. Reply to Cover letters.</tspan></text> <text x="31.140535" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="31.140535" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-3" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.445322" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-5-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.445322" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-7-2" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="19.750109" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-7-1" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="19.750109" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9-6" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="14.016749" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-7-1-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="14.016749" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9-6-5" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <rect width="196.44218" @@ -1449,36 +1408,35 @@ id="rect3239-0-9-4-2-1-9-9-7" style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <rect - width="678.43036" - height="43.497677" - rx="7.8557949" - ry="6.7630997" - x="31.274473" - y="836.69745" + width="710.73767" + height="43.476074" + rx="8.2298937" + ry="6.7597408" + x="31.285275" + y="836.70825" id="rect3239-0-9-4-3-6" - style="fill:none;stroke:#00233b;stroke-width:0.92794865;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.949551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="73.804535" y="864.28137" id="text4090-8-1-8-65-9-1" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan sodipodi:role="line" x="73.804535" y="864.28137" - id="tspan3266-8">git format-patch -[N]</tspan></text> + id="tspan3266-8" + style="font-size:19px;line-height:1.25;font-family:monospace">git format-patch -[N]</tspan></text> <text x="342.70221" y="862.83478" id="text4090-8-1-8-65-9-1-7" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan sodipodi:role="line" x="342.70221" y="862.83478" id="tspan3266-8-2" - style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">// creates .patch files for final review</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">// creates .patch files for final review</tspan></text> </g> </svg> -- 2.17.1 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v5 00/20] remove make support in DPDK 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power ` (19 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 20/20] doc: update patch cheatsheet to use meson Ciara Power @ 2020-10-01 15:09 ` Thomas Monjalon 20 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-01 15:09 UTC (permalink / raw) To: Ciara Power Cc: dev, ferruh.yigit, akhil.goyal, david.marchand, jerinj, ajit.khaparde, rasland, maxime.coquelin, qi.z.zhang, techboard > This patchset includes the remaining 18 patches that were not > merged along with the others in v4, pending rework and more review. > *All*, please make the documentation update your highest priority. > > v5: > - Added patch to update cheatsheet. > - Added patch to update release notes. > - Fixed outstanding comments on v3/v4. We are progressing. The first six patches of this v5 are merged with discussed updates. Most of the remaining patches are about drivers. We miss drivers maintainers to review the changes to their doc. PLEASE REVIEW One way of doing global changes could be to ask all maintainers to do their own cleanup. But Ciara did the global cleanup already. All you have to do is to review and give feedbacks. Why is it so complicate to get reviews? Probably maintainers don't read such patches where they are Cc'ed. In order to avoid such situations making global changes difficult, I think we should block merging of drivers patches until drivers maintainers do their job. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 00/14] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (23 preceding siblings ...) 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides Ciara Power ` (13 more replies) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power 25 siblings, 14 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power This patchset includes the remaining 14 patches that were not merged along with the others in v4/v5, pending rework and more review. *All*, please make the documentation update your highest priority. v6: - Rebased onto main and fixed conflicts. - Fixed some formatting and indentation. - Reworded some commit logs and fixed spellings. v5: - Added patch to update cheatsheet. - Added patch to update release notes. - Fixed outstanding comments on v3/v4. v4: rearrange commits and fix as commented v3: Fixed comments on v2. v2: - Fixed comments on v1. - Removed additional make references. - Added some meson replacements where necessary. - Added dummy root Makefile. As previously decided [1] and communicated via deprecation notice [2], the make build system is to be removed in the 20.11 release. This patchset removes support for compiling DPDK with the legacy make build system. Some make support is maintained for example applications, where pkg-config is used rather than the legacy make method. References to the make build system are removed from all documentation, please review to see if replacement meson instructions are needed in some cases. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 Ciara Power (13): doc: remove references to make from platforms guides doc: remove references to make from mempool guide doc: remove references to make from NICs guides doc: remove references to make from vdpadevs guides doc: remove references to make from bbdevs guides doc: remove references to make from cryptodevs guides doc: remove references to make from compressdevs guides doc: remove references to make from eventdevs guides doc: remove references to make from rawdevs guides doc: remove references to make from app guides doc: remove reference to make from tools guides doc: remove references to make from contributing guide doc: add to release notes to reflect removal of make Kevin Laatz (1): doc: update patch cheatsheet to use meson doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +- doc/guides/bbdevs/fpga_lte_fec.rst | 5 +- doc/guides/bbdevs/turbo_sw.rst | 23 +- doc/guides/compressdevs/isal.rst | 4 - doc/guides/compressdevs/octeontx.rst | 24 +- doc/guides/compressdevs/zlib.rst | 4 - doc/guides/contributing/design.rst | 41 +- doc/guides/contributing/documentation.rst | 31 +- .../contributing/img/patch_cheatsheet.svg | 582 ++++++++---------- doc/guides/contributing/patches.rst | 6 +- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 - doc/guides/cryptodevs/caam_jr.rst | 30 - doc/guides/cryptodevs/ccp.rst | 12 +- doc/guides/cryptodevs/dpaa2_sec.rst | 25 - doc/guides/cryptodevs/dpaa_sec.rst | 25 - doc/guides/cryptodevs/kasumi.rst | 11 +- doc/guides/cryptodevs/mvsam.rst | 10 +- doc/guides/cryptodevs/nitrox.rst | 7 - doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +- doc/guides/cryptodevs/octeontx2.rst | 8 +- doc/guides/cryptodevs/openssl.rst | 6 +- doc/guides/cryptodevs/qat.rst | 65 +- doc/guides/cryptodevs/scheduler.rst | 8 - doc/guides/cryptodevs/snow3g.rst | 10 +- doc/guides/cryptodevs/virtio.rst | 20 +- doc/guides/cryptodevs/zuc.rst | 10 +- doc/guides/eventdevs/dpaa.rst | 20 - doc/guides/eventdevs/dpaa2.rst | 20 - doc/guides/eventdevs/octeontx.rst | 24 - doc/guides/eventdevs/octeontx2.rst | 8 - doc/guides/mempool/octeontx.rst | 28 +- doc/guides/mempool/octeontx2.rst | 10 +- doc/guides/nics/ark.rst | 7 +- doc/guides/nics/atlantic.rst | 4 - doc/guides/nics/axgbe.rst | 15 - doc/guides/nics/bnx2x.rst | 27 - doc/guides/nics/bnxt.rst | 5 +- doc/guides/nics/build_and_test.rst | 6 +- doc/guides/nics/cxgbe.rst | 36 +- doc/guides/nics/dpaa.rst | 27 +- doc/guides/nics/dpaa2.rst | 26 +- doc/guides/nics/ena.rst | 16 - doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 - doc/guides/nics/fail_safe.rst | 20 +- doc/guides/nics/features.rst | 9 - doc/guides/nics/fm10k.rst | 4 - doc/guides/nics/hinic.rst | 9 - doc/guides/nics/hns3.rst | 10 - doc/guides/nics/i40e.rst | 44 +- doc/guides/nics/ice.rst | 25 +- doc/guides/nics/igc.rst | 18 +- doc/guides/nics/intel_vf.rst | 13 +- doc/guides/nics/ionic.rst | 8 - doc/guides/nics/ipn3ke.rst | 12 +- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 - doc/guides/nics/memif.rst | 10 +- doc/guides/nics/mlx4.rst | 55 +- doc/guides/nics/mlx5.rst | 62 +- doc/guides/nics/mvneta.rst | 36 +- doc/guides/nics/mvpp2.rst | 43 +- doc/guides/nics/nfb.rst | 19 +- doc/guides/nics/nfp.rst | 4 - doc/guides/nics/null.rst | 6 +- doc/guides/nics/octeontx.rst | 19 +- doc/guides/nics/octeontx2.rst | 13 +- doc/guides/nics/pcap_ring.rst | 24 +- doc/guides/nics/qede.rst | 17 +- doc/guides/nics/sfc_efx.rst | 15 - doc/guides/nics/softnic.rst | 13 +- doc/guides/nics/szedata2.rst | 18 +- doc/guides/nics/thunderx.rst | 25 +- doc/guides/nics/vdev_netvsc.rst | 6 - doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- doc/guides/platform/bluefield.rst | 22 - doc/guides/platform/octeontx.rst | 33 +- doc/guides/platform/octeontx2.rst | 32 - doc/guides/rawdevs/dpaa2_cmdif.rst | 21 - doc/guides/rawdevs/dpaa2_qdma.rst | 21 - doc/guides/rawdevs/ifpga.rst | 10 - doc/guides/rawdevs/ntb.rst | 6 - doc/guides/rawdevs/octeontx2_dma.rst | 12 - doc/guides/rawdevs/octeontx2_ep.rst | 8 - doc/guides/rel_notes/release_20_11.rst | 4 + doc/guides/sample_app_ug/bbdev_app.rst | 34 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +-- doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 +- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 +- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- doc/guides/tools/comp_perf.rst | 10 +- doc/guides/tools/cryptoperf.rst | 20 +- doc/guides/tools/pdump.rst | 15 +- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 38 +- doc/guides/tools/testeventdev.rst | 21 +- doc/guides/vdpadevs/ifc.rst | 13 - doc/guides/vdpadevs/mlx5.rst | 40 +- 148 files changed, 688 insertions(+), 2076 deletions(-) -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-12 19:37 ` Harman Kalra 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 02/14] doc: remove references to make from mempool guide Ciara Power ` (12 subsequent siblings) 13 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/platform/bluefield.rst | 22 --------------------- doc/guides/platform/octeontx.rst | 33 +------------------------------ doc/guides/platform/octeontx2.rst | 32 ------------------------------ 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..9c20ce437d 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. The above steps would rebuild the modules and the required intermediate binaries. Once the target is ready for native compilation, the OCTEON TX platform -drivers can be compiled with the following steps, +drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details. -.. code-block:: console - - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: The above steps will prepare build system with numa additions. Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" - If NUMA support is not required, it can be disabled as explained in :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. -Following steps could be used in that case. - -.. code-block:: console - - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- - - SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 13255eec5c..232f628366 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -498,27 +498,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -529,17 +508,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides Ciara Power @ 2020-10-12 19:37 ` Harman Kalra 0 siblings, 0 replies; 300+ messages in thread From: Harman Kalra @ 2020-10-12 19:37 UTC (permalink / raw) To: Ciara Power; +Cc: dev, Kevin Laatz, Jerin Jacob, Nithin Dabilpuram On Fri, Oct 09, 2020 at 11:21:27AM +0100, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. Hi Ciara, Thanks for updating the platform guides for octeontx and octeontx2. All looks good for octeontx2 but for octeontx platform guide can we have meson build instructions. I have prepared the following patch for the same which is not merged yet. So can you please take these changes as part of your series: https://patches.dpdk.org/patch/72274/ Thanks Harman Reviewed-by: Harman Kalra <hkalra@marvell.com> > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/platform/bluefield.rst | 22 --------------------- > doc/guides/platform/octeontx.rst | 33 +------------------------------ > doc/guides/platform/octeontx2.rst | 32 ------------------------------ > 3 files changed, 1 insertion(+), 86 deletions(-) > > diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst > index deda675b75..366f2b23a7 100644 > --- a/doc/guides/platform/bluefield.rst > +++ b/doc/guides/platform/bluefield.rst > @@ -60,17 +60,6 @@ Native Compilation > Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or > rdma-core library with corresponding kernel drivers is required. > > -make build > -^^^^^^^^^^ > - > -.. code-block:: console > - > - make config T=arm64-bluefield-linux-gcc > - make -j > - > -meson build > -^^^^^^^^^^^ > - > .. code-block:: console > > meson build > @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. > cd $(dirname $(which aarch64-linux-gnu-gcc))/.. > tar xf aarch64-linux-gnu-mlx.tar > > -make build > -^^^^^^^^^^ > - > -.. code-block:: console > - > - make config T=arm64-bluefield-linux-gcc > - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n > - > -meson build > -^^^^^^^^^^^ > - > .. code-block:: console > > meson build --cross-file config/arm/arm64_bluefield_linux_gcc > diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst > index 7d1cb647d3..9c20ce437d 100644 > --- a/doc/guides/platform/octeontx.rst > +++ b/doc/guides/platform/octeontx.rst > @@ -90,23 +90,8 @@ native architecture, the linux sources need to be compiled once natively. > > The above steps would rebuild the modules and the required intermediate binaries. > Once the target is ready for native compilation, the OCTEON TX platform > -drivers can be compiled with the following steps, > +drivers can be compiled, see :doc:`../linux_gsg/build_dpdk` for details. > > -.. code-block:: console > - > - cd <dpdk directory> > - make config T=arm64-thunderx-linux-gcc > - make > - > -The example applications can be compiled using the following: > - > -.. code-block:: console > - > - cd <dpdk directory> > - export RTE_SDK=$PWD > - export RTE_TARGET=build > - cd examples/<application> > - make > > Cross Compilation > ~~~~~~~~~~~~~~~~~ > @@ -139,23 +124,7 @@ SDK 6.2.0 patch 3: > The above steps will prepare build system with numa additions. Now this build system can be used > to build applications for **OCTEON TX** :sup:`®` platforms. > > -.. code-block:: console > - > - cd <dpdk directory> > - export RTE_SDK=$PWD > - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux > - make config T=arm64-thunderx-linux-gcc > - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" > - > If NUMA support is not required, it can be disabled as explained in > :doc:`../linux_gsg/cross_build_dpdk_for_arm64`. > > -Following steps could be used in that case. > - > -.. code-block:: console > - > - make config T=arm64-thunderx-linux-gcc > - make CROSS=aarch64-thunderx-linux-gnu- > - > - > SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. > diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst > index 13255eec5c..232f628366 100644 > --- a/doc/guides/platform/octeontx2.rst > +++ b/doc/guides/platform/octeontx2.rst > @@ -498,27 +498,6 @@ an x86 based platform. > Native Compilation > ~~~~~~~~~~~~~~~~~~ > > -make build > -^^^^^^^^^^ > - > -.. code-block:: console > - > - make config T=arm64-octeontx2-linux-gcc > - make -j > - > -The example applications can be compiled using the following: > - > -.. code-block:: console > - > - cd <dpdk directory> > - export RTE_SDK=$PWD > - export RTE_TARGET=build > - cd examples/<application> > - make -j > - > -meson build > -^^^^^^^^^^^ > - > .. code-block:: console > > meson build > @@ -529,17 +508,6 @@ Cross Compilation > > Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. > > -make build > -^^^^^^^^^^ > - > -.. code-block:: console > - > - make config T=arm64-octeontx2-linux-gcc > - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n > - > -meson build > -^^^^^^^^^^^ > - > .. code-block:: console > > meson build --cross-file config/arm/arm64_octeontx2_linux_gcc > -- > 2.22.0 > ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 02/14] doc: remove references to make from mempool guide 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power ` (11 subsequent siblings) 13 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/mempool/octeontx.rst | 28 +++------------------------- doc/guides/mempool/octeontx2.rst | 10 +--------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..33c40d5b17 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -30,33 +30,11 @@ Prerequisites See :doc: `../platform/octeontx.rst` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) - - Set default mempool ops to octeontx_fpavf. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console +------------------ - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc +See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK. Initialization @@ -70,5 +48,5 @@ Example: .. code-block:: console - ./build/app/test -c 0xf --base-virtaddr=0x100000000000 \ + ./<build_dir>/app/test/dpdk-test -c 0xf --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..53f09a52db 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -97,4 +89,4 @@ Standalone mempool device Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device:: - echo "mempool_autotest" | build/app/test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" + echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 02/14] doc: remove references to make from mempool guide Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 12:00 ` [dpdk-dev] [EXT] " Igor Russkikh ` (3 more replies) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides Ciara Power ` (10 subsequent siblings) 13 siblings, 4 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev Cc: Ciara Power, Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> --- v6: Fixed indentation of testbbdev list entry. --- doc/guides/nics/ark.rst | 7 +--- doc/guides/nics/atlantic.rst | 4 -- doc/guides/nics/axgbe.rst | 15 -------- doc/guides/nics/bnx2x.rst | 27 ------------- doc/guides/nics/bnxt.rst | 5 +-- doc/guides/nics/build_and_test.rst | 6 ++- doc/guides/nics/cxgbe.rst | 36 +++++------------ doc/guides/nics/dpaa.rst | 27 +------------ doc/guides/nics/dpaa2.rst | 26 +------------ doc/guides/nics/ena.rst | 16 -------- doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 9 ----- doc/guides/nics/fail_safe.rst | 20 ++-------- doc/guides/nics/features.rst | 9 ----- doc/guides/nics/fm10k.rst | 4 -- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ----- doc/guides/nics/i40e.rst | 44 ++++++--------------- doc/guides/nics/ice.rst | 25 ++---------- doc/guides/nics/igc.rst | 18 +-------- doc/guides/nics/intel_vf.rst | 13 +------ doc/guides/nics/ionic.rst | 8 ---- doc/guides/nics/ipn3ke.rst | 12 +----- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 ------------- doc/guides/nics/memif.rst | 10 ++--- doc/guides/nics/mlx4.rst | 55 ++------------------------ doc/guides/nics/mlx5.rst | 62 ++---------------------------- doc/guides/nics/mvneta.rst | 36 ++++------------- doc/guides/nics/mvpp2.rst | 43 ++++----------------- doc/guides/nics/nfb.rst | 19 +-------- doc/guides/nics/nfp.rst | 4 -- doc/guides/nics/null.rst | 6 +-- doc/guides/nics/octeontx.rst | 19 +-------- doc/guides/nics/octeontx2.rst | 13 +------ doc/guides/nics/pcap_ring.rst | 24 ++++++------ doc/guides/nics/qede.rst | 17 +------- doc/guides/nics/sfc_efx.rst | 15 -------- doc/guides/nics/softnic.rst | 13 +------ doc/guides/nics/szedata2.rst | 18 +-------- doc/guides/nics/thunderx.rst | 25 +----------- doc/guides/nics/vdev_netvsc.rst | 6 --- doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- 44 files changed, 102 insertions(+), 672 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 358e7f624d..d9eafa3b88 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -122,12 +122,7 @@ The driver supports single-port, multi-queue for both RX and TX. Configuration Information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. +**DPDK Configuration Parameter** * **RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum packet length for tx packets to the FPGA. Packets less than this diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..3c163df7a8 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -72,33 +72,6 @@ Prerequisites `linux-firmware git repository <https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/bnx2x/bnx2x-e2-7.13.11.0.fw>`_ to get the required firmware. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) - - Toggle display of register reads and writes. - .. _bnx2x_driver-compilation: diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 129a16cfc7..4b172fdaac 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode @@ -612,7 +609,7 @@ Basic stats include: * oerrors By default, per-queue stats for 16 queues are supported. For more than 16 -queues, BNXT PMD should be compiled with ``CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS`` +queues, BNXT PMD should be compiled with ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` set to the desired number of queues. Extended Stats diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index ba196382a9..4a9a3d78ca 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -66,6 +66,10 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. #. Load ``igb_uio`` or ``vfio-pci`` driver: + Before compiling, make sure to enable kmods for the meson build:: + + meson configure -Denable_kmods=true + .. code-block:: console modprobe uio @@ -106,7 +110,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..442ab1511c 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -87,35 +87,19 @@ Prerequisites :ref:`linux-installation` for Linux and section :ref:`freebsd-installation` for FreeBSD. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. For example, .. code-block:: console - testpmd -w 02:00.4,keep_ovlan=1 -- -i + dpdk-testpmd -w 02:00.4,keep_ovlan=1 -- -i Common Runtime Options -^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~ - ``keep_ovlan`` (default **0**) @@ -133,7 +117,7 @@ Common Runtime Options coalesce limit has been reached. CXGBE VF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``force_link_up`` (default **0**) @@ -142,7 +126,7 @@ CXGBE VF Only Runtime Options to send traffic to each other even when the physical link is down. CXGBE PF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``filtermode`` (default **0**) @@ -317,7 +301,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88 -- -i - ``filtermask`` (default **0**) @@ -344,7 +328,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i .. _driver-compilation: @@ -689,7 +673,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ + cp <build_dir>/kernel/freebsd/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -770,13 +754,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko + kldload <build_dir>/kernel/freebsd/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 74d4a6058e..1deb7faaa5 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -196,31 +196,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ @@ -265,7 +240,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index d656b7f7a5..574cf73824 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ @@ -473,7 +449,7 @@ for details. .. code-block:: console - ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx + ./dpdk-testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... EAL: Registered [pci] bus. diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index 3a6074cdf6..3312acba52 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 3c896eeffa..6203f4d799 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -113,5 +113,3 @@ Driver compilation and testing Follow instructions available in the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` to launch **testpmd** - -To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..be6a034279 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,8 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index f80346a358..e1b5c80d6c 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- @@ -128,7 +116,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i @@ -142,7 +130,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -w 81:00.0 -- -i @@ -150,7 +138,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 -w ff:ff.f \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 -w ff:ff.f \ --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i #. Start testpmd, automatically probing the device 84:00.0 and using it with @@ -158,7 +146,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index dd8c9555b0..f4d8446d8e 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -812,8 +812,6 @@ ARMv7 Support armv7 architecture. -Use ``defconfig_arm-armv7a-*-*``. - .. _nic_features_armv8: @@ -822,8 +820,6 @@ ARMv8 Support armv8a (64bit) architecture. -Use ``defconfig_arm64-armv8a-*-*`` - .. _nic_features_power8: @@ -832,7 +828,6 @@ Power8 Support PowerPC architecture. -Use ``defconfig_ppc_64-power8-*-*`` .. _nic_features_x86-32: @@ -841,8 +836,6 @@ x86-32 Support 32bits x86 architecture. -Use ``defconfig_x86_x32-native-*-*`` and ``defconfig_i686-native-*-*``. - .. _nic_features_x86-64: @@ -851,8 +844,6 @@ x86-64 Support 64bits x86 architecture. -Use ``defconfig_x86_64-native-*-*``. - .. _nic_features_usage_doc: diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index a0b81e6695..5cf85d94cc 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -155,35 +155,13 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. +The following options can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -354,7 +332,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --forward-mode=mac + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --forward-mode=mac ... testpmd> set promisc 0 off @@ -389,8 +367,9 @@ Start ``testpmd`` with ``--disable-rss`` and ``--pkt-filter-mode=perfect``: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --disable-rss --pkt-filter-mode=perfect \ - --rxq=8 --txq=8 --nb-cores=8 --nb-ports=1 + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --disable-rss \ + --pkt-filter-mode=perfect --rxq=8 --txq=8 --nb-cores=8 \ + --nb-ports=1 Add a rule to direct ``ipv4-udp`` packet whose ``dst_ip=2.2.2.5, src_ip=2.2.2.3, src_port=32, dst_port=32`` to queue 1: @@ -648,8 +627,7 @@ For all available versions of the i40e driver, these drivers don't support 16 byte RX descriptor. If the Linux i40e kernel driver is used as host driver, while DPDK i40e PMD is used as the VF driver, DPDK cannot choose 16 byte receive descriptor. The reason is that the RX descriptor is already set to 32 byte by -the i40e kernel driver. That is to say, user should keep -``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n`` in config file. +the i40e kernel driver. In the future, if the Linux i40e driver supports 16 byte RX descriptor, user should make sure the DPDK VF uses the same RX descriptor mode, 16 byte or 32 byte, as the PF driver. @@ -769,7 +747,9 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +In ``config/rte_config.h`` set the following to use 16 bytes size RX descriptors:: + + #define RTE_LIBRTE_I40E_16BYTE_RX_DESC 1 Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -822,7 +802,7 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup. 7. The command line of running l3fwd would be something like the following:: - ./l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ + ./dpdk-l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ -- -p 0x3 --config '(0,0,18),(0,1,19),(1,0,20),(1,1,21)' This means that the application uses core 18 for port 0, queue pair 0 forwarding, core 19 for port 0, queue pair 1 forwarding, diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 25a821177a..a2aea12333 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -20,23 +20,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -91,14 +74,14 @@ Runtime Config Options .. code-block:: console - testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' + dpdk-testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-13 are VLAN extraction, other queues run with no protocol extraction. .. code-block:: console - testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' + dpdk-testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. @@ -250,7 +233,7 @@ responses for the same from PF. #. Bind the VF0, and run testpmd with 'cap=dcf' devarg:: - testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i + dpdk-testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i #. Monitor the VF2 interface network traffic:: @@ -279,7 +262,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i + ./app/dpdk-testpmd -l 0-15 -n 4 -- -i ... testpmd> rx_vlan add 10 0 diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3b096236bf 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ @@ -67,7 +53,7 @@ outer VLAN to 0x9100: .. code-block:: console - ./app/testpmd -l 4-8 -- -i + ./app/dpdk-testpmd -l 4-8 -- -i ... testpmd> vlan set filter on 0 @@ -94,7 +80,7 @@ Start ``testpmd``: .. code-block:: console - ./testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss + ./dpdk-testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss Add a rule to direct packet whose ``ether-type=0x801`` to queue 1: diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..723a9c0fa2 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,6 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +520,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..5d4534e4da 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +77,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop HQoS and flow acceleration ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,7 +88,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port, enable FPGA HQoS and .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap Limitations or Known issues --------------------------- diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 90d3040cf5..80ba459d49 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -97,13 +97,13 @@ It is possible to test PMD quickly using KNI kernel module loopback feature: .. code-block:: console - insmod build/kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb * Start testpmd with no physical device but two KNI virtual devices: .. code-block:: console - ./testpmd --vdev net_kni0 --vdev net_kni1 -- -i + ./dpdk-testpmd --vdev net_kni0 --vdev net_kni1 -- -i .. code-block:: console diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index ddeebed25c..6c6227f979 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -213,15 +213,15 @@ In this example we run two instances of testpmd application and transmit packets First create ``master`` interface:: - #./build/app/testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i + #./<build_dir>/app/dpdk-testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i Now create ``slave`` interface (master must be already running so the slave will connect):: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i You can also enable ``zero-copy`` on ``slave`` interface:: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i Start forwarding packets:: @@ -257,7 +257,7 @@ To see socket filename use show memif command:: Now create memif interface by running testpmd with these command line options:: - #./testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i + #./dpdk-testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i Testpmd should now create memif slave interface and try to connect to master. In testpmd set forward option to icmpecho and start forwarding:: @@ -280,7 +280,7 @@ The situation is analogous to cross connecting 2 ports of the NIC by cable. To set the loopback, just use the same socket and id with different roles:: - #./testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i + #./dpdk-testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i Then start the communication:: diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 6818b6af51..d1f2a7ab68 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,43 +51,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +65,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +203,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index b0614ae335..cced42450f 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -328,50 +323,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -383,10 +337,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1109,12 +1059,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..e8abde42da 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -81,20 +75,9 @@ Prerequisites Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. @@ -107,7 +90,7 @@ be passed as part of EAL arguments. .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ -c 3 -- -i --p 3 -a @@ -126,16 +109,13 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +following command: .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + Usage Example ------------- @@ -160,7 +140,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ -i --p 3 -a --txd 256 --rxd 128 --rxq=1 --txq=1 --nb-cores=1 @@ -168,4 +148,4 @@ In order to run l2fwd example application following command can be used: .. code-block:: console - ./l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 + ./dpdk-l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..6fbce8358e 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -143,22 +123,15 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +command below. For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`. .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make Usage Example ------------- @@ -185,7 +158,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ --burst=128 --txd=2048 --rxd=1024 --rxq=2 --txq=2 --nb-cores=2 \ -i -a --rss-udp @@ -373,7 +346,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ -c 7 -- -i -a --disable-hw-vlan-strip --rxq=3 --txq=3 .. _flowapi: @@ -486,7 +459,7 @@ Before proceeding run testpmd user application: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip Example #1 ^^^^^^^^^^ @@ -578,7 +551,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 2. Create meter profile: @@ -657,7 +630,7 @@ For a detailed usage description please refer to "Traffic Management" section in .. code-block:: console - ./testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ + ./dpdk-testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ -i -p 3 --disable-hw-vlan-strip --rxq 3 --txq 3 --txd 1024 --rxd 1024 2. Stop all ports: diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..ecea3ecff0 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./<build_dir>/app/dpdk-testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. @@ -133,7 +118,7 @@ transmit queue: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 020e37d131..fef99973b6 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..e75abd96d2 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..c01ae09bb3 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./<build_dir>/app/dpdk-testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index f3be79bbb8..7c04b5e600 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document @@ -74,7 +63,7 @@ use arm64-octeontx2-linux-gcc as target. .. code-block:: console - ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 + ./<build_dir>/app/dpdk-testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 EAL: Detected 24 lcore(s) EAL: Detected 1 NUMA nodes EAL: Multi-process socket /var/run/dpdk/rte/mp_socket diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index cf230ae40a..67bd23ea4a 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx @@ -225,7 +223,7 @@ Multiple devices may be specified, separated by commas. .. code-block:: console - ./testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i + ./dpdk-testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i EAL: Detected lcore 1 as core 1 on socket 0 ... diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index e874915c2f..32eede5da4 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -106,22 +106,9 @@ Performance note Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index ab44ce66c8..a2f59fb0f5 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -273,21 +273,6 @@ Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_PMD`` (default **y**) - - Enable compilation of Solarflare libefx-based poll-mode driver. - -- ``CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG`` (default **n**) - - Enable compilation of the extra run-time consistency checks. - - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..695ebed91f 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- @@ -130,7 +121,7 @@ Soft NIC testing .. code-block:: console - ./testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i + ./dpdk-testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i --portmask=0x2 .. code-block:: console @@ -375,7 +366,7 @@ commands. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -c 0x7 -s 0x4 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0x7 -s 0x4 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..9cf3f39eb5 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..a928a790e3 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ @@ -70,8 +50,7 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linux-gcc as target. +Use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling. Linux ----- @@ -178,7 +157,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst index d36f3120b2..ee802ec4a8 100644 --- a/doc/guides/nics/vhost.rst +++ b/doc/guides/nics/vhost.rst @@ -90,7 +90,7 @@ This section demonstrates vhost PMD with testpmd DPDK sample application. .. code-block:: console - ./testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i + ./dpdk-testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i Other basic DPDK preparations like hugepage enabling here. Please refer to the *DPDK Getting Started Guide* for detailed instructions. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 4477c1c160..c03c2d0fed 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -110,7 +110,7 @@ Host2VM communication example .. code-block:: console - examples/kni/build/app/kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" + <build_dir>/examples/dpdk-kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" This command generates one network device vEth0 for physical port. If specify more physical ports, the generated network device will be vEth1, vEth2, and so on. @@ -340,7 +340,7 @@ Here we use l3fwd-power as an example to show how to get started. .. code-block:: console - $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ + $ dpdk-l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ --no-numa --parse-ptype -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [EXT] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power @ 2020-10-09 12:00 ` Igor Russkikh 2020-10-11 21:01 ` Thomas Monjalon 2020-10-09 12:15 ` [dpdk-dev] " Ferruh Yigit ` (2 subsequent siblings) 3 siblings, 1 reply; 300+ messages in thread From: Igor Russkikh @ 2020-10-09 12:00 UTC (permalink / raw) To: Ciara Power, dev Cc: Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob Kollanukkaran, Nithin Kumar Dabilpuram, Kiran Kumar Kokkilagadda, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maxime Coquelin, Chenbo Xia, Zhihong Wang Hi Ciara, Thanks for the patch, > --- a/doc/guides/nics/atlantic.rst > +++ b/doc/guides/nics/atlantic.rst > @@ -26,10 +26,6 @@ Experimental API features > > - MACSEC PMD API is considered as experimental and is subject to > change/removal in next DPDK releases. > > -Configuration Information > -^^^^^^^^^^^^^^^^^^^^^^^^^ > - > -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) > > Application Programming Interface > --------------------------------- For atlantic, Reviewed-by: Igor Russkikh <irusskikh@marvell.com> > diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst > index e874915c2f..32eede5da4 100644 > --- a/doc/guides/nics/qede.rst > +++ b/doc/guides/nics/qede.rst > @@ -106,22 +106,9 @@ Performance note > Config File Options > ~~~~~~~~~~~~~~~~~~~ > > -The following options can be modified in the ``.config`` file. Please note > that > -enabling debugging options may affect system performance. > +The following option can be modified in the ``config/rte_config.h`` file. > > -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) > - > - Toggle compilation of QEDE PMD driver. This one is correctly removed, but the below defines, > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) > - > - Toggle display of transmit fast path run-time messages. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) > - > - Toggle display of receive fast path run-time messages. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) > +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) > > Gives absolute path of firmware file. > ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` These all still exist. I believe "CONFIG_" prefix should be removed here, but the defines and code behind them should stay. Regards, Igor ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [EXT] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 12:00 ` [dpdk-dev] [EXT] " Igor Russkikh @ 2020-10-11 21:01 ` Thomas Monjalon 2020-10-12 6:47 ` Rasesh Mody 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-10-11 21:01 UTC (permalink / raw) To: Ciara Power Cc: dev, Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob Kollanukkaran, Nithin Kumar Dabilpuram, Kiran Kumar Kokkilagadda, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Igor Russkikh 09/10/2020 14:00, Igor Russkikh: > > --- a/doc/guides/nics/qede.rst > > +++ b/doc/guides/nics/qede.rst > > @@ -106,22 +106,9 @@ Performance note > > Config File Options > > ~~~~~~~~~~~~~~~~~~~ > > > > -The following options can be modified in the ``.config`` file. Please note > > that > > -enabling debugging options may affect system performance. > > +The following option can be modified in the ``config/rte_config.h`` file. > > > > -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) > > - > > - Toggle compilation of QEDE PMD driver. > > This one is correctly removed, but the below defines, > > > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) > > - > > - Toggle display of transmit fast path run-time messages. > > - > > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) > > - > > - Toggle display of receive fast path run-time messages. > > - > > -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) > > +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) > > > > Gives absolute path of firmware file. > > ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` > > These all still exist. I believe "CONFIG_" prefix should be removed here, but > the defines and code behind them should stay. I believe the same comment applies to multiple drivers which have compilation options and probably should keep this information. That's the main reason why I didn't apply these patches so far, waiting for feedbacks. It has been decided in a maintainers meeting to apply the patches anyway, but given we have a request for qede, I think it blocks applying this v6. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [EXT] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-11 21:01 ` Thomas Monjalon @ 2020-10-12 6:47 ` Rasesh Mody 0 siblings, 0 replies; 300+ messages in thread From: Rasesh Mody @ 2020-10-12 6:47 UTC (permalink / raw) To: Thomas Monjalon, Ciara Power Cc: dev, Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob Kollanukkaran, Nithin Kumar Dabilpuram, Kiran Kumar Kokkilagadda, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Igor Russkikh >From: Thomas Monjalon <thomas@monjalon.net> >Sent: Sunday, October 11, 2020 2:02 PM > >09/10/2020 14:00, Igor Russkikh: >> > --- a/doc/guides/nics/qede.rst >> > +++ b/doc/guides/nics/qede.rst >> > @@ -106,22 +106,9 @@ Performance note Config File Options >> > ~~~~~~~~~~~~~~~~~~~ >> > >> > -The following options can be modified in the ``.config`` file. >> > Please note that -enabling debugging options may affect system >> > performance. >> > +The following option can be modified in the ``config/rte_config.h`` file. >> > >> > -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) >> > - >> > - Toggle compilation of QEDE PMD driver. >> >> This one is correctly removed, but the below defines, >> >> > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) >> > - >> > - Toggle display of transmit fast path run-time messages. >> > - >> > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) >> > - >> > - Toggle display of receive fast path run-time messages. >> > - >> > -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) >> > +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) >> > >> > Gives absolute path of firmware file. >> > ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` >> >> These all still exist. I believe "CONFIG_" prefix should be removed >> here, but the defines and code behind them should stay. > >I believe the same comment applies to multiple drivers which have >compilation options and probably should keep this information. > >That's the main reason why I didn't apply these patches so far, waiting for >feedbacks. >It has been decided in a maintainers meeting to apply the patches anyway, >but given we have a request for qede, I think it blocks applying this v6. > Thanks for the patch Ciara, besides 'qede' PMD we also need similar config preserved for 'bnx2x' PMD. Remove "CONFIG_" prefix and retain following: RTE_LIBRTE_BNX2X_DEBUG_RX RTE_LIBRTE_BNX2X_DEBUG_TX RTE_LIBRTE_BNX2X_DEBUG_PERIODIC ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power 2020-10-09 12:00 ` [dpdk-dev] [EXT] " Igor Russkikh @ 2020-10-09 12:15 ` Ferruh Yigit 2020-10-12 0:42 ` Ajit Khaparde 2020-10-12 2:41 ` Hyong Youb Kim (hyonkim) 2020-10-12 19:57 ` [dpdk-dev] [EXT] " Harman Kalra 3 siblings, 1 reply; 300+ messages in thread From: Ferruh Yigit @ 2020-10-09 12:15 UTC (permalink / raw) To: Ciara Power, dev Cc: Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang On 10/9/2020 11:21 AM, Ciara Power wrote: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> > > --- > v6: Fixed indentation of testbbdev list entry. for kni, pcap & null, Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 12:15 ` [dpdk-dev] " Ferruh Yigit @ 2020-10-12 0:42 ` Ajit Khaparde 0 siblings, 0 replies; 300+ messages in thread From: Ajit Khaparde @ 2020-10-12 0:42 UTC (permalink / raw) To: Ferruh Yigit Cc: Ciara Power, dpdk-dev, Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang On Fri, Oct 9, 2020 at 5:16 AM Ferruh Yigit <ferruh.yigit@intel.com> wrote: > > On 10/9/2020 11:21 AM, Ciara Power wrote: > > Make is no longer supported for compiling DPDK, references are now > > removed in the documentation. > > > > Signed-off-by: Ciara Power <ciara.power@intel.com> > > Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> > > > > --- > > v6: Fixed indentation of testbbdev list entry. > > for kni, pcap & null, > Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> For bnxt Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com> > > ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power 2020-10-09 12:00 ` [dpdk-dev] [EXT] " Igor Russkikh 2020-10-09 12:15 ` [dpdk-dev] " Ferruh Yigit @ 2020-10-12 2:41 ` Hyong Youb Kim (hyonkim) 2020-10-12 19:57 ` [dpdk-dev] [EXT] " Harman Kalra 3 siblings, 0 replies; 300+ messages in thread From: Hyong Youb Kim (hyonkim) @ 2020-10-12 2:41 UTC (permalink / raw) To: Ciara Power, dev Cc: Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley (johndale), Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar -X (jgrajcia - PANTHEON TECH SRO at Cisco), Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Harman Kalra, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang > -----Original Message----- > From: Ciara Power <ciara.power@intel.com> > Sent: Friday, October 9, 2020 7:21 PM > To: dev@dpdk.org [...] > Subject: [PATCH v6 03/14] doc: remove references to make from NICs guides > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. [...] > doc/guides/nics/enic.rst | 9 ----- [...] > diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst > index 3c896eeffa..6203f4d799 100644 > --- a/doc/guides/nics/enetc.rst > +++ b/doc/guides/nics/enetc.rst > @@ -113,5 +113,3 @@ Driver compilation and testing > Follow instructions available in the document > :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` > to launch **testpmd** > - > -To compile in performance mode, please set > ``CONFIG_RTE_CACHE_LINE_SIZE=64`` > diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst > index a28a7f4e47..be6a034279 100644 > --- a/doc/guides/nics/enic.rst > +++ b/doc/guides/nics/enic.rst > @@ -20,13 +20,6 @@ should be downloaded from > https://core.dpdk.org/download/ > Configuration information > ------------------------- > > -- **DPDK Configuration Parameters** > - > - The following configuration options are available for the ENIC PMD: > - > - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables > inclusion > - of the ENIC PMD driver in the DPDK compilation. > - > - **vNIC Configuration Parameters** > > - **Number of Queues** > @@ -583,8 +576,6 @@ The value depends on the memory configuration of > the application, DPDK and > PMD. Typically, the limit has to be raised to higher than 2GB. > e.g., 2621440 > > -The compilation of any unused drivers can be disabled using the > -configuration file in config/ directory (e.g., config/common_linux). > This would help in bringing down the time taken for building the > libraries and the initialization time of the application. > Hi, Could you remove the remaining two lines as well ("This would ... application.")? For enic, Acked-by: Hyong Youb Kim <hyonkim@cisco.com> Thanks. -Hyong ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [EXT] [PATCH v6 03/14] doc: remove references to make from NICs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power ` (2 preceding siblings ...) 2020-10-12 2:41 ` Hyong Youb Kim (hyonkim) @ 2020-10-12 19:57 ` Harman Kalra 3 siblings, 0 replies; 300+ messages in thread From: Harman Kalra @ 2020-10-12 19:57 UTC (permalink / raw) To: Ciara Power Cc: dev, Bruce Richardson, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Ajit Khaparde, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Hyong Youb Kim, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Ferruh Yigit, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Andrew Rybchenko, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang On Fri, Oct 09, 2020 at 11:21:29AM +0100, Ciara Power wrote: > External Email > > ---------------------------------------------------------------------- > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> > > --- > v6: Fixed indentation of testbbdev list entry. Hi Ciara, Thanks for updating the nic documentation for octeontx and octeontx2. Reviewed-by: Harman Kalra <hkalra@marvell.com> Thanks Harman ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (2 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-11 6:49 ` Matan Azrad 2020-10-11 20:57 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 05/14] doc: remove references to make from bbdevs guides Ciara Power ` (9 subsequent siblings) 13 siblings, 2 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Xiao Wang, Matan Azrad, Viacheslav Ovsiienko Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> --- doc/guides/vdpadevs/ifc.rst | 13 ------------ doc/guides/vdpadevs/mlx5.rst | 40 +++--------------------------------- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst index 12a2a342e6..f968489a75 100644 --- a/doc/guides/vdpadevs/ifc.rst +++ b/doc/guides/vdpadevs/ifc.rst @@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and device state report/restore, this driver enables its vDPA functionality. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux) - - Toggle compilation of the ``librte_pmd_ifc`` driver. - - IFCVF vDPA Implementation ------------------------- diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..2717459b6f 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -65,42 +63,10 @@ Prerequisites Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides Ciara Power @ 2020-10-11 6:49 ` Matan Azrad 2020-10-11 20:57 ` Thomas Monjalon 1 sibling, 0 replies; 300+ messages in thread From: Matan Azrad @ 2020-10-11 6:49 UTC (permalink / raw) To: Ciara Power, dev; +Cc: Xiao Wang, Slava Ovsiienko Hi Ciara, Looks good. From: Ciara Power <ciara.power@intel.com> > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Matan Azrad <matan@nvidia.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides Ciara Power 2020-10-11 6:49 ` Matan Azrad @ 2020-10-11 20:57 ` Thomas Monjalon 1 sibling, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-11 20:57 UTC (permalink / raw) To: Ciara Power; +Cc: dev, Xiao Wang, Matan Azrad, Viacheslav Ovsiienko 09/10/2020 12:21, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > --- > Compilation options > ~~~~~~~~~~~~~~~~~~~ > > -These options can be modified in the ``.config`` file. > - > -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) > - > - Toggle compilation of librte_pmd_mlx5 itself. > - > -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) > - > - Build PMD with additional code to make it loadable without hard > - dependencies on **libibverbs** nor **libmlx5**, which may not be installed > - on the target system. > - > - In this mode, their presence is still required for it to run properly, > - however their absence won't prevent a DPDK application from starting (with > - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as > - missing with ``ldd(1)``. > - > - It works by moving these dependencies to a purpose-built rdma-core "glue" > - plug-in which must either be installed in a directory whose name is based > - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a > - standard location for the dynamic linker (e.g. ``/lib``) if left to the > - default empty string (``""``). > - > - This option has no performance impact. > - > -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) > - > - Embed static flavor of the dependencies **libibverbs** and **libmlx5** > - in the PMD shared library or the executable static binary. It is completely removing some information which could be kept if mentioning the meson option "ibverbs_link". ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 05/14] doc: remove references to make from bbdevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (3 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 06/14] doc: remove references to make from cryptodevs guides Ciara Power ` (8 subsequent siblings) 13 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Nicolas Chautru Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v5: Added meson steps to turbo_sw doc. --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +---- doc/guides/bbdevs/fpga_lte_fec.rst | 5 +---- doc/guides/bbdevs/turbo_sw.rst | 23 ++++++++--------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index 709e7baed9..17d3da30ff 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index 344a2cc06a..77a5a58175 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..43c5129fd7 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -144,20 +136,21 @@ In order to enable this virtual bbdev PMD, the user may: FlexRAN SDK libraries were installed. And ``DIR_WIRELESS_SDK`` to the path where the libraries were extracted. +* Tune the meson build option pointing the location of the FlexRAN SDK libraries ``flexran_sdk`` + Example: .. code-block:: console export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ + cd build + meson configure -Dflexran_sdk=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx512-icc/install + +* For AVX512 machines with SDK libraries installed then both 4G and 5G can be enabled for full real time FEC capability. + For AVX2 machines it is possible to only enable the 4G libraries and the PMD capabilities will be limited to 4G FEC. + If no library is present then the PMD driver will still build but its capabilities will be limited accordingly. -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 06/14] doc: remove references to make from cryptodevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (4 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 05/14] doc: remove references to make from bbdevs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:30 ` Akhil Goyal 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 07/14] doc: remove references to make from compressdevs guides Ciara Power ` (7 subsequent siblings) 13 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Declan Doherty, Pablo de Lara, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Akhil Goyal, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ------------- doc/guides/cryptodevs/ccp.rst | 12 ++---- doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- doc/guides/cryptodevs/kasumi.rst | 11 +---- doc/guides/cryptodevs/mvsam.rst | 10 +---- doc/guides/cryptodevs/nitrox.rst | 7 ---- doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +----- doc/guides/cryptodevs/octeontx2.rst | 8 +--- doc/guides/cryptodevs/openssl.rst | 6 +-- doc/guides/cryptodevs/qat.rst | 65 +++++++---------------------- doc/guides/cryptodevs/scheduler.rst | 8 ---- doc/guides/cryptodevs/snow3g.rst | 10 +---- doc/guides/cryptodevs/virtio.rst | 20 +++------ doc/guides/cryptodevs/zuc.rst | 10 +---- 19 files changed, 38 insertions(+), 234 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 74e0de63ad..013615e2d0 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -96,8 +96,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. @@ -117,5 +115,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm" diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 15388d20ab..fd533ca65b 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -131,8 +131,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. @@ -152,7 +150,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo "sha1-hmac" Extra notes diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index 9c1997768a..4cf9f5907e 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -85,8 +83,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. @@ -108,7 +104,7 @@ To validate ccp pmd, l2fwd-crypto example can be used with following command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff @@ -123,7 +119,7 @@ following: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..5770a60cb2 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. @@ -117,7 +108,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "kasumi-f8" Extra notes on KASUMI F9 diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..6188c1248c 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: @@ -105,7 +97,7 @@ operation: .. code-block:: console - ./l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ + ./dpdk-l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ --auth_op GENERATE --auth_algo sha1-hmac \ diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 85f5212b64..2f0565b49e 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -33,13 +33,6 @@ Limitations * 3DES Cipher Only combination is not supported. * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/null.rst b/doc/guides/cryptodevs/null.rst index c980e0ac84..aac5904b1d 100644 --- a/doc/guides/cryptodevs/null.rst +++ b/doc/guides/cryptodevs/null.rst @@ -67,5 +67,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "null" diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..d813cb2974 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- @@ -135,7 +127,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_autotest The asymmetric crypto operations on OCTEON TX crypto PMD may be verified by running the test @@ -143,5 +135,5 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_asym_autotest diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index 432146db04..bb4af3a04d 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. @@ -148,7 +144,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_autotest The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test @@ -156,7 +152,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_asym_autotest diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..ca0f0b43f3 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: @@ -93,7 +93,7 @@ To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" --vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index 7c56293192..f34ba49ed5 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -483,7 +456,6 @@ To complete the installation follow the instructions in insmod ./drivers/crypto/qat/qat_common/intel_qat.ko insmod ./drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko - .. Note:: If you see the following warning in ``/var/log/messages`` it can be ignored: @@ -659,27 +631,20 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -703,7 +668,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 7004ca431a..ee23b25b73 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..13341c39c4 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "snow3g-uea2" diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..83d8e32397 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,27 +83,17 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "cryptodev_virtio_autotest" to test + cd to <build_dir> + meson test cryptodev_virtio_autotest The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test-crypto-perf - type the command "make" to compile - run the tests with the following command: - - ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ + cd to <build_dir> + + ./app/dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ --ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \ --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \ --auth-op generate --auth-key-sz 64 --digest-sz 12 \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..907840ef05 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "zuc-eea3" -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 06/14] doc: remove references to make from cryptodevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 06/14] doc: remove references to make from cryptodevs guides Ciara Power @ 2020-10-09 10:30 ` Akhil Goyal 0 siblings, 0 replies; 300+ messages in thread From: Akhil Goyal @ 2020-10-09 10:30 UTC (permalink / raw) To: Ciara Power, dev Cc: Kevin Laatz, Declan Doherty, Pablo de Lara, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- The overall patch looks good. But there are some PMDs which are not enabled by default. The documentation should cover how to enable them using meson and what all paths need To be set. For example: aesni-mb, aesni-gcm, armv8-crypto, openssl. I believe PMD owners should send the patch for fixing this in documentation. Acked-by: Akhil Goyal <akhil.goyal@nxp.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 07/14] doc: remove references to make from compressdevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (5 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 06/14] doc: remove references to make from cryptodevs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 08/14] doc: remove references to make from eventdevs guides Ciara Power ` (6 subsequent siblings) 13 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Lee Daly, Ashish Gupta, Sunila Sahu Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Lee Daly <lee.daly@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..8c658721b9 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -56,21 +56,6 @@ Steps To Setup Platform SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. -Installation ------------- - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "compressdev_autotest" to test + cd to <build_dir> + meson test compressdev_autotest diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 08/14] doc: remove references to make from eventdevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (6 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 07/14] doc: remove references to make from compressdevs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-11 20:36 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 09/14] doc: remove references to make from rawdevs guides Ciara Power ` (5 subsequent siblings) 13 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Hemant Agrawal, Nipun Gupta, Jerin Jacob, Pavan Nikhilesh Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- doc/guides/eventdevs/dpaa.rst | 20 -------------------- doc/guides/eventdevs/dpaa2.rst | 20 -------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 8 -------- 4 files changed, 72 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..6fbee91d9e 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -43,26 +43,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..b992ae649e 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -52,26 +52,6 @@ Currently supported by DPDK: Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 9a3646db0d..f7a4cdd586 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..7f9eceb01f 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 08/14] doc: remove references to make from eventdevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 08/14] doc: remove references to make from eventdevs guides Ciara Power @ 2020-10-11 20:36 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-11 20:36 UTC (permalink / raw) To: Ciara Power Cc: dev, Kevin Laatz, Hemant Agrawal, Nipun Gupta, Jerin Jacob, Pavan Nikhilesh 09/10/2020 12:21, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > --- > doc/guides/eventdevs/dpaa.rst | 20 -------------------- > doc/guides/eventdevs/dpaa2.rst | 20 -------------------- > doc/guides/eventdevs/octeontx.rst | 24 ------------------------ > doc/guides/eventdevs/octeontx2.rst | 8 -------- > 4 files changed, 72 deletions(-) > > diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst > index be68c6da6f..6fbee91d9e 100644 > --- a/doc/guides/eventdevs/dpaa.rst > +++ b/doc/guides/eventdevs/dpaa.rst > @@ -43,26 +43,6 @@ Currently supported by DPDK: > Pre-Installation Configuration > ------------------------------ This section becomes empty and can be removed. > > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > -Please note that enabling debugging options may affect system performance. > - > -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) > - > - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. > - > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the > -following ``make`` command: > - > -.. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst > index 835767f98d..b992ae649e 100644 > --- a/doc/guides/eventdevs/dpaa2.rst > +++ b/doc/guides/eventdevs/dpaa2.rst > @@ -52,26 +52,6 @@ Currently supported by DPDK: > Pre-Installation Configuration > ------------------------------ This section becomes empty and can be removed. > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > -Please note that enabling debugging options may affect system performance. > - > -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) > - > - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. > - > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the > -following ``make`` command: > - > -.. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-dpaa-linux-gcc install > > Initialization > -------------- > diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst > index 9a3646db0d..f7a4cdd586 100644 > --- a/doc/guides/eventdevs/octeontx.rst > +++ b/doc/guides/eventdevs/octeontx.rst > @@ -41,30 +41,6 @@ Prerequisites > > See :doc:`../platform/octeontx` for setup information. > > -Pre-Installation Configuration > ------------------------------- > - > -Config File Options > -~~~~~~~~~~~~~~~~~~~ > - > -The following options can be modified in the ``config`` file. > -Please note that enabling debugging options may affect system performance. > - > -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) > - > - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. > - > -Driver Compilation > -~~~~~~~~~~~~~~~~~~ > - > -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the > -following ``make`` command: > - > -.. code-block:: console > - > - cd <DPDK-source-directory> > - make config T=arm64-thunderx-linux-gcc install > - > > Initialization > -------------- > diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst > index 6502f6415f..7f9eceb01f 100644 > --- a/doc/guides/eventdevs/octeontx2.rst > +++ b/doc/guides/eventdevs/octeontx2.rst > @@ -47,14 +47,6 @@ Prerequisites and Compilation procedure > Pre-Installation Configuration > ------------------------------ This title doesn't really make any sense now. If think sub-titles could be promoted to an highel level. > > -Compile time Config Options > -~~~~~~~~~~~~~~~~~~~~~~~~~~~ > - > -The following option can be modified in the ``config`` file. > - > -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) > - > - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. > > Runtime Config Options > ~~~~~~~~~~~~~~~~~~~~~~ > ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 09/14] doc: remove references to make from rawdevs guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (7 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 08/14] doc: remove references to make from eventdevs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 10/14] doc: remove references to make from app guides Ciara Power ` (4 subsequent siblings) 13 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Bruce Richardson, Rosen Xu, Nipun Gupta, Tianfei zhang, Xiaoyun Li, Jingjing Wu, Satha Rao, Mahipal Challa Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Rosen Xu <rosen.xu@intel.com> --- v6: Modified compilation section for ioat based on v5 feedback. --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 6 files changed, 78 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index 39e4d65f87..2c5fa7690c 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ Skylake is https://www.intel.com/content/dam/support/us/en/documents/server-prod - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 4a9794489e..6887da5278 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index b03fcf789a..fb9d346ccf 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 10/14] doc: remove references to make from app guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (8 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 09/14] doc: remove references to make from rawdevs guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 12:23 ` Ferruh Yigit 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 11/14] doc: remove reference to make from tools guides Ciara Power ` (3 subsequent siblings) 13 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, Olivier Matz, David Hunt, Harry van Haaren, Marko Kovacevic, Bernard Iremonger, Ori Kam, Bruce Richardson, Konstantin Ananyev, Cristian Dumitrescu, Radu Nicolau, Akhil Goyal, Ferruh Yigit, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, John McNamara, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Wenzhuo Lu, Beilei Xing While make has been deprecated for DPDK, it's still applicable for some example apps to be built standalone, this patch adjusts the guides to take that into consideration. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- v6: Modified commit log based on suggestions on v5. --- doc/guides/sample_app_ug/bbdev_app.rst | 34 ++------ doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +++++++------------ doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +-- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +----- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +--- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 ++-- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +-- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +-- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 ++-- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 ++--- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +++------- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +-- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +---- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +++------- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +-- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 ++++---- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- 51 files changed, 199 insertions(+), 356 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..764155f983 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -31,30 +31,12 @@ Limitations Compiling the Application ------------------------- -#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along - with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* - documentation for more details on this. +DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along +with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* +documentation for more details on this. -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make Running the Application ----------------------- @@ -63,8 +45,8 @@ The application accepts a number of command line options: .. code-block:: console - $ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] / - [-p ETH_PORT_ID] [-b BBDEV_ID] + $ ./<build_dir>/examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] / + [-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID] where: @@ -84,8 +66,8 @@ issue the command: .. code-block:: console - $ ./build/bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> -c 0x38 --socket-mem=2,2 \ - --file-prefix=bbdev -- -e 0x10 -d 0x20 + $ ./<build_dir>/examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> \ + -c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20 where, NIC0PCIADDR is the PCI address of the Rx port diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index 6deb6c8112..5e3a25a317 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -52,7 +52,7 @@ To run the application in linux environment, issue the following command: .. code-block:: console - $ ./build/cmdline -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-cmdline -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..adde775d4e 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,100 +9,75 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: - - .. code-block:: console - - cd $RTE_SDK - -Build DPDK: +Enable examples compilation: .. code-block:: console - make defconfig - make + meson configure -Dexamples=all -Build the sample applications: +Build: .. code-block:: console - export RTE_TARGET=build - make -C examples + ninja -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. +Applications are output to: ``dpdk/<build_dir>/examples``. -In the example above the compiled application is written to the ``build`` subdirectory. -To have the applications written to a different location, -the ``O=/path/to/build/directory`` option may be specified in the make command. +To compile a single application +------------------------------- - .. code-block:: console - make O=/tmp +Using meson +~~~~~~~~~~~ -To build the applications for debugging use the ``DEBUG`` option. -This option adds some extra flags, disables compiler optimizations and -sets verbose output. +Go to DPDK build directory: .. code-block:: console - make DEBUG=1 - - -To compile a single application -------------------------------- + cd dpdk/<build_dir> -Set the path to DPDK source code: +Enable example app compilation: - .. code-block:: console + .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + meson configure -Dexamples=helloworld -Go to DPDK source: +Build: - .. code-block:: console + .. code-block:: console - cd $RTE_SDK + ninja -Build DPDK: - .. code-block:: console +Using Make +~~~~~~~~~~ - make defconfig - make +Pkg-config is used when building an example app standalone using make, please +see :ref:`building_app_using_installed_dpdk` for more information. Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. - +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make -To cross compile the sample application(s) ------------------------------------------- - -For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command. -In example of AARCH64 cross compiling: +To build the application for debugging use the ``DEBUG`` option. +This option adds some extra flags, disables compiler optimizations and +sets verbose output. .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk - make -C examples CROSS=aarch64-linux-gnu- - or - make CROSS=aarch64-linux-gnu- + make DEBUG=1 diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 90270e3a58..3bd03905c3 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -42,7 +42,7 @@ Running the Application .. code-block:: console - ./build/distributor_app [EAL options] -- -p PORTMASK + ./<build-dir>/examples/dpdk-distributor [EAL options] -- -p PORTMASK where, @@ -53,7 +53,7 @@ Running the Application .. code-block:: console - $ ./build/distributor_app -l 1-9,22 -n 4 -- -p f + $ ./<build-dir>/examples/dpdk-distributor -l 1-9,22 -n 4 -- -p f #. Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst index 253004dd00..7819871917 100644 --- a/doc/guides/sample_app_ug/ethtool.rst +++ b/doc/guides/sample_app_ug/ethtool.rst @@ -24,7 +24,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./ethtool-app/${RTE_TARGET}/ethtool [EAL options] + ./<build_dir>/examples/dpdk-ethtool [EAL options] Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index dc7972aa9a..b4fc587a09 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -46,7 +46,8 @@ these settings is shown below: .. code-block:: console - ./build/eventdev_pipeline --vdev event_sw0 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D + ./<build_dir>/examples/dpdk-eventdev_pipeline --vdev event_sw0 -- -r1 -t1 / + -e4 -w FF00 -s4 -n0 -c32 -W1000 -D The application has some sanity checking built-in, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 2953fddeb9..8b009244b8 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -70,9 +70,7 @@ Compiling the Application * Compile Application - .. code-block:: console - - make -C examples/fips_validation + To compile the sample application see :doc:`compiling`. * Run ``dos2unix`` on the request files @@ -92,7 +90,7 @@ The application requires a number of command line options: .. code-block:: console - ./fips_validation [EAL options] + ./dpdk-fips_validation [EAL options] -- --req-file FILE_PATH/FOLDER_PATH --rsp-file FILE_PATH/FOLDER_PATH [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder] @@ -117,7 +115,7 @@ file for crypto_aesni_mb PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_mb -- + $ ./dpdk-fips_validation --vdev crypto_aesni_mb -- --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb @@ -126,7 +124,7 @@ data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_gcm0 -- + $ ./dpdk-fips_validation --vdev crypto_aesni_gcm0 -- --req-file /PATH/TO/REQUEST/FILE/FOLDER/ --rsp-file ./PATH/TO/RESPONSE/FILE/FOLDER/ --cryptodev-id 0 --path-is-folder diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index 31175cff0a..01915971ae 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -28,8 +28,8 @@ To run the example in a ``linux`` environment: .. code-block:: console - cd ~/dpdk/examples/flow_classify - ./build/flow_classify -c 4 -n 4 -- --rule_ipv4="../ipv4_rules_file.txt" + ./<build_dir>/examples/dpdk-flow_classify -c 4 -n 4 -- / + --rule_ipv4="../ipv4_rules_file.txt" Please refer to the *DPDK Getting Started Guide*, section :doc:`../linux_gsg/build_sample_apps` diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index d3653e57b2..ee5a8b44bd 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -13,28 +13,7 @@ It is intended as a demonstration of the basic components RTE flow rules. Compiling the Application ------------------------- -To compile the application export the path to the DPDK source tree and go to -the example directory: - -.. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - - cd ${RTE_SDK}/examples/flow_filtering - -Set the target, for example: - -.. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - -See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. - -Build the application as follows: - -.. code-block:: console - - make +To compile the sample application see :doc:`compiling`. Running the Application @@ -44,7 +23,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/flow -l 1 -n 1 + ./<build_dir>/examples/dpdk-flow_filtering -l 1 -n 1 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 46f997a7dc..8f48533873 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -21,7 +21,7 @@ To run the example in a linux environment: .. code-block:: console - $ ./build/helloworld -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-helloworld -l 0-3 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ioat.rst b/doc/guides/sample_app_ug/ioat.rst index 964160dff8..efd9bea367 100644 --- a/doc/guides/sample_app_ug/ioat.rst +++ b/doc/guides/sample_app_ug/ioat.rst @@ -45,7 +45,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/ioatfwd [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] + ./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] [--[no-]mac-updating] where, @@ -81,7 +81,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw + $ ./<build_dir>/examples/dpdk-ioat -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw To run the application in a Linux environment with 2 lcores (the master lcore, plus one forwarding core), 2 ports (ports 0 and 1), hardware copying and no MAC @@ -89,7 +89,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw + $ ./<build_dir>/examples/dpdk-ioat -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index afeaff3639..92d5e4aeae 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -53,7 +53,7 @@ Application usage: .. code-block:: console - ./build/ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] where: @@ -65,7 +65,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_fragmentation -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -94,7 +94,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst index 56014be174..1d8656c637 100644 --- a/doc/guides/sample_app_ug/ip_pipeline.rst +++ b/doc/guides/sample_app_ug/ip_pipeline.rst @@ -34,7 +34,7 @@ Running the application The application startup command line is:: - ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] + dpdk-ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] The application startup arguments are: @@ -71,7 +71,7 @@ The following is an example command to run ip pipeline application configured fo .. code-block:: console - $ ./build/ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli + $ ./<build_dir>/examples/dpdk-ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli The application should start successfully and display as follows: diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index f34b9d0055..e72c8492e9 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -42,7 +42,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] + ./<build_dir>/examples/dpdk-ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] where: @@ -61,7 +61,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_reassembly -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_reassembly -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -92,7 +92,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_reassembly -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_reassembly -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. @@ -231,7 +231,8 @@ Debug logging and Statistics Collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The RTE_LIBRTE_IP_FRAG_TBL_STAT controls statistics collection for the IP Fragment Table. -This macro is disabled by default. +This macro is disabled by default, but it can be enabled by modifying the appropriate line +in ``config/rte_config.h``. To make ip_reassembly print the statistics to the standard output, the user must send either an USR1, INT or TERM signal to the process. For all of these signals, the ip_reassembly process prints Fragment table statistics for each RX queue, diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 434f484138..1f37dccf8b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -116,12 +116,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ipsec-secgw`` sub-directory. -#. [Optional] Build the application for debugging: - This option adds some extra flags, disables compiler optimizations and - is verbose:: - - make DEBUG=1 - Running the Application ----------------------- @@ -129,7 +123,7 @@ Running the Application The application has a number of command line options:: - ./build/ipsec-secgw [EAL options] -- + ./<build_dir>/examples/dpdk-ipsec-secgw [EAL options] -- -p PORTMASK -P -u PORTMASK -j FRAMESIZE -l -w REPLAY_WINOW_SIZE -e -a -c SAD_CACHE_SIZE @@ -245,7 +239,7 @@ The mapping of lcores to port/queues is similar to other l3fwd applications. For example, given the following command line to run application in poll mode:: - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ --vdev "crypto_null" -- -p 0xf -P -u 0x3 \ --config="(0,0,20),(1,0,20),(2,0,21),(3,0,21)" \ -f /path/to/config_file --transfer-mode poll \ @@ -297,7 +291,7 @@ where each option means: Similarly for example, given the following command line to run application in event app mode:: - ./build/ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ -f /path/to/config_file --transfer-mode event \ --event-schedule-type parallel \ @@ -336,7 +330,7 @@ For example, something like the following command line: .. code-block:: console - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ -w 81:00.0 -w 81:00.1 -w 81:00.2 -w 81:00.3 \ --vdev "crypto_aesni_mb" --vdev "crypto_null" \ -- \ diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index 8923a7f548..7c6e8b15cc 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -50,7 +50,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] where, @@ -67,7 +67,7 @@ Typically, to run the IPv4 Multicast sample application, issue the following com .. code-block:: console - ./build/ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 + ./<build_dir>/examples/dpdk-ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 In this command: diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..ef7936f80f 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -49,7 +49,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l2fwd-keepalive [EAL options] \ + ./<build_dir>/examples/dpdk-l2fwd-keepalive [EAL options] \ -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD] where, @@ -68,7 +68,7 @@ To run the application in linux environment with 4 lcores, 16 ports .. code-block:: console - ./build/l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 + ./<build_dir>/examples/dpdk-l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index aac4ebd8d4..ef441cc1e5 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -96,7 +96,7 @@ The ``kni`` example application requires a number of command line options: .. code-block:: console - kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] + dpdk-kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] Where: @@ -168,8 +168,8 @@ interface ``vEth1_0`` with the kernel thread bound to lcore 9. .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" The following example is identical, except an additional ``lcore_kthread`` core is specified per physical port. In this case, ``kni`` will create @@ -186,8 +186,8 @@ The kernel thread for each interface will be bound as follows: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" The following example can be used to test the interface between the ``kni`` test application and the ``rte_kni`` kernel module. In this example, @@ -206,8 +206,8 @@ disabled by **not** specifying the ``-m`` flag to ``kni``: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo carrier=on - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo carrier=on + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" KNI Operations -------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 0a813200ba..c1be2d7dff 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -70,13 +70,13 @@ To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" or to enable CAT and CDP on cpus 1,3: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" If CDP is not supported it will fail with following error message: diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 962752f21c..e2c0f9f1ec 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / + ./<build_dir>/examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / [--cdev_type HW/SW/ANY] [--chain HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] / [--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] / [--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size SIZE] / @@ -162,7 +162,7 @@ To run the application in linux environment with 2 lcores, 2 ports and 2 crypto .. code-block:: console - $ ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ + $ ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ --vdev "crypto_aesni_mb1" -- -p 0x3 --chain CIPHER_HASH \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index d536eee819..11c9d4b2ee 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -52,7 +52,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE + ./<build_dir>/examples/dpdk-l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE where, @@ -75,20 +75,20 @@ issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll Eventdev mode with 4 lcores, 16 ports , sched method ordered and MAC address updating enabled, issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered or .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -105,7 +105,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Explanation ----------- diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 8d0c38721f..1a854abb23 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -81,7 +81,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] + ./<build_dir>/examples/dpdk-l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] where, @@ -96,7 +96,7 @@ thousands separator printing, issue the command: .. code-block:: console - $ ./build/l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l + $ ./<build_dir>/examples/dpdk-l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index c0e8488e79..5a13de215e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK + ./<build_dir>/examples/dpdk-l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating [--portmap="(port, port)[,(port, port)]"] @@ -111,7 +111,7 @@ updating enabled, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p ffff To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and @@ -119,7 +119,7 @@ vice versa, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936..7acbd7404e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -51,7 +51,7 @@ Running the Application The application has a number of command line options:: - ./l3fwd [EAL options] -- -p PORTMASK + ./dpdk-l3fwd [EAL options] -- -p PORTMASK [-P] [-E] [-L] @@ -111,7 +111,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: @@ -138,13 +138,13 @@ Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered or .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered In this command: @@ -166,7 +166,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered In case of eventdev mode, *--config* option is not used for ethernet port configuration. Instead each ethernet port will be configured with mentioned diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..d3c901f8d8 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -268,7 +268,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_graph.rst b/doc/guides/sample_app_ug/l3_forward_graph.rst index df50827bab..75617e3af1 100644 --- a/doc/guides/sample_app_ug/l3_forward_graph.rst +++ b/doc/guides/sample_app_ug/l3_forward_graph.rst @@ -44,7 +44,7 @@ Running the Application The application has a number of command line options similar to l3fwd:: - ./l3fwd-graph [EAL options] -- -p PORTMASK + ./dpdk-l3fwd-graph [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--eth-dest=X,MM:MM:MM:MM:MM:MM] @@ -79,7 +79,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 0cc6f2e62e..4f997108ba 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -88,7 +88,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -378,7 +378,7 @@ See :doc:`Power Management<../prog_guide/power_man>` chapter in the DPDK Program .. code-block:: console - ./l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 + ./<build_dir>/examples/dpdk-l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 Where, @@ -407,7 +407,7 @@ app with the training flag set to “1”, and the other parameters set to .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P This will run the training algorithm for x seconds on each core (cores 2 and 3), and then print out the recommended threshold values for those @@ -432,7 +432,7 @@ then be started without the training mode so traffic can start immediately. .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P Telemetry Mode -------------- @@ -449,13 +449,9 @@ cycles it took is measured and compared with minimum and maximum reference cycles and accordingly busy rate is set to either 0% or 50% or 100%. - .. Note:: - - * The CONFIG_RTE_LIBRTE_TELEMETRY should be set in order to get the stats in DPDK telemetry. - .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry + ./<build_dir>/examples/dpdk-l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry The new stats ``empty_poll`` , ``full_poll`` and ``busy_percent`` can be viewed by running the script ``/usertools/dpdk-telemetry-client.py`` and selecting the menu option ``Send for global Metrics``. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 1057c7584d..8399a1bd51 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] + ./<build_dir>/examples/dpdk-link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] where, @@ -54,7 +54,7 @@ issue the command: .. code-block:: console - $ ./build/link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index bd329c2db2..411e8ebb49 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -41,7 +41,7 @@ passing at least two cores in the coremask/corelist, as follows: .. code-block:: console - ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary For the first DPDK process run, the proc-type flag can be omitted or set to auto, since all DPDK processes will default to being a primary instance, @@ -50,7 +50,7 @@ The process should start successfully and display a command prompt as follows: .. code-block:: console - $ ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + $ ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary EAL: coremask set to 3 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 0 @@ -76,7 +76,7 @@ again run the same binary setting at least two cores in the coremask/corelist: .. code-block:: console - ./build/simple_mp -l 2-3 -n 4 --proc-type=secondary + ./<build_dir>/examples/dpdk-simple_mp -l 2-3 -n 4 --proc-type=secondary When running a secondary process such as that shown above, the proc-type parameter can again be specified as auto. However, omitting the parameter altogether will cause the process to try and start as a primary rather than secondary process. @@ -182,10 +182,10 @@ the following commands can be used (assuming run as root): .. code-block:: console - # ./build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 - # ./build/symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 - # ./build/symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 - # ./build/symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 .. note:: @@ -282,9 +282,9 @@ the following commands could be used: .. code-block:: console - # ./mp_server/build/mp_server -l 1-2 -n 4 -- -p 3 -n 2 - # ./mp_client/build/mp_client -l 3 -n 4 --proc-type=auto -- -n 0 - # ./mp_client/build/mp_client -l 4 -n 4 --proc-type=auto -- -n 1 + # ./<build_dir>/examples/dpdk-mp_server -l 1-2 -n 4 -- -p 3 -n 2 + # ./<build_dir>/examples/dpdk-mp_client -l 3 -n 4 --proc-type=auto -- -n 0 + # ./<build_dir>/examples/dpdk-mp_client -l 4 -n 4 --proc-type=auto -- -n 1 .. note:: diff --git a/doc/guides/sample_app_ug/ntb.rst b/doc/guides/sample_app_ug/ntb.rst index 93fb752f25..f80b221db7 100644 --- a/doc/guides/sample_app_ug/ntb.rst +++ b/doc/guides/sample_app_ug/ntb.rst @@ -32,7 +32,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./build/ntb_fwd -c 0xf -n 6 -- -i + ./<build_dir>/examples/dpdk-ntb -c 0xf -n 6 -- -i Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/packet_ordering.rst b/doc/guides/sample_app_ug/packet_ordering.rst index 1c8ee5d040..5a4e0a9d28 100644 --- a/doc/guides/sample_app_ug/packet_ordering.rst +++ b/doc/guides/sample_app_ug/packet_ordering.rst @@ -43,7 +43,8 @@ The application execution command line is: .. code-block:: console - ./packet_ordering [EAL options] -- -p PORTMASK [--disable-reorder] [--insight-worker] + ./<build_dir>/examples/dpdk-packet_ordering [EAL options] -- -p PORTMASK / + [--disable-reorder] [--insight-worker] The -c EAL CPU_COREMASK option has to contain at least 3 CPU cores. The first CPU core in the core mask is the master core and would be assigned to diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..2a50eb4270 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -55,7 +55,7 @@ Running the Application The application has a number of command line options:: - ./build/l3fwd-thread [EAL options] -- + ./<build_dir>/examples/dpdk-l3fwd-thread [EAL options] -- -p PORTMASK [-P] --rx(port,queue,lcore,thread)[,(port,queue,lcore,thread)] --tx(lcore,thread)[,(lcore,thread)] @@ -141,14 +141,14 @@ in ``--rx/--tx`` are used to affinitize threads to the selected scheduler. For example, the following places every l-thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" The following places RX l-threads on lcore 0 and TX l-threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(2,1)" @@ -164,7 +164,7 @@ place every RX and TX thread on different lcores. For example, the following places every EAL thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -176,7 +176,7 @@ parameter is used. The following places RX EAL threads on lcore 0 and TX EAL threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -190,13 +190,13 @@ and its corresponding EAL threads command line can be realized as follows: a) Start every thread on different scheduler (1:1):: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" EAL thread equivalent:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -205,13 +205,13 @@ b) Start all threads on one core (N:1). Start 4 L-threads on lcore 0:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(0,0)(0,1)" Start 4 EAL threads on cpu-set 0:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -220,14 +220,14 @@ c) Start threads on different cores (N:M). Start 2 L-threads for RX on lcore 0, and 2 L-threads for TX on lcore 1:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(1,1)" Start 2 EAL threads for RX on cpu-set 0, and 2 EAL threads for TX on cpu-set 1:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -1146,33 +1146,15 @@ in the performance-thread folder To build and run the pthread shim example -#. Go to the example applications folder - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim - - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the DPDK Getting Started Guide for possible RTE_TARGET values. - #. Build the application: - .. code-block:: console - - make + To compile the sample application see :doc:`compiling`. #. To run the pthread_shim example .. code-block:: console - lthread-pthread-shim -c core_mask -n number_of_channels + dpdk-pthread-shim -c core_mask -n number_of_channels .. _lthread_diagnostics: diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 12b4f13d5b..a58b6f35bf 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -57,13 +57,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. -.. note:: - To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 - and then recompile DPDK: - - .. code-block:: console - - CONFIG_RTE_LIBRTE_IEEE1588=y Running the Application ----------------------- @@ -72,7 +65,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/ptpclient -l 1 -n 4 -- -p 0x1 -T 0 + ./<build_dir>/examples/dpdk-ptpclient -l 1 -n 4 -- -p 0x1 -T 0 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst index d75f7da52c..6b6853a0e9 100644 --- a/doc/guides/sample_app_ug/qos_metering.rst +++ b/doc/guides/sample_app_ug/qos_metering.rst @@ -48,7 +48,7 @@ The application execution command line is as below: .. code-block:: console - ./qos_meter [EAL options] -- -p PORTMASK + ./dpdk-qos_meter [EAL options] -- -p PORTMASK The application is constrained to use a single core in the EAL core mask and 2 ports only in the application port mask (first port from the port mask is used for RX and the other port in the core mask is used for TX). diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..801f5e1286 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,8 +42,8 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, - which can be done by changing the configuration file for the specific target to be compiled. + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the relevant + entry in the ``config/rte_config.h`` file. Running the Application ----------------------- @@ -57,7 +57,7 @@ The application has a number of command line options: .. code-block:: console - ./qos_sched [EAL options] -- <APP PARAMS> + ./<build_dir>/examples/dpdk-qos_sched [EAL options] -- <APP PARAMS> Mandatory application parameters include: @@ -315,7 +315,7 @@ The following is an example command with a single packet flow configuration: .. code-block:: console - ./qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg This example uses a single packet flow configuration which creates one RX thread on lcore 5 reading from port 3 and a worker thread on lcore 7 writing to port 2. @@ -324,7 +324,7 @@ Another example with 2 packet flow configurations using different ports but shar .. code-block:: console - ./qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg Note that independent cores for the packet flow configurations for each of the RX, WT and TX thread are also supported, providing flexibility to balance the work. diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..62d1f39d7e 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- @@ -40,7 +33,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/rxtx_callbacks -l 1 -n 4 -- [-t] + ./<build_dir>/examples/dpdk-rxtx_callbacks -l 1 -n 4 -- [-t] Use -t to enable hardware timestamping. If not supported by the NIC, an error will be displayed. diff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst index 12208f4258..f27d1ccfce 100644 --- a/doc/guides/sample_app_ug/server_node_efd.rst +++ b/doc/guides/sample_app_ug/server_node_efd.rst @@ -93,7 +93,7 @@ and the back-end node. The frontend server (server) has the following command line options:: - ./server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS + ./<build_dir>/examples/dpdk-server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS Where, diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..9202be6ea9 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -20,26 +20,9 @@ is application specific, and not a part of the service cores API. Compiling the Application ------------------------- -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make +The application is located in the ``service_cores`` sub-directory. Running the Application ----------------------- @@ -50,7 +33,7 @@ pass a service core-mask as an EAL argument at startup time. .. code-block:: console - $ ./build/service_cores + $ ./<build_dir>/examples/dpdk-service_cores Explanation diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 34f6f9aea7..263d8debc8 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -25,7 +25,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/basicfwd -l 1 -n 4 + ./<build_dir>/examples/dpdk-skeleton -l 1 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..86ced036ce 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,36 +90,17 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- -#. Go to the examples directory: +Run the tep_termination sample code: - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination - -#. Run the tep_termination sample code: - - .. code-block:: console +.. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- - -p 0x1 --dev-basename tep-termination --nb-devices 4 - --udp-port 4789 --filter-type 1 + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + -p 0x1 --dev-basename tep-termination --nb-devices 4 + --udp-port 4789 --filter-type 1 .. note:: @@ -139,7 +120,7 @@ The default value is 2. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 **Tunneling UDP port.** @@ -149,7 +130,7 @@ The default value is 4789. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 **Filter Type.** @@ -160,7 +141,7 @@ The default value is 1, which means the filter type of inner MAC and tenant ID i .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 --filter-type 1 **TX Checksum.** @@ -170,7 +151,7 @@ The default value is 0, which means the checksum offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --tx-checksum **TCP segment size.** @@ -180,7 +161,7 @@ The default value is 0, which means TSO offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --tx-checksum --tso-segsz 800 **Decapsulation option.** @@ -190,7 +171,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --decap 1 **Encapsulation option.** @@ -200,7 +181,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --encap 1 diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..d57d08fb2c 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/<build_dir>/app`` directory. Running the Application @@ -45,7 +45,7 @@ The application execution command line is: .. code-block:: console - ./test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE + ./dpdk-test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE The -c or -l EAL CPU coremask/corelist option has to contain exactly 3 CPU cores. The first CPU core in the core mask is assigned for core A, the second for core B and the third for core C. diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index 98d762d238..94cee9819d 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -21,7 +21,7 @@ To run the example in linux environment: .. code-block:: console - $ ./build/timer -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-timer -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index d66a724827..a8bedbab53 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -29,7 +29,7 @@ Start the vdpa example .. code-block:: console - ./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + ./dpdk-vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] where @@ -51,7 +51,7 @@ Take IFCVF driver for example: .. code-block:: console - ./vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ + ./dpdk-vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ -w 0000:06:00.3,vdpa=1 -w 0000:06:00.4,vdpa=1 \ -- --interactive diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..bacf7898f9 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -38,7 +38,7 @@ Start the vswitch example .. code-block:: console - ./vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ + ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ -- --socket-file /tmp/sock0 --client \ ... @@ -78,13 +78,13 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. .. code-block:: console - ./x86_64-native-gcc/app/testpmd -l 0-1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-1 -- -i > start tx_first Inject packets @@ -192,11 +192,6 @@ Common Issues max queue number is larger than 128, device start will fail due to insufficient mbuf. - Change the default number to make it work as below, just set the number - according to the NIC's property. :: - - make EXTRA_CFLAGS="-DMAX_QUEUES=320" - * Option "builtin-net-driver" is incompatible with QEMU QEMU vhost net device start will fail if protocol feature is not negotiated. diff --git a/doc/guides/sample_app_ug/vhost_blk.rst b/doc/guides/sample_app_ug/vhost_blk.rst index 681de6f3e1..788eef0d5f 100644 --- a/doc/guides/sample_app_ug/vhost_blk.rst +++ b/doc/guides/sample_app_ug/vhost_blk.rst @@ -36,7 +36,7 @@ Start the vhost_blk example .. code-block:: console - ./vhost_blk -m 1024 + ./dpdk-vhost_blk -m 1024 .. _vhost_blk_app_run_vm: diff --git a/doc/guides/sample_app_ug/vhost_crypto.rst b/doc/guides/sample_app_ug/vhost_crypto.rst index bbc25bde1c..7ae7addac4 100644 --- a/doc/guides/sample_app_ug/vhost_crypto.rst +++ b/doc/guides/sample_app_ug/vhost_crypto.rst @@ -28,7 +28,7 @@ Start the vhost_crypto example .. code-block:: console - ./vhost_crypto [EAL options] -- + ./dpdk-vhost_crypto [EAL options] -- --config (lcore,cdev-id,queue-id)[,(lcore,cdev-id,queue-id)] --socket-file lcore,PATH [--zero-copy] diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..35afdac63f 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -274,7 +271,7 @@ than the EAL options: .. code-block:: console - ./build/vm_power_mgr [EAL options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] The application requires exactly two cores to run. One core for the CLI and the other for the channel endpoint monitor. For example, to run on @@ -282,7 +279,7 @@ cores 0 and 1 on a system with four memory channels, issue the command: .. code-block:: console - ./build/vm_power_mgr -l 0-1 -n 4 + ./<build_dir>/examples/dpdk-vm_power_mgr -l 0-1 -n 4 After successful initialization, the VM Power Manager CLI prompt appears: @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -515,14 +509,14 @@ The standard EAL command line parameters are necessary: .. code-block:: console - ./build/vm_power_mgr [EAL options] -- [guest options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] -- [guest options] The guest example uses a channel for each lcore enabled. For example, to run on cores 0, 1, 2 and 3: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 .. _sending_policy: @@ -593,7 +587,7 @@ host, use a command like the following: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: @@ -707,7 +701,7 @@ To start the application and configure the power policy, and send it to the host .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c908074eb0 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,13 +26,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss + ./<build_dir>/examples/dpdk-vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss where, NP can be 16 or 32, TC can be 4 or 8, rss is disabled by default. @@ -72,7 +72,7 @@ To run the example in a linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index e9bca8c98c..6fbd333a51 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,13 +24,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_app [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss + ./<build_dir>/examples/dpdk-vmdq [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss where, NP can be 8, 16 or 32, rss is disabled by default. @@ -56,7 +56,7 @@ To run the example in a Linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_app -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index e2539f693f..83167e4d0e 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the previous section, with .. code-block:: console - sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 + sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 The command line options are: @@ -59,13 +59,13 @@ The command line options are: * ``--nb-cores=N`` Set the number of forwarding cores, - where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the configuration file. + where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the configuration file. The default value is 1. * ``--nb-ports=N`` Set the number of forwarding ports, - where 1 <= N <= "number of ports" on the board or ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` from the configuration file. The default value is the number of ports on the board. * ``--coremask=0xXX`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 72bdb1be43..47e39b30c0 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command .. code-block:: console - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt Interactive-mode selected CLI commands to be read from /home/ubuntu/flow-create-commands.txt Configuring Port 0 (socket 0) @@ -336,7 +336,7 @@ The available information categories are: * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. +* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. * ``noisy``: Noisy neighbor simulation. Simulate more realistic behavior of a guest machine engaged in receiving @@ -386,11 +386,6 @@ Example for the io forwarding engine, with some packet drops on the tx side:: TX-packets: 548595568 TX-dropped: 128 TX-total: 548595696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. note:: - - Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" stats, like: - - CPU cycles/packet=xx.dd (total cycles=xxxx / total RX packets=xxxx) at xxx MHz clock clear fwd ~~~~~~~~~ -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 10/14] doc: remove references to make from app guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 10/14] doc: remove references to make from app guides Ciara Power @ 2020-10-09 12:23 ` Ferruh Yigit 0 siblings, 0 replies; 300+ messages in thread From: Ferruh Yigit @ 2020-10-09 12:23 UTC (permalink / raw) To: Ciara Power, dev Cc: Nicolas Chautru, Olivier Matz, David Hunt, Harry van Haaren, Marko Kovacevic, Bernard Iremonger, Ori Kam, Bruce Richardson, Konstantin Ananyev, Cristian Dumitrescu, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, John McNamara, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Wenzhuo Lu, Beilei Xing On 10/9/2020 11:21 AM, Ciara Power wrote: > While make has been deprecated for DPDK, it's still applicable for > some example apps to be built standalone, this patch adjusts the > guides to take that into consideration. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> > > --- > v6: Modified commit log based on suggestions on v5. For kernel_nic_interface.rst, Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 11/14] doc: remove reference to make from tools guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (9 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 10/14] doc: remove references to make from app guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-11 20:45 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 12/14] doc: remove references to make from contributing guide Ciara Power ` (2 subsequent siblings) 13 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Nicolas Chautru, Declan Doherty, Reshma Pattan, Maryam Tahhan, Jerin Jacob Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- v6: - Fixed indentation for testbbdev list entry. v5: - Reworded sentence in pdump doc. - Replaced references to testbbdev binary with dpdk-test-bbdev. - Fixed links to linux_gsg doc. --- doc/guides/tools/comp_perf.rst | 10 ++------ doc/guides/tools/cryptoperf.rst | 20 +++------------- doc/guides/tools/pdump.rst | 15 +++++------- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 38 +++++++++---------------------- doc/guides/tools/testeventdev.rst | 21 ++++++++--------- 6 files changed, 32 insertions(+), 74 deletions(-) diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst index ee585d1024..269d7bdc9d 100644 --- a/doc/guides/tools/comp_perf.rst +++ b/doc/guides/tools/comp_perf.rst @@ -100,13 +100,7 @@ Application Options Compiling the Tool ------------------ -**Step 1: PMD setting** - -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which -can be disabled by default in the build configuration file ``common_base``. -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: - - CONFIG_RTE_LIBRTE_PMD_ISAL=y +See :doc:`../linux_gsg/build_dpdk` for compilation steps. Running the Tool @@ -116,5 +110,5 @@ The tool has a number of command line options. Here is the sample command line: .. code-block:: console - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index 28b729dbda..8aa8272c71 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum throughput. Compiling the Application ------------------------- -**Step 1: PMD setting** -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The crypto device drivers PMD which should be tested can be enabled by setting:: - - CONFIG_RTE_LIBRTE_PMD_<name>=y - -Setting example for open ssl PMD:: - - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y - -**Step 2: Linearization setting** +**Step 1: Linearization setting** It is possible linearized input segmented packets just before crypto operation for devices which doesn't support scatter-gather, and allows to measure @@ -56,13 +45,10 @@ To set on the linearization options add below definition to the #define CPERF_LINEARIZATION_ENABLE -**Step 3: Build the application** +**Step 2: Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-crypto-perf`` application. +See :doc:`../linux_gsg/build_dpdk` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 8a499c6c5b..6f9bd77ab1 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports framework initialization code. Refer ``app/test-pmd/testpmd.c`` code to see how this is done. - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled - by default in the build configuration files, - owing to an external dependency on the libpcap development files - which must be installed on the board. - Once the libpcap development files are installed, the libpcap based PMD - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool depends on DPDK pcap PMD, so the system should + have libpcap development files installed and the pcap PMD not disabled + in the build. * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when the primary application exits. @@ -37,7 +34,7 @@ The tool has a number of command line options: .. code-block:: console - ./build/app/dpdk-pdump -- + ./<build_dir>/app/dpdk-pdump -- [--multi] --pdump '(port=<port id> | device_id=<pci id or vdev name>), (queue=<queue_id>), @@ -120,5 +117,5 @@ Example .. code-block:: console - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 0390b9c589..9772d97ef0 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,7 +17,7 @@ The application has a number of command line options: .. code-block:: console - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 9969231451..03f23277c0 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -13,25 +13,10 @@ parameters passed to a python running script. Compiling the Application ------------------------- -**Step 1: PMD setting** +**Build the application** -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The bbdevice drivers PMD which should be tested can be enabled by setting +See :doc:`../linux_gsg/build_dpdk` for compilation steps. - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` - -Setting example for (*baseband_turbo_sw*) PMD - - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` - -**Step 2: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-bbdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -60,7 +45,7 @@ The following are the command-line options: ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` Indicates the path to the bbdev test app. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with "*/build/app/testbbdev*". + on "../.." concatenated with "*/build/app/dpdk-test-bbdev*". ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` Specifies EAL arguments which are passed to the test app. For more details, @@ -82,9 +67,8 @@ The following are the command-line options: ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR [TEST_VECTOR ...]`` Specifies paths to the test vector files. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default - data file. + on "../.." concatenated with "*/app/test-bbdev/test_vectors/bbdev_null.data*" + and indicates default data file. **Example usage:** @@ -259,8 +243,8 @@ They are chosen to have a good coverage across sizes and processing parameters while still keeping their number limited as part of sanity regression. -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linux-icc target: +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output +to the build directory: :: @@ -268,16 +252,16 @@ x86_64-native-linux-icc target: |-- test-bbdev |-- test_vectors - |-- x86_64-native-linux-icc + |-- build |-- app - |-- testbbdev + |-- dpdk-test-bbdev All bbdev devices ~~~~~~~~~~~~~~~~~ .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -291,7 +275,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/* -n 64 -b 8 32 diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst index 2ed67a6340..1127036bb5 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -15,11 +15,8 @@ Compiling the Application **Build the application** -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-eventdev`` application. +See :doc:`../linux_gsg/build_dpdk` for compilation steps. -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. The user must have all libraries, modules, updates and compilers installed in the system prior to this, as described in the earlier chapters in this Getting Started Guide. @@ -251,7 +248,7 @@ Example command to run order queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ --test=order_queue --plcores 1 --wlcores 2,3 @@ -314,7 +311,7 @@ Example command to run order ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=order_atq --plcores 1 --wlcores 2,3 @@ -414,7 +411,7 @@ Example command to run perf queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf queue test with ethernet ports: @@ -428,7 +425,7 @@ Example command to run perf queue test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ --prod_type_timerdev --fwd_latency @@ -514,14 +511,14 @@ Example command to run perf ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf ``all types queue`` test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ --stlist=a --prod_type_timerdev --fwd_latency @@ -633,7 +630,7 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a @@ -725,5 +722,5 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 11/14] doc: remove reference to make from tools guides 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 11/14] doc: remove reference to make from tools guides Ciara Power @ 2020-10-11 20:45 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-11 20:45 UTC (permalink / raw) To: Ciara Power Cc: dev, Kevin Laatz, Nicolas Chautru, Declan Doherty, Reshma Pattan, Maryam Tahhan, Jerin Jacob 09/10/2020 12:21, Ciara Power: > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> > > --- > v6: > - Fixed indentation for testbbdev list entry. > v5: > - Reworded sentence in pdump doc. > - Replaced references to testbbdev binary with dpdk-test-bbdev. > - Fixed links to linux_gsg doc. > --- > doc/guides/tools/comp_perf.rst | 10 ++------ > doc/guides/tools/cryptoperf.rst | 20 +++------------- > doc/guides/tools/pdump.rst | 15 +++++------- > doc/guides/tools/proc_info.rst | 2 +- > doc/guides/tools/testbbdev.rst | 38 +++++++++---------------------- > doc/guides/tools/testeventdev.rst | 21 ++++++++--------- > 6 files changed, 32 insertions(+), 74 deletions(-) > > diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst > index ee585d1024..269d7bdc9d 100644 > --- a/doc/guides/tools/comp_perf.rst > +++ b/doc/guides/tools/comp_perf.rst > @@ -100,13 +100,7 @@ Application Options > Compiling the Tool > ------------------ > > -**Step 1: PMD setting** > - > -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which > -can be disabled by default in the build configuration file ``common_base``. > -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: > - > - CONFIG_RTE_LIBRTE_PMD_ISAL=y > +See :doc:`../linux_gsg/build_dpdk` for compilation steps. Funnily there was only one step in this section. I don't see any benefit of referencing how to compile on Linux everywhere. I think it would be better to just drop the whole section about compilation. > Running the Tool [...] > --- a/doc/guides/tools/cryptoperf.rst > +++ b/doc/guides/tools/cryptoperf.rst > @@ -33,19 +33,8 @@ the hardware accelerator fully loaded and so measure maximum throughput. > Compiling the Application > ------------------------- > > -**Step 1: PMD setting** > > -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which > -are disabled by default in the build configuration file ``common_base``. > -The crypto device drivers PMD which should be tested can be enabled by setting:: > - > - CONFIG_RTE_LIBRTE_PMD_<name>=y > - > -Setting example for open ssl PMD:: > - > - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y > - > -**Step 2: Linearization setting** > +**Step 1: Linearization setting** > > It is possible linearized input segmented packets just before crypto operation > for devices which doesn't support scatter-gather, and allows to measure > @@ -56,13 +45,10 @@ To set on the linearization options add below definition to the > > #define CPERF_LINEARIZATION_ENABLE > > -**Step 3: Build the application** > +**Step 2: Build the application** > > -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the > -``dpdk-test-crypto-perf`` application. > +See :doc:`../linux_gsg/build_dpdk` for compilation steps. > > -Initially, the user must select a DPDK target to choose the correct target type > -and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed > in the system prior to this, > as described in the earlier chapters in this Getting Started Guide. Same here, I would keep only the "Linearization setting". > --- a/doc/guides/tools/testbbdev.rst > +++ b/doc/guides/tools/testbbdev.rst > @@ -13,25 +13,10 @@ parameters passed to a python running script. > Compiling the Application > ------------------------- > > -**Step 1: PMD setting** > +**Build the application** > > -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which > -are disabled by default in the build configuration file ``common_base``. > -The bbdevice drivers PMD which should be tested can be enabled by setting > +See :doc:`../linux_gsg/build_dpdk` for compilation steps. > > - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` > - > -Setting example for (*baseband_turbo_sw*) PMD > - > - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` > - > -**Step 2: Build the application** > - > -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the > -``dpdk-test-bbdev`` application. > - > -Initially, the user must select a DPDK target to choose the correct target type > -and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed > in the system prior to this, as described in the earlier chapters in this > Getting Started Guide. Same here, there is no value in repeating these obvious considerations about compilation. [...] > --- a/doc/guides/tools/testeventdev.rst > +++ b/doc/guides/tools/testeventdev.rst > @@ -15,11 +15,8 @@ Compiling the Application > > **Build the application** > > -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the > -``dpdk-test-eventdev`` application. > +See :doc:`../linux_gsg/build_dpdk` for compilation steps. > > -Initially, the user must select a DPDK target to choose the correct target type > -and compiler options to use when building the libraries. > The user must have all libraries, modules, updates and compilers installed > in the system prior to this, > as described in the earlier chapters in this Getting Started Guide. Same here ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 12/14] doc: remove references to make from contributing guide 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (10 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 11/14] doc: remove reference to make from tools guides Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-11 20:52 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 13/14] doc: add to release notes to reflect removal of make Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 14/14] doc: update patch cheatsheet to use meson Ciara Power 13 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Louise Kilheeney Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> --- v5: - Removed reference to test-build.sh used for Make. - Added point back in for handling specific code, reworded as necessary. - Added library statistics section, removing only the mention of CONFIG options. --- doc/guides/contributing/design.rst | 41 ++++++++--------------- doc/guides/contributing/documentation.rst | 31 ++++------------- doc/guides/contributing/patches.rst | 6 ++-- 3 files changed, 23 insertions(+), 55 deletions(-) diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..3e24dc1c7b 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,25 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. - In this case, the code is split into two separate files that are architecture or environment specific. - This should only apply inside the EAL library. - -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. +* Use build definition macros and conditions in the Meson build file. This is done when the differences + are more significant. In this case, the code is split into two separate files that are architecture + or environment specific. This should only apply inside the EAL library. Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -87,22 +82,14 @@ requirements for preventing ABI changes when implementing statistics. Mechanism to allow the application to turn library statistics on and off ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are +Having runtime support for enabling/disabling library statistics is recommended, +as build-time options should be avoided. However, if build-time options are used, +for example as in the table library, the options can be set using c_args. +When this flag is set, all the counters supported by current library are collected for all the instances of every object type provided by the library. When this flag is cleared, none of the counters supported by the current library are collected for any instance of any object type provided by the library: -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - Prevention of ABI changes due to library statistics support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index be985e6cf8..fd73e6538b 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -218,25 +218,14 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: +To enable doc building:: - make doc + meson configure -Denable_docs=true -* Generate the Doxygen API documentation in Html:: +See :doc:`../linux_gsg/build_dpdk` for more detail on compiling DPDK with meson. - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -251,10 +240,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -304,7 +289,7 @@ Line Length Long literal command lines can be shown wrapped with backslashes. For example:: - testpmd -l 2-3 -n 4 \ + dpdk-testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ --txd=1024 --rxd=1024 @@ -456,7 +441,7 @@ Code and Literal block sections For long literal lines that exceed that limit try to wrap the text at sensible locations. For example a long command line could be documented like this and still work if copied directly from the docs:: - build/app/testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ + ./<build_dir>/app/dpdk-testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ --vdev=net_pcap1,iface=eth1 \ -- -i --nb-cores=2 --nb-ports=2 \ --total-num-mbufs=2048 @@ -739,9 +724,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 9ff60944c3..9fa5a79c85 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -486,9 +486,9 @@ By default, ABI compatibility checks are disabled. To enable them, a reference version must be selected via the environment variable ``DPDK_ABI_REF_VERSION``. -The ``devtools/test-build.sh`` and ``devtools/test-meson-builds.sh`` scripts -then build this reference version in a temporary directory and store the -results in a subfolder of the current working directory. +The ``devtools/test-meson-builds.sh`` script then build this reference version +in a temporary directory and store the results in a subfolder of the current +working directory. The environment variable ``DPDK_ABI_REF_DIR`` can be set so that the results go to a different location. -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v6 12/14] doc: remove references to make from contributing guide 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 12/14] doc: remove references to make from contributing guide Ciara Power @ 2020-10-11 20:52 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-11 20:52 UTC (permalink / raw) To: Ciara Power; +Cc: dev, Louise Kilheeney 09/10/2020 12:21, Ciara Power: > - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. > - This is only needed in Makefiles or shell scripts. > +* Use build definition macros and conditions in the Meson build file. This is done when the differences > + are more significant. In this case, the code is split into two separate files that are architecture > + or environment specific. This should only apply inside the EAL library. When writing new sentences, it's better splitting lines after a punctuation, preferably the end of a sentence. > Per Architecture Sources > ~~~~~~~~~~~~~~~~~~~~~~~~ > > -The following config options can be used: > +The following macro options can be used: > > -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. > -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. > +* ``RTE_ARCH`` is a string that contains the name of the architecture. > +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32`` or ``RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. This is out of date. Arm is notably missing. > Per Execution Environment Sources > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > -The following config options can be used: > +The following macro options can be used: > > -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. > -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. > +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. > +* ``RTE_EXEC_ENV_FREEBSD`` or ``RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. This is out of date. Windows is missing. [...] > -* Generate all the documentation targets:: > +To enable doc building:: > > - make doc > + meson configure -Denable_docs=true No need of this option. "ninja -C build doc" works even without it. ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 13/14] doc: add to release notes to reflect removal of make 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (11 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 12/14] doc: remove references to make from contributing guide Ciara Power @ 2020-10-09 10:21 ` Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 14/14] doc: update patch cheatsheet to use meson Ciara Power 13 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Ciara Power Added an entry to describe the removal of the Make build system to the release notes for 20.11. Signed-off-by: Ciara Power <ciara.power@intel.com> --- v6: - Fixed spelling in commit log. - Fixed formatting of release note entry to be split logically. --- doc/guides/rel_notes/release_20_11.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index 808bdc4e54..acca7ce274 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -156,6 +156,10 @@ Removed Items * Removed Python 2 support since it was EOL'd in January 2020. +* build: Support for the Make build system was removed for compiling DPDK, + Meson is now the primary build system. + Sample applications can still be built with Make standalone, using pkg-config. + API Changes ----------- -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v6 14/14] doc: update patch cheatsheet to use meson 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power ` (12 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 13/14] doc: add to release notes to reflect removal of make Ciara Power @ 2020-10-09 10:21 ` Ciara Power 13 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-09 10:21 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> With 'make' being removed, the patch cheatsheet needs to be updated to remove any references to 'make'. These references have been replaced with meson alternatives in this patch. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- .../contributing/img/patch_cheatsheet.svg | 582 ++++++++---------- 1 file changed, 270 insertions(+), 312 deletions(-) diff --git a/doc/guides/contributing/img/patch_cheatsheet.svg b/doc/guides/contributing/img/patch_cheatsheet.svg index 85225923e1..986e4db815 100644 --- a/doc/guides/contributing/img/patch_cheatsheet.svg +++ b/doc/guides/contributing/img/patch_cheatsheet.svg @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -13,7 +11,7 @@ width="210mm" height="297mm" id="svg2985" - inkscape:version="0.48.4 r9939" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" sodipodi:docname="patch_cheatsheet.svg"> <sodipodi:namedview pagecolor="#ffffff" @@ -24,17 +22,19 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1184" - inkscape:window-height="1822" + inkscape:window-width="1920" + inkscape:window-height="1017" id="namedview274" showgrid="false" - inkscape:zoom="1.2685914" - inkscape:cx="289.93958" - inkscape:cy="509.84194" - inkscape:window-x="0" - inkscape:window-y="19" - inkscape:window-maximized="0" - inkscape:current-layer="g3272" /> + inkscape:zoom="0.89702958" + inkscape:cx="246.07409" + inkscape:cy="416.76022" + inkscape:window-x="1072" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + inkscape:snap-grids="false" /> <defs id="defs3"> <linearGradient @@ -549,347 +549,336 @@ </g> </switch> <g - transform="matrix(0.89980358,0,0,0.89980358,45.57817,-2.8793563)" + transform="matrix(0.89980358,0,0,0.89980358,57.57817,-2.8793563)" id="g4009"> <text x="325.02054" y="107.5126" id="text3212" xml:space="preserve" - style="font-size:43.11383057px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:43.1138px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none" transform="scale(1.193782,0.83767389)"><tspan x="325.02054" y="107.5126" - id="tspan3214">CHEATSHEET</tspan></text> + id="tspan3214" + style="font-family:monospace">CHEATSHEET</tspan></text> <text x="386.51117" y="58.178116" transform="scale(1.0054999,0.99453018)" id="text3212-1" xml:space="preserve" - style="font-size:42.11373901px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:42.1137px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="386.51117" y="58.178116" - id="tspan3214-7">PATCH SUBMIT</tspan></text> + id="tspan3214-7" + style="font-family:monospace">PATCH SUBMIT</tspan></text> </g> <rect - width="714.94495" - height="88.618027" - rx="20.780111" - ry="15.96909" - x="14.574773" - y="7.0045133" + width="759.50977" + height="88.591248" + rx="22.075403" + ry="15.964265" + x="14.588161" + y="7.0179014" id="rect3239" - style="fill:none;stroke:#00233b;stroke-width:0.87678075;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.903557;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="713.28113" - height="887.29156" - rx="17.656931" - ry="17.280584" - x="15.406689" - y="104.73515" + width="757.84167" + height="887.2605" + rx="18.760006" + ry="17.27998" + x="15.422211" + y="104.75068" id="rect3239-0" - style="fill:none;stroke:#00233b;stroke-width:1.00973284;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.04078;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="694.94904" - height="381.31" - rx="9.4761629" - ry="9.0904856" - x="24.336016" - y="601.75836" + width="732.82446" + height="381.28253" + rx="9.9926233" + ry="9.0898304" + x="24.349754" + y="601.77209" id="rect3239-0-9-4" - style="fill:none;stroke:#00233b;stroke-width:1.02322531;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.0507;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - d="m 386.3921,327.23442 323.14298,0" + d="M 422.0654,327.23442 H 709.53508" id="path4088" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:0.943189px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <text - x="396.18015" + x="428.18015" y="314.45731" id="text4090" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="396.18015" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="428.18015" y="314.45731" id="tspan4092" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Patch Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Patch Pre-Checks</tspan></text> <text x="43.44949" y="147.32129" id="text4090-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.44949" y="147.32129" id="tspan4092-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Commit Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Commit Pre-Checks</tspan></text> <text - x="397.1235" + x="429.1235" y="144.8549" id="text4090-4-3" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="397.1235" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="429.1235" y="144.8549" id="tspan4092-3-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Bugfix?</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Bugfix?</tspan></text> <text x="41.215897" y="634.38617" id="text4090-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="41.215897" y="634.38617" id="tspan4092-38" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Git send-email </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Git send-email </tspan></text> <path d="m 31.232443,642.80575 376.113467,0" id="path4088-7" style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" inkscape:connector-curvature="0" /> <rect - width="342.13785" - height="230.74609" - rx="10.411126" - ry="10.411126" - x="25.418407" - y="114.92036" + width="376.65033" + height="230.70007" + rx="11.461329" + ry="10.40905" + x="25.441414" + y="114.94337" id="rect3239-0-9-4-2" - style="fill:none;stroke:#00233b;stroke-width:0.93674862;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.982762;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="43.44949" y="385.8045" id="text4090-86" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.44949" y="385.8045" id="tspan4092-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Compile Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Compile Pre-Checks</tspan></text> <g - transform="translate(352.00486,-348.25973)" + transform="matrix(1.0077634,0,0,1,384.57109,-348.25973)" id="g3295"> <text x="43.87738" y="568.03088" id="text4090-8-14" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="568.03088" id="tspan4289" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Include warning/error</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Include warning/error</tspan></text> <text x="43.87738" y="537.71906" id="text4090-8-14-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="537.71906" id="tspan4289-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Fixes: line</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Fixes: line</tspan></text> <text x="43.87738" y="598.9939" id="text4090-8-14-0" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="598.9939" id="tspan4289-2" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ How to reproduce</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ How to reproduce</tspan></text> </g> <g - transform="translate(-2.6258125,-26.708615)" + transform="matrix(0.88614399,0,0,1.0199334,-5.7864591,-38.84504)" id="g4115"> <g id="g3272"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1" y="454.36987" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7" y="454.36987" x="49.093246">+ build gcc icc clang </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + xml:space="preserve" + id="text581" + y="454.36987" + x="49.093246" /> + <text + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2" y="516.59979" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79" y="516.59979" - x="49.093246">+ make test doc </tspan></text> + x="49.093246">+ meson -Denable_docs=true</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-0" y="544.71033" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-0" y="544.71033" - x="49.093246">+ make examples</tspan></text> + x="49.093246">+ meson -Dexamples=all</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-07" y="576.83533" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-3" y="576.83533" - x="49.093246">+ make shared-lib</tspan></text> + x="49.093246" + transform="matrix(1.0305467,0,0,1,-1.5447426,0)">+ meson -Ddefault_library=shared</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-07-4" y="604.88947" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-3-9" y="604.88947" x="49.093246">+ library ABI version</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-9" y="486.56659" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-3" y="486.56659" x="49.093246">+ build 32 and 64 bits</tspan></text> </g> </g> <text - x="74.388756" - y="914.65686" + x="72.598656" + y="937.21002" id="text4090-8-1-8-65-9" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.2959px;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02466" + transform="scale(1.0246575,0.97593587)"><tspan sodipodi:role="line" id="tspan3268" - x="74.388756" - y="914.65686">git send-email *.patch --annotate --to <maintainer></tspan><tspan + x="72.598656" + y="937.21002" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466">git send-email *.patch --annotate --to <maintainer></tspan><tspan sodipodi:role="line" id="tspan3272" - x="74.388756" - y="938.40686"> --cc dev@dpdk.org [ --cc other@participants.com</tspan><tspan + x="72.598656" + y="961.54565" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466"> --cc dev@dpdk.org [ --cc other@participants.com</tspan><tspan sodipodi:role="line" - x="74.388756" - y="962.15686" - id="tspan3266"> --cover-letter -v[N] --in-reply-to <message ID> ]</tspan></text> + x="72.598656" + y="985.88129" + id="tspan3266" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466"> --cover-letter -v[N] --in-reply-to <message ID> ]</tspan></text> <text x="543.47675" y="1032.3459" id="text4090-8-7-8-7-6-3-8-2-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="543.47675" y="1032.3459" id="tspan4092-8-6-3-1-8-4-4-5-3" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">harry.van.haaren@intel.com</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">harry.van.haaren@intel.com</tspan></text> <rect - width="678.14105" - height="87.351799" - rx="6.7972355" - ry="6.7972355" - x="31.865864" - y="888.44696" + width="711.56055" + height="87.327599" + rx="7.1322103" + ry="6.795352" + x="31.877964" + y="888.45905" id="rect3239-0-9-4-3" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.0242;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="543.29498" y="1018.1843" id="text4090-8-7-8-7-6-3-8-2-5-3" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="543.29498" y="1018.1843" id="tspan4092-8-6-3-1-8-4-4-5-3-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Suggestions / Updates?</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Suggestions / Updates?</tspan></text> <g id="g3268" transform="translate(0,-6)"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8" y="704.07019" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6" y="704.07019" x="41.658669">+ Patch version ( eg: -v2 ) </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-0" y="736.29175" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-2" y="736.29175" x="41.658669">+ Patch version annotations</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-6" y="766.70355" x="41.911205"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-1" y="766.70355" x="41.911205">+ Send --to maintainer </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-6-3" y="795.30548" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-1-8" y="795.30548" x="41.658669">+ Send --cc dev@dpdk.org </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-9" y="675.25287" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-9" y="675.25287" x="41.658669">+ Cover letter</tspan></text> @@ -897,73 +886,70 @@ id="g3303" transform="translate(1.0962334,-40.034939)"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-65" y="868.70337" x="41.572586"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-10" y="868.70337" x="41.572586">+ Send --in-reply-to <message ID><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:20px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan3184" /></tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-9-1" y="855.79816" x="460.18405"><tspan - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-9-7" y="855.79816" x="460.18405">****</tspan></text> </g> </g> <text - x="685.67828" + x="697.67828" y="76.55056" id="text4090-8-1-8-9-1-9" xml:space="preserve" - style="font-size:20.20989037px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="685.67828" + style="font-style:normal;font-weight:normal;font-size:20.2099px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="697.67828" y="76.55056" id="tspan4092-8-7-6-9-7-4" - style="font-size:9.09445095px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">v1.0</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:9.09445px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">v2.0</tspan></text> <rect - width="342.3053" - height="155.54948" - rx="9.2344503" - ry="9.2344503" - x="377.58942" - y="114.55766" + width="347.40179" + height="155.50351" + rx="9.3719397" + ry="9.2317209" + x="412.60239" + y="114.58065" id="rect3239-0-9-4-2-1" - style="fill:none;stroke:#00233b;stroke-width:0.76930124;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.774892;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="342.12564" - height="236.79482" - rx="10.647112" - ry="9.584527" - x="25.642178" - y="356.86249" + width="377.75555" + height="234.52185" + rx="11.755931" + ry="9.4925261" + x="25.663876" + y="356.88416" id="rect3239-0-9-4-2-0" - style="fill:none;stroke:#00233b;stroke-width:0.9489302;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.99232;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="341.98428" - height="312.73181" - rx="8.5358429" - ry="8.5358429" - x="377.96762" - y="280.45331" + width="343.53604" + height="312.67508" + rx="8.5745735" + ry="8.5342941" + x="414.29037" + y="280.48166" id="rect3239-0-9-4-2-1-9" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.00217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - d="m 387.02742,157.3408 323.14298,0" + d="M 419.35634,157.3408 H 710.1704" id="path4088-8" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:0.94866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <path d="m 36.504486,397.33869 323.142974,0" @@ -971,9 +957,9 @@ style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <path - d="m 35.494337,156.92238 323.142983,0" + d="M 35.494337,156.92238 H 372.01481" id="path4088-4" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:1.02049px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <g transform="translate(1.0962334,-30.749225)" @@ -983,45 +969,41 @@ y="214.1572" id="text4090-8-11" xml:space="preserve" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="214.1572" id="tspan4092-8-52" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Signed-off-by: </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Signed-off-by: </tspan></text> <text x="45.371201" y="243.81795" id="text4090-8-7-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="243.81795" id="tspan4092-8-6-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Suggested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Suggested-by:</tspan></text> <text x="45.371201" y="273.90939" id="text4090-8-7-8-7" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="273.90939" id="tspan4092-8-6-3-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Reported-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Reported-by:</tspan></text> <text x="45.371201" y="304.00082" id="text4090-8-7-8-7-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="304.00082" id="tspan4092-8-6-3-1-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Tested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Tested-by:</tspan></text> <g id="g3297" transform="translate(1.1147904,-7.2461378)"> @@ -1030,110 +1012,102 @@ y="368.8187" id="text4090-8-7-8-7-6-3" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="368.8187" id="tspan4092-8-6-3-1-8-4" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Previous Acks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Previous Acks</tspan></text> <text x="235.24362" y="360.3028" id="text4090-8-1-8-9-1-4" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="235.24362" y="360.3028" id="tspan4092-8-7-6-9-7-0" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <text x="45.371201" y="334.52298" id="text4090-8-7-8-7-6-3-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="334.52298" id="tspan4092-8-6-3-1-8-4-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Commit message</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Commit message</tspan></text> </g> <rect width="295.87207" height="164.50136" rx="7.3848925" ry="4.489974" - x="414.80502" + x="444.80502" y="611.47064" id="rect3239-0-9-4-2-1-9-9" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text - x="439.4429" + x="469.4429" y="638.35608" id="text4090-1-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="439.4429" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="469.4429" y="638.35608" id="tspan4092-38-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Mailing List</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Mailing List</tspan></text> <text - x="431.55353" + x="461.55353" y="675.59857" id="text4090-8-5-6-9-4-6-6-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.55353" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.55353" y="675.59857" id="tspan4092-8-5-5-3-4-0-6-2" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Acked-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Acked-by:</tspan></text> <text - x="431.39734" + x="461.39734" y="734.18231" id="text4090-8-5-6-9-4-6-6-8-5" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.39734" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.39734" y="734.18231" id="tspan4092-8-5-5-3-4-0-6-2-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Reviewed-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Reviewed-by:</tspan></text> <text - x="450.8428" + x="480.8428" y="766.5578" id="text4090-8-5-6-9-4-6-6-8-7" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="450.8428" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="480.8428" y="766.5578" id="tspan4092-8-5-5-3-4-0-6-2-11" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Nack (refuse patch)</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Nack (refuse patch)</tspan></text> <path - d="m 426.99385,647.80575 272.72607,0" + d="M 456.99385,647.80575 H 729.71992" id="path4088-7-5" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" /> <path - d="m 424.7332,742.35699 272.72607,0" + d="M 454.7332,742.35699 H 727.45927" id="path4088-7-5-2" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" /> <text - x="431.39734" + x="461.39734" y="704.78278" id="text4090-8-5-6-9-4-6-6-8-5-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.39734" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.39734" y="704.78278" id="tspan4092-8-5-5-3-4-0-6-2-1-7" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Tested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Tested-by:</tspan></text> <g transform="translate(1.0962334,-2.7492248)" id="g3613"> @@ -1142,22 +1116,21 @@ y="1007.5879" id="text4090-8-7-8-7-6-3-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.146141" y="1007.5879" id="tspan4092-8-6-3-1-8-4-4" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">Previous Acks only when fixing typos, rebased, or checkpatch issues.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">Previous Acks only when fixing typos, rebased, or checkpatch issues.</tspan></text> <text x="30.942892" y="1011.3757" id="text4090-8-7-8-7-6-3-8-4-1" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1011.3757" id="tspan4092-8-6-3-1-8-4-4-55-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <g transform="translate(1.0962334,-2.7492248)" @@ -1167,35 +1140,34 @@ y="1020.4383" id="text4090-8-7-8-7-6-3-8-4" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.176418" y="1020.4383" id="tspan4092-8-6-3-1-8-4-4-55" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">The version.map function names must be in alphabetical order.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">The version.map function names must be in alphabetical order.</tspan></text> <text x="30.942892" y="1024.2014" id="text4090-8-7-8-7-6-3-8-4-1-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1024.2014" id="tspan4092-8-6-3-1-8-4-4-55-7-2" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.247679" y="1024.2014" id="text4090-8-7-8-7-6-3-8-4-1-5-6" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.247679" y="1024.2014" id="tspan4092-8-6-3-1-8-4-4-55-7-2-8" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <g - transform="translate(1.0962334,-30.749225)" + transform="matrix(1.0211743,0,0,1,25.427515,-30.749225)" id="g3275"> <g id="g3341"> @@ -1204,67 +1176,61 @@ y="390.17807" id="text4090-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="390.17807" id="tspan4092-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Rebase to git </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Rebase to git </tspan></text> <text x="394.78601" y="420.24835" id="text4090-8-5" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="420.24835" id="tspan4092-8-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Checkpatch </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Checkpatch </tspan></text> <text x="394.78601" y="450.53394" id="text4090-8-5-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="450.53394" id="tspan4092-8-5-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ ABI breakage </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ ABI breakage </tspan></text> <text x="394.78601" y="513.13031" id="text4090-8-5-6-9-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="513.13031" id="tspan4092-8-5-5-3-4" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Maintainers file</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Maintainers file</tspan></text> <text x="394.78601" y="573.48621" id="text4090-8-5-6-9-4-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="573.48621" id="tspan4092-8-5-5-3-4-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Release notes</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Release notes</tspan></text> <text x="395.79617" y="603.98718" id="text4090-8-5-6-9-4-6-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="395.79617" y="603.98718" id="tspan4092-8-5-5-3-4-0-6" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Documentation</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Documentation</tspan></text> <g transform="translate(0,-0.83470152)" id="g3334"> @@ -1276,24 +1242,22 @@ y="468.01297" id="text4090-8-1-8-9-1-4-1" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="660.46729" y="468.01297" id="tspan4092-8-7-6-9-7-0-7" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">**</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">**</tspan></text> </g> <text x="394.78601" y="483.59955" id="text4090-8-5-6-9" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="483.59955" id="tspan4092-8-5-5-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Update version.map</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Update version.map</tspan></text> </g> <g id="g3428" @@ -1303,12 +1267,11 @@ y="541.38928" id="text4090-8-5-6-9-4-6-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="541.38928" id="tspan4092-8-5-5-3-4-0-7" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Doxygen</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Doxygen</tspan></text> <g transform="translate(-119.92979,57.949844)" id="g3267-9"> @@ -1317,28 +1280,26 @@ y="473.13675" id="text4090-8-1-8-9-1-4-1-4" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="628.93628" y="473.13675" id="tspan4092-8-7-6-9-7-0-7-8" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">***</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">***</tspan></text> </g> </g> </g> </g> <text - x="840.1828" - y="234.34692" - transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + x="861.39557" + y="213.1337" + transform="rotate(45)" id="text4090-8-5-6-9-4-6-6-8-7-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="840.1828" - y="234.34692" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="861.39557" + y="213.1337" id="tspan4092-8-5-5-3-4-0-6-2-11-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+</tspan></text> <g transform="translate(1.0962334,-2.7492248)" id="g3595"> @@ -1347,42 +1308,41 @@ y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.247679" y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.247679" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="19.552465" y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2-7" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="19.552465" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="42.830166" y="1033.2393" id="text4090-8-7-8-7-6-3-8-4-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.830166" y="1033.2393" id="tspan4092-8-6-3-1-8-4-4-55-2" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">New header files must get a new page in the API docs.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">New header files must get a new page in the API docs.</tspan></text> </g> <g transform="translate(1.0962334,-2.7492248)" @@ -1392,52 +1352,51 @@ y="1046.0962" id="text4090-8-7-8-7-6-3-8-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.212418" y="1046.0962" id="tspan4092-8-6-3-1-8-4-4-5" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">Available from patchwork, or email header. Reply to Cover letters.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">Available from patchwork, or email header. Reply to Cover letters.</tspan></text> <text x="31.140535" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="31.140535" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-3" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.445322" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-5-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.445322" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-7-2" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="19.750109" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-7-1" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="19.750109" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9-6" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="14.016749" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-7-1-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="14.016749" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9-6-5" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <rect width="196.44218" @@ -1449,36 +1408,35 @@ id="rect3239-0-9-4-2-1-9-9-7" style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <rect - width="678.43036" - height="43.497677" - rx="7.8557949" - ry="6.7630997" - x="31.274473" - y="836.69745" + width="710.73767" + height="43.476074" + rx="8.2298937" + ry="6.7597408" + x="31.285275" + y="836.70825" id="rect3239-0-9-4-3-6" - style="fill:none;stroke:#00233b;stroke-width:0.92794865;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.949551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="73.804535" y="864.28137" id="text4090-8-1-8-65-9-1" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan sodipodi:role="line" x="73.804535" y="864.28137" - id="tspan3266-8">git format-patch -[N]</tspan></text> + id="tspan3266-8" + style="font-size:19px;line-height:1.25;font-family:monospace">git format-patch -[N]</tspan></text> <text x="342.70221" y="862.83478" id="text4090-8-1-8-65-9-1-7" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan sodipodi:role="line" x="342.70221" y="862.83478" id="tspan3266-8-2" - style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">// creates .patch files for final review</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">// creates .patch files for final review</tspan></text> </g> </svg> -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power ` (24 preceding siblings ...) 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 01/14] doc: remove references to make from platforms guides Ciara Power ` (14 more replies) 25 siblings, 15 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power This patchset includes the remaining 14 patches that were not merged along with the others in v4/v5, pending rework and more review. *All*, please make the documentation update your highest priority. v7: - Merged some changes from patch [3] for platform/octeontx.rst. - Rebased onto main and fixed conflicts. - Added config option for mempool/octeontx.rst that was incorrectly removed in previous versions. - Fixed comments on v6. v6: - Rebased onto main and fixed conflicts. - Fixed some formatting and indentation. - Reworded some commit logs and fixed spellings. v5: - Added patch to update cheatsheet. - Added patch to update release notes. - Fixed outstanding comments on v3/v4. v4: rearrange commits and fix as commented v3: Fixed comments on v2. v2: - Fixed comments on v1. - Removed additional make references. - Added some meson replacements where necessary. - Added dummy root Makefile. As previously decided [1] and communicated via deprecation notice [2], the make build system is to be removed in the 20.11 release. This patchset removes support for compiling DPDK with the legacy make build system. Some make support is maintained for example applications, where pkg-config is used rather than the legacy make method. References to the make build system are removed from all documentation, please review to see if replacement meson instructions are needed in some cases. [1] https://mails.dpdk.org/archives/dev/2020-April/162839.html [2] http://git.dpdk.org/dpdk/commit/?id=a5449d78d1413e7bd1d66f6e70884e46cfb5e673 [3] https://patches.dpdk.org/patch/72274/ Ciara Power (13): doc: remove references to make from platforms guides doc: remove references to make from mempool guide doc: remove references to make from NICs guides doc: remove references to make from vdpadevs guides doc: remove references to make from bbdevs guides doc: remove references to make from cryptodevs guides doc: remove references to make from compressdevs guides doc: remove references to make from eventdevs guides doc: remove references to make from rawdevs guides doc: remove references to make from app guides doc: remove reference to make from tools guides doc: remove references to make from contributing guide doc: add to release notes to reflect removal of make Kevin Laatz (1): doc: update patch cheatsheet to use meson doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +- doc/guides/bbdevs/fpga_lte_fec.rst | 5 +- doc/guides/bbdevs/turbo_sw.rst | 23 +- doc/guides/compressdevs/isal.rst | 4 - doc/guides/compressdevs/octeontx.rst | 24 +- doc/guides/compressdevs/zlib.rst | 4 - doc/guides/contributing/design.rst | 37 +- doc/guides/contributing/documentation.rst | 31 +- .../contributing/img/patch_cheatsheet.svg | 582 ++++++++---------- doc/guides/contributing/patches.rst | 6 +- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 - doc/guides/cryptodevs/caam_jr.rst | 30 - doc/guides/cryptodevs/ccp.rst | 12 +- doc/guides/cryptodevs/dpaa2_sec.rst | 25 - doc/guides/cryptodevs/dpaa_sec.rst | 25 - doc/guides/cryptodevs/kasumi.rst | 11 +- doc/guides/cryptodevs/mvsam.rst | 10 +- doc/guides/cryptodevs/nitrox.rst | 7 - doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +- doc/guides/cryptodevs/octeontx2.rst | 8 +- doc/guides/cryptodevs/openssl.rst | 6 +- doc/guides/cryptodevs/qat.rst | 65 +- doc/guides/cryptodevs/scheduler.rst | 8 - doc/guides/cryptodevs/snow3g.rst | 10 +- doc/guides/cryptodevs/virtio.rst | 20 +- doc/guides/cryptodevs/zuc.rst | 10 +- doc/guides/eventdevs/dpaa.rst | 23 - doc/guides/eventdevs/dpaa2.rst | 23 - doc/guides/eventdevs/octeontx.rst | 24 - doc/guides/eventdevs/octeontx2.rst | 15 +- doc/guides/mempool/octeontx.rst | 16 +- doc/guides/mempool/octeontx2.rst | 10 +- doc/guides/nics/ark.rst | 7 +- doc/guides/nics/atlantic.rst | 4 - doc/guides/nics/axgbe.rst | 15 - doc/guides/nics/bnx2x.rst | 21 +- doc/guides/nics/bnxt.rst | 5 +- doc/guides/nics/build_and_test.rst | 6 +- doc/guides/nics/cxgbe.rst | 36 +- doc/guides/nics/dpaa.rst | 27 +- doc/guides/nics/dpaa2.rst | 26 +- doc/guides/nics/ena.rst | 16 - doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 12 - doc/guides/nics/fail_safe.rst | 20 +- doc/guides/nics/features.rst | 9 - doc/guides/nics/fm10k.rst | 4 - doc/guides/nics/hinic.rst | 9 - doc/guides/nics/hns3.rst | 10 - doc/guides/nics/i40e.rst | 44 +- doc/guides/nics/ice.rst | 25 +- doc/guides/nics/igc.rst | 18 +- doc/guides/nics/intel_vf.rst | 13 +- doc/guides/nics/ionic.rst | 8 - doc/guides/nics/ipn3ke.rst | 12 +- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 - doc/guides/nics/memif.rst | 10 +- doc/guides/nics/mlx4.rst | 55 +- doc/guides/nics/mlx5.rst | 62 +- doc/guides/nics/mvneta.rst | 36 +- doc/guides/nics/mvpp2.rst | 43 +- doc/guides/nics/nfb.rst | 19 +- doc/guides/nics/nfp.rst | 4 - doc/guides/nics/null.rst | 6 +- doc/guides/nics/octeontx.rst | 19 +- doc/guides/nics/octeontx2.rst | 13 +- doc/guides/nics/pcap_ring.rst | 24 +- doc/guides/nics/qede.rst | 31 +- doc/guides/nics/softnic.rst | 13 +- doc/guides/nics/szedata2.rst | 18 +- doc/guides/nics/thunderx.rst | 25 +- doc/guides/nics/vdev_netvsc.rst | 6 - doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- doc/guides/platform/bluefield.rst | 22 - doc/guides/platform/octeontx.rst | 51 +- doc/guides/platform/octeontx2.rst | 32 - doc/guides/rawdevs/dpaa2_cmdif.rst | 21 - doc/guides/rawdevs/dpaa2_qdma.rst | 21 - doc/guides/rawdevs/ifpga.rst | 10 - doc/guides/rawdevs/ntb.rst | 6 - doc/guides/rawdevs/octeontx2_dma.rst | 12 - doc/guides/rawdevs/octeontx2_ep.rst | 8 - doc/guides/rel_notes/release_20_11.rst | 4 + doc/guides/sample_app_ug/bbdev_app.rst | 34 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +-- doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 +- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 +- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 +- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 +- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- doc/guides/tools/comp_perf.rst | 14 +- doc/guides/tools/cryptoperf.rst | 27 +- doc/guides/tools/pdump.rst | 15 +- doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 44 +- doc/guides/tools/testeventdev.rst | 29 +- doc/guides/vdpadevs/ifc.rst | 13 - doc/guides/vdpadevs/mlx5.rst | 34 +- 147 files changed, 729 insertions(+), 2065 deletions(-) -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 01/14] doc: remove references to make from platforms guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 02/14] doc: remove references to make from mempool guide Ciara Power ` (13 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Harman Kalra, Kevin Laatz, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Harman Kalra <hkalra@marvell.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v7: Merged changes from another patch, as suggested by the author on v6, and added the relevant sign off. --- doc/guides/platform/bluefield.rst | 22 ------------- doc/guides/platform/octeontx.rst | 51 ++++++++++++------------------- doc/guides/platform/octeontx2.rst | 32 ------------------- 3 files changed, 19 insertions(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..42ddb1762e 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -94,19 +94,15 @@ drivers can be compiled with the following steps, .. code-block:: console - cd <dpdk directory> - make config T=arm64-thunderx-linux-gcc - make + meson build -Dexamples=<application> + ninja -C build The example applications can be compiled using the following: .. code-block:: console - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make + meson build -Dexamples=<application> + ninja -C build Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -115,10 +111,7 @@ The DPDK applications can be cross-compiled on any x86 based platform. The OCTEON TX SDK need to be installed on the build system. The SDK package will provide the required toolchain etc. -Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for further steps on -compilation. The 'host' & 'CC' to be used in the commands would change, -in addition to the paths to which libnuma related files have to be -copied. +Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. The following steps can be used to perform cross-compilation with OCTEON TX SDK 6.2.0 patch 3: @@ -128,34 +121,28 @@ SDK 6.2.0 patch 3: cd <sdk_install_dir> source env-setup - git clone https://github.com/numactl/numactl.git - cd numactl - git checkout v2.0.11 -b v2.0.11 - ./autogen.sh - autoconf -i - ./configure --host=aarch64-thunderx-linux CC=aarch64-thunderx-linux-gnu-gcc --prefix=<numa install dir> - make install - -The above steps will prepare build system with numa additions. Now this build system can be used -to build applications for **OCTEON TX** :sup:`®` platforms. +The above steps will prepare build system with required toolchain. +Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. .. code-block:: console cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma" + meson build --cross-file config/arm/arm64_thunderx_linux_gcc + ninja -C build -If NUMA support is not required, it can be disabled as explained in -:doc:`../linux_gsg/cross_build_dpdk_for_arm64`. - -Following steps could be used in that case. +The example applications can be compiled using the following: .. code-block:: console - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- + cd <dpdk directory> + meson build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples=<application> + ninja -C build + +.. note:: + By default, meson cross compilation uses ``aarch64-linux-gnu-gcc`` toolchain, + if OCTEON TX SDK 6.2.0 patch 3 is available then it can be used by + overriding the c, cpp, ar, strip ``binaries`` attributes to respective thunderx + toolchain binaries in ``config/arm/arm64_thunderx_linux_gcc`` file. SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index c4d64ab4b2..8b5991f03b 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -503,27 +503,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd <dpdk directory> - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/<application> - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -534,17 +513,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 02/14] doc: remove references to make from mempool guide 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 01/14] doc: remove references to make from platforms guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides Ciara Power ` (12 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Jerin Jacob, Nithin Dabilpuram Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v7: Added back in config option that is available in meson config file. --- doc/guides/mempool/octeontx.rst | 16 +++------------- doc/guides/mempool/octeontx2.rst | 10 +--------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index dfa1993e19..15737ad7bf 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -36,27 +36,17 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. +The following option can be modified in the ``config/rte_config.h`` file. Please note that enabling debugging options may affect system performance. - ``CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS`` ( set to ``octeontx_fpavf``) Set default mempool ops to octeontx_fpavf. -- ``CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx`` driver. - Driver Compilation ~~~~~~~~~~~~~~~~~~ -To compile the OCTEON TX FPAVF MEMPOOL PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc +See :doc:`../linux_gsg/build_dpdk` for more information on compiling DPDK. Initialization @@ -70,5 +60,5 @@ Example: .. code-block:: console - ./build/app/test -c 0xf --base-virtaddr=0x100000000000 \ + ./<build_dir>/app/test/dpdk-test -c 0xf --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst index 49b45a04e8..53f09a52db 100644 --- a/doc/guides/mempool/octeontx2.rst +++ b/doc/guides/mempool/octeontx2.rst @@ -29,14 +29,6 @@ Prerequisites and Compilation procedure Pre-Installation Configuration ------------------------------ -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL`` (default ``y``) - - Toggle compilation of the ``librte_mempool_octeontx2`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -97,4 +89,4 @@ Standalone mempool device Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device:: - echo "mempool_autotest" | build/app/test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" + echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa" -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 01/14] doc: remove references to make from platforms guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 02/14] doc: remove references to make from mempool guide Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-22 8:31 ` Thomas Monjalon 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 04/14] doc: remove references to make from vdpadevs guides Ciara Power ` (11 subsequent siblings) 14 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Bruce Richardson, Igor Russkikh, Ferruh Yigit, Harman Kalra, Ajit Khaparde, Hyong Youb Kim, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com> Reviewed-by: Igor Russkikh <irusskikh@marvell.com> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> Reviewed-by: Harman Kalra <hkalra@marvell.com> Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com> Acked-by: Hyong Youb Kim <hyonkim@cisco.com> --- v7: - Modified config options for qede and bnx2x. - Removed unnecessary line in enic doc. v6: Fixed indentation of testbbdev list entry. --- doc/guides/nics/ark.rst | 7 +--- doc/guides/nics/atlantic.rst | 4 -- doc/guides/nics/axgbe.rst | 15 -------- doc/guides/nics/bnx2x.rst | 21 ++++------ doc/guides/nics/bnxt.rst | 5 +-- doc/guides/nics/build_and_test.rst | 6 ++- doc/guides/nics/cxgbe.rst | 36 +++++------------ doc/guides/nics/dpaa.rst | 27 +------------ doc/guides/nics/dpaa2.rst | 26 +------------ doc/guides/nics/ena.rst | 16 -------- doc/guides/nics/enetc.rst | 2 - doc/guides/nics/enic.rst | 12 ------ doc/guides/nics/fail_safe.rst | 20 ++-------- doc/guides/nics/features.rst | 9 ----- doc/guides/nics/fm10k.rst | 4 -- doc/guides/nics/hinic.rst | 9 ----- doc/guides/nics/hns3.rst | 10 ----- doc/guides/nics/i40e.rst | 44 ++++++--------------- doc/guides/nics/ice.rst | 25 ++---------- doc/guides/nics/igc.rst | 18 +-------- doc/guides/nics/intel_vf.rst | 13 +------ doc/guides/nics/ionic.rst | 8 ---- doc/guides/nics/ipn3ke.rst | 12 +----- doc/guides/nics/kni.rst | 4 +- doc/guides/nics/liquidio.rst | 27 ------------- doc/guides/nics/memif.rst | 10 ++--- doc/guides/nics/mlx4.rst | 55 ++------------------------ doc/guides/nics/mlx5.rst | 62 ++---------------------------- doc/guides/nics/mvneta.rst | 36 ++++------------- doc/guides/nics/mvpp2.rst | 43 ++++----------------- doc/guides/nics/nfb.rst | 19 +-------- doc/guides/nics/nfp.rst | 4 -- doc/guides/nics/null.rst | 6 +-- doc/guides/nics/octeontx.rst | 19 +-------- doc/guides/nics/octeontx2.rst | 13 +------ doc/guides/nics/pcap_ring.rst | 24 ++++++------ doc/guides/nics/qede.rst | 31 +++++++-------- doc/guides/nics/softnic.rst | 13 +------ doc/guides/nics/szedata2.rst | 18 +-------- doc/guides/nics/thunderx.rst | 25 +----------- doc/guides/nics/vdev_netvsc.rst | 6 --- doc/guides/nics/vhost.rst | 2 +- doc/guides/nics/virtio.rst | 4 +- 43 files changed, 121 insertions(+), 649 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 358e7f624d..d9eafa3b88 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -122,12 +122,7 @@ The driver supports single-port, multi-queue for both RX and TX. Configuration Information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ARK PMD: - - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. +**DPDK Configuration Parameter** * **RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum packet length for tx packets to the FPGA. Packets less than this diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst index 3f3f2949f3..605f6dc3ab 100644 --- a/doc/guides/nics/atlantic.rst +++ b/doc/guides/nics/atlantic.rst @@ -26,10 +26,6 @@ Experimental API features - MACSEC PMD API is considered as experimental and is subject to change/removal in next DPDK releases. -Configuration Information -^^^^^^^^^^^^^^^^^^^^^^^^^ - -- ``CONFIG_RTE_LIBRTE_ATLANTIC_PMD`` (default ``y``) Application Programming Interface --------------------------------- diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst index 9b270a4226..10bf86fa54 100644 --- a/doc/guides/nics/axgbe.rst +++ b/doc/guides/nics/axgbe.rst @@ -27,21 +27,6 @@ AXGBE PMD has support for: - Jumbo Frame up to 9K -Configuration Information -------------------------- - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD`` (default **y**) - - Toggle compilation of axgbe PMD. - -- ``CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG`` (default **n**) - - Toggle display for PMD debug related messages. - - Building DPDK ------------- diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index ab90d8ae5e..602d27b126 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -75,32 +75,25 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ +Config Options +~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that +The following options can be enabled with Meson flags. Please note that enabling debugging options may affect system performance. -- ``CONFIG_RTE_LIBRTE_BNX2X_PMD`` (default **n**) - - Toggle compilation of bnx2x driver. To use bnx2x PMD set this config parameter - to 'y'. Also, in order for firmware binary to load user will need zlib devel - package installed. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) +- ``RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **disabled**) Toggle display of transmit fast path run-time messages. -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **n**) +- ``RTE_LIBRTE_BNX2X_DEBUG_RX`` (default **disabled**) Toggle display of receive fast path run-time messages. -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **n**) +- ``RTE_LIBRTE_BNX2X_DEBUG_PERIODIC`` (default **disabled**) Toggle display of register reads and writes. - -.. _bnx2x_driver-compilation: + .. _bnx2x_driver-compilation: Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 74d90ba97f..399d9b5a4f 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -565,9 +565,6 @@ The BNXT PMD supports a PTP client application to communicate with a PTP master clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to run on PF and vector mode needs to be disabled. -For the PTP time synchronization support, the BNXT PMD must be compiled with -``CONFIG_RTE_LIBRTE_IEEE1588=y`` (this compilation flag is currently pending). - .. code-block:: console testpmd> set fwd ieee1588 // enable IEEE 1588 mode @@ -612,7 +609,7 @@ Basic stats include: * oerrors By default, per-queue stats for 16 queues are supported. For more than 16 -queues, BNXT PMD should be compiled with ``CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS`` +queues, BNXT PMD should be compiled with ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` set to the desired number of queues. Extended Stats diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index ba196382a9..4a9a3d78ca 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -66,6 +66,10 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. #. Load ``igb_uio`` or ``vfio-pci`` driver: + Before compiling, make sure to enable kmods for the meson build:: + + meson configure -Denable_kmods=true + .. code-block:: console modprobe uio @@ -106,7 +110,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c13899..442ab1511c 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -87,35 +87,19 @@ Prerequisites :ref:`linux-installation` for Linux and section :ref:`freebsd-installation` for FreeBSD. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_CXGBE_PMD`` (default **y**) - - Toggle compilation of librte_pmd_cxgbe driver. - - .. note:: - - This controls compilation of both CXGBE and CXGBEVF PMD. Runtime Options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. For example, .. code-block:: console - testpmd -w 02:00.4,keep_ovlan=1 -- -i + dpdk-testpmd -w 02:00.4,keep_ovlan=1 -- -i Common Runtime Options -^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~ - ``keep_ovlan`` (default **0**) @@ -133,7 +117,7 @@ Common Runtime Options coalesce limit has been reached. CXGBE VF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``force_link_up`` (default **0**) @@ -142,7 +126,7 @@ CXGBE VF Only Runtime Options to send traffic to each other even when the physical link is down. CXGBE PF Only Runtime Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ``filtermode`` (default **0**) @@ -317,7 +301,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88 -- -i - ``filtermask`` (default **0**) @@ -344,7 +328,7 @@ CXGBE PF Only Runtime Options .. code-block:: console - testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i + dpdk-testpmd -w 02:00.4,filtermode=0x88,filtermask=0x80 -- -i .. _driver-compilation: @@ -689,7 +673,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ + cp <build_dir>/kernel/freebsd/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -770,13 +754,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko + kldload <build_dir>/kernel/freebsd/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 74d4a6058e..1deb7faaa5 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -196,31 +196,6 @@ See :doc:`../platform/dpaa` for setup information Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_DPAA_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) - - Toggles display of bus configurations and enables a debugging queue - to fetch error (Rx/Tx) packets to driver. By default, packets with errors - (like wrong checksum) are dropped by the hardware. - -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) - - Enables debugging of the Queue and Buffer Manager layer which interacts - with the DPAA hardware. - Environment Variables ~~~~~~~~~~~~~~~~~~~~~ @@ -265,7 +240,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index ca6ba5b5e2..01e37d4621 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -432,30 +432,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2), however they are used as BSD in DPDK in userspace. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_FSLMC_BUS`` (default ``y``) - - Toggle compilation of the ``librte_bus_fslmc`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa2`` driver. - -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - - Toggle display of debugging messages/logic - -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) - - Toggle to use physical address vs virtual address for hardware accelerators. Driver compilation and testing ------------------------------ @@ -473,7 +449,7 @@ for details. .. code-block:: console - ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx + ./dpdk-testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... EAL: Registered [pci] bus. diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index 3a6074cdf6..3312acba52 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -79,22 +79,6 @@ The driver supports multi-queue for both Tx and Rx. Configuration information ------------------------- -**DPDK Configuration Parameters** - - The following configuration options are available for the ENA PMD: - - * **CONFIG_RTE_LIBRTE_ENA_PMD** (default y): Enables or disables inclusion - of the ENA PMD driver in the DPDK compilation. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug - logging of RX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug - logging of TX logic within the ENA PMD driver. - - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. - **Runtime Configuration Parameters** * **large_llq_hdr** (default 0) diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 3c896eeffa..6203f4d799 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -113,5 +113,3 @@ Driver compilation and testing Follow instructions available in the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` to launch **testpmd** - -To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e47..c624487683 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -20,13 +20,6 @@ should be downloaded from https://core.dpdk.org/download/ Configuration information ------------------------- -- **DPDK Configuration Parameters** - - The following configuration options are available for the ENIC PMD: - - - **CONFIG_RTE_LIBRTE_ENIC_PMD** (default y): Enables or disables inclusion - of the ENIC PMD driver in the DPDK compilation. - - **vNIC Configuration Parameters** - **Number of Queues** @@ -583,11 +576,6 @@ The value depends on the memory configuration of the application, DPDK and PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 -The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linux). -This would help in bringing down the time taken for building the -libraries and the initialization time of the application. - Additional Reference -------------------- diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index f80346a358..e1b5c80d6c 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -14,10 +14,6 @@ Additionally to the Seamless Hotplug feature, the Fail-safe PMD offers the ability to redirect operations to a secondary device when the primary has been removed from the system. -.. note:: - - The library is enabled by default. You can enable it or disable it manually - by setting the ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` configuration option. Features -------- @@ -33,14 +29,6 @@ automatically by detecting capable devices and registering the relevant handler. Check the feature matrix for the complete set of supported features. -Compilation option ------------------- - -Available options within the ``$RTE_TARGET/build/.config`` file: - -- ``CONFIG_RTE_LIBRTE_PMD_FAILSAFE`` (default **y**) - - This option enables or disables compiling librte_pmd_failsafe. Using the Fail-safe PMD from the EAL command line ------------------------------------------------- @@ -128,7 +116,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i @@ -142,7 +130,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -w 81:00.0 -- -i @@ -150,7 +138,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 -w ff:ff.f \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 -w ff:ff.f \ --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i #. Start testpmd, automatically probing the device 84:00.0 and using it with @@ -158,7 +146,7 @@ This section shows some example of using **testpmd** with a fail-safe PMD. .. code-block:: console - $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0xff -n 4 \ --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index 16e00b8f64..234bf066b9 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -826,8 +826,6 @@ ARMv7 Support armv7 architecture. -Use ``defconfig_arm-armv7a-*-*``. - .. _nic_features_armv8: @@ -836,8 +834,6 @@ ARMv8 Support armv8a (64bit) architecture. -Use ``defconfig_arm64-armv8a-*-*`` - .. _nic_features_power8: @@ -846,7 +842,6 @@ Power8 Support PowerPC architecture. -Use ``defconfig_ppc_64-power8-*-*`` .. _nic_features_x86-32: @@ -855,8 +850,6 @@ x86-32 Support 32bits x86 architecture. -Use ``defconfig_x86_x32-native-*-*`` and ``defconfig_i686-native-*-*``. - .. _nic_features_x86-64: @@ -865,8 +858,6 @@ x86-64 Support 64bits x86 architecture. -Use ``defconfig_x86_64-native-*-*``. - .. _nic_features_usage_doc: diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 4e178c2cc6..0f7c91bbd1 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -35,10 +35,6 @@ There is no change to the PMD API. The RX/TX handlers are the only two entries f vPMD packet I/O. They are transparently registered at runtime RX/TX execution if all required conditions are met. -1. To date, only an SSE version of FM10K vPMD is available. - To ensure that vPMD is in the binary code, set - ``CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y`` in the configure file. - Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers. The following sections explain RX and TX constraints in the vPMD. diff --git a/doc/guides/nics/hinic.rst b/doc/guides/nics/hinic.rst index f765060641..fe13c582e7 100644 --- a/doc/guides/nics/hinic.rst +++ b/doc/guides/nics/hinic.rst @@ -46,15 +46,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_HINIC_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst index a62fcfdede..d96ad5d445 100644 --- a/doc/guides/nics/hns3.rst +++ b/doc/guides/nics/hns3.rst @@ -44,16 +44,6 @@ Prerequisites - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_HNS3_PMD`` (default ``y``) Driver compilation and testing ------------------------------ diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index a0b81e6695..5cf85d94cc 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -155,35 +155,13 @@ Pre-Installation Configuration Config File Options ~~~~~~~~~~~~~~~~~~~ -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. +The following options can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_I40E_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_i40e`` driver. - -- ``CONFIG_RTE_LIBRTE_I40E_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC`` (default ``y``) - - Toggle bulk allocation for RX. - -- ``CONFIG_RTE_LIBRTE_I40E_INC_VECTOR`` (default ``n``) - - Toggle the use of Vector PMD instead of normal RX/TX path. - To enable vPMD for RX, bulk allocation for Rx must be allowed. - -- ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. - -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF`` (default ``64``) Number of queues reserved for PF. -- ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) +- ``RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM`` (default ``4``) Number of queues reserved for each VMDQ Pool. @@ -354,7 +332,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --forward-mode=mac + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --forward-mode=mac ... testpmd> set promisc 0 off @@ -389,8 +367,9 @@ Start ``testpmd`` with ``--disable-rss`` and ``--pkt-filter-mode=perfect``: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i --disable-rss --pkt-filter-mode=perfect \ - --rxq=8 --txq=8 --nb-cores=8 --nb-ports=1 + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 -- -i --disable-rss \ + --pkt-filter-mode=perfect --rxq=8 --txq=8 --nb-cores=8 \ + --nb-ports=1 Add a rule to direct ``ipv4-udp`` packet whose ``dst_ip=2.2.2.5, src_ip=2.2.2.3, src_port=32, dst_port=32`` to queue 1: @@ -648,8 +627,7 @@ For all available versions of the i40e driver, these drivers don't support 16 byte RX descriptor. If the Linux i40e kernel driver is used as host driver, while DPDK i40e PMD is used as the VF driver, DPDK cannot choose 16 byte receive descriptor. The reason is that the RX descriptor is already set to 32 byte by -the i40e kernel driver. That is to say, user should keep -``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n`` in config file. +the i40e kernel driver. In the future, if the Linux i40e driver supports 16 byte RX descriptor, user should make sure the DPDK VF uses the same RX descriptor mode, 16 byte or 32 byte, as the PF driver. @@ -769,7 +747,9 @@ Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size can provide helps to high performance of small packets. -Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors. +In ``config/rte_config.h`` set the following to use 16 bytes size RX descriptors:: + + #define RTE_LIBRTE_I40E_16BYTE_RX_DESC 1 Input set requirement of each pctype for FDIR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -822,7 +802,7 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup. 7. The command line of running l3fwd would be something like the following:: - ./l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ + ./dpdk-l3fwd -l 18-21 -n 4 -w 82:00.0 -w 85:00.0 \ -- -p 0x3 --config '(0,0,18),(0,1,19),(1,0,20),(1,1,21)' This means that the application uses core 18 for port 0, queue pair 0 forwarding, core 19 for port 0, queue pair 1 forwarding, diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 25a821177a..a2aea12333 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -20,23 +20,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_ICE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ice`` driver. - -- ``CONFIG_RTE_LIBRTE_ICE_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC`` (default ``n``) - - Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -91,14 +74,14 @@ Runtime Config Options .. code-block:: console - testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' + dpdk-testpmd -w 18:00.0,proto_xtr='[(1,2-3,8-9):tcp,10-13:vlan]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-13 are VLAN extraction, other queues run with no protocol extraction. .. code-block:: console - testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' + dpdk-testpmd -w 18:00.0,proto_xtr=vlan,proto_xtr='[(1,2-3,8-9):tcp,10-23:ipv6]' This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. @@ -250,7 +233,7 @@ responses for the same from PF. #. Bind the VF0, and run testpmd with 'cap=dcf' devarg:: - testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i + dpdk-testpmd -l 22-25 -n 4 -w 18:01.0,cap=dcf -- -i #. Monitor the VF2 interface network traffic:: @@ -279,7 +262,7 @@ To start ``testpmd``, and add vlan 10 to port 0: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 -- -i + ./app/dpdk-testpmd -l 0-15 -n 4 -- -i ... testpmd> rx_vlan add 10 0 diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst index 4c5e626759..3b096236bf 100644 --- a/doc/guides/nics/igc.rst +++ b/doc/guides/nics/igc.rst @@ -11,20 +11,6 @@ I225 Series Network Adapters. `https://ark.intel.com/content/www/us/en/ark/products/series/184686/ intel-ethernet-controller-i225-series.html` -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_IGC_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_igc`` driver. - -- ``CONFIG_RTE_LIBRTE_IGC_DEBUG_*`` (default ``n``) - - Toggle display of generic debugging messages. - Driver compilation and testing ------------------------------ @@ -67,7 +53,7 @@ outer VLAN to 0x9100: .. code-block:: console - ./app/testpmd -l 4-8 -- -i + ./app/dpdk-testpmd -l 4-8 -- -i ... testpmd> vlan set filter on 0 @@ -94,7 +80,7 @@ Start ``testpmd``: .. code-block:: console - ./testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss + ./dpdk-testpmd -l 4-8 -- i --rxq=4 --txq=4 --pkt-filter-mode=perfect --disable-rss Add a rule to direct packet whose ``ether-type=0x801`` to queue 1: diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index ade5152595..723a9c0fa2 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -124,7 +124,6 @@ Intel® X710/XL710 Gigabit Ethernet Controller VF Infrastructure In a virtualized environment, the programmer can enable a maximum of *128 Virtual Functions (VF)* globally per Intel® X710/XL710 Gigabit Ethernet Controller NIC device. -The number of queue pairs of each VF can be configured by ``CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF`` in ``config`` file. The Physical Function in host could be either configured by the Linux* i40e driver (in the case of the Linux Kernel-based Virtual Machine [KVM]) or by DPDK PMD PF driver. When using both DPDK PMD PF/VF drivers, the whole NIC will be taken over by DPDK based application. @@ -521,20 +520,12 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linux-gcc - ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, - that is, there is no change to the normal installation procedure. - - .. code-block:: console - - make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc - cd x86_64-native-linux-gcc - make +#. Configure and install the DPDK on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. note:: diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 787123df5d..fd32926bf4 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -24,14 +24,6 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IONIC_PMD`` (default ``y``) - - Toggle compilation of ionic PMD. Building DPDK ------------- diff --git a/doc/guides/nics/ipn3ke.rst b/doc/guides/nics/ipn3ke.rst index c6c1552f66..5d4534e4da 100644 --- a/doc/guides/nics/ipn3ke.rst +++ b/doc/guides/nics/ipn3ke.rst @@ -31,14 +31,6 @@ Prerequisites Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IPN3KE_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_ipn3ke`` driver. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +77,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port: .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --port-topology=loop HQoS and flow acceleration ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,7 +88,7 @@ To start ``testpmd``, and add I40e PF to FPGA network port, enable FPGA HQoS and .. code-block:: console - ./app/testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap + ./<build_dir>/app/dpdk-testpmd -l 0-15 -n 4 --vdev 'ifpga_rawdev_cfg0,ifpga=b3:00.0,port=0' --vdev 'ipn3ke_cfg0,afu=0|b3:00.0,fpga_acc={tm|flow},i40e_pf={0000:b1:00.0|0000:b1:00.1|0000:b1:00.2|0000:b1:00.3|0000:b5:00.0|0000:b5:00.1|0000:b5:00.2|0000:b5:00.3}' -- -i --no-numa --forward-mode=macswap Limitations or Known issues --------------------------- diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 90d3040cf5..80ba459d49 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -97,13 +97,13 @@ It is possible to test PMD quickly using KNI kernel module loopback feature: .. code-block:: console - insmod build/kmod/rte_kni.ko lo_mode=lo_mode_fifo_skb + insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo_skb * Start testpmd with no physical device but two KNI virtual devices: .. code-block:: console - ./testpmd --vdev net_kni0 --vdev net_kni1 -- -i + ./dpdk-testpmd --vdev net_kni0 --vdev net_kni1 -- -i .. code-block:: console diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index 0534146720..65c7d2d0b0 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -20,33 +20,6 @@ Supported LiquidIO Adapters - LiquidIO II CN2360 210SVPT -Pre-Installation Configuration ------------------------------- - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_LIO_PMD`` (default ``y``) - - Toggle compilation of LiquidIO PMD. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_RX`` (default ``n``) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_TX`` (default ``n``) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX`` (default ``n``) - - Toggle display of mailbox messages. - -- ``CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS`` (default ``n``) - - Toggle display of register reads and writes. - - SR-IOV: Prerequisites and Sample Application Notes -------------------------------------------------- diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index 8e80105a46..1b6b52aa70 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -214,15 +214,15 @@ In this example we run two instances of testpmd application and transmit packets First create ``master`` interface:: - #./build/app/testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i + #./<build_dir>/app/dpdk-testpmd -l 0-1 --proc-type=primary --file-prefix=pmd1 --vdev=net_memif,role=master -- -i Now create ``slave`` interface (master must be already running so the slave will connect):: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif -- -i You can also enable ``zero-copy`` on ``slave`` interface:: - #./build/app/testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i + #./<build_dir>/app/dpdk-testpmd -l 2-3 --proc-type=primary --file-prefix=pmd2 --vdev=net_memif,zero-copy=yes --single-file-segments -- -i Start forwarding packets:: @@ -258,7 +258,7 @@ To see socket filename use show memif command:: Now create memif interface by running testpmd with these command line options:: - #./testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i + #./dpdk-testpmd --vdev=net_memif,socket=/run/vpp/memif.sock -- -i Testpmd should now create memif slave interface and try to connect to master. In testpmd set forward option to icmpecho and start forwarding:: @@ -281,7 +281,7 @@ The situation is analogous to cross connecting 2 ports of the NIC by cable. To set the loopback, just use the same socket and id with different roles:: - #./testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i + #./dpdk-testpmd --vdev=net_memif0,role=master,id=0 --vdev=net_memif1,role=slave,id=0 -- -i Then start the communication:: diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 6818b6af51..d1f2a7ab68 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -16,11 +16,6 @@ the `Mellanox community <http://community.mellanox.com/welcome>`_. There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`_. -.. note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and - recompiling DPDK. Implementation details ---------------------- @@ -56,43 +51,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX4_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx4 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx4**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx4** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -104,9 +65,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ @@ -245,13 +203,6 @@ Current RDMA core package and Linux kernel (recommended) .. _`RDMA core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` - .. _Mellanox_OFED_as_a_fallback: Mellanox OFED as a fallback diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index a071db276f..b8a6ae5e1f 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -20,11 +20,6 @@ Information and documentation about these adapters can be found on the There is also a `section dedicated to this poll mode driver <http://www.mellanox.com/page/products_dyn?product_family=209&mtag=pmd_for_dpdk>`__. -.. note:: - - Due to external dependencies, this driver is disabled in default configuration - of the "make" build. It can be enabled with ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` - or by using "meson" build system which will detect dependencies. Design ------ @@ -334,50 +329,9 @@ Configuration Compilation options ~~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. - -- ``CONFIG_RTE_LIBRTE_MLX5_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) - - Build PMD with additional code to make it loadable without hard - dependencies on **libibverbs** nor **libmlx5**, which may not be installed - on the target system. - - In this mode, their presence is still required for it to run properly, - however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. - - It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). - - This option has no performance impact. - -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) - - Embed static flavor of the dependencies **libibverbs** and **libmlx5** - in the PMD shared library or the executable static binary. - -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) - - Toggle debugging code and stricter compilation flags. Enabling this option - adds additional run-time checks and debugging messages at the cost of - lower performance. - -.. note:: - - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to - 64. Default armv8a configuration of make build and meson build set it to 128 - then brings performance degradation. - -This option is available in meson: +The ibverbs libraries can be linked with this PMD in a number of ways, +configured by the "ibverbs_link" build option. This can take on the +following values: - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. @@ -389,10 +343,6 @@ Environment variables A list of directories in which to search for the rdma-core "glue" plug-in, separated by colons or semi-colons. - Only matters when compiled with ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` - enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set, - since ``LD_LIBRARY_PATH`` has no effect in this case. - - ``MLX5_SHUT_UP_BF`` Configures HW Tx doorbell register as IO-mapped. @@ -1115,12 +1065,6 @@ RDMA Core with Linux Kernel .. _`Linux installation documentation`: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/plain/Documentation/admin-guide/README.rst .. _`RDMA Core installation documentation`: https://raw.githubusercontent.com/linux-rdma/rdma-core/master/README.md -If rdma-core libraries are built but not installed, DPDK makefile can link them, -thanks to these environment variables: - - - ``EXTRA_CFLAGS=-I/path/to/rdma-core/build/include`` - - ``EXTRA_LDFLAGS=-L/path/to/rdma-core/build/lib`` - - ``PKG_CONFIG_PATH=/path/to/rdma-core/build/lib/pkgconfig`` Mellanox OFED/EN ^^^^^^^^^^^^^^^^ diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index c8b00ddf22..e8abde42da 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -13,12 +13,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-3700/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -81,20 +75,9 @@ Prerequisites Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` (default ``n``) - - Toggle compilation of the librte_pmd_mvneta driver. Runtime options -~~~~~~~~~~~~~~~ +--------------- The following ``devargs`` options can be enabled at runtime. They must be passed as part of EAL arguments. @@ -107,7 +90,7 @@ be passed as part of EAL arguments. .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 \ -c 3 -- -i --p 3 -a @@ -126,16 +109,13 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +following command: .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linux-gcc - sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config - make + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + Usage Example ------------- @@ -160,7 +140,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ + ./dpdk-testpmd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- \ -i --p 3 -a --txd 256 --rxd 128 --rxq=1 --txq=1 --nb-cores=1 @@ -168,4 +148,4 @@ In order to run l2fwd example application following command can be used: .. code-block:: console - ./l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 + ./dpdk-l2fwd --vdev=net_mvneta,iface=eth0,iface=eth1 -c 3 -- -T 1 -p 3 diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 19cab1cbcc..6fbce8358e 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -15,12 +15,6 @@ Detailed information about SoCs that use PPv2 can be obtained here: * https://www.marvell.com/embedded-processors/armada-70xx/ * https://www.marvell.com/embedded-processors/armada-80xx/ -.. Note:: - - Due to external dependencies, this driver is disabled by default. It must - be enabled manually by setting relevant configuration option manually. - Please refer to `Config File Options`_ section for further details. - Features -------- @@ -114,20 +108,6 @@ Prerequisites DPDK environment. -Config File Options -------------------- - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_MVPP2_PMD`` (default ``n``) - - Toggle compilation of the librte mvpp2 driver. - - .. Note:: - - When MVPP2 PMD is enabled ``CONFIG_RTE_LIBRTE_MVNETA_PMD`` must be disabled - - Building DPDK ------------- @@ -143,22 +123,15 @@ Driver needs precompiled MUSDK library during compilation. MUSDK will be installed to `usr/local` under current directory. For the detailed build instructions please consult ``doc/musdk_get_started.txt``. -Before the DPDK build process the environmental variable ``LIBMUSDK_PATH`` with -the path to the MUSDK installation directory needs to be exported. +The path to the MUSDK installation directory needs to set in meson, shown in the +command below. For additional instructions regarding DPDK cross compilation please refer to :doc:`Cross compile DPDK for ARM64 <../linux_gsg/cross_build_dpdk_for_arm64>`. .. code-block:: console - export LIBMUSDK_PATH=<musdk>/usr/local - export CROSS=<toolchain>/bin/aarch64-linux-gnu- - export RTE_KERNELDIR=<kernel-dir> - export RTE_TARGET=arm64-armv8a-linux-gcc + meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build - make config T=arm64-armv8a-linux-gcc - sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config - sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config - make Usage Example ------------- @@ -185,7 +158,7 @@ In order to run testpmd example application following command can be used: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 7 -- \ --burst=128 --txd=2048 --rxd=1024 --rxq=2 --txq=2 --nb-cores=2 \ -i -a --rss-udp @@ -373,7 +346,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2,cfg=/home/user/mrvl.conf \ -c 7 -- -i -a --disable-hw-vlan-strip --rxq=3 --txq=3 .. _flowapi: @@ -486,7 +459,7 @@ Before proceeding run testpmd user application: .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 3 -- -i --p 3 -a --disable-hw-vlan-strip Example #1 ^^^^^^^^^^ @@ -578,7 +551,7 @@ Usage example .. code-block:: console - ./testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 + ./dpdk-testpmd --vdev=eth_mvpp2,iface=eth0,iface=eth2 -c 6 -- -i -p 3 -a --txd 1024 --rxd 1024 2. Create meter profile: @@ -657,7 +630,7 @@ For a detailed usage description please refer to "Traffic Management" section in .. code-block:: console - ./testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ + ./dpdk-testpmd --vdev=net_mrvl,iface=eth0,iface=eth2,cfg=./qos_config -c 7 -- \ -i -p 3 --disable-hw-vlan-strip --rxq 3 --txq 3 --txd 1024 --rxd 1024 2. Stop all ports: diff --git a/doc/guides/nics/nfb.rst b/doc/guides/nics/nfb.rst index 10f33a025e..ecea3ecff0 100644 --- a/doc/guides/nics/nfb.rst +++ b/doc/guides/nics/nfb.rst @@ -16,13 +16,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_NFB_PMD=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -62,14 +55,6 @@ The minimum version of the provided packages: Configuration ------------- -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_NFB_PMD`` default value: **n** - - Value **y** enables compilation of nfb PMD. - - Timestamps The PMD supports hardware timestamps of frame receipt on physical network interface. In order to use @@ -78,7 +63,7 @@ products) and the device argument `timestamp=1` must be used. .. code-block:: console - $RTE_TARGET/app/testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> + ./<build_dir>/app/dpdk-testpmd -w b3:00.0,timestamp=1 <other EAL params> -- <testpmd params> When the timestamps are enabled with the *devarg*, a timestamp validity flag is set in the MBUFs containing received frames and timestamp is inserted into the `rte_mbuf` struct. @@ -133,7 +118,7 @@ transmit queue: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 020e37d131..fef99973b6 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -49,10 +49,6 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linux configuration** file: - -- **CONFIG_RTE_LIBRTE_NFP_PMD=y** - Once the DPDK is built all the DPDK apps and examples include support for the NFP PMD. diff --git a/doc/guides/nics/null.rst b/doc/guides/nics/null.rst index c68d0d6051..e75abd96d2 100644 --- a/doc/guides/nics/null.rst +++ b/doc/guides/nics/null.rst @@ -14,7 +14,7 @@ Usage .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev net_null0 --vdev net_null1 -- -i Runtime Config Options @@ -26,7 +26,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,copy=1" -- -i - ``size`` [optional, default=64 bytes] @@ -35,7 +35,7 @@ Runtime Config Options .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 --vdev "net_null0,size=256" -- -i - ``no-rx`` [optional, default disabled] diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index c8655bf375..c01ae09bb3 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -52,15 +52,6 @@ See :doc:`../platform/octeontx` for setup information. Pre-Installation Configuration ------------------------------ -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx`` driver. Driver compilation and testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,14 +59,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - #. Running testpmd: Follow instructions available in the document @@ -86,7 +69,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ + ./<build_dir>/app/dpdk-testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst index f3be79bbb8..7c04b5e600 100644 --- a/doc/guides/nics/octeontx2.rst +++ b/doc/guides/nics/octeontx2.rst @@ -46,14 +46,6 @@ Prerequisites See :doc:`../platform/octeontx2` for setup information. -Compile time Config Options ---------------------------- - -The following options may be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2`` driver. Driver compilation and testing ------------------------------ @@ -61,9 +53,6 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the OCTEON TX2 PMD for Linux arm64 gcc, -use arm64-octeontx2-linux-gcc as target. - #. Running testpmd: Follow instructions available in the document @@ -74,7 +63,7 @@ use arm64-octeontx2-linux-gcc as target. .. code-block:: console - ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 + ./<build_dir>/app/dpdk-testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1 EAL: Detected 24 lcore(s) EAL: Detected 1 NUMA nodes EAL: Multi-process socket /var/run/dpdk/rte/mp_socket diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst index 8fdb49179a..3734c29083 100644 --- a/doc/guides/nics/pcap_ring.rst +++ b/doc/guides/nics/pcap_ring.rst @@ -15,10 +15,8 @@ the DPDK also includes pure-software PMDs, two of these drivers are: .. note:: - The libpcap -based PMD is disabled by default in the build configuration files, - owing to an external dependency on the libpcap development files which must be installed on the board. - Once the libpcap development files are installed, - the library can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + The libpcap -based PMD has an external dependency on the libpcap development files which must + be installed on the board. Using the Drivers from the EAL Command Line ------------------------------------------- @@ -42,7 +40,7 @@ Device name and stream options must be separated by commas as shown below: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,stream_opt0=..,stream_opt1=..' \ --vdev='net_pcap1,stream_opt0=..' @@ -141,7 +139,7 @@ Read packets from one pcap file and write them to another: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -149,7 +147,7 @@ Read packets from a network interface and write them to a pcap file: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth0,tx_pcap=file_tx.pcap' \ -- --port-topology=chained @@ -157,7 +155,7 @@ Read packets from a pcap file and write them to a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_iface=eth1' \ -- --port-topology=chained @@ -165,14 +163,14 @@ Forward packets through two network interfaces: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1,iface=eth1' Enable 2 tx queues on a network interface: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface=eth1,tx_iface=eth1,tx_iface=eth1' \ -- --txq 2 @@ -180,7 +178,7 @@ Read only incoming packets from a network interface and write them back to the s .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_iface_in=eth1,tx_iface=eth1' Using libpcap-based PMD with the testpmd Application @@ -205,7 +203,7 @@ Otherwise, the first 512 packets from the input pcap file will be discarded by t .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 \ --vdev 'net_pcap0,rx_pcap=file_rx.pcap,tx_pcap=file_tx.pcap' \ -- --port-topology=chained --no-flush-rx @@ -225,7 +223,7 @@ Multiple devices may be specified, separated by commas. .. code-block:: console - ./testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i + ./dpdk-testpmd -l 1-3 -n 4 --vdev=net_ring0 --vdev=net_ring1 -- -i EAL: Detected lcore 1 as core 1 on socket 0 ... diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index e874915c2f..31f1283e56 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -103,25 +103,12 @@ Performance note - For better performance, it is recommended to use 4K or higher RX/TX rings. -Config File Options -~~~~~~~~~~~~~~~~~~~ +Config Options +~~~~~~~~~~~~~~ -The following options can be modified in the ``.config`` file. Please note that -enabling debugging options may affect system performance. +The following option can be modified in the ``config/rte_config.h`` file. -- ``CONFIG_RTE_LIBRTE_QEDE_PMD`` (default **y**) - - Toggle compilation of QEDE PMD driver. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) - - Toggle display of transmit fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) - - Toggle display of receive fast path run-time messages. - -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) Gives absolute path of firmware file. ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` @@ -130,6 +117,16 @@ enabling debugging options may affect system performance. CAUTION this option is more for custom firmware, it is not recommended for use under normal condition. +The following options can be enabled with Meson flags. + +- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **disabled**) + + Toggle display of transmit fast path run-time messages. + +- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **disabled**) + + Toggle display of receive fast path run-time messages. + Config notes ~~~~~~~~~~~~ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 8f0dd53eac..695ebed91f 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -51,15 +51,6 @@ Any Linux distribution fulfilling the conditions described in ``System Requireme section of :ref:`the DPDK documentation <linux_gsg>` or refer to *DPDK Release Notes*. -Build options -------------- - -The default PMD configuration available in the common_linux configuration file: - -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y - -Once the DPDK is built, all the DPDK applications include support for the -Soft NIC PMD. Soft NIC PMD arguments ---------------------- @@ -130,7 +121,7 @@ Soft NIC testing .. code-block:: console - ./testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i + ./dpdk-testpmd -c 0x7 -s 0x4 --vdev 'net_softnic0,firmware=<script path>/firmware.cli,cpu_id=0,conn_port=8086' -- -i --portmask=0x2 .. code-block:: console @@ -375,7 +366,7 @@ commands. .. code-block:: console - ./x86_64-native-linux-gcc/app/testpmd -c 0x7 -s 0x4 -n 4 \ + ./<build_dir>/app/dpdk-testpmd -c 0x7 -s 0x4 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst index 30710a80b8..9cf3f39eb5 100644 --- a/doc/guides/nics/szedata2.rst +++ b/doc/guides/nics/szedata2.rst @@ -15,13 +15,6 @@ and used technology (`Netcope Development Kit <http://www.netcope.com/en/products/fpga-development-kit>`_) can be found on the `Netcope Technologies website <http://www.netcope.com/>`_. -.. note:: - - This driver has external dependencies. - Therefore it is disabled in default configuration files. - It can be enabled by setting ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2=y`` - and recompiling. - .. note:: Currently the driver is supported only on x86_64 architectures. @@ -63,15 +56,6 @@ The minimum version of the provided packages: * for DPDK up to 18.02 (including): **3.0.5** -Configuration -------------- - -These configuration options can be modified before compilation in the -``.config`` file: - -* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2`` default value: **n** - - Value **y** enables compilation of szedata2 PMD. Using the SZEDATA2 PMD ---------------------- @@ -129,7 +113,7 @@ transmit channel: .. code-block:: console - $RTE_TARGET/app/testpmd -l 0-3 -n 2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 2 \ -- --port-topology=chained --rxq=2 --txq=2 --nb-cores=2 -i -a Example output: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index b1ef9eba59..a928a790e3 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -43,26 +43,6 @@ Prerequisites ------------- - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD`` (default ``y``) - - Toggle compilation of the ``librte_pmd_thunderx_nicvf`` driver. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX`` (default ``n``) - - Toggle asserts of receive fast path. - -- ``CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX`` (default ``n``) - - Toggle asserts of transmit fast path. Driver compilation and testing ------------------------------ @@ -70,8 +50,7 @@ Driver compilation and testing Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>` for details. -To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linux-gcc as target. +Use config/arm/arm64-thunderx-linux-gcc as a meson cross-file when cross-compiling. Linux ----- @@ -178,7 +157,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./<build_dir>/app/dpdk-testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop diff --git a/doc/guides/nics/vdev_netvsc.rst b/doc/guides/nics/vdev_netvsc.rst index d1da071187..d9f6319b9f 100644 --- a/doc/guides/nics/vdev_netvsc.rst +++ b/doc/guides/nics/vdev_netvsc.rst @@ -61,12 +61,6 @@ This driver implementation may be temporary and should be improved or removed either when hot-plug will be fully supported in EAL and bus drivers or when a new NetVSC driver will be integrated. -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD`` (default ``y``) - - Toggle compilation of this driver. Run-time parameters ------------------- diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst index d36f3120b2..ee802ec4a8 100644 --- a/doc/guides/nics/vhost.rst +++ b/doc/guides/nics/vhost.rst @@ -90,7 +90,7 @@ This section demonstrates vhost PMD with testpmd DPDK sample application. .. code-block:: console - ./testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i + ./dpdk-testpmd -l 0-3 -n 4 --vdev 'net_vhost0,iface=/tmp/sock0,queues=1' -- -i Other basic DPDK preparations like hugepage enabling here. Please refer to the *DPDK Getting Started Guide* for detailed instructions. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 4477c1c160..c03c2d0fed 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -110,7 +110,7 @@ Host2VM communication example .. code-block:: console - examples/kni/build/app/kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" + <build_dir>/examples/dpdk-kni -l 0-3 -n 4 -- -p 0x1 -P --config="(0,1,3)" This command generates one network device vEth0 for physical port. If specify more physical ports, the generated network device will be vEth1, vEth2, and so on. @@ -340,7 +340,7 @@ Here we use l3fwd-power as an example to show how to get started. .. code-block:: console - $ l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ + $ dpdk-l3fwd-power -l 0-1 -- -p 1 -P --config="(0,0,1)" \ --no-numa --parse-ptype -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides Ciara Power @ 2020-10-22 8:31 ` Thomas Monjalon 2020-10-22 10:03 ` Power, Ciara 0 siblings, 1 reply; 300+ messages in thread From: Thomas Monjalon @ 2020-10-22 8:31 UTC (permalink / raw) To: Ciara Power, Bruce Richardson Cc: dev, Igor Russkikh, Ferruh Yigit, Harman Kalra, Ajit Khaparde, Hyong Youb Kim, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Gaetan Rivet, Qi Zhang, Xiao Wang, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Beilei Xing, Jeff Guo, Qiming Yang, Haiyue Wang, Alfredo Cardigliano, Rosen Xu, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Jasvinder Singh, Cristian Dumitrescu, Maciej Czekaj, Maxime Coquelin, Chenbo Xia, Zhihong Wang Hi, I would like to apply this series. I see some small things that I could fix. Please see the comments below to confirm. 21/10/2020 10:17, Ciara Power: > -.. _bnx2x_driver-compilation: > + .. _bnx2x_driver-compilation: was it changed by mistake? [...] > #. Load ``igb_uio`` or ``vfio-pci`` driver: > > + Before compiling, make sure to enable kmods for the meson build:: > + > + meson configure -Denable_kmods=true > + igb_uio is moved so I think this addition is not relevant anymore. [...] > -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) > - > - Toggles display of bus configurations and enables a debugging queue > - to fetch error (Rx/Tx) packets to driver. By default, packets with errors > - (like wrong checksum) are dropped by the hardware. > - > -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) > - > - Enables debugging of the Queue and Buffer Manager layer which interacts > - with the DPAA hardware. I feel these explanations should be kept. Or do you think it's not worth? [...] > -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) > - > - Toggle display of debugging messages/logic > - > -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) > - > - Toggle to use physical address vs virtual address for hardware accelerators. Keep these ones? [...] > - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or disables debug > - logging of RX logic within the ENA PMD driver. > - > - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or disables debug > - logging of TX logic within the ENA PMD driver. > - > - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug > - logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. Keep? Or debug options not worth? [...] > -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) > - > - Build PMD with additional code to make it loadable without hard > - dependencies on **libibverbs** nor **libmlx5**, which may not be installed > - on the target system. > - > - In this mode, their presence is still required for it to run properly, > - however their absence won't prevent a DPDK application from starting (with > - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as > - missing with ``ldd(1)``. > - > - It works by moving these dependencies to a purpose-built rdma-core "glue" > - plug-in which must either be installed in a directory whose name is based > - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a > - standard location for the dynamic linker (e.g. ``/lib``) if left to the > - default empty string (``""``). > - > - This option has no performance impact. > - > -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) > - > - Embed static flavor of the dependencies **libibverbs** and **libmlx5** > - in the PMD shared library or the executable static binary. > - > -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) > - > - Toggle debugging code and stricter compilation flags. Enabling this option > - adds additional run-time checks and debugging messages at the cost of > - lower performance. > - > -.. note:: > - > - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This > - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to > - 64. Default armv8a configuration of make build and meson build set it to 128 > - then brings performance degradation. > - > -This option is available in meson: > +The ibverbs libraries can be linked with this PMD in a number of ways, > +configured by the "ibverbs_link" build option. This can take on the > +following values: > > - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. I would reword to include explanations above. [...] > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) > - > - Toggle display of transmit fast path run-time messages. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) > - > - Toggle display of receive fast path run-time messages. > - > -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) > +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) > > Gives absolute path of firmware file. > ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` > @@ -130,6 +117,16 @@ enabling debugging options may affect system performance. > CAUTION this option is more for custom firmware, it is not > recommended for use under normal condition. > > +The following options can be enabled with Meson flags. > + > +- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **disabled**) > + > + Toggle display of transmit fast path run-time messages. > + > +- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **disabled**) > + > + Toggle display of receive fast path run-time messages. CONFIG_ should be removed. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides 2020-10-22 8:31 ` Thomas Monjalon @ 2020-10-22 10:03 ` Power, Ciara 2020-10-22 10:16 ` Thomas Monjalon 0 siblings, 1 reply; 300+ messages in thread From: Power, Ciara @ 2020-10-22 10:03 UTC (permalink / raw) To: Thomas Monjalon, Richardson, Bruce Cc: dev, Igor Russkikh, Yigit, Ferruh, Harman Kalra, Ajit Khaparde, Hyong Youb Kim, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Gaetan Rivet, Zhang, Qi Z, Wang, Xiao W, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Xing, Beilei, Guo, Jia, Yang, Qiming, Wang, Haiyue, Alfredo Cardigliano, Xu, Rosen, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Singh, Jasvinder, Dumitrescu, Cristian, Maciej Czekaj, Maxime Coquelin, Xia, Chenbo, Wang, Zhihong Hi Thomas, Thanks for reviewing, these changes seem fine overall, comments inline. Thanks, Ciara >-----Original Message----- >From: Thomas Monjalon <thomas@monjalon.net> >Sent: Thursday 22 October 2020 09:32 <snip> >Subject: Re: [dpdk-dev] [PATCH v7 03/14] doc: remove references to make >from NICs guides > >Hi, > >I would like to apply this series. >I see some small things that I could fix. >Please see the comments below to confirm. > >21/10/2020 10:17, Ciara Power: >> -.. _bnx2x_driver-compilation: >> + .. _bnx2x_driver-compilation: > >was it changed by mistake? > Yes sorry, that change was unintentional. >[...] >> #. Load ``igb_uio`` or ``vfio-pci`` driver: >> >> + Before compiling, make sure to enable kmods for the meson build:: >> + >> + meson configure -Denable_kmods=true >> + > >igb_uio is moved so I think this addition is not relevant anymore. > Yes agreed, can remove. >[...] >> -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) >> - >> - Toggles display of bus configurations and enables a debugging queue >> - to fetch error (Rx/Tx) packets to driver. By default, packets with >> errors >> - (like wrong checksum) are dropped by the hardware. >> - >> -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) >> - >> - Enables debugging of the Queue and Buffer Manager layer which >> interacts >> - with the DPAA hardware. > >I feel these explanations should be kept. >Or do you think it's not worth? > Yes sure, keep them. >[...] >> -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) >> - >> - Toggle display of debugging messages/logic >> - >> -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) >> - >> - Toggle to use physical address vs virtual address for hardware >accelerators. > >Keep these ones? > Yes can keep, although one thing to note is I think RTE_LIBRTE_DPAA2_USE_PHYS_IOVA is now enabled by default, going by config/meson.build: dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) >[...] >> - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or >disables debug >> - logging of RX logic within the ENA PMD driver. >> - >> - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or >disables debug >> - logging of TX logic within the ENA PMD driver. >> - >> - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or >disables debug >> - logging of low level tx/rx logic in ena_com(base) within the ENA PMD >driver. > >Keep? Or debug options not worth? > Yes sure, I have no problems keeping them. >[...] >> -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) >> - >> - Build PMD with additional code to make it loadable without hard >> - dependencies on **libibverbs** nor **libmlx5**, which may not be >> installed >> - on the target system. >> - >> - In this mode, their presence is still required for it to run >> properly, >> - however their absence won't prevent a DPDK application from >> starting (with >> - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up >as >> - missing with ``ldd(1)``. >> - >> - It works by moving these dependencies to a purpose-built rdma-core >"glue" >> - plug-in which must either be installed in a directory whose name is >> based >> - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or >> in a >> - standard location for the dynamic linker (e.g. ``/lib``) if left to >> the >> - default empty string (``""``). >> - >> - This option has no performance impact. >> - >> -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) >> - >> - Embed static flavor of the dependencies **libibverbs** and >> **libmlx5** >> - in the PMD shared library or the executable static binary. >> - >> -- ``CONFIG_RTE_LIBRTE_MLX5_DEBUG`` (default **n**) >> - >> - Toggle debugging code and stricter compilation flags. Enabling this >> option >> - adds additional run-time checks and debugging messages at the cost >> of >> - lower performance. >> - >> -.. note:: >> - >> - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This >> - will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set >``RTE_CACHE_LINE_SIZE`` to >> - 64. Default armv8a configuration of make build and meson build set it to >128 >> - then brings performance degradation. >> - >> -This option is available in meson: >> +The ibverbs libraries can be linked with this PMD in a number of >> +ways, configured by the "ibverbs_link" build option. This can take on >> +the following values: >> >> - ``ibverbs_link`` can be ``static``, ``shared``, or ``dlopen``. > >I would reword to include explanations above. > I agree, I made that change for the vdpadevs/mlx5 doc (https://patchwork.dpdk.org/patch/81678/) , I missed it in these NIC guides. >[...] >> -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **n**) >> - >> - Toggle display of transmit fast path run-time messages. >> - >> -- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **n**) >> - >> - Toggle display of receive fast path run-time messages. >> - >> -- ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**) >> +- ``RTE_LIBRTE_QEDE_FW`` (default **""**) >> >> Gives absolute path of firmware file. >> ``Eg: "/lib/firmware/qed/qed_init_values-8.40.33.0.bin"`` >> @@ -130,6 +117,16 @@ enabling debugging options may affect system >performance. >> CAUTION this option is more for custom firmware, it is not >> recommended for use under normal condition. >> >> +The following options can be enabled with Meson flags. >> + >> +- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX`` (default **disabled**) >> + >> + Toggle display of transmit fast path run-time messages. >> + >> +- ``CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX`` (default **disabled**) >> + >> + Toggle display of receive fast path run-time messages. > >CONFIG_ should be removed. > Agreed, missed that when adding them back in, thanks. ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides 2020-10-22 10:03 ` Power, Ciara @ 2020-10-22 10:16 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-22 10:16 UTC (permalink / raw) To: Richardson, Bruce, Power, Ciara Cc: dev, Igor Russkikh, Yigit, Ferruh, Harman Kalra, Ajit Khaparde, Hyong Youb Kim, Shepard Siegel, Ed Czeck, John Miller, Igor Russkikh, Pavel Belous, Somalapuram Amaranath, Rasesh Mody, Shahed Shaikh, Somnath Kotur, Rahul Lakkireddy, Hemant Agrawal, Sachin Saxena, Marcin Wojtas, Michal Krawczyk, Guy Tzalik, Evgeny Schemeilin, Igor Chauskin, Gagandeep Singh, John Daley, Gaetan Rivet, Zhang, Qi Z, Wang, Xiao W, Ziyang Xuan, Xiaoyun Wang, Guoyang Zhou, Wei Hu (Xavier), Min Hu (Connor), Yisen Zhuang, Xing, Beilei, Guo, Jia, Yang, Qiming, Wang, Haiyue, Alfredo Cardigliano, Xu, Rosen, Shijith Thotton, Srisivasubramanian Srinivasan, Jakub Grajciar, Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko, Zyta Szpak, Liron Himi, Martin Spinler, Heinrich Kuhn, Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, Singh, Jasvinder, Dumitrescu, Cristian, Maciej Czekaj, Maxime Coquelin, Xia, Chenbo, Wang, Zhihong 22/10/2020 12:03, Power, Ciara: > From: Thomas Monjalon <thomas@monjalon.net> > >> -- ``CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER`` (default ``n``) > >> - > >> - Toggles display of bus configurations and enables a debugging queue > >> - to fetch error (Rx/Tx) packets to driver. By default, packets with > >> errors > >> - (like wrong checksum) are dropped by the hardware. > >> - > >> -- ``CONFIG_RTE_LIBRTE_DPAA_HWDEBUG`` (default ``n``) > >> - > >> - Enables debugging of the Queue and Buffer Manager layer which > >> interacts > >> - with the DPAA hardware. > > > >I feel these explanations should be kept. > >Or do you think it's not worth? > > Yes sure, keep them. You dropped other debug flags, so it's OK drop them as you did. > >[...] > >> -- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) > >> - > >> - Toggle display of debugging messages/logic > >> - > >> -- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``n``) > >> - > >> - Toggle to use physical address vs virtual address for hardware > >accelerators. > > > >Keep these ones? > > > > Yes can keep, although one thing to note is I think RTE_LIBRTE_DPAA2_USE_PHYS_IOVA is now enabled by default, going by config/meson.build: > dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) OK so let's drop. > >[...] > >> - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_RX** (default n): Enables or > >disables debug > >> - logging of RX logic within the ENA PMD driver. > >> - > >> - * **CONFIG_RTE_LIBRTE_ENA_DEBUG_TX** (default n): Enables or > >disables debug > >> - logging of TX logic within the ENA PMD driver. > >> - > >> - * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or > >disables debug > >> - logging of low level tx/rx logic in ena_com(base) within the ENA PMD > >driver. > > > >Keep? Or debug options not worth? > > > > Yes sure, I have no problems keeping them. No problem to drop :) ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 04/14] doc: remove references to make from vdpadevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (2 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 05/14] doc: remove references to make from bbdevs guides Ciara Power ` (10 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Matan Azrad, Xiao Wang, Viacheslav Ovsiienko Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Matan Azrad <matan@nvidia.com> --- v7: Modified compilation options to detail meson option ibverbs_link. --- doc/guides/vdpadevs/ifc.rst | 13 ------------- doc/guides/vdpadevs/mlx5.rst | 34 ++++++++++++---------------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/doc/guides/vdpadevs/ifc.rst b/doc/guides/vdpadevs/ifc.rst index 12a2a342e6..f968489a75 100644 --- a/doc/guides/vdpadevs/ifc.rst +++ b/doc/guides/vdpadevs/ifc.rst @@ -11,19 +11,6 @@ directly by DMA. Besides, it supports dirty page logging and device state report/restore, this driver enables its vDPA functionality. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux) - - Toggle compilation of the ``librte_pmd_ifc`` driver. - - IFCVF vDPA Implementation ------------------------- diff --git a/doc/guides/vdpadevs/mlx5.rst b/doc/guides/vdpadevs/mlx5.rst index 2c7a550afc..9a11eefd2c 100644 --- a/doc/guides/vdpadevs/mlx5.rst +++ b/doc/guides/vdpadevs/mlx5.rst @@ -14,9 +14,7 @@ SR-IOV context. .. note:: - Due to external dependencies, this driver is disabled in default - configuration of the "make" build. It can be enabled with - ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=y`` or by using "meson" build system which + This driver is enabled automatically when using "meson" build system which will detect dependencies. @@ -62,16 +60,13 @@ Prerequisites - Mellanox OFED version: **5.0** see :doc:`../../nics/mlx5` guide for more Mellanox OFED details. -Compilation options -~~~~~~~~~~~~~~~~~~~ +Compilation option +~~~~~~~~~~~~~~~~~~ -These options can be modified in the ``.config`` file. +The meson option ``ibverbs_link`` is **shared** by default, +but can be configured to have the following values: -- ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` (default **n**) - - Toggle compilation of librte_pmd_mlx5 itself. - -- ``CONFIG_RTE_IBVERBS_LINK_DLOPEN`` (default **n**) +- ``dlopen`` Build PMD with additional code to make it loadable without hard dependencies on **libibverbs** nor **libmlx5**, which may not be installed @@ -79,28 +74,23 @@ These options can be modified in the ``.config`` file. In this mode, their presence is still required for it to run properly, however their absence won't prevent a DPDK application from starting (with - ``CONFIG_RTE_BUILD_SHARED_LIB`` disabled) and they won't show up as - missing with ``ldd(1)``. + DPDK shared build disabled) and they won't show up as missing with ``ldd(1)``. It works by moving these dependencies to a purpose-built rdma-core "glue" - plug-in which must either be installed in a directory whose name is based - on ``CONFIG_RTE_EAL_PMD_PATH`` suffixed with ``-glue`` if set, or in a - standard location for the dynamic linker (e.g. ``/lib``) if left to the - default empty string (``""``). + plug-in which must be installed in a directory whose name is based + on ``RTE_EAL_PMD_PATH`` suffixed with ``-glue``. This option has no performance impact. -- ``CONFIG_RTE_IBVERBS_LINK_STATIC`` (default **n**) +- ``static`` Embed static flavor of the dependencies **libibverbs** and **libmlx5** in the PMD shared library or the executable static binary. .. note:: - For BlueField, target should be set to ``arm64-bluefield-linux-gcc``. This - will enable ``CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD`` and set - ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and - meson build set it to 128 then brings performance degradation. + Default armv8a configuration of meson build sets ``RTE_CACHE_LINE_SIZE`` + to 128 then brings performance degradation. Run-time configuration ~~~~~~~~~~~~~~~~~~~~~~ -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 05/14] doc: remove references to make from bbdevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (3 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 04/14] doc: remove references to make from vdpadevs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 06/14] doc: remove references to make from cryptodevs guides Ciara Power ` (9 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Nicolas Chautru Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v5: Added meson steps to turbo_sw doc. --- doc/guides/bbdevs/fpga_5gnr_fec.rst | 5 +---- doc/guides/bbdevs/fpga_lte_fec.rst | 5 +---- doc/guides/bbdevs/turbo_sw.rst | 23 ++++++++--------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/doc/guides/bbdevs/fpga_5gnr_fec.rst b/doc/guides/bbdevs/fpga_5gnr_fec.rst index c199c8787d..61c19c31e6 100644 --- a/doc/guides/bbdevs/fpga_5gnr_fec.rst +++ b/doc/guides/bbdevs/fpga_5gnr_fec.rst @@ -51,10 +51,7 @@ FPGA 5GNR FEC does not support the following: Installation ------------ -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA 5GNR FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC``, -is already set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index 7731ad0e94..9d64e15d10 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -50,10 +50,7 @@ FPGA LTE FEC does not support the following: Installation -------------- -Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The -default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already -set. +Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. DPDK requires hugepages to be configured as detailed in section 2 of the DPDK manual. The bbdev test application has been tested with a configuration 40 x 1GB hugepages. The diff --git a/doc/guides/bbdevs/turbo_sw.rst b/doc/guides/bbdevs/turbo_sw.rst index 20620c2e20..43c5129fd7 100644 --- a/doc/guides/bbdevs/turbo_sw.rst +++ b/doc/guides/bbdevs/turbo_sw.rst @@ -12,14 +12,6 @@ Note that the driver can also be built without any dependency with reduced functionality for maintenance purpose. To enable linking to the SDK libraries see detailed installation section below. -Two flags can be enabled depending on whether the target machine can support -AVX2 and AVX512 instructions sets and the related SDK libraries for vectorized -signal processing functions are installed : -- CONFIG_RTE_BBDEV_SDK_AVX2 -- CONFIG_RTE_BBDEV_SDK_AVX512 -By default these 2 flags are disabled by default. For AVX2 machine and SDK -library installed then the first flag can be enabled. For AVX512 machine and -SDK library installed then both flags can be enabled for full real time capability. This PMD supports the functions: FEC, Rate Matching and CRC functions detailed in the Features section. @@ -144,20 +136,21 @@ In order to enable this virtual bbdev PMD, the user may: FlexRAN SDK libraries were installed. And ``DIR_WIRELESS_SDK`` to the path where the libraries were extracted. +* Tune the meson build option pointing the location of the FlexRAN SDK libraries ``flexran_sdk`` + Example: .. code-block:: console export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ + cd build + meson configure -Dflexran_sdk=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx512-icc/install + +* For AVX512 machines with SDK libraries installed then both 4G and 5G can be enabled for full real time FEC capability. + For AVX2 machines it is possible to only enable the 4G libraries and the PMD capabilities will be limited to 4G FEC. + If no library is present then the PMD driver will still build but its capabilities will be limited accordingly. -* Set ``CONFIG_RTE_BBDEV_SDK_AVX2=y`` and ``CONFIG_RTE_BBDEV_SDK_AVX512=y`` - in DPDK common configuration file ``config/common_base`` to be able to use - the SDK libraries as mentioned above. - For AVX2 machine it is possible to only enable CONFIG_RTE_BBDEV_SDK_AVX2 - for limited 4G functionality. - If no flag are set the PMD driver will still build but its capabilities - will be limited accordingly. To use the PMD in an application, user must: -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 06/14] doc: remove references to make from cryptodevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (4 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 05/14] doc: remove references to make from bbdevs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:33 ` Ruifeng Wang 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 07/14] doc: remove references to make from compressdevs guides Ciara Power ` (8 subsequent siblings) 14 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Akhil Goyal, Declan Doherty, Pablo de Lara, Ruifeng Wang, Gagandeep Singh, Hemant Agrawal, Somalapuram Amaranath, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Akhil Goyal <akhil.goyal@nxp.com> --- doc/guides/cryptodevs/aesni_gcm.rst | 4 +- doc/guides/cryptodevs/aesni_mb.rst | 4 +- doc/guides/cryptodevs/armv8.rst | 3 -- doc/guides/cryptodevs/caam_jr.rst | 30 ------------- doc/guides/cryptodevs/ccp.rst | 12 ++---- doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- doc/guides/cryptodevs/kasumi.rst | 11 +---- doc/guides/cryptodevs/mvsam.rst | 10 +---- doc/guides/cryptodevs/nitrox.rst | 7 ---- doc/guides/cryptodevs/null.rst | 2 +- doc/guides/cryptodevs/octeontx.rst | 12 +----- doc/guides/cryptodevs/octeontx2.rst | 8 +--- doc/guides/cryptodevs/openssl.rst | 6 +-- doc/guides/cryptodevs/qat.rst | 65 +++++++---------------------- doc/guides/cryptodevs/scheduler.rst | 8 ---- doc/guides/cryptodevs/snow3g.rst | 10 +---- doc/guides/cryptodevs/virtio.rst | 20 +++------ doc/guides/cryptodevs/zuc.rst | 10 +---- 19 files changed, 38 insertions(+), 234 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst index 0e146486ea..e4f244a991 100644 --- a/doc/guides/cryptodevs/aesni_gcm.rst +++ b/doc/guides/cryptodevs/aesni_gcm.rst @@ -94,8 +94,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_gcm") within the application. @@ -115,5 +113,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_gcm,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain AEAD --aead_algo "aes-gcm" diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 2ff264937c..32850c977c 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -141,8 +141,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Set CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_aesni_mb") within the application. @@ -162,7 +160,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_aesni_mb,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_HASH --cipher_algo "aes-cbc" --auth_algo "sha1-hmac" Extra notes diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linux-gcc - The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index 6d9daf7364..5ef33ae78e 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -109,36 +109,6 @@ Currently supported by DPDK: * Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file -to enable caam_jr PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linux config. - Toggle compilation of the ``librte_pmd_caam_jr`` driver. - -* ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) - By default it is disabled. - It can be used when the underlying hardware supports the CAAM in BE mode. - LS1043A, LS1046A and LS1012A support CAAM in BE mode. - LS1028A supports CAAM in LE mode. - -Installations -------------- -To compile the caam_jr PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/ccp.rst b/doc/guides/cryptodevs/ccp.rst index 9c1997768a..4cf9f5907e 100644 --- a/doc/guides/cryptodevs/ccp.rst +++ b/doc/guides/cryptodevs/ccp.rst @@ -56,10 +56,8 @@ AEAD algorithms: Installation ------------ -To compile ccp PMD, it has to be enabled in the config/common_base file and openssl -packages have to be installed in the build environment. - -* ``CONFIG_RTE_LIBRTE_PMD_CCP=y`` +To compile ccp PMD, openssl packages have to be installed in the build +environment. For Ubuntu 16.04 LTS use below to install openssl in the build system: @@ -85,8 +83,6 @@ The following command assumes ``BFD`` as ``0000:09:00.2``:: cd to the top-level DPDK directory ./usertools/dpdk-devbind.py -b igb_uio 0000:09:00.2 -In order to enable the ccp crypto PMD, user must set CONFIG_RTE_LIBRTE_PMD_CCP=y in config/common_base. - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_ccp") within the application. @@ -108,7 +104,7 @@ To validate ccp pmd, l2fwd-crypto example can be used with following command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff @@ -123,7 +119,7 @@ following: .. code-block:: console - sudo ./build/l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 1 -n 4 --vdev "crypto_ccp,ccp_auth_opt=1" -- -p 0x1 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo aes-cbc --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b82..080768a2e7 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -167,31 +167,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA2 config file options are described in :ref:`dpaa2_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA2_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa2_sec`` driver. - -Installations -------------- -To compile the DPAA2_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e9189..da14a68d9c 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -111,31 +111,6 @@ See :doc:`../platform/dpaa` for setup information - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -Basic DPAA config file options are described in :ref:`dpaa_overview`. -In addition to those, the following options can be modified in the ``config`` file -to enable DPAA_SEC PMD. - -Please note that enabling debugging options may affect system performance. - -* ``CONFIG_RTE_LIBRTE_PMD_DPAA_SEC`` (default ``n``) - By default it is only enabled in defconfig_arm64-dpaa-* config. - Toggle compilation of the ``librte_pmd_dpaa_sec`` driver. - -Installations -------------- -To compile the DPAA_SEC PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst index 09a538f816..5770a60cb2 100644 --- a/doc/guides/cryptodevs/kasumi.rst +++ b/doc/guides/cryptodevs/kasumi.rst @@ -89,15 +89,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_KASUMI\)=n,\1=y,' build/.config - make - - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_kasumi") within the application. @@ -117,7 +108,7 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_kasumi,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "kasumi-f8" Extra notes on KASUMI F9 diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 399fe37a67..6188c1248c 100644 --- a/doc/guides/cryptodevs/mvsam.rst +++ b/doc/guides/cryptodevs/mvsam.rst @@ -64,14 +64,6 @@ Limitations Installation ------------ -MVSAM CRYPTO PMD driver compilation is disabled by default due to external dependencies. -Currently there are two driver specific compilation options in -``config/common_base`` available: - -- ``CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO`` (default: ``n``) - - Toggle compilation of the librte_pmd_mvsam driver. - MVSAM CRYPTO PMD requires MUSDK built with EIP197 support thus following extra option must be passed to the library configuration script: @@ -105,7 +97,7 @@ operation: .. code-block:: console - ./l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ + ./dpdk-l2fwd-crypto --vdev=eth_mvpp2,iface=eth0 --vdev=crypto_mvsam -- \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ --auth_op GENERATE --auth_algo sha1-hmac \ diff --git a/doc/guides/cryptodevs/nitrox.rst b/doc/guides/cryptodevs/nitrox.rst index 095e545c6a..82c4418cd3 100644 --- a/doc/guides/cryptodevs/nitrox.rst +++ b/doc/guides/cryptodevs/nitrox.rst @@ -35,13 +35,6 @@ Limitations * Session-less APIs are not supported. -Installation ------------- - -For compiling the Nitrox crypto PMD, please check if the -CONFIG_RTE_LIBRTE_PMD_NITROX setting is set to `y` in config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_NITROX=y`` Initialization -------------- diff --git a/doc/guides/cryptodevs/null.rst b/doc/guides/cryptodevs/null.rst index c980e0ac84..aac5904b1d 100644 --- a/doc/guides/cryptodevs/null.rst +++ b/doc/guides/cryptodevs/null.rst @@ -67,5 +67,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_null,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "null" diff --git a/doc/guides/cryptodevs/octeontx.rst b/doc/guides/cryptodevs/octeontx.rst index 4fa199e3c4..d813cb2974 100644 --- a/doc/guides/cryptodevs/octeontx.rst +++ b/doc/guides/cryptodevs/octeontx.rst @@ -59,14 +59,6 @@ Supported Asymmetric Crypto Algorithms * ``RTE_CRYPTO_ASYM_XFORM_RSA`` * ``RTE_CRYPTO_ASYM_XFORM_MODEX`` -Config flags ------------- - -For compiling the OCTEON TX crypto poll mode driver, please check if the -CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO setting is set to `y` in -config/common_base file. - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y`` Compilation ----------- @@ -135,7 +127,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_autotest The asymmetric crypto operations on OCTEON TX crypto PMD may be verified by running the test @@ -143,5 +135,5 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx_asym_autotest diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst index b927c8f21d..0a38b8662e 100644 --- a/doc/guides/cryptodevs/octeontx2.rst +++ b/doc/guides/cryptodevs/octeontx2.rst @@ -70,10 +70,6 @@ Installation The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or cross-compiled on an x86 platform. -Enable OCTEON TX2 crypto PMD in your config file: - -* ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y`` - Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK application. @@ -148,7 +144,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_autotest The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test @@ -156,7 +152,7 @@ application: .. code-block:: console - ./test + ./dpdk-test RTE>>cryptodev_octeontx2_asym_autotest diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index 7407294813..ca0f0b43f3 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -58,8 +58,8 @@ Supported Asymmetric Crypto algorithms: Installation ------------ -To compile openssl PMD, it has to be enabled in the config/common_base file -and appropriate openssl packages have to be installed in the build environment. +To compile openssl PMD, appropriate openssl packages have to be installed +in the build environment. The newest openssl library version is supported: @@ -93,7 +93,7 @@ To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console - sudo ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" + sudo ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_openssl" --vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index a0becf6891..f77ce91f76 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -207,27 +207,6 @@ Configuring and Building the DPDK QAT PMDs Further information on configuring, building and installing DPDK is described :doc:`here <../linux_gsg/build_dpdk>`. - -Quick instructions for QAT cryptodev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_SYM\)=n,\1=y,' build/.config - or/and - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM\)=n,\1=y,' build/.config - make - -Quick instructions for QAT compressdev PMD are as follows: - -.. code-block:: console - - cd to the top-level DPDK directory - make defconfig - make - - .. _building_qat_config: Build Configuration @@ -237,38 +216,32 @@ These are the build configuration options affecting QAT, and their default value .. code-block:: console - CONFIG_RTE_LIBRTE_PMD_QAT=y - CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n - CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n - CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48 - CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 - -CONFIG_RTE_LIBRTE_PMD_QAT must be enabled for any QAT PMD to be built. + RTE_PMD_QAT_MAX_PCI_DEVICES=48 + RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536 Both QAT SYM PMD and QAT ASYM PMD have an external dependency on libcrypto, so are not -built by default. CONFIG_RTE_LIBRTE_PMD_QAT_SYM/ASYM should be enabled to build them. +built by default. -The QAT compressdev PMD has no external dependencies, so needs no configuration -options and is built by default. +The QAT compressdev PMD has no external dependencies, so is built by default. The number of VFs per PF varies - see table below. If multiple QAT packages are -installed on a platform then CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES should be +installed on a platform then RTE_PMD_QAT_MAX_PCI_DEVICES should be adjusted to the number of VFs which the QAT common code will need to handle. .. Note:: There are separate config items (not QAT-specific) for max cryptodevs - CONFIG_RTE_CRYPTO_MAX_DEVS and max compressdevs CONFIG_RTE_COMPRESS_MAX_DEVS, + RTE_CRYPTO_MAX_DEVS and max compressdevs RTE_COMPRESS_MAX_DEVS, if necessary these should be adjusted to handle the total of QAT and other devices which the process will use. In particular for crypto, where each QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error - during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be + during PMD initialisation. To avoid this problem RTE_CRYPTO_MAX_DEVS may be increased or -w, pci-whitelist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression -with Dynamic Huffman encoding. CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE +with Dynamic Huffman encoding. RTE_PMD_QAT_COMP_IM_BUFFER_SIZE specifies the size of a single buffer, the PMD will allocate a multiple of these, plus some extra space for associated meta-data. For GEN2 devices, 20 buffers are allocated while for GEN1 devices, 12 buffers are allocated, plus 1472 bytes overhead. @@ -483,7 +456,6 @@ To complete the installation follow the instructions in insmod ./drivers/crypto/qat/qat_common/intel_qat.ko insmod ./drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko - .. Note:: If you see the following warning in ``/var/log/messages`` it can be ignored: @@ -659,27 +631,20 @@ Testing QAT SYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_autotest QAT ASYM crypto PMD can be tested by running the test application:: - make defconfig - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>cryptodev_qat_asym_autotest QAT compression PMD can be tested by running the test application:: - make defconfig - sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config - make -j - cd ./build/app - ./test -l1 -n1 -w <your qat bdf> + cd ./<build_dir>/app/test + ./dpdk-test -l1 -n1 -w <your qat bdf> RTE>>compressdev_autotest @@ -703,7 +668,7 @@ the process cmdline, e.g. using any of the following:: The global RTE_LOG_DP_LEVEL overrides data-path trace so must be set to RTE_LOG_DEBUG to see all the trace. This variable is in config/rte_config.h - for meson build and config/common_base for gnu make. + for meson build. Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst index 565de40f37..0b731fe8ad 100644 --- a/doc/guides/cryptodevs/scheduler.rst +++ b/doc/guides/cryptodevs/scheduler.rst @@ -32,14 +32,6 @@ Limitations is enabled. -Installation ------------- - -To build DPDK with CRYTPO_SCHEDULER_PMD the user is required to set -CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y in config/common_base, and -recompile DPDK - - Initialization -------------- diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst index e0cddc2d77..13341c39c4 100644 --- a/doc/guides/cryptodevs/snow3g.rst +++ b/doc/guides/cryptodevs/snow3g.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_SNOW3G\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_snow3g") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_snow3g,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "snow3g-uea2" diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index 2c46bda866..83d8e32397 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -83,27 +83,17 @@ The unit test cases can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "cryptodev_virtio_autotest" to test + cd to <build_dir> + meson test cryptodev_virtio_autotest The performance can be tested as below: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linux-gcc - export RTE_SDK=`pwd` - cd to app/test-crypto-perf - type the command "make" to compile - run the tests with the following command: - - ./dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ + cd to <build_dir> + + ./app/dpdk-test-crypto-perf -l 0,1 -- --devtype crypto_virtio \ --ptest throughput --optype cipher-then-auth --cipher-algo aes-cbc \ --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac \ --auth-op generate --auth-key-sz 64 --digest-sz 12 \ diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index 9b51ba141d..907840ef05 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -88,14 +88,6 @@ In order to enable this virtual crypto PMD, user must: * Build the multi buffer library (explained in Installation section). -* Build DPDK as follows: - -.. code-block:: console - - make config T=x86_64-native-linux-gcc - sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config - make - To use the PMD in an application, user must: * Call rte_vdev_init("crypto_zuc") within the application. @@ -115,5 +107,5 @@ Example: .. code-block:: console - ./l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ + ./dpdk-l2fwd-crypto -l 1 -n 4 --vdev="crypto_zuc,socket_id=0,max_nb_sessions=128" \ -- -p 1 --cdev SW --chain CIPHER_ONLY --cipher_algo "zuc-eea3" -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v7 06/14] doc: remove references to make from cryptodevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 06/14] doc: remove references to make from cryptodevs guides Ciara Power @ 2020-10-21 8:33 ` Ruifeng Wang 0 siblings, 0 replies; 300+ messages in thread From: Ruifeng Wang @ 2020-10-21 8:33 UTC (permalink / raw) To: Ciara Power, dev Cc: Kevin Laatz, Akhil.goyal@nxp.com, Declan Doherty, Pablo de Lara, Gagandeep Singh, hemant.agrawal, Somalapuram Amaranath, Michael Shamis, Liron Himi, Nagadheeraj Rottela, Srikanth Jampala, Anoob Joseph, Ankur Dwivedi, John Griffin, Fiona Trahe, Deepak Kumar Jain, Fan Zhang, Jay Zhou, nd > -----Original Message----- > From: Ciara Power <ciara.power@intel.com> > Sent: Wednesday, October 21, 2020 4:17 PM > To: dev@dpdk.org > Cc: Ciara Power <ciara.power@intel.com>; Kevin Laatz > <kevin.laatz@intel.com>; Akhil.goyal@nxp.com; Declan Doherty > <declan.doherty@intel.com>; Pablo de Lara > <pablo.de.lara.guarch@intel.com>; Ruifeng Wang > <Ruifeng.Wang@arm.com>; Gagandeep Singh <g.singh@nxp.com>; > hemant.agrawal@nxp.com; Somalapuram Amaranath > <asomalap@amd.com>; Michael Shamis <michaelsh@marvell.com>; Liron > Himi <lironh@marvell.com>; Nagadheeraj Rottela > <rnagadheeraj@marvell.com>; Srikanth Jampala <jsrikanth@marvell.com>; > Anoob Joseph <anoobj@marvell.com>; Ankur Dwivedi > <adwivedi@marvell.com>; John Griffin <john.griffin@intel.com>; Fiona > Trahe <fiona.trahe@intel.com>; Deepak Kumar Jain > <deepak.k.jain@intel.com>; Fan Zhang <roy.fan.zhang@intel.com>; Jay > Zhou <jianjay.zhou@huawei.com> > Subject: [PATCH v7 06/14] doc: remove references to make from cryptodevs > guides > > Make is no longer supported for compiling DPDK, references are now > removed in the documentation. > > Signed-off-by: Ciara Power <ciara.power@intel.com> > Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> > Acked-by: Akhil Goyal <akhil.goyal@nxp.com> > --- > doc/guides/cryptodevs/aesni_gcm.rst | 4 +- > doc/guides/cryptodevs/aesni_mb.rst | 4 +- > doc/guides/cryptodevs/armv8.rst | 3 -- > doc/guides/cryptodevs/caam_jr.rst | 30 ------------- > doc/guides/cryptodevs/ccp.rst | 12 ++---- > doc/guides/cryptodevs/dpaa2_sec.rst | 25 ----------- > doc/guides/cryptodevs/dpaa_sec.rst | 25 ----------- > doc/guides/cryptodevs/kasumi.rst | 11 +---- > doc/guides/cryptodevs/mvsam.rst | 10 +---- > doc/guides/cryptodevs/nitrox.rst | 7 ---- > doc/guides/cryptodevs/null.rst | 2 +- > doc/guides/cryptodevs/octeontx.rst | 12 +----- > doc/guides/cryptodevs/octeontx2.rst | 8 +--- > doc/guides/cryptodevs/openssl.rst | 6 +-- > doc/guides/cryptodevs/qat.rst | 65 +++++++---------------------- > doc/guides/cryptodevs/scheduler.rst | 8 ---- > doc/guides/cryptodevs/snow3g.rst | 10 +---- > doc/guides/cryptodevs/virtio.rst | 20 +++------ > doc/guides/cryptodevs/zuc.rst | 10 +---- > 19 files changed, 38 insertions(+), 234 deletions(-) > -snip- > diff --git a/doc/guides/cryptodevs/armv8.rst > b/doc/guides/cryptodevs/armv8.rst index fee85354ba..d30ef6168e 100644 > --- a/doc/guides/cryptodevs/armv8.rst > +++ b/doc/guides/cryptodevs/armv8.rst > @@ -40,9 +40,6 @@ In order to enable this virtual crypto PMD, user must: > > make -C $ARMV8_CRYPTO_LIB_PATH/ > > -* Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in > - config/defconfig_arm64-armv8a-linux-gcc > - > The corresponding device can be created only if the following features are > supported by the CPU: > Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com> PS: A document patch covers armv8-crypto meson build is at: http://patches.dpdk.org/patch/80707/ -snip- ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 07/14] doc: remove references to make from compressdevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (5 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 06/14] doc: remove references to make from cryptodevs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 08/14] doc: remove references to make from eventdevs guides Ciara Power ` (7 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Kevin Laatz, Lee Daly, Ashish Gupta, Sunila Sahu Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Lee Daly <lee.daly@intel.com> --- doc/guides/compressdevs/isal.rst | 4 ---- doc/guides/compressdevs/octeontx.rst | 24 ++---------------------- doc/guides/compressdevs/zlib.rst | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/doc/guides/compressdevs/isal.rst b/doc/guides/compressdevs/isal.rst index af1f41f240..1d146fb4a6 100644 --- a/doc/guides/compressdevs/isal.rst +++ b/doc/guides/compressdevs/isal.rst @@ -133,10 +133,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ISAL=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_isal")`` within the application. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index 5924ad1fa3..8c658721b9 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -56,21 +56,6 @@ Steps To Setup Platform SDK and related information can be obtained from: `Cavium support site <https://support.cavium.com/>`_. -Installation ------------- - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX ZIP PMD for Linux arm64 gcc target, run the -following ``make`` command: - - .. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - - Initialization -------------- @@ -96,10 +81,5 @@ probed. To use the PMD in an application, user must: .. code-block:: console reserve enough huge pages - cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linux-gcc - export RTE_SDK=`pwd` - cd to app/test - type the command "make" to compile - run the tests with "./test" - type the command "compressdev_autotest" to test + cd to <build_dir> + meson test compressdev_autotest diff --git a/doc/guides/compressdevs/zlib.rst b/doc/guides/compressdevs/zlib.rst index 986c59d43b..6e397ecd7e 100644 --- a/doc/guides/compressdevs/zlib.rst +++ b/doc/guides/compressdevs/zlib.rst @@ -53,10 +53,6 @@ Installation Initialization -------------- -In order to enable this virtual compression PMD, user must: - -* Set ``CONFIG_RTE_LIBRTE_PMD_ZLIB=y`` in config/common_base. - To use the PMD in an application, user must: * Call ``rte_vdev_init("compress_zlib")`` within the application. -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 08/14] doc: remove references to make from eventdevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (6 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 07/14] doc: remove references to make from compressdevs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 09/14] doc: remove references to make from rawdevs guides Ciara Power ` (6 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Hemant Agrawal, Nipun Gupta, Jerin Jacob, Pavan Nikhilesh Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> --- v7: - Removed unused headers. - Promoted some sub-headers. --- doc/guides/eventdevs/dpaa.rst | 23 ----------------------- doc/guides/eventdevs/dpaa2.rst | 23 ----------------------- doc/guides/eventdevs/octeontx.rst | 24 ------------------------ doc/guides/eventdevs/octeontx2.rst | 15 ++------------- 4 files changed, 2 insertions(+), 83 deletions(-) diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index be68c6da6f..266f92d159 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -40,29 +40,6 @@ Currently supported by DPDK: - Follow the DPDK :ref:`Getting Started Guide for Linux <linux_gsg>` to setup the basic DPDK environment. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_dpaa_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 835767f98d..33f13d0543 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -49,29 +49,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_event`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 EVENTDEV PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index 21d251341f..4621ebe80a 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -41,30 +41,6 @@ Prerequisites See :doc:`../platform/octeontx` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. -Please note that enabling debugging options may affect system performance. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx_ssovf`` driver. - -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the OCTEON TX SSOVF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-thunderx-linux-gcc install - Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst index 6502f6415f..4f06e06984 100644 --- a/doc/guides/eventdevs/octeontx2.rst +++ b/doc/guides/eventdevs/octeontx2.rst @@ -44,20 +44,9 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Compile time Config Options -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following option can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV`` (default ``y``) - - Toggle compilation of the ``librte_pmd_octeontx2_event`` driver. Runtime Config Options -~~~~~~~~~~~~~~~~~~~~~~ +---------------------- - ``Maximum number of in-flight events`` (default ``8192``) @@ -159,7 +148,7 @@ Runtime Config Options -w 0002:0e:00.0,npa_lock_mask=0xf Debugging Options -~~~~~~~~~~~~~~~~~ +----------------- .. _table_octeontx2_event_debug_options: -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 09/14] doc: remove references to make from rawdevs guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (7 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 08/14] doc: remove references to make from eventdevs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 10/14] doc: remove references to make from app guides Ciara Power ` (5 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Bruce Richardson, Rosen Xu, Nipun Gupta, Tianfei zhang, Xiaoyun Li, Jingjing Wu, Satha Rao, Mahipal Challa Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Rosen Xu <rosen.xu@intel.com> --- v6: Modified compilation section for ioat based on v5 feedback. --- doc/guides/rawdevs/dpaa2_cmdif.rst | 21 --------------------- doc/guides/rawdevs/dpaa2_qdma.rst | 21 --------------------- doc/guides/rawdevs/ifpga.rst | 10 ---------- doc/guides/rawdevs/ntb.rst | 6 ------ doc/guides/rawdevs/octeontx2_dma.rst | 12 ------------ doc/guides/rawdevs/octeontx2_ep.rst | 8 -------- 6 files changed, 78 deletions(-) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index be9805874b..7ac3963938 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -44,17 +44,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_cmdif`` driver. Enabling logs ------------- @@ -68,16 +57,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.cmdif`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 CMDIF PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 129e83d5ef..92921fafdd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -48,17 +48,6 @@ Currently supported by DPDK: Some part of fslmc bus code (mc flib - object library) routines are dual licensed (BSD & GPLv2). -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_dpaa2_qdma`` driver. Enabling logs ------------- @@ -72,16 +61,6 @@ For enabling logs, use the following EAL parameter: Using ``pmd.raw.dpaa2.qdma`` as log matching criteria, all Event PMD logs can be enabled which are lower than logging ``level``. -Driver Compilation -~~~~~~~~~~~~~~~~~~ - -To compile the DPAA2 QDMA PMD for Linux arm64 gcc target, run the -following ``make`` command: - -.. code-block:: console - - cd <DPDK-source-directory> - make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/ifpga.rst b/doc/guides/rawdevs/ifpga.rst index a3d92a62ea..dbd0d6e37d 100644 --- a/doc/guides/rawdevs/ifpga.rst +++ b/doc/guides/rawdevs/ifpga.rst @@ -76,16 +76,6 @@ summarized by the following block diagram:: | vdev_ifpga_cfg driver | | Intel FpgaDev | +------------------------------------+ +-----------------+ -Build options -------------- - -- ``CONFIG_RTE_LIBRTE_IFPGA_BUS`` (default ``y``) - - Toggle compilation of IFPGA Bus library. - -- ``CONFIG_RTE_LIBRTE_IFPGA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ifpga_rawdev`` driver. Run-time parameters ------------------- diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst index 39e4d65f87..2c5fa7690c 100644 --- a/doc/guides/rawdevs/ntb.rst +++ b/doc/guides/rawdevs/ntb.rst @@ -30,12 +30,6 @@ Skylake is https://www.intel.com/content/dam/support/us/en/documents/server-prod - Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This is a hardware requirement. -Build Options -------------- - -- ``CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV`` (default ``y``) - - Toggle compilation of the ``ntb`` driver. Device Setup ------------ diff --git a/doc/guides/rawdevs/octeontx2_dma.rst b/doc/guides/rawdevs/octeontx2_dma.rst index 4a9794489e..6887da5278 100644 --- a/doc/guides/rawdevs/octeontx2_dma.rst +++ b/doc/guides/rawdevs/octeontx2_dma.rst @@ -26,18 +26,6 @@ Prerequisites and Compilation procedure See :doc:`../platform/octeontx2` for setup information. -Pre-Installation Configuration ------------------------------- - -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_dma`` driver. - Enabling logs ------------- diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index b03fcf789a..fb9d346ccf 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -18,14 +18,6 @@ This OCTEON TX2 End Point mode PMD supports #. Packet Output - OCTEON TX2 to Host with info pointer mode. -Config File Options -~~~~~~~~~~~~~~~~~~~ - -The following options can be modified in the ``config`` file. - -- ``CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV`` (default ``y``) - - Toggle compilation of the ``lrte_pmd_octeontx2_ep`` driver. Initialization -------------- -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 10/14] doc: remove references to make from app guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (8 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 09/14] doc: remove references to make from rawdevs guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 11/14] doc: remove reference to make from tools guides Ciara Power ` (4 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Nicolas Chautru, Ferruh Yigit, Olivier Matz, David Hunt, Harry van Haaren, Marko Kovacevic, Bernard Iremonger, Ori Kam, Bruce Richardson, Konstantin Ananyev, Cristian Dumitrescu, Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori, Pavan Nikhilesh, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram, Anatoly Burakov, Xiaoyun Li, Jingjing Wu, Reshma Pattan, John McNamara, Jasvinder Singh, Byron Marohn, Yipeng Wang, Robert Sanford, Erik Gabriel Carrillo, Maxime Coquelin, Chenbo Xia, Zhihong Wang, Wenzhuo Lu, Beilei Xing While make has been deprecated for DPDK, it's still applicable for some example apps to be built standalone, this patch adjusts the guides to take that into consideration. Signed-off-by: Ciara Power <ciara.power@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> --- v6: Modified commit log based on suggestions on v5. --- doc/guides/sample_app_ug/bbdev_app.rst | 34 ++------ doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/compiling.rst | 83 +++++++------------ doc/guides/sample_app_ug/dist_app.rst | 4 +- doc/guides/sample_app_ug/ethtool.rst | 2 +- .../sample_app_ug/eventdev_pipeline.rst | 3 +- doc/guides/sample_app_ug/fips_validation.rst | 10 +-- doc/guides/sample_app_ug/flow_classify.rst | 4 +- doc/guides/sample_app_ug/flow_filtering.rst | 25 +----- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/ioat.rst | 6 +- doc/guides/sample_app_ug/ip_frag.rst | 6 +- doc/guides/sample_app_ug/ip_pipeline.rst | 4 +- doc/guides/sample_app_ug/ip_reassembly.rst | 9 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 14 +--- doc/guides/sample_app_ug/ipv4_multicast.rst | 4 +- doc/guides/sample_app_ug/keep_alive.rst | 4 +- .../sample_app_ug/kernel_nic_interface.rst | 14 ++-- doc/guides/sample_app_ug/l2_forward_cat.rst | 4 +- .../sample_app_ug/l2_forward_crypto.rst | 4 +- doc/guides/sample_app_ug/l2_forward_event.rst | 10 +-- .../sample_app_ug/l2_forward_job_stats.rst | 4 +- .../sample_app_ug/l2_forward_real_virtual.rst | 6 +- doc/guides/sample_app_ug/l3_forward.rst | 10 +-- .../sample_app_ug/l3_forward_access_ctrl.rst | 6 +- doc/guides/sample_app_ug/l3_forward_graph.rst | 4 +- .../sample_app_ug/l3_forward_power_man.rst | 14 ++-- doc/guides/sample_app_ug/link_status_intr.rst | 4 +- doc/guides/sample_app_ug/multi_process.rst | 20 ++--- doc/guides/sample_app_ug/ntb.rst | 2 +- doc/guides/sample_app_ug/packet_ordering.rst | 3 +- .../sample_app_ug/performance_thread.rst | 44 +++------- doc/guides/sample_app_ug/ptpclient.rst | 9 +- doc/guides/sample_app_ug/qos_metering.rst | 2 +- doc/guides/sample_app_ug/qos_scheduler.rst | 10 +-- doc/guides/sample_app_ug/rxtx_callbacks.rst | 9 +- doc/guides/sample_app_ug/server_node_efd.rst | 2 +- doc/guides/sample_app_ug/service_cores.rst | 23 +---- doc/guides/sample_app_ug/skeleton.rst | 2 +- doc/guides/sample_app_ug/tep_termination.rst | 43 +++------- doc/guides/sample_app_ug/test_pipeline.rst | 4 +- doc/guides/sample_app_ug/timer.rst | 2 +- doc/guides/sample_app_ug/vdpa.rst | 4 +- doc/guides/sample_app_ug/vhost.rst | 11 +-- doc/guides/sample_app_ug/vhost_blk.rst | 2 +- doc/guides/sample_app_ug/vhost_crypto.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 34 ++++---- .../sample_app_ug/vmdq_dcb_forwarding.rst | 8 +- doc/guides/sample_app_ug/vmdq_forwarding.rst | 8 +- doc/guides/testpmd_app_ug/run_app.rst | 6 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 +- 51 files changed, 199 insertions(+), 356 deletions(-) diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46..764155f983 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -31,30 +31,12 @@ Limitations Compiling the Application ------------------------- -#. DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along - with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* - documentation for more details on this. +DPDK needs to be built with ``baseband_turbo_sw`` PMD driver enabled along +with ``FLEXRAN SDK`` Libraries. Refer to *SW Turbo Poll Mode Driver* +documentation for more details on this. -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/bbdev_app - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started Guide* for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make Running the Application ----------------------- @@ -63,8 +45,8 @@ The application accepts a number of command line options: .. code-block:: console - $ ./build/bbdev [EAL options] -- [-e ENCODING_CORES] [-d DECODING_CORES] / - [-p ETH_PORT_ID] [-b BBDEV_ID] + $ ./<build_dir>/examples/dpdk-bbdev [EAL options] -- [-e ENCODING_CORES] / + [-d DECODING_CORES] [-p ETH_PORT_ID] [-b BBDEV_ID] where: @@ -84,8 +66,8 @@ issue the command: .. code-block:: console - $ ./build/bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> -c 0x38 --socket-mem=2,2 \ - --file-prefix=bbdev -- -e 0x10 -d 0x20 + $ ./<build_dir>/examples/dpdk-bbdev --vdev='baseband_turbo_sw' -w <NIC0PCIADDR> \ + -c 0x38 --socket-mem=2,2 --file-prefix=bbdev -- -e 0x10 -d 0x20 where, NIC0PCIADDR is the PCI address of the Rx port diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index 6deb6c8112..5e3a25a317 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -52,7 +52,7 @@ To run the application in linux environment, issue the following command: .. code-block:: console - $ ./build/cmdline -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-cmdline -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst index 6f04743c82..adde775d4e 100644 --- a/doc/guides/sample_app_ug/compiling.rst +++ b/doc/guides/sample_app_ug/compiling.rst @@ -9,100 +9,75 @@ This section explains how to compile the DPDK sample applications. To compile all the sample applications -------------------------------------- -Set the path to DPDK source code if its not set: +Go to DPDK build directory: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + cd dpdk/<build_dir> -Go to DPDK source: - - .. code-block:: console - - cd $RTE_SDK - -Build DPDK: +Enable examples compilation: .. code-block:: console - make defconfig - make + meson configure -Dexamples=all -Build the sample applications: +Build: .. code-block:: console - export RTE_TARGET=build - make -C examples + ninja -For other possible ``RTE_TARGET`` values and additional information on -compiling see +For additional information on compiling see :ref:`Compiling DPDK on Linux <linux_gsg_compiling_dpdk>` or :ref:`Compiling DPDK on FreeBSD <building_from_source>`. -Applications are output to: ``$RTE_SDK/examples/app-dir/build`` or -``$RTE_SDK/examples/app-dir/$RTE_TARGET``. +Applications are output to: ``dpdk/<build_dir>/examples``. -In the example above the compiled application is written to the ``build`` subdirectory. -To have the applications written to a different location, -the ``O=/path/to/build/directory`` option may be specified in the make command. +To compile a single application +------------------------------- - .. code-block:: console - make O=/tmp +Using meson +~~~~~~~~~~~ -To build the applications for debugging use the ``DEBUG`` option. -This option adds some extra flags, disables compiler optimizations and -sets verbose output. +Go to DPDK build directory: .. code-block:: console - make DEBUG=1 - - -To compile a single application -------------------------------- + cd dpdk/<build_dir> -Set the path to DPDK source code: +Enable example app compilation: - .. code-block:: console + .. code-block:: console - export RTE_SDK=/path/to/rte_sdk + meson configure -Dexamples=helloworld -Go to DPDK source: +Build: - .. code-block:: console + .. code-block:: console - cd $RTE_SDK + ninja -Build DPDK: - .. code-block:: console +Using Make +~~~~~~~~~~ - make defconfig - make +Pkg-config is used when building an example app standalone using make, please +see :ref:`building_app_using_installed_dpdk` for more information. Go to the sample application directory. Unless otherwise specified the sample -applications are located in ``$RTE_SDK/examples/``. - +applications are located in ``dpdk/examples/``. Build the application: .. code-block:: console - export RTE_TARGET=build make -To cross compile the sample application(s) ------------------------------------------- - -For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command. -In example of AARCH64 cross compiling: +To build the application for debugging use the ``DEBUG`` option. +This option adds some extra flags, disables compiler optimizations and +sets verbose output. .. code-block:: console - export RTE_TARGET=build - export RTE_SDK=/path/to/rte_sdk - make -C examples CROSS=aarch64-linux-gnu- - or - make CROSS=aarch64-linux-gnu- + make DEBUG=1 diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 90270e3a58..3bd03905c3 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -42,7 +42,7 @@ Running the Application .. code-block:: console - ./build/distributor_app [EAL options] -- -p PORTMASK + ./<build-dir>/examples/dpdk-distributor [EAL options] -- -p PORTMASK where, @@ -53,7 +53,7 @@ Running the Application .. code-block:: console - $ ./build/distributor_app -l 1-9,22 -n 4 -- -p f + $ ./<build-dir>/examples/dpdk-distributor -l 1-9,22 -n 4 -- -p f #. Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ethtool.rst b/doc/guides/sample_app_ug/ethtool.rst index 253004dd00..7819871917 100644 --- a/doc/guides/sample_app_ug/ethtool.rst +++ b/doc/guides/sample_app_ug/ethtool.rst @@ -24,7 +24,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./ethtool-app/${RTE_TARGET}/ethtool [EAL options] + ./<build_dir>/examples/dpdk-ethtool [EAL options] Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index dc7972aa9a..b4fc587a09 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -46,7 +46,8 @@ these settings is shown below: .. code-block:: console - ./build/eventdev_pipeline --vdev event_sw0 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D + ./<build_dir>/examples/dpdk-eventdev_pipeline --vdev event_sw0 -- -r1 -t1 / + -e4 -w FF00 -s4 -n0 -c32 -W1000 -D The application has some sanity checking built-in, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 8d3db2214d..ca37fc0b38 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -70,9 +70,7 @@ Compiling the Application * Compile Application - .. code-block:: console - - make -C examples/fips_validation + To compile the sample application see :doc:`compiling`. * Run ``dos2unix`` on the request files @@ -92,7 +90,7 @@ The application requires a number of command line options: .. code-block:: console - ./fips_validation [EAL options] + ./dpdk-fips_validation [EAL options] -- --req-file FILE_PATH/FOLDER_PATH --rsp-file FILE_PATH/FOLDER_PATH [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder] @@ -123,7 +121,7 @@ file for crypto_aesni_mb PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_mb -- + $ ./dpdk-fips_validation --vdev crypto_aesni_mb -- --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb @@ -132,7 +130,7 @@ data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console - $ ./fips_validation --vdev crypto_aesni_gcm0 -- + $ ./dpdk-fips_validation --vdev crypto_aesni_gcm0 -- --req-file /PATH/TO/REQUEST/FILE/FOLDER/ --rsp-file ./PATH/TO/RESPONSE/FILE/FOLDER/ --cryptodev-id 0 --path-is-folder diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index 31175cff0a..01915971ae 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -28,8 +28,8 @@ To run the example in a ``linux`` environment: .. code-block:: console - cd ~/dpdk/examples/flow_classify - ./build/flow_classify -c 4 -n 4 -- --rule_ipv4="../ipv4_rules_file.txt" + ./<build_dir>/examples/dpdk-flow_classify -c 4 -n 4 -- / + --rule_ipv4="../ipv4_rules_file.txt" Please refer to the *DPDK Getting Started Guide*, section :doc:`../linux_gsg/build_sample_apps` diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index d3653e57b2..ee5a8b44bd 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -13,28 +13,7 @@ It is intended as a demonstration of the basic components RTE flow rules. Compiling the Application ------------------------- -To compile the application export the path to the DPDK source tree and go to -the example directory: - -.. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - - cd ${RTE_SDK}/examples/flow_filtering - -Set the target, for example: - -.. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - -See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. - -Build the application as follows: - -.. code-block:: console - - make +To compile the sample application see :doc:`compiling`. Running the Application @@ -44,7 +23,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/flow -l 1 -n 1 + ./<build_dir>/examples/dpdk-flow_filtering -l 1 -n 1 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 46f997a7dc..8f48533873 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -21,7 +21,7 @@ To run the example in a linux environment: .. code-block:: console - $ ./build/helloworld -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-helloworld -l 0-3 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ioat.rst b/doc/guides/sample_app_ug/ioat.rst index 964160dff8..efd9bea367 100644 --- a/doc/guides/sample_app_ug/ioat.rst +++ b/doc/guides/sample_app_ug/ioat.rst @@ -45,7 +45,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/ioatfwd [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] + ./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s RS] [-c <sw|hw>] [--[no-]mac-updating] where, @@ -81,7 +81,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw + $ ./<build_dir>/examples/dpdk-ioat -l 0-2 -n 2 -- -p 0x1 --mac-updating -c sw To run the application in a Linux environment with 2 lcores (the master lcore, plus one forwarding core), 2 ports (ports 0 and 1), hardware copying and no MAC @@ -89,7 +89,7 @@ updating issue the command: .. code-block:: console - $ ./build/ioatfwd -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw + $ ./<build_dir>/examples/dpdk-ioat -l 0-1 -n 1 -- -p 0x3 --no-mac-updating -c hw Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index afeaff3639..92d5e4aeae 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -53,7 +53,7 @@ Application usage: .. code-block:: console - ./build/ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ip_fragmentation [EAL options] -- -p PORTMASK [-q NQ] where: @@ -65,7 +65,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_fragmentation -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -94,7 +94,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_fragmentation -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. diff --git a/doc/guides/sample_app_ug/ip_pipeline.rst b/doc/guides/sample_app_ug/ip_pipeline.rst index 56014be174..1d8656c637 100644 --- a/doc/guides/sample_app_ug/ip_pipeline.rst +++ b/doc/guides/sample_app_ug/ip_pipeline.rst @@ -34,7 +34,7 @@ Running the application The application startup command line is:: - ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] + dpdk-ip_pipeline [EAL_ARGS] -- [-s SCRIPT_FILE] [-h HOST] [-p PORT] The application startup arguments are: @@ -71,7 +71,7 @@ The following is an example command to run ip pipeline application configured fo .. code-block:: console - $ ./build/ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli + $ ./<build_dir>/examples/dpdk-ip_pipeline -c 0x3 -- -s examples/route_ecmp.cli The application should start successfully and display as follows: diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index f34b9d0055..e72c8492e9 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -42,7 +42,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] + ./<build_dir>/examples/dpdk-ip_reassembly [EAL options] -- -p PORTMASK [-q NQ] [--maxflows=FLOWS>] [--flowttl=TTL[(s|ms)]] where: @@ -61,7 +61,7 @@ To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) wi .. code-block:: console - ./build/ip_reassembly -l 2,4 -n 3 -- -p 5 + ./<build_dir>/examples/dpdk-ip_reassembly -l 2,4 -n 3 -- -p 5 EAL: coremask set to 14 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 1 @@ -92,7 +92,7 @@ To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with .. code-block:: console - ./build/ip_reassembly -l 4 -n 3 -- -p 5 -q 2 + ./<build_dir>/examples/dpdk-ip_reassembly -l 4 -n 3 -- -p 5 -q 2 To test the application, flows should be set up in the flow generator that match the values in the l3fwd_ipv4_route_array and/or l3fwd_ipv6_route_array table. @@ -231,7 +231,8 @@ Debug logging and Statistics Collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The RTE_LIBRTE_IP_FRAG_TBL_STAT controls statistics collection for the IP Fragment Table. -This macro is disabled by default. +This macro is disabled by default, but it can be enabled by modifying the appropriate line +in ``config/rte_config.h``. To make ip_reassembly print the statistics to the standard output, the user must send either an USR1, INT or TERM signal to the process. For all of these signals, the ip_reassembly process prints Fragment table statistics for each RX queue, diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 434f484138..1f37dccf8b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -116,12 +116,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ipsec-secgw`` sub-directory. -#. [Optional] Build the application for debugging: - This option adds some extra flags, disables compiler optimizations and - is verbose:: - - make DEBUG=1 - Running the Application ----------------------- @@ -129,7 +123,7 @@ Running the Application The application has a number of command line options:: - ./build/ipsec-secgw [EAL options] -- + ./<build_dir>/examples/dpdk-ipsec-secgw [EAL options] -- -p PORTMASK -P -u PORTMASK -j FRAMESIZE -l -w REPLAY_WINOW_SIZE -e -a -c SAD_CACHE_SIZE @@ -245,7 +239,7 @@ The mapping of lcores to port/queues is similar to other l3fwd applications. For example, given the following command line to run application in poll mode:: - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ --vdev "crypto_null" -- -p 0xf -P -u 0x3 \ --config="(0,0,20),(1,0,20),(2,0,21),(3,0,21)" \ -f /path/to/config_file --transfer-mode poll \ @@ -297,7 +291,7 @@ where each option means: Similarly for example, given the following command line to run application in event app mode:: - ./build/ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -c 0x3 -- -P -p 0x3 -u 0x1 \ -f /path/to/config_file --transfer-mode event \ --event-schedule-type parallel \ @@ -336,7 +330,7 @@ For example, something like the following command line: .. code-block:: console - ./build/ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ + ./<build_dir>/examples/dpdk-ipsec-secgw -l 20,21 -n 4 --socket-mem 0,2048 \ -w 81:00.0 -w 81:00.1 -w 81:00.2 -w 81:00.3 \ --vdev "crypto_aesni_mb" --vdev "crypto_null" \ -- \ diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index 8923a7f548..7c6e8b15cc 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -50,7 +50,7 @@ The application has a number of command line options: .. code-block:: console - ./build/ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] + ./<build_dir>/examples/dpdk-ipv4_multicast [EAL options] -- -p PORTMASK [-q NQ] where, @@ -67,7 +67,7 @@ Typically, to run the IPv4 Multicast sample application, issue the following com .. code-block:: console - ./build/ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 + ./<build_dir>/examples/dpdk-ipv4_multicast -l 0-3 -n 3 -- -p 0x3 -q 1 In this command: diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..ef7936f80f 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -49,7 +49,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l2fwd-keepalive [EAL options] \ + ./<build_dir>/examples/dpdk-l2fwd-keepalive [EAL options] \ -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD] where, @@ -68,7 +68,7 @@ To run the application in linux environment with 4 lcores, 16 ports .. code-block:: console - ./build/l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 + ./<build_dir>/examples/dpdk-l2fwd-keepalive -l 0-3 -n 4 -- -q 8 -p ffff -K 10 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index aac4ebd8d4..ef441cc1e5 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -96,7 +96,7 @@ The ``kni`` example application requires a number of command line options: .. code-block:: console - kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] + dpdk-kni [EAL options] -- -p PORTMASK --config="(port,lcore_rx,lcore_tx[,lcore_kthread,...])[,(port,lcore_rx,lcore_tx[,lcore_kthread,...])]" [-P] [-m] Where: @@ -168,8 +168,8 @@ interface ``vEth1_0`` with the kernel thread bound to lcore 9. .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8),(1,5,7,9)" The following example is identical, except an additional ``lcore_kthread`` core is specified per physical port. In this case, ``kni`` will create @@ -186,8 +186,8 @@ The kernel thread for each interface will be bound as follows: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko kthread_mode=multiple - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko kthread_mode=multiple + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 -m --config="(0,4,6,8,10),(1,5,7,9,11)" The following example can be used to test the interface between the ``kni`` test application and the ``rte_kni`` kernel module. In this example, @@ -206,8 +206,8 @@ disabled by **not** specifying the ``-m`` flag to ``kni``: .. code-block:: console # rmmod rte_kni - # insmod kmod/rte_kni.ko lo_mode=lo_mode_fifo carrier=on - # ./build/kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" + # insmod <build_dir>/kernel/linux/kni/rte_kni.ko lo_mode=lo_mode_fifo carrier=on + # ./<build-dir>/examples/dpdk-kni -l 4-7 -n 4 -- -P -p 0x3 --config="(0,4,6,8),(1,5,7,9)" KNI Operations -------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 0a813200ba..c1be2d7dff 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -70,13 +70,13 @@ To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="0x3@(0-2)" or to enable CAT and CDP on cpus 1,3: .. code-block:: console - ./build/l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" + ./<build_dir>/examples/dpdk-l2fwd-cat -l 1 -n 4 -- --l3ca="(0x00C00,0x00300)@(1,3)" If CDP is not supported it will fail with following error message: diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 962752f21c..e2c0f9f1ec 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / + ./<build_dir>/examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] [-q NQ] [-s] [-T PERIOD] / [--cdev_type HW/SW/ANY] [--chain HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] / [--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] / [--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size SIZE] / @@ -162,7 +162,7 @@ To run the application in linux environment with 2 lcores, 2 ports and 2 crypto .. code-block:: console - $ ./build/l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ + $ ./<build_dir>/examples/dpdk-l2fwd-crypto -l 0-1 -n 4 --vdev "crypto_aesni_mb0" \ --vdev "crypto_aesni_mb1" -- -p 0x3 --chain CIPHER_HASH \ --cipher_op ENCRYPT --cipher_algo aes-cbc \ --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f \ diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index d536eee819..11c9d4b2ee 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -52,7 +52,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE + ./<build_dir>/examples/dpdk-l2fwd-event [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating --mode=MODE --eventq-sched=SCHED_MODE where, @@ -75,20 +75,20 @@ issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=poll Eventdev mode with 4 lcores, 16 ports , sched method ordered and MAC address updating enabled, issue the command: .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -p ffff --eventq-sched=ordered or .. code-block:: console - ./build/l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-3 -n 4 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -105,7 +105,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l2fwd-event -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -q 8 -p ffff --mode=eventdev --eventq-sched=ordered Explanation ----------- diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index 8d0c38721f..1a854abb23 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -81,7 +81,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] + ./<build_dir>/examples/dpdk-l2fwd-jobstats [EAL options] -- -p PORTMASK [-q NQ] [-l] where, @@ -96,7 +96,7 @@ thousands separator printing, issue the command: .. code-block:: console - $ ./build/l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l + $ ./<build_dir>/examples/dpdk-l2fwd-jobstats -l 0-3 -n 4 -- -q 8 -p ffff -l Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index c0e8488e79..5a13de215e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK + ./<build_dir>/examples/dpdk-l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating [--portmap="(port, port)[,(port, port)]"] @@ -111,7 +111,7 @@ updating enabled, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p ffff To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and @@ -119,7 +119,7 @@ vice versa, issue the command: .. code-block:: console - $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + $ ./<build_dir>/examples/dpdk-l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936..7acbd7404e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -51,7 +51,7 @@ Running the Application The application has a number of command line options:: - ./l3fwd [EAL options] -- -p PORTMASK + ./dpdk-l3fwd [EAL options] -- -p PORTMASK [-P] [-E] [-L] @@ -111,7 +111,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: @@ -138,13 +138,13 @@ Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x3 --eventq-sched=ordered or .. code-block:: console - ./build/l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-3 -n 4 -w <event device> -- -p 0x03 --mode=eventdev --eventq-sched=ordered In this command: @@ -166,7 +166,7 @@ scheduler. Following is the sample command: .. code-block:: console - ./build/l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + ./<build_dir>/examples/dpdk-l3fwd -l 0-7 -s 0xf0000 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered In case of eventdev mode, *--config* option is not used for ethernet port configuration. Instead each ethernet port will be configured with mentioned diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index c2d4ca73ab..4a96800ec6 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -184,7 +184,7 @@ Packet 2 matches Rule 2 and is forwarded to port 1. Packet 3 matches Rule 3 and is forwarded to port 0. For more details on the rule file format, -please refer to rule_ipv4.db and rule_ipv6.db files (inside <RTE_SDK>/examples/l3fwd-acl/). +please refer to rule_ipv4.db and rule_ipv6.db files (inside dpdk/examples/l3fwd-acl/). Application Phases ~~~~~~~~~~~~~~~~~~ @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--alg=<val>] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] + ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--alg=<val>] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] where, @@ -271,7 +271,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --alg=scalar + ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --alg=scalar In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_graph.rst b/doc/guides/sample_app_ug/l3_forward_graph.rst index df50827bab..75617e3af1 100644 --- a/doc/guides/sample_app_ug/l3_forward_graph.rst +++ b/doc/guides/sample_app_ug/l3_forward_graph.rst @@ -44,7 +44,7 @@ Running the Application The application has a number of command line options similar to l3fwd:: - ./l3fwd-graph [EAL options] -- -p PORTMASK + ./dpdk-l3fwd-graph [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--eth-dest=X,MM:MM:MM:MM:MM:MM] @@ -79,7 +79,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" + ./<build_dir>/examples/dpdk-l3fwd-graph -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" In this command: diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 0cc6f2e62e..4f997108ba 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -88,7 +88,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./<build_dir>/examples/dpdk-l3fwd_power [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] where, @@ -378,7 +378,7 @@ See :doc:`Power Management<../prog_guide/power_man>` chapter in the DPDK Program .. code-block:: console - ./l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 + ./<build_dir>/examples/dpdk-l3fwd-power -l xxx -n 4 -w 0000:xx:00.0 -w 0000:xx:00.1 -- -p 0x3 -P --config="(0,0,xx),(1,0,xx)" --empty-poll="0,0,0" -l 14 -m 9 -h 1 Where, @@ -407,7 +407,7 @@ app with the training flag set to “1”, and the other parameters set to .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "1,0,0" –P This will run the training algorithm for x seconds on each core (cores 2 and 3), and then print out the recommended threshold values for those @@ -432,7 +432,7 @@ then be started without the training mode so traffic can start immediately. .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P + ./<build_dir>/examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --empty-poll "0,340000,540000" –P Telemetry Mode -------------- @@ -449,13 +449,9 @@ cycles it took is measured and compared with minimum and maximum reference cycles and accordingly busy rate is set to either 0% or 50% or 100%. - .. Note:: - - * The CONFIG_RTE_LIBRTE_TELEMETRY should be set in order to get the stats in DPDK telemetry. - .. code-block:: console - ./examples/l3fwd-power/build/l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry + ./<build_dir>/examples/dpdk-l3fwd-power --telemetry -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --telemetry The new stats ``empty_poll`` , ``full_poll`` and ``busy_percent`` can be viewed by running the script ``/usertools/dpdk-telemetry-client.py`` and selecting the menu option ``Send for global Metrics``. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 1057c7584d..8399a1bd51 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -39,7 +39,7 @@ The application requires a number of command line options: .. code-block:: console - ./build/link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] + ./<build_dir>/examples/dpdk-link_status_interrupt [EAL options] -- -p PORTMASK [-q NQ][-T PERIOD] where, @@ -54,7 +54,7 @@ issue the command: .. code-block:: console - $ ./build/link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff + $ ./<build_dir>/examples/dpdk-link_status_interrupt -l 0-3 -n 4-- -q 8 -p ffff Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index bd329c2db2..411e8ebb49 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -41,7 +41,7 @@ passing at least two cores in the coremask/corelist, as follows: .. code-block:: console - ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary For the first DPDK process run, the proc-type flag can be omitted or set to auto, since all DPDK processes will default to being a primary instance, @@ -50,7 +50,7 @@ The process should start successfully and display a command prompt as follows: .. code-block:: console - $ ./build/simple_mp -l 0-1 -n 4 --proc-type=primary + $ ./<build_dir>/examples/dpdk-simple_mp -l 0-1 -n 4 --proc-type=primary EAL: coremask set to 3 EAL: Detected lcore 0 on socket 0 EAL: Detected lcore 1 on socket 0 @@ -76,7 +76,7 @@ again run the same binary setting at least two cores in the coremask/corelist: .. code-block:: console - ./build/simple_mp -l 2-3 -n 4 --proc-type=secondary + ./<build_dir>/examples/dpdk-simple_mp -l 2-3 -n 4 --proc-type=secondary When running a secondary process such as that shown above, the proc-type parameter can again be specified as auto. However, omitting the parameter altogether will cause the process to try and start as a primary rather than secondary process. @@ -182,10 +182,10 @@ the following commands can be used (assuming run as root): .. code-block:: console - # ./build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 - # ./build/symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 - # ./build/symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 - # ./build/symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 3 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2 + # ./<build_dir>/examples/dpdk-symmetric_mp -l 4 -n 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3 .. note:: @@ -282,9 +282,9 @@ the following commands could be used: .. code-block:: console - # ./mp_server/build/mp_server -l 1-2 -n 4 -- -p 3 -n 2 - # ./mp_client/build/mp_client -l 3 -n 4 --proc-type=auto -- -n 0 - # ./mp_client/build/mp_client -l 4 -n 4 --proc-type=auto -- -n 1 + # ./<build_dir>/examples/dpdk-mp_server -l 1-2 -n 4 -- -p 3 -n 2 + # ./<build_dir>/examples/dpdk-mp_client -l 3 -n 4 --proc-type=auto -- -n 0 + # ./<build_dir>/examples/dpdk-mp_client -l 4 -n 4 --proc-type=auto -- -n 1 .. note:: diff --git a/doc/guides/sample_app_ug/ntb.rst b/doc/guides/sample_app_ug/ntb.rst index 93fb752f25..f80b221db7 100644 --- a/doc/guides/sample_app_ug/ntb.rst +++ b/doc/guides/sample_app_ug/ntb.rst @@ -32,7 +32,7 @@ The only available options are the standard ones for the EAL: .. code-block:: console - ./build/ntb_fwd -c 0xf -n 6 -- -i + ./<build_dir>/examples/dpdk-ntb -c 0xf -n 6 -- -i Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) diff --git a/doc/guides/sample_app_ug/packet_ordering.rst b/doc/guides/sample_app_ug/packet_ordering.rst index 1c8ee5d040..5a4e0a9d28 100644 --- a/doc/guides/sample_app_ug/packet_ordering.rst +++ b/doc/guides/sample_app_ug/packet_ordering.rst @@ -43,7 +43,8 @@ The application execution command line is: .. code-block:: console - ./packet_ordering [EAL options] -- -p PORTMASK [--disable-reorder] [--insight-worker] + ./<build_dir>/examples/dpdk-packet_ordering [EAL options] -- -p PORTMASK / + [--disable-reorder] [--insight-worker] The -c EAL CPU_COREMASK option has to contain at least 3 CPU cores. The first CPU core in the core mask is the master core and would be assigned to diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index b04d0ba444..2a50eb4270 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -55,7 +55,7 @@ Running the Application The application has a number of command line options:: - ./build/l3fwd-thread [EAL options] -- + ./<build_dir>/examples/dpdk-l3fwd-thread [EAL options] -- -p PORTMASK [-P] --rx(port,queue,lcore,thread)[,(port,queue,lcore,thread)] --tx(lcore,thread)[,(lcore,thread)] @@ -141,14 +141,14 @@ in ``--rx/--tx`` are used to affinitize threads to the selected scheduler. For example, the following places every l-thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" The following places RX l-threads on lcore 0 and TX l-threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(2,1)" @@ -164,7 +164,7 @@ place every RX and TX thread on different lcores. For example, the following places every EAL thread on different lcores:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -176,7 +176,7 @@ parameter is used. The following places RX EAL threads on lcore 0 and TX EAL threads on lcore 1 and 2 and so on:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0,1)@0,(2,3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -190,13 +190,13 @@ and its corresponding EAL threads command line can be realized as follows: a) Start every thread on different scheduler (1:1):: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" EAL thread equivalent:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -205,13 +205,13 @@ b) Start all threads on one core (N:1). Start 4 L-threads on lcore 0:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(0,0)(0,1)" Start 4 EAL threads on cpu-set 0:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-3)@0" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -220,14 +220,14 @@ c) Start threads on different cores (N:M). Start 2 L-threads for RX on lcore 0, and 2 L-threads for TX on lcore 1:: - l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 -- -P -p 3 \ --rx="(0,0,0,0)(1,0,0,1)" \ --tx="(1,0)(1,1)" Start 2 EAL threads for RX on cpu-set 0, and 2 EAL threads for TX on cpu-set 1:: - l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ + dpdk-l3fwd-thread -l 0-7 -n 2 --lcores="(0-1)@0,(2-3)@1" -- -P -p 3 \ --rx="(0,0,0,0)(1,0,1,1)" \ --tx="(2,0)(3,1)" \ --no-lthreads @@ -1146,33 +1146,15 @@ in the performance-thread folder To build and run the pthread shim example -#. Go to the example applications folder - - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/performance-thread/pthread_shim - - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the DPDK Getting Started Guide for possible RTE_TARGET values. - #. Build the application: - .. code-block:: console - - make + To compile the sample application see :doc:`compiling`. #. To run the pthread_shim example .. code-block:: console - lthread-pthread-shim -c core_mask -n number_of_channels + dpdk-pthread-shim -c core_mask -n number_of_channels .. _lthread_diagnostics: diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 12b4f13d5b..a58b6f35bf 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -57,13 +57,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. -.. note:: - To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 - and then recompile DPDK: - - .. code-block:: console - - CONFIG_RTE_LIBRTE_IEEE1588=y Running the Application ----------------------- @@ -72,7 +65,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/ptpclient -l 1 -n 4 -- -p 0x1 -T 0 + ./<build_dir>/examples/dpdk-ptpclient -l 1 -n 4 -- -p 0x1 -T 0 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/qos_metering.rst b/doc/guides/sample_app_ug/qos_metering.rst index d75f7da52c..6b6853a0e9 100644 --- a/doc/guides/sample_app_ug/qos_metering.rst +++ b/doc/guides/sample_app_ug/qos_metering.rst @@ -48,7 +48,7 @@ The application execution command line is as below: .. code-block:: console - ./qos_meter [EAL options] -- -p PORTMASK + ./dpdk-qos_meter [EAL options] -- -p PORTMASK The application is constrained to use a single core in the EAL core mask and 2 ports only in the application port mask (first port from the port mask is used for RX and the other port in the core mask is used for TX). diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index b5010657a7..801f5e1286 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -42,8 +42,8 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: To get statistics on the sample app using the command line interface as described in the next section, - DPDK must be compiled defining *CONFIG_RTE_SCHED_COLLECT_STATS*, - which can be done by changing the configuration file for the specific target to be compiled. + DPDK must be compiled defining *RTE_SCHED_COLLECT_STATS*, which can be done by changing the relevant + entry in the ``config/rte_config.h`` file. Running the Application ----------------------- @@ -57,7 +57,7 @@ The application has a number of command line options: .. code-block:: console - ./qos_sched [EAL options] -- <APP PARAMS> + ./<build_dir>/examples/dpdk-qos_sched [EAL options] -- <APP PARAMS> Mandatory application parameters include: @@ -315,7 +315,7 @@ The following is an example command with a single packet flow configuration: .. code-block:: console - ./qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,5,7 -n 4 -- --pfc "3,2,5,7" --cfg ./profile.cfg This example uses a single packet flow configuration which creates one RX thread on lcore 5 reading from port 3 and a worker thread on lcore 7 writing to port 2. @@ -324,7 +324,7 @@ Another example with 2 packet flow configurations using different ports but shar .. code-block:: console - ./qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg + ./<build_dir>/examples/dpdk-qos_sched -l 1,2,6,7 -n 4 -- --pfc "3,2,2,6,7" --pfc "1,0,2,6,7" --cfg ./profile.cfg Note that independent cores for the packet flow configurations for each of the RX, WT and TX thread are also supported, providing flexibility to balance the work. diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 0a69ec71ab..62d1f39d7e 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -25,13 +25,6 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``rxtx_callbacks`` sub-directory. -The callbacks feature requires that the ``CONFIG_RTE_ETHDEV_RXTX_CALLBACKS`` -setting is on in the ``config/common_`` config file that applies to the -target. This is generally on by default: - -.. code-block:: console - - CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y Running the Application ----------------------- @@ -40,7 +33,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/rxtx_callbacks -l 1 -n 4 -- [-t] + ./<build_dir>/examples/dpdk-rxtx_callbacks -l 1 -n 4 -- [-t] Use -t to enable hardware timestamping. If not supported by the NIC, an error will be displayed. diff --git a/doc/guides/sample_app_ug/server_node_efd.rst b/doc/guides/sample_app_ug/server_node_efd.rst index 12208f4258..f27d1ccfce 100644 --- a/doc/guides/sample_app_ug/server_node_efd.rst +++ b/doc/guides/sample_app_ug/server_node_efd.rst @@ -93,7 +93,7 @@ and the back-end node. The frontend server (server) has the following command line options:: - ./server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS + ./<build_dir>/examples/dpdk-server [EAL options] -- -p PORTMASK -n NUM_NODES -f NUM_FLOWS Where, diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index cd0f4717aa..9202be6ea9 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -20,26 +20,9 @@ is application specific, and not a part of the service cores API. Compiling the Application ------------------------- -#. Go to the example directory: +To compile the sample application see :doc:`compiling`. - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/service_cores - -#. Set the target (a default target is used if not specified). For example: - - .. code-block:: console - - export RTE_TARGET=x86_64-native-linux-gcc - - See the *DPDK Getting Started* Guide for possible RTE_TARGET values. - -#. Build the application: - - .. code-block:: console - - make +The application is located in the ``service_cores`` sub-directory. Running the Application ----------------------- @@ -50,7 +33,7 @@ pass a service core-mask as an EAL argument at startup time. .. code-block:: console - $ ./build/service_cores + $ ./<build_dir>/examples/dpdk-service_cores Explanation diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 34f6f9aea7..263d8debc8 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -25,7 +25,7 @@ To run the example in a ``linux`` environment: .. code-block:: console - ./build/basicfwd -l 1 -n 4 + ./<build_dir>/examples/dpdk-skeleton -l 1 -n 4 Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index df159355d6..86ced036ce 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -90,36 +90,17 @@ The example in this section have been validated with the following distributions * Fedora* 20 -Compiling the Sample Code -------------------------- - -To enable vhost, turn on vhost library in the configure file -``config/common_linux``. - - .. code-block:: console - - CONFIG_RTE_LIBRTE_VHOST=y - -Then following the to compile the sample application shown in -:doc:`compiling`. Running the Sample Code ----------------------- -#. Go to the examples directory: +Run the tep_termination sample code: - .. code-block:: console - - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK}/examples/tep_termination - -#. Run the tep_termination sample code: - - .. code-block:: console +.. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- - -p 0x1 --dev-basename tep-termination --nb-devices 4 - --udp-port 4789 --filter-type 1 + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + -p 0x1 --dev-basename tep-termination --nb-devices 4 + --udp-port 4789 --filter-type 1 .. note:: @@ -139,7 +120,7 @@ The default value is 2. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 **Tunneling UDP port.** @@ -149,7 +130,7 @@ The default value is 4789. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 **Filter Type.** @@ -160,7 +141,7 @@ The default value is 1, which means the filter type of inner MAC and tenant ID i .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --udp-port 4789 --filter-type 1 **TX Checksum.** @@ -170,7 +151,7 @@ The default value is 0, which means the checksum offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 2 --tx-checksum **TCP segment size.** @@ -180,7 +161,7 @@ The default value is 0, which means TSO offload is disabled. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --tx-checksum --tso-segsz 800 **Decapsulation option.** @@ -190,7 +171,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --decap 1 **Encapsulation option.** @@ -200,7 +181,7 @@ The default value is 1. .. code-block:: console - user@target:~$ ./build/app/tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- + user@target:~$ ./<build_dir>/examples/dpdk-tep_termination -l 0-3 -n 4 --huge-dir /mnt/huge -- --nb-devices 4 --udp-port 4789 --encap 1 diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst index 5aefd8d89f..d57d08fb2c 100644 --- a/doc/guides/sample_app_ug/test_pipeline.rst +++ b/doc/guides/sample_app_ug/test_pipeline.rst @@ -32,7 +32,7 @@ Compiling the Application ------------------------- To compile the sample application see :doc:`compiling` -The application is located in the ``$RTE_SDK/app/test-pipeline`` directory. +The application is located in the ``dpdk/<build_dir>/app`` directory. Running the Application @@ -45,7 +45,7 @@ The application execution command line is: .. code-block:: console - ./test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE + ./dpdk-test-pipeline [EAL options] -- -p PORTMASK --TABLE_TYPE The -c or -l EAL CPU coremask/corelist option has to contain exactly 3 CPU cores. The first CPU core in the core mask is assigned for core A, the second for core B and the third for core C. diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index 98d762d238..94cee9819d 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -21,7 +21,7 @@ To run the example in linux environment: .. code-block:: console - $ ./build/timer -l 0-3 -n 4 + $ ./<build_dir>/examples/dpdk-timer -l 0-3 -n 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index d66a724827..a8bedbab53 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -29,7 +29,7 @@ Start the vdpa example .. code-block:: console - ./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + ./dpdk-vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] where @@ -51,7 +51,7 @@ Take IFCVF driver for example: .. code-block:: console - ./vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ + ./dpdk-vdpa -c 0x2 -n 4 --socket-mem 1024,1024 \ -w 0000:06:00.3,vdpa=1 -w 0000:06:00.4,vdpa=1 \ -- --interactive diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index b7ed4f8bdf..bacf7898f9 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -38,7 +38,7 @@ Start the vswitch example .. code-block:: console - ./vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ + ./dpdk-vhost-switch -l 0-3 -n 4 --socket-mem 1024 \ -- --socket-file /tmp/sock0 --client \ ... @@ -78,13 +78,13 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 + dpdk/usertools/dpdk-devbind.py -b uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. .. code-block:: console - ./x86_64-native-gcc/app/testpmd -l 0-1 -- -i + ./<build_dir>/app/dpdk-testpmd -l 0-1 -- -i > start tx_first Inject packets @@ -192,11 +192,6 @@ Common Issues max queue number is larger than 128, device start will fail due to insufficient mbuf. - Change the default number to make it work as below, just set the number - according to the NIC's property. :: - - make EXTRA_CFLAGS="-DMAX_QUEUES=320" - * Option "builtin-net-driver" is incompatible with QEMU QEMU vhost net device start will fail if protocol feature is not negotiated. diff --git a/doc/guides/sample_app_ug/vhost_blk.rst b/doc/guides/sample_app_ug/vhost_blk.rst index 681de6f3e1..788eef0d5f 100644 --- a/doc/guides/sample_app_ug/vhost_blk.rst +++ b/doc/guides/sample_app_ug/vhost_blk.rst @@ -36,7 +36,7 @@ Start the vhost_blk example .. code-block:: console - ./vhost_blk -m 1024 + ./dpdk-vhost_blk -m 1024 .. _vhost_blk_app_run_vm: diff --git a/doc/guides/sample_app_ug/vhost_crypto.rst b/doc/guides/sample_app_ug/vhost_crypto.rst index bbc25bde1c..7ae7addac4 100644 --- a/doc/guides/sample_app_ug/vhost_crypto.rst +++ b/doc/guides/sample_app_ug/vhost_crypto.rst @@ -28,7 +28,7 @@ Start the vhost_crypto example .. code-block:: console - ./vhost_crypto [EAL options] -- + ./dpdk-vhost_crypto [EAL options] -- --config (lcore,cdev-id,queue-id)[,(lcore,cdev-id,queue-id)] --socket-file lcore,PATH [--zero-copy] diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 1b6de8e936..35afdac63f 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -245,26 +245,23 @@ To build just the ``vm_power_manager`` application using ``make``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/ + cd dpdk/examples/vm_power_manager/ make -The resulting binary is ``${RTE_SDK}/build/examples/vm_power_manager``. +The resulting binary is ``dpdk/build/examples/vm_power_manager``. To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager ninja -The resulting binary is ``${RTE_SDK}/build/examples/dpdk-vm_power_manager``. +The resulting binary is ``dpdk/build/examples/dpdk-vm_power_manager``. Running the Host Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -274,7 +271,7 @@ than the EAL options: .. code-block:: console - ./build/vm_power_mgr [EAL options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] The application requires exactly two cores to run. One core for the CLI and the other for the channel endpoint monitor. For example, to run on @@ -282,7 +279,7 @@ cores 0 and 1 on a system with four memory channels, issue the command: .. code-block:: console - ./build/vm_power_mgr -l 0-1 -n 4 + ./<build_dir>/examples/dpdk-vm_power_mgr -l 0-1 -n 4 After successful initialization, the VM Power Manager CLI prompt appears: @@ -462,12 +459,10 @@ the following commands: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - export RTE_TARGET=build - cd ${RTE_SDK}/examples/vm_power_manager/guest_cli/ + cd dpdk/examples/vm_power_manager/guest_cli/ make -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. **Note**: This sample application conditionally links in the Jansson JSON library. Consequently, if you are using a multilib or cross-compile @@ -498,15 +493,14 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console - export RTE_SDK=/path/to/rte_sdk - cd ${RTE_SDK} + cd dpdk meson build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli ninja -The resulting binary is ``${RTE_SDK}/build/examples/guest_cli``. +The resulting binary is ``dpdk/build/examples/guest_cli``. Running the Guest Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -515,14 +509,14 @@ The standard EAL command line parameters are necessary: .. code-block:: console - ./build/vm_power_mgr [EAL options] -- [guest options] + ./<build_dir>/examples/dpdk-vm_power_mgr [EAL options] -- [guest options] The guest example uses a channel for each lcore enabled. For example, to run on cores 0, 1, 2 and 3: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 .. _sending_policy: @@ -593,7 +587,7 @@ host, use a command like the following: .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: @@ -707,7 +701,7 @@ To start the application and configure the power policy, and send it to the host .. code-block:: console - ./build/guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 + ./<build_dir>/examples/dpdk-guest_vm_power_mgr -l 0-3 -n 4 -- --vm-name=ubuntu --policy=BRANCH_RATIO --vcpu-list=2-4 Once the VM Power Manager Guest CLI appears, issuing the 'send_policy now' command will send the policy to the host: diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 8e1774d9e2..c908074eb0 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -26,13 +26,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDQ feature to have 32 pools with 4 queues each as indicated in :numref:`figure_vmdq_dcb_example`. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 8 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDQ pools of 4 or 8 queues each. For simplicity, only 16 -or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +or 32 pools is supported in this sample. And queues numbers for each VMDQ pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools, nb-tcs and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss + ./<build_dir>/examples/dpdk-vmdq_dcb [EAL options] -- -p PORTMASK --nb-pools NP --nb-tcs TC --enable-rss where, NP can be 16 or 32, TC can be 4 or 8, rss is disabled by default. @@ -72,7 +72,7 @@ To run the example in a linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq_dcb -l 0-3 -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/sample_app_ug/vmdq_forwarding.rst b/doc/guides/sample_app_ug/vmdq_forwarding.rst index e9bca8c98c..6fbd333a51 100644 --- a/doc/guides/sample_app_ug/vmdq_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_forwarding.rst @@ -24,13 +24,13 @@ multiple queues. When run with 8 threads, that is, with the -c FF option, each t As supplied, the sample application configures the VMDq feature to have 32 pools with 4 queues each. The Intel® 82599 10 Gigabit Ethernet Controller NIC also supports the splitting of traffic into 16 pools of 2 queues. While the Intel® X710 or XL710 Ethernet Controller NICs support many configurations of VMDq pools of 4 or 8 queues each. -And queues numbers for each VMDq pool can be changed by setting CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM -in config/common_* file. +And queues numbers for each VMDq pool can be changed by setting RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM +in config/rte_config.h file. The nb-pools and enable-rss parameters can be passed on the command line, after the EAL parameters: .. code-block:: console - ./build/vmdq_app [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss + ./<build_dir>/examples/dpdk-vmdq [EAL options] -- -p PORTMASK --nb-pools NP --enable-rss where, NP can be 8, 16 or 32, rss is disabled by default. @@ -56,7 +56,7 @@ To run the example in a Linux environment: .. code-block:: console - user@target:~$ ./build/vmdq_app -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 + user@target:~$ ./<build_dir>/examples/dpdk-vmdq -l 0-3 -n 4 -- -p 0x3 --nb-pools 16 Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 95348ef297..0ad0f54401 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -20,7 +20,7 @@ They must be separated from the EAL options, shown in the previous section, with .. code-block:: console - sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 + sudo ./dpdk-testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2 The command line options are: @@ -59,13 +59,13 @@ The command line options are: * ``--nb-cores=N`` Set the number of forwarding cores, - where 1 <= N <= "number of cores" or ``CONFIG_RTE_MAX_LCORE`` from the configuration file. + where 1 <= N <= "number of cores" or ``RTE_MAX_LCORE`` from the configuration file. The default value is 1. * ``--nb-ports=N`` Set the number of forwarding ports, - where 1 <= N <= "number of ports" on the board or ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + where 1 <= N <= "number of ports" on the board or ``RTE_MAX_ETHPORTS`` from the configuration file. The default value is the number of ports on the board. * ``--coremask=0xXX`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index a4c07c9933..7ea50f8f77 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -71,7 +71,7 @@ practical or possible testpmd supports alternative methods for executing command .. code-block:: console - ./testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt + ./dpdk-testpmd -n4 -r2 ... -- -i --cmdline-file=/home/ubuntu/flow-create-commands.txt Interactive-mode selected CLI commands to be read from /home/ubuntu/flow-create-commands.txt Configuring Port 0 (socket 0) @@ -340,7 +340,7 @@ The available information categories are: * ``icmpecho``: Receives a burst of packets, lookup for ICMP echo requests and, if any, send back ICMP echo replies. -* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. Requires ``CONFIG_RTE_LIBRTE_IEEE1588=y``. +* ``ieee1588``: Demonstrate L2 IEEE1588 V2 PTP timestamping for RX and TX. * ``noisy``: Noisy neighbor simulation. Simulate more realistic behavior of a guest machine engaged in receiving @@ -390,11 +390,6 @@ Example for the io forwarding engine, with some packet drops on the tx side:: TX-packets: 548595568 TX-dropped: 128 TX-total: 548595696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. note:: - - Enabling CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES appends "CPU cycles/packet" stats, like: - - CPU cycles/packet=xx.dd (total cycles=xxxx / total RX packets=xxxx) at xxx MHz clock clear fwd ~~~~~~~~~ -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 11/14] doc: remove reference to make from tools guides 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (9 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 10/14] doc: remove references to make from app guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 12/14] doc: remove references to make from contributing guide Ciara Power ` (3 subsequent siblings) 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev Cc: Ciara Power, Kevin Laatz, Nicolas Chautru, Declan Doherty, Reshma Pattan, Maryam Tahhan, Jerin Jacob Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Kevin Laatz <kevin.laatz@intel.com> Acked-by: Nicolas Chautru <nicolas.chautru@intel.com> --- v7: Removed compilation steps where unnecessary. v6: - Fixed indentation for testbbdev list entry. v5: - Reworded sentence in pdump doc. - Replaced references to testbbdev binary with dpdk-test-bbdev. - Fixed links to linux_gsg doc. --- doc/guides/tools/comp_perf.rst | 14 +--------- doc/guides/tools/cryptoperf.rst | 27 ++----------------- doc/guides/tools/pdump.rst | 15 +++++------ doc/guides/tools/proc_info.rst | 2 +- doc/guides/tools/testbbdev.rst | 44 +++++++------------------------ doc/guides/tools/testeventdev.rst | 29 ++++++-------------- 6 files changed, 27 insertions(+), 104 deletions(-) diff --git a/doc/guides/tools/comp_perf.rst b/doc/guides/tools/comp_perf.rst index ee585d1024..6ba1076484 100644 --- a/doc/guides/tools/comp_perf.rst +++ b/doc/guides/tools/comp_perf.rst @@ -97,18 +97,6 @@ Application Options ``-h``: prints this help -Compiling the Tool ------------------- - -**Step 1: PMD setting** - -The ``dpdk-test-compress-perf`` tool depends on compression device drivers PMD which -can be disabled by default in the build configuration file ``common_base``. -The compression device drivers PMD which should be tested can be enabled by setting e.g.:: - - CONFIG_RTE_LIBRTE_PMD_ISAL=y - - Running the Tool ---------------- @@ -116,5 +104,5 @@ The tool has a number of command line options. Here is the sample command line: .. code-block:: console - ./build/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 + ./<build_dir>/app/dpdk-test-compress-perf -l 4 -- --driver-name compress_qat --input-file test.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index 28b729dbda..29340d94e8 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -30,22 +30,9 @@ On hardware devices the throughput measurement is not necessarily the maximum possible for the device, e.g. it may be necessary to use multiple cores to keep the hardware accelerator fully loaded and so measure maximum throughput. -Compiling the Application -------------------------- -**Step 1: PMD setting** - -The ``dpdk-test-crypto-perf`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The crypto device drivers PMD which should be tested can be enabled by setting:: - - CONFIG_RTE_LIBRTE_PMD_<name>=y - -Setting example for open ssl PMD:: - - CONFIG_RTE_LIBRTE_PMD_OPENSSL=y - -**Step 2: Linearization setting** +Linearization setting +--------------------- It is possible linearized input segmented packets just before crypto operation for devices which doesn't support scatter-gather, and allows to measure @@ -56,16 +43,6 @@ To set on the linearization options add below definition to the #define CPERF_LINEARIZATION_ENABLE -**Step 3: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-crypto-perf`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. -The user must have all libraries, modules, updates and compilers installed -in the system prior to this, -as described in the earlier chapters in this Getting Started Guide. Running the Application ----------------------- diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst index 8a499c6c5b..6f9bd77ab1 100644 --- a/doc/guides/tools/pdump.rst +++ b/doc/guides/tools/pdump.rst @@ -19,12 +19,9 @@ a DPDK secondary process and is capable of enabling packet capture on dpdk ports framework initialization code. Refer ``app/test-pmd/testpmd.c`` code to see how this is done. - * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled - by default in the build configuration files, - owing to an external dependency on the libpcap development files - which must be installed on the board. - Once the libpcap development files are installed, the libpcap based PMD - can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK. + * The ``dpdk-pdump`` tool depends on DPDK pcap PMD, so the system should + have libpcap development files installed and the pcap PMD not disabled + in the build. * The ``dpdk-pdump`` tool runs as a DPDK secondary process. It exits when the primary application exits. @@ -37,7 +34,7 @@ The tool has a number of command line options: .. code-block:: console - ./build/app/dpdk-pdump -- + ./<build_dir>/app/dpdk-pdump -- [--multi] --pdump '(port=<port id> | device_id=<pci id or vdev name>), (queue=<queue_id>), @@ -120,5 +117,5 @@ Example .. code-block:: console - $ sudo ./build/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' - $ sudo ./build/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3 -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap' + $ sudo ./<build_dir>/app/dpdk-pdump -l 3,4,5 -- --multi --pdump 'port=0,queue=*,rx-dev=/tmp/rx-1.pcap' --pdump 'port=1,queue=*,rx-dev=/tmp/rx-2.pcap' diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 0390b9c589..9772d97ef0 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,7 +17,7 @@ The application has a number of command line options: .. code-block:: console - ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 9969231451..d397d991ff 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -10,31 +10,6 @@ Tests available for execution are: latency, throughput, validation, bler and sanity tests. Execution of tests can be customized using various parameters passed to a python running script. -Compiling the Application -------------------------- - -**Step 1: PMD setting** - -The ``dpdk-test-bbdev`` tool depends on crypto device drivers PMD which -are disabled by default in the build configuration file ``common_base``. -The bbdevice drivers PMD which should be tested can be enabled by setting - - ``CONFIG_RTE_LIBRTE_PMD_<name>=y`` - -Setting example for (*baseband_turbo_sw*) PMD - - ``CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y`` - -**Step 2: Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-bbdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. -The user must have all libraries, modules, updates and compilers installed -in the system prior to this, as described in the earlier chapters in this -Getting Started Guide. Running the Application ----------------------- @@ -60,7 +35,7 @@ The following are the command-line options: ``-p TESTAPP_PATH, --testapp_path TESTAPP_PATH`` Indicates the path to the bbdev test app. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with "*/build/app/testbbdev*". + on "../.." concatenated with "*/build/app/dpdk-test-bbdev*". ``-e EAL_PARAMS, --eal_params EAL_PARAMS`` Specifies EAL arguments which are passed to the test app. For more details, @@ -82,9 +57,8 @@ The following are the command-line options: ``-v TEST_VECTOR [TEST_VECTOR ...], --test_vector TEST_VECTOR [TEST_VECTOR ...]`` Specifies paths to the test vector files. If not specified path is set based - on *$RTE_SDK* environment variable concatenated with - "*/app/test-bbdev/test_vectors/bbdev_null.data*" and indicates default - data file. + on "../.." concatenated with "*/app/test-bbdev/test_vectors/bbdev_null.data*" + and indicates default data file. **Example usage:** @@ -259,8 +233,8 @@ They are chosen to have a good coverage across sizes and processing parameters while still keeping their number limited as part of sanity regression. -Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linux-icc target: +Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output +to the build directory: :: @@ -268,16 +242,16 @@ x86_64-native-linux-icc target: |-- test-bbdev |-- test_vectors - |-- x86_64-native-linux-icc + |-- build |-- app - |-- testbbdev + |-- dpdk-test-bbdev All bbdev devices ~~~~~~~~~~~~~~~~~ .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -291,7 +265,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev + ./test-bbdev.py -p ../../build/app/dpdk-test-bbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/* -n 64 -b 8 32 diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst index 2ed67a6340..ad1788a3d8 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -10,19 +10,6 @@ This application has a generic framework to add new eventdev based test cases to verify functionality and measure the performance parameters of DPDK eventdev devices. -Compiling the Application -------------------------- - -**Build the application** - -Execute the ``dpdk-setup.sh`` script to build the DPDK library together with the -``dpdk-test-eventdev`` application. - -Initially, the user must select a DPDK target to choose the correct target type -and compiler options to use when building the libraries. -The user must have all libraries, modules, updates and compilers installed -in the system prior to this, -as described in the earlier chapters in this Getting Started Guide. Running the Application ----------------------- @@ -251,7 +238,7 @@ Example command to run order queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_sw0 -- \ --test=order_queue --plcores 1 --wlcores 2,3 @@ -314,7 +301,7 @@ Example command to run order ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=order_atq --plcores 1 --wlcores 2,3 @@ -414,7 +401,7 @@ Example command to run perf queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x1 --vdev=event_sw0 -- \ --test=perf_queue --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf queue test with ethernet ports: @@ -428,7 +415,7 @@ Example command to run perf queue test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_queue --stlist=a \ --prod_type_timerdev --fwd_latency @@ -514,14 +501,14 @@ Example command to run perf ``all types queue`` test: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev=event_octeontx -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev=event_octeontx -- \ --test=perf_atq --plcores=2 --wlcore=3 --stlist=p --nb_pkts=0 Example command to run perf ``all types queue`` test with event timer adapter: .. code-block:: console - sudo build/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ + sudo <build_dir>/app/dpdk-test-eventdev --vdev="event_octeontx" -- \ --wlcores 4 --plcores 12 --test perf_atq --verbose 20 \ --stlist=a --prod_type_timerdev --fwd_latency @@ -633,7 +620,7 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_queue --wlcore=1 --prod_type_ethdev --stlist=a @@ -725,5 +712,5 @@ Example command to run pipeline queue test: .. code-block:: console - sudo build/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ + sudo <build_dir>/app/dpdk-test-eventdev -c 0xf -s 0x8 --vdev=event_sw0 -- \ --test=pipeline_atq --wlcore=1 --prod_type_ethdev --stlist=a -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 12/14] doc: remove references to make from contributing guide 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (10 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 11/14] doc: remove reference to make from tools guides Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-22 20:40 ` Thomas Monjalon 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 13/14] doc: add to release notes to reflect removal of make Ciara Power ` (2 subsequent siblings) 14 siblings, 1 reply; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power, Louise Kilheeney Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power <ciara.power@intel.com> Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com> --- v7: - Updated exec_env and arch lists. - Updated documentation build instruction. v5: - Removed reference to test-build.sh used for Make. - Added point back in for handling specific code, reworded as necessary. - Added library statistics section, removing only the mention of CONFIG options. --- doc/guides/contributing/design.rst | 37 ++++++++--------------- doc/guides/contributing/documentation.rst | 31 ++++--------------- doc/guides/contributing/patches.rst | 6 ++-- 3 files changed, 21 insertions(+), 53 deletions(-) diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 5fe7f63942..cbd0c3dd8e 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -21,7 +21,7 @@ A file located in a subdir of "linux" is specific to this execution environment. When absolutely necessary, there are several ways to handle specific code: -* Use a ``#ifdef`` with the CONFIG option in the C code. +* Use a ``#ifdef`` with a build definition macro in the C code. This can be done when the differences are small and they can be embedded in the same C file: .. code-block:: c @@ -32,30 +32,25 @@ When absolutely necessary, there are several ways to handle specific code: titi(); #endif -* Use the CONFIG option in the Makefile. This is done when the differences are more significant. +* Use build definition macros and conditions in the Meson build file. This is done when the differences are more significant. In this case, the code is split into two separate files that are architecture or environment specific. This should only apply inside the EAL library. -.. note:: - - As in the linux kernel, the ``CONFIG_`` prefix is not used in C code. - This is only needed in Makefiles or shell scripts. - Per Architecture Sources ~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. +* ``RTE_ARCH`` is a string that contains the name of the architecture. +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32``, ``RTE_ARCH_PPC_64``, ``RTE_ARCH_ARM``, ``RTE_ARCH_ARMv7`` or ``RTE_ARCH_ARM64`` are defined only if we are building for those architectures. Per Execution Environment Sources ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The following config options can be used: +The following macro options can be used: -* ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``RTE_EXEC_ENV`` is a string that contains the name of the executive environment. +* ``RTE_EXEC_ENV_FREEBSD``, ``RTE_EXEC_ENV_LINUX`` or ``RTE_EXEC_ENV_WINDOWS`` are defined only if we are building for this execution environment. Mbuf features ------------- @@ -87,22 +82,14 @@ requirements for preventing ABI changes when implementing statistics. Mechanism to allow the application to turn library statistics on and off ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Each library that maintains statistics counters should provide a single build -time flag that decides whether the statistics counter collection is enabled or -not. This flag should be exposed as a variable within the DPDK configuration -file. When this flag is set, all the counters supported by current library are +Having runtime support for enabling/disabling library statistics is recommended, +as build-time options should be avoided. However, if build-time options are used, +for example as in the table library, the options can be set using c_args. +When this flag is set, all the counters supported by current library are collected for all the instances of every object type provided by the library. When this flag is cleared, none of the counters supported by the current library are collected for any instance of any object type provided by the library: -.. code-block:: console - - # DPDK file config/common_linux, config/common_freebsd, etc. - CONFIG_RTE_<LIBRARY_NAME>_STATS_COLLECT=y/n - -The default value for this DPDK configuration file variable (either "yes" or -"no") is decided by each library. - Prevention of ABI changes due to library statistics support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst index be985e6cf8..a4e6be6aca 100644 --- a/doc/guides/contributing/documentation.rst +++ b/doc/guides/contributing/documentation.rst @@ -218,25 +218,14 @@ Build commands ~~~~~~~~~~~~~~ The documentation is built using the standard DPDK build system. -Some examples are shown below: -* Generate all the documentation targets:: +To build the documentation:: - make doc + ninja -C build doc -* Generate the Doxygen API documentation in Html:: +See :doc:`../linux_gsg/build_dpdk` for more detail on compiling DPDK with meson. - make doc-api-html - -* Generate the guides documentation in Html:: - - make doc-guides-html - -* Generate the guides documentation in Pdf:: - - make doc-guides-pdf - -The output of these commands is generated in the ``build`` directory:: +The output is generated in the ``build`` directory:: build/doc |-- html @@ -251,10 +240,6 @@ The output of these commands is generated in the ``build`` directory:: Make sure to fix any Sphinx or Doxygen warnings when adding or updating documentation. -The documentation output files can be removed as follows:: - - make doc-clean - Document Guidelines ------------------- @@ -304,7 +289,7 @@ Line Length Long literal command lines can be shown wrapped with backslashes. For example:: - testpmd -l 2-3 -n 4 \ + dpdk-testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ --txd=1024 --rxd=1024 @@ -456,7 +441,7 @@ Code and Literal block sections For long literal lines that exceed that limit try to wrap the text at sensible locations. For example a long command line could be documented like this and still work if copied directly from the docs:: - build/app/testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ + ./<build_dir>/app/dpdk-testpmd -l 0-2 -n3 --vdev=net_pcap0,iface=eth0 \ --vdev=net_pcap1,iface=eth1 \ -- -i --nb-cores=2 --nb-ports=2 \ --total-num-mbufs=2048 @@ -739,9 +724,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati /** Array of physical page addresses for the mempool buffer. */ phys_addr_t elt_pa[MEMPOOL_PG_NUM_DEFAULT]; -* Check for Doxygen warnings in new code by checking the API documentation build:: - - make doc-api-html >/dev/null - * Read the rendered section of the documentation that you have added for correctness, clarity and consistency with the surrounding text. diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 9ff60944c3..9fa5a79c85 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -486,9 +486,9 @@ By default, ABI compatibility checks are disabled. To enable them, a reference version must be selected via the environment variable ``DPDK_ABI_REF_VERSION``. -The ``devtools/test-build.sh`` and ``devtools/test-meson-builds.sh`` scripts -then build this reference version in a temporary directory and store the -results in a subfolder of the current working directory. +The ``devtools/test-meson-builds.sh`` script then build this reference version +in a temporary directory and store the results in a subfolder of the current +working directory. The environment variable ``DPDK_ABI_REF_DIR`` can be set so that the results go to a different location. -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v7 12/14] doc: remove references to make from contributing guide 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 12/14] doc: remove references to make from contributing guide Ciara Power @ 2020-10-22 20:40 ` Thomas Monjalon 0 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-22 20:40 UTC (permalink / raw) To: Ciara Power; +Cc: dev, Louise Kilheeney, david.marchand 21/10/2020 10:17, Ciara Power: > -* ``CONFIG_RTE_ARCH`` is a string that contains the name of the architecture. > -* ``CONFIG_RTE_ARCH_I686``, ``CONFIG_RTE_ARCH_X86_64``, ``CONFIG_RTE_ARCH_X86_64_32`` or ``CONFIG_RTE_ARCH_PPC_64`` are defined only if we are building for those architectures. > +* ``RTE_ARCH`` is a string that contains the name of the architecture. > +* ``RTE_ARCH_I686``, ``RTE_ARCH_X86_64``, ``RTE_ARCH_X86_64_32``, ``RTE_ARCH_PPC_64``, ``RTE_ARCH_ARM``, ``RTE_ARCH_ARMv7`` or ``RTE_ARCH_ARM64`` are defined only if we are building for those architectures. Will merge the fix from David here: CONFIG_RTE_ARCH_X86_64_32 -> CONFIG_RTE_ARCH_X86_X32 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 13/14] doc: add to release notes to reflect removal of make 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (11 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 12/14] doc: remove references to make from contributing guide Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 14/14] doc: update patch cheatsheet to use meson Ciara Power 2020-10-22 20:53 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Thomas Monjalon 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Ciara Power Added an entry to describe the removal of the Make build system to the release notes for 20.11. Signed-off-by: Ciara Power <ciara.power@intel.com> --- v6: - Fixed spelling in commit log. - Fixed formatting of release note entry to be split logically. --- doc/guides/rel_notes/release_20_11.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index 25ea3c20b4..e5fe0b38cc 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -358,6 +358,10 @@ Removed Items * Removed Python 2 support since it was EOL'd in January 2020. +* build: Support for the Make build system was removed for compiling DPDK, + Meson is now the primary build system. + Sample applications can still be built with Make standalone, using pkg-config. + API Changes ----------- -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* [dpdk-dev] [PATCH v7 14/14] doc: update patch cheatsheet to use meson 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (12 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 13/14] doc: add to release notes to reflect removal of make Ciara Power @ 2020-10-21 8:17 ` Ciara Power 2020-10-22 20:53 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Thomas Monjalon 14 siblings, 0 replies; 300+ messages in thread From: Ciara Power @ 2020-10-21 8:17 UTC (permalink / raw) To: dev; +Cc: Kevin Laatz From: Kevin Laatz <kevin.laatz@intel.com> With 'make' being removed, the patch cheatsheet needs to be updated to remove any references to 'make'. These references have been replaced with meson alternatives in this patch. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- .../contributing/img/patch_cheatsheet.svg | 582 ++++++++---------- 1 file changed, 270 insertions(+), 312 deletions(-) diff --git a/doc/guides/contributing/img/patch_cheatsheet.svg b/doc/guides/contributing/img/patch_cheatsheet.svg index 85225923e1..986e4db815 100644 --- a/doc/guides/contributing/img/patch_cheatsheet.svg +++ b/doc/guides/contributing/img/patch_cheatsheet.svg @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -13,7 +11,7 @@ width="210mm" height="297mm" id="svg2985" - inkscape:version="0.48.4 r9939" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" sodipodi:docname="patch_cheatsheet.svg"> <sodipodi:namedview pagecolor="#ffffff" @@ -24,17 +22,19 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1184" - inkscape:window-height="1822" + inkscape:window-width="1920" + inkscape:window-height="1017" id="namedview274" showgrid="false" - inkscape:zoom="1.2685914" - inkscape:cx="289.93958" - inkscape:cy="509.84194" - inkscape:window-x="0" - inkscape:window-y="19" - inkscape:window-maximized="0" - inkscape:current-layer="g3272" /> + inkscape:zoom="0.89702958" + inkscape:cx="246.07409" + inkscape:cy="416.76022" + inkscape:window-x="1072" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + inkscape:snap-grids="false" /> <defs id="defs3"> <linearGradient @@ -549,347 +549,336 @@ </g> </switch> <g - transform="matrix(0.89980358,0,0,0.89980358,45.57817,-2.8793563)" + transform="matrix(0.89980358,0,0,0.89980358,57.57817,-2.8793563)" id="g4009"> <text x="325.02054" y="107.5126" id="text3212" xml:space="preserve" - style="font-size:43.11383057px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:43.1138px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none" transform="scale(1.193782,0.83767389)"><tspan x="325.02054" y="107.5126" - id="tspan3214">CHEATSHEET</tspan></text> + id="tspan3214" + style="font-family:monospace">CHEATSHEET</tspan></text> <text x="386.51117" y="58.178116" transform="scale(1.0054999,0.99453018)" id="text3212-1" xml:space="preserve" - style="font-size:42.11373901px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:42.1137px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="386.51117" y="58.178116" - id="tspan3214-7">PATCH SUBMIT</tspan></text> + id="tspan3214-7" + style="font-family:monospace">PATCH SUBMIT</tspan></text> </g> <rect - width="714.94495" - height="88.618027" - rx="20.780111" - ry="15.96909" - x="14.574773" - y="7.0045133" + width="759.50977" + height="88.591248" + rx="22.075403" + ry="15.964265" + x="14.588161" + y="7.0179014" id="rect3239" - style="fill:none;stroke:#00233b;stroke-width:0.87678075;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.903557;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="713.28113" - height="887.29156" - rx="17.656931" - ry="17.280584" - x="15.406689" - y="104.73515" + width="757.84167" + height="887.2605" + rx="18.760006" + ry="17.27998" + x="15.422211" + y="104.75068" id="rect3239-0" - style="fill:none;stroke:#00233b;stroke-width:1.00973284;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.04078;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="694.94904" - height="381.31" - rx="9.4761629" - ry="9.0904856" - x="24.336016" - y="601.75836" + width="732.82446" + height="381.28253" + rx="9.9926233" + ry="9.0898304" + x="24.349754" + y="601.77209" id="rect3239-0-9-4" - style="fill:none;stroke:#00233b;stroke-width:1.02322531;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.0507;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - d="m 386.3921,327.23442 323.14298,0" + d="M 422.0654,327.23442 H 709.53508" id="path4088" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:0.943189px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <text - x="396.18015" + x="428.18015" y="314.45731" id="text4090" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="396.18015" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="428.18015" y="314.45731" id="tspan4092" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Patch Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Patch Pre-Checks</tspan></text> <text x="43.44949" y="147.32129" id="text4090-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.44949" y="147.32129" id="tspan4092-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Commit Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Commit Pre-Checks</tspan></text> <text - x="397.1235" + x="429.1235" y="144.8549" id="text4090-4-3" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="397.1235" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="429.1235" y="144.8549" id="tspan4092-3-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Bugfix?</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Bugfix?</tspan></text> <text x="41.215897" y="634.38617" id="text4090-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="41.215897" y="634.38617" id="tspan4092-38" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Git send-email </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Git send-email </tspan></text> <path d="m 31.232443,642.80575 376.113467,0" id="path4088-7" style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" inkscape:connector-curvature="0" /> <rect - width="342.13785" - height="230.74609" - rx="10.411126" - ry="10.411126" - x="25.418407" - y="114.92036" + width="376.65033" + height="230.70007" + rx="11.461329" + ry="10.40905" + x="25.441414" + y="114.94337" id="rect3239-0-9-4-2" - style="fill:none;stroke:#00233b;stroke-width:0.93674862;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.982762;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="43.44949" y="385.8045" id="text4090-86" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.44949" y="385.8045" id="tspan4092-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Compile Pre-Checks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Compile Pre-Checks</tspan></text> <g - transform="translate(352.00486,-348.25973)" + transform="matrix(1.0077634,0,0,1,384.57109,-348.25973)" id="g3295"> <text x="43.87738" y="568.03088" id="text4090-8-14" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="568.03088" id="tspan4289" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Include warning/error</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Include warning/error</tspan></text> <text x="43.87738" y="537.71906" id="text4090-8-14-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="537.71906" id="tspan4289-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Fixes: line</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Fixes: line</tspan></text> <text x="43.87738" y="598.9939" id="text4090-8-14-0" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.87738" y="598.9939" id="tspan4289-2" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ How to reproduce</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ How to reproduce</tspan></text> </g> <g - transform="translate(-2.6258125,-26.708615)" + transform="matrix(0.88614399,0,0,1.0199334,-5.7864591,-38.84504)" id="g4115"> <g id="g3272"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1" y="454.36987" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7" y="454.36987" x="49.093246">+ build gcc icc clang </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + xml:space="preserve" + id="text581" + y="454.36987" + x="49.093246" /> + <text + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2" y="516.59979" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79" y="516.59979" - x="49.093246">+ make test doc </tspan></text> + x="49.093246">+ meson -Denable_docs=true</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-0" y="544.71033" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-0" y="544.71033" - x="49.093246">+ make examples</tspan></text> + x="49.093246">+ meson -Dexamples=all</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-07" y="576.83533" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-3" y="576.83533" - x="49.093246">+ make shared-lib</tspan></text> + x="49.093246" + transform="matrix(1.0305467,0,0,1,-1.5447426,0)">+ meson -Ddefault_library=shared</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-0-07-4" y="604.88947" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-9-3-9" y="604.88947" x="49.093246">+ library ABI version</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-2-9" y="486.56659" x="49.093246"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-79-3" y="486.56659" x="49.093246">+ build 32 and 64 bits</tspan></text> </g> </g> <text - x="74.388756" - y="914.65686" + x="72.598656" + y="937.21002" id="text4090-8-1-8-65-9" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.2959px;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.02466" + transform="scale(1.0246575,0.97593587)"><tspan sodipodi:role="line" id="tspan3268" - x="74.388756" - y="914.65686">git send-email *.patch --annotate --to <maintainer></tspan><tspan + x="72.598656" + y="937.21002" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466">git send-email *.patch --annotate --to <maintainer></tspan><tspan sodipodi:role="line" id="tspan3272" - x="74.388756" - y="938.40686"> --cc dev@dpdk.org [ --cc other@participants.com</tspan><tspan + x="72.598656" + y="961.54565" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466"> --cc dev@dpdk.org [ --cc other@participants.com</tspan><tspan sodipodi:role="line" - x="74.388756" - y="962.15686" - id="tspan3266"> --cover-letter -v[N] --in-reply-to <message ID> ]</tspan></text> + x="72.598656" + y="985.88129" + id="tspan3266" + style="font-size:19.4685px;line-height:1.25;font-family:monospace;stroke-width:1.02466"> --cover-letter -v[N] --in-reply-to <message ID> ]</tspan></text> <text x="543.47675" y="1032.3459" id="text4090-8-7-8-7-6-3-8-2-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="543.47675" y="1032.3459" id="tspan4092-8-6-3-1-8-4-4-5-3" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">harry.van.haaren@intel.com</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">harry.van.haaren@intel.com</tspan></text> <rect - width="678.14105" - height="87.351799" - rx="6.7972355" - ry="6.7972355" - x="31.865864" - y="888.44696" + width="711.56055" + height="87.327599" + rx="7.1322103" + ry="6.795352" + x="31.877964" + y="888.45905" id="rect3239-0-9-4-3" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.0242;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="543.29498" y="1018.1843" id="text4090-8-7-8-7-6-3-8-2-5-3" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="543.29498" y="1018.1843" id="tspan4092-8-6-3-1-8-4-4-5-3-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Suggestions / Updates?</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Suggestions / Updates?</tspan></text> <g id="g3268" transform="translate(0,-6)"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8" y="704.07019" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6" y="704.07019" x="41.658669">+ Patch version ( eg: -v2 ) </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-0" y="736.29175" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-2" y="736.29175" x="41.658669">+ Patch version annotations</tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-6" y="766.70355" x="41.911205"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-1" y="766.70355" x="41.911205">+ Send --to maintainer </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-6-3" y="795.30548" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-1-8" y="795.30548" x="41.658669">+ Send --cc dev@dpdk.org </tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-9" y="675.25287" x="41.658669"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-9" y="675.25287" x="41.658669">+ Cover letter</tspan></text> @@ -897,73 +886,70 @@ id="g3303" transform="translate(1.0962334,-40.034939)"> <text - sodipodi:linespacing="125%" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-65" y="868.70337" x="41.572586"><tspan - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-10" y="868.70337" x="41.572586">+ Send --in-reply-to <message ID><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:20px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan3184" /></tspan></text> <text - sodipodi:linespacing="125%" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve" id="text4090-8-1-8-9-1" y="855.79816" x="460.18405"><tspan - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7-6-9-7" y="855.79816" x="460.18405">****</tspan></text> </g> </g> <text - x="685.67828" + x="697.67828" y="76.55056" id="text4090-8-1-8-9-1-9" xml:space="preserve" - style="font-size:20.20989037px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="685.67828" + style="font-style:normal;font-weight:normal;font-size:20.2099px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="697.67828" y="76.55056" id="tspan4092-8-7-6-9-7-4" - style="font-size:9.09445095px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">v1.0</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:9.09445px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">v2.0</tspan></text> <rect - width="342.3053" - height="155.54948" - rx="9.2344503" - ry="9.2344503" - x="377.58942" - y="114.55766" + width="347.40179" + height="155.50351" + rx="9.3719397" + ry="9.2317209" + x="412.60239" + y="114.58065" id="rect3239-0-9-4-2-1" - style="fill:none;stroke:#00233b;stroke-width:0.76930124;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.774892;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="342.12564" - height="236.79482" - rx="10.647112" - ry="9.584527" - x="25.642178" - y="356.86249" + width="377.75555" + height="234.52185" + rx="11.755931" + ry="9.4925261" + x="25.663876" + y="356.88416" id="rect3239-0-9-4-2-0" - style="fill:none;stroke:#00233b;stroke-width:0.9489302;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.99232;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - width="341.98428" - height="312.73181" - rx="8.5358429" - ry="8.5358429" - x="377.96762" - y="280.45331" + width="343.53604" + height="312.67508" + rx="8.5745735" + ry="8.5342941" + x="414.29037" + y="280.48166" id="rect3239-0-9-4-2-1-9" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1.00217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - d="m 387.02742,157.3408 323.14298,0" + d="M 419.35634,157.3408 H 710.1704" id="path4088-8" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:0.94866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <path d="m 36.504486,397.33869 323.142974,0" @@ -971,9 +957,9 @@ style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <path - d="m 35.494337,156.92238 323.142983,0" + d="M 35.494337,156.92238 H 372.01481" id="path4088-4" - style="fill:none;stroke:#00233b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;stroke:#00233b;stroke-width:1.02049px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" inkscape:connector-curvature="0" /> <g transform="translate(1.0962334,-30.749225)" @@ -983,45 +969,41 @@ y="214.1572" id="text4090-8-11" xml:space="preserve" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="214.1572" id="tspan4092-8-52" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Signed-off-by: </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Signed-off-by: </tspan></text> <text x="45.371201" y="243.81795" id="text4090-8-7-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="243.81795" id="tspan4092-8-6-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Suggested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Suggested-by:</tspan></text> <text x="45.371201" y="273.90939" id="text4090-8-7-8-7" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="273.90939" id="tspan4092-8-6-3-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Reported-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Reported-by:</tspan></text> <text x="45.371201" y="304.00082" id="text4090-8-7-8-7-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="304.00082" id="tspan4092-8-6-3-1-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Tested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Tested-by:</tspan></text> <g id="g3297" transform="translate(1.1147904,-7.2461378)"> @@ -1030,110 +1012,102 @@ y="368.8187" id="text4090-8-7-8-7-6-3" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="368.8187" id="tspan4092-8-6-3-1-8-4" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Previous Acks</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Previous Acks</tspan></text> <text x="235.24362" y="360.3028" id="text4090-8-1-8-9-1-4" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="235.24362" y="360.3028" id="tspan4092-8-7-6-9-7-0" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <text x="45.371201" y="334.52298" id="text4090-8-7-8-7-6-3-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="45.371201" y="334.52298" id="tspan4092-8-6-3-1-8-4-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Commit message</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Commit message</tspan></text> </g> <rect width="295.87207" height="164.50136" rx="7.3848925" ry="4.489974" - x="414.80502" + x="444.80502" y="611.47064" id="rect3239-0-9-4-2-1-9-9" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text - x="439.4429" + x="469.4429" y="638.35608" id="text4090-1-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="439.4429" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="469.4429" y="638.35608" id="tspan4092-38-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Mailing List</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Mailing List</tspan></text> <text - x="431.55353" + x="461.55353" y="675.59857" id="text4090-8-5-6-9-4-6-6-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.55353" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.55353" y="675.59857" id="tspan4092-8-5-5-3-4-0-6-2" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Acked-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Acked-by:</tspan></text> <text - x="431.39734" + x="461.39734" y="734.18231" id="text4090-8-5-6-9-4-6-6-8-5" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.39734" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.39734" y="734.18231" id="tspan4092-8-5-5-3-4-0-6-2-1" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Reviewed-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Reviewed-by:</tspan></text> <text - x="450.8428" + x="480.8428" y="766.5578" id="text4090-8-5-6-9-4-6-6-8-7" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="450.8428" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="480.8428" y="766.5578" id="tspan4092-8-5-5-3-4-0-6-2-11" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">Nack (refuse patch)</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">Nack (refuse patch)</tspan></text> <path - d="m 426.99385,647.80575 272.72607,0" + d="M 456.99385,647.80575 H 729.71992" id="path4088-7-5" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" /> <path - d="m 424.7332,742.35699 272.72607,0" + d="M 454.7332,742.35699 H 727.45927" id="path4088-7-5-2" - style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:#00233b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" /> <text - x="431.39734" + x="461.39734" y="704.78278" id="text4090-8-5-6-9-4-6-6-8-5-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="431.39734" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="461.39734" y="704.78278" id="tspan4092-8-5-5-3-4-0-6-2-1-7" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Tested-by:</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Tested-by:</tspan></text> <g transform="translate(1.0962334,-2.7492248)" id="g3613"> @@ -1142,22 +1116,21 @@ y="1007.5879" id="text4090-8-7-8-7-6-3-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="43.146141" y="1007.5879" id="tspan4092-8-6-3-1-8-4-4" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">Previous Acks only when fixing typos, rebased, or checkpatch issues.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">Previous Acks only when fixing typos, rebased, or checkpatch issues.</tspan></text> <text x="30.942892" y="1011.3757" id="text4090-8-7-8-7-6-3-8-4-1" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1011.3757" id="tspan4092-8-6-3-1-8-4-4-55-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <g transform="translate(1.0962334,-2.7492248)" @@ -1167,35 +1140,34 @@ y="1020.4383" id="text4090-8-7-8-7-6-3-8-4" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.176418" y="1020.4383" id="tspan4092-8-6-3-1-8-4-4-55" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">The version.map function names must be in alphabetical order.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">The version.map function names must be in alphabetical order.</tspan></text> <text x="30.942892" y="1024.2014" id="text4090-8-7-8-7-6-3-8-4-1-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1024.2014" id="tspan4092-8-6-3-1-8-4-4-55-7-2" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.247679" y="1024.2014" id="text4090-8-7-8-7-6-3-8-4-1-5-6" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.247679" y="1024.2014" id="tspan4092-8-6-3-1-8-4-4-55-7-2-8" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <g - transform="translate(1.0962334,-30.749225)" + transform="matrix(1.0211743,0,0,1,25.427515,-30.749225)" id="g3275"> <g id="g3341"> @@ -1204,67 +1176,61 @@ y="390.17807" id="text4090-8" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="390.17807" id="tspan4092-8" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Rebase to git </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Rebase to git </tspan></text> <text x="394.78601" y="420.24835" id="text4090-8-5" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="420.24835" id="tspan4092-8-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Checkpatch </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Checkpatch </tspan></text> <text x="394.78601" y="450.53394" id="text4090-8-5-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="450.53394" id="tspan4092-8-5-5" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ ABI breakage </tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ ABI breakage </tspan></text> <text x="394.78601" y="513.13031" id="text4090-8-5-6-9-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="513.13031" id="tspan4092-8-5-5-3-4" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Maintainers file</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Maintainers file</tspan></text> <text x="394.78601" y="573.48621" id="text4090-8-5-6-9-4-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="573.48621" id="tspan4092-8-5-5-3-4-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Release notes</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Release notes</tspan></text> <text x="395.79617" y="603.98718" id="text4090-8-5-6-9-4-6-6" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="395.79617" y="603.98718" id="tspan4092-8-5-5-3-4-0-6" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Documentation</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Documentation</tspan></text> <g transform="translate(0,-0.83470152)" id="g3334"> @@ -1276,24 +1242,22 @@ y="468.01297" id="text4090-8-1-8-9-1-4-1" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="660.46729" y="468.01297" id="tspan4092-8-7-6-9-7-0-7" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">**</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">**</tspan></text> </g> <text x="394.78601" y="483.59955" id="text4090-8-5-6-9" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="483.59955" id="tspan4092-8-5-5-3" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Update version.map</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Update version.map</tspan></text> </g> <g id="g3428" @@ -1303,12 +1267,11 @@ y="541.38928" id="text4090-8-5-6-9-4-6-1" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="394.78601" y="541.38928" id="tspan4092-8-5-5-3-4-0-7" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+ Doxygen</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+ Doxygen</tspan></text> <g transform="translate(-119.92979,57.949844)" id="g3267-9"> @@ -1317,28 +1280,26 @@ y="473.13675" id="text4090-8-1-8-9-1-4-1-4" xml:space="preserve" - style="font-size:25.6917057px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-weight:normal;font-size:25.6917px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan x="628.93628" y="473.13675" id="tspan4092-8-7-6-9-7-0-7-8" - style="font-size:11.56126785px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">***</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:11.5613px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">***</tspan></text> </g> </g> </g> </g> <text - x="840.1828" - y="234.34692" - transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + x="861.39557" + y="213.1337" + transform="rotate(45)" id="text4090-8-5-6-9-4-6-6-8-7-4" xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - sodipodi:linespacing="125%"><tspan - x="840.1828" - y="234.34692" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"><tspan + x="861.39557" + y="213.1337" id="tspan4092-8-5-5-3-4-0-6-2-11-0" - style="font-size:21px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">+</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">+</tspan></text> <g transform="translate(1.0962334,-2.7492248)" id="g3595"> @@ -1347,42 +1308,41 @@ y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="30.942892" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.247679" y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2-5" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.247679" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3-7" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="19.552465" y="1037.0271" id="text4090-8-7-8-7-6-3-8-4-1-2-7" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="19.552465" y="1037.0271" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="42.830166" y="1033.2393" id="text4090-8-7-8-7-6-3-8-4-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.830166" y="1033.2393" id="tspan4092-8-6-3-1-8-4-4-55-2" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">New header files must get a new page in the API docs.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">New header files must get a new page in the API docs.</tspan></text> </g> <g transform="translate(1.0962334,-2.7492248)" @@ -1392,52 +1352,51 @@ y="1046.0962" id="text4090-8-7-8-7-6-3-8-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="42.212418" y="1046.0962" id="tspan4092-8-6-3-1-8-4-4-5" - style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">Available from patchwork, or email header. Reply to Cover letters.</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">Available from patchwork, or email header. Reply to Cover letters.</tspan></text> <text x="31.140535" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="31.140535" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-3" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="25.445322" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-5-2" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="25.445322" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-7-2" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="19.750109" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-7-1" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="19.750109" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9-6" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> <text x="14.016749" y="1049.8527" id="text4090-8-7-8-7-6-3-8-4-1-2-7-1-8" xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace Bold"><tspan + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:0%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan x="14.016749" y="1049.8527" id="tspan4092-8-6-3-1-8-4-4-55-7-3-9-6-5" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace Bold">*</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">*</tspan></text> </g> <rect width="196.44218" @@ -1449,36 +1408,35 @@ id="rect3239-0-9-4-2-1-9-9-7" style="fill:none;stroke:#00233b;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <rect - width="678.43036" - height="43.497677" - rx="7.8557949" - ry="6.7630997" - x="31.274473" - y="836.69745" + width="710.73767" + height="43.476074" + rx="8.2298937" + ry="6.7597408" + x="31.285275" + y="836.70825" id="rect3239-0-9-4-3-6" - style="fill:none;stroke:#00233b;stroke-width:0.92794865;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#00233b;stroke-width:0.949551;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text x="73.804535" y="864.28137" id="text4090-8-1-8-65-9-1" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan sodipodi:role="line" x="73.804535" y="864.28137" - id="tspan3266-8">git format-patch -[N]</tspan></text> + id="tspan3266-8" + style="font-size:19px;line-height:1.25;font-family:monospace">git format-patch -[N]</tspan></text> <text x="342.70221" y="862.83478" id="text4090-8-1-8-65-9-1-7" xml:space="preserve" - style="font-size:19px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace" - sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"><tspan sodipodi:role="line" x="342.70221" y="862.83478" id="tspan3266-8-2" - style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Monospace;-inkscape-font-specification:Monospace">// creates .patch files for final review</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;writing-mode:lr-tb;text-anchor:start">// creates .patch files for final review</tspan></text> </g> </svg> -- 2.22.0 ^ permalink raw reply [flat|nested] 300+ messages in thread
* Re: [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power ` (13 preceding siblings ...) 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 14/14] doc: update patch cheatsheet to use meson Ciara Power @ 2020-10-22 20:53 ` Thomas Monjalon 14 siblings, 0 replies; 300+ messages in thread From: Thomas Monjalon @ 2020-10-22 20:53 UTC (permalink / raw) To: Ciara Power; +Cc: dev 21/10/2020 10:17, Ciara Power: > 147 files changed, 729 insertions(+), 2065 deletions(-) Huge patchset! After few adjustments (including new driver and remaining CONFIG_RTE), Applied, thanks for the great effort. ^ permalink raw reply [flat|nested] 300+ messages in thread
end of thread, other threads:[~2020-10-22 20:53 UTC | newest] Thread overview: 300+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-07 12:29 [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 01/19] examples: remove legacy sections of makefiles Ciara Power 2020-08-12 16:38 ` Bruce Richardson 2020-08-13 14:29 ` Power, Ciara 2020-08-14 10:29 ` Bruce Richardson 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 02/19] build: remove makefiles and mk directory Ciara Power 2020-08-07 12:45 ` Bruce Richardson 2020-08-07 13:19 ` Jerin Jacob 2020-08-07 13:23 ` Bruce Richardson 2020-08-07 13:34 ` Ferruh Yigit 2020-08-07 14:01 ` Jerin Jacob 2020-08-07 15:05 ` Gaëtan Rivet 2020-08-12 15:50 ` Bruce Richardson 2020-08-12 16:12 ` Jerin Jacob 2020-08-12 16:40 ` Bruce Richardson 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 03/19] config: remove all config files used by make Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 04/19] buildtools: remove all scripts for use with make Ciara Power 2020-08-12 21:54 ` Thomas Monjalon 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 05/19] doc: remove references to make in bbdev guides Ciara Power 2020-08-12 21:56 ` Thomas Monjalon 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 06/19] doc: remove references to make in compressdev guides Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 07/19] doc: remove references to make in contributing guides Ciara Power 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 08/19] doc: remove references to make in cryptodev guides Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:29 ` [dpdk-dev] [PATCH 20.11 09/19] doc: remove references to make in eventdev guides Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 10/19] doc: remove references to make in FreeBSD gsg guide Ciara Power 2020-08-18 11:33 ` Bruce Richardson 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 11/19] doc: remove references to make in howto guides Ciara Power 2020-08-12 22:00 ` Thomas Monjalon 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 12/19] doc: remove references to make in Linux gsg guides Ciara Power 2020-08-18 11:40 ` Bruce Richardson 2020-08-19 13:03 ` Bruce Richardson 2020-08-18 11:48 ` Bruce Richardson 2020-08-18 13:11 ` Bruce Richardson 2020-08-18 13:34 ` Bruce Richardson 2020-08-18 14:31 ` Bruce Richardson 2020-08-18 14:45 ` Bruce Richardson 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 13/19] doc: remove references to make in mempool guides Ciara Power 2020-08-18 10:34 ` Kilheeney, Louise 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 14/19] doc: remove references to make in NIC guides Ciara Power 2020-08-19 16:22 ` Bruce Richardson 2020-08-19 17:17 ` Bruce Richardson 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 15/19] doc: remove references to make in platform guides Ciara Power 2020-08-12 22:03 ` Thomas Monjalon 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 16/19] doc: remove references to make in prog guides Ciara Power 2020-08-12 22:05 ` Thomas Monjalon 2020-08-17 13:54 ` Bruce Richardson 2020-08-19 15:54 ` Stephen Hemminger 2020-08-19 15:21 ` Laatz, Kevin 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 17/19] doc: remove references to make in rawdev guides Ciara Power 2020-08-18 11:46 ` Laatz, Kevin 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 18/19] doc: remove references to make in sample app guides Ciara Power 2020-08-07 12:30 ` [dpdk-dev] [PATCH 20.11 19/19] doc: remove references to make in vdpadevs guides Ciara Power 2020-08-07 13:28 ` [dpdk-dev] [PATCH 20.11 00/19] remove make support in DPDK Bruce Richardson 2020-08-12 22:07 ` Thomas Monjalon 2020-08-12 21:50 ` Thomas Monjalon 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 00/37] " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 01/37] examples: remove legacy sections of makefiles Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 02/37] examples/multi_process: convert to pkg-config-based build Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 03/37] examples/server_node_efd: " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 04/37] examples/ka-agent: " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 05/37] examples/pthread: " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 06/37] examples/vm_power_manager: convert to use DPDK pkg-config Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 07/37] examples/vm_power_manager: convert guest cli to pkg-config Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 08/37] examples/ethtool: convert to pkg-config-based build Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 09/37] build: create dummy Makefile Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 10/37] build: remove makefiles and mk directory Ciara Power 2020-08-21 3:18 ` Ruifeng Wang 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 11/37] config: remove all config files used by make Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 12/37] examples: remove old build system references Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 13/37] buildtools: remove all scripts for use with make Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 14/37] devtools: remove use of make in scripts Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 15/37] app/test: remove references to make Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 16/37] drivers: remove references to make config options Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 17/37] lib: " Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 18/37] doc/guides: remove use of DPDK make build system Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 19/37] doc: remove deprecation notice for make Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 20/37] doc: remove references to make in bbdev guides Ciara Power 2020-08-21 2:12 ` Chautru, Nicolas 2020-08-21 10:55 ` Power, Ciara 2020-08-21 15:18 ` Chautru, Nicolas 2020-08-21 2:22 ` Chautru, Nicolas 2020-08-21 9:41 ` Bruce Richardson 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 21/37] doc: remove references to make in compressdev guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 22/37] doc: remove references to make in contributing guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 23/37] doc: remove references to make in cryptodev guides Ciara Power 2020-08-20 15:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 24/37] doc: remove references to make in eventdev guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 25/37] doc: remove references to make in FreeBSD gsg guide Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 26/37] doc: remove references to make in howto guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 27/37] doc: remove references to make in Linux gsg guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 28/37] doc: remove references to make in mempool guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 29/37] doc: remove references to make in NIC guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 30/37] doc: remove references to make in platform guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 31/37] doc: remove references to make in prog guides Ciara Power 2020-08-20 15:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 32/37] doc: remove references to make in rawdev guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 33/37] doc: remove references to make in sample app guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 34/37] doc: remove references to make in vdpadevs guides Ciara Power 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 35/37] doc: remove reference to make in tools guides Ciara Power 2020-09-02 11:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 36/37] doc: remove references to make in testpmd guides Ciara Power 2020-09-02 11:08 ` Laatz, Kevin 2020-08-20 12:41 ` [dpdk-dev] [PATCH v2 37/37] doc: update quick build doc to remove make references Ciara Power 2020-09-02 11:08 ` Laatz, Kevin 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 01/37] examples: remove legacy sections of makefiles Ciara Power 2020-09-04 0:36 ` Chautru, Nicolas 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 02/37] examples/multi_process: convert to pkg-config-based build Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 03/37] examples/server_node_efd: " Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 04/37] examples/ka-agent: " Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 05/37] examples/pthread: " Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 06/37] examples/vm_power_manager: convert to use DPDK pkg-config Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 07/37] examples/vm_power_manager: convert guest cli to pkg-config Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 08/37] examples/ethtool: convert to pkg-config-based build Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 09/37] build: create dummy Makefile Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 10/37] build: remove makefiles and mk directory Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 11/37] config: remove all config files used by make Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 12/37] examples: remove old build system references Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 13/37] buildtools: remove all scripts for use with make Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 14/37] devtools: remove use of make in scripts Ciara Power 2020-09-06 10:15 ` Thomas Monjalon 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 15/37] app/test: remove references to make Ciara Power 2020-09-04 0:24 ` Chautru, Nicolas 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 16/37] drivers: remove references to make config options Ciara Power 2020-09-06 10:24 ` Thomas Monjalon 2020-09-07 8:18 ` Bruce Richardson 2020-09-07 9:43 ` Thomas Monjalon 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 17/37] lib: " Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 18/37] doc/guides: remove use of DPDK make build system Ciara Power 2020-09-03 15:26 ` [dpdk-dev] [PATCH v3 19/37] doc: remove deprecation notice for make Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 20/37] doc: remove references to make in bbdev guides Ciara Power 2020-09-04 1:35 ` Chautru, Nicolas 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 21/37] doc: remove references to make in compressdev guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 22/37] doc: remove references to make in contributing guides Ciara Power 2020-09-07 10:20 ` Thomas Monjalon 2020-09-17 13:44 ` Power, Ciara 2020-09-21 16:14 ` Thomas Monjalon 2020-09-21 19:14 ` Dumitrescu, Cristian 2020-09-22 8:39 ` Power, Ciara 2020-09-22 9:14 ` Dumitrescu, Cristian 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 23/37] doc: remove references to make in cryptodev guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 24/37] doc: remove references to make in eventdev guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 25/37] doc: remove references to make in FreeBSD gsg guide Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 26/37] doc: remove references to make in howto guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 27/37] doc: remove references to make in Linux gsg guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 28/37] doc: remove references to make in mempool guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 29/37] doc: remove references to make in NIC guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 30/37] doc: remove references to make in platform guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 31/37] doc: remove references to make in prog guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 32/37] doc: remove references to make in rawdev guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 33/37] doc: remove references to make in sample app guides Ciara Power 2020-09-04 0:34 ` Chautru, Nicolas 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 34/37] doc: remove references to make in vdpadevs guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 35/37] doc: remove reference to make in tools guides Ciara Power 2020-09-04 0:32 ` Chautru, Nicolas 2020-09-04 9:04 ` Pattan, Reshma 2020-09-04 13:34 ` Bruce Richardson 2020-09-04 13:54 ` Pattan, Reshma 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 36/37] doc: remove references to make in testpmd guides Ciara Power 2020-09-03 15:27 ` [dpdk-dev] [PATCH v3 37/37] doc: update quick build doc to remove make references Ciara Power 2020-09-06 13:19 ` Thomas Monjalon 2020-09-06 21:58 ` [dpdk-dev] [PATCH v3 00/37] remove make support in DPDK Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 00/31] " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 01/31] doc: build without using make Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 02/31] examples: remove legacy sections of makefiles Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 03/31] examples/ka-agent: convert to pkg-config-based build Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 04/31] examples/server_node_efd: " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 05/31] examples/performance-thread: " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 06/31] examples/multi_process: " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 07/31] examples/vm_power: " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 08/31] examples/ethtool: " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 09/31] examples: remove old build system references Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 10/31] build: create dummy Makefile Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 11/31] build: remove makefiles Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 12/31] buildtools: remove scripts used only with make Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 13/31] config: remove default configs used " Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 14/31] devtools: remove legacy flags from includes check Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 15/31] app: remove references to make-based config Thomas Monjalon 2020-09-14 17:11 ` Laatz, Kevin 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 16/31] doc: remove references to make from Linux guide Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 17/31] doc: remove references to make from FreeBSD guide Thomas Monjalon 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 18/31] doc: remove references to make from howto guides Thomas Monjalon 2020-09-14 16:53 ` Laatz, Kevin 2020-09-07 22:06 ` [dpdk-dev] [PATCH v4 19/31] doc: remove references to make from prog guide Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 20/31] doc: remove references to make from platforms guides Thomas Monjalon 2020-09-14 16:52 ` Laatz, Kevin 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 21/31] doc: remove references to make from mempool guide Thomas Monjalon 2020-09-14 16:52 ` Laatz, Kevin 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 22/31] doc: remove references to make from NICs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 23/31] doc: remove references to make from vdpadevs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 24/31] doc: remove references to make from bbdevs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 25/31] doc: remove references to make from cryptodevs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 26/31] doc: remove references to make from compressdevs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 27/31] doc: remove references to make from eventdevs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 28/31] doc: remove references to make from rawdevs guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 29/31] doc: remove references to make from app guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 30/31] doc: remove reference to make from tools guides Thomas Monjalon 2020-09-07 22:07 ` [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide Thomas Monjalon 2020-09-08 10:16 ` Thomas Monjalon 2020-09-08 8:16 ` [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK Bruce Richardson 2020-09-08 9:05 ` Thomas Monjalon 2020-09-15 14:02 ` David Marchand 2020-09-15 15:08 ` Power, Ciara 2020-09-15 15:44 ` Thomas Monjalon 2020-09-15 15:57 ` Richardson, Bruce 2020-09-15 16:10 ` Thomas Monjalon 2020-09-15 16:39 ` Chautru, Nicolas 2020-09-15 16:42 ` Thomas Monjalon 2020-09-16 14:58 ` David Marchand 2020-09-08 13:02 ` David Marchand 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 00/20] " Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 01/20] devtools: remove legacy flags from includes check Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 02/20] app: remove references to make-based config Ciara Power 2020-09-21 14:28 ` Chautru, Nicolas 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 03/20] doc: remove references to make from Linux guide Ciara Power 2020-09-30 22:09 ` Thomas Monjalon 2020-10-01 8:31 ` Power, Ciara 2020-10-01 8:36 ` Power, Ciara 2020-10-01 9:49 ` Thomas Monjalon 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 04/20] doc: remove references to make from FreeBSD guide Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 05/20] doc: remove references to make from howto guides Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 06/20] doc: remove references to make from prog guide Ciara Power 2020-10-09 12:07 ` Ferruh Yigit 2020-10-09 12:12 ` Ferruh Yigit 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 07/20] doc: remove references to make from platforms guides Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 08/20] doc: remove references to make from mempool guide Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 09/20] doc: remove references to make from NICs guides Ciara Power 2020-10-09 12:08 ` Ferruh Yigit 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 10/20] doc: remove references to make from vdpadevs guides Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 11/20] doc: remove references to make from bbdevs guides Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 12/20] doc: remove references to make from cryptodevs guides Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 13/20] doc: remove references to make from compressdevs guides Ciara Power 2020-10-02 9:33 ` Daly, Lee 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 14/20] doc: remove references to make from eventdevs guides Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 15/20] doc: remove references to make from rawdevs guides Ciara Power 2020-10-01 15:17 ` Bruce Richardson 2020-10-02 14:57 ` Xu, Rosen 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 16/20] doc: remove references to make from app guides Ciara Power 2020-09-24 13:17 ` David Hunt 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 17/20] doc: remove reference to make from tools guides Ciara Power 2020-10-01 14:03 ` Power, Ciara 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 18/20] doc: remove references to make from contributing guide Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 19/20] doc: add to release notes to reflect removal of make Ciara Power 2020-09-21 13:59 ` [dpdk-dev] [PATCH v5 20/20] doc: update patch cheatsheet to use meson Ciara Power 2020-10-01 15:09 ` [dpdk-dev] [PATCH v5 00/20] remove make support in DPDK Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 00/14] " Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 01/14] doc: remove references to make from platforms guides Ciara Power 2020-10-12 19:37 ` Harman Kalra 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 02/14] doc: remove references to make from mempool guide Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 03/14] doc: remove references to make from NICs guides Ciara Power 2020-10-09 12:00 ` [dpdk-dev] [EXT] " Igor Russkikh 2020-10-11 21:01 ` Thomas Monjalon 2020-10-12 6:47 ` Rasesh Mody 2020-10-09 12:15 ` [dpdk-dev] " Ferruh Yigit 2020-10-12 0:42 ` Ajit Khaparde 2020-10-12 2:41 ` Hyong Youb Kim (hyonkim) 2020-10-12 19:57 ` [dpdk-dev] [EXT] " Harman Kalra 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 04/14] doc: remove references to make from vdpadevs guides Ciara Power 2020-10-11 6:49 ` Matan Azrad 2020-10-11 20:57 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 05/14] doc: remove references to make from bbdevs guides Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 06/14] doc: remove references to make from cryptodevs guides Ciara Power 2020-10-09 10:30 ` Akhil Goyal 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 07/14] doc: remove references to make from compressdevs guides Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 08/14] doc: remove references to make from eventdevs guides Ciara Power 2020-10-11 20:36 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 09/14] doc: remove references to make from rawdevs guides Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 10/14] doc: remove references to make from app guides Ciara Power 2020-10-09 12:23 ` Ferruh Yigit 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 11/14] doc: remove reference to make from tools guides Ciara Power 2020-10-11 20:45 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 12/14] doc: remove references to make from contributing guide Ciara Power 2020-10-11 20:52 ` Thomas Monjalon 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 13/14] doc: add to release notes to reflect removal of make Ciara Power 2020-10-09 10:21 ` [dpdk-dev] [PATCH v6 14/14] doc: update patch cheatsheet to use meson Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 01/14] doc: remove references to make from platforms guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 02/14] doc: remove references to make from mempool guide Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 03/14] doc: remove references to make from NICs guides Ciara Power 2020-10-22 8:31 ` Thomas Monjalon 2020-10-22 10:03 ` Power, Ciara 2020-10-22 10:16 ` Thomas Monjalon 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 04/14] doc: remove references to make from vdpadevs guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 05/14] doc: remove references to make from bbdevs guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 06/14] doc: remove references to make from cryptodevs guides Ciara Power 2020-10-21 8:33 ` Ruifeng Wang 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 07/14] doc: remove references to make from compressdevs guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 08/14] doc: remove references to make from eventdevs guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 09/14] doc: remove references to make from rawdevs guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 10/14] doc: remove references to make from app guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 11/14] doc: remove reference to make from tools guides Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 12/14] doc: remove references to make from contributing guide Ciara Power 2020-10-22 20:40 ` Thomas Monjalon 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 13/14] doc: add to release notes to reflect removal of make Ciara Power 2020-10-21 8:17 ` [dpdk-dev] [PATCH v7 14/14] doc: update patch cheatsheet to use meson Ciara Power 2020-10-22 20:53 ` [dpdk-dev] [PATCH v7 00/14] remove make support in DPDK Thomas Monjalon
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).
