* [dts][PTACH V1 1/3]conf/*: improve performance conf settings
2022-05-18 6:20 [dts][PTACH V1 0/3] revise L3fwd related cases Yingya Han
@ 2022-05-18 6:20 ` Yingya Han
2022-05-18 6:20 ` [dts][PTACH V1 2/3]test_plan/l3fwd: remove invalid compilation Yingya Han
2022-05-18 6:20 ` [dts][PTACH V1 3/3]tests/perf_test_base: optimize l3fwd related cases Yingya Han
2 siblings, 0 replies; 5+ messages in thread
From: Yingya Han @ 2022-05-18 6:20 UTC (permalink / raw)
To: dts; +Cc: Yingya Han
Signed-off-by: Yingya Han <yingyax.han@intel.com>
---
conf/l3fwd.cfg | 8 +++++--
conf/l3fwd_em.cfg | 6 ++++-
conf/l3fwd_lpm_ipv4.cfg | 26 ++++++++++++---------
conf/l3fwd_lpm_ipv4_rfc2544.cfg | 8 +++++--
conf/l3fwd_lpm_ipv6.cfg | 6 ++++-
conf/testpmd_perf.cfg | 17 +++++---------
conf/vf_l3fwd_em_kernelpf.cfg | 6 ++++-
conf/vf_l3fwd_kernelpf.cfg | 5 ++++
conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg | 6 ++++-
conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg | 8 +++++--
conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg | 6 ++++-
11 files changed, 69 insertions(+), 33 deletions(-)
diff --git a/conf/l3fwd.cfg b/conf/l3fwd.cfg
index 66274d8c..62cd6814 100644
--- a/conf/l3fwd.cfg
+++ b/conf/l3fwd.cfg
@@ -56,11 +56,15 @@
[suite]
update_expected = True
-
-port_list=None
+compile_rx_desc = 16
+port_list = None
rxtx_queue_size = None
test_duration = 12
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
accepted_tolerance = 1
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/l3fwd_em.cfg b/conf/l3fwd_em.cfg
index cc236370..e9ea322c 100644
--- a/conf/l3fwd_em.cfg
+++ b/conf/l3fwd_em.cfg
@@ -53,10 +53,14 @@
[suite]
update_expected = True
-
+compile_rx_desc = 16
rxtx_queue_size = None
test_duration = 12
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
accepted_tolerance = 1
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/l3fwd_lpm_ipv4.cfg b/conf/l3fwd_lpm_ipv4.cfg
index fd8cb95b..53e30928 100644
--- a/conf/l3fwd_lpm_ipv4.cfg
+++ b/conf/l3fwd_lpm_ipv4.cfg
@@ -53,20 +53,24 @@
[suite]
update_expected = True
-
+compile_rx_desc = 16
rxtx_queue_size = None
test_duration = 60
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
accepted_tolerance = 1
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
- '1C/1T/1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
- '1C/2T/2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
- '2C/2T/2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
- '2C/4T/4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
- '4C/4T/4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
+ '1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
+ '1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
+ '2C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
+ '2C/4T-4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
+ '4C/4T-4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
expected_throughput = {
'test_perf_throughput_ipv4_lpm': {
'IXGBE_10G-82599_SFP': {
- '1C/1T/1Q': {
+ '1C/1T-1Q': {
'64': '0.00',
'128': '0.00',
'256': '0.00',
@@ -74,7 +78,7 @@ expected_throughput = {
'1024': '0.00',
'1280': '0.00',
'1518': '0.00', },
- '1C/2T/2Q': {
+ '1C/2T-2Q': {
'64': '0.00',
'128': '0.00',
'256': '0.00',
@@ -82,7 +86,7 @@ expected_throughput = {
'1024': '0.00',
'1280': '0.00',
'1518': '0.00', },
- '2C/2T/2Q': {
+ '2C/2T-2Q': {
'64': '0.00',
'128': '0.00',
'256': '0.00',
@@ -90,7 +94,7 @@ expected_throughput = {
'1024': '0.00',
'1280': '0.00',
'1518': '0.00', },
- '2C/4T/4Q': {
+ '2C/4T-4Q': {
'64': '0.00',
'128': '0.00',
'256': '0.00',
@@ -98,7 +102,7 @@ expected_throughput = {
'1024': '0.00',
'1280': '0.00',
'1518': '0.00', },
- '4C/4T/4Q': {
+ '4C/4T-4Q': {
'64': '0.00',
'128': '0.00',
'256': '0.00',
diff --git a/conf/l3fwd_lpm_ipv4_rfc2544.cfg b/conf/l3fwd_lpm_ipv4_rfc2544.cfg
index 4c1ee00e..8039f8ed 100644
--- a/conf/l3fwd_lpm_ipv4_rfc2544.cfg
+++ b/conf/l3fwd_lpm_ipv4_rfc2544.cfg
@@ -53,10 +53,14 @@
[suite]
update_expected = True
-
+compile_rx_desc = 16
rxtx_queue_size = None
-test_duration = 60
+test_duration = 20
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
accepted_tolerance = 1
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/l3fwd_lpm_ipv6.cfg b/conf/l3fwd_lpm_ipv6.cfg
index 103a5104..13c9a298 100644
--- a/conf/l3fwd_lpm_ipv6.cfg
+++ b/conf/l3fwd_lpm_ipv6.cfg
@@ -53,10 +53,14 @@
[suite]
update_expected = True
-
+compile_rx_desc = 16
rxtx_queue_size = None
test_duration = 60
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
accepted_tolerance = 1
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/testpmd_perf.cfg b/conf/testpmd_perf.cfg
index dc558435..e974fc84 100644
--- a/conf/testpmd_perf.cfg
+++ b/conf/testpmd_perf.cfg
@@ -6,12 +6,6 @@
# e.g.
# compile_rx_desc=16
#
-# - compile_avx
-# compile switch flag CONFIG_RTE_ENABLE_<XXXX>, support 'AVX512' or 'AVX2'
-#
-# e.g.
-# compile_avx='AVX512' or 'AVX2'
-#
# - forwarding_mode
# testpmd set the packet forwarding mode, support 'io'/'mac'
#
@@ -83,19 +77,20 @@
#
[suite]
-# compile_rx_desc=16
-# compile_avx='AVX512' or 'AVX2'
+update_expected = True
+compile_rx_desc = 16
# 'io', 'mac'
forwarding_mode = 'io'
descriptor_numbers = {
'txd': 2048,
'rxd': 2048, }
-
# port_list=None
-cores_for_all=True
test_duration = 60
+bin_ps_wait_up = 2
+traffic_stop_wait_time = 2
accepted_tolerance = 1
-
+bin_ps_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/vf_l3fwd_em_kernelpf.cfg b/conf/vf_l3fwd_em_kernelpf.cfg
index 95e228cd..ef5aa460 100644
--- a/conf/vf_l3fwd_em_kernelpf.cfg
+++ b/conf/vf_l3fwd_em_kernelpf.cfg
@@ -4,10 +4,14 @@
#
[suite]
+update_expected = True
test_duration = 60
accepted_tolerance = '1%%'
rxtx_queue_size = None
-
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/vf_l3fwd_kernelpf.cfg b/conf/vf_l3fwd_kernelpf.cfg
index 5b831f0a..ca590272 100644
--- a/conf/vf_l3fwd_kernelpf.cfg
+++ b/conf/vf_l3fwd_kernelpf.cfg
@@ -52,9 +52,14 @@
# tests as usual.
[suite]
+update_expected = True
test_duration = 60
accepted_tolerance = '1%%'
rxtx_queue_size = None
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg b/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg
index 6dcd07a2..1be258ca 100644
--- a/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg
+++ b/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg
@@ -4,10 +4,14 @@
#
[suite]
+update_expected = True
test_duration = 60
accepted_tolerance = '1%%'
rxtx_queue_size = None
-
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg b/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg
index 6d70acf3..a853afbf 100644
--- a/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg
+++ b/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg
@@ -4,10 +4,14 @@
#
[suite]
-test_duration = 60
+update_expected = True
+test_duration = 20
accepted_tolerance = '1%%'
rxtx_queue_size = None
-
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
diff --git a/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg b/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg
index 47c4a36f..1a6a8c94 100644
--- a/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg
+++ b/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg
@@ -4,10 +4,14 @@
#
[suite]
+update_expected = True
test_duration = 60
accepted_tolerance = '1%%'
rxtx_queue_size = None
-
+l3fwd_wait_up = 2
+traffic_stop_wait_time = 2
+l3fwd_restart = False
+cores_for_all = True
test_parameters = {
'1C/1T-1Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
'1C/2T-2Q': ['64', '128', '256', '512', '1024', '1280', '1518',],
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [dts][PTACH V1 3/3]tests/perf_test_base: optimize l3fwd related cases
2022-05-18 6:20 [dts][PTACH V1 0/3] revise L3fwd related cases Yingya Han
2022-05-18 6:20 ` [dts][PTACH V1 1/3]conf/*: improve performance conf settings Yingya Han
2022-05-18 6:20 ` [dts][PTACH V1 2/3]test_plan/l3fwd: remove invalid compilation Yingya Han
@ 2022-05-18 6:20 ` Yingya Han
2022-05-18 14:08 ` lijuan.tu
2 siblings, 1 reply; 5+ messages in thread
From: Yingya Han @ 2022-05-18 6:20 UTC (permalink / raw)
To: dts; +Cc: Yingya Han
1) framework already supports rx_mode, delete the avx2/avx512 setting in case.
2) l3fwd uses the parameters "-E" and "-L" to correspond to EM and LPM modes respectively.
the default is LPM mode.
Signed-off-by: Yingya Han <yingyax.han@intel.com>
---
tests/perf_test_base.py | 100 +++++++++++++++-------------------------
1 file changed, 37 insertions(+), 63 deletions(-)
diff --git a/tests/perf_test_base.py b/tests/perf_test_base.py
index fb4f123a..9a73787a 100644
--- a/tests/perf_test_base.py
+++ b/tests/perf_test_base.py
@@ -145,7 +145,6 @@ class PerfTestBase(object):
def __init__(self, valports, socket, mode=None, bin_type=None):
self.__bin_type = bin_type or BIN_TYPE.L3FWD
self.__compile_rx_desc = None
- self.__compile_avx = None
self.__rxtx_queue_size = None
self.__mode = mode or SUITE_TYPE.PF
self.__suite = None
@@ -378,6 +377,7 @@ class PerfTestBase(object):
layer = {
"ether": {
"dst": dmacs[self.__valports.index(port_id)],
+ "src": "02:00:00:00:00:0%d" % port_id,
},
}
else:
@@ -385,6 +385,7 @@ class PerfTestBase(object):
layer = {
"ether": {
"dst": dmac,
+ "src": "02:00:00:00:00:0%d" % port_id,
},
}
return layer
@@ -694,8 +695,7 @@ class PerfTestBase(object):
# init testpmd
if self.__pf_driver is not NIC_DRV.PCI_STUB:
self.__init_host_testpmd()
- self.__l3fwd_em = self.__l3fwd_init(MATCH_MODE.EM)
- self.__l3fwd_lpm = self.__l3fwd_init(MATCH_MODE.LPM)
+ self.__l3fwd_init()
def __init_host_testpmd(self):
"""
@@ -767,7 +767,7 @@ class PerfTestBase(object):
)
return "loop" if port_num == 1 else "chained"
- def __testpmd_start(self, mode, core_mask, config, frame_size):
+ def __testpmd_start(self, mode, eal_para, config, frame_size):
# use test pmd
bin = os.path.join(self.__target_dir, self.dut.apps_name["test-pmd"])
fwd_mode, _config = config
@@ -775,21 +775,16 @@ class PerfTestBase(object):
command_line = (
"{bin} "
"-v "
- "-c {cores} "
- "-n {channel} "
- "{allowlist}"
+ "{eal_para}"
"-- -i "
+ "--portmask {port_mask} "
"{config} "
"{port_topo} "
""
).format(
**{
"bin": bin,
- "cores": core_mask,
- "channel": self.dut.get_memory_channels(),
- "allowlist": self.__bin_ps_allow_list
- if self.__bin_ps_allow_list
- else "",
+ "eal_para": eal_para,
"port_mask": utils.create_mask(self.__valports),
"config": _config,
"port_topo": port_topo,
@@ -823,53 +818,30 @@ class PerfTestBase(object):
self.dut.send_expect("quit", "# ")
self.__is_bin_ps_on = False
- def __l3fwd_init(self, mode, rename=True):
+ def __l3fwd_init(self):
"""
- Prepare long prefix match table, __replace P(x) port pattern
+ compile l3fwd
"""
self.app_name = self.dut.apps_name["l3fwd"].replace(" ", "")
- l3fwd_method = "".join(["_", mode.value])
- flg = 1 if mode is MATCH_MODE.LPM else 0
- _opt = (
- "USER_FLAGS=-DAPP_LOOKUP_METHOD={}".format(flg)
- if self.__mode is SUITE_TYPE.PF
- else ""
- )
- out = self.dut.build_dpdk_apps("./examples/l3fwd", _opt)
+ out = self.dut.build_dpdk_apps("./examples/l3fwd")
self.verify("Error" not in out, "compilation error 1")
self.verify("No such file" not in out, "compilation error 2")
- if not rename:
- return "./" + self.app_name
- # rename binary file
- self.d_con(
- ("mv -f " + self.app_name + " " + self.app_name + "{}").format(
- l3fwd_method
- )
- )
- l3fwd_bin = os.path.join("./" + self.app_name + l3fwd_method)
- return l3fwd_bin
+ self.__l3fwd_bin = os.path.join("./" + self.app_name)
- def __l3fwd_start(self, mode, core_mask, config, frame_size):
- bin = self.__l3fwd_em if mode is MATCH_MODE.EM else self.__l3fwd_lpm
+ def __l3fwd_start(self, mode, eal_para, config, frame_size):
# Start L3fwd application
command_line = (
"{bin} "
"-v "
- "-c {cores} "
- "-n {channel} "
- "{allowlist}"
+ "{eal_para}"
"-- "
"-p {port_mask} "
"--config '{config}'"
""
).format(
**{
- "bin": bin,
- "cores": core_mask,
- "channel": self.dut.get_memory_channels(),
- "allowlist": self.__bin_ps_allow_list
- if self.__bin_ps_allow_list
- else "",
+ "bin": self.__l3fwd_bin,
+ "eal_para": eal_para,
"port_mask": utils.create_mask(self.__valports),
"config": config,
}
@@ -886,6 +858,9 @@ class PerfTestBase(object):
)
if self.nic in suppored_nics or self.__mode is SUITE_TYPE.VF:
command_line += " --parse-ptype"
+ if mode == MATCH_MODE.EM:
+ # use exact mode
+ command_line += " -E"
if frame_size > 1518:
command_line += " --enable-jumbo --max-pkt-len %d" % frame_size
# ignore duplicate start binary with the same option
@@ -909,13 +884,18 @@ class PerfTestBase(object):
self.d_con(["^C", "# ", 25])
self.__is_bin_ps_on = False
- def __bin_ps_start(self, mode, core_mask, config, frame_size):
+ def __bin_ps_start(self, mode, core_list, config, frame_size):
+ eal_para = self.dut.create_eal_parameters(
+ cores=core_list,
+ ports=self.__bin_ps_allow_list,
+ socket=self.__socket,
+ )
bin_methods = {
BIN_TYPE.PMD: self.__testpmd_start,
BIN_TYPE.L3FWD: self.__l3fwd_start,
}
start_func = bin_methods.get(self.__bin_type)
- start_func(mode, core_mask, config, frame_size)
+ start_func(mode, eal_para, config, frame_size)
def __bin_ps_close(self):
bin_methods = {
@@ -1210,7 +1190,7 @@ class PerfTestBase(object):
try:
test_content = self.__test_content.get("port_configs")
results = []
- for config, core_mask, port_conf, frame_size in test_content:
+ for config, core_list, port_conf, frame_size in test_content:
# Start application binary process
self.logger.info(
(
@@ -1224,7 +1204,7 @@ class PerfTestBase(object):
self.__bin_type.value,
)
)
- self.__bin_ps_start(mode, core_mask, port_conf, frame_size)
+ self.__bin_ps_start(mode, core_list, port_conf, frame_size)
result = self.__throughput(l3_proto, mode, frame_size)
# Stop binary process
self.__bin_ps_close()
@@ -1249,7 +1229,7 @@ class PerfTestBase(object):
try:
test_content = self.__test_content.get("port_configs")
results = []
- for config, core_mask, port_conf, frame_size in test_content:
+ for config, core_list, port_conf, frame_size in test_content:
# Start application binary process
self.logger.info(
(
@@ -1263,7 +1243,7 @@ class PerfTestBase(object):
self.__bin_type.value,
)
)
- self.__bin_ps_start(mode, core_mask, port_conf, frame_size)
+ self.__bin_ps_start(mode, core_list, port_conf, frame_size)
result = self.__rfc2544(config, l3_proto, mode, frame_size)
# Stop binary process
self.__bin_ps_close()
@@ -1365,12 +1345,12 @@ class PerfTestBase(object):
if self.__bin_type == BIN_TYPE.PMD:
# keep only one logic core of the main core
- cores_mask = utils.create_mask(corelist[thread_num - 1 :])
+ _corelist = corelist[thread_num - 1 :]
[
configs.append(
[
test_item,
- cores_mask,
+ _corelist,
[
fixed_config[0],
fixed_config[1]
@@ -1384,7 +1364,6 @@ class PerfTestBase(object):
]
# (port,queue,lcore)
else:
- cores_mask = utils.create_mask(corelist)
total = len(grp)
# ignore first 2 cores
_corelist = (corelist * (total // len(corelist) + 1))[:total]
@@ -1393,7 +1372,7 @@ class PerfTestBase(object):
configs.append(
[
test_item,
- cores_mask,
+ _corelist,
",".join(
[
"({0},{1},{2})".format(port, queue, core)
@@ -1509,7 +1488,6 @@ class PerfTestBase(object):
cores_for_all = test_content.get("cores_for_all", False)
self.__compile_rx_desc = test_content.get("compile_rx_desc")
if self.__bin_type == BIN_TYPE.PMD:
- self.__compile_avx = test_content.get("compile_avx")
forwarding_mode = test_content.get("forwarding_mode") or "io"
descriptor_numbers = test_content.get("descriptor_numbers") or {
"txd": 2048,
@@ -1536,7 +1514,7 @@ class PerfTestBase(object):
return test_content
def __get_bin_ps_allowlist(self, port_list=None):
- allowlist = ""
+ allowlist = []
if self.__mode is SUITE_TYPE.PF:
if not port_list:
return None
@@ -1544,15 +1522,11 @@ class PerfTestBase(object):
pci = self.dut.ports_info[port_index].get("pci")
if not pci:
continue
- allowlist += "-a {} ".format(pci)
+ allowlist.append(pci)
else:
- allowlist = "".join(
- [
- "-a {} ".format(pci)
- for _, info in self.__vf_ports_info.items()
- for pci in info.get("vfs_pci")
- ]
- )
+ for _, info in self.__vf_ports_info.items():
+ for pci in info.get("vfs_pci"):
+ allowlist.append(pci)
return allowlist
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread