X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fdpdk.sh;h=3c16372294d8d63902b6b8bd9a2093f8b553004c;hp=1654cf811bdd0de46afa260437441a110bff3398;hb=6da5a6920171682bd5bf6a77517bedfef91cbd0e;hpb=018dc06b3cf5fdd4733a1221f9592a48ddd6664c

diff --git a/resources/libraries/bash/function/dpdk.sh b/resources/libraries/bash/function/dpdk.sh
index 1654cf811b..3c16372294 100644
--- a/resources/libraries/bash/function/dpdk.sh
+++ b/resources/libraries/bash/function/dpdk.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -84,49 +84,34 @@ function dpdk_compile () {
 
     set -exuo pipefail
 
-    arch=$(uname -m) || {
-        die "Get CPU architecture failed."
-    }
-
-    # DPDK prefers "arm64" to "aarch64" and does not allow arm64 native target.
-    if [ ${arch} == "aarch64" ]; then
-        arch="arm64"
-        machine="armv8a"
-    else
-        machine="native"
-    fi
-
-    # Patch settings.
-    sed_mlx="s/^CONFIG_RTE_LIBRTE_MLX5_PMD=n/CONFIG_RTE_LIBRTE_MLX5_PMD=y/g"
-    sed_i40e="s/^CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/g"
-    sed_file="./config/common_base"
-
     pushd "${DPDK_DIR}" || die "Pushd failed"
-    if ( lsmod || die ) | fgrep mlx; then
-        sed -i "${sed_mlx}" "${sed_file}" || die
-    fi
-
-    sed -i "${sed_i40e}" "${sed_file}" || die "Patch failed"
 
-    # Compile
-    make install T="${arch}"-"${machine}"-linuxapp-gcc -j || {
-        die "Failed to compile DPDK!"
-    }
-    popd || die "Popd failed"
-
-    # Compile the l3fwd.
-    export RTE_SDK="${DPDK_DIR}/"
-    export RTE_TARGET="${arch}-${machine}-linuxapp-gcc"
-    # Patch settings.
-    sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128/#define RTE_TEST_RX_DESC_DEFAULT 1024/g"
-    sed_txd="s/^#define RTE_TEST_TX_DESC_DEFAULT 512/#define RTE_TEST_TX_DESC_DEFAULT 1024/g"
+    # Patch ARM.
+    sed_file="config/arm/meson.build"
+    sed_cmd="s/'RTE_MAX_LCORE', [0-9]*/'RTE_MAX_LCORE', $(nproc --all)/"
+    sed -i "${sed_cmd}" "${sed_file}" || die "RTE_MAX_LCORE Patch failed"
+    sed_cmd="s/'RTE_MAX_NUMA_NODES', [0-9]*/'RTE_MAX_NUMA_NODES', "
+    sed_cmd+="$(echo /sys/devices/system/node/node* | wc -w)/"
+    sed -i "${sed_cmd}" "${sed_file}" || die "RTE_MAX_NUMA_NODES Patch failed"
+
+    # Patch L3FWD.
+    sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128"
+    sed_rxd+="/#define RTE_TEST_RX_DESC_DEFAULT 1024/g"
+    sed_txd="s/^#define RTE_TEST_TX_DESC_DEFAULT 512"
+    sed_txd+="/#define RTE_TEST_TX_DESC_DEFAULT 1024/g"
     sed_file="./main.c"
-    pushd "${RTE_SDK}"/examples/l3fwd || die "Pushd failed"
+    pushd examples/l3fwd || die "Pushd failed"
     sed -i "${sed_rxd}" "${sed_file}" || die "Patch failed"
     sed -i "${sed_txd}" "${sed_file}" || die "Patch failed"
-    make clean || die "Failed to compile l3fwd"
-    make -j || die "Failed to compile l3fwd"
     popd || die "Popd failed"
+
+    # Compile using Meson and Ninja.
+    export CFLAGS=""
+    CFLAGS+="-DRTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
+    meson -Dexamples=l3fwd build || {
+        die "Failed to compile DPDK!"
+    }
+    ninja -C build || die "Failed to compile DPDK!"
 }
 
 
