From patchwork Fri Nov 5 07:58:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 103849 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 78681A0C60; Fri, 5 Nov 2021 09:05:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70D2140E5A; Fri, 5 Nov 2021 09:05:37 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id EB3C140151 for ; Fri, 5 Nov 2021 09:05:35 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10158"; a="318064049" X-IronPort-AV: E=Sophos;i="5.87,210,1631602800"; d="scan'208";a="318064049" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2021 01:05:31 -0700 X-IronPort-AV: E=Sophos;i="5.87,210,1631602800"; d="scan'208";a="501858346" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2021 01:05:30 -0700 From: Wei Ling To: dts@dpdk.org Cc: Wei Ling Date: Fri, 5 Nov 2021 15:58:23 +0800 Message-Id: <20211105075823.535946-1-weix.ling@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dts] [PATCH V1 1/2] tests/cbdma: modify testsuite sync with dpdk change 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.According to the dpdk-21.11-rc1 'd047310407a3511b1e2910c7ddf59d5049b202f6' change from example/ioat to /example/dma, dts need to change sync with dpdk. 2.The print info format have been changed, so need to modify check point. 3.Improve checkpoints according to test plan. Signed-off-by: Wei Ling --- tests/TestSuite_cbdma.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_cbdma.py b/tests/TestSuite_cbdma.py index dd1e4e44..3a70f176 100644 --- a/tests/TestSuite_cbdma.py +++ b/tests/TestSuite_cbdma.py @@ -60,8 +60,8 @@ class TestCBDMA(TestCase): self.cbdma_proc = '--proc-type=primary' # default v_dev is None, case 1-6 use default None values, case7 use --vdev net_null_0 self.v_dev = '' - out = self.dut.build_dpdk_apps('./examples/ioat') - self.ioat_path = self.dut.apps_name['ioat'] + out = self.dut.build_dpdk_apps('./examples/dma') + self.ioat_path = self.dut.apps_name['dma'] self.verify('Error' not in out, 'compilation ioat error') def set_up(self): @@ -92,10 +92,8 @@ class TestCBDMA(TestCase): get all cbdma ports """ # check driver name in execution.cfg - self.verify(self.drivername == 'igb_uio', - "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg") str_info = 'Misc (rawdev) devices using kernel driver' - out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30) + out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30) device_info = out.split('\n') for device in device_info: pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device) @@ -220,9 +218,9 @@ class TestCBDMA(TestCase): out = self.send_session.get_session_before(timeout=2) index = out.rfind('Statistics for port 0') out = out[index:] - data_info = re.findall('successful_enqueues:\s*(\d*)', out) - self.verify(len(data_info) == self.cbdma_ioat_dev_num, 'There miss some queue, the run queue is ' - '%d, and expect queue num is %d' % (len(data_info), self.cbdma_ioat_dev_num)) + data_info = re.findall('Total completed ops:\s*(\d*)', out) + self.verify((len(data_info) - 1) == self.cbdma_ioat_dev_num, 'There miss some queue, the run queue is ' + '%d, and expect queue num is %d' % ((len(data_info) - 1), self.cbdma_ioat_dev_num)) for index in range(self.cbdma_ioat_dev_num): self.verify(data_info[index] != 0, 'the queue %d can not enqueues data' % index) @@ -254,7 +252,7 @@ class TestCBDMA(TestCase): dev_info = self.get_ports_info() eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=dev_info, prefix='cbdma') self.launch_ioatfwd_app(eal_params) - self.send_and_verify_throughput(check_channel=False) + self.send_and_verify_throughput(check_channel=True) self.result_table_print() def test_perf_cbdma_with_multi_thread(self): @@ -271,7 +269,7 @@ class TestCBDMA(TestCase): dev_info = self.get_ports_info() eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=dev_info, prefix='cbdma') self.launch_ioatfwd_app(eal_params) - self.send_and_verify_throughput(check_channel=False) + self.send_and_verify_throughput(check_channel=True) self.result_table_print() def test_perf_cbdma_with_multi_nic_ports(self): @@ -325,11 +323,11 @@ class TestCBDMA(TestCase): dev_info = self.get_ports_info() eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=dev_info, prefix='cbdma') self.launch_ioatfwd_app(eal_params) - self.send_and_verify_throughput(check_channel=False) + self.send_and_verify_throughput(check_channel=True) self.send_session.send_expect('^c', '# ') self.cbdma_updating_mac = 'disable' self.launch_ioatfwd_app(eal_params) - self.send_and_verify_throughput(check_channel=False) + self.send_and_verify_throughput(check_channel=True) self.result_table_print() def test_perf_cbdma_with_diff_copy_mode(self):