| ... |
... |
@@ -55,6 +55,9 @@ def main(): |
|
55
|
55
|
|
|
56
|
56
|
generate_info_table(html_file, baseline_info, benchmark_info)
|
|
57
|
57
|
|
|
|
58
|
+ # Generate total results table
|
|
|
59
|
+ generate_total_results_table(html_file, BASELINE_DIR, BENCHMARK_DIR)
|
|
|
60
|
+
|
|
58
|
61
|
# Generate results tables
|
|
59
|
62
|
for filename in os.listdir(BASELINE_DIR):
|
|
60
|
63
|
if filename.endswith(".txt") and not filename == "info.txt":
|
| ... |
... |
@@ -64,6 +67,8 @@ def main(): |
|
64
|
67
|
generate_results_table(
|
|
65
|
68
|
html_file, baseline_results, benchmark_results, filename
|
|
66
|
69
|
)
|
|
|
70
|
+
|
|
|
71
|
+
|
|
67
|
72
|
write_to_html(html_file, "<center>Freetype Benchmark</center>\n")
|
|
68
|
73
|
write_to_html(html_file, "</body>\n</html>\n")
|
|
69
|
74
|
|
| ... |
... |
@@ -103,7 +108,95 @@ def generate_info_table(html_file, baseline_info, benchmark_info): |
|
103
|
108
|
),
|
|
104
|
109
|
)
|
|
105
|
110
|
write_to_html(html_file, "</table><br/>")
|
|
106
|
|
- write_to_html(html_file, "* Cumulative time for iterations which is better in smaller values<br/>\n")
|
|
|
111
|
+ write_to_html(html_file, "<p>* Average time for all iterations. Smaller values are better.</p>")
|
|
|
112
|
+ write_to_html(html_file, "<p>** N count in (x | y) format is for showing baseline and benchmark N counts seperately when they differs.</p>")
|
|
|
113
|
+
|
|
|
114
|
+
|
|
|
115
|
+def generate_total_results_table(html_file, baseline_dir, benchmark_dir):
|
|
|
116
|
+ """Prepare total results table for html"""
|
|
|
117
|
+
|
|
|
118
|
+ # This dictionary will store aggregated results.
|
|
|
119
|
+ test_results = {test: {"baseline": 0, "benchmark": 0, "n_baseline": 0, "n_benchmark": 0} for test in [
|
|
|
120
|
+ "Load", "Load_Advances (Normal)", "Load_Advances (Fast)", "Load_Advances (Unscaled)", "Render",
|
|
|
121
|
+ "Get_Glyph", "Get_Char_Index", "Iterate CMap", "New_Face", "Embolden", "Stroke", "Get_BBox",
|
|
|
122
|
+ "Get_CBox", "New_Face & load glyph(s)"
|
|
|
123
|
+ ]}
|
|
|
124
|
+
|
|
|
125
|
+ for filename in os.listdir(baseline_dir):
|
|
|
126
|
+ if filename.endswith(".txt") and not filename == "info.txt":
|
|
|
127
|
+
|
|
|
128
|
+ baseline_results = read_file(os.path.join(baseline_dir, filename))
|
|
|
129
|
+ benchmark_results = read_file(os.path.join(benchmark_dir, filename))
|
|
|
130
|
+
|
|
|
131
|
+ for baseline_line, benchmark_line in zip(baseline_results, benchmark_results):
|
|
|
132
|
+ if baseline_line.startswith(" "):
|
|
|
133
|
+ baseline_match = re.match(r"\s+(.*?)\s+(\d+\.\d+)\s+microseconds\s+(\d+)\s", baseline_line)
|
|
|
134
|
+ benchmark_match = re.match(r"\s+(.*?)\s+(\d+\.\d+)\s+microseconds\s+(\d+)\s", benchmark_line)
|
|
|
135
|
+
|
|
|
136
|
+ if baseline_match and benchmark_match:
|
|
|
137
|
+ test = baseline_match.group(1).strip()
|
|
|
138
|
+ baseline_value = float(baseline_match.group(2))
|
|
|
139
|
+ benchmark_value = float(benchmark_match.group(2))
|
|
|
140
|
+ baseline_n = int(baseline_match.group(3))
|
|
|
141
|
+ benchmark_n = int(benchmark_match.group(3))
|
|
|
142
|
+
|
|
|
143
|
+ # Aggregate the results
|
|
|
144
|
+ if test in test_results:
|
|
|
145
|
+ test_results[test]["baseline"] += baseline_value
|
|
|
146
|
+ test_results[test]["benchmark"] += benchmark_value
|
|
|
147
|
+ test_results[test]["n_baseline"] += baseline_n
|
|
|
148
|
+ test_results[test]["n_benchmark"] += benchmark_n
|
|
|
149
|
+
|
|
|
150
|
+ # Writing to HTML
|
|
|
151
|
+ write_to_html(html_file, "<h2>Total Results</h2>\n")
|
|
|
152
|
+ write_to_html(html_file, '<table border="1">\n')
|
|
|
153
|
+ write_to_html(
|
|
|
154
|
+ html_file,
|
|
|
155
|
+ '<tr><th>Test</th><th>N</th><th>Baseline (µs)</th>\
|
|
|
156
|
+ <th>Benchmark (µs)</th><th>Difference (%)</th></tr>\n'
|
|
|
157
|
+ )
|
|
|
158
|
+
|
|
|
159
|
+ total_baseline = total_benchmark = total_diff = total_n_baseline = total_n_benchmark = 0
|
|
|
160
|
+
|
|
|
161
|
+ for test, values in test_results.items():
|
|
|
162
|
+ baseline = values["baseline"]
|
|
|
163
|
+ benchmark = values["benchmark"]
|
|
|
164
|
+ n_baseline = values["n_baseline"]
|
|
|
165
|
+ n_benchmark = values["n_benchmark"]
|
|
|
166
|
+
|
|
|
167
|
+ n_display = f"{n_baseline} | {n_benchmark}" if n_baseline != n_benchmark else str(n_baseline)
|
|
|
168
|
+
|
|
|
169
|
+ diff = ((baseline - benchmark) / baseline) * 100
|
|
|
170
|
+
|
|
|
171
|
+ # Calculate for total row
|
|
|
172
|
+ total_baseline += baseline
|
|
|
173
|
+ total_benchmark += benchmark
|
|
|
174
|
+ total_n_baseline += n_baseline
|
|
|
175
|
+ total_n_benchmark += n_benchmark
|
|
|
176
|
+
|
|
|
177
|
+ # Check which value is smaller for color highlighting
|
|
|
178
|
+ baseline_color = "highlight" if baseline <= benchmark else ""
|
|
|
179
|
+ benchmark_color = "highlight" if benchmark <= baseline else ""
|
|
|
180
|
+
|
|
|
181
|
+ write_to_html(
|
|
|
182
|
+ html_file,
|
|
|
183
|
+ f'<tr><td class="col1">{test}</td><td>{n_display}</td>\
|
|
|
184
|
+ <td class="{baseline_color}">{baseline:.0f}</td>\
|
|
|
185
|
+ <td class="{benchmark_color}">{benchmark:.0f}</td><td>{diff:.1f}</td></tr>\n'
|
|
|
186
|
+ )
|
|
|
187
|
+
|
|
|
188
|
+ total_diff = ((total_baseline - total_benchmark) / total_baseline) * 100
|
|
|
189
|
+ total_n_display = f"{total_n_baseline} | {total_n_benchmark}" if total_n_baseline != total_n_benchmark else str(total_n_baseline)
|
|
|
190
|
+
|
|
|
191
|
+ write_to_html(
|
|
|
192
|
+ html_file,
|
|
|
193
|
+ f'<tr><td class="col1">TOTAL</td><td class="col1">{total_n_display}</td>\
|
|
|
194
|
+ <td class="col1">{total_baseline:.0f}</td><td class="col1">{total_benchmark:.0f}</td>\
|
|
|
195
|
+ <td class="col1">{total_diff:.1f}</td></tr>\n'
|
|
|
196
|
+ )
|
|
|
197
|
+
|
|
|
198
|
+ write_to_html(html_file, "</table><br/>\n")
|
|
|
199
|
+
|
|
107
|
200
|
|
|
108
|
201
|
|
|
109
|
202
|
def generate_results_table(html_file, baseline_results, benchmark_results, filename):
|
| ... |
... |
@@ -114,7 +207,7 @@ def generate_results_table(html_file, baseline_results, benchmark_results, filen |
|
114
|
207
|
if line.startswith("ftbench results for font")
|
|
115
|
208
|
][0]
|
|
116
|
209
|
|
|
117
|
|
- write_to_html(html_file, "<h2>Results for {}</h2>\n".format(fontname))
|
|
|
210
|
+ write_to_html(html_file, "<h3>Results for {}</h2>\n".format(fontname))
|
|
118
|
211
|
write_to_html(html_file, '<table border="1">\n')
|
|
119
|
212
|
write_to_html(
|
|
120
|
213
|
html_file,
|
| ... |
... |
@@ -185,7 +278,7 @@ def generate_results_table(html_file, baseline_results, benchmark_results, filen |
|
185
|
278
|
percentage_diff,
|
|
186
|
279
|
),
|
|
187
|
280
|
)
|
|
188
|
|
-
|
|
|
281
|
+
|
|
189
|
282
|
write_to_html(
|
|
190
|
283
|
html_file,
|
|
191
|
284
|
'<tr><td class="col1">TOTAL</td><td class="col1">{}</td>\
|