fix another case of pypy results parsing

Author: timfel

mx.graalpython/mx_graalpython_python_benchmarks.py

@@ -308,7 +308,13 @@ def parse(self, text: str) -> dict:
 
             for result in js["results"]:
                 name = result[0]
-                values = result[2]["base_times"]
+                if result[1] == "RawResult":
+                    values = result[2]["base_times"]
+                elif result[1] == "SimpleComparisonResult":
+                    values = [result[2]["base_time"]]
+                else:
+                    mx.warn(f"No data found for {name} with {result[1]}")
+                    continue
                 for iteration, value in enumerate(values):
                     r.append(
                         {

mx.graalpython/test_json_parsing.py

@@ -170,6 +170,28 @@ def test_pypy_results_parsing(self):
 
         self.assertEqual(len(results), 100, "should have 2*50 peak values")
 
+    def test_pypy_results_parsing2(self):
+        import mx
+        import mx_graalpython_python_benchmarks
+        from mx_graalpython_python_benchmarks import PyPyJsonRule
+
+        rule = PyPyJsonRule("", "pypy")
+
+        with mock.patch('mx_graalpython_python_benchmarks.open', mock.mock_open(read_data=PYPY_JSON2)):
+            results = rule.parse("ignored")
+
+        for result in results:
+            self.assertEqual(result["bench-suite"], "pypy")
+            self.assertIn(result["benchmark"], ["scimark_fft"])
+            self.assertIn(result["metric.name"], ["time"])
+            self.assertIn(result["metric.unit"], ["s"])
+            self.assertEqual(result["metric.score-function"], "id")
+            self.assertEqual(result["metric.type"], "numeric")
+            self.assertIsInstance(result["metric.value"], float)
+            self.assertIsInstance(result["metric.iteration"], int)
+
+        self.assertEqual(len(results), 1, "just 1 value expected")
+
 
 if __name__ == '__main__':
     unittest.main()

mx.graalpython/test_json_parsing_data.py

@@ -58,3 +58,22 @@
 
 PYPY_JSON = """{"revision":null,"results":[["ai","RawResult",{"base_times":[0.1217505931854248,0.11989736557006836,0.12207770347595215,0.1212611198425293,0.12156319618225098,0.12146615982055664,0.12032508850097656,0.1202230453491211,0.12592768669128418,0.13594508171081543,0.122528076171875,0.1665651798248291,0.1241462230682373,0.12212920188903809,0.12382888793945312,0.12459158897399902,0.122039794921875,0.13077545166015625,0.12950801849365234,0.1267859935760498,0.12106966972351074,0.1210174560546875,0.12207388877868652,0.14129161834716797,0.13507962226867676,0.14200639724731445,0.11904263496398926,0.11947965621948242,0.12305212020874023,0.1311967372894287,0.12037253379821777,0.14057588577270508,0.14170050621032715,0.12280845642089844,0.11976122856140137,0.12080550193786621,0.12368440628051758,0.12019705772399902,0.11932086944580078,0.14517879486083984,0.1198279857635498,0.11819911003112793,0.11786103248596191,0.1181638240814209,0.11869239807128906,0.11780905723571777,0.1181485652923584,0.11883139610290527,0.1194918155670166,0.11823678016662598],"changed_times":[0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001]}],["deltablue","RawResult",{"base_times":[0.026775598526000977,0.026055097579956055,0.02671957015991211,0.022783279418945312,0.02802562713623047,0.026577234268188477,0.035811662673950195,0.01685333251953125,0.03618144989013672,0.013469457626342773,0.013250112533569336,0.0172579288482666,0.0043566226959228516,0.010727643966674805,0.03354144096374512,0.002112865447998047,0.002906322479248047,0.002869844436645508,0.002597808837890625,0.0019690990447998047,0.001994609832763672,0.0019328594207763672,0.012478828430175781,0.0018014907836914062,0.0017092227935791016,0.02298450469970703,0.0014376640319824219,0.002154827117919922,0.0023458003997802734,0.0013427734375,0.0012488365173339844,0.0012402534484863281,0.001291513442993164,0.0031270980834960938,0.0015931129455566406,0.001474618911743164,0.0013575553894042969,0.0013427734375,0.0013327598571777344,0.001308441162109375,0.0013232231140136719,0.0019099712371826172,0.0013327598571777344,0.001382589340209961,0.0025641918182373047,0.002003908157348633,0.0012929439544677734,0.0015599727630615234,0.0013189315795898438,0.0012421607971191406],"changed_times":[0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001]}]],"options":"","branch":"default"}
 """
+
+
+PYPY_JSON2 = """{
+  "revision": null,
+  "results": [
+    [
+      "scimark_fft",
+      "SimpleComparisonResult",
+      {
+        "base_time": 0.17319999694824217,
+        "changed_time": -1,
+        "time_delta": -1
+      }
+    ]
+  ],
+  "options": "",
+  "branch": "default"
+}
+"""