Skip to content
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

allow specifying the external memory #7125

Merged
merged 13 commits into from
Jan 22, 2025
+147 −2
Merged

allow specifying the external memory #7125

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
75a7f5d
allow specifying the external memory
gkgoat1 Nov 27, 2024
61c68ff
apply suggestions
gkgoat1 Nov 27, 2024
6ab2142
add test
gkgoat1 Nov 28, 2024
bbfb574
Apply suggestions from code review
gkgoat1 Dec 5, 2024
179944a
update test
gkgoat1 Dec 5, 2024
f02138f
Apply suggestions from code review: style and further tests
gkgoat1 Dec 23, 2024
40f1ad1
apply more suggestions from code review
gkgoat1 Dec 23, 2024
64faf28
fix build
gkgoat1 Dec 30, 2024
58e76f0
fix the test
gkgoat1 Dec 30, 2024
8eb339e
Add a memory to the local test so Asyncify can use it (even though it…
gkgoat1 Jan 4, 2025
a6edba5
fix the tests
gkgoat1 Jan 13, 2025
38025b4
format
gkgoat1 Jan 18, 2025
5f70419
Merge https://github.com/WebAssembly/binaryen into asyncify-custom-me…
gkgoat1 Jan 19, 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
21 changes: 19 additions & 2 deletions src/passes/Asyncify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@
//
// Logs out instrumentation decisions to the console. This can help figure
// out why a certain function was instrumented.
// --pass-arg=asyncify-memory@memory
gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
// Sets the exported memory of the module to store and load data from and
gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
// to, if said module contains multiple memories
gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
//
// For manual fine-tuning of the list of instrumented functions, there are lists
// that you can set. These must be used carefully, as misuse can break your
Expand Down Expand Up @@ -1648,14 +1651,28 @@ struct Asyncify : public Pass {
auto propagateAddList = hasArgument("asyncify-propagate-addlist");

// Ensure there is a memory, as we need it.

if (secondaryMemory) {
auto secondaryMemorySizeString =
getArgumentOrDefault("asyncify-secondary-memory-size", "1");
Address secondaryMemorySize = std::stoi(secondaryMemorySizeString);
asyncifyMemory = createSecondaryMemory(module, secondaryMemorySize);
} else {
MemoryUtils::ensureExists(module);
asyncifyMemory = module->memories[0]->name;
if (module->memories.size() == 1) {
MemoryUtils::ensureExists(module);
asyncifyMemory = module->memories[0]->name;
} else {
auto asyncifyMemoryValue =
getArgumentOrDefault("asyncify-memory", "memory");
for (auto& export : module->exports) {
if (export->kind == ExternalKind::Memory &&
export->name == asyncifyMemoryValue) {
asyncifyMemory = export->value;
gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
break;
break;
gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
}
}
gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
}
}
pointerType =
module->getMemory(asyncifyMemory)->is64() ? Type::i64 : Type::i32;
Expand Down
112 changes: 112 additions & 0 deletions test/lit/passes/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.

;; RUN: foreach %s %t wasm-opt --enable-multimemory --enable-mutable-globals --asyncify --pass-arg=asyncify-memory@memory -S -o - | filecheck %s

gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
;; This test checks that the asyncify-memory argument can pick which memory to use in asyncify.
(module
;; CHECK: (type $0 (func (param i32)))

;; CHECK: (type $1 (func))

;; CHECK: (type $2 (func (result i32)))

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

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

gkgoat1 marked this conversation as resolved.
Show resolved Hide resolved
;; CHECK: (memory $mem 1 1)
(memory $mem (export "memory") 1 1)
;; CHECK: (memory $ignore 1 1)
(memory $ignore (export "unused") 1 1)
)
;; CHECK: (export "memory" (memory $mem))

;; CHECK: (export "unused" (memory $ignore))

;; CHECK: (export "asyncify_start_unwind" (func $asyncify_start_unwind))

;; CHECK: (export "asyncify_stop_unwind" (func $asyncify_stop_unwind))

;; CHECK: (export "asyncify_start_rewind" (func $asyncify_start_rewind))

;; CHECK: (export "asyncify_stop_rewind" (func $asyncify_stop_rewind))

;; CHECK: (export "asyncify_get_state" (func $asyncify_get_state))

;; CHECK: (func $asyncify_start_unwind (param $0 i32)
;; CHECK-NEXT: (global.set $__asyncify_state
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (global.set $__asyncify_data
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (if
;; CHECK-NEXT: (i32.gt_u
;; CHECK-NEXT: (i32.load $mem
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.load $mem offset=4
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; CHECK: (func $asyncify_stop_unwind
;; CHECK-NEXT: (global.set $__asyncify_state
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (if
;; CHECK-NEXT: (i32.gt_u
;; CHECK-NEXT: (i32.load $mem
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.load $mem offset=4
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; CHECK: (func $asyncify_start_rewind (param $0 i32)
;; CHECK-NEXT: (global.set $__asyncify_state
;; CHECK-NEXT: (i32.const 2)
;; CHECK-NEXT: )
;; CHECK-NEXT: (global.set $__asyncify_data
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (if
;; CHECK-NEXT: (i32.gt_u
;; CHECK-NEXT: (i32.load $mem
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.load $mem offset=4
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; CHECK: (func $asyncify_stop_rewind
;; CHECK-NEXT: (global.set $__asyncify_state
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (if
;; CHECK-NEXT: (i32.gt_u
;; CHECK-NEXT: (i32.load $mem
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.load $mem offset=4
;; CHECK-NEXT: (global.get $__asyncify_data)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; CHECK: (func $asyncify_get_state (result i32)
;; CHECK-NEXT: (global.get $__asyncify_state)
;; CHECK-NEXT: )