From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1202FA0553; Mon, 17 Feb 2020 13:11:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0AC8B1DAA0; Mon, 17 Feb 2020 13:11:07 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id DA7471BF9C for ; Mon, 17 Feb 2020 13:11:04 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 04:11:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,452,1574150400"; d="scan'208";a="348488073" Received: from unknown (HELO dpdk-xiaoqimai-dut.sh.intel.com) ([10.240.179.33]) by fmsmga001.fm.intel.com with ESMTP; 17 Feb 2020 04:11:03 -0800 From: Xiao Qimai To: dts@dpdk.org Cc: Xiao Qimai Date: Mon, 17 Feb 2020 20:05:46 +0800 Message-Id: <1581941147-230859-10-git-send-email-qimaix.xiao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1581941147-230859-1-git-send-email-qimaix.xiao@intel.com> References: <1581941147-230859-1-git-send-email-qimaix.xiao@intel.com> Subject: [dts] [PATCH V1 10/11]tests/TestSuite_pvp_vhost_user_built_in_net_driver: optimize testpmd eal parameters X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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" Signed-off-by: Xiao Qimai --- ...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