... |
... |
@@ -86,13 +86,13 @@ with open(benchmark_html, 'w') as html_file: |
86
|
86
|
# Write results to HTML
|
87
|
87
|
html_file.write('<h2>Results for {}</h2>\n'.format(fontname))
|
88
|
88
|
html_file.write('<table border="1">\n')
|
89
|
|
- html_file.write('<tr><th> Test </th><th><a href="">Baseline</a> (µs/op)</th><th> <a href="">Benchmark</a> (µs/op)</th><th> Difference (%)</th></tr>\n'.format(os.path.join(baseline_dir,fontname[:-4]),os.path.join(benchmark_dir,fontname[:-4])))
|
|
89
|
+ html_file.write('<tr><th>Test</th><th>N</th><th><a href="">Baseline</a> (ms)</th><th> <a href="">Benchmark</a> (ms)</th><th>Difference (%)</th></tr>\n'.format(os.path.join(baseline_dir,fontname[:-4]),os.path.join(benchmark_dir,fontname[:-4])))
|
90
|
90
|
|
91
|
91
|
for baseline_line, benchmark_line in zip(baseline_results, benchmark_results):
|
92
|
92
|
if baseline_line.startswith(' '):
|
93
|
|
- baseline_match = re.match(r' (.*\S)\s+(\d+\.\d+)\s', baseline_line)
|
|
93
|
+ baseline_match = re.match(r'\s+(.*?)\s+(\d+\.\d+)\s+ms\s+(\d+)\s', baseline_line)
|
94
|
94
|
|
95
|
|
- benchmark_match = re.match(r' (.*\S)\s+(\d+\.\d+)\s', benchmark_line)
|
|
95
|
+ benchmark_match = re.match(r'\s+(.*?)\s+(\d+\.\d+)\s+ms\s+(\d+)\s', benchmark_line)
|
96
|
96
|
|
97
|
97
|
if baseline_match and benchmark_match:
|
98
|
98
|
baseline_value = float(baseline_match.group(2))
|
... |
... |
@@ -100,11 +100,20 @@ with open(benchmark_html, 'w') as html_file: |
100
|
100
|
|
101
|
101
|
# Calculate the percentage difference
|
102
|
102
|
percentage_diff = ((baseline_value - benchmark_value) / baseline_value) * 100
|
|
103
|
+
|
|
104
|
+ baseline_n = baseline_match.group(3)
|
|
105
|
+ benchmark_n = benchmark_match.group(3)
|
|
106
|
+
|
|
107
|
+ if(baseline_n == benchmark_n):
|
|
108
|
+ total_n = baseline_n
|
|
109
|
+ else:
|
|
110
|
+ total_n = baseline_n + " / " + benchmark_n
|
|
111
|
+
|
103
|
112
|
|
104
|
113
|
if baseline_value > benchmark_value:
|
105
|
|
- html_file.write('<tr><td class="col1">{}</td><td class="lowlight">{:.2f}</td><td class="highlight">{:.2f}</td><td>{:.2f}</td></tr>\n'.format(baseline_match.group(1), baseline_value, benchmark_value, percentage_diff))
|
|
114
|
+ html_file.write('<tr><td class="col1">{}</td><td>{}</td><td class="lowlight">{:.2f}</td><td class="highlight">{:.2f}</td><td>{:.2f}</td></tr>\n'.format(baseline_match.group(1), total_n,baseline_value, benchmark_value, percentage_diff))
|
106
|
115
|
else:
|
107
|
|
- html_file.write('<tr><td class="col1">{}</td><td class="highlight">{:.2f}</td><td class="lowlight">{:.2f}</td><td>{:.2f}</td></tr>\n'.format(baseline_match.group(1), baseline_value, benchmark_value, percentage_diff))
|
|
116
|
+ html_file.write('<tr><td class="col1">{}</td><td>{}</td><td class="highlight">{:.2f}</td><td class="lowlight">{:.2f}</td><td>{:.2f}</td></tr>\n'.format(baseline_match.group(1), total_n,baseline_value, benchmark_value, percentage_diff))
|
108
|
117
|
|
109
|
118
|
html_file.write('</table><br/>\n')
|
110
|
119
|
|