Double-column layout for opt/non-opt.

Mark-Simulacrum · Mark-Simulacrum · commit bd94eeeac6b3 · 2017-11-29T19:13:37.000-07:00
This makes it somewhat shorter of a page, and potentially eases
comparison across the two (though it is unknown whether this is
necessary -- it seems like a possible usecase, though, especially for
future benchmarks where that comparison may be more meaningful, e.g.,
runtime benchmarks).
diff --git a/site/src/api.rs b/site/src/api.rs
@@ -114,6 +114,7 @@ pub mod graph {
     pub struct Response {
         /// Crate -> Benchmark -> [GraphData]
         pub benchmarks: HashMap<String, HashMap<String, Vec<GraphData>>>,
+        pub max: HashMap<String, f64>,
     }
 }
 
diff --git a/site/src/server.rs b/site/src/server.rs
@@ -120,13 +120,13 @@ pub fn handle_graph(body: graph::Request, data: &InputData) -> ServerResult<grap
                     trivial = true;
                 }
 
-                let mut entry = entry.entry(name.clone())
+                let mut entry = entry.entry(name)
                     .or_insert_with(|| Vec::<graph::GraphData>::with_capacity(elements));
                 let first = entry.first().map(|d| d.absolute);
                 let percent = first.map_or(0.0, |f| (value - f) / f * 100.0);
                 entry
                     .push(graph::GraphData {
-                        benchmark: name,
+                        benchmark: run.state.name(),
                         commit: commit.clone(),
                         url: last_commit.as_ref().map(|c| {
                             format!("/compare.html?start={}&end={}&stat={}",
@@ -194,7 +194,21 @@ pub fn handle_graph(body: graph::Request, data: &InputData) -> ServerResult<grap
         last_commit = Some(commit);
     }
 
+    let mut maxes = HashMap::new();
+    for (ref crate_name, ref benchmarks) in &result {
+        let name = crate_name.replace("-opt", "");
+        let mut max = 0.0f64;
+        for points in benchmarks.values() {
+            for point in points {
+                max = max.max(point.y);
+            }
+        }
+        let max = maxes.get(&name).cloned().unwrap_or(0.0f64).max(max);
+        maxes.insert(name, max);
+    }
+
     Ok(graph::Response {
+        max: maxes,
         benchmarks: result,
     })
 }
diff --git a/site/static/index.html b/site/static/index.html
@@ -4,6 +4,14 @@
     <meta charset="utf-8">
     <title>rustc performance data</title>
     <link rel="stylesheet" type="text/css" href="perf.css">
+    <style>
+        #charts {
+            width: 100%;
+        }
+        div[id^="chart-container"] {
+            max-width: 50%;
+        }
+    </style>
 </head>
 <body class="container">
     <div>&gt; <a href="index.html">graphs</a>, <a href="compare.html">compare</a>.</div>
@@ -55,18 +63,30 @@
             return false;
         }
 
-        let elements = [];
+        let by_crate = {};
         for (let crate_name of sorted_names) {
-            let element = document.createElement("div");
-            element.id = "chart-container-" + crate_name;
-            document.getElementById("charts").appendChild(element);
+            let key = crate_name.replace("-opt", "");
+            if (!by_crate[key]) by_crate[key] = [];
+            by_crate[key].push(crate_name);
+        }
+        for (let crate_names of Object.values(by_crate)) {
+            let wrapper = document.createElement("table");
+            let row = document.createElement("tr");
+            wrapper.appendChild(row);
+            for (let crate_name of crate_names) {
+                let element = document.createElement("td");
+                element.id = "chart-container-" + crate_name;
+                row.appendChild(element);
+            }
+            document.getElementById("charts").appendChild(wrapper);
         }
         let graphs = [];
         for (let crate_name of sorted_names) {
             graphs.push(() => {
             let benchmark_names = Object.keys(response.benchmarks[crate_name]);
             benchmark_names.sort();
             let datasets = [];
+            let max = response.max[crate_name.replace("-opt", "")];
             for (let name of benchmark_names) {
                 let data = response.benchmarks[crate_name][name];
                 datasets.push({
@@ -101,23 +121,30 @@
                         let date = new Date();
                         date.setUTCMilliseconds(this.x);
                         let commit = this.point.commit.substr(0, 10);
-                        let yAxis = crate_name.startsWith("Summary") ? summaryYAxis : yAxis;
+                        let y_axis = crate_name.startsWith("Summary") ? summaryYAxis : yAxis;
                         return "<b>" + date.toLocaleString() + " - " + commit + "</b>" +
                             "<br>" + this.series.name + ": " + this.point.absolute.toFixed(2) + " " +
-                            yAxis.toLowerCase() + " (" +
+                            y_axis.toLowerCase() + " (" +
                             this.point.percent.toFixed(2) + "% from start)";
                     },
                 },
                 xAxis: {
                     type: "datetime",
                 },
                 yAxis: absolute ? {
-                    title: {
+                    title: crate_name.includes("-opt") ? { text: "" } : {
                         text: crate_name.startsWith("Summary") ? summaryYAxis : yAxis,
                     },
+                    labels: crate_name.includes("-opt") ? {
+                        enabled: false,
+                    } : {},
                     min: 0,
+                    max: max * 1.05,
+                    softMax: max * 1.05,
+                    ceiling: max * 1.05,
+                    floor: 0,
                 } : {
-                    softMax: 5,
+                    max: max * 1.05,
                     softMin: -5,
                     minRange: 0.1,
                     title: {
diff --git a/site/static/perf.css b/site/static/perf.css
@@ -1,13 +1,6 @@
 body {
     font-family: monospace;
-    margin-top: 20px;
-    margin-bottom: 10px;
-    max-width: 1000px;
-}
-@media (min-width: 992px) {
-    body {
-        margin-left: 5%;
-    }
+    margin: 1em auto;
 }
 p {
     margin-top: 1.2em;

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ pub mod graph {`
`114`	`114`	`pub struct Response {`
`115`	`115`	`/// Crate -> Benchmark -> [GraphData]`
`116`	`116`	`pub benchmarks: HashMap<String, HashMap<String, Vec<GraphData>>>,`
	`117`	`+ pub max: HashMap<String, f64>,`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`