Merge pull request #964 from tgnottingham/reapply-graph-total-bootstrap-time

Reapply "Graph total bootstrap time" with fixes to postgres query

Author: rylev

database/src/pool.rs

@@ -67,8 +67,22 @@ pub trait Connection: Send + Sync {
         krate: &str,
         value: Duration,
     );
-
-    async fn get_bootstrap(
+    /// Returns vector of bootstrap build times for the given artifacts. The kth
+    /// element is the minimum build time for the kth artifact in `aids`, across
+    /// all collections for the artifact, or none if there is no bootstrap data
+    /// for that artifact (for example, because the rustc benchmark wasn't
+    /// executed for that artifact).
+    async fn get_bootstrap(&self, aids: &[ArtifactIdNumber]) -> Vec<Option<Duration>>;
+    /// Returns map from rustc crate name to vector of build times for that crate
+    /// for the given artifacts. Within a crate's corresponding vector, the kth
+    /// element is the minimum build time for the kth artifact in `aids`, across
+    /// all collections for the artifact, or none if there is no data for that
+    /// artifact / crate combination (for example, because that rustc crate
+    /// wasn't present when building rustc with that artifact, or because the
+    /// rustc benchmark wasn't executed for that artifact). A crate will not be
+    /// included as a key in the map unless at least one artifact in `aids` has a
+    /// build time for it.
+    async fn get_bootstrap_by_crate(
         &self,
         aids: &[ArtifactIdNumber],
     ) -> HashMap<String, Vec<Option<Duration>>>;

database/src/pool/postgres.rs

@@ -264,6 +264,7 @@ impl<'a> Transaction for PostgresTransaction<'a> {
 pub struct CachedStatements {
     get_pstat: Statement,
     get_rustc_compilation: Statement,
+    get_rustc_compilation_by_crate: Statement,
     insert_pstat: Statement,
     insert_rustc: Statement,
     get_self_profile_query: Statement,
@@ -356,6 +357,16 @@ impl PostgresConnection {
                     .await
                     .unwrap(),
                 get_rustc_compilation: conn.prepare("
+                        select aid, min(total)
+                        from (
+                            select aid, cast(sum(duration) AS bigint) as total
+                            from rustc_compilation
+                            where aid = any($1)
+                            group by aid, cid
+                        ) as duration_per_aid_cid
+                        group by aid
+                    ").await.unwrap(),
+                get_rustc_compilation_by_crate: conn.prepare("
                         select
                             aid,
                             crate,
@@ -1184,7 +1195,36 @@ where
             .collect()
     }
 
-    async fn get_bootstrap(
+    async fn get_bootstrap(&self, aids: &[ArtifactIdNumber]) -> Vec<Option<Duration>> {
+        let mut result = vec![None; aids.len()];
+
+        let aid_to_idx = aids
+            .iter()
+            .copied()
+            .enumerate()
+            .map(|(idx, v)| (v, idx))
+            .collect::<HashMap<ArtifactIdNumber, usize>>();
+
+        let rows = self
+            .conn()
+            .query(
+                &self.statements().get_rustc_compilation,
+                &[&aids.iter().map(|v| v.0 as i32).collect::<Vec<_>>()],
+            )
+            .await
+            .unwrap();
+
+        for row in rows {
+            let aid = ArtifactIdNumber(row.get::<_, i32>(0) as u32);
+            let min_duration = row.get::<_, i64>(1);
+
+            result[aid_to_idx[&aid]] = Some(Duration::from_nanos(min_duration as u64));
+        }
+
+        result
+    }
+
+    async fn get_bootstrap_by_crate(
         &self,
         aids: &[ArtifactIdNumber],
     ) -> HashMap<String, Vec<Option<Duration>>> {
@@ -1198,7 +1238,7 @@ where
         let rows = self
             .conn()
             .query(
-                &self.statements().get_rustc_compilation,
+                &self.statements().get_rustc_compilation_by_crate,
                 &[&aids.iter().map(|v| v.0 as i32).collect::<Vec<_>>()],
             )
             .await

database/src/pool/sqlite.rs

@@ -911,7 +911,32 @@ impl Connection for SqliteConnection {
         Vec::new()
     }
 
-    async fn get_bootstrap(
+    async fn get_bootstrap(&self, aids: &[ArtifactIdNumber]) -> Vec<Option<Duration>> {
+        aids.into_iter()
+            .map(|aid| {
+                self.raw_ref()
+                    .prepare(
+                        "
+                        select min(total)
+                        from (
+                            select sum(duration) as total
+                            from rustc_compilation
+                            where aid = ?
+                            group by cid
+                        )
+                    ",
+                    )
+                    .unwrap()
+                    .query_row(params![&aid.0], |row| {
+                        Ok(Duration::from_nanos(row.get::<_, i64>(0)? as u64))
+                    })
+                    .optional()
+                    .unwrap()
+            })
+            .collect()
+    }
+
+    async fn get_bootstrap_by_crate(
         &self,
         aids: &[ArtifactIdNumber],
     ) -> HashMap<String, Vec<Option<Duration>>> {
@@ -928,15 +953,11 @@ impl Connection for SqliteConnection {
                 .unwrap()
                 .map(|r| r.unwrap())
                 .collect();
-            for (krate, duration) in rows {
+            for (krate, min_duration) in rows {
                 let v = results
                     .entry(krate)
-                    .or_insert_with(|| Vec::with_capacity(aids.len()));
-
-                if v.len() != idx {
-                    v.resize_with(idx, || None);
-                }
-                v.push(Some(Duration::from_nanos(duration as u64)));
+                    .or_insert_with(|| vec![None; aids.len()]);
+                v[idx] = Some(Duration::from_nanos(min_duration as u64));
             }
         }
 

site/src/api.rs

@@ -133,7 +133,9 @@ pub mod bootstrap {
         // (UTC timestamp, sha)
         pub commits: Vec<(i64, String)>,
         // Optional nanoseconds
-        pub by_crate: HashMap<String, Vec<Option<u64>>>,
+        pub by_crate_build_times: HashMap<String, Vec<Option<u64>>>,
+        // Each commit's total rustc build time in nanoseconds
+        pub total_build_times: Vec<Option<u64>>,
     }
 }
 

site/src/comparison.rs

@@ -436,7 +436,7 @@ impl ArtifactDescription {
         master_commits: &[collector::MasterCommit],
     ) -> Self {
         let bootstrap = conn
-            .get_bootstrap(&[conn.artifact_id(&artifact).await])
+            .get_bootstrap_by_crate(&[conn.artifact_id(&artifact).await])
             .await;
         let bootstrap = bootstrap
             .into_iter()

site/src/request_handlers/bootstrap.rs

@@ -4,13 +4,15 @@ use crate::api::{bootstrap, ServerResult};
 use crate::db::ArtifactId;
 use crate::load::SiteCtxt;
 
+use std::time::Duration;
+
 pub async fn handle_bootstrap(
     body: bootstrap::Request,
     ctxt: &SiteCtxt,
 ) -> ServerResult<bootstrap::Response> {
     log::info!("handle_bootstrap({:?})", body);
     let range = ctxt.data_range(body.start.clone()..=body.end.clone());
-    let mut commits: Vec<ArtifactId> = range.iter().map(|c| c.clone().into()).collect();
+    let commits: Vec<ArtifactId> = range.iter().map(|c| c.clone().into()).collect();
 
     let conn = ctxt.conn().await;
     let ids = commits
@@ -19,8 +21,14 @@ pub async fn handle_bootstrap(
         .collect::<FuturesOrdered<_>>()
         .collect::<Vec<_>>()
         .await;
-    let by_crate = conn.get_bootstrap(&ids).await;
-    let mut by_crate = by_crate
+
+    let by_crate_build_times = conn.get_bootstrap_by_crate(&ids).await;
+
+    fn duration_as_nanos_u64(d: Duration) -> u64 {
+        d.as_nanos() as u64
+    }
+
+    let by_crate_build_times = by_crate_build_times
         .into_iter()
         .filter_map(|(k, v)| {
             // We show any line that has at least one point exceeding the
@@ -29,7 +37,7 @@ pub async fn handle_bootstrap(
                 Some((
                     k,
                     v.into_iter()
-                        .map(|v| v.map(|d| d.as_nanos() as u64))
+                        .map(|v| v.map(duration_as_nanos_u64))
                         .collect(),
                 ))
             } else {
@@ -38,17 +46,12 @@ pub async fn handle_bootstrap(
         })
         .collect::<hashbrown::HashMap<String, Vec<Option<u64>>>>();
 
-    // Don't return commits/nulls for completely null commits at the beginning
-    let start: usize = by_crate
-        .values()
-        .filter_map(|series| series.iter().position(|v| v.is_some()))
-        .min()
-        .unwrap_or(0);
-
-    commits = commits.split_off(start);
-    for series in by_crate.values_mut() {
-        *series = series.split_off(start);
-    }
+    let total_build_times = conn
+        .get_bootstrap(&ids)
+        .await
+        .into_iter()
+        .map(|v| v.map(duration_as_nanos_u64))
+        .collect();
 
     Ok(bootstrap::Response {
         commits: commits
@@ -58,6 +61,7 @@ pub async fn handle_bootstrap(
                 ArtifactId::Tag(_) => todo!(),
             })
             .collect(),
-        by_crate,
+        by_crate_build_times,
+        total_build_times,
     })
 }

site/static/bootstrap.html

@@ -72,7 +72,8 @@
         <h2>Loading &amp; rendering data..</h2>
         <h3>This may take a while!</h3>
     </div>
-    <div id="charts"></div>
+    <div id="byCrateChart"></div>
+    <div id="totalChart"></div>
     <div id="as-of"></div>
     <a href="https://github.com/rust-lang-nursery/rustc-perf">
         <img style="position: absolute; top: 0; right: 0; border: 0;"
@@ -232,36 +233,50 @@ <h3>This may take a while!</h3>
         }
 
         function renderPlots(data, state) {
-            let seriesOpts = [{}];
+            let byChartSeriesOpts = [{}];
 
             let xVals = data.commits.map(c => c[0]);
-            let plotData = [xVals];
+            let byChartPlotData = [xVals];
             // https://sashamaps.net/docs/resources/20-colors/
             let colors = [
                 '#e6194b', '#3cb44b', '#ffe119', '#4363d8', '#f58231',
                 '#911eb4', '#46f0f0', '#f032e6', '#a09b13', '#0ab0be',
                 'red', 'green', 'blue', 'purple'
             ];
-            let crates = Object.keys(data.by_crate).sort();
+            let crates = Object.keys(data.by_crate_build_times).sort();
             for (let crate of crates) {
-                plotData.push(data.by_crate[crate]);
+                byChartPlotData.push(data.by_crate_build_times[crate]);
 
-                seriesOpts.push({
+                byChartSeriesOpts.push({
                     label: crate,
                     stroke: colors.length ? colors.pop() : 'black',
                 });
             }
 
-            let plotOpts = genPlotOpts({
-                title: "Bootstrap timings for crates >= 30 seconds",
+            let byChartPlotOpts = genPlotOpts({
+                title: "Bootstrap time for crates >= 30 seconds",
                 width: Math.floor(window.innerWidth) - 16,
-                height: window.innerHeight * 0.75,
+                height: window.innerHeight * 0.56,
                 yAxisLabel: "",
-                series: seriesOpts,
+                series: byChartSeriesOpts,
                 commits: data.commits,
             });
 
-            let u = new uPlot(plotOpts, plotData, document.querySelector("#charts"));
+            let byChartPlot = new uPlot(byChartPlotOpts, byChartPlotData, document.querySelector("#byCrateChart"));
+
+            let totalPlotData = [xVals, data.total_build_times];
+
+            let totalPlotOpts = genPlotOpts({
+                title: "Total bootstrap time",
+                width: Math.floor(window.innerWidth) - 16,
+                height: window.innerHeight * 0.26,
+                yAxisLabel: "",
+                series: [{}, { label: "rustc", stroke: '#7cb5ec' }],
+                commits: data.commits,
+            });
+
+            let totalPlot = new uPlot(totalPlotOpts, totalPlotData, document.querySelector("#totalChart"));
+
             document.querySelector("#loading").style.display = 'none';
         }
 
@@ -291,4 +306,4 @@ <h3>This may take a while!</h3>
     </script>
 </body>
 
-</html>
+</html>