SunSpider:

        Reviewed by Maciej.

        * sunspider: Added --shark20 option, to run Shark at its highest sample
        resolution instead of its default.

WebKitTools:

        Reviewed by Maciej.

        * Scripts/run-sunspider: Added --shark20 option, to run Shark at its highest sample
        resolution instead of its default.

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

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 3722780..5e98ad5 100644 (file)
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        * sunspider: Added --shark20 option, to run Shark at its highest sample
+        resolution instead of its default.
+
 2007-10-28  Adam Roben  <aroben@apple.com>
 
         Fix SunSpider on Windows

diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 636ed6c..82ca911 100755 (executable)
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -32,6 +32,7 @@ use POSIX qw(strftime);
 
 my $showHelp = 0;
 my $runShark = 0;
+my $runShark20 = 0;
 my $jsShellPath;
 my $testsPattern;
 my $testRuns = 5; # This number may be different from what ./sunspider defaults to (that's OK)
@@ -40,18 +41,21 @@ my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName --shell=[path] [options]
   --help        Show this help message
-  --shell       Path to javascript shell
+  --shell       Path to JavaScript shell
   --runs        Number of times to run tests (default: $testRuns)
   --tests       Only run tests matching provided pattern
   --shark       Sample with the Mac OS X "Shark" performance testing tool (implies --runs=1)
+  --shark20     Like --shark, but with a 20 microsecond sampling interval
 EOF
 
 GetOptions('runs=i' => \$testRuns,
            'shell=s' => \$jsShellPath,
            'shark' => \$runShark,
+           'shark20' => \$runShark20,
            'tests=s' => \$testsPattern,
            'help' => \$showHelp);
 
+$runShark = 20 if $runShark20;
 $testRuns = 1 if $runShark;
 
 if (!$jsShellPath || $showHelp) {
@@ -108,7 +112,8 @@ sub runTestsOnce($)
     my $shellArgs = "-f $prefixFile -f resources/sunspider-standalone-driver.js 2> /dev/null";
     my $output;
     if ($useShark) {
-        $output = `shark -i -1 -q "$jsShellPath" $shellArgs`;
+        my $intervalArg = $useShark == 20 ? "-I 20u" : "";
+        $output = `shark $intervalArg -i -1-q "$jsShellPath" $shellArgs`;
     } else {
         $output = `"$jsShellPath" $shellArgs | grep -v break`;
     }

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 81d5b79..2f4b9c0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        * Scripts/run-sunspider: Added --shark20 option, to run Shark at its highest sample
+        resolution instead of its default.
+
 2007-10-29  David Kilzer  <ddkilzer@webkit.org>
 
         Fixed showStatus() to print status for successfully resolved conflicts when using git.

diff --git a/WebKitTools/Scripts/run-sunspider b/WebKitTools/Scripts/run-sunspider
index 362be05..ac82819 100755 (executable)
--- a/WebKitTools/Scripts/run-sunspider
+++ b/WebKitTools/Scripts/run-sunspider
@@ -39,6 +39,7 @@ my $configuration = configuration();
 my $root;
 my $testRuns = 5; # This number may be different from what sunspider defaults to (that's OK)
 my $runShark = 0;
+my $runShark20 = 0;
 my $showHelp = 0;
 my $testsPattern;
 
@@ -50,16 +51,16 @@ Usage: $programName [options] [options to pass to build system]
   --runs        Number of times to run tests (default: $testRuns)
   --tests       Only run tests matching provided pattern
   --shark       Sample with the Mac OS X "Shark" performance testing tool (implies --runs=1)
+  --shark20     Like --shark, but with a 20 microsecond sampling interval
 EOF
 
 GetOptions('root=s' => sub { my ($argName, $value); setConfigurationProductDir(Cwd::abs_path($value)); },
            'runs=i' => \$testRuns,
            'shark' => \$runShark,
+           'shark20' => \$runShark20,
            'tests=s' => \$testsPattern,
            'help' => \$showHelp);
 
-$testRuns = 1 if $runShark;
-
 if ($showHelp) {
    print STDERR $usage;
    exit 1;
@@ -108,6 +109,7 @@ setupEnvironmentForExecution($productDir);
 my @args = ("--shell", testKJSPath($productDir), "--runs", $testRuns);
 # This code could be removed if we chose to pass extra args to sunspider instead of Xcode
 push @args, "--shark" if $runShark;
+push @args, "--shark20" if $runShark20;
 push @args, "--tests", $testsPattern if $testsPattern;
 
 exec "./sunspider", @args;