Changeset 179931 in webkit

Timestamp:

Feb 11, 2015, 9:11:22 AM (12 years ago)

Author:

Csaba Osztrogonác

Message:

run-jsc-stress tests should detect the number of processors on the remote machine too
​https://bugs.webkit.org/show_bug.cgi?id=141196

Reviewed by Darin Adler.

• Scripts/run-javascriptcore-tests:

(runJSCStressTests): Pass through the --child-processes argument.

• Scripts/run-jsc-stress-tests: Added determineNumberOfProcessors function

to detect the number of local and remote processors with the same algorithm.
Additionally introduced $numChildProcesses to emphasize it isn't necessarily
same as $numProcessors.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (4 diffs)
• Scripts/run-jsc-stress-tests (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-02-11  Csaba Osztrogonác  <ossy@webkit.org>
+
+        run-jsc-stress tests should detect the number of processors on the remote machine too
+        https://bugs.webkit.org/show_bug.cgi?id=141196
+
+        Reviewed by Darin Adler.
+
+        * Scripts/run-javascriptcore-tests:
+        (runJSCStressTests): Pass through the --child-processes argument.
+        * Scripts/run-jsc-stress-tests: Added determineNumberOfProcessors function
+        to detect the number of local and remote processors with the same algorithm.
+        Additionally introduced $numChildProcesses to emphasize it isn't necessarily
+        same as $numProcessors.
+
 2015-02-11  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -48 +48 @@
 my $extraTests;
 my $jsDriverArgs;
+my $childProcesses;
 
 my $buildJSC = 1;
@@ -81 +82 @@
   --remote=                     Run the JSC stress tests on the specified remote host. Implies --tarball.
   --extra-tests=                Path to a file containing extra tests
+  --child-processes=            Specify the number of child processes.
 
 EOF
@@ -94 +96 @@
     'tarball!' => \$createTarball,
     'remote=s' => \$remoteHost,
+    'child-processes=s' => \$childProcesses,
     'help' => \$showHelp
 );
@@ -277 +280 @@
         push(@jscStressDriverCmd, "--remote");
         push(@jscStressDriverCmd, $remoteHost);
+    }
+
+    if ($childProcesses) {
+        push(@jscStressDriverCmd, "--child-processes");
+        push(@jscStressDriverCmd, $childProcesses);
     }
 

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

@@ -88 +88 @@
 end
 
-begin
-    $numProcessors = `sysctl -n hw.activecpu 2>/dev/null`.to_i
-rescue
-    $numProcessors = 0
-end
-
-if $numProcessors == 0
-    $numProcessors = `nproc --all 2>/dev/null`.to_i
-end
-if $numProcessors == 0
-    $numProcessors = 1
-end
-
-if ENV["WEBKIT_TEST_CHILD_PROCESSES"]
-    $numProcessors = ENV["WEBKIT_TEST_CHILD_PROCESSES"].to_i
-end
 
 $jscPath = nil
@@ -200 +184 @@
         $remoteUser, $remoteHost, $remotePort = uri.user, uri.host, uri.port
     when '--child-processes'
-        $numProcessors = arg.to_i
+        $numChildProcesses = arg.to_i
     when '--arch'
         $architecture = arg
@@ -543 +527 @@
     $didAddRunCommand = true
     plan = Plan.new($benchmarkDirectory, command, baseOutputName(kind), outputHandler, errorHandler)
-    if $numProcessors > 1 and $runCommandOptions[:isSlow]
+    if $numChildProcesses > 1 and $runCommandOptions[:isSlow]
         $runlist.unshift plan
     else
@@ -1250 +1234 @@
 end
 
-if $enableFTL and ENV["JSC_timeout"]
-    # Currently, using the FTL is a performance regression particularly in real
-    # (i.e. non-loopy) benchmarks. Account for this in the timeout.
-    ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i * 2).to_s
-end
-
-if ENV["JSC_timeout"]
-    # 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
-end
     
 puts
@@ -1297 +1270 @@
     raise "#{$?}" unless $?.success?
     result
+end
+
+def runCommandOnTester(cmd)
+    if $remote
+        result = sshRead(cmd)
+    else
+        result = `#{cmd}`
+    end
+end
+
+def numberOfProcessors
+    begin
+        numProcessors = runCommandOnTester("sysctl -n hw.activecpu 2>/dev/null").to_i
+    rescue
+        numProcessors = 0
+    end
+
+    if numProcessors == 0
+        begin
+            numProcessors = runCommandOnTester("nproc --all 2>/dev/null").to_i
+        rescue
+            numProcessors == 0
+        end
+    end
+
+    if numProcessors == 0
+        numProcessors = 1
+    end
+    return numProcessors
 end
 
@@ -1390 +1392 @@
     raise if $remote
     Dir.chdir($runnerDir) {
-        runAndMonitorTestRunnerCommand("make", "-j", $numProcessors.to_s, "-s", "-f", "Makefile")
+        runAndMonitorTestRunnerCommand("make", "-j", $numChildProcesses.to_s, "-s", "-f", "Makefile")
     }
 end
@@ -1434 +1436 @@
 $outputDir = $outputDir.realpath
 $runnerDir = $outputDir + ".runner"
+
+if !$numChildProcesses
+    if ENV["WEBKIT_TEST_CHILD_PROCESSES"]
+        $numChildProcesses = ENV["WEBKIT_TEST_CHILD_PROCESSES"].to_i
+    else
+        $numChildProcesses = numberOfProcessors
+    end
+end
+
+if $enableFTL and ENV["JSC_timeout"]
+    # Currently, using the FTL is a performance regression particularly in real
+    # (i.e. non-loopy) benchmarks. Account for this in the timeout.
+    ENV["JSC_timeout"] = (ENV["JSC_timeout"].to_i * 2).to_s
+end
+
+if ENV["JSC_timeout"]
+    # 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($numChildProcesses)).to_i.to_s
+end
 
 def runBundle