Skip to content

feat: Support Set/Map for binding generator #2340

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

Draft
MaxGraey wants to merge 20 commits into
base: main
Choose a base branch
from
Draft

feat: Support Set/Map for binding generator #2340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7720ce8
wip
MaxGraey Jun 26, 2022
16fe5a9
wip
MaxGraey Jun 26, 2022
863e1bb
wip
MaxGraey Jun 26, 2022
b44d2bf
wip
MaxGraey Jun 26, 2022
c5c7de2
wip
MaxGraey Jun 26, 2022
67df57b
Merge branch 'main' into Set-Map-bindings
MaxGraey Jun 26, 2022
bdbce81
wip
MaxGraey Jun 26, 2022
4a5253d
add tests (wip)
MaxGraey Jun 26, 2022
afbc743
wip
MaxGraey Jun 26, 2022
46d4378
wip
MaxGraey Jun 26, 2022
d1433c8
refactor
MaxGraey Jun 26, 2022
a861c74
refactor
MaxGraey Jun 26, 2022
afbaa83
refactor tsd
MaxGraey Jun 26, 2022
6e7f8ef
Merge branch 'main' into Set-Map-bindings
MaxGraey Jun 27, 2022
b2e5734
remove hardcoded. Update constant names
MaxGraey Jun 27, 2022
380efd9
fixes
MaxGraey Jun 27, 2022
fa444bc
update
MaxGraey Jun 27, 2022
191c700
refactoring
MaxGraey Jun 27, 2022
a9696f7
add test for Map<u16, i64>
MaxGraey Jun 27, 2022
e6cdbc7
minor fixes + update raw bindings
MaxGraey Jun 27, 2022
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
Prev Previous commit
Next Next commit
refactoring
  • Loading branch information
