Reviewed by Darin.

[WebKit-https.git] / SunSpider / sunspider

diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index fbe59ba705690bca70c9267a25208af700442e7c..bd6436efc5a892cbda3a661495a4ab503957861a 100755 (executable)
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -27,32 +27,43 @@
 use strict;
 use Getopt::Long;
 use File::Basename;
+use File::Spec;
 use Cwd;
 use POSIX qw(strftime);
 
 my $showHelp = 0;
 my $runShark = 0;
+my $runShark20 = 0;
 my $jsShellPath;
+my $setBaseline = 0;
 my $testsPattern;
 my $testRuns = 5; # This number may be different from what ./sunspider defaults to (that's OK)
 
 my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName --shell=[path] [options]
-  --help        Show this help message
-  --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)
+  --help            Show this help message
+  --set-baseline    Set baseline for future comparisons
+  --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,
+           'set-baseline' => \$setBaseline,
            'shell=s' => \$jsShellPath,
            'shark' => \$runShark,
+           'shark20' => \$runShark20,
            'tests=s' => \$testsPattern,
            'help' => \$showHelp);
 
+$runShark = 20 if $runShark20;
 $testRuns = 1 if $runShark;
+if ($runShark && ! -x "/usr/bin/shark") {
+    die "Please install CHUD tools from http://developer.apple.com/tools/download/\n";
+}
 
 if (!$jsShellPath || $showHelp) {
    print STDERR $usage;
@@ -62,7 +73,7 @@ if (!$jsShellPath || $showHelp) {
 sub dumpToFile($$)
 {
     my ($contents, $path) = @_;
-    open FILE, ">", $path or die;
+    open FILE, ">", $path or die "Failed to open $path";
     print FILE $contents;
     close FILE;
 }
@@ -89,7 +100,7 @@ sub loadTestsList()
     close TESTLIST;
 }
 
-my $timeString = strftime "%Y-%m-%d-%H:%M:%S", localtime $^T;
+my $timeString = strftime "%Y-%m-%d-%H.%M.%S", localtime $^T;
 my $prefixFile = "tmp/sunspider-test-prefix.js";
 my $resultsFile = "tmp/sunspider-results-$timeString.js";
 
@@ -108,13 +119,35 @@ 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`;
     }
     return $output;
 }
 
+sub newestFile($$)
+{
+    my ($dir, $pattern) = @_;
+
+    my $newestAge;
+    my $newestFile = "";
+    opendir DIR, $dir or die;
+    for my $file (readdir DIR) {
+        if ($file =~ $pattern) {
+            my $age = -M "$dir/$file";
+            if (!defined $newestAge || $age < $newestAge) {
+                $newestFile = $file;
+                $newestAge = $age;
+            }
+        }
+    }
+    closedir DIR;
+
+    return "$dir/$newestFile";
+}
+
 loadTestsList();
 if ($testsPattern) {
     print STDERR "Found " . scalar(@tests) . " tests matching '" . $testsPattern . "'\n";
@@ -145,23 +178,12 @@ print "]\n";
 
 my $output = "var output = [\n" . join(",\n", @results) . "\n];\n";
 dumpToFile($output, $resultsFile);
+dumpToFile(File::Spec->rel2abs($resultsFile), "tmp/baseline-filename.txt") if $setBaseline;
 
 system("$jsShellPath", "-f", $prefixFile, "-f", $resultsFile, "-f", "resources/sunspider-analyze-results.js");
 
 if ($runShark) {
-    my $newestAge = 0;
-    my $newestMShark = 0;
-    opendir DIR, "." or die;
-    for my $file (readdir DIR) {
-        if ($file =~ /\.mshark$/) {
-            my $age = -M $file;
-            if ($age < $newestAge) {
-                $newestMShark = $file;
-                $newestAge = $age;
-            }
-        }
-    }
-    closedir DIR;
+    my $newestMShark = newestFile(".", qr/\.mshark$/);
     if ($newestMShark) {
         my $profileFile = "tmp/sunspider-profile-$timeString.mshark";
         rename $newestMShark, $profileFile or die;