Run dart2js compiled Dromaeo on Chrome

tools/testing/perf_testing/run_perf_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import datetime
 import math             
 try:            
   from matplotlib.font_manager import FontProperties            
@@ skipping 560 matching lines @@
         tester: The visitor that actually performs the test running mechanics.
         file_processor: The visitor that processes files in the format
             appropriate for this test.
         grapher: The visitor that generates graphs given our test result data.
         extra_metrics: A list of any additional measurements we wish to keep
             track of (such as the geometric mean of a set, the sum, etc).
         build_targets: The targets necessary to build to run these tests
             (default target is create_sdk)."""
     super(RuntimePerformanceTest, self).__init__(result_folder_name,
           platform_list, versions, benchmarks, test_runner, tester,
-          file_processor, self.RuntimePerfGrapher(self),
+          file_processor, RuntimePerfGrapher(self),
           build_targets=build_targets)
     self.platform_list = platform_list
     self.platform_type = platform_type
     self.versions = versions
     self.benchmarks = benchmarks 
 
-  class RuntimePerfGrapher(Grapher):
-    def plot_all_perf(self, png_filename):
-      """Create a plot that shows the performance changes of individual
-      benchmarks run by JS and generated by frog, over svn history."""
-      for benchmark in self.test.benchmarks:
-        self.style_and_save_perf_plot(
-            'Performance of %s over time on the %s on %s' % (benchmark,
-            self.test.platform_type, utils.GuessOS()),
-            'Speed (bigger = better)', 16, 14, 'lower left',
-            benchmark + png_filename, self.test.platform_list,
-            self.test.versions, [benchmark])
+class RuntimePerfGrapher(Grapher):
+  def plot_all_perf(self, png_filename):
+    """Create a plot that shows the performance changes of individual
+    benchmarks run by JS and generated by frog, over svn history."""
+    for benchmark in self.test.benchmarks:
+      self.style_and_save_perf_plot(
+          'Performance of %s over time on the %s on %s' % (benchmark,
+          self.test.platform_type, utils.GuessOS()),
+          'Speed (bigger = better)', 16, 14, 'lower left',
+          benchmark + png_filename, self.test.platform_list,
+          self.test.versions, [benchmark])
 
-    def plot_avg_perf(self, png_filename):
-      """Generate a plot that shows the performance changes of the geomentric
-      mean of JS and frog benchmark performance over svn history."""
-      (title, y_axis, size_x, size_y, loc, filename) = \
-          ('Geometric Mean of benchmark %s performance on %s ' %
-          (self.test.platform_type, utils.GuessOS()), 'Speed (bigger = better)',
-          16, 5, 'lower left', 'avg'+png_filename)
-      clear_axis = True
-      for platform in self.test.platform_list:
-        for version in self.test.versions:
-          if self.test.is_valid_combination(platform, version):
-            for metric in self.test.extra_metrics:
-              self.style_and_save_perf_plot(title, y_axis, size_x, size_y, loc,
-                                            filename, [platform], [version],
-                                            [metric], clear_axis)
-              clear_axis = False
+  def plot_avg_perf(self, png_filename, platforms=None, versions=None):
+    """Generate a plot that shows the performance changes of the geomentric
+    mean of JS and frog benchmark performance over svn history."""
+    if platforms == None:
+      platforms = self.test.platform_list
+    if versions == None:
+      versions = self.test.versions
+    (title, y_axis, size_x, size_y, loc, filename) = \
+      ('Geometric Mean of benchmark %s performance on %s ' %
+      (self.test.platform_type, utils.GuessOS()), 'Speed (bigger = better)',
+      16, 5, 'lower left', 'avg'+png_filename)
+    clear_axis = True
+    for platform in platforms:
+      for version in versions:
+        if self.test.is_valid_combination(platform, version):
+          for metric in self.test.extra_metrics:
+            self.style_and_save_perf_plot(title, y_axis, size_x, size_y, loc,
+                                          filename, [platform], [version],
+                                          [metric], clear_axis)
+            clear_axis = False
 
-    def plot_results(self, png_filename):
-      self.plot_all_perf(png_filename)
-      self.plot_avg_perf('2' + png_filename)
-
+  def plot_results(self, png_filename):
+    self.plot_all_perf(png_filename)
+    self.plot_avg_perf('2' + png_filename)
 
 class BrowserTester(Tester):
   @staticmethod
   def get_browsers(add_dartium=True):
     browsers = ['ff', 'chrome']
     if add_dartium:
       browsers += ['dartium']
     has_shell = False
     if platform.system() == 'Darwin':
       browsers += ['safari']
@@ skipping 179 matching lines @@
   def get_dromaeo_benchmarks():
     valid = DromaeoTester.get_valid_dromaeo_tags()
     benchmarks = reduce(lambda l1,l2: l1+l2,
                         [tests for (tag, tests) in
                          DromaeoTester.DROMAEO_BENCHMARKS.values() 
                          if tag in valid])
     return map(DromaeoTester.legalize_filename, benchmarks)
 
   @staticmethod
   def get_dromaeo_versions():
-    return ['js', 'frog_dom', 'frog_html']
+    return ['js', 'frog_dom', 'frog_html', 'dart2js_dom', 'dart2js_html']
 
 
 class DromaeoTest(RuntimePerformanceTest):
   """Runs Dromaeo tests, in the browser."""
   def __init__(self, test_runner):
     super(DromaeoTest, self).__init__(
         self.name(), BrowserTester.get_browsers(), 'browser',
         DromaeoTester.get_dromaeo_versions(), 
         DromaeoTester.get_dromaeo_benchmarks(), test_runner,
         self.DromaeoPerfTester(self),
         self.DromaeoFileProcessor(self))
+    # TODO(vsm): These tester/grapher/processor classes should be
+    # cleaner to override.
+    self.grapher = self.DromaeoPerfGrapher(self)
 
   @staticmethod
   def name():
     return 'dromaeo'
 
   def is_valid_combination(self, browser, version):
     # TODO(vsm): This avoids a bug in 32-bit Chrome (dartium)
     # running JS dromaeo.
     if browser == 'dartium' and version == 'js':
       return False
+    # Only run dart2js on Chrome until we validate it elsewhere.
+    if browser != 'chrome' and 'dart2js' in version:
+      return False
     return True
 
+  class DromaeoPerfGrapher(RuntimePerfGrapher):
+    def plot_results(self, png_filename):
+      self.plot_all_perf(png_filename)
+      self.plot_avg_perf('2' + png_filename)
+      self.plot_avg_perf('3' + png_filename, ['chrome', 'dartium'],
+                         ['js', 'frog_dom', 'frog_html'])
+      self.plot_avg_perf('4' + png_filename, ['chrome'],
+                         ['js', 'frog_dom', 'dart2js_dom'])
+      self.plot_avg_perf('5' + png_filename, ['chrome'],
+                         ['js', 'dart2js_dom', 'dart2js_html'])
+      self.plot_avg_perf('6' + png_filename, ['chrome'],
+                         ['js', 'frog_dom', 'frog_html', 'dart2js_dom',
+                          'dart2js_html'])
+
   class DromaeoPerfTester(DromaeoTester):
     def move_chrome_driver_if_needed(self, browser):
       """Move the appropriate version of ChromeDriver onto the path. 
       TODO(efortuna): This is a total hack because the latest version of Chrome
       (Dartium builds) requires a different version of ChromeDriver, that is
       incompatible with the release or beta Chrome and vice versa. Remove these
       shenanigans once we're back to both versions of Chrome using the same
       version of ChromeDriver. IMPORTANT NOTE: This assumes your chromedriver is
       in the default location (inside depot_tools).
       """
@@ skipping 431 matching lines @@
     while True:
       if runner.has_new_code():
         runner.run_test_sequence()
       else:
         time.sleep(200)
   else:
     runner.run_test_sequence()
 
 if __name__ == '__main__':
   main()