@MaxGraey
MaxGraey committed Jun 27, 2022
commit 191c700fda0cc1652f02ab7f4f0beeebffddfab7
36 changes: 25 additions & 11 deletions src/bindings/js.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,21 +720,27 @@ export class JSBuilder extends ExportsWalker {
const entries = setInstance.offsetof("entries");
const emptyTagMask = 1 << 0;
const pointerSize = this.program.options.isWasm64 ? 8 : 4;
const pointerMask = pointerSize - 1;

sb.push(` function __liftSet(liftElement, byteSize, ptr) {
sb.push(` function __liftSet(liftElement, keySize, ptr) {
if (!ptr) return null;
const
mem32 = new Uint32Array(memory.buffer),
count = mem32[ptr + ${entriesOffset} >>> 2],
entries = mem32[ptr + ${entries} >>> 2],
tagOffset = Math.max(byteSize, ${pointerSize}),
entryMask = tagOffset - 1,
entrySize = (byteSize + ${pointerSize} + entryMask) & ~entryMask,
// key is known
keyMask = keySize - 1,
taggedOffset = (keySize + ${pointerMask}) & ~${pointerMask},
// end is all contents combined (here: pointer after value after key, net size unaligned)
endOffset = taggedOffset + ${pointerSize},
// entire thing is at least pointer aligned, or more if K or V is larger, i.e. v128
entryMask = Math.max(${pointerMask}, keyMask),
entrySize = (endOffset + entryMask) & ~entryMask,
res = new Set();
for (let i = 0; i < count; ++i) {
const
buf = entries + i * entrySize,
tag = mem32[buf + tagOffset >>> 2];
tag = mem32[buf + taggedOffset >>> 2];
if (!(tag & ${emptyTagMask})) {
res.add(liftElement(buf));
}
Expand All @@ -757,17 +763,25 @@ export class JSBuilder extends ExportsWalker {
mem32 = new Uint32Array(memory.buffer),
count = mem32[ptr + ${entriesOffset} >>> 2],
entries = mem32[ptr + ${entries} >>> 2],
alignedKeySize = (keySize + valueSize - 1) & ~(valueSize - 1),
tagOffset = ((alignedKeySize + valueSize) + ${pointerMask}) & ~${pointerMask},
entryMask = Math.max(keySize, valueSize, ${pointerSize}) - 1,
entrySize = (tagOffset + ${pointerSize} + entryMask) & ~entryMask,
// key is known
keyMask = keySize - 1,
keyOffset = 0,
// value is aligned after key
valueMask = valueSize - 1,
valueOffset = (keyOffset + keySize + valueMask) & ~valueMask,
taggedOffset = (valueOffset + valueSize + ${pointerMask}) & ~${pointerMask},
// end is all contents combined (here: pointer after value after key, net size unaligned)
endOffset = taggedOffset + ${pointerSize},
// entire thing is at least pointer aligned, or more if K or V is larger, i.e. v128
entryMask = Math.max(${pointerMask}, keyMask, valueMask),
entrySize = (endOffset + entryMask) & ~entryMask,
res = new Map();
for (let i = 0; i < count; ++i) {
const
buf = entries + i * entrySize,
tag = mem32[buf + tagOffset >>> 2];
tag = mem32[buf + taggedOffset >>> 2];
if (!(tag & ${emptyTagMask})) {
res.set(liftKeyElement(buf), liftValueElement(buf + alignedKeySize));
res.set(liftKeyElement(buf + keyOffset), liftValueElement(buf + valueOffset));
}
}
return res;
Expand Down
35 changes: 24 additions & 11 deletions tests/compiler/bindings/esm.debug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,20 +335,25 @@ async function instantiate(module, imports = {}) {
exports.__unpin(buf);
return buf;
}
function __liftSet(liftElement, byteSize, ptr) {
function __liftSet(liftElement, keySize, ptr) {
if (!ptr) return null;
const
mem32 = new Uint32Array(memory.buffer),
count = mem32[ptr + 16 >>> 2],
entries = mem32[ptr + 8 >>> 2],
tagOffset = Math.max(byteSize, 4),
entryMask = tagOffset - 1,
entrySize = (byteSize + 4 + entryMask) & ~entryMask,
// key is known
keyMask = keySize - 1,
taggedOffset = (keySize + 3) & ~3,
// end is all contents combined (here: pointer after value after key, net size unaligned)
endOffset = taggedOffset + 4,
// entire thing is at least pointer aligned, or more if K or V is larger, i.e. v128
entryMask = Math.max(3, keyMask),
entrySize = (endOffset + entryMask) & ~entryMask,
res = new Set();
for (let i = 0; i < count; ++i) {
const
buf = entries + i * entrySize,
tag = mem32[buf + tagOffset >>> 2];
tag = mem32[buf + taggedOffset >>> 2];
if (!(tag & 1)) {
res.add(liftElement(buf));
}
Expand All @@ -361,17 +366,25 @@ async function instantiate(module, imports = {}) {
mem32 = new Uint32Array(memory.buffer),
count = mem32[ptr + 16 >>> 2],
entries = mem32[ptr + 8 >>> 2],
alignedKeySize = (keySize + valueSize - 1) & ~(valueSize - 1),
tagOffset = ((alignedKeySize + valueSize) + 3) & ~3,
entryMask = Math.max(keySize, valueSize, 4) - 1,
entrySize = (tagOffset + 4 + entryMask) & ~entryMask,
// key is known
keyMask = keySize - 1,
keyOffset = 0,
// value is aligned after key
valueMask = valueSize - 1,
valueOffset = (keyOffset + keySize + valueMask) & ~valueMask,
taggedOffset = (valueOffset + valueSize + 3) & ~3,
// end is all contents combined (here: pointer after value after key, net size unaligned)
endOffset = taggedOffset + 4,
// entire thing is at least pointer aligned, or more if K or V is larger, i.e. v128
entryMask = Math.max(3, keyMask, valueMask),
entrySize = (endOffset + entryMask) & ~entryMask,
res = new Map();
for (let i = 0; i < count; ++i) {
const
buf = entries + i * entrySize,
tag = mem32[buf + tagOffset >>> 2];
tag = mem32[buf + taggedOffset >>> 2];
if (!(tag & 1)) {
res.set(liftKeyElement(buf), liftValueElement(buf + alignedKeySize));
res.set(liftKeyElement(buf + keyOffset), liftValueElement(buf + valueOffset));
}
}
return res;
Expand Down
35 changes: 24 additions & 11 deletions tests/compiler/bindings/esm.release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,20 +335,25 @@ async function instantiate(module, imports = {}) {
exports.__unpin(buf);
return buf;
}
function __liftSet(liftElement, byteSize, ptr) {
function __liftSet(liftElement, keySize, ptr) {
if (!ptr) return null;
const
mem32 = new Uint32Array(memory.buffer),
count = mem32[ptr + 16 >>> 2],
entries = mem32[ptr + 8 >>> 2],
tagOffset = Math.max(byteSize, 4),
entryMask = tagOffset - 1,
entrySize = (byteSize + 4 + entryMask) & ~entryMask,
// key is known
keyMask = keySize - 1,
taggedOffset = (keySize + 3) & ~3,
// end is all contents combined (here: pointer after value after key, net size unaligned)
endOffset = taggedOffset + 4,
// entire thing is at least pointer aligned, or more if K or V is larger, i.e. v128
entryMask = Math.max(3, keyMask),
entrySize = (endOffset + entryMask) & ~entryMask,
res = new Set();
for (let i = 0; i < count; ++i) {
const
buf = entries + i * entrySize,
tag = mem32[buf + tagOffset >>> 2];
tag = mem32[buf + taggedOffset >>> 2];
if (!(tag & 1)) {
res.add(liftElement(buf));
}
Expand All @@ -361,17 +366,25 @@ async function instantiate(module, imports = {}) {
mem32 = new Uint32Array(memory.buffer),
count = mem32[ptr + 16 >>> 2],
entries = mem32[ptr + 8 >>> 2],
alignedKeySize = (keySize + valueSize - 1) & ~(valueSize - 1),
tagOffset = ((alignedKeySize + valueSize) + 3) & ~3,
entryMask = Math.max(keySize, valueSize, 4) - 1,
entrySize = (tagOffset + 4 + entryMask) & ~entryMask,
// key is known
keyMask = keySize - 1,
keyOffset = 0,
// value is aligned after key
valueMask = valueSize - 1,
valueOffset = (keyOffset + keySize + valueMask) & ~valueMask,
taggedOffset = (valueOffset + valueSize + 3) & ~3,
// end is all contents combined (here: pointer after value after key, net size unaligned)
endOffset = taggedOffset + 4,
// entire thing is at least pointer aligned, or more if K or V is larger, i.e. v128
entryMask = Math.max(3, keyMask, valueMask),
entrySize = (endOffset + entryMask) & ~entryMask,
res = new Map();
for (let i = 0; i < count; ++i) {
const
buf = entries + i * entrySize,
tag = mem32[buf + tagOffset >>> 2];
tag = mem32[buf + taggedOffset >>> 2];
if (!(tag & 1)) {
res.set(liftKeyElement(buf), liftValueElement(buf + alignedKeySize));
res.set(liftKeyElement(buf + keyOffset), liftValueElement(buf + valueOffset));
}
}
return res;
Expand Down