Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store times and scores explicitly #16

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Store times and scores explicitly #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 72 additions & 54 deletions JetStreamDriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function displayCategoryScores() {

let summaryElement = document.getElementById("result-summary");
for (let [category, scores] of categoryScores)
summaryElement.innerHTML += `<p> ${category}: ${uiFriendlyNumber(geomean(scores))}</p>`
summaryElement.innerHTML += `<p> ${category}: ${uiFriendlyScore(geomean(scores))}</p>`

categoryScores = null;
}
Expand Down Expand Up @@ -153,6 +153,10 @@ function uiFriendlyNumber(num) {
return num.toFixed(3);
}

function uiFriendlyScore(num) {
return uiFriendlyNumber(num);
}

function uiFriendlyDuration(time)
{
const minutes = time.getMinutes();
Expand Down Expand Up @@ -280,30 +284,30 @@ class Driver {

categoryScores = new Map;
for (const benchmark of this.benchmarks) {
for (let category of Object.keys(benchmark.subTimes()))
for (let category of Object.keys(benchmark.subScores()))
categoryScores.set(category, []);
}

for (const benchmark of this.benchmarks) {
for (let [category, value] of Object.entries(benchmark.subTimes())) {
for (let [category, value] of Object.entries(benchmark.subScores())) {
const arr = categoryScores.get(category);
arr.push(value);
}
}

if (isInBrowser) {
summaryElement.classList.add('done');
summaryElement.innerHTML = "<div class=\"score\">" + uiFriendlyNumber(geomean(allScores)) + "</div><label>Score</label>";
summaryElement.innerHTML = "<div class=\"score\">" + uiFriendlyScore(geomean(allScores)) + "</div><label>Score</label>";
summaryElement.onclick = displayCategoryScores;
if (showScoreDetails)
displayCategoryScores();
statusElement.innerHTML = '';
} else if (!dumpJSONResults) {
console.log("\n");
for (let [category, scores] of categoryScores)
console.log(`${category}: ${uiFriendlyNumber(geomean(scores))}`);
console.log(`${category}: ${uiFriendlyScore(geomean(scores))}`);
Copy link
Contributor

@kmiller68 kmiller68 Dec 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e.g. can we do ${category}: ${uiFriendlyScore(geomean(scores))}, ${uiFriendlyDuration(geomean(times))}?


console.log("\nTotal Score: ", uiFriendlyNumber(geomean(allScores)), "\n");
console.log("\nTotal Score: ", uiFriendlyScore(geomean(allScores)), "\n");
}

this.reportScoreToRunBenchmarkRunner();
Expand Down Expand Up @@ -472,9 +476,9 @@ class Driver {
const results = {};
for (const benchmark of this.benchmarks) {
const subResults = {}
const subTimes = benchmark.subTimes();
for (const name in subTimes) {
subResults[name] = {"metrics": {"Time": {"current": [toTimeValue(subTimes[name])]}}};
const subScores = benchmark.subScores();
for (const name in subScores) {
subResults[name] = {"metrics": {"Time": {"current": [toTimeValue(subScores[name])]}}};
}
results[benchmark.name] = {
"metrics" : {
Expand Down Expand Up @@ -889,9 +893,12 @@ class DefaultBenchmark extends Benchmark {
super(...args);

this.worstCaseCount = getWorstCaseCount(this.plan);
this.firstIteration = null;
this.worst4 = null;
this.average = null;
this.firstIterationTime = null;
this.firstIterationScore = null;
this.worst4Time = null;
this.worst4Score = null;
this.averageTime = null;
this.averageScore = null;

assert(this.iterations > this.worstCaseCount);
}
Expand All @@ -905,7 +912,8 @@ class DefaultBenchmark extends Benchmark {
}
results = copyArray(results);

this.firstIteration = toScore(results[0]);
this.firstIterationTime = results[0];
this.firstIterationScore = toScore(results[0]);

results = results.slice(1);
results.sort((a, b) => a < b ? 1 : -1);
Expand All @@ -915,19 +923,21 @@ class DefaultBenchmark extends Benchmark {
const worstCase = [];
for (let i = 0; i < this.worstCaseCount; ++i)
worstCase.push(results[i]);
this.worst4 = toScore(mean(worstCase));
this.average = toScore(mean(results));
this.worst4Time = mean(worstCase);
this.worst4Score = toScore(this.worst4Time);
this.averageTime = mean(results);
this.averageScore = toScore(this.averageTime);
}

get score() {
return geomean([this.firstIteration, this.worst4, this.average]);
return geomean([this.firstIterationScore, this.worst4Score, this.averageScore]);
}

subTimes() {
subScores() {
return {
"First": this.firstIteration,
"Worst": this.worst4,
"Average": this.average,
"First": this.firstIterationScore,
"Worst": this.worst4Score,
"Average": this.averageScore,
};
}

Expand All @@ -943,20 +953,20 @@ class DefaultBenchmark extends Benchmark {
super.updateUIAfterRun();

if (isInBrowser) {
document.getElementById(firstID(this)).innerHTML = uiFriendlyNumber(this.firstIteration);
document.getElementById(worst4ID(this)).innerHTML = uiFriendlyNumber(this.worst4);
document.getElementById(avgID(this)).innerHTML = uiFriendlyNumber(this.average);
document.getElementById(scoreID(this)).innerHTML = uiFriendlyNumber(this.score);
document.getElementById(firstID(this)).innerHTML = uiFriendlyScore(this.firstIterationScore);
document.getElementById(worst4ID(this)).innerHTML = uiFriendlyScore(this.worst4Score);
document.getElementById(avgID(this)).innerHTML = uiFriendlyScore(this.averageScore);
document.getElementById(scoreID(this)).innerHTML = uiFriendlyScore(this.score);
return;
}

if (dumpJSONResults)
return;

console.log(" Startup:", uiFriendlyNumber(this.firstIteration));
console.log(" Worst Case:", uiFriendlyNumber(this.worst4));
console.log(" Average:", uiFriendlyNumber(this.average));
console.log(" Score:", uiFriendlyNumber(this.score));
console.log(" Startup:", uiFriendlyScore(this.firstIterationScore));
console.log(" Worst Case:", uiFriendlyScore(this.worst4Score));
console.log(" Average:", uiFriendlyScore(this.averageScore));
console.log(" Score:", uiFriendlyScore(this.score));
if (RAMification) {
console.log(" Current Footprint:", uiFriendlyNumber(this.currentFootprint));
console.log(" Peak Footprint:", uiFriendlyNumber(this.peakFootprint));
Expand Down Expand Up @@ -990,17 +1000,21 @@ class WSLBenchmark extends Benchmark {
constructor(...args) {
super(...args);

this.stdlib = null;
this.mainRun = null;
this.stdlibTime = null;
this.stdlibScore = null;
this.mainRunTime = null;
this.mainRunScore = null;
}

processResults(results) {
this.stdlib = toScore(results[0]);
this.mainRun = toScore(results[1]);
this.stdlibTime = results[0];
this.stdlibScore = toScore(results[0]);
this.mainRunTime = results[1];
this.mainRunScore = toScore(results[1]);
}

get score() {
return geomean([this.stdlib, this.mainRun]);
return geomean([this.stdlibScore, this.mainRunScore]);
}

get runnerCode() {
Expand All @@ -1023,10 +1037,10 @@ class WSLBenchmark extends Benchmark {
`;
}

subTimes() {
subScores() {
return {
"Stdlib": this.stdlib,
"MainRun": this.mainRun,
"Stdlib": this.stdlibScore,
"MainRun": this.mainRunScore,
};
}

Expand All @@ -1042,18 +1056,18 @@ class WSLBenchmark extends Benchmark {
super.updateUIAfterRun();

if (isInBrowser) {
document.getElementById("wsl-stdlib-score").innerHTML = uiFriendlyNumber(this.stdlib);
document.getElementById("wsl-tests-score").innerHTML = uiFriendlyNumber(this.mainRun);
document.getElementById("wsl-score-score").innerHTML = uiFriendlyNumber(this.score);
document.getElementById("wsl-stdlib-score").innerHTML = uiFriendlyScore(this.stdlibScore);
document.getElementById("wsl-tests-score").innerHTML = uiFriendlyScore(this.mainRunScore);
document.getElementById("wsl-score-score").innerHTML = uiFriendlyScore(this.score);
return;
}

if (dumpJSONResults)
return;

console.log(" Stdlib:", uiFriendlyNumber(this.stdlib));
console.log(" Tests:", uiFriendlyNumber(this.mainRun));
console.log(" Score:", uiFriendlyNumber(this.score));
console.log(" Stdlib:", uiFriendlyScore(this.stdlibScore));
console.log(" Tests:", uiFriendlyScore(this.mainRunScore));
console.log(" Score:", uiFriendlyScore(this.score));
if (RAMification) {
console.log(" Current Footprint:", uiFriendlyNumber(this.currentFootprint));
console.log(" Peak Footprint:", uiFriendlyNumber(this.peakFootprint));
Expand All @@ -1067,16 +1081,20 @@ class WasmBenchmark extends Benchmark {
super(...args);

this.startupTime = null;
this.startupScore = null;
this.runTime = null;
this.runScore = null;
}

processResults(results) {
this.startupTime = toScore(results[0]);
this.runTime = toScore(results[1]);
this.startupTime = results[0];
this.startupScore= toScore(results[0]);
this.runTime = results[1];
this.runScore = toScore(results[1]);
}

get score() {
return geomean([this.startupTime, this.runTime]);
return geomean([this.startupScore, this.runScore]);
}

get prerunCode() {
Expand Down Expand Up @@ -1194,10 +1212,10 @@ class WasmBenchmark extends Benchmark {
return str;
}

subTimes() {
subScores() {
return {
"Startup": this.startupTime,
"Runtime": this.runTime,
"Startup": this.startupScore,
"Runtime": this.runScore,
};
}

Expand All @@ -1223,22 +1241,22 @@ class WasmBenchmark extends Benchmark {
super.updateUIAfterRun();

if (isInBrowser) {
document.getElementById(this.startupID).innerHTML = uiFriendlyNumber(this.startupTime);
document.getElementById(this.runID).innerHTML = uiFriendlyNumber(this.runTime);
document.getElementById(this.scoreID).innerHTML = uiFriendlyNumber(this.score);
document.getElementById(this.startupID).innerHTML = uiFriendlyScore(this.startupScore);
document.getElementById(this.runID).innerHTML = uiFriendlyScore(this.runScore);
document.getElementById(this.scoreID).innerHTML = uiFriendlyScore(this.score);
return;
}

if (dumpJSONResults)
return;

console.log(" Startup:", uiFriendlyNumber(this.startupTime));
console.log(" Run time:", uiFriendlyNumber(this.runTime));
console.log(" Startup:", uiFriendlyScore(this.startupScore));
console.log(" Run time:", uiFriendlyScore(this.runScore));
if (RAMification) {
console.log(" Current Footprint:", uiFriendlyNumber(this.currentFootprint));
console.log(" Peak Footprint:", uiFriendlyNumber(this.peakFootprint));
}
console.log(" Score:", uiFriendlyNumber(this.score));
console.log(" Score:", uiFriendlyScore(this.score));
}
};

Expand Down