diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2020-01-21 19:02:14 +0000 |
|---|---|---|
| committer |   Vratko Polak <vrpolak@cisco.com> | 2020-01-28 14:35:46 +0000 |
| commit | b340b5c9925b43869b91197850504760757a0bfe (patch) | |
| tree | f95b3f6c94b1385443458252e52b711099414da3 /resources/libraries/python/autogen | |
| parent | 0c6d1142326b6953b972733c4fa3bddf078ec802 (diff) | |
perf: hoststack iperf3 test tuning
Change-Id: I53425f57fe9ecef9cff2c94642cc7cb24537a961
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'resources/libraries/python/autogen')
| -rw-r--r-- | resources/libraries/python/autogen/Regenerator.py | 26 | ||||
| -rw-r--r-- | resources/libraries/python/autogen/Testcase.py | 8 |
2 files changed, 18 insertions, 16 deletions
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index cb0d3329d5..5b112f5a73 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -280,8 +280,8 @@ def write_default_files(in_filename, in_prolog, kwargs_list): iface, suite_id, suite_tag = get_iface_and_suite_ids( out_filename ) - # The next replace is probably a noop, but it is safer to maintain - # the same structure as for other edits. + # The next replace is probably a noop, but it is safer to + # maintain the same structure as for other edits. out_prolog = replace_defensively( out_prolog, old_suite_tag, suite_tag, 1, f"Perf suite tag {old_suite_tag} should appear once.", @@ -466,27 +466,23 @@ class Regenerator: u"streams": 1, u"bytes_str": u"1G"} ] hoststack_wrk_kwargs_list = [ - {u"phy_cores": i, u"frame_size": 0, u"clients": 1, + {u"frame_size": 0, u"phy_cores": i, u"clients": 1, u"streams": 1, u"bytes_str": u"1G"} for i in (1, 2, 4) ] hoststack_iperf3_kwargs_list = [ - {u"phy_cores": 1, u"frame_size": 0, u"clients": 1, + {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, u"streams": 1, u"bytes_str": u"1G"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 1, - u"streams": 10, u"bytes_str": u"10G"}, - {u"phy_cores": 2, u"frame_size": 0, u"clients": 1, - u"streams": 10, u"bytes_str": u"10G"}, - {u"phy_cores": 4, u"frame_size": 0, u"clients": 1, - u"streams": 10, u"bytes_str": u"10G"}, + {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, + u"streams": 10, u"bytes_str": u"1G"}, ] hoststack_quic_kwargs_list = [ - {u"phy_cores": 1, u"frame_size": 0, u"clients": 1, + {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, u"streams": 1, u"bytes_str": u"100M"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 1, + {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, u"streams": 10, u"bytes_str": u"100M"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 10, + {u"frame_size": 0, u"phy_cores": 1, u"clients": 10, u"streams": 1, u"bytes_str": u"100M"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 10, + {u"frame_size": 0, u"phy_cores": 1, u"clients": 10, u"streams": 10, u"bytes_str": u"100M"}, ] @@ -516,7 +512,7 @@ class Regenerator: elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"): write_tcp_files(in_filename, in_prolog, hoststack_wrk_kwargs_list) - elif in_filename[-10:] in (u"-bps.robot"): + elif in_filename[-10:] in u"-bps.robot": write_tcp_files(in_filename, in_prolog, hoststack_iperf3_kwargs_list if u"iperf3" in in_filename else hoststack_quic_kwargs_list) diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py index 6b4cfb2e06..c540d8ccec 100644 --- a/resources/libraries/python/autogen/Testcase.py +++ b/resources/libraries/python/autogen/Testcase.py @@ -122,9 +122,15 @@ class Testcase: | | [Tags] | ${{cores_str}}C | | phy_cores=${{cores_num}} ''' + elif u"iperf3" in suite_id: + template_string = f''' +| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id} +| | [Tags] | ${{cores_str}}C | ${{clients_str}}CLIENT | ${{streams_str}}STREAM +| | phy_cores=${{cores_num}} | clients=${{clients_num}}''' + template_string += f" | streams=${{streams_num}}\n" else: template_string = f''' -| ${{tc_num}}-IMIX-${{cores_str}}c-{suite_id} +| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id} | | [Tags] | ${{cores_str}}C | ${{clients_str}}CLIENT | ${{streams_str}}STREAM | | phy_cores=${{cores_num}} | clients=${{clients_num}}''' template_string += f" | streams=${{streams_num}}" \ |