aboutsummaryrefslogtreecommitdiffstats
path: root/tests/dpdk
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2020-02-28 07:13:27 +0000
committerPeter Mikus <pmikus@cisco.com>2020-03-10 11:10:27 +0000
commit6daa2d791f0e0d41b73668ef3ee233e58987dc37 (patch)
treee04db74c43eeb297284ab9431af97438fd2f7b7d /tests/dpdk
parentdddfcfb9ce358799ce2b9f53ffb8e1e594fb2cec (diff)
Make RXQs/TXQs configurable
Change-Id: Ib30bc4697fcba93a6723ee492a59a0523425f623 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/dpdk')
-rwxr-xr-xtests/dpdk/dpdk_scripts/install_dpdk.sh4
-rwxr-xr-xtests/dpdk/dpdk_scripts/run_l2fwd.sh14
-rw-r--r--tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot4
-rw-r--r--tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot4
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot4
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot4
6 files changed, 22 insertions, 12 deletions
diff --git a/tests/dpdk/dpdk_scripts/install_dpdk.sh b/tests/dpdk/dpdk_scripts/install_dpdk.sh
index ec23aa06b1..05a922b457 100755
--- a/tests/dpdk/dpdk_scripts/install_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/install_dpdk.sh
@@ -35,8 +35,8 @@ cd ${PWDDIR}
export RTE_SDK=${ROOTDIR}/${DPDK_DIR}/
export RTE_TARGET=${ARCH}-${MACHINE}-linuxapp-gcc
cd ${RTE_SDK}/examples/l3fwd
-sudo sed -i 's/^#define RTE_TEST_RX_DESC_DEFAULT 128/#define RTE_TEST_RX_DESC_DEFAULT 2048/g' ./main.c
-sudo sed -i 's/^#define RTE_TEST_TX_DESC_DEFAULT 512/#define RTE_TEST_TX_DESC_DEFAULT 2048/g' ./main.c
+sudo sed -i 's/^#define RTE_TEST_RX_DESC_DEFAULT 128/#define RTE_TEST_RX_DESC_DEFAULT 1024/g' ./main.c
+sudo sed -i 's/^#define RTE_TEST_TX_DESC_DEFAULT 512/#define RTE_TEST_TX_DESC_DEFAULT 1024/g' ./main.c
make -j || \
{ echo "Failed to compile l3fwd"; exit 1; }
cd ${PWDDIR}
diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index f15461e254..0ec4f2d85f 100755
--- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@ -26,6 +26,8 @@ cpu_corelist="${1}"
nb_cores="${2}"
queue_nums="${3}"
jumbo_frames="${4}"
+rxd="${5:-128}"
+txd="${6:-512}"
arch="$(uname -m)"
# DPDK prefers "arm64" to "aarch64" and does not allow arm64 native target.
@@ -112,8 +114,8 @@ if [ "${jumbo_frames}" = "yes" ]; then
--rxq=${queue_nums} \
--txq=$((${nb_cores} + 1)) \
--burst=64 \
- --rxd=1024 \
- --txd=1024 \
+ --rxd=${rxd} \
+ --txd=${txd} \
--disable-link-check \
--auto-start"
else
@@ -127,20 +129,20 @@ else
--rxq=${queue_nums} \
--txq=$((${nb_cores} + 1)) \
--burst=64 \
- --rxd=1024 \
- --txd=1024 \
+ --rxd=${rxd} \
+ --txd=${txd} \
--disable-link-check \
--auto-start"
fi
for attempt in {1..60}; do
echo "Checking if testpmd is alive, attempt nr ${attempt}"
- fgrep "Port 1: link state change event" "${TESTPMDLOG}"
+ fgrep "Press enter to exit" "${TESTPMDLOG}"
if [ "${?}" -eq "0" ]; then
- cat "${TESTPMDLOG}"
exit 0
fi
sleep 1
done
+cat "${TESTPMDLOG}"
exit 1
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index a0e173984d..ae6ebb28b3 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -46,6 +46,8 @@
*** Variables ***
| ${osi_layer}= | L2
| ${nic_name}= | Intel-X710
+| ${nic_rxq_size}= | 1024
+| ${nic_txq_size}= | 1024
| ${overhead}= | ${0}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index d041deb5bf..068a6145d7 100644
--- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -46,6 +46,8 @@
*** Variables ***
| ${osi_layer}= | L3
| ${nic_name}= | Intel-X710
+| ${nic_rxq_size}= | 1024
+| ${nic_txq_size}= | 1024
| ${overhead}= | ${0}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 568f7ed256..770c7f0b30 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -46,6 +46,8 @@
*** Variables ***
| ${osi_layer}= | L2
| ${nic_name}= | Intel-X710
+| ${nic_rxq_size}= | 1024
+| ${nic_txq_size}= | 1024
| ${overhead}= | ${0}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 8bbc131f41..da9e5251ac 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -46,6 +46,8 @@
*** Variables ***
| ${osi_layer}= | L3
| ${nic_name}= | Intel-X710
+| ${nic_rxq_size}= | 1024
+| ${nic_txq_size}= | 1024
| ${overhead}= | ${0}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd