[GR-33621] Record the execution time of each iteration.

PullRequest: graal/9726

Author: ansalond

vm/mx.vm/mx_vm_benchmark.py

@@ -820,7 +820,7 @@ def __call__(self, *args, **kwargs):
         ]
 
 
-class AgentScriptJsBenchmarkSuite(mx_benchmark.VmBenchmarkSuite):
+class AgentScriptJsBenchmarkSuite(mx_benchmark.VmBenchmarkSuite, mx_benchmark.AveragingBenchmarkMixin):
     def __init__(self):
         super(AgentScriptJsBenchmarkSuite, self).__init__()
         self._benchmarks = {
@@ -862,10 +862,10 @@ def successPatterns(self):
     def rules(self, out, benchmarks, bmSuiteArgs):
         assert len(benchmarks) == 1
         return [
-            mx_benchmark.StdOutRule(r'^Hundred thousand prime numbers in (?P<time>[0-9]+) ms\n$', {
+            mx_benchmark.StdOutRule(r'^Hundred thousand prime numbers in (?P<time>[0-9]+) ms$', {
                 "bench-suite": self.name(),
                 "benchmark": (benchmarks[0], str),
-                "metric.name": "time",
+                "metric.name": "warmup",
                 "metric.type": "numeric",
                 "metric.unit": "ms",
                 "metric.value": ("<time>", int),
@@ -891,6 +891,11 @@ def createVmCommandLineArgs(self, benchmarks, runArgs):
     def get_vm_registry(self):
         return mx_benchmark.js_vm_registry
 
+    def run(self, benchmarks, bmSuiteArgs):
+        results = super(AgentScriptJsBenchmarkSuite, self).run(benchmarks, bmSuiteArgs)
+        self.addAverageAcrossLatestResults(results)
+        return results
+
 
 class ExcludeWarmupRule(mx_benchmark.StdOutRule):
     """Rule that behaves as the StdOutRule, but skips input until a certain pattern."""