Skip to content

Updated waitqueue support #8672

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

Open
stevenfontanella wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Updated waitqueue support #8672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ec73bbe
Updated waitqueue support
stevenfontanella Apr 27, 2026
7cacf10
Some updates
stevenfontanella Jun 25, 2026
0d52cee
More updates
stevenfontanella Jun 25, 2026
3d0ee2f
Fix test
stevenfontanella Jul 6, 2026
7a01e72
Some fixes
stevenfontanella Jul 6, 2026
84e0adf
Binary format test
stevenfontanella Jul 6, 2026
6689195
Format
stevenfontanella Jul 7, 2026
38127ac
Update binary test
stevenfontanella Jul 7, 2026
5806dd5
Small update to test
stevenfontanella Jul 8, 2026
8afc250
PR updates
stevenfontanella Jul 13, 2026
f4c3d54
PR updates
stevenfontanella Jul 14, 2026
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
3 changes: 2 additions & 1 deletion scripts/gen-s-parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@
# atomic instructions
("memory.atomic.notify", "makeAtomicNotify()"),
("struct.wait", "makeStructWait()"),
("struct.notify", "makeStructNotify()"),
("waitqueue.new", "makeWaitqueueNew()"),
("waitqueue.notify", "makeWaitqueueNotify()"),
("memory.atomic.wait32", "makeAtomicWait(Type::i32)"),
("memory.atomic.wait64", "makeAtomicWait(Type::i64)"),
("atomic.fence", "makeAtomicFence()"),
Expand Down
6 changes: 6 additions & 0 deletions src/binaryen-c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ BinaryenLiteral toBinaryenLiteral(Literal x) {
WASM_UNREACHABLE("invalid type");
case HeapType::string:
WASM_UNREACHABLE("TODO: string literals");
case HeapType::waitqueue:
case HeapType::nowaitqueue:
Comment thread
stevenfontanella marked this conversation as resolved.
WASM_UNREACHABLE("TODO: waitqueue");
case HeapType::none:
case HeapType::noext:
case HeapType::nofunc:
Expand Down Expand Up @@ -147,6 +150,9 @@ Literal fromBinaryenLiteral(BinaryenLiteral x) {
WASM_UNREACHABLE("invalid type");
case HeapType::string:
WASM_UNREACHABLE("TODO: string literals");
case HeapType::waitqueue:
case HeapType::nowaitqueue:
Comment thread
stevenfontanella marked this conversation as resolved.
WASM_UNREACHABLE("TODO: waitqueue");
case HeapType::none:
case HeapType::noext:
case HeapType::nofunc:
Expand Down
78 changes: 42 additions & 36 deletions src/gen-s-parser.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5448,52 +5448,41 @@ switch (buf[0]) {
}
}
case 'n': {
switch (buf[8]) {
case 'e': {
switch (buf[10]) {
case '\0':
if (op == "struct.new"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, false, false));
return Ok{};
}
goto parse_error;
case '_': {
switch (buf[13]) {
case 'f': {
switch (buf[18]) {
case '\0':
if (op == "struct.new_default"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, true, false));
return Ok{};
}
goto parse_error;
case '_':
if (op == "struct.new_default_desc"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, true, true));
return Ok{};
}
goto parse_error;
default: goto parse_error;
switch (buf[10]) {
case '\0':
if (op == "struct.new"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, false, false));
return Ok{};
}
goto parse_error;
case '_': {
switch (buf[13]) {
case 'f': {
switch (buf[18]) {
case '\0':
if (op == "struct.new_default"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, true, false));
return Ok{};
}
}
case 's':
if (op == "struct.new_desc"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, false, true));
goto parse_error;
case '_':
if (op == "struct.new_default_desc"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, true, true));
return Ok{};
}
goto parse_error;
default: goto parse_error;
}
}
case 's':
if (op == "struct.new_desc"sv) {
CHECK_ERR(makeStructNew(ctx, pos, annotations, false, true));
return Ok{};
}
goto parse_error;
default: goto parse_error;
}
}
case 'o':
if (op == "struct.notify"sv) {
CHECK_ERR(makeStructNotify(ctx, pos, annotations));
return Ok{};
}
goto parse_error;
default: goto parse_error;
}
}
Expand Down Expand Up @@ -5893,6 +5882,23 @@ switch (buf[0]) {
default: goto parse_error;
}
}
case 'w': {
switch (buf[11]) {
case 'e':
if (op == "waitqueue.new"sv) {
CHECK_ERR(makeWaitqueueNew(ctx, pos, annotations));
return Ok{};
}
goto parse_error;
case 'o':
if (op == "waitqueue.notify"sv) {
CHECK_ERR(makeWaitqueueNotify(ctx, pos, annotations));
return Ok{};
}
goto parse_error;
default: goto parse_error;
}
}
default: goto parse_error;
}
parse_error:
Expand Down
3 changes: 2 additions & 1 deletion src/interpreter/interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ struct ExpressionInterpreter : OverriddenVisitor<ExpressionInterpreter, Flow> {
Flow visitStructRMW(StructRMW* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitStructCmpxchg(StructCmpxchg* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitStructWait(StructWait* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitStructNotify(StructNotify* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitWaitqueueNew(WaitqueueNew* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitWaitqueueNotify(WaitqueueNotify* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitArrayNew(ArrayNew* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitArrayNewData(ArrayNewData* curr) { WASM_UNREACHABLE("TODO"); }
Flow visitArrayNewElem(ArrayNewElem* curr) { WASM_UNREACHABLE("TODO"); }
Expand Down
5 changes: 4 additions & 1 deletion src/ir/ReFinalize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ void ReFinalize::visitStructSet(StructSet* curr) { curr->finalize(); }
void ReFinalize::visitStructRMW(StructRMW* curr) { curr->finalize(); }
void ReFinalize::visitStructCmpxchg(StructCmpxchg* curr) { curr->finalize(); }
void ReFinalize::visitStructWait(StructWait* curr) { curr->finalize(); }
void ReFinalize::visitStructNotify(StructNotify* curr) { curr->finalize(); }
void ReFinalize::visitWaitqueueNew(WaitqueueNew* curr) { curr->finalize(); }
void ReFinalize::visitWaitqueueNotify(WaitqueueNotify* curr) {
curr->finalize();
}
void ReFinalize::visitArrayNew(ArrayNew* curr) { curr->finalize(); }
void ReFinalize::visitArrayNewData(ArrayNewData* curr) { curr->finalize(); }
void ReFinalize::visitArrayNewElem(ArrayNewElem* curr) { curr->finalize(); }
Expand Down
14 changes: 4 additions & 10 deletions src/ir/child-typer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,21 +1037,15 @@ template<typename Subtype> struct ChildTyper : OverriddenVisitor<Subtype> {
}

note(&curr->ref, Type(*ht, Nullable));
note(&curr->waitqueue, Type(HeapType::waitqueue, Nullable));

@tlively tlively Jul 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The waitqueue heap type should be shared here.

note(&curr->expected, Type(Type::BasicType::i32));
note(&curr->timeout, Type(Type::BasicType::i64));
}

void visitStructNotify(StructNotify* curr,
std::optional<HeapType> ht = std::nullopt) {
if (!ht) {
if (!curr->ref->type.isStruct()) {
self().noteUnknown();
return;
}
ht = curr->ref->type.getHeapType();
}
void visitWaitqueueNew(WaitqueueNew* curr) {}

note(&curr->ref, Type(*ht, Nullable));
void visitWaitqueueNotify(WaitqueueNotify* curr) {
note(&curr->waitqueue, Type(HeapType::waitqueue, Nullable));

@tlively tlively Jul 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

And here.

note(&curr->count, Type(Type::BasicType::i32));
}

Expand Down
8 changes: 5 additions & 3 deletions src/ir/cost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,13 @@ struct CostAnalyzer : public OverriddenVisitor<CostAnalyzer, CostType> {
}
CostType visitStructWait(StructWait* curr) {
return AtomicCost + nullCheckCost(curr->ref) + visit(curr->ref) +
nullCheckCost(curr->waitqueue) + visit(curr->waitqueue) +
visit(curr->expected) + visit(curr->timeout);
}
CostType visitStructNotify(StructNotify* curr) {
return AtomicCost + nullCheckCost(curr->ref) + visit(curr->ref) +
visit(curr->count);
CostType visitWaitqueueNew(WaitqueueNew* curr) { return AllocationCost; }
CostType visitWaitqueueNotify(WaitqueueNotify* curr) {
return AtomicCost + nullCheckCost(curr->waitqueue) +
visit(curr->waitqueue) + visit(curr->count);
}
CostType visitAtomicNotify(AtomicNotify* curr) {
return AtomicCost + visit(curr->ptr) + visit(curr->notifyCount);
Expand Down
18 changes: 8 additions & 10 deletions src/ir/effects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,11 +1074,12 @@ class EffectAnalyzer {
void visitStructRMW(StructRMW* curr) { visitStructRMWExpr(curr); }
void visitStructCmpxchg(StructCmpxchg* curr) { visitStructRMWExpr(curr); }
void visitStructWait(StructWait* curr) {
if (trapOnNull(curr->ref)) {
if (trapOnNull({curr->ref, curr->waitqueue})) {
return;
}

// StructWait doesn't strictly write a struct, but it does modify the
// waiters list associated with the waitqueue field, which we can think
// waiters list associated with the waitqueue, which we can think
// of as a write.
parent.readsSharedMutableStruct = true;
parent.writesSharedStruct = true;
Expand All @@ -1087,16 +1088,13 @@ class EffectAnalyzer {
// If the timeout is negative and no-one wakes us.
parent.mayNotReturn = true;
}
void visitStructNotify(StructNotify* curr) {
if (trapOnNull(curr->ref)) {
return;
}
// Non-shared notifies just return 0.
if (curr->ref->type.getHeapType().isShared()) {
void visitWaitqueueNew(WaitqueueNew* curr) {}
void visitWaitqueueNotify(WaitqueueNotify* curr) {
if (trapOnNull(curr->waitqueue)) {
return;
}
// AtomicNotify doesn't strictly write the struct, but it does
// modify the waiters list associated with the waitqueue field, which we
// WaitqueueNotify doesn't strictly write anything, but it does
// modify the waiters list associated with the waitqueue, which we
// can think of as a write.
parent.readsSharedMutableStruct = true;
parent.writesSharedStruct = true;
Expand Down
5 changes: 4 additions & 1 deletion src/ir/module-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,10 @@ struct CodeScanner : PostWalker<CodeScanner> {
void visitStructGet(StructGet* curr) { info.note(curr->ref->type); }
void visitStructSet(StructSet* curr) { info.note(curr->ref->type); }
void visitStructWait(StructWait* curr) { info.note(curr->ref->type); }
void visitStructNotify(StructNotify* curr) { info.note(curr->ref->type); }
void visitWaitqueueNew(WaitqueueNew* curr) { info.note(curr->type); }
void visitWaitqueueNotify(WaitqueueNotify* curr) {
info.note(curr->waitqueue->type);
}
Comment on lines +457 to +460

@tlively tlively Jul 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

No need to have visitors for waitqueue.new and waitqueue.notify. They don't have type immediates in the binary or text formats and they don't use any defined types that we have to make sure to keep around.

void visitArrayGet(ArrayGet* curr) { info.note(curr->ref->type); }
void visitArraySet(ArraySet* curr) { info.note(curr->ref->type); }
void visitContBind(ContBind* curr) {
Expand Down
3 changes: 0 additions & 3 deletions src/ir/possible-constant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ struct PossibleConstantValues {
value = val.and_(Literal(uint32_t(0xffff)));
}
break;
case Field::WaitQueue:
value = val;
break;
case Field::NotPacked:
WASM_UNREACHABLE("unexpected packed type");
break;
Expand Down
3 changes: 2 additions & 1 deletion src/ir/possible-contents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,8 @@ struct InfoCollector
addRoot(curr);
}
void visitStructWait(StructWait* curr) { addRoot(curr); }
void visitStructNotify(StructNotify* curr) { addRoot(curr); }
void visitWaitqueueNew(WaitqueueNew* curr) { addRoot(curr); }
void visitWaitqueueNotify(WaitqueueNotify* curr) { addRoot(curr); }
// Array operations access the array's location, parallel to how structs work.
void visitArrayGet(ArrayGet* curr) {
if (!isRelevant(curr->ref)) {
Expand Down
3 changes: 2 additions & 1 deletion src/ir/properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ struct GenerativityScanner : public PostWalker<GenerativityScanner> {
void visitArrayNewElem(ArrayNewElem* curr) { generative = true; }
void visitArrayNewFixed(ArrayNewFixed* curr) { generative = true; }
void visitContNew(ContNew* curr) { generative = true; }
void visitWaitqueueNew(WaitqueueNew* curr) { generative = true; }

@tlively tlively Jul 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

notify should probably also be considered generative, since calling it more than once can produce different results each time. Although it looks like the linear memory notify is not considered generative... Maybe just a TODO for now, then.

};

} // anonymous namespace
Expand All @@ -73,7 +74,7 @@ bool isShallowlyGenerative(Expression* curr, Function* func, Module& wasm) {
static bool isValidInConstantExpression(Module& wasm, Expression* expr) {
if (isSingleConstantExpression(expr) || expr->is<StructNew>() ||
expr->is<ArrayNew>() || expr->is<ArrayNewFixed>() || expr->is<RefI31>() ||
expr->is<StringConst>()) {
expr->is<StringConst>() || expr->is<WaitqueueNew>()) {
return true;
}

Expand Down
3 changes: 2 additions & 1 deletion src/ir/subtype-exprs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,8 @@ struct SubtypingDiscoverer : public OverriddenVisitor<SubType> {
self()->noteSubtype(curr->replacement, type);
}
void visitStructWait(StructWait* curr) {}
void visitStructNotify(StructNotify* curr) {}
void visitWaitqueueNew(WaitqueueNew* curr) {}
void visitWaitqueueNotify(WaitqueueNotify* curr) {}
void visitArrayNew(ArrayNew* curr) {
if (!curr->type.isArray() || curr->isWithDefault()) {
return;
Expand Down
4 changes: 2 additions & 2 deletions src/literal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,8 +797,8 @@ inline bool Literal::hasExternPayload() const {
if (isNull()) {
return false;
}
assert(type.getHeapType().isMaybeShared(HeapType::ext));
return gcData->values[0].type == Type::i32;
return type.getHeapType().isMaybeShared(HeapType::ext) &&
gcData->values[0].type == Type::i32;
Comment thread
stevenfontanella marked this conversation as resolved.
}

inline int32_t Literal::getExternPayload() const {
Expand Down
32 changes: 20 additions & 12 deletions src/parser/contexts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ struct NullTypeParserCtx {
HeapTypeT makeNofuncType(Shareability) { return Ok{}; }
HeapTypeT makeNoexnType(Shareability) { return Ok{}; }
HeapTypeT makeNocontType(Shareability) { return Ok{}; }
HeapTypeT makeWaitqueueType(Shareability) { return Ok{}; }
HeapTypeT makeNowaitqueueType(Shareability) { return Ok{}; }

TypeT makeI32() { return Ok{}; }
TypeT makeI64() { return Ok{}; }
Expand Down Expand Up @@ -150,7 +152,6 @@ struct NullTypeParserCtx {

StorageT makeI8() { return Ok{}; }
StorageT makeI16() { return Ok{}; }
StorageT makeWaitQueue() { return Ok{}; }
StorageT makeStorageType(TypeT) { return Ok{}; }

FieldT makeFieldType(StorageT, Mutability) { return Ok{}; }
Expand Down Expand Up @@ -263,6 +264,12 @@ template<typename Ctx> struct TypeParserCtx {
HeapTypeT makeNocontType(Shareability share) {
return HeapTypes::nocont.getBasic(share);
}
HeapTypeT makeWaitqueueType(Shareability share) {
return HeapTypes::waitqueue.getBasic(share);
}
HeapTypeT makeNowaitqueueType(Shareability share) {
return HeapTypes::nowaitqueue.getBasic(share);
}
Comment thread
stevenfontanella marked this conversation as resolved.

HeapTypeT makeExact(HeapTypeT type) {
type.exactness = Exact;
Expand Down Expand Up @@ -308,7 +315,6 @@ template<typename Ctx> struct TypeParserCtx {

StorageT makeI8() { return Field(Field::i8, Immutable); }
StorageT makeI16() { return Field(Field::i16, Immutable); }
StorageT makeWaitQueue() { return Field(Field::WaitQueue, Immutable); }
StorageT makeStorageType(TypeT type) { return Field(type, Immutable); }

FieldT makeFieldType(FieldT field, Mutability mutability) {
Expand Down Expand Up @@ -825,11 +831,10 @@ struct NullInstrParserCtx {
makeStructWait(Index, const std::vector<Annotation>&, HeapTypeT, FieldIdxT) {
return Ok{};
}
template<typename HeapTypeT>
Result<> makeStructNotify(Index,
const std::vector<Annotation>&,
HeapTypeT,
FieldIdxT) {
Result<> makeWaitqueueNew(Index, const std::vector<Annotation>&) {
return Ok{};
}
Result<> makeWaitqueueNotify(Index, const std::vector<Annotation>&) {
return Ok{};
}
template<typename HeapTypeT>
Expand Down Expand Up @@ -2819,11 +2824,14 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx>, AnnotationParserCtx {
return withLoc(pos, irBuilder.makeStructWait(type, field));
}

Result<> makeStructNotify(Index pos,
const std::vector<Annotation>& annotations,
HeapType type,
Index field) {
return withLoc(pos, irBuilder.makeStructNotify(type, field));
Result<> makeWaitqueueNew(Index pos,
const std::vector<Annotation>& annotations) {
return withLoc(pos, irBuilder.makeWaitqueueNew());
}

Result<> makeWaitqueueNotify(Index pos,
const std::vector<Annotation>& annotations) {
return withLoc(pos, irBuilder.makeWaitqueueNotify());
}

Result<> makeArrayNew(Index pos,
Expand Down
Loading
Loading