From patchwork Mon Sep 14 14:58:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 77577 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 0C45DA04C9; Mon, 14 Sep 2020 09:08:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 06EA4FFA; Mon, 14 Sep 2020 09:08:38 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id E0A03160 for ; Mon, 14 Sep 2020 09:08:36 +0200 (CEST) IronPort-SDR: 4lHfzJe5vTi6u0Uyw7aJ0OjcOkMPlIBdAb7uUbMfMTmWQe3BI06NaLjN2VvO3+9FVMt99rRWOu iiJ4AF9uvssA== X-IronPort-AV: E=McAfee;i="6000,8403,9743"; a="159071506" X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="159071506" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 00:08:35 -0700 IronPort-SDR: YDuW5ALG9NxvxctVX5w4wVy82q8xO6ZpmA04hpv+wjH83pm84wONZsmPXmFN8IBthGXJiDJ5SR GDRBxiAn2j8w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="408775997" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga001.fm.intel.com with ESMTP; 14 Sep 2020 00:08:34 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Mon, 14 Sep 2020 14:58:18 +0000 Message-Id: <20200914145822.18971-2-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914145822.18971-1-weix.ling@intel.com> References: <20200914145822.18971-1-weix.ling@intel.com> Subject: [dts] [PATCH V4 1/5] tests/l3fwd_base:use API to set dpdk config when use meson 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" use API to set dpdk config when use meson Signed-off-by: lingwei --- tests/l3fwd_base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/l3fwd_base.py b/tests/l3fwd_base.py index 1eccc0e..6f7af8a 100644 --- a/tests/l3fwd_base.py +++ b/tests/l3fwd_base.py @@ -548,6 +548,7 @@ class L3fwdBase(object): "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) def __restore_compilation(self): @@ -558,6 +559,7 @@ class L3fwdBase(object): "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) def __preset_compilation(self): From patchwork Mon Sep 14 14:58:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 77578 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 46C1FA04C9; Mon, 14 Sep 2020 09:08:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3609C2C36; Mon, 14 Sep 2020 09:08:40 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 1FF562C36 for ; Mon, 14 Sep 2020 09:08:37 +0200 (CEST) IronPort-SDR: KEoLNWKM3OIKCrN94MnHmfLbwdcvHZNAGKgR4A3urK2w19wJiDJi0BoMqwGSUkMq2Q/LRGD6tH 3ezK4oLNfTRQ== X-IronPort-AV: E=McAfee;i="6000,8403,9743"; a="159071509" X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="159071509" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 00:08:37 -0700 IronPort-SDR: wg1D33wNVePUOyyO2OZYDbQXwnVgGQ/A2s1duO+vYyzAkKJtFeNQQaBcYMQXyLQKNU4bAzRiQR P9hJMnH+BNKg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="408776001" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga001.fm.intel.com with ESMTP; 14 Sep 2020 00:08:36 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Mon, 14 Sep 2020 14:58:19 +0000 Message-Id: <20200914145822.18971-3-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914145822.18971-1-weix.ling@intel.com> References: <20200914145822.18971-1-weix.ling@intel.com> Subject: [dts] [PATCH V4 2/5] tests/TestSuite_af_xdp_2:use API to set dpdk config when use meson 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" use API to set dpdk config when use meson Signed-off-by: lingwei --- tests/TestSuite_af_xdp_2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/TestSuite_af_xdp_2.py b/tests/TestSuite_af_xdp_2.py index f1d495f..4586c9d 100644 --- a/tests/TestSuite_af_xdp_2.py +++ b/tests/TestSuite_af_xdp_2.py @@ -77,6 +77,7 @@ class TestAfXdp(TestCase): def prepare_dpdk(self): self.dut.send_expect( "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AF_XDP=n$/CONFIG_RTE_LIBRTE_PMD_AF_XDP=y/' config/common_base", "# ") + self.dut.set_build_options({'RTE_LIBRTE_PMD_AF_XDP': 'y'}) self.dut.build_install_dpdk(self.dut.target) def set_port_queue(self, intf): @@ -431,7 +432,7 @@ class TestAfXdp(TestCase): def tear_down_all(self): self.dut.kill_all() - self.dut.send_expect( "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AF_XDP=y$/CONFIG_RTE_LIBRTE_PMD_AF_XDP=n/' config/common_base", "# ") + self.dut.set_build_options({'RTE_LIBRTE_PMD_AF_XDP': 'n'}) self.dut.build_install_dpdk(self.dut.target) From patchwork Mon Sep 14 14:58:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 77579 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 6F7E5A04C9; Mon, 14 Sep 2020 09:08:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 65CB61C0C0; Mon, 14 Sep 2020 09:08:42 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 4C9631BFC4 for ; Mon, 14 Sep 2020 09:08:40 +0200 (CEST) IronPort-SDR: +M/GTEprhn6JffW9iXzM+BDs5Q4KeJtHR9/oIohAY+aC8Jhf7qL7J529HfIRj3eGCWsmlP16mO ksEY3KYG1XHg== X-IronPort-AV: E=McAfee;i="6000,8403,9743"; a="159071516" X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="159071516" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 00:08:39 -0700 IronPort-SDR: ASt3gfeJaKD/Qo1Y4QGxkYa1AxTuvmBP2li+ChxpaddvRmjTLn1iwMCLIrDRsbnfKnA/oyqryP HstVa/UTaOwg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="408776007" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga001.fm.intel.com with ESMTP; 14 Sep 2020 00:08:38 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Mon, 14 Sep 2020 14:58:20 +0000 Message-Id: <20200914145822.18971-4-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914145822.18971-1-weix.ling@intel.com> References: <20200914145822.18971-1-weix.ling@intel.com> Subject: [dts] [PATCH V4 3/5] tests/TestSuite_nic_single_core_perf:use API to set dpdk config when use meson 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" use API to set dpdk config when use meson Signed-off-by: lingwei --- tests/TestSuite_nic_single_core_perf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py index 3460252..9bc421b 100644 --- a/tests/TestSuite_nic_single_core_perf.py +++ b/tests/TestSuite_nic_single_core_perf.py @@ -61,10 +61,12 @@ class TestNicSingleCorePerf(TestCase): 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.dut.build_install_dpdk(self.target) # Based on h/w type, choose how many ports to use @@ -394,9 +396,11 @@ class TestNicSingleCorePerf(TestCase): 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'}) self.dut.build_install_dpdk(self.target) self.dut.kill_all() From patchwork Mon Sep 14 14:58:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 77580 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 990A8A04C9; Mon, 14 Sep 2020 09:08:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F2AA1BFC4; Mon, 14 Sep 2020 09:08:44 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 5A205160 for ; Mon, 14 Sep 2020 09:08:42 +0200 (CEST) IronPort-SDR: 1yH+IaibB0nKtMuwSYWDn3SFQ/A9Gs+wAlaMa42mdsNWyo46yA8ImoSKPmtxND/9jerDp7p8tL RUauZOwESb0Q== X-IronPort-AV: E=McAfee;i="6000,8403,9743"; a="159071519" X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="159071519" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 00:08:42 -0700 IronPort-SDR: 8k4oIwoLavle+F6zp2HmEJjoHu5z0BCOsKtYbgwW4RGoixGW63oNh3H/YITVDWw3EXL9B7y9Af g3cB/WKeooMw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="408776013" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga001.fm.intel.com with ESMTP; 14 Sep 2020 00:08:41 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Mon, 14 Sep 2020 14:58:21 +0000 Message-Id: <20200914145822.18971-5-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914145822.18971-1-weix.ling@intel.com> References: <20200914145822.18971-1-weix.ling@intel.com> Subject: [dts] [PATCH V4 4/5] tests/TestSuite_vmdq_dcb:use API to set dpdk config when use meson 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" use API to set dpdk config when use meson Signed-off-by: lingwei --- tests/TestSuite_vmdq_dcb.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/TestSuite_vmdq_dcb.py b/tests/TestSuite_vmdq_dcb.py index d202441..5f0da0f 100644 --- a/tests/TestSuite_vmdq_dcb.py +++ b/tests/TestSuite_vmdq_dcb.py @@ -93,15 +93,10 @@ class TestVmdqDcb(TestCase): """ Rebuild dpdk """ - out = self.dut.send_expect("grep 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM' ./config/common_base", "#", 20) - vm_num = re.findall(r'\d+', out)[-1] - if str(nb_queue_per_vm) == vm_num: - return - else: - self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=%s/CONFIG_RTE_LIBRTE_I40E_" - "QUEUE_NUM_PER_VM=%s/' ./config/common_base" % (vm_num, nb_queue_per_vm), "#", 20) - self.dut.set_build_options({'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM': nb_queue_per_vm}) - self.dut.build_install_dpdk(self.target) + self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=.*$/CONFIG_RTE_LIBRTE_I40E_" + "QUEUE_NUM_PER_VM=%s/' ./config/common_base" % nb_queue_per_vm, "#", 20) + self.dut.set_build_options({'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM': nb_queue_per_vm}) + self.dut.build_install_dpdk(self.target) def start_application(self, npools, ntcs): """ From patchwork Mon Sep 14 14:58:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 77581 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 C0A40A04C9; Mon, 14 Sep 2020 09:08:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B46D11BE95; Mon, 14 Sep 2020 09:08:46 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 5B5D3160 for ; Mon, 14 Sep 2020 09:08:45 +0200 (CEST) IronPort-SDR: oblHscrwicw9CM1Jq7X3BxR+EfQWn9D0V3U9qXpIQTfRttSAbGJ6Rr/PVZoc2gZpJ0/ISQSqZz S839ejQMK17A== X-IronPort-AV: E=McAfee;i="6000,8403,9743"; a="159071534" X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="159071534" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 00:08:45 -0700 IronPort-SDR: 2pkV73RjDrmiTOjr8zvtsLlNQz1SSRCr4pRKz3jRrQ59qg2nO73JJN4J198IK7tgG6qtnXHUsn qLv0JfMa+ihQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,425,1592895600"; d="scan'208";a="408776027" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga001.fm.intel.com with ESMTP; 14 Sep 2020 00:08:43 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Mon, 14 Sep 2020 14:58:22 +0000 Message-Id: <20200914145822.18971-6-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914145822.18971-1-weix.ling@intel.com> References: <20200914145822.18971-1-weix.ling@intel.com> Subject: [dts] [PATCH V4 5/5] tests/TestSuite_vmdq:use API to set dpdk config when use meson 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" use API to set dpdk config when use meson Signed-off-by: lingwei --- tests/TestSuite_vmdq.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py index 8e721e5..1bac5fe 100644 --- a/tests/TestSuite_vmdq.py +++ b/tests/TestSuite_vmdq.py @@ -28,6 +28,7 @@ class TestVmdq(TestCase): self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=256/CONFIG_RTE_MAX_QUEUES_PER_PORT=1024/' ./config/common_base", "# ", 5) + self.dut.set_build_options({'RTE_MAX_QUEUES_PER_PORT': 1024}) self.dut.build_install_dpdk(self.target) # Update the max queue per port for Fortville. self.dut.send_expect("sed -i 's/define MAX_QUEUES 128/define MAX_QUEUES 1024/' ./examples/vmdq/main.c", "#", 5) @@ -133,7 +134,8 @@ class TestVmdq(TestCase): def get_vmdq_stats(self): vmdq_session = self.dut.new_session() - vmdq_session.send_expect("kill -s SIGHUP `pgrep -fl vmdq_app | awk '{print $1}'`", "#", 20) + app_name = self.dut.apps_name['vmdq'].split('/')[-1] + vmdq_session.send_expect("kill -s SIGHUP `pgrep -fl %s | awk '{print $1}'`" % app_name, "#", 20) out = self.dut.get_session_output() self.logger.info(out) vmdq_session.close() @@ -242,4 +244,5 @@ class TestVmdq(TestCase): self.dut.send_expect( "sed -i 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=1024/CONFIG_RTE_MAX_QUEUES_PER_PORT=256/' ./config/common_base", "# ", 5) + self.dut.set_build_options({'RTE_MAX_QUEUES_PER_PORT': 256}) self.dut.build_install_dpdk(self.target)