Skip to content

Add asyncify-export-globals argument #8074

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add asyncify-export-globals argument #8074

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
17 changes: 14 additions & 3 deletions src/passes/Asyncify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,7 +1759,8 @@ struct Asyncify : public Pass {
String::Split::NewLineOr(","));
auto asserts = hasArgument("asyncify-asserts");
auto verbose = hasArgument("asyncify-verbose");
auto relocatable = hasArgument("asyncify-relocatable");
auto importGlobals = hasArgument("asyncify-relocatable");
Copy link
Member

@kripken kripken Nov 27, 2025

Choose a reason for hiding this comment

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

Suggested change
auto importGlobals = hasArgument("asyncify-relocatable");
auto importGlobals = hasArgument("asyncify-relocatable");

Maybe relocatable => import-globals for symmetry?

auto exportGlobals = hasArgument("asyncify-export-globals");
Copy link
Member

@kripken kripken Nov 27, 2025

Choose a reason for hiding this comment

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

These flags should be documented in the comment earlier, among the other docs.

auto secondaryMemory = hasArgument("asyncify-in-secondary-memory");
auto propagateAddList = hasArgument("asyncify-propagate-addlist");

Expand Down Expand Up @@ -1826,7 +1827,7 @@ struct Asyncify : public Pass {
verbose);

// Add necessary globals before we emit code to use them.
addGlobals(module, relocatable);
addGlobals(module, importGlobals, exportGlobals);

// Compute the set of functions we will instrument. All of the passes we run
// below only need to run there.
Expand Down Expand Up @@ -1904,8 +1905,11 @@ struct Asyncify : public Pass {
}

private:
void addGlobals(Module* module, bool imported) {
void addGlobals(Module* module, bool imported, bool exported) {
Builder builder(*module);
// It doesn't make sense to both import and export these globals at the
// same time.
assert(!(imported && exported));

auto asyncifyState = builder.makeGlobal(ASYNCIFY_STATE,
Type::i32,
Expand All @@ -1926,6 +1930,13 @@ struct Asyncify : public Pass {
asyncifyData->base = ASYNCIFY_DATA;
}
module->addGlobal(std::move(asyncifyData));

if (exported) {
module->addExport(builder.makeExport(
ASYNCIFY_STATE, ASYNCIFY_STATE, ExternalKind::Global));
module->addExport(
builder.makeExport(ASYNCIFY_DATA, ASYNCIFY_DATA, ExternalKind::Global));
}
}

void addFunctions(Module* module) {
Expand Down
11 changes: 11 additions & 0 deletions test/lit/passes/asyncify_pass-arg=asyncify-export-globals.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
;; RUN: wasm-opt --enable-mutable-globals --asyncify --pass-arg=asyncify-export-globals -S -o - | filecheck %s

(module
)
;; CHECK: (global $__asyncify_state (mut i32) (i32.const 0))

;; CHECK: (global $__asyncify_data (mut i32) (i32.const 0))

;; CHECK: (export "__asyncify_state" (global $__asyncify_state))

;; CHECK: (export "__asyncify_data" (global $__asyncify_data))
Loading