microbench: refactor printing results

Author: paugier

.gitignore

@@ -94,3 +94,5 @@ docs/_build/
 microbench/pixi.lock
 microbench/.venv_*
 microbench/tmp_*
+microbench/profile_alloc/log
+microbench/profile_alloc/*.prof*

microbench/Makefile

@@ -12,12 +12,12 @@ uninstall:
 	$(PYTHON) -m pip uninstall hpy.microbench --yes
 
 test:
-	$(PYTHON) -m pytest -v --purepy | tee tmp_results_$(shell $(PYTHON) -c "import sys; print(sys.implementation.name)").txt
+	$(PYTHON) -m pytest -v --purepy | tee $(shell $(PYTHON) -c 'import util as u; u.print_file_name_results()')
 
 bench: test
 
 bench_hpy:
-	$(PYTHON) -m pytest -v -m hpy | tee tmp_results_$(shell $(PYTHON) -c "import sys; print(sys.implementation.name)").txt
+	$(PYTHON) -m pytest -v -m hpy | tee $(shell $(PYTHON) get_file_name_results.py)
 
 clean:
 	rm -f src/*.so src/hpy_simple.py
@@ -39,19 +39,16 @@ create_venv_graalpy:
 	$(shell uv python find graalpy) -m venv .venv_graalpy
 
 print_cpy:
-	@echo =================================== CPython ====================================
-	@tail tmp_results_cpython.txt -n 32
+	@$(PYTHON) print_tmp_results.py cpy
 
 print_pypy:
-	@echo ==================================== PyPy ======================================
-	@tail tmp_results_pypy.txt -n 32
+	@$(PYTHON) print_tmp_results.py pypy
 
 print_graalpy:
-	@echo =================================== GraalPy ====================================
-	@tail tmp_results_graalpy.txt -n 32
+	@$(PYTHON) print_tmp_results.py graalpy
 
 print_pypy_vs_cpy:
-	@$(PYTHON) print_other_vs_cpy.py PyPy
+	@$(PYTHON) print_other_vs_cpy.py pypy
 
 print_graalpy_vs_cpy:
-	@$(PYTHON) print_other_vs_cpy.py GraalPy
+	@$(PYTHON) print_other_vs_cpy.py graalpy

microbench/conftest.py

@@ -1,9 +1,12 @@
 import re
 import time
+import sys
 from collections import defaultdict
 import pytest
 import _valgrind
 
+from util import get_short_prefix
+
 class Timer:
 
     def __init__(self, nodeid):
@@ -72,6 +75,9 @@ def format_ratio(self, reference, value):
     def display_summary(self, tr):
         w = tr.write_line
         w('')
+        tr.write_sep('=', "INFO", cyan=True)
+        w(f"implementation: {sys.implementation.name}")
+        w(f"short prefix: {get_short_prefix()}")
         tr.write_sep('=', 'BENCHMARKS', cyan=True)
         line = ' '*40 + '             cpy                    hpy'
         if 'purepy' in self.apis:

microbench/print_other_vs_cpy.py

@@ -1,14 +1,21 @@
+#!/usr/bin/env python3
 import sys
 
 from pathlib import Path
 
+from util import capitalize_implementation, info_from_path, print_sep
+
 try:
-    other = sys.argv[1]
+    arg = sys.argv[1]
 except IndexError:
-    other = "PyPy"
+    arg = "pypy"
+
+path_result_cpy = Path("tmp_results_cpy.txt")
+
+path_result_other = Path(arg)
 
-path_result_cpy = Path("tmp_results_cpython.txt")
-path_result_other = Path(f"tmp_results_{other.lower()}.txt")
+if not path_result_other.exists():
+    path_result_other = Path(f"tmp_results_{arg}.txt")
 
 assert path_result_cpy.exists()
 assert path_result_other.exists()
@@ -47,17 +54,24 @@ def data_from_path(path):
     return names, times_cpy, times_hpy
 
 
-names, times_cpy_cpy, times_cpy_hpy = data_from_path(path_result_cpy)
+info = info_from_path(path_result_other)
+
+implementation = info["implementation"]
+
+names_cpy, times_cpy_cpy, times_cpy_hpy = data_from_path(path_result_cpy)
 names, times_other_cpyext, times_other_hpy = data_from_path(path_result_other)
 
+assert names_cpy == names
+
 max_length_name = 45
 fmt_name = f"{{:{max_length_name}s}}"
 
-out = f" {other} / CPy native (time ratio, smaller is better) "
-num_chars = 81
-num_equals = (num_chars - len(out)) // 2
+print_sep(
+    f"{capitalize_implementation(implementation)} / CPy native (time ratio, smaller is better)"
+)
 
-print(num_equals * "=" + out + num_equals * "=")
+if info["short prefix"] != implementation:
+    print(f"short prefix: {info['short prefix']}")
 
 if times_other_cpyext:
     print(max_length_name * " " + "cpyext    HPy univ")

microbench/print_tmp_results.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+import sys
+
+from pathlib import Path
+
+import util
+
+try:
+    arg = sys.argv[1]
+except IndexError:
+    arg = "pypy"
+
+path_result = Path(arg)
+
+if not path_result.exists():
+    path_result = Path(f"tmp_results_{arg}.txt")
+
+assert path_result.exists()
+
+info = util.info_from_path(path_result)
+implementation = info["implementation"]
+
+util.print_sep(util.capitalize_implementation(implementation))
+if info["short prefix"] != implementation and info[
+    "short prefix"
+] != util.short_implementation(implementation):
+    print(f"short prefix: {info['short prefix']}")
+
+txt = path_result.read_text()
+_, txt = txt.split(
+    "================================== BENCHMARKS ==================================\n"
+)
+
+print(txt.rstrip())

microbench/util.py

@@ -0,0 +1,51 @@
+import sys
+
+from pathlib import Path
+
+
+def get_short_prefix():
+    prefix = Path(sys.prefix)
+    name = prefix.name
+    parts = [".", "venv", "_", "-"]
+    for part in parts:
+        if name.startswith(part):
+            name = name[len(part) :]
+    return name
+
+
+def info_from_path(path):
+    txt = path.read_text()
+    _, txt = txt.split(
+        "===================================== INFO ====================================="
+    )
+    txt, _ = txt.split(
+        "================================== BENCHMARKS =================================="
+    )
+    result = {}
+    for line in txt.splitlines():
+        if not line:
+            continue
+        left, right = line.split(":")
+        result[left] = right.strip()
+    return result
+
+
+def capitalize_implementation(implementation):
+    return implementation.capitalize().replace("py", "Py")
+
+
+def short_implementation(implementation):
+    if implementation == "cpython":
+        return "cpy"
+    return implementation
+
+
+def print_sep(out, sep_char="=", num_chars=81):
+    out = f" {out} "
+    num_sep_chars = (num_chars - len(out)) // 2
+    print(num_sep_chars * "=" + out + num_sep_chars * "=")
+
+
+def print_file_name_results():
+    name = f"tmp_results_{get_short_prefix()}.txt"
+    print(name)