X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fdpdk%2Fdpdk_scripts%2Frun_l2fwd.sh;h=80b688eccf485b3842e28a7661d7d4751410dcde;hb=c7eb2002bcd007520309feb3e11a26ff847a4e05;hp=20c41d6d6fab9a1959b158b591cc68658c2d5abc;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b;p=csit.git diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh index 20c41d6d6f..80b688eccf 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.05 +DPDK_VERSION=dpdk-17.11 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,8 +84,10 @@ 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 \ + sudo sh -c "screen -dmSL DPDK-test $TESTPMD_BIN \ -l ${cpu_corelist} -n 4 -- \ --numa \ --nb-ports=2 \ @@ -93,7 +104,7 @@ 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 \ + sudo sh -c "screen -dmSL DPDK-test $TESTPMD_BIN \ -l ${cpu_corelist} -n 4 -- \ --numa \ --nb-ports=2 \