Re: [dts] [PATCH V2 0/5] support columbiaville_25gx2 nic

Re: [dts] [PATCH V2 0/5] support columbiaville_25gx2 nic

[Ling, WeiX]

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

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

Regards,
Ling Wei

> -----Original Message-----
> From: lingwei <weix.ling@intel.com>
> Sent: Wednesday, November 25, 2020 10:29 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V2 0/5] support columbiaville_25gx2 nic
> 

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

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

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

Re: [dts] [PATCH V2 0/5] support columbiaville_25gx2 nic

[Zhao, HaiyangX]

Acked-by: Haiyang Zhao <haiyangx.zhao@intel.com>

Best Regards,
Zhao Haiyang

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Ling, WeiX
> Sent: Wednesday, November 25, 2020 14:37
> To: Ling, WeiX <weix.ling@intel.com>; dts@dpdk.org
> Subject: Re: [dts] [PATCH V2 0/5] support columbiaville_25gx2 nic
> 
> Tested-by: Ling, Wei <weix.ling@intel.com>
> 
> Regards,
> Ling Wei
> 
> > -----Original Message-----
> > From: lingwei <weix.ling@intel.com>
> > Sent: Wednesday, November 25, 2020 10:29 PM
> > To: dts@dpdk.org
> > Cc: Ling, WeiX <weix.ling@intel.com>
> > Subject: [dts][PATCH V2 0/5] support columbiaville_25gx2 nic
> >

[dts] [PATCH V2 0/5] support columbiaville_25gx2 nic

[lingwei]

support columbiaville_25gx2 nic

lingwei (5):
  conf/vf_l3fwd.cfg:support columbiaville_25gx2 nic
  tests/vf_l3fwd_kernelpf:support columbiaville_25gx2 nic
  tests/nic_single_core_perf:support columbiaville_25gx2 nic
  tests/vf_single_core_perf:support columbiaville_25gx2 nic
  tests/l3fwd_base:support columbiaville_25gx2 nic and set-ice-16bytes
    when build dpdk

 conf/vf_l3fwd.cfg                       |  2 +-
 tests/TestSuite_nic_single_core_perf.py |  8 ++++----
 tests/TestSuite_vf_l3fwd_kernelpf.py    |  3 ++-
 tests/TestSuite_vf_single_core_perf.py  |  2 +-
 tests/l3fwd_base.py                     | 24 +++++++++---------------
 5 files changed, 17 insertions(+), 22 deletions(-)

-- 
2.17.1

[dts] [PATCH V2 1/5] conf/vf_l3fwd.cfg:support columbiaville_25gx2 nic

[lingwei]

support columbiaville_25gx2 nic

Signed-off-by: lingwei <weix.ling@intel.com>
---
 conf/vf_l3fwd.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/vf_l3fwd.cfg b/conf/vf_l3fwd.cfg
index e14da64f..7c6ab803 100644
--- a/conf/vf_l3fwd.cfg
+++ b/conf/vf_l3fwd.cfg
@@ -1,2 +1,2 @@
 [suite]
-perf_params = {"frame_size": [64, 128, 256, 512, 1024, 1518], "queue_number": {"fortville_spirit" : 2, "fortville25g" : 2, "fortville_eagle" : 1, "niantic" : 1}}
+perf_params = {"frame_size": [64, 128, 256, 512, 1024, 1518], "queue_number": {"fortville_spirit" : 2, "fortville_25g" : 2, "fortville_eagle" : 1, "niantic" : 1, "columbiaville_25gx2" : 2, "columbiaville_25g" : 4, "columbiaville_100g" : 4}}
-- 
2.17.1

[dts] [PATCH V2 2/5] tests/vf_l3fwd_kernelpf:support columbiaville_25gx2 nic

[lingwei]

support columbiaville_25gx2 nic

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

diff --git a/tests/TestSuite_vf_l3fwd_kernelpf.py b/tests/TestSuite_vf_l3fwd_kernelpf.py
index 054d5621..b2ae7ec0 100644
--- a/tests/TestSuite_vf_l3fwd_kernelpf.py
+++ b/tests/TestSuite_vf_l3fwd_kernelpf.py
@@ -50,7 +50,8 @@ class TestVfL3fwdKernelPf(TestCase, L3fwdBase):
             "fortville_25g",
             "fortville_eagle",
             "columbiaville_100g",
-            "columbiaville_25g"], "NIC Unsupported: " + str(self.nic))
+            "columbiaville_25g",
+            "columbiaville_25gx2"], "NIC Unsupported: " + str(self.nic))
         self.dut_ports = self.dut.get_ports(self.nic)
         valports = [
             _ for _ in self.dut_ports if self.tester.get_local_port(_) != -1]
-- 
2.17.1

[dts] [PATCH V2 3/5] tests/nic_single_core_perf:support columbiaville_25gx2 nic

[lingwei]

support columbiaville_25gx2 nic

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

diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py
index eb42fb30..8266506b 100644
--- a/tests/TestSuite_nic_single_core_perf.py
+++ b/tests/TestSuite_nic_single_core_perf.py
@@ -53,7 +53,7 @@ class TestNicSingleCorePerf(TestCase):
         PMD prerequisites.
         """
         self.verify(self.nic in ['niantic', 'fortville_25g', 'fortville_spirit', 'ConnectX5_MT4121',
-                                 'ConnectX4_LX_MT4117', 'columbiaville_100g', 'columbiaville_25g'],
+                                 'ConnectX4_LX_MT4117', 'columbiaville_100g', 'columbiaville_25g', 'columbiaville_25gx2'],
                                  "Not required NIC ")
         self.headers_size = HEADER_SIZE['eth'] + HEADER_SIZE['ip']
 
@@ -62,7 +62,7 @@ class TestNicSingleCorePerf(TestCase):
             # Update DPDK config file and rebuild to get best perf on fortville
             if self.nic in ["fortville_25g", "fortville_spirit"]:
                 self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': self.rx_desc})
-            elif self.nic in ["columbiaville_100g", "columbiaville_25g"]:
+            elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
                 self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': self.rx_desc})
             self.dut.build_install_dpdk(self.target)
 
@@ -240,7 +240,7 @@ class TestNicSingleCorePerf(TestCase):
             if self.nic in ["fortville_25g", "fortville_spirit"] or thread_num == 2:
                 param += " --rxq=2 --txq=2"
             # columbiaville use one queue per port for best performance.
-            elif self.nic in ["columbiaville_100g", "columbiaville_25g"]:
+            elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
                 param += " --rxq=1 --txq=1"
                 # workaround for that testpmd can't forward packets in io forward mode
                 param += " --port-topology=loop"
@@ -396,7 +396,7 @@ class TestNicSingleCorePerf(TestCase):
             self.rx_desc = 'n'
             if self.nic in ["fortville_25g", "fortville_spirit"]:
                 self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': self.rx_desc})
-            elif self.nic in ["columbiaville_100g", "columbiaville_25g"]:
+            elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
                 self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': self.rx_desc})
             self.dut.build_install_dpdk(self.target)
         self.dut.kill_all()
-- 
2.17.1

[dts] [PATCH V2 4/5] tests/vf_single_core_perf:support columbiaville_25gx2 nic

[lingwei]

support columbiaville_25gx2 nic

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

diff --git a/tests/TestSuite_vf_single_core_perf.py b/tests/TestSuite_vf_single_core_perf.py
index 47550bf8..05974eac 100644
--- a/tests/TestSuite_vf_single_core_perf.py
+++ b/tests/TestSuite_vf_single_core_perf.py
@@ -249,7 +249,7 @@ class TestVfSingleCorePerf(TestCase):
             if self.nic in ["fortville_25g", "fortville_spirit"] or thread_num == 2:
                 param += " --rxq=2 --txq=2"
             # columbiaville use one queue per port for best performance.
-            elif self.nic in ["columbiaville_100g", "columbiaville_25g"]:
+            elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
                 param += " --rxq=1 --txq=1"
                 # workaround for that testpmd can't forward packets in io forward mode
                 param += " --port-topology=loop"
-- 
2.17.1

[dts] [PATCH V2 5/5] tests/l3fwd_base:support columbiaville_25gx2 nic and set-ice-16bytes when build dpdk

[lingwei]

support columbiaville_25gx2 nic and set-ice-16bytes when build dpdk

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

diff --git a/tests/l3fwd_base.py b/tests/l3fwd_base.py
index 94b68347..235ee278 100644
--- a/tests/l3fwd_base.py
+++ b/tests/l3fwd_base.py
@@ -543,30 +543,24 @@ class L3fwdBase(object):
         # Update config file and rebuild to get best perf on FVL
         if self.__mode is SUITE_TYPE.PF:
             if self.nic in ["fortville_spirit", "fortville_eagle", "fortville_25g"]:
-                self.d_con(
-                    ("sed -i -e 's/"
-                     "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)
+            elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
+                self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'y'})
+            self.dut.build_install_dpdk(self.target)
 
     def __restore_compilation(self):
         if self.__mode is SUITE_TYPE.PF:
             if self.nic in ["fortville_spirit", "fortville_eagle", "fortville_25g"]:
-                self.d_con(
-                    ("sed -i -e 's/"
-                     "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)
+                self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'})
+            elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
+                self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'})
+            self.dut.build_install_dpdk(self.target)
 
     def __preset_compilation(self):
         # Update config file and rebuild to get best perf on FVL
         self.__preset_dpdk_compilation()
         # init l3fwd binary file
-        if self.nic not in ["columbiaville_100g", "columbiaville_25g"]:
+        if self.nic not in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
             self.logger.info(
                 "Configure RX/TX descriptor to 2048, re-build ./examples/l3fwd")
             self.d_con((
@@ -677,7 +671,7 @@ class L3fwdBase(object):
                 'whitelist': self.__l3fwd_white_list if self.__l3fwd_white_list else '',
                 'port_mask': utils.create_mask(self.__valports),
                 'config': config, })
-        if self.nic in ["niantic", "columbiaville_100g", "columbiaville_25g"]:
+        if self.nic in ["niantic", "columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]:
             command_line += " --parse-ptype"
         if frame_size > 1518:
             command_line += " --enable-jumbo --max-pkt-len %d" % frame_size
-- 
2.17.1

Re: [dts] [PATCH V2 0/5] support columbiaville_25gx2 nic

[Tu, Lijuan]

> support columbiaville_25gx2 nic
> 
> lingwei (5):
>   conf/vf_l3fwd.cfg:support columbiaville_25gx2 nic
>   tests/vf_l3fwd_kernelpf:support columbiaville_25gx2 nic
>   tests/nic_single_core_perf:support columbiaville_25gx2 nic
>   tests/vf_single_core_perf:support columbiaville_25gx2 nic
>   tests/l3fwd_base:support columbiaville_25gx2 nic and set-ice-16bytes
>     when build dpdk

Applied