diff options
4 files changed, 45 insertions, 46 deletions
diff --git a/docs/report/vpp_performance_tests/performance_impact_meltdown/index.rst b/docs/report/vpp_performance_tests/performance_impact_meltdown/index.rst index 67faff8afa..1f60d260f2 100644 --- a/docs/report/vpp_performance_tests/performance_impact_meltdown/index.rst +++ b/docs/report/vpp_performance_tests/performance_impact_meltdown/index.rst @@ -20,7 +20,7 @@ NDR throughput: Best 20 changes .. csv-table:: :align: center - :file: meltdown-impact-ndr-1t1c-top.csv + :file: ../../_static/vpp/meltdown-impact-ndr-1t1c-top.csv .. only:: latex @@ -39,7 +39,7 @@ NDR throughput: Best 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_meltdown/meltdown-impact-ndr-1t1c-top.csv} + ]{../_build/_static/vpp/meltdown-impact-ndr-1t1c-top.csv} } NDR throughput: Worst 20 changes @@ -49,7 +49,7 @@ NDR throughput: Worst 20 changes .. csv-table:: :align: center - :file: meltdown-impact-ndr-1t1c-bottom.csv + :file: ../../_static/vpp/meltdown-impact-ndr-1t1c-bottom.csv .. only:: latex @@ -68,7 +68,7 @@ NDR throughput: Worst 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_meltdown/meltdown-impact-ndr-1t1c-bottom.csv} + ]{../_build/_static/vpp/meltdown-impact-ndr-1t1c-bottom.csv} } .. only:: html @@ -79,12 +79,12 @@ NDR throughput: All changes Complete results for all NDR tests are available in a CSV and pretty ASCII formats: - - `csv format for 1t1c <meltdown-impact-ndr-1t1c-full.csv>`_, - - `csv format for 2t2c <meltdown-impact-ndr-2t2c-full.csv>`_, - - `csv format for 4t4c <meltdown-impact-ndr-4t4c-full.csv>`_, - - `pretty ASCII format for 1t1c <meltdown-impact-ndr-1t1c-full.txt>`_, - - `pretty ASCII format for 2t2c <meltdown-impact-ndr-2t2c-full.txt>`_, - - `pretty ASCII format for 4t4c <meltdown-impact-ndr-4t4c-full.txt>`_. + - `csv format for 1t1c <../../_static/vpp/meltdown-impact-ndr-1t1c-full.csv>`_, + - `csv format for 2t2c <../../_static/vpp/meltdown-impact-ndr-2t2c-full.csv>`_, + - `csv format for 4t4c <../../_static/vpp/meltdown-impact-ndr-4t4c-full.csv>`_, + - `pretty ASCII format for 1t1c <../../_static/vpp/meltdown-impact-ndr-1t1c-full.txt>`_, + - `pretty ASCII format for 2t2c <../../_static/vpp/meltdown-impact-ndr-2t2c-full.txt>`_, + - `pretty ASCII format for 4t4c <../../_static/vpp/meltdown-impact-ndr-4t4c-full.txt>`_. PDR throughput: Best 20 changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -93,7 +93,7 @@ PDR throughput: Best 20 changes .. csv-table:: :align: center - :file: meltdown-impact-pdr-1t1c-top.csv + :file: ../../_static/vpp/meltdown-impact-pdr-1t1c-top.csv .. only:: latex @@ -112,7 +112,7 @@ PDR throughput: Best 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_meltdown/meltdown-impact-pdr-1t1c-top.csv} + ]{../_build/_static/vpp/meltdown-impact-pdr-1t1c-top.csv} } PDR throughput: Worst 20 changes @@ -122,7 +122,7 @@ PDR throughput: Worst 20 changes .. csv-table:: :align: center - :file: meltdown-impact-pdr-1t1c-bottom.csv + :file: ../../_static/vpp/meltdown-impact-pdr-1t1c-bottom.csv .. only:: latex @@ -141,7 +141,7 @@ PDR throughput: Worst 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_meltdown/meltdown-impact-pdr-1t1c-bottom.csv} + ]{../_build/_static/vpp/meltdown-impact-pdr-1t1c-bottom.csv} } .. only:: html @@ -152,9 +152,9 @@ PDR throughput: All changes Complete results for all PDR tests are available in a CSV and pretty ASCII formats: - - `csv format for 1t1c <meltdown-impact-pdr-1t1c-full.csv>`_, - - `csv format for 2t2c <meltdown-impact-pdr-2t2c-full.csv>`_, - - `csv format for 4t4c <meltdown-impact-pdr-4t4c-full.csv>`_, - - `pretty ASCII format for 1t1c <meltdown-impact-pdr-1t1c-full.txt>`_, - - `pretty ASCII format for 2t2c <meltdown-impact-pdr-2t2c-full.txt>`_, - - `pretty ASCII format for 4t4c <meltdown-impact-pdr-4t4c-full.txt>`_. + - `csv format for 1t1c <../../_static/vpp/meltdown-impact-pdr-1t1c-full.csv>`_, + - `csv format for 2t2c <../../_static/vpp/meltdown-impact-pdr-2t2c-full.csv>`_, + - `csv format for 4t4c <../../_static/vpp/meltdown-impact-pdr-4t4c-full.csv>`_, + - `pretty ASCII format for 1t1c <../../_static/vpp/meltdown-impact-pdr-1t1c-full.txt>`_, + - `pretty ASCII format for 2t2c <../../_static/vpp/meltdown-impact-pdr-2t2c-full.txt>`_, + - `pretty ASCII format for 4t4c <../../_static/vpp/meltdown-impact-pdr-4t4c-full.txt>`_. diff --git a/docs/report/vpp_performance_tests/performance_impact_spectre/index.rst b/docs/report/vpp_performance_tests/performance_impact_spectre/index.rst index 334a75784c..cf5202553e 100644 --- a/docs/report/vpp_performance_tests/performance_impact_spectre/index.rst +++ b/docs/report/vpp_performance_tests/performance_impact_spectre/index.rst @@ -23,7 +23,7 @@ NDR throughput: Best 20 changes .. csv-table:: :align: center - :file: meltdown-spectre-impact-ndr-1t1c-top.csv + :file: ../../_static/vpp/meltdown-spectre-impact-ndr-1t1c-top.csv .. only:: latex @@ -42,7 +42,7 @@ NDR throughput: Best 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_spectre/meltdown-spectre-impact-ndr-1t1c-top.csv} + ]{../_build/_static/vpp/meltdown-spectre-impact-ndr-1t1c-top.csv} } NDR throughput: Worst 20 changes @@ -52,7 +52,7 @@ NDR throughput: Worst 20 changes .. csv-table:: :align: center - :file: meltdown-spectre-impact-ndr-1t1c-bottom.csv + :file: ../../_static/vpp/meltdown-spectre-impact-ndr-1t1c-bottom.csv .. only:: latex @@ -71,7 +71,7 @@ NDR throughput: Worst 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_spectre/meltdown-spectre-impact-ndr-1t1c-bottom.csv} + ]{../_build/_static/vpp/meltdown-spectre-impact-ndr-1t1c-bottom.csv} } .. only:: html @@ -83,12 +83,12 @@ NDR throughput: All changes Complete results for all NDR tests are available in a CSV and pretty ASCII formats: - - `csv format for 1t1c <meltdown-spectre-impact-ndr-1t1c-full.csv>`_, - - `csv format for 2t2c <meltdown-spectre-impact-ndr-2t2c-full.csv>`_, - - `csv format for 4t4c <meltdown-spectre-impact-ndr-4t4c-full.csv>`_, - - `pretty ASCII format for 1t1c <meltdown-spectre-impact-ndr-1t1c-full.txt>`_, - - `pretty ASCII format for 2t2c <meltdown-spectre-impact-ndr-2t2c-full.txt>`_, - - `pretty ASCII format for 4t4c <meltdown-spectre-impact-ndr-4t4c-full.txt>`_. + - `csv format for 1t1c <../../_static/vpp/meltdown-spectre-impact-ndr-1t1c-full.csv>`_, + - `csv format for 2t2c <../../_static/vpp/meltdown-spectre-impact-ndr-2t2c-full.csv>`_, + - `csv format for 4t4c <../../_static/vpp/meltdown-spectre-impact-ndr-4t4c-full.csv>`_, + - `pretty ASCII format for 1t1c <../../_static/vpp/meltdown-spectre-impact-ndr-1t1c-full.txt>`_, + - `pretty ASCII format for 2t2c <../../_static/vpp/meltdown-spectre-impact-ndr-2t2c-full.txt>`_, + - `pretty ASCII format for 4t4c <../../_static/vpp/meltdown-spectre-impact-ndr-4t4c-full.txt>`_. PDR throughput: Best 20 changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -97,7 +97,7 @@ PDR throughput: Best 20 changes .. csv-table:: :align: center - :file: meltdown-spectre-impact-pdr-1t1c-top.csv + :file: ../../_static/vpp/meltdown-spectre-impact-pdr-1t1c-top.csv .. only:: latex @@ -116,7 +116,7 @@ PDR throughput: Best 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_spectre/meltdown-spectre-impact-pdr-1t1c-top.csv} + ]{../_build/_static/vpp/meltdown-spectre-impact-pdr-1t1c-top.csv} } PDR throughput: Worst 20 changes @@ -126,7 +126,7 @@ PDR throughput: Worst 20 changes .. csv-table:: :align: center - :file: meltdown-spectre-impact-pdr-1t1c-bottom.csv + :file: ../../_static/vpp/meltdown-spectre-impact-pdr-1t1c-bottom.csv .. only:: latex @@ -145,7 +145,7 @@ PDR throughput: Worst 20 changes perfimprovements column width=1cm, late after line={\\\hline}, late after last line={\end{longtable}} - ]{../_tmp/src/vpp_performance_tests/performance_impact_spectre/meltdown-spectre-impact-pdr-1t1c-bottom.csv} + ]{../_build/_static/vpp/meltdown-spectre-impact-pdr-1t1c-bottom.csv} } .. only:: html @@ -156,9 +156,9 @@ PDR throughput: All changes Complete results for all PDR tests are available in a CSV and pretty ASCII formats: - - `csv format for 1t1c <meltdown-spectre-impact-pdr-1t1c-full.csv>`_, - - `csv format for 2t2c <meltdown-spectre-impact-pdr-2t2c-full.csv>`_, - - `csv format for 4t4c <meltdown-spectre-impact-pdr-4t4c-full.csv>`_, - - `pretty ASCII format for 1t1c <meltdown-spectre-impact-pdr-1t1c-full.txt>`_, - - `pretty ASCII format for 2t2c <meltdown-spectre-impact-pdr-2t2c-full.txt>`_, - - `pretty ASCII format for 4t4c <meltdown-spectre-impact-pdr-4t4c-full.txt>`_. + - `csv format for 1t1c <../../_static/vpp/meltdown-spectre-impact-pdr-1t1c-full.csv>`_, + - `csv format for 2t2c <../../_static/vpp/meltdown-spectre-impact-pdr-2t2c-full.csv>`_, + - `csv format for 4t4c <../../_static/vpp/meltdown-spectre-impact-pdr-4t4c-full.csv>`_, + - `pretty ASCII format for 1t1c <../../_static/vpp/meltdown-spectre-impact-pdr-1t1c-full.txt>`_, + - `pretty ASCII format for 2t2c <../../_static/vpp/meltdown-spectre-impact-pdr-2t2c-full.txt>`_, + - `pretty ASCII format for 4t4c <../../_static/vpp/meltdown-spectre-impact-pdr-4t4c-full.txt>`_. diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 46d2287baa..58d7426542 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -20,7 +20,6 @@ import csv import prettytable from string import replace -from pprint import pformat from errors import PresentationError from utils import mean, stdev, relative_change @@ -196,6 +195,9 @@ def table_performance_improvements(table, input_data): for item in data: if isinstance(item["data"], str): line_lst.append(item["data"]) + # Remove -?drdisc from the end + if item["data"].endswith("drdisc"): + item["data"] = item["data"][:-8] elif isinstance(item["data"], float): line_lst.append("{:.1f}".format(item["data"])) elif item["data"] is None: @@ -397,8 +399,6 @@ def table_performance_comparison(table, input_data): except TypeError: tbl_dict.pop(tst_name, None) - logging.info(pformat(tbl_dict)) - tbl_lst = list() for tst_name in tbl_dict.keys(): item = [tbl_dict[tst_name]["name"], ] @@ -423,7 +423,6 @@ def table_performance_comparison(table, input_data): # Sort the table according to the relative change tbl_lst.sort(key=lambda rel: rel[-1], reverse=True) - logging.info(pformat(tbl_lst)) # Generate tables: # All tests in csv: diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 78dd9f3b21..f34fb2eb7c 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -439,7 +439,7 @@ algorithm: "table_performance_comparison" output-file-ext: ".csv" # TODO: specify dir - output-file: "{DIR[DTR,PERF,VPP,IMPACT,MELTDOWN]}/meltdown-impact" + output-file: "{DIR[STATIC,VPP]}/meltdown-impact" reference: title: "No Meltdown" # TODO: specify data sources @@ -473,7 +473,7 @@ algorithm: "table_performance_comparison" output-file-ext: ".csv" # TODO: specify dir - output-file: "{DIR[DTR,PERF,VPP,IMPACT,SPECTRE]}/meltdown-spectre-impact" + output-file: "{DIR[STATIC,VPP]}/meltdown-spectre-impact" reference: title: "No Spectre" # TODO: specify data sources |