Merge pull request #312 from faster-cpython/fix-latest-pystats

Fix determination of latest pystats

Author: mdboom

bench_runner/result.py

@@ -148,7 +148,8 @@ def _generate_contents(self) -> str:
         )
         fd.write("\n")
         fd.write(
-            f"- Geometric mean (including insignificant results): {self._calculate_geometric_mean()}"
+            "- Geometric mean (including insignificant results): "
+            f"{self._calculate_geometric_mean()}"
         )
         fd.write("\n\n")
         fd.write(hpt.make_report(self.ref.filename, self.head.filename))

bench_runner/scripts/generate_results.py

@@ -176,12 +176,12 @@ def get_most_recent_pystats(results: Iterable[Result]) -> Result | None:
         for result in results
         if result.result_info == ("pystats raw", None, None)
         and result.fork == "python"
-        and result.flags == ["PYTHON_UOPS"]
+        and result.flags in (["PYTHON_UOPS"], ["JIT"])
     ]
     if len(candidate_pystats):
         return sorted(
             candidate_pystats,
-            key=lambda x: x.commit_datetime,
+            key=lambda x: (x.parsed_version, x.commit_datetime),
             reverse=True,
         )[0]