summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarvin Liu <yong.liu@intel.com>2015-07-21 11:10:18 +0800
committerMarvin Liu <yong.liu@intel.com>2015-07-21 11:12:49 +0800
commit9da22cc2e46851720cf7f47b7f5bf5ded16f6321 (patch)
tree463b3757a17a8d02ff8982deab62a952ae78017b
parent81740eaaa86e02b767fea708541b5c88d2d5a410 (diff)
downloaddts-9da22cc2e46851720cf7f47b7f5bf5ded16f6321.zip
dts-9da22cc2e46851720cf7f47b7f5bf5ded16f6321.tar.gz
dts-9da22cc2e46851720cf7f47b7f5bf5ded16f6321.tar.xz
add execution configuration for scalar/vector/full rx function
Signed-off-by: Marvin Liu <yong.liu@intel.com>
-rw-r--r--executions/execution_rxmode.cfg62
-rw-r--r--framework/dts.py6
-rw-r--r--framework/project_dpdk.py10
3 files changed, 73 insertions, 5 deletions
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=<CRB IP Address>
+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=<CRB IP Address>
+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=<CRB IP Address>
+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=.*$/"