Single place to copy all macros

infra/graphs.py

@@ -256,8 +256,6 @@ def make_macros(profile, benchmark_suites, output_file):
     # report the number of benchmarks in the profile
     out.write(format_latex_macro("NumBenchmarksAllSuites", len(dedup([b.get('benchmark') for b in profile]))))
 
-
-
 
 
 

infra/nightly-resources/data.js

@@ -115,17 +115,10 @@ function getDataForBenchmark(benchmark) {
       const rowData = {
         runMethod: row.runMethod,
         mean: { class: "", value: tryRound(mean(cycles)) },
-        meanVsBaseline: getDifference(cycles, comparisonCycles, mean),
+        meanVsOtherBranch: getDifference(cycles, comparisonCycles, mean),
         min: { class: "", value: tryRound(min_cycles(cycles)) },
-        minVsBaseline: getDifference(cycles, comparisonCycles, min_cycles),
         max: { class: "", value: tryRound(max_cycles(cycles)) },
-        maxVsBaseline: getDifference(cycles, comparisonCycles, max_cycles),
         median: { class: "", value: tryRound(median_cycles(cycles)) },
-        medianVsBaseline: getDifference(
-          cycles,
-          comparisonCycles,
-          median_cycles,
-        ),
         stddev: { class: "", value: tryRound(stddev(cycles)) },
         eggccCompileTimeSecs: {
           class: "",

infra/nightly-resources/index.js

@@ -67,23 +67,7 @@ function addTableTo(element, data, title) {
     navigator.clipboard.writeText(table);
   };
 
-  // add a button that copies latex macros for table
-  const copyMacrosButton = document.createElement("button");
-  copyMacrosButton.innerText = "Copy Latex Macros";
-  copyMacrosButton.onclick = () => {
-    const macros = nestedJsonToLatexMacros(
-      data,
-      "name",
-      "executions",
-      "runMethod",
-    );
-    console.log("macros");
-    console.log(macros);
-    navigator.clipboard.writeText(macros);
-  };
-
   element.appendChild(copyButton);
-  element.appendChild(copyMacrosButton);
 
   // add a new div for the table
   const tableDiv = document.createElement("div");
@@ -130,18 +114,22 @@ function refreshView() {
 
   // fill in the overall stats table
   const overallStats = getOverallStatistics();
-
-  console.log("here");
   addTableTo(document.getElementById("tables"), overallStats, "Overall Stats");
 
+  var latexMacros = "";
+  latexMacros = latexMacros + jsonToLatexMacros(overallStats, "runMethod", "");
+
   for (const suite of getSuites()) {
     const tableData = tableForSuite(suite);
     addTableTo(document.getElementById("tables"), tableData, suite + " Stats");
+    latexMacros =
+      latexMacros +
+      nestedJsonToLatexMacros(tableData, "name", "executions", "runMethod");
   }
 
   renderWarnings();
   refreshChart();
-  refreshLatexMacros();
+  refreshLatexMacros(latexMacros);
 }
 
 function renderWarnings() {
@@ -227,10 +215,10 @@ async function buildNightlyDropdown(element, previousRuns, initialIdx) {
   select.value = formatRun(previousRuns[initialIdx]);
 }
 
-async function refreshLatexMacros() {
+async function refreshLatexMacros(tableMacros) {
   const latexMacrosTextArea = document.getElementById("latex-macros-text");
   const latexMacros = await fetch("nightlymacros.tex").then((r) => r.text());
-  latexMacrosTextArea.value = latexMacros;
+  latexMacrosTextArea.value = tableMacros + latexMacros;
 }
 
 function addGraphs() {

infra/nightly-resources/latex.js

@@ -109,15 +109,31 @@ function jsonToLatexTable(json) {
   return res;
 }
 
-// change dashes to underscores
+const replenum = {
+  0: "zero",
+  1: "one",
+  2: "two",
+  3: "three",
+  4: "four",
+  5: "five",
+  6: "six",
+  7: "seven",
+  8: "eight",
+  9: "nine",
+};
+
+// remove dashes and underscores, replace numbers with words
 function convertStringToValidLatexVar(str) {
   // if the str is valid html, get the text content
   if (str.includes("<")) {
     var div = document.createElement("div");
     div.innerHTML = str;
     str = div.textContent;
   }
-  return str.replace(/-/g, "_");
+
+  const dashes_removed = str.replace(/-/g, "").replace(/_/g, "");
+
+  return dashes_removed.replace(/\d/g, (match) => replenum[match]);
 }
 
 // convert a javascript array object storing a table

infra/nightly-resources/table.js

@@ -53,6 +53,9 @@ function ConvertJsonToTable(
   tableClassName,
   linkText,
 ) {
+  // copy the table right away so we don't mutate it
+  parsedJson = JSON.parse(JSON.stringify(parsedJson));
+
   //Patterns for links and NULL value
   var italic = "<i>{0}</i>";
   var link = linkText