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

[Xiao Qimai]

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

diff --git a/tests/TestSuite_pvp_multi_paths_performance.py b/tests/TestSuite_pvp_multi_paths_performance.py
index df24e77..a884e1f 100644
--- a/tests/TestSuite_pvp_multi_paths_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_performance.py
@@ -56,8 +56,6 @@ class TestPVPMultiPathPerformance(TestCase):
             self.core_config, socket=self.ports_socket)
         self.core_list_user = self.core_list[0:2]
         self.core_list_host = self.core_list[2:4]
-        self.core_mask_user = utils.create_mask(self.core_list_user)
-        self.core_mask_host = utils.create_mask(self.core_list_host)
 
         self.out_path = '/tmp'
         out = self.tester.send_expect('ls -d %s' % self.out_path, '# ')
@@ -115,6 +113,11 @@ class TestPVPMultiPathPerformance(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 start_vhost_testpmd(self):
         """
         start testpmd on vhost
@@ -123,10 +126,11 @@ class TestPVPMultiPathPerformance(TestCase):
         self.dut.send_expect("rm -rf ./vhost-net*", "#")
         self.dut.send_expect("killall -s INT testpmd", "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
-        eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, prefix='vhost',
+        eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost',
                                                    ports=[self.dut.ports_info[self.dut_ports[0]]['pci']],
                                                    vdevs=['net_vhost0,iface=vhost-net,queues=1,client=0'])
-        eal_param += " --single-file-segments"
+        if self.check_2M_env:
+            eal_param += " --single-file-segments"
         command_line_client = "./%s/app/testpmd " % self.target + eal_param + " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
         self.vhost.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost.send_expect("set fwd mac", "testpmd> ", 120)
@@ -136,11 +140,12 @@ class TestPVPMultiPathPerformance(TestCase):
         """
         start testpmd on virtio
         """
-        eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, prefix='virtio',
+        eal_param = self.dut.create_eal_parameters(cores=self.core_list_user, prefix='virtio',
                                                    no_pci=True,
                                                    vdevs=['net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,%s' %
                                                           args["version"]])
-        eal_param += " --single-file-segments"
+        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=1 --txd=1024 --rxd=1024" % \
                             args["path"]
         self.vhost_user = self.dut.new_session(suite="user")
-- 
1.8.3.1