Modified: trunk/Tools/ChangeLog (181763 => 181764)
--- trunk/Tools/ChangeLog 2015-03-19 22:39:55 UTC (rev 181763)
+++ trunk/Tools/ChangeLog 2015-03-19 22:46:56 UTC (rev 181764)
@@ -1,3 +1,14 @@
+2015-03-19 Ryosuke Niwa <[email protected]>
+
+ run-jsc-benchmarks should only report preferred mean
+ https://bugs.webkit.org/show_bug.cgi?id=142874
+
+ Reviewed by Geoffrey Garen.
+
+ Just collect statistics for the preferred mean.
+
+ * Scripts/run-jsc-benchmarks:
+
2015-03-19 Alex Christensen <[email protected]>
[Content Extensions] Test regular _expression_ parse failures.
Modified: trunk/Tools/Scripts/run-jsc-benchmarks (181763 => 181764)
--- trunk/Tools/Scripts/run-jsc-benchmarks 2015-03-19 22:39:55 UTC (rev 181763)
+++ trunk/Tools/Scripts/run-jsc-benchmarks 2015-03-19 22:46:56 UTC (rev 181764)
@@ -2471,7 +2471,7 @@
outp.puts createVMsString
end
- def summaryStats(outp, json, jsonKey, accumulators, name, decimalShift, &proc)
+ def summaryStats(outp, json, accumulators, name, decimalShift, &proc)
resultingJson = {}
outp.print " " if $allSuites.size > 1
outp.print rpad(name, $benchpad + $weightpad)
@@ -2488,32 +2488,15 @@
outp.print(" "+accumulators[-1].stats(&proc).compareTo(accumulators[0].stats(&proc)).longForm)
end
outp.puts
- json[jsonKey] = resultingJson
+ json[name] = resultingJson
end
-
- def meanName(currentMean, preferredMean)
- result = "<#{currentMean}>"
- if "#{currentMean}Mean" == preferredMean.to_s
- result += " *"
- end
- result
- end
-
+
def allSummaryStats(outp, json, accumulators, preferredMean, decimalShift)
- summaryStats(outp, json, "<arithmetic>", accumulators, meanName("arithmetic", preferredMean), decimalShift) {
+ meanLabel = '<' + preferredMean.to_s.sub(/Mean$/, '') + '>'
+ summaryStats(outp, json, accumulators, meanLabel, decimalShift) {
| stat |
- stat.arithmeticMean
+ stat.send(preferredMean)
}
-
- summaryStats(outp, json, "<geometric>", accumulators, meanName("geometric", preferredMean), decimalShift) {
- | stat |
- stat.geometricMean
- }
-
- summaryStats(outp, json, "<harmonic>", accumulators, meanName("harmonic", preferredMean), decimalShift) {
- | stat |
- stat.harmonicMean
- }
end
$suites.each {
