diff options
| author |   Gabriel Ganne <gabriel.ganne@enea.com> | 2017-11-27 15:38:53 +0100 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2018-01-10 15:42:43 +0100 |
| commit | c7eb2002bcd007520309feb3e11a26ff847a4e05 (patch) | |
| tree | 84ea1d5513da1bb0f4e078aec87b44cf653a7e7c /tests/dpdk/dpdk_scripts/run_l2fwd.sh | |
| parent | a95c54b7821596402e0aa7136cd7d1de71a5b187 (diff) | |
add new topology parameter: arch
if unset, arch variable will default to "x86_64"
* Note on "arm64" vs "aarch64"
debian-based uses arm64
rhel-based uses aarch64
qemu binaries of both distribs uses aarch64
dpdk uses arm64
vpp uses aarch64
python machine modules uses aarch64
=> prefer aarch64 to use the same nomenclature as vpp
* add ARCH argument to:
init_dpdk.sh, install_dpdk.sh, run_l2fwd.sh, install_tldk.sh, run_tldk.sh.
default to x86_64
converts "aarch64" if needed for dpdk naming convention
* fixed terminal end detection to allow "~]# "
add dut node arch as param to all robot set bin calls
* add --target-list flag to qemu_build.sh
defaults to x86_64-softmmu
* add arch flag to all the topology files
* topologies/available/ (and example file)
* resources/tools/virl/topologies/
* set _qemu_bin path using node['arch'] in qemu_set_node()
Change-Id: If46d88d064d213d3e4c6fc584bb8e0d4b6428cb8
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
Diffstat (limited to 'tests/dpdk/dpdk_scripts/run_l2fwd.sh')
| -rwxr-xr-x | tests/dpdk/dpdk_scripts/run_l2fwd.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh index bbd69b6dec..80b688eccf 100755 --- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh +++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh @@ -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 \ |