aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-02-11 09:06:14 +0100
committerTibor Frank <tifrank@cisco.com>2020-02-11 09:25:34 +0100
commit0ba8b76dc5ac35b39b1a9200c1c81410d632d8aa (patch)
tree7b0d0d49a510f678683e471c5cc92ed35288c9ef
parent7dc45304cd2e4e877c7c5b1885d242c3977e9245 (diff)
Report: Filter data for Latency graphs
Change-Id: I7d0354086c7d63bc79f2b2f97345d84842d6a911 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--docs/report/vpp_performance_tests/comparisons/bad_good.rst2
-rw-r--r--resources/tools/presentation/generator_plots.py6
-rw-r--r--resources/tools/presentation/generator_tables.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/report/vpp_performance_tests/comparisons/bad_good.rst b/docs/report/vpp_performance_tests/comparisons/bad_good.rst
index 5660fc6f2b..644a3d4d15 100644
--- a/docs/report/vpp_performance_tests/comparisons/bad_good.rst
+++ b/docs/report/vpp_performance_tests/comparisons/bad_good.rst
@@ -69,7 +69,7 @@ Comparison tables in HTML, ASCII and CSV formats:
- `CSV 2t1c PDR comparison <../../_static/vpp/performance-bad-good-3n-skx-2t1c-pdr.csv>`_
- `CSV 4t2c PDR comparison <../../_static/vpp/performance-bad-good-3n-skx-4t2c-pdr.csv>`_
-2n-skx
+2n-clx
~~~~~~
NDR Comparison
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index b6a393968d..5d8654a77d 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -202,14 +202,14 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
if plot.get(u"include", None):
data = input_data.filter_tests_by_name(
plot,
- params=[u"latency", u"throughput", u"parent", u"tags", u"type"]
+ params=[u"name", u"latency", u"parent", u"tags", u"type"]
)[0][0]
elif plot.get(u"filter", None):
data = input_data.filter_data(
plot,
- params=[u"latency", u"throughput", u"parent", u"tags", u"type"],
+ params=[u"name", u"latency", u"parent", u"tags", u"type"],
continue_on_error=True
- )
+ )[0][0]
else:
job = list(plot[u"data"].keys())[0]
build = str(plot[u"data"][job][0])
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 6de5d46681..3c77ea89f1 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -34,7 +34,7 @@ from pal_utils import mean, stdev, relative_change, classify_anomalies, \
convert_csv_to_pretty_txt, relative_change_stdev
-REGEX_NIC = re.compile(r'\d*ge\dp\d\D*\d*')
+REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)-')
def generate_tables(spec, data):