[dts] [PATCH V1 11/11]tests/TestSuite_pvp_virtio_user_multi_queues: optimize testpmd eal parameters

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao at intel.com>
---
 tests/TestSuite_pvp_virtio_user_multi_queues.py | 32 +++++++++++++------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/tests/TestSuite_pvp_virtio_user_multi_queues.py b/tests/TestSuite_pvp_virtio_user_multi_queues.py
index ff8a0c4..790ee81 100644
--- a/tests/TestSuite_pvp_virtio_user_multi_queues.py
+++ b/tests/TestSuite_pvp_virtio_user_multi_queues.py
@@ -69,8 +69,6 @@ class TestPVPVirtioMultiQueues(TestCase):
             self.core_config, socket=self.ports_socket)
         self.core_list_user = self.core_list[0:3]
         self.core_list_host = self.core_list[3:6]
-        self.core_mask_user = utils.create_mask(self.core_list_user)
-        self.core_mask_host = utils.create_mask(self.core_list_host)
         self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
 
         self.logger.info("you can config packet_size in file %s.cfg," % self.suite_name + \
@@ -99,16 +97,20 @@ class TestPVPVirtioMultiQueues(TestCase):
         self.vhost_user = self.dut.new_session(suite="vhost-user")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
 
+    @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 start_vhost_testpmd(self):
         """
         start testpmd on vhost
         """
-        command_line_client = self.dut.target + "/app/testpmd -n %d -c %s --socket-mem 1024,1024" + \
-                              " --legacy-mem --file-prefix=vhost --vdev " + \
-                              "'net_vhost0,iface=vhost-net,queues=2,client=0' -- -i --nb-cores=2 " + \
-                              "--rxq=2 --txq=2 --rss-ip"
-        command_line_client = command_line_client % (
-            self.dut.get_memory_channels(), self.core_mask_host)
+        eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_host, prefix='vhost',
+                                                   vdevs=['net_vhost0,iface=vhost-net,queues=2,client=0'])
+        if self.check_2M_env:
+            eal_param += " --single-file-segments"
+        command_line_client = "./%s/app/testpmd " % self.target + eal_param + ' -- -i --nb-cores=2 --rxq=2 --txq=2 --rss-ip'
         self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
@@ -117,13 +119,13 @@ class TestPVPVirtioMultiQueues(TestCase):
         """
         start testpmd on virtio
         """
-        command_line_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
-                            " --socket-mem 1024,1024 --legacy-mem --no-pci --file-prefix=virtio " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,queues=2,%s " + \
-                            "-- -i %s --rss-ip --nb-cores=2 --rxq=2 --txq=2"
-        command_line_user = command_line_user % (
-            self.dut.get_memory_channels(), self.core_mask_user,
-            args["version"], args["path"])
+        eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_user, prefix='virtio',
+                                                   no_pci=True, vdevs=[
+                'net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,queues=2,%s' % args["version"]])
+        if self.check_2M_env:
+            eal_param += " --single-file-segments"
+        command_line_user = "./%s/app/testpmd " % self.target + eal_param + " -- -i %s --rss-ip --nb-cores=2 --rxq=2 --txq=2" % \
+                            args["path"]
         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", "testpmd> ", 120)
-- 
1.8.3.1