Fix Benchmark json output for linux devices

For linux devices, there is some extra output from dex2oat when running the benchmarks.
The filtering we had in place was not taking this into account.
As a result, this output was interpreted as a valid benchmark result and
some erratic benchmark results were included in the json.
This patch changes the filtering to include only the lines which end with 'per
iteration'. These are the only lines which contain benchmark results and
which we are interested in.

Change-Id: I91f5898d08937b6eede077a8f6a037b5d67a8255

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/benchmarks/run.py b/tools/benchmarks/run.py
index 15efcb8..6e13fda 100755
--- a/tools/benchmarks/run.py
+++ b/tools/benchmarks/run.py
@@ -162,13 +162,13 @@ def RunBench(apk, classname,
 
         try:
             for line in outerr.rstrip().split("\n"):
+                if not line.endswith('per iteration'):
+                    continue
                 name = line.split(":")[0].rstrip()
-                # Ignore any java logging from --debug
-                if name not in ['INFO', 'DEBUG', 'ERROR']:
-                    score = float(line.split(":")[1].strip().split(" ")[0].strip())
-                    if name not in result:
-                        result[name] = list()
-                    result[name].append(score)
+                score = float(line.split(":")[1].strip().split(" ")[0].strip())
+                if name not in result:
+                    result[name] = list()
+                result[name].append(score)
         except Exception as e:
             utils.Warning(str(e) + "\n  \-> Error parsing output from %s", e)
             rc += 1