From fae5e8c941a2ab051dbb1c56e6190dbd0f3791f9 Mon Sep 17 00:00:00 2001 From: goksu <25721443+goeksu@users.noreply.github.com> Date: Tue, 1 Aug 2023 17:37:55 +0300 Subject: [PATCH] little fixes --- builds/testing.mk | 6 +++--- src/tools/ftbench/src/tohtml.py | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/builds/testing.mk b/builds/testing.mk index 9a22d3fd4..27181af60 100644 --- a/builds/testing.mk +++ b/builds/testing.mk @@ -3,7 +3,7 @@ FTBENCH_DIR = $(TOP_DIR)/src/tools/ftbench FTBENCH_SRC = $(FTBENCH_DIR)/ftbench.c FTBENCH_OBJ = $(OBJ_DIR)/bench.$(SO) FTBENCH_BIN = $(OBJ_DIR)/bench$E -FTBENCH_FLAG ?= -c 500 +FTBENCH_FLAG ?= -c 100 INCLUDES = $(TOP_DIR)/include FONTS = $(wildcard $(FTBENCH_DIR)/fonts/*.ttf) BASELINE_DIR = $(OBJ_DIR)/baseline/ @@ -100,7 +100,7 @@ baseline: $(FTBENCH_BIN) $(BASELINE_DIR) printf "\rProcessing %d%%..." $$percent; \ $(FTBENCH_BIN) $(FTBENCH_FLAG) "$$font" > $(BASELINE_DIR)$$(basename $$font .ttf).txt; \ done - @echo "\nBaseline created." + @echo "Baseline created." # Benchmark and compare to baseline .PHONY: benchmark @@ -121,7 +121,7 @@ benchmark: $(FTBENCH_BIN) $(BENCHMARK_DIR) $(FTBENCH_BIN) $(FTBENCH_FLAG) "$$font" > $(BENCHMARK_DIR)$$(basename $$font .ttf).txt; \ done @$(PYTHON) $(HTMLCREATOR) $(OBJ_DIR) - @echo "\nBenchmark created." + @echo "Benchmark results created in file: $(HTMLFILE)" .PHONY: clean-benchmark clean-benchmark: diff --git a/src/tools/ftbench/src/tohtml.py b/src/tools/ftbench/src/tohtml.py index 2f91b63f1..85e221a24 100644 --- a/src/tools/ftbench/src/tohtml.py +++ b/src/tools/ftbench/src/tohtml.py @@ -42,6 +42,7 @@ def main(): write_to_html(html_file, "\n\n") write_to_html(html_file, CSS_STYLE) write_to_html(html_file, "\n\n") + write_to_html(html_file, "

Freetype Benchmark Results

\n") baseline_info = parse_info_file(os.path.join(BASELINE_DIR, "info.txt")) benchmark_info = parse_info_file(os.path.join(BENCHMARK_DIR, "info.txt")) @@ -49,7 +50,7 @@ def main(): if baseline_info[1].strip() == benchmark_info[1].strip(): write_to_html( html_file, - '

Warning: Baseline and Benchmark have the same commit ID

\n', + '

Warning: Baseline and Benchmark have the same commit ID!

\n', ) generate_info_table(html_file, baseline_info, benchmark_info) @@ -63,7 +64,7 @@ def main(): generate_results_table( html_file, baseline_results, benchmark_results, filename ) - + write_to_html(html_file, "
Freetype Benchmark
\n") write_to_html(html_file, "\n\n") def write_to_html(html_file, content): @@ -102,7 +103,7 @@ def generate_info_table(html_file, baseline_info, benchmark_info): ), ) write_to_html(html_file, "
") - write_to_html(html_file, "*Smaller values mean faster operation
\n") + write_to_html(html_file, "* Smaller values mean faster operation
\n") def generate_results_table(html_file, baseline_results, benchmark_results, filename): @@ -118,8 +119,8 @@ def generate_results_table(html_file, baseline_results, benchmark_results, filen write_to_html( html_file, 'TestN\ - Baseline (ms)\ - Benchmark (ms)\ + * Baseline (ms)\ + * Benchmark (ms)\ Difference (%)\n'.format( os.path.join(BASELINE_DIR, filename[:-4]), os.path.join(BENCHMARK_DIR, filename[:-4]), @@ -151,7 +152,7 @@ def generate_results_table(html_file, baseline_results, benchmark_results, filen n = ( baseline_n if baseline_n == benchmark_n - else baseline_n + " / " + benchmark_n + else baseline_n + " | " + benchmark_n ) total_n += int(baseline_n)