Changeset 276669 in webkit

Timestamp:

Apr 27, 2021, 3:06:32 PM (5 years ago)

Author:

Sam Sneddon

Message:

Optimize Port._expected_baselines_for_suffixes
​https://bugs.webkit.org/show_bug.cgi?id=225115

Reviewed by Jonathan Bedard.

This takes out the join() and splitext() calls from the inner loop as
they are loop invariant, and account for a large proportion of the
function's execution time. After this, exists() account for almost
all.

• Scripts/webkitpy/port/base.py:

(Port._expected_baselines_for_suffixes):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-27  Sam Sneddon  <gsnedders@apple.com>
+
+        Optimize Port._expected_baselines_for_suffixes
+        https://bugs.webkit.org/show_bug.cgi?id=225115
+
+        Reviewed by Jonathan Bedard.
+
+        This takes out the join() and splitext() calls from the inner loop as
+        they are loop invariant, and account for a large proportion of the
+        function's execution time. After this, exists() account for almost
+        all.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._expected_baselines_for_suffixes):
+
 2021-04-27  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -385 +385 @@
     def _expected_baselines_for_suffixes(self, test_name, suffixes, all_baselines=False, device_type=None):
         baseline_search_path = self.baseline_search_path(device_type=device_type) + [self.layout_tests_dir()]
+        fs = self._filesystem
+        baseline_name_root = fs.splitext(test_name)[0] + '-expected'
 
         baselines = []
         for platform_dir in baseline_search_path:
+            unsuffixed = fs.join(platform_dir, baseline_name_root)
             for suffix in suffixes:
-                baseline_filename = self._filesystem.splitext(test_name)[0] + '-expected' + suffix
-                if self._filesystem.exists(self._filesystem.join(platform_dir, baseline_filename)):
+                if fs.exists(unsuffixed + suffix):
+                    baseline_filename = baseline_name_root + suffix
                     baselines.append((platform_dir, baseline_filename))
 
@@ -400 +403 @@
 
         for suffix in suffixes:
-            baselines.append((None, self._filesystem.splitext(test_name)[0] + '-expected' + suffix))
+            baselines.append((None, baseline_name_root + suffix))
         return baselines