Title: [203030] trunk/Websites/perf.webkit.org
Revision
203030
Author
[email protected]
Date
2016-07-09 08:39:34 -0700 (Sat, 09 Jul 2016)

Log Message

REGRESSION: manifest.json generation takes multiple seconds on perf dashboard
https://bugs.webkit.org/show_bug.cgi?id=159596

Reviewed by Chris Dumez.

The most of CPU time was spent looking for a duplicate entry in an array of metrics by array_search.
This patch moves to postgres by using aggregate functions in the query. Also moved the code to convert
datetime to UNIX epoch timestamp from PHP to within postgres query.

These improvements reduce total runtime of Manifest::generate from ~4s to ~350ms on my machine.

* public/include/manifest.php:
(Manifest::generate): No longer fetches test_configurations table as this is done in Manifest::platforms now.
Also moved calls to each method in the class to separate lines for easier instrumentation.
(Manifest::platforms): Group test configurations (current, baseline, target) by platform and metric.
Use the max of the last modified dates in UNIX epoch timestamps (ms to be compatible with JS's representation).
A given platform, metric pair is considered to be in the v1 dashboard if any test configuration is in.

Modified Paths

Diff

Modified: trunk/Websites/perf.webkit.org/ChangeLog (203029 => 203030)


--- trunk/Websites/perf.webkit.org/ChangeLog	2016-07-09 12:57:37 UTC (rev 203029)
+++ trunk/Websites/perf.webkit.org/ChangeLog	2016-07-09 15:39:34 UTC (rev 203030)
@@ -1,3 +1,23 @@
+2016-07-09  Ryosuke Niwa  <[email protected]>
+
+        REGRESSION: manifest.json generation takes multiple seconds on perf dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=159596
+
+        Reviewed by Chris Dumez.
+
+        The most of CPU time was spent looking for a duplicate entry in an array of metrics by array_search.
+        This patch moves to postgres by using aggregate functions in the query. Also moved the code to convert
+        datetime to UNIX epoch timestamp from PHP to within postgres query.
+
+        These improvements reduce total runtime of Manifest::generate from ~4s to ~350ms on my machine.
+
+        * public/include/manifest.php:
+        (Manifest::generate): No longer fetches test_configurations table as this is done in Manifest::platforms now.
+        Also moved calls to each method in the class to separate lines for easier instrumentation.
+        (Manifest::platforms): Group test configurations (current, baseline, target) by platform and metric.
+        Use the max of the last modified dates in UNIX epoch timestamps (ms to be compatible with JS's representation).
+        A given platform, metric pair is considered to be in the v1 dashboard if any test configuration is in.
+
 2016-07-08  Ryosuke Niwa  <[email protected]>
 
         bundle-v3-scripts.py should compress HTML/CSS templates

Modified: trunk/Websites/perf.webkit.org/public/include/manifest.php (203029 => 203030)


--- trunk/Websites/perf.webkit.org/public/include/manifest.php	2016-07-09 12:57:37 UTC (rev 203029)
+++ trunk/Websites/perf.webkit.org/public/include/manifest.php	2016-07-09 15:39:34 UTC (rev 203030)
@@ -14,7 +14,6 @@
     function generate() {
         $start_time = microtime(true);
 
-        $config_table = $this->db->fetch_table('test_configurations');
         $platform_table = $this->db->fetch_table('platforms');
         $repositories_table = $this->db->fetch_table('repositories');
 
@@ -26,13 +25,19 @@
         foreach ($repositories_with_commit as &$row)
             $row = $row['commit_repository'];
 
+        $tests = (object)$this->tests();
+        $metrics = (object)$this->metrics();
+        $platforms = (object)$this->platforms($platform_table, false);
+        $dashboard = (object)$this->platforms($platform_table, true);
+        $repositories = (object)$this->repositories($repositories_table, $repositories_with_commit);
+
         $this->manifest = array(
             'siteTitle' => config('siteTitle', 'Performance Dashboard'),
-            'tests' => (object)$this->tests(),
-            'metrics' => (object)$this->metrics(),
-            'all' => (object)$this->platforms($config_table, $platform_table, false),
-            'dashboard' => (object)$this->platforms($config_table, $platform_table, true),
-            'repositories' => (object)$this->repositories($repositories_table, $repositories_with_commit),
+            'tests' => &$tests,
+            'metrics' => &$metrics,
+            'all' => &$platforms,
+            'dashboard' => &$dashboard,
+            'repositories' => &$repositories,
             'builders' => (object)$this->builders(),
             'bugTrackers' => (object)$this->bug_trackers($repositories_table),
             'dashboards' => (object)config('dashboards'),
@@ -79,32 +84,33 @@
         return $metrics;
     }
 
-    private function platforms($config_table, $platform_table, $is_dashboard) {
+    private function platforms($platform_table, $is_dashboard) {
+        $metrics = $this->db->query_and_fetch_all('SELECT config_metric AS metric_id, config_platform AS platform_id,
+            extract(epoch from max(config_runs_last_modified)) * 1000 AS last_modified, bool_or(config_is_in_dashboard) AS in_dashboard
+            FROM test_configurations GROUP BY config_metric, config_platform ORDER BY config_platform');
+
         $platform_metrics = array();
-        if ($config_table) {
-            foreach ($config_table as $config_row) {
-                if ($is_dashboard && !Database::is_true($config_row['config_is_in_dashboard']))
+
+        if ($metrics) {
+            $current_platform_entry = null;
+            foreach ($metrics as $metric_row) {
+                if ($is_dashboard && !Database::is_true($metric_row['in_dashboard']))
                     continue;
 
-                $new_last_modified = array_get($config_row, 'config_runs_last_modified', 0);
-                if ($new_last_modified)
-                    $new_last_modified = strtotime($config_row['config_runs_last_modified']) * 1000;
+                $platform_id = $metric_row['platform_id'];
+                if (!$current_platform_entry || $current_platform_entry['id'] != $platform_id) {
+                    $current_platform_entry = &array_ensure_item_has_array($platform_metrics, $platform_id);
+                    $current_platform_entry['id'] = $platform_id;
+                    array_ensure_item_has_array($current_platform_entry, 'metrics');
+                    array_ensure_item_has_array($current_platform_entry, 'last_modified');
+                }
 
-                $platform = &array_ensure_item_has_array($platform_metrics, $config_row['config_platform']);
-                $metrics = &array_ensure_item_has_array($platform, 'metrics');
-                $last_modified = &array_ensure_item_has_array($platform, 'last_modified');
-
-                $metric_id = $config_row['config_metric'];
-                $index = array_search($metric_id, $metrics);
-                if ($index === FALSE) {
-                    array_push($metrics, $metric_id);
-                    array_push($last_modified, $new_last_modified);
-                } else
-                    $last_modified[$index] = max($last_modified[$index], $new_last_modified);
+                array_push($current_platform_entry['metrics'], $metric_row['metric_id']);
+                array_push($current_platform_entry['last_modified'], $metric_row['last_modified']);
             }
         }
         $configurations = array();
-        
+
         $platforms = array();
         if ($platform_table) {
             foreach ($platform_table as $platform_row) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to