From patchwork Thu Jul 29 17:24:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lingli Chen X-Patchwork-Id: 96388 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DB8DCA0C40; Thu, 29 Jul 2021 11:23:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23C8B41124; Thu, 29 Jul 2021 11:23:12 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 9821E410F3 for ; Thu, 29 Jul 2021 11:23:09 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="234731937" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="234731937" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2021 02:23:05 -0700 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="456788394" Received: from unknown (HELO localhost.localdomain) ([10.240.183.77]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2021 02:23:04 -0700 From: Lingli Chen To: dts@dpdk.org Cc: Lingli Chen Date: Thu, 29 Jul 2021 17:24:04 +0000 Message-Id: <20210729172404.90883-11-linglix.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729172404.90883-1-linglix.chen@intel.com> References: <20210729172404.90883-1-linglix.chen@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V1 10/10] tests/vm2vm_virtio_net_perf: Modify get_cbdma_ports_info 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" 1.Modify get_cbdma_ports_info. 2.fix script issues. Signed-off-by: Lingli Chen --- tests/TestSuite_vm2vm_virtio_net_perf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_net_perf.py b/tests/TestSuite_vm2vm_virtio_net_perf.py index 0ec542af..43e90b81 100644 --- a/tests/TestSuite_vm2vm_virtio_net_perf.py +++ b/tests/TestSuite_vm2vm_virtio_net_perf.py @@ -93,7 +93,7 @@ class TestVM2VMVirtioNetPerf(TestCase): out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30) device_info = out.split('\n') for device in device_info: - pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device) + pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device) if pci_info is not None: dev_info = pci_info.group(1) # the numa id of ioat dev, only add the device which on same socket with nic dev @@ -112,11 +112,11 @@ class TestVM2VMVirtioNetPerf(TestCase): dmas_info = '' for dmas in used_cbdma[0:int(cbdma_num/2)]: number = used_cbdma[0:int(cbdma_num/2)].index(dmas) - dmas = 'txq{}@{},'.format(number, dmas.replace('0000:', '')) + dmas = 'txq{}@{},'.format(number, dmas) dmas_info += dmas for dmas in used_cbdma[int(cbdma_num/2):]: number = used_cbdma[int(cbdma_num/2):].index(dmas) - dmas = 'txq{}@{},'.format(number, dmas.replace('0000:', '')) + dmas = 'txq{}@{},'.format(number, dmas) dmas_info += dmas self.dmas_info = dmas_info[:-1] self.device_str = ' '.join(used_cbdma) @@ -491,7 +491,7 @@ class TestVM2VMVirtioNetPerf(TestCase): self.vm_args = "disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on" self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2, server_mode=False, opt_queue=None, combined=False, rxq_txq=None) - self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo') + self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso') def test_vm2vm_packed_ring_iperf_with_ufo(self): """