X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fdpdk%2Fdpdk_scripts%2Frun_l2fwd.sh;h=8579d7e1aee071f5ece368a987ec886bdc8ad197;hb=2038406703b82f513e6feaa1583118ba0d4eccaf;hp=bbd69b6dec58f770b3f6f976c23ce0a599d620bb;hpb=c293eae53515f7b94ac5a71b329a9a9655bd8c09;p=csit.git

diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index bbd69b6dec..8579d7e1ae 100755
--- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.11
+DPDK_VERSION=dpdk-18.02
 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
+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
@@ -75,15 +84,17 @@ sleep 2
 
 cd ${ROOTDIR}/${DPDK_VERSION}/
 rm -f ${TESTPMDLOG}
+TESTPMD_BIN=./${arch}-${machine}-linuxapp-gcc/app/testpmd
+
 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 -- \
         --numa \
         --nb-ports=2 \
         --portmask=0x3 \
         --nb-cores=${nb_cores} \
         --max-pkt-len=9000 \
-        --txqflags=0 \
+        --tx-offloads=0x7FFFFFFF \
         --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
-    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 -- \
         --numa \
         --nb-ports=2 \
         --portmask=0x3 \