Re: [dts] [PATCH V1 0/5] use API to set dpdk config when use meson

Re: [dts] [PATCH V1 0/5] use API to set dpdk config when use meson

[Ling, WeiX]

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

Tested-by: Ling, Wei <weix.ling@intel.com>

Regards,
Ling Wei

-----Original Message-----
From: Ling, WeiX <weix.ling@intel.com> 
Sent: Friday, September 11, 2020 10:46 PM
To: dts@dpdk.org
Cc: Ling, WeiX <weix.ling@intel.com>
Subject: [dts][PATCH V1 0/5] use API to set dpdk config when use meson

use API to set dpdk config when use meson

lingwei (5):
  tests/l3fwd_base:use API to set dpdk config when use meson
  tests/TestSuite_af_xdp_2:use API to set dpdk config when use meson
  tests/TestSuite_nic_single_core_perf:use API to set dpdk config when
    use meson
  tests/TestSuite_vmdq_dcb:use API to set dpdk config when use meson
  tests/TestSuite_vmdq:use API to set dpdk config when use meson

 tests/TestSuite_af_xdp_2.py             |  3 ++-
 tests/TestSuite_nic_single_core_perf.py |  4 ++++
 tests/TestSuite_vmdq.py                 |  5 ++++-
 tests/TestSuite_vmdq_dcb.py             | 13 ++++---------
 tests/l3fwd_base.py                     |  2 ++
 5 files changed, 16 insertions(+), 11 deletions(-)

-- 
2.17.1


[-- Attachment #2: TestNicSingleCorePerf.log --]
[-- Type: application/octet-stream, Size: 303032 bytes --]

[-- Attachment #3: TestVmdq.log --]
[-- Type: application/octet-stream, Size: 749762 bytes --]

[-- Attachment #4: TestVmdqDcb.log --]
[-- Type: application/octet-stream, Size: 560390 bytes --]

[-- Attachment #5: TestAfXdp.log --]
[-- Type: application/octet-stream, Size: 281793 bytes --]

[-- Attachment #6: TestL3fwdLpmIpv4.log --]
[-- Type: application/octet-stream, Size: 3482148 bytes --]

[dts] [PATCH V1 0/5] use API to set dpdk config when use meson

[lingwei]

use API to set dpdk config when use meson

lingwei (5):
  tests/l3fwd_base:use API to set dpdk config when use meson
  tests/TestSuite_af_xdp_2:use API to set dpdk config when use meson
  tests/TestSuite_nic_single_core_perf:use API to set dpdk config when
    use meson
  tests/TestSuite_vmdq_dcb:use API to set dpdk config when use meson
  tests/TestSuite_vmdq:use API to set dpdk config when use meson

 tests/TestSuite_af_xdp_2.py             |  3 ++-
 tests/TestSuite_nic_single_core_perf.py |  4 ++++
 tests/TestSuite_vmdq.py                 |  5 ++++-
 tests/TestSuite_vmdq_dcb.py             | 13 ++++---------
 tests/l3fwd_base.py                     |  2 ++
 5 files changed, 16 insertions(+), 11 deletions(-)

-- 
2.17.1

[dts] [dts 1/5] tests/l3fwd_base:use API to set dpdk config when use meson

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/l3fwd_base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/l3fwd_base.py b/tests/l3fwd_base.py
index 1eccc0e..6f7af8a 100644
--- a/tests/l3fwd_base.py
+++ b/tests/l3fwd_base.py
@@ -548,6 +548,7 @@ class L3fwdBase(object):
                      "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/"
                      "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/' "
                      "./config/common_base"))
+                self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'y'})
                 self.dut.build_install_dpdk(self.target)
 
     def __restore_compilation(self):
@@ -558,6 +559,7 @@ class L3fwdBase(object):
                      "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/"
                      "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/' "
                      "./config/common_base"))
+                self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'n'})
                 self.dut.build_install_dpdk(self.target)
 
     def __preset_compilation(self):
-- 
2.17.1

[dts] [dts 2/5] tests/TestSuite_af_xdp_2:use API to set dpdk config when use meson

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_af_xdp_2.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/TestSuite_af_xdp_2.py b/tests/TestSuite_af_xdp_2.py
index f1d495f..4586c9d 100644
--- a/tests/TestSuite_af_xdp_2.py
+++ b/tests/TestSuite_af_xdp_2.py
@@ -77,6 +77,7 @@ class TestAfXdp(TestCase):
     def prepare_dpdk(self):
         self.dut.send_expect(
             "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AF_XDP=n$/CONFIG_RTE_LIBRTE_PMD_AF_XDP=y/' config/common_base", "# ")
+        self.dut.set_build_options({'RTE_LIBRTE_PMD_AF_XDP': 'y'})
         self.dut.build_install_dpdk(self.dut.target)
 
     def set_port_queue(self, intf):
@@ -431,7 +432,7 @@ class TestAfXdp(TestCase):
 
     def tear_down_all(self):
         self.dut.kill_all()
-
         self.dut.send_expect(
             "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AF_XDP=y$/CONFIG_RTE_LIBRTE_PMD_AF_XDP=n/' config/common_base", "# ")
+        self.dut.set_build_options({'RTE_LIBRTE_PMD_AF_XDP': 'n'})
         self.dut.build_install_dpdk(self.dut.target)
-- 
2.17.1

