SunSpider:

        Reviewed by Maciej.

        * sunspider: Added a "--base" option that records the current test as a baseline.
        Moved the code to find the newest .mshark file into a function (since I needed to use
        it in the other script and I prefer to copy/paste a function).

        * sunspider-compare-results: Added logic to compare the baseline with the last
        run when you don't pass any parameters.

WebKitTools:

        Reviewed by Maciej.

        * Scripts/run-sunspider: Pass the "--base" option through.

        * Scripts/sunspider-compare-results: Don't check the number of parameters; let
        the real script do that. Default configuration to Release to match run-sunspider
        so we don't end up building Debug just to compare results.

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

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 711571778fb9207a34d8136fed1281ecdb9a75e2..53af33715866084a512e147b43f0b3f1b6194b53 100644 (file)
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-02  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        * sunspider: Added a "--base" option that records the current test as a baseline.
+        Moved the code to find the newest .mshark file into a function (since I needed to use
+        it in the other script and I prefer to copy/paste a function).
+
+        * sunspider-compare-results: Added logic to compare the baseline with the last
+        run when you don't pass any parameters.
+
 2007-10-29  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Eric.

diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 82ca91197a74ba708f2a29c6531fadb5afe0f313..0527a4eb80592ceced43894aae49d319f697c290 100755 (executable)
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -27,6 +27,7 @@
 use strict;
 use Getopt::Long;
 use File::Basename;
+use File::Spec;
 use Cwd;
 use POSIX qw(strftime);
 
@@ -34,6 +35,7 @@ my $showHelp = 0;
 my $runShark = 0;
 my $runShark20 = 0;
 my $jsShellPath;
+my $setBase = 0;
 my $testsPattern;
 my $testRuns = 5; # This number may be different from what ./sunspider defaults to (that's OK)
 
@@ -41,6 +43,7 @@ my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName --shell=[path] [options]
   --help        Show this help message
+  --base        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
@@ -48,7 +51,8 @@ Usage: $programName --shell=[path] [options]
   --shark20     Like --shark, but with a 20 microsecond sampling interval
 EOF
 
-GetOptions('runs=i' => \$testRuns,
+GetOptions('base' => \$setBase,
+           'runs=i' => \$testRuns,
            'shell=s' => \$jsShellPath,
            'shark' => \$runShark,
            'shark20' => \$runShark20,
@@ -120,6 +124,27 @@ sub runTestsOnce($)
     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";
@@ -150,23 +175,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 $setBase;
 
 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;

diff --git a/SunSpider/sunspider-compare-results b/SunSpider/sunspider-compare-results
index 632c3cf88b08f163f0652e229cc38112c0ff3238..1a17cfd9804bf067d02bedf6ead384fa359425df 100755 (executable)
--- a/SunSpider/sunspider-compare-results
+++ b/SunSpider/sunspider-compare-results
@@ -40,7 +40,7 @@ EOF
 GetOptions('shell=s' => \$jsShellPath,
            'help' => \$showHelp);
 
-if (scalar @ARGV < 2 || !$jsShellPath || $showHelp) {
+if ((scalar @ARGV != 0 && scalar @ARGV != 2) || !$jsShellPath || $showHelp) {
    print STDERR $usage;
    exit 1;
 }
@@ -93,8 +93,49 @@ sub dumpToFile($$)
     close FILE;
 }
 
-my $output = "var output1 = " . readResultsFile($ARGV[0]) . ";\n";
-$output .= "var output2 = " . readResultsFile($ARGV[1]) . ";\n";
+sub readFile($)
+{
+    my ($path) = @_;
+    open FILE, "<", $path or die;
+    my $result = <FILE>;
+    close FILE;
+    return $result;
+}
+
+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";
+}
+
+my $file1;
+my $file2;
+
+if (scalar @ARGV == 2) {
+    $file1 = $ARGV[0];
+    $file2 = $ARGV[1];
+} else {
+    $file1 = readFile("tmp/baseline-filename.txt");
+    $file2 = newestFile("tmp", qr/sunspider-results-.+\.js$/);
+}
+
+my $output = "var output1 = " . readResultsFile($file1) . ";\n";
+$output .= "var output2 = " . readResultsFile($file2) . ";\n";
 
 dumpToFile($output, "tmp/sunspider-comparison-data.js");
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8e0ec02a789772587e75e64b5960eced73360864..de5694948cce03beb4f43f878cff34bb503d5c82 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-02  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        * Scripts/run-sunspider: Pass the "--base" option through.
+
+        * Scripts/sunspider-compare-results: Don't check the number of parameters; let
+        the real script do that. Default configuration to Release to match run-sunspider
+        so we don't end up building Debug just to compare results.
+
 2007-11-01  Adam Roben  <aroben@apple.com>
 
         Make changes in WebKit/win show up under "WebKit/win:" instead of just "win:"

diff --git a/WebKitTools/Scripts/run-sunspider b/WebKitTools/Scripts/run-sunspider
index ac8281948325254748e6dea47402faa7d82b70d9..ca1ce236bd817fb7e1ef62ce3b78f61d17f12e2a 100755 (executable)
--- a/WebKitTools/Scripts/run-sunspider
+++ b/WebKitTools/Scripts/run-sunspider
@@ -40,6 +40,7 @@ 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 $setBase = 0;
 my $showHelp = 0;
 my $testsPattern;
 
@@ -47,6 +48,7 @@ my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
   --help        Show this help message
+  --base        Set baseline for future comparisons
   --root        Path to root tools build
   --runs        Number of times to run tests (default: $testRuns)
   --tests       Only run tests matching provided pattern
@@ -54,7 +56,8 @@ Usage: $programName [options] [options to pass to build system]
   --shark20     Like --shark, but with a 20 microsecond sampling interval
 EOF
 
-GetOptions('root=s' => sub { my ($argName, $value); setConfigurationProductDir(Cwd::abs_path($value)); },
+GetOptions('base' => \$setBase,
+           'root=s' => sub { my ($argName, $value); setConfigurationProductDir(Cwd::abs_path($value)); },
            'runs=i' => \$testRuns,
            'shark' => \$runShark,
            'shark20' => \$runShark20,
@@ -110,6 +113,7 @@ 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, "--base" if $setBase;
 push @args, "--tests", $testsPattern if $testsPattern;
 
 exec "./sunspider", @args;

diff --git a/WebKitTools/Scripts/sunspider-compare-results b/WebKitTools/Scripts/sunspider-compare-results
index 742721fb1f35d4729c5d1f9cb6f32a2557f269f3..cf18aaea03c15d727c4b8a1c5696fe7281734225 100755 (executable)
--- a/WebKitTools/Scripts/sunspider-compare-results
+++ b/WebKitTools/Scripts/sunspider-compare-results
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2007 Apple Inc.  All rights reserved.
+# Copyright (C) 2007 Apple Inc. All rights reserved.
 # Copyright (C) 2007 Eric Seidel <eric@webkit.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,8 @@ use lib $FindBin::Bin;
 use webkitdirs;
 use POSIX;
 
-# determine configuration
+# determine configuration, but default to "Release" instead of last-used configuration to match run-sunspider
+setConfiguration("Release");
 setConfiguration();
 my $configuration = configuration();
 
@@ -49,7 +50,7 @@ EOF
 GetOptions('root=s' => sub { my ($argName, $value); setConfigurationProductDir(Cwd::abs_path($value)); },
            'help' => \$showHelp);
 
-if ($showHelp || scalar @ARGV < 2) {
+if ($showHelp) {
    print STDERR $usage;
    exit 1;
 }