Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1121: Add "Get DPDK version" KW to DPDK tests
[csit.git]
/
tests
/
dpdk
/
dpdk_scripts
/
run_l2fwd.sh
diff --git
a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index
20c41d6
..
578c12c
100755
(executable)
--- a/
tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/
tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@
-3,7
+3,7
@@
set -x
# Setting variables
set -x
# Setting variables
-DPDK_VERSION=dpdk-1
7.05
+DPDK_VERSION=dpdk-1
8.02
ROOTDIR=/tmp/openvpp-testing
TESTPMDLOG=screenlog.0
PWDDIR=$(pwd)
ROOTDIR=/tmp/openvpp-testing
TESTPMDLOG=screenlog.0
PWDDIR=$(pwd)
@@
-13,6
+13,15
@@
cpu_corelist=$1
nb_cores=$2
queue_nums=$3
jumbo_frames=$4
nb_cores=$2
queue_nums=$3
jumbo_frames=$4
+arch=${5:-"x86_64"}
+
+# dpdk prefers "arm64" to "aarch64" and does not allow arm64 native target
+if [ $arch == "aarch64" ]; then
+ arch="arm64"
+ machine="armv8a"
+else
+ machine="native"
+fi
# Try to kill the testpmd
sudo pgrep testpmd
# Try to kill the testpmd
sudo pgrep testpmd
@@
-75,15
+84,17
@@
sleep 2
cd ${ROOTDIR}/${DPDK_VERSION}/
rm -f ${TESTPMDLOG}
cd ${ROOTDIR}/${DPDK_VERSION}/
rm -f ${TESTPMDLOG}
+TESTPMD_BIN=./${arch}-${machine}-linuxapp-gcc/app/testpmd
+
if [ "$jumbo_frames" = "yes" ]; then
if [ "$jumbo_frames" = "yes" ]; then
- sudo sh -c "screen -dmSL DPDK-test
./x86_64-native-linuxapp-gcc/app/testpmd
\
- -l ${cpu_corelist} -n 4 -- \
+ sudo sh -c "screen -dmSL DPDK-test
$TESTPMD_BIN
\
+ -l ${cpu_corelist} -n 4 --
log-level 8 -v --
\
--numa \
--nb-ports=2 \
--portmask=0x3 \
--nb-cores=${nb_cores} \
--max-pkt-len=9000 \
--numa \
--nb-ports=2 \
--portmask=0x3 \
--nb-cores=${nb_cores} \
--max-pkt-len=9000 \
- --tx
qflags=0
\
+ --tx
-offloads=0x7FFFFFFF
\
--forward-mode=io \
--rxq=${queue_nums} \
--txq=$((${nb_cores} + 1)) \
--forward-mode=io \
--rxq=${queue_nums} \
--txq=$((${nb_cores} + 1)) \
@@
-93,8
+104,8
@@
if [ "$jumbo_frames" = "yes" ]; then
--disable-link-check \
--auto-start"
else
--disable-link-check \
--auto-start"
else
- sudo sh -c "screen -dmSL DPDK-test
./x86_64-native-linuxapp-gcc/app/testpmd
\
- -l ${cpu_corelist} -n 4 -- \
+ sudo sh -c "screen -dmSL DPDK-test
$TESTPMD_BIN
\
+ -l ${cpu_corelist} -n 4 --
log-level 8 -v --
\
--numa \
--nb-ports=2 \
--portmask=0x3 \
--numa \
--nb-ports=2 \
--portmask=0x3 \