[Truffle] Allow extra output in benchmark and print it on stderr.

jruby · Oct 6, 2016 · d5831a4 · d5831a4
1 parent b756ba6
commit d5831a4
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/mx.jruby/mx_jruby.py b/mx.jruby/mx_jruby.py
@@ -456,6 +456,17 @@ def time(self):
     def directory(self):
         return self.name()
 
+    def filterLines(self, lines):
+        data = []
+        for line in lines:
+            try:
+                data.append(float(line))
+            except ValueError:
+                log(line)
+        if data.size % 2 != 0:
+            raise AssertionError("Odd number of values")
+        return data
+
     def runBenchmark(self, benchmark, bmSuiteArgs):
         arguments = ['benchmark']
         if 'MX_NO_GRAAL' in os.environ:
@@ -478,9 +489,9 @@ def runBenchmark(self, benchmark, bmSuiteArgs):
 
         if jt(arguments, out=out, nonZeroIsFatal=False) == 0:
             lines = out.data.split('\n')[1:-1]
-            
+
             if lines[-1] == 'optimised away':
-                data = [float(s) for s in lines[0:-2]]
+                data = self.filterLines(lines)
                 elapsed = [d for n, d in enumerate(data) if n % 2 == 0]
                 samples = [d for n, d in enumerate(data) if n % 2 == 1]
 
@@ -507,7 +518,7 @@ def runBenchmark(self, benchmark, bmSuiteArgs):
                     'extra.error': 'optimised away'
                 }]
             else:
-                data = [float(s) for s in lines]
+                data = self.filterLines(lines)
                 elapsed = [d for n, d in enumerate(data) if n % 2 == 0]
                 samples = [d for n, d in enumerate(data) if n % 2 == 1]