diff --git a/JetStreamDriver.js b/JetStreamDriver.js index 2816170d..5aa981ae 100644 --- a/JetStreamDriver.js +++ b/JetStreamDriver.js @@ -394,11 +394,11 @@ class Driver { let text = ""; let newBenchmarks = []; for (const benchmark of this.benchmarks) { - const id = JSON.stringify(benchmark.constructor.scoreDescription()); - const description = JSON.parse(id); + const description = Object.keys(benchmark.subScores()); + description.push("Score"); newBenchmarks.push(benchmark); - const scoreIds = benchmark.scoreIdentifiers() + const scoreIds = benchmark.scoreIdentifiers(); const overallScoreId = scoreIds.pop(); if (isInBrowser) { @@ -1005,7 +1005,6 @@ class Benchmark { return this._resourcesPromise; } - static scoreDescription() { throw new Error("Must be implemented by subclasses."); } scoreIdentifiers() { throw new Error("Must be implemented by subclasses"); } updateUIBeforeRun() { @@ -1088,10 +1087,6 @@ class DefaultBenchmark extends Benchmark { }; } - static scoreDescription() { - return ["First", "Worst", "Average", "Score"]; - } - scoreIdentifiers() { return [firstID(this), worst4ID(this), avgID(this), scoreID(this)]; } @@ -1310,10 +1305,6 @@ class WSLBenchmark extends Benchmark { }; } - static scoreDescription() { - return ["Stdlib", "MainRun", "Score"]; - } - scoreIdentifiers() { return ["wsl-stdlib-score", "wsl-tests-score", "wsl-score-score"]; } @@ -1486,10 +1477,6 @@ class WasmLegacyBenchmark extends Benchmark { }; } - static scoreDescription() { - return ["Startup", "Runtime", "Score"]; - } - get startupID() { return `wasm-startup-id${this.name}`; }