From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id F29685A5E for ; Tue, 21 Jul 2015 05:11:36 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 20 Jul 2015 20:10:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,512,1432623600"; d="scan'208";a="751207228" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 20 Jul 2015 20:10:23 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t6L3ALtW023335; Tue, 21 Jul 2015 11:10:21 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t6L3AJv5012272; Tue, 21 Jul 2015 11:10:21 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t6L3AJMZ012268; Tue, 21 Jul 2015 11:10:19 +0800 From: Yong Liu To: dts@dpdk.org Date: Tue, 21 Jul 2015 11:10:18 +0800 Message-Id: <1437448218-12236-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] add execution configuration for scalar/vector/full rx function 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: , X-List-Received-Date: Tue, 21 Jul 2015 03:11:37 -0000 From: Marvin Liu Signed-off-by: Marvin Liu diff --git a/executions/execution_rxmode.cfg b/executions/execution_rxmode.cfg new file mode 100644 index 0000000..cf46dbf --- /dev/null +++ b/executions/execution_rxmode.cfg @@ -0,0 +1,62 @@ +[Execution1] +crbs= +drivername=igb_uio +rx_mode=scalar +test_suites= + fdir, + jumboframes, + scatter, + ieee1588, + checksum_offload, + link_flowctrl, + pmd, + vlan, + shutdown_api, + dual_vlan, + pmdrssreta, + generic_filter +targets= + x86_64-native-linuxapp-gcc +parameters=nic_type=cfg:func=true + +[Execution2] +crbs= +drivername=igb_uio +rx_mode=full +test_suites= + fdir, + jumboframes, + scatter, + ieee1588, + checksum_offload, + link_flowctrl, + pmd, + vlan, + shutdown_api, + dual_vlan, + pmdrssreta, + generic_filter +targets= + x86_64-native-linuxapp-gcc +parameters=nic_type=cfg:func=true + +[Execution3] +crbs= +drivername=igb_uio +rx_mode=vector +test_suites= + fdir, + jumboframes, + scatter, + ieee1588, + checksum_offload, + link_flowctrl, + pmd, + vlan, + shutdown_api, + dual_vlan, + pmdrssreta, + generic_filter +targets= + x86_64-native-linuxapp-gcc +parameters=nic_type=cfg:func=true diff --git a/framework/dts.py b/framework/dts.py index cc3744b..e9513c6 100644 --- a/framework/dts.py +++ b/framework/dts.py @@ -73,6 +73,7 @@ results_table_header = [] performance_only = False functional_only = False nic = None +rx_mode = None requested_tests = None dut = None duts = None @@ -153,6 +154,7 @@ def dts_parse_config(section): scenario = '' global nic + global rx_mode duts = [dut_.strip() for dut_ in config.get(section, 'crbs').split(',')] @@ -160,6 +162,10 @@ def dts_parse_config(section): for target in config.get(section, 'targets').split(',')] test_suites = [suite.strip() for suite in config.get(section, 'test_suites').split(',')] + try: + rx_mode = config.get(section, 'rx_mode').strip() + except: + rx_mode = None for suite in test_suites: if suite == '': diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index 7cbff51..7b6e1ae 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -126,22 +126,22 @@ class DPDKdut(Dut): Set default RX/TX PMD function, now only take effect on ixgbe. """ [arch, machine, env, toolchain] = self.target.split('-') - if 'mode' not in self.crb: + if dts.rx_mode is None: mode = 'default' else: - mode = self.crb['mode'] + mode = dts.rx_mode - if mode is 'scalar': + if mode == 'scalar': self.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=.*$/" + "CONFIG_RTE_IXGBE_INC_VECTOR=n/' config/common_%s" % env, "# ", 30) self.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=.*$/" + "CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y/' config/common_%s" % env, "# ", 30) - if mode is 'full': + if mode == 'full': self.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=.*$/" + "CONFIG_RTE_IXGBE_INC_VECTOR=n/' config/common_%s" % env, "# ", 30) self.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=.*$/" + "CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=n/' config/common_%s" % env, "# ", 30) - if mode is 'vector': + if mode == 'vector': self.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=.*$/" + "CONFIG_RTE_IXGBE_INC_VECTOR=y/' config/common_%s" % env, "# ", 30) self.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=.*$/" -- 1.9.3