diff --git a/JetStream.css b/JetStream.css
index b510f02..c48cc3c 100644
--- a/JetStream.css
+++ b/JetStream.css
@@ -348,6 +348,13 @@ a.button {
scroll-margin-bottom: 20vh;
}
+.benchmark .result.detail {
+ display: none;
+}
+.details .benchmark .result.detail {
+ display: inline-block;
+}
+
.benchmark h4,
.benchmark .result,
.benchmark label,
diff --git a/JetStreamDriver.js b/JetStreamDriver.js
index 8b74ab2..26f500a 100644
--- a/JetStreamDriver.js
+++ b/JetStreamDriver.js
@@ -37,25 +37,8 @@ if (!JetStreamParams.prefetchResources)
this.currentResolve = null;
this.currentReject = null;
-let showScoreDetails = false;
-let categoryScores = null;
-
function displayCategoryScores() {
- if (!categoryScores)
- return;
-
- let scoreDetails = ``;
- for (let [category, scores] of categoryScores) {
- scoreDetails += `
- ${uiFriendlyScore(geomeanScore(scores))}
-
- `;
- }
- scoreDetails += "
";
- let summaryElement = document.getElementById("result-summary");
- summaryElement.innerHTML += scoreDetails;
-
- categoryScores = null;
+ document.body.classList.add("details");
}
function getIterationCount(plan) {
@@ -81,19 +64,22 @@ function getWorstCaseCount(plan) {
if (isInBrowser) {
document.onkeydown = (keyboardEvent) => {
const key = keyboardEvent.key;
- if (key === "d" || key === "D") {
- showScoreDetails = true;
+ if (key === "d" || key === "D")
displayCategoryScores();
- }
};
}
-function mean(values) {
+function sum(values) {
console.assert(values instanceof Array);
let sum = 0;
for (let x of values)
sum += x;
- return sum / values.length;
+ return sum;
+}
+
+function mean(values) {
+ const totalSum = sum(values)
+ return totalSum / values.length;
}
function geomeanScore(values) {
@@ -135,9 +121,25 @@ function uiFriendlyScore(num) {
}
function uiFriendlyDuration(time) {
- return `${time.toFixed(3)} ms`;
+ return `${time.toFixed(2)} ms`;
+}
+
+
+function shellFriendlyLabel(label) {
+ const namePadding = 40;
+ return `${label}:`.padEnd(namePadding);
+}
+
+const valuePadding = 10;
+function shellFriendlyDuration(time) {
+ return `${uiFriendlyDuration(time)}`.padStart(valuePadding);
}
+function shellFriendlyScore(time) {
+ return `${uiFriendlyScore(time)} # `.padStart(valuePadding);
+}
+
+
// TODO: Cleanup / remove / merge. This is only used for caching loads in the
// non-browser setting. In the browser we use exclusively `loadCache`,
// `loadBlob`, `doLoadBlob`, `prefetchResourcesForBrowser` etc., see below.
@@ -226,7 +228,7 @@ class Driver {
if (isInBrowser)
document.getElementById("benchmark-total-time-score").innerHTML = uiFriendlyNumber(totalTime);
else if (!JetStreamParams.dumpJSONResults)
- console.log("Total time:", uiFriendlyNumber(totalTime));
+ console.log("Total-Time:", uiFriendlyNumber(totalTime));
allScores.push(totalTime);
}
@@ -237,10 +239,13 @@ class Driver {
allScores.push(score);
}
- categoryScores = new Map;
+ const categoryScores = new Map();
+ const categoryTimes = new Map();
for (const benchmark of this.benchmarks) {
for (let category of Object.keys(benchmark.subScores()))
categoryScores.set(category, []);
+ for (let category of Object.keys(benchmark.subTimes()))
+ categoryTimes.set(category, []);
}
for (const benchmark of this.benchmarks) {
@@ -249,25 +254,55 @@ class Driver {
console.assert(value > 0, `Invalid ${benchmark.name} ${category} score: ${value}`);
arr.push(value);
}
+ for (let [category, value] of Object.entries(benchmark.subTimes())) {
+ const arr = categoryTimes.get(category);
+ console.assert(value > 0, `Invalid ${benchmark.name} ${category} time: ${value}`);
+ arr.push(value);
+ }
}
const totalScore = geomeanScore(allScores);
console.assert(totalScore > 0, `Invalid total score: ${totalScore}`);
if (isInBrowser) {
+ let summaryHtml = `${uiFriendlyScore(totalScore)}
+ `;
+ summaryHtml += ``;
+ for (let [category, scores] of categoryScores) {
+ summaryHtml += `
+ ${uiFriendlyScore(geomeanScore(scores))}
+
+ `;
+ }
+ summaryHtml += "
";
+ for (let [category, times] of categoryTimes) {
+ summaryHtml += `
+ ${uiFriendlyDuration(geomeanScore(times))}
+
+ `;
+ }
+ summaryHtml += "
";
const summaryElement = document.getElementById("result-summary");
summaryElement.classList.add("done");
- summaryElement.innerHTML = `${uiFriendlyScore(totalScore)}
- `;
+ summaryElement.innerHTML = summaryHtml;
summaryElement.onclick = displayCategoryScores;
- if (showScoreDetails)
- displayCategoryScores();
statusElement.innerHTML = "";
} else if (!JetStreamParams.dumpJSONResults) {
- console.log("\n");
- for (let [category, scores] of categoryScores)
- console.log(`${category}: ${uiFriendlyScore(geomeanScore(scores))}`);
- console.log("\nTotal Score: ", uiFriendlyScore(totalScore), "\n");
+ console.log("Total:");
+ for (let [category, scores] of categoryScores) {
+ console.log(
+ shellFriendlyLabel(`${category}-Score`),
+ shellFriendlyScore(geomeanScore(scores)));
+ }
+ for (let [category, times] of categoryTimes) {
+ console.log(
+ shellFriendlyLabel(`${category}-Time`),
+ shellFriendlyDuration(geomeanScore(times)));
+ }
+ console.log("");
+ console.log(shellFriendlyLabel("Total-Score"), shellFriendlyScore(totalScore));
+ console.log(shellFriendlyLabel("Total-Time"), shellFriendlyDuration(totalTime));
+ console.log("");
}
this.reportScoreToRunBenchmarkRunner();
@@ -284,33 +319,38 @@ class Driver {
prepareToRun() {
this.benchmarks.sort((a, b) => a.plan.name.toLowerCase() < b.plan.name.toLowerCase() ? 1 : -1);
+ if (!isInBrowser)
+ return;
+
let text = "";
for (const benchmark of this.benchmarks) {
- const description = Object.keys(benchmark.subScores());
- description.push("Score");
+ const scoreDescription = Object.keys(benchmark.allScores());
+ const timeDescription = Object.keys(benchmark.allTimes());
- const scoreIds = benchmark.scoreIdentifiers();
+ const scoreIds = benchmark.allScoreIdentifiers();
const overallScoreId = scoreIds.pop();
-
- if (isInBrowser) {
- text +=
- `
-
${benchmark.name} i
-
-
-
`;
- for (let i = 0; i < scoreIds.length; i++) {
- const scoreId = scoreIds[i];
- const label = description[i];
- text += ` `
- }
- text += `
+
${benchmark.name} i
+
+
+
`;
+ for (let i = 0; i < scoreIds.length; i++) {
+ const scoreId = scoreIds[i];
+ const label = scoreDescription[i];
+ text += ` `
}
+ text += "
";
+ for (let i = 0; i < timeIds.length; i++) {
+ const timeId = timeIds[i];
+ const label = timeDescription[i];
+ text += ` `
+ }
+ text += `