@@ -222,32 +207,20 @@ function dpdk_l3fwd_compile () {
 
     set -exuo pipefail
 
-    arch=$(uname -m) || {
-        die "Get CPU architecture failed."
-    }
-
-    # DPDK prefers "arm64" to "aarch64" and does not allow arm64 native target.
-    if [ ${arch} == "aarch64" ]; then
-        arch="arm64"
-        machine="armv8a"
-    else
-        machine="native"
-    fi
-
-    # Compile the l3fwd.
-    export RTE_SDK="${DPDK_DIR}/"
-    export RTE_TARGET="${arch}-${machine}-linuxapp-gcc"
-    # Patch settings.
-    sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128/#define RTE_TEST_RX_DESC_DEFAULT 2048/g"
-    sed_txd="s/^#define RTE_TEST_TX_DESC_DEFAULT 512/#define RTE_TEST_TX_DESC_DEFAULT 2048/g"
+    pushd "${DPDK_DIR}" || die "Pushd failed"
+    # Patch L3FWD.
+    sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128"
+    sed_rxd+="/#define RTE_TEST_RX_DESC_DEFAULT 2048/g"
+    sed_txd="s/^#define RTE_TEST_TX_DESC_DEFAULT 512"
+    sed_txd+="/#define RTE_TEST_TX_DESC_DEFAULT 2048/g"
     sed_file="./main.c"
-    pushd "${RTE_SDK}"/examples/l3fwd || die "Pushd failed"
+    pushd examples/l3fwd || die "Pushd failed"
     sed -i "${sed_rxd}" "${sed_file}" || die "Patch failed"
     sed -i "${sed_txd}" "${sed_file}" || die "Patch failed"
     chmod +x ${1} && source ${1} || die "Patch failed"
-    make clean || die "Failed to compile l3fwd"
-    make -j || die "Failed to compile l3fwd"
     popd || die "Popd failed"
+
+    ninja -C build || die "Failed to compile DPDK!"
 }
 
 
@@ -262,20 +235,8 @@ function dpdk_l3fwd () {
 
     set -exuo pipefail
 
-    arch=$(uname -m) || {
-        die "Get CPU architecture failed."
-    }
-
-    # DPDK prefers "arm64" to "aarch64" and does not allow arm64 native target.
-    if [ ${arch} == "aarch64" ]; then
-        arch="arm64"
-        machine="armv8a"
-    else
-        machine="native"
-    fi
-
     rm -f screenlog.0 || true
-    binary="${DPDK_DIR}/examples/l3fwd/build/app/l3fwd"
+    binary="${DPDK_DIR}/build/examples/dpdk-l3fwd"
 
     sudo sh -c "screen -dmSL DPDK-test ${binary} ${@}" || {
         die "Failed to start l3fwd"
@@ -329,20 +290,8 @@ function dpdk_testpmd () {
 
     set -exuo pipefail
 
-    arch=$(uname -m) || {
-        die "Get CPU architecture failed."
-    }
-
-    # DPDK prefers "arm64" to "aarch64" and does not allow arm64 native target.
-    if [ ${arch} == "aarch64" ]; then
-        arch="arm64"
-        machine="armv8a"
-    else
-        machine="native"
-    fi
-
     rm -f screenlog.0 || true
-    binary="${DPDK_DIR}/${arch}-${machine}-linuxapp-gcc/app/testpmd"
+    binary="${DPDK_DIR}/build/app/dpdk-testpmd"
 
     sudo sh -c "screen -dmSL DPDK-test ${binary} ${@}" || {
         die "Failed to start testpmd"
@@ -350,9 +299,7 @@ function dpdk_testpmd () {
 
     for attempt in {1..60}; do
         echo "Checking if testpmd is alive, attempt nr ${attempt}"
-         if fgrep "Press enter to exit" screenlog.0 && \
-            fgrep "Port 0: link state change event" screenlog.0 && \
-            fgrep "Port 1: link state change event" screenlog.0; then
+         if fgrep "Press enter to exit" screenlog.0; then
              cat screenlog.0
              exit 0
         fi