From 5570bf3ab49301201dd7607bb4f8de67fd8f16dc Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 11 Feb 2020 00:57:10 +0000 Subject: perf: Clean up Hoststack tests - Update test names with clients/streams - Convert test results to JSON output * iperf3 results include bits_per_second * vpp_echo results include both client and server output which includes time in seconds and rx_data/tx_data in bytes which can be used to calculate the average bits per second. Tx and Rx data will always be the same: BPS = (client tx_data * 8) / ((client time + server time) / 2) - Fix WRK test results data formatting errors Change-Id: Ie2aeb665e3cc0739b16f97ba2628eebe6e041d22 Signed-off-by: Dave Wallace --- resources/libraries/python/autogen/Regenerator.py | 67 ++++++----------------- resources/libraries/python/autogen/Testcase.py | 31 ++--------- 2 files changed, 23 insertions(+), 75 deletions(-) (limited to 'resources/libraries/python/autogen') diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 5cd8bcccb7..d40ae7c9fc 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -440,50 +440,24 @@ class Regenerator: min_frame_size = PROTOCOL_TO_MIN_FRAME_SIZE[protocol] default_kwargs_list = [ - {u"frame_size": min_frame_size, u"phy_cores": 1, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": min_frame_size, u"phy_cores": 2, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": min_frame_size, u"phy_cores": 4, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": 1518, u"phy_cores": 1, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": 1518, u"phy_cores": 2, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": 1518, u"phy_cores": 4, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": 9000, u"phy_cores": 1, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": 9000, u"phy_cores": 2, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": 9000, u"phy_cores": 4, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": u"IMIX_v4_1", u"phy_cores": 1, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"} + {u"frame_size": min_frame_size, u"phy_cores": 1}, + {u"frame_size": min_frame_size, u"phy_cores": 2}, + {u"frame_size": min_frame_size, u"phy_cores": 4}, + {u"frame_size": 1518, u"phy_cores": 1}, + {u"frame_size": 1518, u"phy_cores": 2}, + {u"frame_size": 1518, u"phy_cores": 4}, + {u"frame_size": 9000, u"phy_cores": 1}, + {u"frame_size": 9000, u"phy_cores": 2}, + {u"frame_size": 9000, u"phy_cores": 4}, + {u"frame_size": u"IMIX_v4_1", u"phy_cores": 1}, + {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2}, + {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4} ] - hoststack_wrk_kwargs_list = [ - {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) + hs_wrk_kwargs_list = [ + {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4) ] - hoststack_iperf3_kwargs_list = [ - {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, - u"streams": 1, u"bytes_str": u"1G"}, - {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"streams": 1, u"bytes_str": u"10G"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 1, - u"streams": 10, u"bytes_str": u"1G"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 10, - u"streams": 1, u"bytes_str": u"1G"}, - {u"phy_cores": 1, u"frame_size": 0, u"clients": 10, - u"streams": 10, u"bytes_str": u"100M"}, + hs_bps_kwargs_list = [ + {u"frame_size": 0, u"phy_cores": 1}, ] for in_filename in glob(pattern): @@ -510,14 +484,9 @@ class Regenerator: elif in_filename.endswith(u"-reconf.robot"): write_reconf_files(in_filename, in_prolog, default_kwargs_list) elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"): - write_tcp_files(in_filename, in_prolog, - hoststack_wrk_kwargs_list) + write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list) elif in_filename[-10:] in (u"-bps.robot"): - if u"ldpreload-iperf3" in in_filename: - hoststack_kwargs_list = hoststack_iperf3_kwargs_list - else: - hoststack_kwargs_list = hoststack_quic_kwargs_list - write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list) + write_tcp_files(in_filename, in_prolog, hs_bps_kwargs_list) else: raise RuntimeError( f"Error in {in_filename}: non-primary suite type found." diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py index c540d8ccec..d419b2993b 100644 --- a/resources/libraries/python/autogen/Testcase.py +++ b/resources/libraries/python/autogen/Testcase.py @@ -34,8 +34,7 @@ class Testcase: """ self.template = Template(template_string) - def generate(self, num, frame_size, phy_cores, clients, streams, - bytes_str): + def generate(self, num, frame_size, phy_cores): """Return string of test case code with placeholders filled. Fail if there are placeholders left unfilled. @@ -44,16 +43,9 @@ class Testcase: :param num: Test case number. Example value: 4. :param frame_size: Imix string or numeric frame size. Example: 74. :param phy_cores: Number of physical cores to use. Example: 2. - :param clients: Number of clients used by test program. Example: 4. - :param streams: Number of streams used by test program. Example: 10. - :param bytes_str: Size in bytes of stream sent by test program. - Example: 1G :type num: int :type frame_size: str or int :type phy_cores: int or str - :type clients: int - :type streams: int - :type bytes_str: str :returns: Filled template, usable as test case code. :rtype: str """ @@ -75,11 +67,6 @@ class Testcase: u"cores_num": f"${{{cores_num:d}}}", u"cores_str": phy_cores, u"tc_num": f"tc{num:02d}", - u"clients_num": f"${{{clients:d}}}", - u"clients_str": str(clients), - u"streams_num": f"${{{streams:d}}}", - u"streams_str": str(streams), - u"bytes_str": bytes_str, } ) return self.template.substitute(subst_dict) @@ -122,17 +109,9 @@ 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}}-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}}" \ - f" | bytes=${{bytes_str}}\n" + template_string = \ + f"\n| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id[:-4]}" \ + f"-{suite_id[-3:]}\n" \ + f"| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}\n" return cls(template_string) -- cgit 1.2.3-korg