Reworked how warmup plot is going to work: render in the browser

The R setup would render this immediately, but the plots are rearely used, so, instead of doing it at report generation time, we can leave it to on-demand requesting of data and rendering.
smarr · May 6, 2023 · dbfa19d · dbfa19d
1 parent 88e744f
commit dbfa19d
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 17 deletions.
diff --git a/src/views/compare.ts b/src/views/compare.ts
@@ -107,12 +107,13 @@ function fetchProfile(projectName: string, change, runId, trialId, jqInsert) {
   });
 }
 
-function insertProfiles(e) {
+function insertProfiles(e): void {
   const projectName = <string>$('#project-name').attr('value');
   const jqButton = $(e.target);
   let profileInsertTarget = jqButton.parent().parent();
   jqButton.remove();
 
+  // format is serialized in data-format.ts:dataSeriesIds()
   const profilesIds = jqButton.data('content').split(',');
   for (const ids of profilesIds) {
     const [change, runId, trialId] = ids.split('/');

diff --git a/src/views/compare/stats-row-buttons-info.html b/src/views/compare/stats-row-buttons-info.html
@@ -10,14 +10,14 @@
     data-content="{%= f.formatEnvironment(d.envId, it.environments) %}"></button>
 {% }
 
-   if (d.warmupPlotUrl) {
-%}<button type="button" class="btn btn-sm btn-light btn-expand" data-img="{%= d.warmupPlotUrl %}"></button>
-{% } 
+   if (d.hasWarmup) {
+%}<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="{%= f.dataSeriesIds(d.dataSeries) %}"></button>
+{%
+   } 
 
-   if (d.profileIds) {
-      const p = d.profileIds;
-%}<button type="button" class="btn btn-sm btn-profile" data-content="{%= p.base.commitId %}/{%= p.base.runId %}/{%= p.base.trialId %},{%= p.change.commitId %}/{%= p.change.runId %}/{%= p.change.trialId %}"></button>{%
+   if (d.hasProfiles) {
+%}<button type="button" class="btn btn-sm btn-profile" data-content="{%= f.dataSeriesIds(d.dataSeries) %}"></button>
+{%
    }
-%}
-<button type="button" class="btn btn-sm btn-timeline" data-content='{%- JSON.stringify(
+%}<button type="button" class="btn btn-sm btn-timeline" data-content='{%- JSON.stringify(
   f.benchmarkId(b.b, b.e, b.s, b.v, d.numV, b.c, d.numC, b.i, d.numI, b.ea, d.numEa)) %}'></button>
diff --git a/src/views/view-types.ts b/src/views/view-types.ts
@@ -54,25 +54,30 @@ export interface CompareStatsRowAcrossVersionsPartial {
   dataFormatters: DataFormat;
 }
 
-export interface ProfileId {
-  commitId: string;
+/**
+ * Identifies the set of measurements of a specific run, i.e., a concrete
+ * benchmark execution, and a specific trial, i.e., in a specific environment.
+ */
+export interface DataSeriesId {
+  commitId: string; // this one is a bit redundant, it's implied by the trialId
   runId: number;
   trialId: number;
 }
 
-export interface ProfileIds {
-  base: ProfileId;
-  change: ProfileId;
+export interface DataSeriesVersionComparison {
+  base: DataSeriesId;
+  change: DataSeriesId;
 }
 
 export interface DetailedInfo {
   cmdline: string;
 
   envId: number;
 
-  warmupPlotUrl?: string;
+  hasWarmup: boolean;
+  hasProfiles: boolean;
 
-  profileIds?: ProfileIds;
+  dataSeries?: DataSeriesVersionComparison;
 
   /** Number of VarValues */
   numV: number;

diff --git a/tests/views/compare-view.test.ts b/tests/views/compare-view.test.ts
@@ -71,7 +71,9 @@ const environments: Environment[] = [
 const details: DetailedInfo = {
   cmdline: 'som/some-command with args',
   envId: 1,
-  profileIds: {
+  hasProfiles: true,
+  hasWarmup: true,
+  dataSeries: {
     base: {
       commitId: '123456',
       runId: 1,

diff --git a/tests/views/expected-results/compare-versions.html b/tests/views/expected-results/compare-versions.html
@@ -34,6 +34,7 @@ <h3 id="suite1-exe1">suite1</h3>
 data-content="<code>som/some-command with args</code>"></button>
 <button type="button" class="btn btn-sm btn-environment btn-popover"
 data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
+<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-profile" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
 </tr></tbody>

diff --git a/tests/views/expected-results/stats-row-button-info.html b/tests/views/expected-results/stats-row-button-info.html
@@ -2,5 +2,6 @@
 data-content="<code>som/some-command with args</code>"></button>
 <button type="button" class="btn btn-sm btn-environment btn-popover"
 data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
+<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-profile" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button>
diff --git a/tests/views/expected-results/stats-row-exe.html b/tests/views/expected-results/stats-row-exe.html
@@ -35,6 +35,7 @@
 data-content="<code>som/some-command with args</code>"></button>
 <button type="button" class="btn btn-sm btn-environment btn-popover"
 data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
+<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-profile" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
 </tr>
diff --git a/tests/views/expected-results/stats-row-version.html b/tests/views/expected-results/stats-row-version.html
@@ -12,6 +12,7 @@
 data-content="<code>som/some-command with args</code>"></button>
 <button type="button" class="btn btn-sm btn-environment btn-popover"
 data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
+<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-profile" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
 </tr>
diff --git a/tests/views/expected-results/stats-tbl.html b/tests/views/expected-results/stats-tbl.html
@@ -29,6 +29,7 @@
 data-content="<code>som/some-command with args</code>"></button>
 <button type="button" class="btn btn-sm btn-environment btn-popover"
 data-content="MyHost | Linux | 121kb | Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz | 3GHz"></button>
+<button type="button" class="btn btn-sm btn-light btn-warmup" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-profile" data-content="123456/1/2,123457/3/4"></button>
 <button type="button" class="btn btn-sm btn-timeline" data-content='{"b":"my-benchmark","e":"exe1","s":"suite2"}'></button></td>
 </tr></tbody>