Merge pull request #1945 from s7tya/feat/add-runtime-chart-to-dashboard

Add runtime chart to dashboard

Author: Kobzol

site/frontend/src/pages/dashboard.ts

@@ -3,7 +3,7 @@ import {DASHBOARD_DATA_URL} from "../urls";
 
 import {getJson} from "../utils/requests";
 
-interface DashboardCases {
+interface DashboardCompileBenchmarkCases {
   clean_averages: [number];
   base_incr_averages: [number];
   clean_incr_averages: [number];
@@ -13,10 +13,11 @@ interface DashboardCases {
 interface DashboardResponse {
   Ok: {
     versions: [string];
-    check: DashboardCases;
-    debug: DashboardCases;
-    opt: DashboardCases;
-    doc: DashboardCases;
+    check: DashboardCompileBenchmarkCases;
+    debug: DashboardCompileBenchmarkCases;
+    opt: DashboardCompileBenchmarkCases;
+    doc: DashboardCompileBenchmarkCases;
+    runtime: [number];
   };
 }
 
@@ -25,7 +26,7 @@ type Profile = "check" | "debug" | "opt" | "doc";
 function render(
   element: string,
   name: Profile,
-  data: DashboardCases,
+  data: DashboardCompileBenchmarkCases,
   versions: [string]
 ) {
   let articles = {check: "a", debug: "a", opt: "an", doc: "a"};
@@ -78,12 +79,44 @@ function render(
   });
 }
 
+function renderRuntime(element: string, data: [number], versions: [string]) {
+  Highcharts.chart({
+    chart: {
+      renderTo: element,
+      zooming: {
+        type: "xy",
+      },
+      type: "line",
+    },
+    title: {
+      text: `Average time for a runtime benchmark`,
+    },
+    yAxis: {
+      title: {text: "Seconds"},
+      min: 0,
+    },
+    xAxis: {
+      categories: versions,
+      title: {text: "Version"},
+    },
+    series: [
+      {
+        showInLegend: false,
+        type: "line",
+        animation: false,
+        data,
+      },
+    ],
+  });
+}
+
 function populate_data(response: DashboardResponse) {
   const data = response.Ok;
   render("check-average-times", "check", data.check, data.versions);
   render("debug-average-times", "debug", data.debug, data.versions);
   render("opt-average-times", "opt", data.opt, data.versions);
   render("doc-average-times", "doc", data.doc, data.versions);
+  renderRuntime("runtime-average-times", data.runtime, data.versions);
 }
 
 async function make_data() {

site/frontend/templates/pages/dashboard.html

@@ -1,21 +1,38 @@
 {% extends "layout.html" %}
+{% block head %}
+<style>
+    .graphs {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
+        @media screen and (max-width: 768px) {
+            grid-template-columns: 1fr;
+        }
+    }
+</style>
+{% endblock %}
 {% block content %}
 <details style="margin-top: 10px;">
-<summary>What data is in the dashboard?</summary>
+    <summary>What data is in the dashboard?</summary>
 
-The dashboard shows performance results for all stable Rust releases going back to
-<code>1.28.0</code>, along with the latest <code>beta</code> release. The displayed
-duration is an arithmetic mean amongst all
-<a href="https://github.com/rust-lang/rustc-perf/tree/master/collector/compile-benchmarks#stable">stable</a>
-benchmarks.
+    The dashboard shows performance results for all stable Rust releases going back to
+    <code>1.28.0</code>, along with the latest <code>beta</code> release. The displayed
+    duration is an arithmetic mean amongst all
+    <a href="https://github.com/rust-lang/rustc-perf/tree/master/collector/compile-benchmarks#stable">stable</a>
+    benchmarks. The dashboard also shows the average duration of runtime benchmarks, which measure the performance of
+    Rust programs
+    compiled by a given version of the Rust compiler.
 </details>
 
-<div id="check-average-times"></div>
-<div id="debug-average-times"></div>
-<div id="opt-average-times"></div>
-<div id="doc-average-times"></div>
+<div class="graphs">
+    <div id="check-average-times"></div>
+    <div id="debug-average-times"></div>
+    <div id="opt-average-times"></div>
+    <div id="doc-average-times"></div>
+    <div id="runtime-average-times"></div>
+</div>
 <div id="as-of"></div>
 {% endblock %}
 {% block script %}
 <script src="scripts/dashboard.js"></script>
-{% endblock %}
+{% endblock %}

site/src/api.rs

@@ -75,6 +75,7 @@ pub mod dashboard {
         pub debug: Cases,
         pub opt: Cases,
         pub doc: Cases,
+        pub runtime: Vec<f64>,
     }
 }
 

site/src/request_handlers/dashboard.rs

@@ -82,22 +82,22 @@ pub async fn handle_dashboard(ctxt: Arc<SiteCtxt>) -> ServerResult<dashboard::Re
         static ref STABLE_BENCHMARKS: Vec<String> = get_stable_benchmark_names();
     }
 
-    let query = selector::CompileBenchmarkQuery::default()
+    let compile_benchmark_query = selector::CompileBenchmarkQuery::default()
         .benchmark(selector::Selector::Subset(STABLE_BENCHMARKS.clone()))
         .metric(selector::Selector::One(Metric::WallTime));
 
     let summary_scenarios = ctxt.summary_scenarios();
+    let aids = &artifact_ids;
     let by_profile = ByProfile::new::<String, _, _>(|profile| {
         let summary_scenarios = &summary_scenarios;
         let ctxt = &ctxt;
-        let query = &query;
-        let aids = &artifact_ids;
+        let compile_benchmark_query = &compile_benchmark_query;
         async move {
             let mut cases = dashboard::Cases::default();
             for scenario in summary_scenarios.iter() {
                 let responses = ctxt
                     .statistic_series(
-                        query
+                        compile_benchmark_query
                             .clone()
                             .profile(selector::Selector::One(profile))
                             .scenario(selector::Selector::One(*scenario)),
@@ -130,6 +130,22 @@ pub async fn handle_dashboard(ctxt: Arc<SiteCtxt>) -> ServerResult<dashboard::Re
     .await
     .unwrap();
 
+    let runtime_benchmark_query = selector::RuntimeBenchmarkQuery::default()
+        .benchmark(selector::Selector::All)
+        .metric(selector::Selector::One(Metric::WallTime));
+
+    let responses = ctxt
+        .statistic_series(runtime_benchmark_query.clone(), aids.clone())
+        .await?;
+    let points = db::average(
+        responses
+            .into_iter()
+            .map(|sr| sr.interpolate().series)
+            .collect::<Vec<_>>(),
+    )
+    .map(|((_id, point), _interpolated)| (point.expect("interpolated") * 100.0).round() / 100.0)
+    .collect::<Vec<_>>();
+
     Ok(dashboard::Response {
         versions: artifact_ids
             .iter()
@@ -142,6 +158,7 @@ pub async fn handle_dashboard(ctxt: Arc<SiteCtxt>) -> ServerResult<dashboard::Re
         debug: by_profile.debug,
         opt: by_profile.opt,
         doc: by_profile.doc,
+        runtime: points,
     })
 }
 

site/src/selector.rs

@@ -86,6 +86,7 @@ pub fn range_subset(data: Vec<Commit>, range: RangeInclusive<Bound>) -> Vec<Comm
     }
 }
 
+#[derive(Debug)]
 struct ArtifactIdIter {
     ids: Arc<Vec<ArtifactId>>,
     idx: usize,
@@ -424,6 +425,7 @@ impl SiteCtxt {
     }
 }
 
+#[derive(Debug)]
 pub struct StatisticSeries {
     artifact_ids: ArtifactIdIter,
     points: std::vec::IntoIter<Option<f64>>,