test suite reviews and discussions
 help / color / mirror / Atom feed
From: Xiao Qimai <qimaix.xiao@intel.com>
To: dts@dpdk.org
Cc: Xiao Qimai <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V1 10/11]tests/TestSuite_pvp_vhost_user_built_in_net_driver: optimize testpmd eal parameters
Date: Mon, 17 Feb 2020 20:05:46 +0800	[thread overview]
Message-ID: <1581941147-230859-10-git-send-email-qimaix.xiao@intel.com> (raw)
In-Reply-To: <1581941147-230859-1-git-send-email-qimaix.xiao@intel.com>

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 ...TestSuite_pvp_vhost_user_built_in_net_driver.py | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
index 1c13665..9c642a3 100644
--- a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
+++ b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
@@ -61,8 +61,6 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
 
         self.core_list_virtio_user = self.core_list[0:2]
         self.core_list_vhost_user = self.core_list[2:4]
-        self.core_mask_virtio_user = utils.create_mask(self.core_list_virtio_user)
-        self.core_mask_vhost_user = utils.create_mask(self.core_list_vhost_user)
         self.mem_channels = self.dut.get_memory_channels()
         self.headers_size = HEADER_SIZE['eth'] + HEADER_SIZE['ip']
         self.prepare_vhost_switch()
@@ -163,18 +161,20 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
             results_row.append(throughput)
             self.result_table_add(results_row)
 
+    @property
+    def check_2M_env(self):
+        out = self.dut.send_expect("cat /proc/meminfo |grep Hugepagesize|awk '{print($2)}'", "# ")
+        return True if out == '2048' else False
+
     def launch_vhost_switch(self):
         """
         start vhost-switch on vhost
         """
         self.dut.send_expect("rm -rf ./vhost.out", "#")
-        command_line_client = "./examples/vhost/build/app/vhost-switch " + \
-                              "-c %s -n %d --socket-mem %s -- " + \
-                              "-p 0x1 --mergeable 0 --vm2vm 1 " + \
-                              "--builtin-net-driver  --socket-file ./vhost-net" + \
-                              "> ./vhost.out &"
-        command_line_client = command_line_client % (self.core_mask_vhost_user,
-                                                     self.mem_channels, self.mem_size)
+        eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_vhost_user, prefix='vhost')
+        if self.check_2M_env:
+            eal_param += " --single-file-segments"
+        command_line_client = "./examples/vhost/build/app/vhost-switch " + eal_param + ' -- -p 0x1 --mergeable 0 --vm2vm 1 --builtin-net-driver --socket-file ./vhost-net> ./vhost.out &'
         self.vhost_switch.send_expect(command_line_client, "# ", 120)
         time.sleep(15)
         try:
@@ -195,13 +195,12 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
         """
         start testpmd on virtio
         """
-        command_line_user = "./%s/app/testpmd -n %d -c %s " + \
-                            "--no-pci --socket-mem %s --file-prefix=virtio-user " + \
-                            "--vdev=net_virtio_user0,mac=%s,path=./vhost-net,queues=1 " + \
-                            "-- -i --rxq=1 --txq=1"
-        command_line_user = command_line_user % (self.target,
-                                                 self.mem_channels, self.core_mask_virtio_user,
-                                                 self.mem_size, self.virtio_mac)
+        eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_virtio_user, prefix='virtio',
+                                                   no_pci=True, vdevs=[
+                'net_virtio_user0,mac=%s,path=./vhost-net,queues=1' % self.virtio_mac])
+        if self.check_2M_env:
+            eal_param += " --single-file-segments"
+        command_line_user = "./%s/app/testpmd " % self.target + eal_param + " -- -i --rxq=1 --txq=1"
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.virtio_user.send_expect("start tx_first", "testpmd> ", 120)
-- 
1.8.3.1


  parent reply	other threads:[~2020-02-17 12:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-17 12:05 [dts] [PATCH V1 01/11]tests/TestSuite_dpdk_gro_lib: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 02/11]tests/TestSuite_dpdk_gso_lib: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 03/11]tests/TestSuite_loopback_multi_paths_port_restart: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 04/11]tests/TestSuite_loopback_multi_queues: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 05/11]tests/TestSuite_loopback_virtio_user_server_mode: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 06/11]tests/TestSuite_pvp_multi_paths_performance: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 07/11]tests/TestSuite_pvp_multi_paths_vhost_single_core_performance: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 08/11]tests/TestSuite_pvp_multi_paths_virtio_single_core_performance: " Xiao Qimai
2020-02-17 12:05 ` [dts] [PATCH V1 09/11]tests/TestSuite_pvp_share_lib: " Xiao Qimai
2020-02-17 12:05 ` Xiao Qimai [this message]
2020-02-17 12:05 ` [dts] [PATCH V1 11/11]tests/TestSuite_pvp_virtio_user_multi_queues: " Xiao Qimai
2020-02-18  5:12 ` [dts] [PATCH V1 01/11]tests/TestSuite_dpdk_gro_lib: " Tu, Lijuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1581941147-230859-10-git-send-email-qimaix.xiao@intel.com \
    --to=qimaix.xiao@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).