Skip to content

[inlining] increasing accuracy of the code size assessment model #7648

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 2 commits into
base: main
Choose a base branch
from
Open

[inlining] increasing accuracy of the code size assessment model #7648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65499c7
[inlining] increasing accuracy of the code size assessment model
HerrCai0907 Jun 10, 2025
a42896b
fix
HerrCai0907 Jun 11, 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
59 changes: 58 additions & 1 deletion src/passes/Inlining.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include "pass.h"
#include "passes/opt-utils.h"
#include "wasm-builder.h"
#include "wasm-traversal.h"
#include "wasm.h"

namespace wasm {
Expand Down Expand Up @@ -175,6 +176,62 @@ static bool canHandleParams(Function* func) {

using NameInfoMap = std::unordered_map<Name, FunctionInfo>;

struct InlineMeasurer
: public PostWalker<InlineMeasurer,
UnifiedExpressionVisitor<InlineMeasurer>> {
Index size = 0;
Index orderedGetCount = 0;
Index expectedGetIndex = 0;
bool isViolationOrderedAssumption = false;

void visitExpression(Expression* curr) {
size++;
// calculate the local.get count which should be duplicate after inlining
if (isViolationOrderedAssumption) {
return;
}
if (invalidOperation(curr)) {
isViolationOrderedAssumption = true;
return;
}
if (LocalGet* localGet = curr->dynCast<LocalGet>()) {
if (localGet->index >= expectedGetIndex) {
expectedGetIndex = localGet->index + 1;
orderedGetCount++;
} else {
// duplicated local.get, fallback to normal cases
// it will introduce temporary locals after inlining
isViolationOrderedAssumption = true;
}
}
}

bool invalidOperation(Expression* curr) {
return curr->is<GlobalGet>() || curr->is<LocalSet>() || curr->is<Const>();
}

// Measure the number of expressions for inlining purposes. This is similar to
// Measurer::measure, but ignore the local sequence of at the beginning of
// function body.
static Index measure(Function* func) {
InlineMeasurer measurer;
measurer.isViolationOrderedAssumption = func->getNumVars() != 0;
measurer.walkFunction(func);
// we don't count the local.get when the order is same as the
// parameters' order.
// It can enable the inlining for the function like:
// (func $foo (param $x i32) (param $y i32)
// (call $bar
// (local.get $x)
// (local.get $y)
// )
// )
return measurer.size - (measurer.isViolationOrderedAssumption
? 0
: measurer.orderedGetCount);
}
};

struct FunctionInfoScanner
: public WalkerPass<PostWalker<FunctionInfoScanner>> {
bool isFunctionParallel() override { return true; }
Expand Down Expand Up @@ -224,7 +281,7 @@ struct FunctionInfoScanner
info.inliningMode = InliningMode::Uninlineable;
}

info.size = Measurer::measure(curr->body);
info.size = InlineMeasurer::measure(curr);

if (auto* call = curr->body->dynCast<Call>()) {
if (info.size == call->operands.size() + 1) {
Expand Down
253 changes: 253 additions & 0 deletions test/lit/passes/inlining-small-function-always.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
;; RUN: foreach %s %t wasm-opt -all --inlining --shrink-level=2 -S -o - | filecheck %s

(module $call_two
;; CHECK: (type $0 (func (param i32 i32) (result i32)))

;; CHECK: (type $1 (func (param i32) (result i32)))

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

;; CHECK: (func $add (type $0) (param $0 i32) (param $1 i32) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $add (param i32) (param i32) (result i32)
(i32.add (local.get 0) (local.get 1))
)

;; CHECK: (func $call_add (type $1) (param $0 i32) (result i32)
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (local $2 i32)
;; CHECK-NEXT: (block $__inlined_func$add (result i32)
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: (local.get $2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $call_add (param i32) (result i32)
(call $add (local.get 0) (i32.const 1))
)
)

(module $call_three
;; CHECK: (type $0 (func (param i32 i32 i32) (result i32)))

;; CHECK: (type $1 (func (param i32) (result i32)))

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

;; CHECK: (func $callee (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: (local.get $2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $callee (param i32 i32 i32) (result i32)
(i32.add
(local.get 0)
(i32.add (local.get 1) (local.get 2))
)
)

;; CHECK: (func $caller (type $1) (param $0 i32) (result i32)
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (local $2 i32)
;; CHECK-NEXT: (local $3 i32)
;; CHECK-NEXT: (block $__inlined_func$callee (result i32)
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $3
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $2)
;; CHECK-NEXT: (local.get $3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $caller (param i32) (result i32)
(call $callee (local.get 0) (i32.const 1) (local.get 0))
)
)

(module $skip_part_of_parameters
;; CHECK: (type $0 (func (param i32 i32 i32) (result i32)))

;; CHECK: (type $1 (func (param i32) (result i32)))

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

;; CHECK: (func $callee (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: (local.get $2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $callee (param i32 i32 i32) (result i32)
(i32.add
(local.get 0)
(local.get 2)
)
)

;; CHECK: (func $caller (type $1) (param $0 i32) (result i32)
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (local $2 i32)
;; CHECK-NEXT: (local $3 i32)
;; CHECK-NEXT: (block $__inlined_func$callee (result i32)
;; CHECK-NEXT: (local.set $1
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $3
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: (local.get $3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $caller (param i32) (result i32)
(call $callee (local.get 0) (i32.const 1) (local.get 0))
)
)


(module $wrong_order
;; CHECK: (type $0 (func (param i32 i32) (result i32)))

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

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

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

;; CHECK: (func $callee1 (type $0) (param $0 i32) (param $1 i32) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $callee1 (param i32 i32) (result i32)
(i32.add (local.get 1) (local.get 0))
)
(export "callee2" (func $callee2))

;; CHECK: (func $callee2 (type $0) (param $0 i32) (param $1 i32) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $callee2 (param i32 i32) (result i32)
(i32.add (local.get 0) (local.get 0))
)

;; CHECK: (func $caller (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $callee1
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $callee2
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $caller
(drop (call $callee1 (i32.const 0) (i32.const 1)))
(drop (call $callee2 (i32.const 0) (i32.const 1)))
)
)

(module $non_parameters
;; CHECK: (type $0 (func (result i32)))

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

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

;; CHECK: (func $callee1 (type $0) (result i32)
;; CHECK-NEXT: (local $0 i32)
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $callee1 (result i32)
(local i32 i32)
(i32.add (local.get 0) (local.get 1))
)

;; CHECK: (func $caller (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $callee1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $caller
(drop (call $callee1))
)
)

(module $non_parameters
;; CHECK: (type $0 (func (result i32)))

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

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

;; CHECK: (func $callee1 (type $0) (result i32)
;; CHECK-NEXT: (local $0 i32)
;; CHECK-NEXT: (local $1 i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $callee1 (result i32)
(local i32 i32)
(i32.add (local.get 0) (local.get 1))
)

;; CHECK: (func $caller (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (call $callee1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $caller
(drop (call $callee1))
)
)
Loading
Loading