Merge pull request #1300 from rust-lang/graphs-filter

Add benchmark/scenario/profile filters to graphs page and graph history link to compare page

Author: Mark-Simulacrum

site/src/api.rs

@@ -74,6 +74,9 @@ pub mod graphs {
         pub end: Bound,
         pub stat: String,
         pub kind: GraphKind,
+        pub benchmark: Option<String>,
+        pub scenario: Option<String>,
+        pub profile: Option<String>,
     }
 
     #[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]

site/src/request_handlers/graph.rs

@@ -30,6 +30,9 @@ pub async fn handle_graphs(
             end: Bound::None,
             stat: String::from("instructions:u"),
             kind: graphs::GraphKind::Raw,
+            benchmark: None,
+            scenario: None,
+            profile: None,
         };
 
     if is_default_query {
@@ -80,12 +83,23 @@ async fn create_graphs(
     let artifact_ids = Arc::new(artifact_ids_for_range(ctxt, request.start, request.end));
     let mut benchmarks = HashMap::new();
 
+    let create_selector = |filter: &Option<String>| -> Selector<String> {
+        filter
+            .as_ref()
+            .map(|value| Selector::One(value.clone()))
+            .unwrap_or(Selector::All)
+    };
+
+    let benchmark_selector = create_selector(&request.benchmark);
+    let profile_selector = create_selector(&request.profile);
+    let scenario_selector = create_selector(&request.scenario);
+
     let interpolated_responses: Vec<_> = ctxt
         .statistic_series(
             Query::new()
-                .set::<String>(Tag::Benchmark, Selector::All)
-                .set::<String>(Tag::Profile, Selector::All)
-                .set::<String>(Tag::Scenario, Selector::All)
+                .set::<String>(Tag::Benchmark, benchmark_selector)
+                .set::<String>(Tag::Profile, profile_selector)
+                .set::<String>(Tag::Scenario, scenario_selector)
                 .set::<String>(Tag::Metric, Selector::One(request.stat)),
             artifact_ids.clone(),
         )
@@ -94,9 +108,10 @@ async fn create_graphs(
         .map(|sr| sr.interpolate().map(|series| series.collect::<Vec<_>>()))
         .collect();
 
-    let summary_benchmark = create_summary(ctxt, &interpolated_responses, request.kind)?;
-
-    benchmarks.insert("Summary".to_string(), summary_benchmark);
+    if request.benchmark.is_none() {
+        let summary_benchmark = create_summary(ctxt, &interpolated_responses, request.kind)?;
+        benchmarks.insert("Summary".to_string(), summary_benchmark);
+    }
 
     for response in interpolated_responses {
         let benchmark = response.path.get::<Benchmark>()?.to_string();

site/static/compare.html

@@ -612,17 +612,19 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
                 title="Primary"
                 :cases="testCases.filter(c => c.category === 'primary')"
                 :show-raw-data="showRawData"
-                :commit-a="data.a.commit"
-                :commit-b="data.b.commit"
+                :commit-a="data.a"
+                :commit-b="data.b"
+                :stat="stat"
                 :before="before"
                 :after="after"></test-cases-table>
             <hr />
             <test-cases-table
                 title="Secondary"
                 :cases="testCases.filter(c => c.category === 'secondary')"
                 :show-raw-data="showRawData"
-                :commit-a="data.a.commit"
-                :commit-b="data.b.commit"
+                :commit-a="data.a"
+                :commit-b="data.b"
+                :stat="stat"
                 :before="before"
                 :after="after"></test-cases-table>
             <br />
@@ -989,16 +991,28 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
         });
 
         app.component('test-cases-table', {
-            props: ['cases', 'showRawData', 'commitA', 'commitB', 'before', 'after', 'title'],
+            props: ['cases', 'showRawData', 'commitA', 'commitB', 'before', 'after', 'title', 'stat'],
             methods: {
                 detailedQueryLink(commit, testCase) {
-                    return `/detailed-query.html?commit=${commit}&benchmark=${testCase.benchmark + "-" + testCase.profile}&scenario=${testCase.scenario}`;
+                    return `/detailed-query.html?commit=${commit.commit}&benchmark=${testCase.benchmark + "-" + testCase.profile}&scenario=${testCase.scenario}`;
                 },
                 percentLink(commit, baseCommit, testCase) {
-                    return `/detailed-query.html?commit=${commit}&base_commit=${baseCommit}&benchmark=${testCase.benchmark + "-" + testCase.profile}&scenario=${testCase.scenario}`;
+                    return `/detailed-query.html?commit=${commit.commit}&base_commit=${baseCommit.commit}&benchmark=${testCase.benchmark + "-" + testCase.profile}&scenario=${testCase.scenario}`;
                 },
                 benchmarkLink(benchmark) {
                     return "https://github.com/rust-lang/rustc-perf/tree/master/collector/benchmarks/" + benchmark;
+                },
+                graphLink(commit, stat, testCase) {
+                    let date = new Date(commit.date);
+                    // Move to `two weeks ago` to display history of the test case
+                    date.setUTCDate(date.getUTCDate() - 14);
+                    let year = date.getUTCFullYear();
+                    let month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
+                    let day = date.getUTCDate().toString().padStart(2, '0');
+                    let start = `${year}-${month}-${day}`;
+
+                    let end = commit.commit;
+                    return `/index.html?start=${start}&end=${end}&benchmark=${testCase.benchmark}&profile=${testCase.profile}&scenario=${testCase.scenario}&stat=${stat}`;
                 }
             },
             template: `
@@ -1039,7 +1053,11 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
                      {{ testCase.benchmark }}
                  </a>
                 </td>
-                <td>{{ testCase.profile }}</td>
+                <td>
+                  <a v-bind:href="graphLink(commitB, stat, testCase)" target="_blank" class="silent-link">
+                    {{ testCase.profile }}
+                  </a>
+                </td>
                 <td>{{ testCase.scenario }}</td>
                 <td>
                     <a v-bind:href="percentLink(commitB, commitA, testCase)">

site/static/index.html

@@ -102,6 +102,7 @@ <h3>This may take a while!</h3>
 
         const otherCacheStateColors = ["#8085e9", "#f15c80", "#e4d354", "#2b908f", "#f45b5b", "#91e8e1"];
         const interpolatedColor = "#fcb0f1";
+        const basicProfiles = ["Check", "Debug", "Opt"];
 
         function tooltipPlugin({ onclick, commits, isInterpolated, absoluteMode, shiftX = 10, shiftY = 10 }) {
             let tooltipLeftOffset = 0;
@@ -380,6 +381,8 @@ <h3>This may take a while!</h3>
                         });
                     }
 
+                    let indices = cacheStates[Object.keys(cacheStates)[0]].interpolated_indices;
+
                     let plotOpts = genPlotOpts({
                         title: benchName + "-" + benchKind,
                         width: Math.floor(window.innerWidth / 3) - 16,
@@ -389,7 +392,7 @@ <h3>This may take a while!</h3>
                         commits: data.commits,
                         stat: state.stat,
                         isInterpolated(dataIdx) {
-                            return cacheStates.full.interpolated_indices.has(dataIdx);
+                            return indices.has(dataIdx);
                         },
                         absoluteMode: state.kind == "raw",
                     });
@@ -414,19 +417,19 @@ <h3>This may take a while!</h3>
             let benchmarks = {};
 
             function optInterpolated(profile) {
-                for (let cacheState in profile)
-                    profile[cacheState].interpolated_indices = new Set(profile[cacheState].interpolated_indices);
+                for (let scenario in profile)
+                    profile[scenario].interpolated_indices = new Set(profile[scenario].interpolated_indices);
 
                 return profile;
             }
 
             sortedBenchNames.forEach(name => {
-                const { Check, Debug, Opt } = data.benchmarks[name];
+                benchmarks[name] = {};
 
-                benchmarks[name] = {
-                    check: optInterpolated(Check),
-                    debug: optInterpolated(Debug),
-                    opt: optInterpolated(Opt),
+                for (let profile of basicProfiles) {
+                    if (data.benchmarks[name].hasOwnProperty(profile)) {
+                        benchmarks[name][profile.toLowerCase()] = optInterpolated(data.benchmarks[name][profile]);
+                    }
                 }
             });