Skip to content

Bindings: Expect memory growth when lowering references #2568

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 1 commit into from
Nov 16, 2022
Merged

Bindings: Expect memory growth when lowering references #2568

Show file tree
Hide file tree
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
67 changes: 41 additions & 26 deletions src/bindings/js.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ export class JSBuilder extends ExportsWalker {
private needsRetain: bool = false;
private needsRelease: bool = false;
private needsNotNull: bool = false;
private needsStoreRef: bool = false;

private deferredLifts: Set<Element> = new Set();
private deferredLowers: Set<Element> = new Set();
Expand Down Expand Up @@ -851,6 +852,12 @@ export class JSBuilder extends ExportsWalker {
}
`);
}
if (this.needsStoreRef) {
sb.push(` function __store_ref(pointer, value) {
new Uint32Array(memory.buffer)[pointer >>> 2] = value;
}
`);
}

let exportStart = options.exportStart;
if (exportStart) {
Expand Down Expand Up @@ -1177,36 +1184,44 @@ export class JSBuilder extends ExportsWalker {
skipTail = false;
}
if (valueType.isInternalReference) {
// The RHS is typically another lowering to memory, which may trigger
// memory growth. Use a helper closure to delay evaluation of `memory`.
this.needsStoreRef = true;
sb.push("__store_ref(");
sb.push(targetName);
sb.push(", ");
this.makeLowerToValue(valueName, valueType, sb);
sb.push(")");
if (!skipTail) sb.push("; }");
return;
}
if (valueType == Type.i8) {
sb.push("new Int8Array(memory.buffer)[");
} else if (valueType == Type.u8 || valueType == Type.bool) {
sb.push("new Uint8Array(memory.buffer)[");
} else if (valueType == Type.i16) {
sb.push("new Int16Array(memory.buffer)[");
} else if (valueType == Type.u16) {
sb.push("new Uint16Array(memory.buffer)[");
} else if (valueType == Type.i32 || valueType == Type.isize32) {
sb.push("new Int32Array(memory.buffer)[");
} else if (valueType == Type.u32 || valueType == Type.usize32) {
sb.push("new Uint32Array(memory.buffer)[");
} else if (valueType == Type.i64 || valueType == Type.isize64) {
sb.push("new BigInt64Array(memory.buffer)[");
} else if (valueType == Type.u64 || valueType == Type.usize64) {
sb.push("new BigUint64Array(memory.buffer)[");
} else if (valueType == Type.f32) {
sb.push("new Float32Array(memory.buffer)[");
} else if (valueType == Type.f64) {
sb.push("new Float64Array(memory.buffer)[");
} else {
if (valueType == Type.i8) {
sb.push("new Int8Array(memory.buffer)[");
} else if (valueType == Type.u8 || valueType == Type.bool) {
sb.push("new Uint8Array(memory.buffer)[");
} else if (valueType == Type.i16) {
sb.push("new Int16Array(memory.buffer)[");
} else if (valueType == Type.u16) {
sb.push("new Uint16Array(memory.buffer)[");
} else if (valueType == Type.i32 || valueType == Type.isize32) {
sb.push("new Int32Array(memory.buffer)[");
} else if (valueType == Type.u32 || valueType == Type.usize32) {
sb.push("new Uint32Array(memory.buffer)[");
} else if (valueType == Type.i64 || valueType == Type.isize64) {
sb.push("new BigInt64Array(memory.buffer)[");
} else if (valueType == Type.u64 || valueType == Type.usize64) {
sb.push("new BigUint64Array(memory.buffer)[");
} else if (valueType == Type.f32) {
sb.push("new Float32Array(memory.buffer)[");
} else if (valueType == Type.f64) {
sb.push("new Float64Array(memory.buffer)[");
if (skipTail) {
sb.push("(() => { throw Error(\"unsupported type\") })()");
} else {
if (skipTail) {
sb.push("(() => { throw Error(\"unsupported type\") })()");
} else {
sb.push("throw Error(\"unsupported type\"); }");
}
return;
sb.push("throw Error(\"unsupported type\"); }");
}
return;
}
sb.push(targetName);
sb.push(" >>> ");
Expand Down
9 changes: 6 additions & 3 deletions tests/compiler/bindings/esm.debug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ async function instantiate(module, imports = {}) {
new Uint8Array(memory.buffer)[pointer + 40 >>> 0] = value.k ? 1 : 0;
new Float32Array(memory.buffer)[pointer + 44 >>> 2] = value.l;
new Float64Array(memory.buffer)[pointer + 48 >>> 3] = value.m;
new Uint32Array(memory.buffer)[pointer + 56 >>> 2] = __lowerString(value.n);
new Uint32Array(memory.buffer)[pointer + 60 >>> 2] = __lowerTypedArray(Uint8Array, 13, 0, value.o);
new Uint32Array(memory.buffer)[pointer + 64 >>> 2] = __lowerArray((pointer, value) => { new Uint32Array(memory.buffer)[pointer >>> 2] = __lowerString(value) || __notnull(); }, 14, 2, value.p);
__store_ref(pointer + 56, __lowerString(value.n));
__store_ref(pointer + 60, __lowerTypedArray(Uint8Array, 13, 0, value.o));
__store_ref(pointer + 64, __lowerArray((pointer, value) => { __store_ref(pointer, __lowerString(value) || __notnull()); }, 14, 2, value.p));
exports.__unpin(pointer);
return pointer;
}
Expand Down Expand Up @@ -382,6 +382,9 @@ async function instantiate(module, imports = {}) {
function __notnull() {
throw TypeError("value must not be null");
}
function __store_ref(pointer, value) {
new Uint32Array(memory.buffer)[pointer >>> 2] = value;
}
exports._start();
return adaptedExports;
}
Expand Down
9 changes: 6 additions & 3 deletions tests/compiler/bindings/esm.release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ async function instantiate(module, imports = {}) {
new Uint8Array(memory.buffer)[pointer + 40 >>> 0] = value.k ? 1 : 0;
new Float32Array(memory.buffer)[pointer + 44 >>> 2] = value.l;
new Float64Array(memory.buffer)[pointer + 48 >>> 3] = value.m;
new Uint32Array(memory.buffer)[pointer + 56 >>> 2] = __lowerString(value.n);
new Uint32Array(memory.buffer)[pointer + 60 >>> 2] = __lowerTypedArray(Uint8Array, 13, 0, value.o);
new Uint32Array(memory.buffer)[pointer + 64 >>> 2] = __lowerArray((pointer, value) => { new Uint32Array(memory.buffer)[pointer >>> 2] = __lowerString(value) || __notnull(); }, 14, 2, value.p);
__store_ref(pointer + 56, __lowerString(value.n));
__store_ref(pointer + 60, __lowerTypedArray(Uint8Array, 13, 0, value.o));
__store_ref(pointer + 64, __lowerArray((pointer, value) => { __store_ref(pointer, __lowerString(value) || __notnull()); }, 14, 2, value.p));
exports.__unpin(pointer);
return pointer;
}
Expand Down Expand Up @@ -382,6 +382,9 @@ async function instantiate(module, imports = {}) {
function __notnull() {
throw TypeError("value must not be null");
}
function __store_ref(pointer, value) {
new Uint32Array(memory.buffer)[pointer >>> 2] = value;
}
exports._start();
return adaptedExports;
}
Expand Down
9 changes: 6 additions & 3 deletions tests/compiler/bindings/raw.debug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ export async function instantiate(module, imports = {}) {
new Uint8Array(memory.buffer)[pointer + 40 >>> 0] = value.k ? 1 : 0;
new Float32Array(memory.buffer)[pointer + 44 >>> 2] = value.l;
new Float64Array(memory.buffer)[pointer + 48 >>> 3] = value.m;
new Uint32Array(memory.buffer)[pointer + 56 >>> 2] = __lowerString(value.n);
new Uint32Array(memory.buffer)[pointer + 60 >>> 2] = __lowerTypedArray(Uint8Array, 13, 0, value.o);
new Uint32Array(memory.buffer)[pointer + 64 >>> 2] = __lowerArray((pointer, value) => { new Uint32Array(memory.buffer)[pointer >>> 2] = __lowerString(value) || __notnull(); }, 14, 2, value.p);
__store_ref(pointer + 56, __lowerString(value.n));
__store_ref(pointer + 60, __lowerTypedArray(Uint8Array, 13, 0, value.o));
__store_ref(pointer + 64, __lowerArray((pointer, value) => { __store_ref(pointer, __lowerString(value) || __notnull()); }, 14, 2, value.p));
exports.__unpin(pointer);
return pointer;
}
Expand Down Expand Up @@ -382,6 +382,9 @@ export async function instantiate(module, imports = {}) {
function __notnull() {
throw TypeError("value must not be null");
}
function __store_ref(pointer, value) {
new Uint32Array(memory.buffer)[pointer >>> 2] = value;
}
exports._start();
return adaptedExports;
}
9 changes: 6 additions & 3 deletions tests/compiler/bindings/raw.release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ export async function instantiate(module, imports = {}) {
new Uint8Array(memory.buffer)[pointer + 40 >>> 0] = value.k ? 1 : 0;
new Float32Array(memory.buffer)[pointer + 44 >>> 2] = value.l;
new Float64Array(memory.buffer)[pointer + 48 >>> 3] = value.m;
new Uint32Array(memory.buffer)[pointer + 56 >>> 2] = __lowerString(value.n);
new Uint32Array(memory.buffer)[pointer + 60 >>> 2] = __lowerTypedArray(Uint8Array, 13, 0, value.o);
new Uint32Array(memory.buffer)[pointer + 64 >>> 2] = __lowerArray((pointer, value) => { new Uint32Array(memory.buffer)[pointer >>> 2] = __lowerString(value) || __notnull(); }, 14, 2, value.p);
__store_ref(pointer + 56, __lowerString(value.n));
__store_ref(pointer + 60, __lowerTypedArray(Uint8Array, 13, 0, value.o));
__store_ref(pointer + 64, __lowerArray((pointer, value) => { __store_ref(pointer, __lowerString(value) || __notnull()); }, 14, 2, value.p));
exports.__unpin(pointer);
return pointer;
}
Expand Down Expand Up @@ -382,6 +382,9 @@ export async function instantiate(module, imports = {}) {
function __notnull() {
throw TypeError("value must not be null");
}
function __store_ref(pointer, value) {
new Uint32Array(memory.buffer)[pointer >>> 2] = value;
}
exports._start();
return adaptedExports;
}