Changeset 157887 in webkit

Timestamp:

Oct 23, 2013 2:15:50 PM (10 years ago)

Author:

fpizlo@apple.com

Message:

Have a way of dealing with slow tests in run-jsc-stress-tests
​https://bugs.webkit.org/show_bug.cgi?id=123221

Tools:

Reviewed by Mark Hahnenberg.

If you add the slow! command to @ then all subsequent plans are prepended to the run list
rather than appended to it. This means that slow tests get queued up first and are less likely
to block completion.

• Scripts/run-jsc-stress-tests:

LayoutTests:

Reviewed by Mark Hahnenberg.

• js/regress/script-tests/stepanov_container.js: This test is slow!

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/regress/script-tests/stepanov_container.js (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-jsc-stress-tests (modified) (8 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-23  Filip Pizlo  <fpizlo@apple.com>
+
+        Have a way of dealing with slow tests in run-jsc-stress-tests
+        https://bugs.webkit.org/show_bug.cgi?id=123221
+
+        Reviewed by Mark Hahnenberg.
+        
+        * js/regress/script-tests/stepanov_container.js: This test is slow!
+
 2013-10-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/js/regress/script-tests/stepanov_container.js

@@ +1 @@
+//@ slow!
 //@ runDefault
 //@ runDefaultFTL if $enableFTL

trunk/Tools/ChangeLog

@@ +1 @@
+2013-10-23  Filip Pizlo  <fpizlo@apple.com>
+
+        Have a way of dealing with slow tests in run-jsc-stress-tests
+        https://bugs.webkit.org/show_bug.cgi?id=123221
+
+        Reviewed by Mark Hahnenberg.
+        
+        If you add the slow! command to //@ then all subsequent plans are prepended to the run list
+        rather than appended to it. This means that slow tests get queued up first and are less likely
+        to block completion.
+
+        * Scripts/run-jsc-stress-tests:
+
 2013-10-23  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/Scripts/run-jsc-stress-tests

@@ -72 +72 @@
 end
 
-numProcessors = `sysctl -n hw.availcpu`.to_i
-if numProcessors == 0
-    numProcessors = `nproc --all 2>/dev/null`.to_i
-end
-if numProcessors == 0
-    numProcessors = 1
+$numProcessors = `sysctl -n hw.availcpu`.to_i
+if $numProcessors == 0
+    $numProcessors = `nproc --all 2>/dev/null`.to_i
+end
+if $numProcessors == 0
+    $numProcessors = 1
 end
 
@@ -270 +270 @@
 end
 
+$runCommandOptions = {}
+
 class Plan
     attr_reader :directory, :arguments, :name, :outputHandler, :errorHandler
@@ -280 +282 @@
         @outputHandler = outputHandler
         @errorHandler = errorHandler
+        @isSlow = !!$runCommandOptions[:isSlow]
     end
     
@@ -347 +350 @@
 
 def addRunCommand(kind, command, outputHandler, errorHandler)
-    $runlist << Plan.new($benchmarkDirectory, command, baseOutputName(kind), outputHandler, errorHandler)
+    plan = Plan.new($benchmarkDirectory, command, baseOutputName(kind), outputHandler, errorHandler)
+    if $numProcessors > 1 and $runCommandOptions[:isSlow]
+        $runlist.unshift plan
+    else
+        $runlist << plan
+    end
 end
 
@@ -355 +363 @@
 def parseRunCommands
     didRun = false
+    $runCommandOptions = {}
     File.open($benchmarkDirectory + $benchmark) {
         | inp |
@@ -372 +381 @@
     }
     didRun
+end
+
+def slow!
+    $runCommandOptions[:isSlow] = true
 end
 
@@ -660 +673 @@
     # In the worst case, the processors just interfere with each other.
     # Increase the timeout proportionally to the number of processors.
-    ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i.to_f * Math.sqrt(numProcessors)).to_i.to_s
+    ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i.to_f * Math.sqrt($numProcessors)).to_i.to_s
 end
 
@@ -741 +754 @@
 Dir.chdir(parallelDir) {
     unless $progressMeter
-        mysys("make", "-j", numProcessors.to_s, "-s", "-f", "Makefile")
+        mysys("make", "-j", $numProcessors.to_s, "-s", "-f", "Makefile")
     else
-        cmd = "make -j #{numProcessors} -s -f Makefile"
+        cmd = "make -j #{$numProcessors} -s -f Makefile"
         running = {}
         didRun = {}