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 30283A0527; Wed, 25 Nov 2020 07:35:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 274F6C95C; Wed, 25 Nov 2020 07:35:04 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 29057C96E for ; Wed, 25 Nov 2020 07:35:02 +0100 (CET) IronPort-SDR: 0f5sR+MQnG5V31pJV19ZzMd1pXaJex3jCNIOah7N2oj+1mlquVNWB3KjM0r0dYtm6R5bzoaQvU gm0Sm0xPYwMg== X-IronPort-AV: E=McAfee;i="6000,8403,9815"; a="171296913" X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="171296913" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 22:35:01 -0800 IronPort-SDR: ukrXYhNQAPl+B5TQ7sH+vZScLDNaSsnKs6+rXkkP/a3UrnNfTrtEYkrwaPW6P/eYRsJVDuLnNY sfHyovXvavvQ== X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="312844631" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 22:35:00 -0800 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Wed, 25 Nov 2020 22:29:30 +0800 Message-Id: <20201125142930.77045-6-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125142930.77045-1-weix.ling@intel.com> References: <20201125142930.77045-1-weix.ling@intel.com> Subject: [dts] [PATCH V2 5/5] tests/l3fwd_base:support columbiaville_25gx2 nic and set-ice-16bytes when build dpdk 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" support columbiaville_25gx2 nic and set-ice-16bytes when build dpdk Signed-off-by: lingwei --- tests/l3fwd_base.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/l3fwd_base.py b/tests/l3fwd_base.py index 94b68347..235ee278 100644 --- a/tests/l3fwd_base.py +++ b/tests/l3fwd_base.py @@ -543,30 +543,24 @@ class L3fwdBase(object): # Update config file and rebuild to get best perf on FVL if self.__mode is SUITE_TYPE.PF: if self.nic in ["fortville_spirit", "fortville_eagle", "fortville_25g"]: - self.d_con( - ("sed -i -e 's/" - "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/" - "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/' " - "./config/common_base")) 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", "columbiaville_25gx2"]: + self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'y'}) + self.dut.build_install_dpdk(self.target) def __restore_compilation(self): if self.__mode is SUITE_TYPE.PF: if self.nic in ["fortville_spirit", "fortville_eagle", "fortville_25g"]: - self.d_con( - ("sed -i -e 's/" - "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/" - "CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/' " - "./config/common_base")) - self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'n'}) - self.dut.build_install_dpdk(self.target) + self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'}) + elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]: + self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'}) + self.dut.build_install_dpdk(self.target) def __preset_compilation(self): # Update config file and rebuild to get best perf on FVL self.__preset_dpdk_compilation() # init l3fwd binary file - if self.nic not in ["columbiaville_100g", "columbiaville_25g"]: + if self.nic not in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]: self.logger.info( "Configure RX/TX descriptor to 2048, re-build ./examples/l3fwd") self.d_con(( @@ -677,7 +671,7 @@ class L3fwdBase(object): 'whitelist': self.__l3fwd_white_list if self.__l3fwd_white_list else '', 'port_mask': utils.create_mask(self.__valports), 'config': config, }) - if self.nic in ["niantic", "columbiaville_100g", "columbiaville_25g"]: + if self.nic in ["niantic", "columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]: command_line += " --parse-ptype" if frame_size > 1518: command_line += " --enable-jumbo --max-pkt-len %d" % frame_size -- 2.17.1