From patchwork Thu Oct 29 05:52:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yingya Han X-Patchwork-Id: 82698 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 037CEA04B5; Thu, 29 Oct 2020 06:56:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED4417CC8; Thu, 29 Oct 2020 06:56:38 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 442E072E6 for ; Thu, 29 Oct 2020 06:56:36 +0100 (CET) IronPort-SDR: IvC9VTyss6OtXEjJHlATBSkBnzPkyaI4u1F74xzCNtPQi9rKMU67vacKpXI1kTsZDKDL7iVk4g FQlawRNxjTug== X-IronPort-AV: E=McAfee;i="6000,8403,9788"; a="253083972" X-IronPort-AV: E=Sophos;i="5.77,429,1596524400"; d="scan'208";a="253083972" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2020 22:56:35 -0700 IronPort-SDR: GLtXFDKeHVPddGx8vcGWwmcO8oWn7w/4M4o+OMQ3gKQlBWPf1dpNnby0ZJllu5JY24RO02rRX1 gFPrinWMM72g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,429,1596524400"; d="scan'208";a="526610366" Received: from dpdk-lijuan-purley2.sh.intel.com ([10.67.119.168]) by fmsmga005.fm.intel.com with ESMTP; 28 Oct 2020 22:56:34 -0700 From: hanyingya To: dts@dpdk.org Cc: hanyingya Date: Thu, 29 Oct 2020 13:52:41 +0800 Message-Id: <20201029055241.44633-1-yingyax.han@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1]tests/nic_single_core:rework 16byte configuration 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" rework 16byte configuration to adapt to the new version of DPDK. Signed-off-by: hanyingya --- conf/nic_single_core_perf.cfg | 1 + tests/TestSuite_nic_single_core_perf.py | 32 ++++++++++--------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/conf/nic_single_core_perf.cfg b/conf/nic_single_core_perf.cfg index e7bf3b28..4d3279ba 100644 --- a/conf/nic_single_core_perf.cfg +++ b/conf/nic_single_core_perf.cfg @@ -32,6 +32,7 @@ update_expected = True test_parameters = {'1C/1T': {64: [512, 2048]}, '1C/2T': {64: [512, 2048]}} +rx_desc_16byte = 'y' test_duration = 60 accepted_tolerance = 1 expected_throughput = { diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py index e93ee46e..eb42fb30 100644 --- a/tests/TestSuite_nic_single_core_perf.py +++ b/tests/TestSuite_nic_single_core_perf.py @@ -57,16 +57,13 @@ class TestNicSingleCorePerf(TestCase): "Not required NIC ") self.headers_size = HEADER_SIZE['eth'] + HEADER_SIZE['ip'] - # Update DPDK config file and rebuild to get best perf on fortville - if self.nic in ["fortville_25g", "fortville_spirit"]: - self.dut.send_expect( - "sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/' ./config/common_base", "#", 20) - self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'y'}) - self.dut.build_install_dpdk(self.target) - elif self.nic in ["columbiaville_100g", "columbiaville_25g"]: - self.dut.send_expect( - "sed -i -e 's/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=y/' ./config/common_base", "#", 20) - self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'y'}) + self.rx_desc = self.get_suite_cfg()['rx_desc_16byte'] + if 'y' == self.rx_desc: + # Update DPDK config file and rebuild to get best perf on fortville + if self.nic in ["fortville_25g", "fortville_spirit"]: + self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': self.rx_desc}) + elif self.nic in ["columbiaville_100g", "columbiaville_25g"]: + self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': self.rx_desc}) self.dut.build_install_dpdk(self.target) # Based on h/w type, choose how many ports to use @@ -395,14 +392,11 @@ class TestNicSingleCorePerf(TestCase): Run after each test suite. """ # resume setting - if self.nic in ["fortville_25g", "fortville_spirit"]: - self.dut.send_expect( - "sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/' ./config/common_base", "#", 20) - self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'n'}) - self.dut.build_install_dpdk(self.target) - elif self.nic in ["columbiaville_100g", "columbiaville_25g"]: - self.dut.send_expect( - "sed -i -e 's/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=y/CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n/' ./config/common_base", "#", 20) - self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'}) + if 'y' == self.rx_desc: + self.rx_desc = 'n' + if self.nic in ["fortville_25g", "fortville_spirit"]: + self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': self.rx_desc}) + elif self.nic in ["columbiaville_100g", "columbiaville_25g"]: + self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': self.rx_desc}) self.dut.build_install_dpdk(self.target) self.dut.kill_all()