Changeset 223956 in webkit

Timestamp:

Oct 25, 2017 9:58:57 AM (7 years ago)

Author:

rmorisset@apple.com

Message:

Support the TailBench9000 benchmark in run-jsc-benchmarks
​https://bugs.webkit.org/show_bug.cgi?id=178451

Reviewed by Saam Barati.

PerformanceTests:

The separation between the definition of the benchmarks (in merge-sort.js and n-body.js) and their loops (in *-run.js)
was causing trouble since the load of the js files only succeeded from the same directory. So I chose to merge them, following
the example of the other benchmarks.

• TailBench9000/merge-sort-run.js: Removed.
• TailBench9000/merge-sort.js:
• TailBench9000/n-body-run.js: Removed.
• TailBench9000/n-body.js:

Tools:

• Scripts/run-jsc-benchmarks:

Location:

trunk

Files:

• PerformanceTests/ChangeLog (modified) (1 diff)
• PerformanceTests/TailBench9000/merge-sort-run.js (deleted)
• PerformanceTests/TailBench9000/merge-sort.js (modified) (1 diff)
• PerformanceTests/TailBench9000/n-body-run.js (deleted)
• PerformanceTests/TailBench9000/n-body.js (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-jsc-benchmarks (modified) (9 diffs)

trunk/PerformanceTests/ChangeLog

@@ +1 @@
+2017-10-25  Robin Morisset  <rmorisset@apple.com>
+
+        Support the TailBench9000 benchmark in run-jsc-benchmarks
+        https://bugs.webkit.org/show_bug.cgi?id=178451
+
+        Reviewed by Saam Barati.
+
+        The separation between the definition of the benchmarks (in merge-sort.js and n-body.js) and their loops (in *-run.js)
+        was causing trouble since the load of the js files only succeeded from the same directory. So I chose to merge them, following
+        the example of the other benchmarks.
+
+        * TailBench9000/merge-sort-run.js: Removed.
+        * TailBench9000/merge-sort.js:
+        * TailBench9000/n-body-run.js: Removed.
+        * TailBench9000/n-body.js:
+
 2017-10-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/PerformanceTests/TailBench9000/merge-sort.js

@@ -153 +153 @@
     test(0);
 }
+
+for (var i = 0; i < 3000; ++i)
+    TEST_mergeSort();

trunk/PerformanceTests/TailBench9000/n-body.js

@@ -236 +236 @@
         throw "ERROR: bad result: expected " + expected + " but got " + ret;
 }
+
+for (var i = 0; i < 300; ++i)
+    TEST_nBody();

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-25  Robin Morisset  <rmorisset@apple.com>
+
+        Support the TailBench9000 benchmark in run-jsc-benchmarks
+        https://bugs.webkit.org/show_bug.cgi?id=178451
+
+        Reviewed by Saam Barati.
+
+        * Scripts/run-jsc-benchmarks:
+
 2017-10-25  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Tools/Scripts/run-jsc-benchmarks

@@ -49 +49 @@
 LONGSPIDER_PATH = PERFORMANCETESTS_PATH + "LongSpider"
 V8_PATH = PERFORMANCETESTS_PATH + "SunSpider" + "tests" + "v8-v6"
+TAILBENCH_PATH = PERFORMANCETESTS_PATH + "TailBench9000"
 MICROBENCHMARKS_PATH = OPENSOURCE_PATH + "JSTests" + "microbenchmarks"
 OCTANE_WRAPPER_PATH = PERFORMANCETESTS_PATH + "Octane" + "wrappers"
@@ -227 +228 @@
 $includeCompressionBench = true
 $includeSixSpeed = true
+$includeTailBench = true
 $measureGC=false
 $benchmarkPattern=nil
@@ -318 +320 @@
   puts "--browsermark-dom    Only run browsermark-dom."
   puts "--octane             Only run Octane."
+  puts "--tail-bench         Only run TailBench"
   puts "--compression-bench  Only run compression bench"
   puts "                     The default is to run all benchmarks. The above options can"
@@ -1625 +1628 @@
 end
 
+class TailBenchBenchmark
+  include Benchmark
+
+  def initialize(name)
+    @name = name
+  end
+
+  def emitRunCode(plan)
+    emitBenchRunCode(fullname, plan, SingleFileTimedBenchmarkParameters.new(ensureFile("TailBench-#{@name}", "#{TAILBENCH_PATH}/#{@name}.js")))
+  end
+end
+
 class MicrobenchmarksBenchmark
   include Benchmark
@@ -2672 +2687 @@
       $includeCompressionBench = false
       $includeSixSpeed = false
+      $includeTailBench = false;
       $sawBenchOptions = true
     end
@@ -2697 +2713 @@
                  ['--compression-bench', GetoptLong::NO_ARGUMENT],
                  ['--six-speed', GetoptLong::NO_ARGUMENT],
+                 ['--tail-bench', GetoptLong::NO_ARGUMENT],
                  ['--benchmarks', GetoptLong::REQUIRED_ARGUMENT],
                  ['--measure-gc', GetoptLong::OPTIONAL_ARGUMENT],
@@ -2776 +2793 @@
       resetBenchOptionsIfNecessary
       $includeJSBench = true
+    when '--tail-bench'
+      resetBenchOptionsIfNecessary
+      $includeTailBench = true
     when '--microbenchmarks'
       resetBenchOptionsIfNecessary
@@ -3016 +3036 @@
     JSBENCH.add JSBenchBenchmark.new(*nameAndMode)
   }
-  
+
+  TAILBENCH = BenchmarkSuite.new("TailBench", :geometricMean, 0)
+  ["n-body", "merge-sort"].each {
+    | name |
+    TAILBENCH.add TailBenchBenchmark.new(name);
+  }
+
   MICROBENCHMARKS = BenchmarkSuite.new("Microbenchmarks", :geometricMean, 0)
   Dir.foreach(MICROBENCHMARKS_PATH) {
@@ -3155 +3181 @@
   end
   
+  if $includeTailBench and not TAILBENCH.empty?
+    $suites << TAILBENCH
+  end
+
   if $includeMicrobenchmarks and not MICROBENCHMARKS.empty?
     $suites << MICROBENCHMARKS
   end
-  
+
   if $includeAsmBench and not ASMBENCH.empty?
     if ASMBENCH_PATH