[dts] [dts 3/5] tests/TestSuite_nic_single_core_perf:use API to set dpdk config when use meson

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_nic_single_core_perf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py
index 3460252..9bc421b 100644
--- a/tests/TestSuite_nic_single_core_perf.py
+++ b/tests/TestSuite_nic_single_core_perf.py
@@ -61,10 +61,12 @@ class TestNicSingleCorePerf(TestCase):
         if self.nic in ["fortville_25g", "fortville_spirit"]:
             self.dut.send_expect(
                 "sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/' ./config/common_base", "#", 20)
+            self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'y'})
             self.dut.build_install_dpdk(self.target)
         elif self.nic in ["columbiaville_100g", "columbiaville_25g"]:
             self.dut.send_expect(
                 "sed -i -e 's/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=y/' ./config/common_base", "#", 20)
+            self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'y'})
             self.dut.build_install_dpdk(self.target)
 
         # Based on h/w type, choose how many ports to use
@@ -394,9 +396,11 @@ class TestNicSingleCorePerf(TestCase):
         if self.nic in ["fortville_25g", "fortville_spirit"]:
             self.dut.send_expect(
                 "sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/' ./config/common_base", "#", 20)
+            self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'n'})
             self.dut.build_install_dpdk(self.target)
         elif self.nic in ["columbiaville_100g", "columbiaville_25g"]:
             self.dut.send_expect(
                 "sed -i -e 's/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=y/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n/' ./config/common_base", "#", 20)
+            self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'})
             self.dut.build_install_dpdk(self.target)
         self.dut.kill_all()
-- 
2.17.1

[dts] [dts 4/5] tests/TestSuite_vmdq_dcb:use API to set dpdk config when use meson

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_vmdq_dcb.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/TestSuite_vmdq_dcb.py b/tests/TestSuite_vmdq_dcb.py
index d202441..5f0da0f 100644
--- a/tests/TestSuite_vmdq_dcb.py
+++ b/tests/TestSuite_vmdq_dcb.py
@@ -93,15 +93,10 @@ class TestVmdqDcb(TestCase):
         """
         Rebuild dpdk
         """
-        out = self.dut.send_expect("grep 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM' ./config/common_base", "#", 20)
-        vm_num = re.findall(r'\d+', out)[-1]
-        if str(nb_queue_per_vm) == vm_num:
-            return
-        else:
-            self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=%s/CONFIG_RTE_LIBRTE_I40E_"
-                             "QUEUE_NUM_PER_VM=%s/' ./config/common_base" % (vm_num, nb_queue_per_vm), "#", 20)
-            self.dut.set_build_options({'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM': nb_queue_per_vm})
-            self.dut.build_install_dpdk(self.target)
+        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=.*$/CONFIG_RTE_LIBRTE_I40E_"
+                             "QUEUE_NUM_PER_VM=%s/' ./config/common_base" % nb_queue_per_vm, "#", 20)
+        self.dut.set_build_options({'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM': nb_queue_per_vm})
+        self.dut.build_install_dpdk(self.target)
 
     def start_application(self, npools, ntcs):
         """
-- 
2.17.1

[dts] [dts 5/5] tests/TestSuite_vmdq:use API to set dpdk config when use meson

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_vmdq.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py
index 8e721e5..c80de64 100644
--- a/tests/TestSuite_vmdq.py
+++ b/tests/TestSuite_vmdq.py
@@ -28,6 +28,7 @@ class TestVmdq(TestCase):
         self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
 
         self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=256/CONFIG_RTE_MAX_QUEUES_PER_PORT=1024/' ./config/common_base", "# ", 5)
+        self.dut.set_build_options({'RTE_MAX_QUEUES_PER_PORT': 1024})
         self.dut.build_install_dpdk(self.target)
         # Update the max queue per port for Fortville.
         self.dut.send_expect("sed -i 's/define MAX_QUEUES 128/define MAX_QUEUES 1024/' ./examples/vmdq/main.c", "#", 5)
@@ -133,7 +134,8 @@ class TestVmdq(TestCase):
 
     def get_vmdq_stats(self):
         vmdq_session = self.dut.new_session()
-        vmdq_session.send_expect("kill -s SIGHUP  `pgrep -fl vmdq_app | awk '{print $1}'`", "#", 20)
+        app_name = self.dut.apps_name['vmdq_dcb'].split('/')[-1]
+        vmdq_session.send_expect("kill -s SIGHUP  `pgrep -fl %s | awk '{print $1}'`" % app_name, "#", 20)
         out = self.dut.get_session_output()
         self.logger.info(out)
         vmdq_session.close()
@@ -242,4 +244,5 @@ class TestVmdq(TestCase):
         self.dut.send_expect(
             "sed -i 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=1024/CONFIG_RTE_MAX_QUEUES_PER_PORT=256/' ./config/common_base",
             "# ", 5)
+        self.dut.set_build_options({'RTE_MAX_QUEUES_PER_PORT': 256})
         self.dut.build_install_dpdk(self.target)
-- 
2.17.1

Re: [dts] [PATCH V1 0/5] use API to set dpdk config when use meson

[Tu, Lijuan]

> Subject: [dts] [PATCH V1 0/5] use API to set dpdk config when use meson
> 
> use API to set dpdk config when use meson
> 
> lingwei (5):
>   tests/l3fwd_base:use API to set dpdk config when use meson
>   tests/TestSuite_af_xdp_2:use API to set dpdk config when use meson
>   tests/TestSuite_nic_single_core_perf:use API to set dpdk config when
>     use meson
>   tests/TestSuite_vmdq_dcb:use API to set dpdk config when use meson
>   tests/TestSuite_vmdq:use API to set dpdk config when use meson

Applied