Skip to content

[Parser] Re-use blocks instead of wrapping where possible #6552

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

Merged
tlively merged 2 commits into from
Apr 29, 2024
Merged

[Parser] Re-use blocks instead of wrapping where possible #6552

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
70b7584
[Parser] Re-use blocks instead of wrapping where possible
tlively Apr 26, 2024
2c59fb5
fix block type
tlively Apr 29, 2024
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: 11 additions & 6 deletions src/wasm/wasm-ir-builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,13 +929,18 @@ Result<> IRBuilder::visitEnd() {
auto maybeWrapForLabel = [&](Expression* curr) -> Expression* {
bool isTry = scope.getTry() || scope.getCatch() || scope.getCatchAll();
auto& label = isTry ? scope.branchLabel : scope.label;
if (label) {
return builder.makeBlock(label,
{curr},
scope.labelUsed ? originalScopeType
: scope.getResultType());
if (!label) {
return curr;
}
return curr;
auto blockType =
scope.labelUsed ? originalScopeType : scope.getResultType();
// We can re-use unnamed blocks instead of wrapping them.
if (auto* block = curr->dynCast<Block>(); block && !block->name) {
block->name = label;
block->type = blockType;
return block;
}
return builder.makeBlock(label, {curr}, blockType);
};

if (auto* func = scope.getFunction()) {
Expand Down
22 changes: 10 additions & 12 deletions test/lit/passes/type-merging-tnh.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,20 @@

;; CHECK: (func $test (type $2) (param $a (ref $A)) (result (ref $B))
;; CHECK-NEXT: (block $label (result (ref $B))
;; CHECK-NEXT: (block (result (ref $B))
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (br_on_cast $label (ref $A) (ref $B)
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (br_on_cast $label (ref $A) (ref $B)
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block $l (result (ref $A))
;; CHECK-NEXT: (br_on_non_null $l
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block $l (result (ref $A))
;; CHECK-NEXT: (br_on_non_null $l
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $test (param $a (ref $A)) (result (ref $B))
Expand Down
22 changes: 10 additions & 12 deletions test/lit/passes/type-merging.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,22 +1053,20 @@

;; CHECK: (func $test (type $2) (param $a (ref $A)) (result (ref $B))
;; CHECK-NEXT: (block $label (result (ref $B))
;; CHECK-NEXT: (block (result (ref $B))
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (br_on_cast $label (ref $A) (ref $B)
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (br_on_cast $label (ref $A) (ref $B)
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block $l (result (ref $A))
;; CHECK-NEXT: (br_on_non_null $l
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block $l (result (ref $A))
;; CHECK-NEXT: (br_on_non_null $l
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $test (param $a (ref $A)) (result (ref $B))
Expand Down
94 changes: 43 additions & 51 deletions test/lit/wat-kitchen-sink.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
(type $ret2 (func (result i32 i32)))

(rec
;; CHECK: (type $3 (func (result i32 i64)))

;; CHECK: (type $pair (struct (field $first (mut i32)) (field $second (mut i64))))

;; CHECK: (type $4 (func (result i32 i64)))

;; CHECK: (type $5 (func (param i32 i64)))

;; CHECK: (type $a2 (array (mut f32)))
Expand Down Expand Up @@ -323,7 +323,7 @@

;; CHECK: (import "mod" "f5" (func $fimport$0 (type $void)))

;; CHECK: (import "mod" "imported-f" (func $fimport$1 (type $3) (result i32 i64)))
;; CHECK: (import "mod" "imported-f" (func $fimport$1 (type $4) (result i32 i64)))

;; CHECK: (import "mod" "t0" (tag $imported (param i32 i64)))

Expand Down Expand Up @@ -1877,8 +1877,8 @@
end
)

;; CHECK: (func $try-catch-params (type $3) (result i32 i64)
;; CHECK-NEXT: (try (type $3) (result i32 i64)
;; CHECK: (func $try-catch-params (type $4) (result i32 i64)
;; CHECK-NEXT: (try (type $4) (result i32 i64)
;; CHECK-NEXT: (do
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 0)
Expand All @@ -1898,8 +1898,8 @@
end
)

;; CHECK: (func $try-catch-pop (type $3) (result i32 i64)
;; CHECK-NEXT: (try (type $3) (result i32 i64)
;; CHECK: (func $try-catch-pop (type $4) (result i32 i64)
;; CHECK-NEXT: (try (type $4) (result i32 i64)
;; CHECK-NEXT: (do
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 0)
Expand Down Expand Up @@ -2670,13 +2670,11 @@

;; CHECK: (func $label-func (type $void)
;; CHECK-NEXT: (block $label
;; CHECK-NEXT: (block
;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: (block $a
;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: (block $a
;; CHECK-NEXT: (block $b
;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: (block $b
;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand Down Expand Up @@ -2705,13 +2703,11 @@

;; CHECK: (func $br-value-drop (type $1) (result i32)
;; CHECK-NEXT: (block $label (result i32)
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (f32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (br $label
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (f32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (br $label
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand All @@ -2721,8 +2717,8 @@
br 0
)

;; CHECK: (func $br-multivalue (type $3) (result i32 i64)
;; CHECK-NEXT: (block $label (type $3) (result i32 i64)
;; CHECK: (func $br-multivalue (type $4) (result i32 i64)
;; CHECK-NEXT: (block $label (type $4) (result i32 i64)
;; CHECK-NEXT: (br $label
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 0)
Expand All @@ -2737,17 +2733,15 @@
br 0
)

;; CHECK: (func $br-multivalue-drop (type $3) (result i32 i64)
;; CHECK-NEXT: (block $label (type $3) (result i32 i64)
;; CHECK-NEXT: (block (type $3) (result i32 i64)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (f32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (br $label
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: (i64.const 2)
;; CHECK-NEXT: )
;; CHECK: (func $br-multivalue-drop (type $4) (result i32 i64)
;; CHECK-NEXT: (block $label (type $4) (result i32 i64)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (f32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (br $label
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: (i64.const 2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Expand Down Expand Up @@ -2939,9 +2933,9 @@
end
)

;; CHECK: (func $br-table-multivalue (type $3) (result i32 i64)
;; CHECK-NEXT: (block $a (type $3) (result i32 i64)
;; CHECK-NEXT: (block $b (type $3) (result i32 i64)
;; CHECK: (func $br-table-multivalue (type $4) (result i32 i64)
;; CHECK-NEXT: (block $a (type $4) (result i32 i64)
;; CHECK-NEXT: (block $b (type $4) (result i32 i64)
;; CHECK-NEXT: (br_table $a $b
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 42)
Expand Down Expand Up @@ -3669,7 +3663,7 @@
return
)

;; CHECK: (func $return-multivalue (type $3) (result i32 i64)
;; CHECK: (func $return-multivalue (type $4) (result i32 i64)
;; CHECK-NEXT: (return
;; CHECK-NEXT: (call $return-multivalue)
;; CHECK-NEXT: )
Expand Down Expand Up @@ -5086,26 +5080,24 @@
;; CHECK: (func $resume (type $91) (param $ct (ref $simple-cont))
;; CHECK-NEXT: (local $f f32)
;; CHECK-NEXT: (block $label
;; CHECK-NEXT: (block
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block $block (result (ref $to-f32-cont))
;; CHECK-NEXT: (tuple.drop 3
;; CHECK-NEXT: (block $block0 (type $37) (result i32 i64 (ref null $simple-cont))
;; CHECK-NEXT: (local.set $f
;; CHECK-NEXT: (resume $simple-cont (tag $empty $block) (tag $tag-pair-to-pair $block0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i64.const 1)
;; CHECK-NEXT: (local.get $ct)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block $block (result (ref $to-f32-cont))
;; CHECK-NEXT: (tuple.drop 3
;; CHECK-NEXT: (block $block0 (type $37) (result i32 i64 (ref null $simple-cont))
;; CHECK-NEXT: (local.set $f
;; CHECK-NEXT: (resume $simple-cont (tag $empty $block) (tag $tag-pair-to-pair $block0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i64.const 1)
;; CHECK-NEXT: (local.get $ct)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: )
;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $resume (param $ct (ref $simple-cont))
Expand Down Expand Up @@ -5148,7 +5140,7 @@
cont.bind $cont-bind-before $simple-cont
)

;; CHECK: (func $suspend (type $3) (result i32 i64)
;; CHECK: (func $suspend (type $4) (result i32 i64)
;; CHECK-NEXT: (suspend $tag-pair-to-pair
;; CHECK-NEXT: (i32.const 123)
;; CHECK-NEXT: (i64.const 456)
Expand Down