From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9B1E5A055D; Wed, 3 Mar 2021 09:56:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F4AC40683; Wed, 3 Mar 2021 09:56:34 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 4DF094067B for ; Wed, 3 Mar 2021 09:56:32 +0100 (CET) IronPort-SDR: z+whzlt6AVeeraVGXhVSHTWW6UII9KfriRK2CtVkkBKlhZ9mMVF7qGuunfslMqAMa00DcGBVs6 le+bTvIS2V3g== X-IronPort-AV: E=McAfee;i="6000,8403,9911"; a="187261294" X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="187261294" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 00:56:30 -0800 IronPort-SDR: rQBk5PpfFkZ5oBoTKKHBOX+3MfinOTuZkclbTIsRMmvJMq016wlB7XgeDu/edp5zinSgm4gf5D kpiqB793fPQg== X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208";a="407144628" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 00:56:29 -0800 From: Ling Wei To: dts@dpdk.org Cc: Ling Wei Date: Wed, 3 Mar 2021 16:55:41 +0800 Message-Id: <20210303085541.223382-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V3] tests/pvp_multi_paths_performance:modify dts code sync with testplan and optimize code X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Remove test case 9 vectorized=1 with testplan, default is vectorized=0 and use pmd.start_testpmd() to replace session.send_expect() to start testpmd. Signed-off-by: Ling Wei --- v1: Remove test case 9 vectorized=1 with testplan, default is vectorized=0. v2: Use pmd.start_testpmd() to replace session.send_expect() to start testpmd. v3: Use pmd.start_testpmd() to replace session.send_expect() to quit testpmd. .../TestSuite_pvp_multi_paths_performance.py | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/tests/TestSuite_pvp_multi_paths_performance.py b/tests/TestSuite_pvp_multi_paths_performance.py index e2fa5ec9..11db11ee 100644 --- a/tests/TestSuite_pvp_multi_paths_performance.py +++ b/tests/TestSuite_pvp_multi_paths_performance.py @@ -42,6 +42,7 @@ from packet import Packet from pktgen import PacketGeneratorHelper from settings import UPDATE_EXPECTED, load_global_setting from copy import deepcopy +from pmd_output import PmdOutput class TestPVPMultiPathPerformance(TestCase): @@ -67,8 +68,10 @@ class TestPVPMultiPathPerformance(TestCase): self.tester.send_expect('mkdir -p %s' % self.out_path, '# ') # create an instance to set stream field setting self.pktgen_helper = PacketGeneratorHelper() - self.vhost_user = self.dut.new_session(suite="user") - self.vhost = self.dut.new_session(suite="vhost") + self.vhost_user = self.dut.new_session(suite="vhost-user") + self.virtio_user0 = self.dut.new_session(suite="virtio-user0") + self.vhost_user_pmd = PmdOutput(self.dut, self.vhost_user) + self.virtio_user0_pmd = PmdOutput(self.dut, self.virtio_user0) self.save_result_flag = True self.json_obj = {} @@ -161,34 +164,27 @@ class TestPVPMultiPathPerformance(TestCase): self.dut.send_expect("rm -rf ./vhost-net*", "#") self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - 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']) - command_line_client = self.path + eal_param + \ - " -- -i --nb-cores=1 --txd=%d --rxd=%d" % (self.nb_desc, self.nb_desc) - self.vhost.send_expect(command_line_client, "testpmd> ", 120) - self.vhost.send_expect("set fwd mac", "testpmd> ", 120) - self.vhost.send_expect("start", "testpmd> ", 120) + vdevs = ['net_vhost0,iface=vhost-net,queues=1,client=0'] + ports = [self.dut.ports_info[self.dut_ports[0]]['pci']] + param = "--nb-cores=1 --txd=%d --rxd=%d" % (self.nb_desc, self.nb_desc) + self.vhost_user_pmd.start_testpmd(cores=self.core_list_host,param=param, vdevs=vdevs, ports=ports, prefix="vhost") + self.vhost_user_pmd.execute_cmd("set fwd mac") + self.vhost_user_pmd.execute_cmd("start") def start_virtio_testpmd(self, args): """ start testpmd on 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 = "" if self.check_2M_env: eal_param += " --single-file-segments" if 'virtio11_vectorized' in self.running_case: eal_param += " --force-max-simd-bitwidth=512" - command_line_user = self.path + eal_param + \ - " -- -i %s --rss-ip --nb-cores=1 --txd=%d --rxd=%d" % \ - (args["path"], self.nb_desc, self.nb_desc) - self.vhost_user = self.dut.new_session(suite="user") - self.vhost_user.send_expect(command_line_user, "testpmd> ", 120) - self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120) - self.vhost_user.send_expect("start", "testpmd> ", 120) + vdevs = ['net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,%s' % args["version"]] + param = "%s --rss-ip --nb-cores=1 --txd=%d --rxd=%d" % (args["path"], self.nb_desc, self.nb_desc) + self.virtio_user0_pmd.start_testpmd(cores=self.core_list_user, eal_param=eal_param, param=param, vdevs=vdevs, no_pci=True, prefix='virtio') + self.virtio_user0_pmd.execute_cmd("set fwd mac") + self.virtio_user0_pmd.execute_cmd("start") def handle_expected(self): """ @@ -289,15 +285,15 @@ class TestPVPMultiPathPerformance(TestCase): """ close all testpmd of vhost and virtio """ - self.vhost.send_expect("quit", "#", 60) - self.vhost_user.send_expect("quit", "#", 60) + self.vhost_user_pmd.execute_cmd("quit", "# ") + self.virtio_user0_pmd.execute_cmd("quit", "# ") def close_all_session(self): """ close all session of vhost an virtio """ self.dut.close_session(self.vhost_user) - self.dut.close_session(self.vhost) + self.dut.close_session(self.virtio_user0) def test_perf_pvp_virtio11_mergeable(self): """ @@ -356,7 +352,7 @@ class TestPVPMultiPathPerformance(TestCase): """ self.test_target = self.running_case self.expected_throughput = self.get_suite_cfg()['expected_throughput'][self.test_target] - virtio_pmd_arg = {"version": "in_order=1,packed_vq=1,mrg_rxbuf=0,vectorized=1", + virtio_pmd_arg = {"version": "in_order=1,packed_vq=1,mrg_rxbuf=0", "path": "--rx-offloads=0x10 --enable-hw-vlan-strip"} self.start_vhost_testpmd() self.start_virtio_testpmd(virtio_pmd_arg) -- 2.25.1