Skip to content

Cleanup of non-browser prefetch code #93

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

Merged
merged 2 commits into from
Jul 23, 2025
Merged

Cleanup of non-browser prefetch code #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc3d21a
Cleanup of non-browser prefetch code
danleh Jul 14, 2025
78070d5
remove unused variable
danleh Jul 14, 2025
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
123 changes: 39 additions & 84 deletions JetStreamDriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,47 +181,27 @@ function uiFriendlyDuration(time) {
return `${time.toFixed(3)} ms`;
}

// 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.
const fileLoader = (function() {
Copy link
Contributor

Choose a reason for hiding this comment

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

future-nit: we could actually start using modules instead of these "hacky" IFEEs to hide the classes.

class Loader {
constructor() {
this.requests = new Map;
}

async _loadInternal(url) {
if (!isInBrowser)
return Promise.resolve(readFile(url));
// Cache / memoize previously read files, because some workloads
// share common code.
load(url) {
assert(!isInBrowser);

let response;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These following lines were dead code, since fileLoader.load and thus _loadInternal were only called from non-browser code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also, since the remaining non-browser only code doesn't use promises at all, this doesn't need to be async any longer. And this propagates further up the call chain.

Copy link
Contributor

Choose a reason for hiding this comment

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

ACK.

const tries = 3;
while (tries--) {
let hasError = false;
try {
response = await fetch(url);
} catch (e) {
hasError = true;
}
if (!hasError && response.ok)
break;
if (tries)
continue;
globalThis.allIsGood = false;
throw new Error("Fetch failed");
}
if (url.indexOf(".js") !== -1)
return response.text();
else if (url.indexOf(".wasm") !== -1)
return response.arrayBuffer();

throw new Error("should not be reached!");
}

async load(url) {
if (this.requests.has(url))
if (this.requests.has(url)) {
return this.requests.get(url);
}

const promise = this._loadInternal(url);
this.requests.set(url, promise);
return promise;
const contents = readFile(url);
this.requests.set(url, contents);
return contents;
}
}
return new Loader;
Expand All @@ -233,6 +213,8 @@ class Driver {
this.isDone = false;
this.errors = [];
this.benchmarks = [];
// TODO: Cleanup / remove / merge `blobDataCache` and `loadCache` vs.
// the global `fileLoader` cache.
this.blobDataCache = { };
this.loadCache = { };
this.counter = { };
Expand All @@ -241,9 +223,10 @@ class Driver {
this.counter.failedPreloadResources = 0;
}

// TODO: Remove, make `this.benchmarks` immutable and set it once in the
// ctor instead of this and the global `addBenchmarksBy*` functions.
addBenchmark(benchmark) {
this.benchmarks.push(benchmark);
benchmark.fetchResources();
}

async start() {
Expand Down Expand Up @@ -336,8 +319,7 @@ class Driver {
}
}

runCode(string)
{
runCode(string) {
if (!isInBrowser) {
const scripts = string;
let globalObject;
Expand Down Expand Up @@ -387,8 +369,7 @@ class Driver {
return magicFrame;
}

prepareToRun()
{
prepareToRun() {
this.benchmarks.sort((a, b) => a.plan.name.toLowerCase() < b.plan.name.toLowerCase() ? 1 : -1);

let text = "";
Expand Down Expand Up @@ -433,8 +414,7 @@ class Driver {
});
}

reportError(benchmark, error)
{
reportError(benchmark, error) {
this.pushError(benchmark.name, error);

if (!isInBrowser)
Expand All @@ -459,8 +439,7 @@ class Driver {
async initialize() {
if (isInBrowser)
window.addEventListener("error", (e) => this.pushError("driver startup", e.error));
await this.prefetchResourcesForBrowser();
await this.fetchResources();
await this.prefetchResources();
this.prepareToRun();
this.isReady = true;
if (isInBrowser) {
Expand All @@ -471,14 +450,18 @@ class Driver {
}
}

async prefetchResourcesForBrowser() {
if (!isInBrowser)
async prefetchResources() {
if (!isInBrowser) {
for (const benchmark of this.benchmarks)
benchmark.prefetchResourcesForShell();
return;
}

// TODO: Cleanup the browser path of the preloading below and in
// `prefetchResourcesForBrowser` / `retryPrefetchResourcesForBrowser`.
const promises = [];
for (const benchmark of this.benchmarks)
promises.push(benchmark.prefetchResourcesForBrowser());

await Promise.all(promises);

const counter = JetStream.counter;
Expand All @@ -498,16 +481,6 @@ class Driver {
}

JetStream.loadCache = { }; // Done preloading all the files.
}

async fetchResources() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Merged with prefetchResourcesForBrowser into prefetchResources.

const promises = [];
for (const benchmark of this.benchmarks)
promises.push(benchmark.fetchResources());
await Promise.all(promises);

if (!isInBrowser)
return;

const statusElement = document.getElementById("status");
statusElement.classList.remove('loading');
Expand Down Expand Up @@ -623,7 +596,7 @@ class Benchmark {
this.isAsync = !!plan.isAsync;
this.disabledByDefault = !!plan.disabledByDefault;
this.scripts = null;
this._resourcesPromise = null;
this.preloads = null;
this._state = BenchmarkState.READY;
}

Expand Down Expand Up @@ -888,8 +861,8 @@ class Benchmark {
}

prefetchResourcesForBrowser() {
if (!isInBrowser)
return;
assert(isInBrowser);

const promises = this.plan.files.map((file) => this.loadBlob("file", null, file).then((blobData) => {
if (!globalThis.allIsGood)
return;
Expand Down Expand Up @@ -921,6 +894,8 @@ class Benchmark {
}

async retryPrefetchResource(type, prop, file) {
assert(isInBrowser);

const counter = JetStream.counter;
const blobData = JetStream.blobDataCache[file];
if (blobData.blob) {
Expand Down Expand Up @@ -955,8 +930,7 @@ class Benchmark {
}

async retryPrefetchResourcesForBrowser() {
if (!isInBrowser)
return;
assert(isInBrowser);

const counter = JetStream.counter;
for (const resource of this.plan.files) {
Expand All @@ -976,33 +950,14 @@ class Benchmark {
return !counter.failedPreloadResources && counter.loadedResources == counter.totalResources;
}

fetchResources() {
if (this._resourcesPromise)
return this._resourcesPromise;
prefetchResourcesForShell() {
assert(!isInBrowser);

this.preloads = [];

if (isInBrowser) {
this._resourcesPromise = Promise.resolve();
return this._resourcesPromise;
}

const filePromises = this.plan.files.map((file) => fileLoader.load(file));
this._resourcesPromise = Promise.all(filePromises).then((texts) => {
if (isInBrowser)
return;
this.scripts = [];
assert(texts.length === this.plan.files.length);
for (const text of texts)
this.scripts.push(text);
});

if (this.plan.preload) {
for (const prop of Object.getOwnPropertyNames(this.plan.preload))
this.preloads.push([ prop, this.plan.preload[prop] ]);
}
assert(this.scripts === null, "This initialization should be called only once.");
this.scripts = this.plan.files.map(file => fileLoader.load(file));

return this._resourcesPromise;
assert(this.preloads === null, "This initialization should be called only once.");
this.preloads = Object.entries(this.plan.preload ?? {});
}

static scoreDescription() { throw new Error("Must be implemented by subclasses."); }
Expand Down
Loading