Improve performance of rebaselining after TestBaselineSet change.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

 # Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 126 matching lines @@
 
 class TestBaselineSet(object):
     """Represents a collection of tests and platforms that can be rebaselined.
 
     A TestBaselineSet specifies tests to rebaseline along with information
     about where to fetch the baselines from.
     """
 
     def __init__(self, host):
         self._host = host
+        self._port = self._host.port_factory.get()
+        self._builder_names = set()
         self._test_prefix_map = collections.defaultdict(list)
 
     def __iter__(self):
         return iter(self._iter_combinations())
 
     def __bool__(self):
         return bool(self._test_prefix_map)
 
     def _iter_combinations(self):
         """Iterates through (test, build) combinations."""
-        port = self._host.port_factory.get()
         for test_prefix, builds in self._test_prefix_map.iteritems():
-            for build in builds:
-                for test in port.tests([test_prefix]):
+            for test in self._port.tests([test_prefix]):
+                for build in builds:
                     yield (test, build)
 
     def __str__(self):
         if not self._test_prefix_map:
             return '<Empty TestBaselineSet>'
         return '<TestBaselineSet with:\n  ' + '\n  '.join('%s: %s' % pair for pair in self._iter_combinations()) + '>'
 
     def add(self, test_prefix, build):
         """Adds an entry for baselines to download for some set of tests.
 
         Args:
             test_prefix: This can be a full test path, or directory of tests, or a path with globs.
             build: A Build object. This specifies where to fetch baselines from.
         """
+        self._builder_names.add(build.builder_name)
         self._test_prefix_map[test_prefix].append(build)
 
     def all_builders(self):
         """Returns all builder names in in this collection."""
-        return sorted({b.builder_name for _, b in self._iter_combinations()})
+        return self._builder_names
 
 
 class CopyExistingBaselinesInternal(AbstractRebaseliningCommand):
     name = 'copy-existing-baselines-internal'
     help_text = ('Copy existing baselines down one level in the baseline order to ensure '
                  "new baselines don't break existing passing platforms.")
 
     def __init__(self):
         super(CopyExistingBaselinesInternal, self).__init__(options=[
             self.results_directory_option,
@@ skipping 210 matching lines @@
 
         return set(builders_to_fallback_paths)
 
     def _rebaseline_commands(self, test_baseline_set, options):
         path_to_webkit_patch = self._tool.path()
         cwd = self._tool.git().checkout_root
         copy_baseline_commands = []
         rebaseline_commands = []
         lines_to_remove = {}
 
+        builders_to_fetch_from = self._builders_to_fetch_from(test_baseline_set.all_builders())
         for test, build in test_baseline_set:
-            if build.builder_name not in self._builders_to_fetch_from(test_baseline_set.all_builders()):
+            if build.builder_name not in builders_to_fetch_from:
                 continue
 
             suffixes = self._suffixes_for_actual_failures(test, build)
             if not suffixes:
                 # If we're not going to rebaseline the test because it's passing on this
                 # builder, we still want to remove the line from TestExpectations.
                 if test not in lines_to_remove:
                     lines_to_remove[test] = []
                 lines_to_remove[test].append(build.builder_name)
                 continue
@@ skipping 29 matching lines @@
                 except ValueError:
                     _log.debug('"%s" is not a JSON object, ignoring', line)
             if not updated:
                 # TODO(qyearsley): This probably should be an error. See http://crbug.com/649412.
                 _log.debug('Could not add file based off output "%s"', stdout)
         return change_set
 
     def _optimize_baselines(self, test_baseline_set, verbose=False):
         """Returns a list of commands to run in parallel to de-duplicate baselines."""
         tests_to_suffixes = collections.defaultdict(set)
+        builders_to_fetch_from = self._builders_to_fetch_from(test_baseline_set.all_builders())
         for test, build in test_baseline_set:
-            builders_to_fetch_from = self._builders_to_fetch_from(test_baseline_set.all_builders())
             if build.builder_name not in builders_to_fetch_from:
                 continue
             tests_to_suffixes[test].update(self._suffixes_for_actual_failures(test, build))
 
         optimize_commands = []
         for test, suffixes in tests_to_suffixes.iteritems():
             # No need to optimize baselines for a test with no failures.
             if not suffixes:
                 continue
             # FIXME: We should propagate the platform options as well.
@@ skipping 242 matching lines @@
 
         test_baseline_set = TestBaselineSet(tool)
 
         for builder in builders_to_check:
             for test_prefix in args:
                 test_baseline_set.add(test_prefix, Build(builder))
 
         _log.debug('Rebaselining: %s', test_baseline_set)
 
         self.rebaseline(options, test_baseline_set)