Skip to content

Split Inlining: Handle return_calls in Pattern B, not just returns #8159

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

Split Inlining: Handle return_calls in Pattern B, not just returns #8159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3437bc5
go
kripken Dec 23, 2025
9aa80e8
go
kripken Dec 23, 2025
9e9d1f8
finish
kripken Dec 23, 2025
33b327c
form
kripken Dec 23, 2025
6b7078e
nice
kripken Dec 23, 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
55 changes: 33 additions & 22 deletions src/ir/return-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,35 +56,46 @@ void removeReturns(Function* func, Module& wasm) {
ReturnValueRemover().walkFunctionInModule(func, &wasm);
}

Info getInfo(Expression* curr) {
struct Finder : PostWalker<Finder> {
Info info;

void visitReturn(Return* curr) { info.hasReturn = true; }

void visitCall(Call* curr) {
if (curr->isReturn) {
info.hasReturnCall = true;
}
}
void visitCallIndirect(CallIndirect* curr) {
if (curr->isReturn) {
info.hasReturnCall = true;
}
}
void visitCallRef(CallRef* curr) {
if (curr->isReturn) {
info.hasReturnCall = true;
}
}
} finder;
finder.walk(curr);

// Any return call is also a return.
if (finder.info.hasReturnCall) {
finder.info.hasReturn = true;
}

return finder.info;
}

std::unordered_map<Function*, bool> findReturnCallers(Module& wasm) {
ModuleUtils::ParallelFunctionAnalysis<bool> analysis(
wasm, [&](Function* func, bool& hasReturnCall) {
if (func->imported()) {
return;
}

struct Finder : PostWalker<Finder> {
bool hasReturnCall = false;

void visitCall(Call* curr) {
if (curr->isReturn) {
hasReturnCall = true;
}
}
void visitCallIndirect(CallIndirect* curr) {
if (curr->isReturn) {
hasReturnCall = true;
}
}
void visitCallRef(CallRef* curr) {
if (curr->isReturn) {
hasReturnCall = true;
}
}
} finder;

finder.walk(func->body);
hasReturnCall = finder.hasReturnCall;
hasReturnCall = getInfo(func->body).hasReturnCall;
});

// Convert to an unordered map for fast lookups. TODO: Avoid a copy here.
Expand Down
7 changes: 7 additions & 0 deletions src/ir/return-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ void removeReturns(Function* func, Module& wasm);
using ReturnCallersMap = std::unordered_map<Function*, bool>;
ReturnCallersMap findReturnCallers(Module& wasm);

// Information about the returns in a given expression.
struct Info {
bool hasReturn = false;
bool hasReturnCall = false;
};
Info getInfo(Expression* curr);

} // namespace wasm::ReturnUtils

#endif // wasm_ir_return_h
3 changes: 2 additions & 1 deletion src/passes/Inlining.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "ir/module-utils.h"
#include "ir/names.h"
#include "ir/properties.h"
#include "ir/return-utils.h"
#include "ir/type-updating.h"
#include "ir/utils.h"
#include "parsing.h"
Expand Down Expand Up @@ -1007,7 +1008,7 @@ struct FunctionSplitter {
}
if (iff->ifTrue->type == Type::none) {
// This must have no returns.
if (!FindAll<Return>(iff->ifTrue).list.empty()) {
if (ReturnUtils::getInfo(iff->ifTrue).hasReturn) {
return InliningMode::Uninlineable;
}
} else {
Expand Down
109 changes: 103 additions & 6 deletions test/lit/passes/inlining_splitting.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (then
;; CHECK-NEXT: (call $byn-split-outlined-A$colliding-name_67
;; CHECK-NEXT: (call $byn-split-outlined-A$colliding-name_70
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand All @@ -843,7 +843,7 @@
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (then
;; CHECK-NEXT: (call $byn-split-outlined-A$colliding-name_67
;; CHECK-NEXT: (call $byn-split-outlined-A$colliding-name_70
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand Down Expand Up @@ -1276,6 +1276,103 @@
(call $unreachable-if-body-no-result (ref.null any))
)

;; CHECK: (func $nop (type $2) (param $x anyref) (result anyref)
;; CHECK-NEXT: (loop $loop
;; CHECK-NEXT: (if
;; CHECK-NEXT: (ref.is_null
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
;; CHECK-NEXT: (then
;; CHECK-NEXT: (br $loop)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (return_call $nop
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $nop (param $x anyref) (result anyref)
;; A loop and recursion, to avoid this getting inlined (we want to keep the
;; return_call to here as a return_call).
(loop $loop
(if
(ref.is_null
(local.get $x)
)
(then
(br $loop)
)
)
(return_call $nop
(local.get $x)
)
)
)

;; CHECK: (func $reachable-if-body-return_call (type $2) (param $x anyref) (result anyref)
;; CHECK-NEXT: (if
;; CHECK-NEXT: (ref.is_null
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
;; CHECK-NEXT: (then
;; CHECK-NEXT: (if
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: (then
;; CHECK-NEXT: (return_call $nop
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (else
;; CHECK-NEXT: (call $import)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
(func $reachable-if-body-return_call (param $x anyref) (result anyref)
(if
(ref.is_null
(local.get $x)
)
(then
(if
(i32.const 1)
;; The return_call here prevents the optimization (nothing is inlined
;; in our caller, below), just like the return in the previous
;; testcase.
(then
(return_call $nop
(local.get $x)
)
)
(else
(call $import)
)
)
)
)
(local.get $x)
)

;; CHECK: (func $call-reachable-if-body-return_call (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $reachable-if-body-return_call
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $reachable-if-body-return_call
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $call-reachable-if-body-return_call
;; We do not inline here.
(drop (call $reachable-if-body-return_call (ref.null any)))
(drop (call $reachable-if-body-return_call (ref.null any)))
)

(func $multi-if (param $x anyref) (result anyref)
(if
(ref.is_null
Expand Down Expand Up @@ -1331,7 +1428,7 @@
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (then
;; CHECK-NEXT: (call $byn-split-outlined-B$multi-if_76
;; CHECK-NEXT: (call $byn-split-outlined-B$multi-if_79
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand Down Expand Up @@ -1364,7 +1461,7 @@
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (then
;; CHECK-NEXT: (call $byn-split-outlined-B$multi-if_76
;; CHECK-NEXT: (call $byn-split-outlined-B$multi-if_79
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand Down Expand Up @@ -1536,7 +1633,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; CHECK: (func $byn-split-outlined-A$colliding-name_67 (type $1) (param $x i32)
;; CHECK: (func $byn-split-outlined-A$colliding-name_70 (type $1) (param $x i32)
;; CHECK-NEXT: (loop $l
;; CHECK-NEXT: (call $import)
;; CHECK-NEXT: (br $l)
Expand All @@ -1559,7 +1656,7 @@
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )

;; CHECK: (func $byn-split-outlined-B$multi-if_76 (type $3) (param $x anyref)
;; CHECK: (func $byn-split-outlined-B$multi-if_79 (type $3) (param $x anyref)
;; CHECK-NEXT: (loop $x
;; CHECK-NEXT: (call $import)
;; CHECK-NEXT: (br_if $x
Expand Down
Loading