diff --git a/builds/testing.mk b/builds/testing.mk index e0fe0965e..2f0276b4a 100644 --- a/builds/testing.mk +++ b/builds/testing.mk @@ -26,7 +26,11 @@ $(FTBENCH_BIN): $(FTBENCH_SRC) | $(OBJ_DIR) baseline: $(FTBENCH_BIN) $(BASELINE_DIR) @echo "Creating baseline..." @$(foreach font, $(FONTS), \ - $(FTBENCH_BIN) $(FTBENCH_FLAG) $(font) > $(BASELINE_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Parameters: $(FTBENCH_FLAG)" > $(BASELINE_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Commit ID: `git rev-parse HEAD`" >> $(BASELINE_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Commit Date: `git show -s --format=%ci HEAD`" >> $(BASELINE_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Branch: `git rev-parse --abbrev-ref HEAD`" >> $(BASELINE_DIR)$(notdir $(font:.ttf=.txt)); \ + $(FTBENCH_BIN) $(FTBENCH_FLAG) $(font) >> $(BASELINE_DIR)$(notdir $(font:.ttf=.txt)); \ ) @echo "Baseline created." @@ -35,11 +39,16 @@ baseline: $(FTBENCH_BIN) $(BASELINE_DIR) benchmark: $(FTBENCH_BIN) $(BENCHMARK_DIR) @echo "Creating benchmark..." @$(foreach font, $(FONTS), \ - $(FTBENCH_BIN) $(FTBENCH_FLAG) $(font) > $(BENCHMARK_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Parameters: $(FTBENCH_FLAG)" > $(BENCHMARK_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Commit ID: `git rev-parse HEAD`" >> $(BENCHMARK_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Commit Date: `git show -s --format=%ci HEAD`" >> $(BENCHMARK_DIR)$(notdir $(font:.ttf=.txt)); \ + echo "Branch: `git rev-parse --abbrev-ref HEAD`" >> $(BENCHMARK_DIR)$(notdir $(font:.ttf=.txt)); \ + $(FTBENCH_BIN) $(FTBENCH_FLAG) $(font) >> $(BENCHMARK_DIR)$(notdir $(font:.ttf=.txt)); \ ) @$(PYTHON) $(HTMLCREATOR) @echo "Benchmark created." + .PHONY: clean-benchmark clean-benchmark: @echo "Cleaning..." diff --git a/src/tools/ftbench/src/tohtml.py b/src/tools/ftbench/src/tohtml.py index cd5c4ef51..49cbf4012 100644 --- a/src/tools/ftbench/src/tohtml.py +++ b/src/tools/ftbench/src/tohtml.py @@ -35,8 +35,14 @@ with open(benchmark_file, 'w') as f: f.write('\n') f.write('\n') + # Write the meta-data to the HTML file + f.write(f'\n') + f.write(f'\n') + f.write(f'\n') + f.write(f'\n') + # For each line in the baseline and benchmark files - for baseline_line, benchmark_line in zip(baseline_lines, benchmark_lines): + for baseline_line, benchmark_line in zip(baseline_lines[4:], benchmark_lines[4:]): # If the line starts with a space, it's a test result line if baseline_line.startswith(' '): # Extract the test name, the time per operation, and the number of operations done
TestBaselineBenchmark
Parameters{baseline_lines[0]}{benchmark_lines[0]}
Commit ID{baseline_lines[1]}{benchmark_lines[1]}
Commit Date{baseline_lines[2]}{benchmark_lines[2]}
Branch{baseline_lines[3]}{benchmark_lines[3]}