Fix JSBench which causes math domain error in run-benchmark script.

https://bugs.webkit.org/show_bug.cgi?id=157697
<rdar://problem/26279292>

Reviewed by Ryosuke Niwa.

Some tests of JSBench give time usage to be 0 ms which will causes error while calculating geometric mean.
Also fix a round-off error while calculating stdev.

* Scripts/webkitpy/benchmark_runner/benchmark_results.py:
(BenchmarkResults._format_values):
* Scripts/webkitpy/benchmark_runner/data/patches/JSBench.patch:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@200914 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 582ed6c8783488aead6e39efce496bad5c41fb4c..408beab26ed566eeaa666d5ed39c0ca7357d2b8f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2016-05-13  Dewei Zhu  <dewei_zhu@apple.com>
+
+        Fix JSBench which causes math domain error in run-benchmark script.
+        https://bugs.webkit.org/show_bug.cgi?id=157697
+        <rdar://problem/26279292>
+
+        Reviewed by Ryosuke Niwa.
+
+        Some tests of JSBench give time usage to be 0 ms which will causes error while calculating geometric mean.
+        Also fix a round-off error while calculating stdev.
+
+        * Scripts/webkitpy/benchmark_runner/benchmark_results.py:
+        (BenchmarkResults._format_values):
+        * Scripts/webkitpy/benchmark_runner/data/patches/JSBench.patch:
+
 2016-05-13  Brady Eidson  <beidson@apple.com>
 
         Extend protector naming code style guideline to cover operator= assignment.

diff --git a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py
index 018e5b446b6d1759674ca7c1f8d892aee57e5973..3fc4fa62f7337ff0139e4b28709296e914ae59c5 100644 (file)
--- a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py
+++ b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py
@@ -89,7 +89,8 @@ class BenchmarkResults(object):
         if sample_count <= 1:
             sample_stdev = 0
         else:
-            sample_stdev = math.sqrt(square_sum / (sample_count - 1) - total * total / (sample_count - 1) / sample_count)
+            # Be careful about round-off error when sample_stdev is 0.
+            sample_stdev = math.sqrt(max(0, square_sum / (sample_count - 1) - total * total / (sample_count - 1) / sample_count))
 
         unit = cls._unit_from_metric(metric_name)
 

diff --git a/Tools/Scripts/webkitpy/benchmark_runner/data/patches/JSBench.patch b/Tools/Scripts/webkitpy/benchmark_runner/data/patches/JSBench.patch
index ff3faf0e9c581eb3ad80232e2741b40c7f2b7f08..26a6f43eaf003a8aa6d9b01db2e46d0e98e8e034 100644 (file)
--- a/Tools/Scripts/webkitpy/benchmark_runner/data/patches/JSBench.patch
+++ b/Tools/Scripts/webkitpy/benchmark_runner/data/patches/JSBench.patch
@@ -24,7 +24,7 @@ index 4b9d269..876fddd 100644
                  if (bmresults.length == 0) continue;
  
 +                if (pr)
-+                    tests[benchmark] = {'metrics': {'Time': {'current': bmresults}}};
++                    tests[benchmark] = {'metrics': {'Time': {'current': bmresults.map(function (value) { return value || 1; })}}};
 +
                  // get the raw results
                  var rr = spc2 + mode + ": [";