aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/presentation
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2019-09-13 13:53:23 +0200
committerTibor Frank <tifrank@cisco.com>2019-09-13 13:53:23 +0200
commite2d15edc355f0c70df578dde0495f8ffd85d8c12 (patch)
tree325f52bed6832dc57396e6d8bdaea1cc7638e3e9 /resources/tools/presentation
parent8be5c3483fffdc62550f74acf8ccba2123547bb5 (diff)
Report: Fixes
Change-Id: Id14704f3c1526655adeaa51f0a4198b6309a64eb Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/tools/presentation')
-rw-r--r--resources/tools/presentation/generator_plots.py16
-rw-r--r--resources/tools/presentation/specification.yaml10
2 files changed, 13 insertions, 13 deletions
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 6fe1f287de..3e5da63c9e 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1792,9 +1792,9 @@ def plot_service_density_heatmap(plot, input_data):
"""
REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
- REGEX_TEST_NAME = re.compile(r'^.*-(\d+vhost|\d+memif)-'
- r'(\d+chain|\d+pipe)-'
- r'(\d+vm|\d+dcr|\d+drc).*$')
+ REGEX_TEST_NAME = re.compile(r'^.*-(\d+ch|\d+pl)-'
+ r'(\d+mif|\d+vh)-'
+ r'(\d+vm\d+t|\d+dcr\d+t).*$')
txt_chains = list()
txt_nodes = list()
@@ -1821,9 +1821,9 @@ def plot_service_density_heatmap(plot, input_data):
continue
groups = re.search(REGEX_TEST_NAME, test["name"])
if groups and len(groups.groups()) == 3:
- hover_name = "{vhost}-{chain}-{vm}".format(
- vhost=str(groups.group(1)),
- chain=str(groups.group(2)),
+ hover_name = "{chain}-{vhost}-{vm}".format(
+ chain=str(groups.group(1)),
+ vhost=str(groups.group(2)),
vm=str(groups.group(3)))
else:
hover_name = ""
@@ -2076,8 +2076,8 @@ def plot_service_density_heatmap_compare(plot, input_data):
REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
REGEX_TEST_NAME = re.compile(r'^.*-(\d+ch|\d+pl)-'
- r'(\d+vh|\d+mif)-'
- r'(\d+vm|\d+dcr).*$')
+ r'(\d+mif|\d+vh)-'
+ r'(\d+vm\d+t|\d+dcr\d+t).*$')
REGEX_THREADS = re.compile(r'^(\d+)(VM|DCR)(\d+)T$')
txt_chains = list()
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 3392e0bcad..30d76fb370 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -12494,7 +12494,7 @@
- type: "plot"
title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr"
algorithm: "plot_throughput_speedup_analysis_name"
- output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-ndr-tsa"
+ output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa"
data: "plot-vpp-throughput-lat-tsa-3n-skx-vhost"
include:
- "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -12504,13 +12504,13 @@
- "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
- "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
layout:
- title: "3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-ndr"
+ title: "3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr"
layout: "plot-throughput-speedup-analysis"
- type: "plot"
- title: "Speedup: 3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-pdr"
+ title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr"
algorithm: "plot_throughput_speedup_analysis_name"
- output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-pdr-tsa"
+ output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa"
data: "plot-vpp-throughput-lat-tsa-3n-skx-vhost"
include:
- "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -12520,7 +12520,7 @@
- "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
- "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
layout:
- title: "3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-pdr"
+ title: "3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr"
layout: "plot-throughput-speedup-analysis"
- type: "plot"