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 AF8C0A00C3; Fri, 15 May 2020 10:28:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 81F641DA79; Fri, 15 May 2020 10:28:38 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 2A2EE1DA64 for ; Fri, 15 May 2020 10:28:35 +0200 (CEST) IronPort-SDR: F14bRszlzdJe/Fl23Cz4XN/4Lo61Q60OEH3z1r1cctp6xunvzQRn3eTmcxGNPPJdKoyW86mFVq C65myL9me23Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2020 01:28:35 -0700 IronPort-SDR: qRuhpXTaWiiltlQwg3FrELnZdCpWrmAnrcs5nnCoR4j3MNqTJEW0UZ7ia1zkkW6CZSkmRSMCGa mXM78HNv/pfA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,394,1583222400"; d="scan'208";a="281148233" Received: from unknown (HELO xqm-virtio_tester.sh.intel.com) ([10.240.183.52]) by orsmga002.jf.intel.com with ESMTP; 15 May 2020 01:28:33 -0700 From: Xiao Qimai To: dts@dpdk.org Cc: Xiao Qimai Date: Fri, 15 May 2020 16:21:38 +0800 Message-Id: <1589530898-229383-1-git-send-email-qimaix.xiao@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V2]unit_tests_pmd_perf: update script according to dpdk update 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" *. CONFIG_RTE_IXGBE_INC_VECTOR has been deleted in dpdk Signed-off-by: Xiao Qimai --- tests/TestSuite_unit_tests_pmd_perf.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/tests/TestSuite_unit_tests_pmd_perf.py b/tests/TestSuite_unit_tests_pmd_perf.py index a01cf4e..f8b36d1 100644 --- a/tests/TestSuite_unit_tests_pmd_perf.py +++ b/tests/TestSuite_unit_tests_pmd_perf.py @@ -35,7 +35,6 @@ DPDK Test suite. This TestSuite runs the unit tests included in DPDK for pmd performance. """ -import utils import re from test_case import TestCase @@ -61,23 +60,11 @@ class TestUnitTestsPmdPerf(TestCase): """ self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing") - [self.arch, machine, _, toolchain] = self.target.split('-') + self.arch = self.target.split('-')[0] self.verify(self.arch in ["x86_64", "arm64"], "pmd perf request running in x86_64 or arm64") self.burst_ctlmodes = ['poll_before_xmit', 'poll_after_xmit'] self.rxtx_modes = ['vector', 'scalar', 'full', 'hybrid'] self.anchors = ['rxtx', 'rxonly', 'txonly'] - - # for better scalar performance data, need disable CONFIG_RTE_IXGBE_INC_VECTOR - [arch, machine, _, toolchain] = self.target.split('-') - self.dut.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=y/CONFIG_RTE_IXGBE_INC_VECTOR=n/' config/common_base", "# ", 30) - self.dut.build_install_dpdk(self.target) - out = self.dut.build_dpdk_apps('./app/test/') - self.verify('make: Leaving directory' in out, "Compilation failed") - self.dut.send_expect("mv -f ./app/test/test ./app/test/test_scalar", "# ") - self.dut.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=n/CONFIG_RTE_IXGBE_INC_VECTOR=y/' config/common_base", "# ", 30) - self.dut.build_install_dpdk(self.target) - out = self.dut.build_dpdk_apps('./app/test/') - self.verify('make: Leaving directory' in out, "Compilation failed") socket_id = self.dut.ports_info[0]['port'].socket self.cores = self.dut.get_core_list(config='1S/4C/1T', socket=socket_id) @@ -93,7 +80,7 @@ class TestUnitTestsPmdPerf(TestCase): """ eal_params = self.dut.create_eal_parameters(cores=self.cores, ports=[0,1]) - self.dut.send_expect("./app/test/test %s" % (eal_params), "R.*T.*E.*>.*>", 60) + self.dut.send_expect("./%s/app/test %s" % (self.target, eal_params), "R.*T.*E.*>.*>", 60) for mode in self.burst_ctlmodes: self.dut.send_expect("set_rxtx_sc %s" % mode, "RTE>>", 10) out = self.dut.send_expect("pmd_perf_autotest", "RTE>>", 120) @@ -115,13 +102,8 @@ class TestUnitTestsPmdPerf(TestCase): self.result_table_create(self.table_header) eal_params = self.dut.create_eal_parameters(cores=self.cores, ports=[0,1]) print((self.table_header)) - + self.dut.send_expect("./%s/app/test %s" % (self.target, eal_params), "R.*T.*E.*>.*>", 60) for mode in self.rxtx_modes: - if mode is "scalar": - self.dut.send_expect("./app/test/test_scalar %s " % (eal_params), "R.*T.*E.*>.*>", 60) - else: - self.dut.send_expect("./app/test/test %s " % (eal_params), "R.*T.*E.*>.*>", 60) - table_row = [mode] self.dut.send_expect("set_rxtx_sc continuous", "RTE>>", 10) self.dut.send_expect("set_rxtx_mode %s" % mode, "RTE>>",10) @@ -133,10 +115,8 @@ class TestUnitTestsPmdPerf(TestCase): result = m.search(out) self.verify(result, "Failed to get result") table_row.append(result.group(1)) - - self.dut.send_expect("quit", "# ") self.result_table_add(table_row) - + self.dut.send_expect("quit", "# ") self.result_table_print() def tear_down(self): -- 1.8.3.1