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.

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

[wasm-reduce] Reduce struct.new arguments away when possible #7118

Merged
merged 8 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 20 additions & 1 deletion src/tools/wasm-reduce.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ struct Reducer
"--simplify-globals",
"--simplify-locals --vacuum",
"--strip",
"--remove-unused-types",
"--remove-unused-types --closed-world",
"--vacuum"};
auto oldSize = file_size(working);
bool more = true;
Expand Down Expand Up @@ -609,6 +609,25 @@ struct Reducer
// children (which would recreate the current state).
return;
}
} else if (auto* structNew = curr->dynCast<StructNew>()) {
// If all the fields are defaultable, try to replace this with a
// struct.new_with_default.
if (!structNew->isWithDefault() && structNew->type != Type::unreachable) {
auto& fields = structNew->type.getHeapType().getStruct().fields;
if (std::all_of(fields.begin(), fields.end(), [&](auto& field) {
return field.type.isDefaultable();
})) {
ExpressionList operands(getModule()->allocator);
operands.swap(structNew->operands);
assert(structNew->isWithDefault());
if (tryToReplaceCurrent(structNew)) {
return;
} else {
structNew->operands.swap(operands);
Copy link
Member Author

Choose a reason for hiding this comment

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

This is how I noticed swap was broken...

assert(!structNew->isWithDefault());
}
}
}
}
// Finally, try to replace with a child.
for (auto* child : ChildIterator(curr)) {
Expand Down
28 changes: 28 additions & 0 deletions test/reduce/gc.wast
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
(module
(rec
(type $A (struct (field (mut i32)) (field funcref)))
;; This type can be optimized away.
(type $unused (struct))
)

(global $A (ref null $A) (struct.new $A
;; These particular values are not used, and can be removed, leaving the
;; struct.new as struct.new_default.
(i32.const 0)
(ref.func $use-global)
))

(func $use-global (export "use-global") (result i32)
;; This function stores 42 in the global struct, then reads and returns
;; that. We don't manage to optimize away anything in this function, which
;; only serves to keep alive the type and the global for the above testing.
(struct.set $A 0
(global.get $A)
(i32.const 42)
)
(struct.get $A 0
(global.get $A)
)
)
)

16 changes: 16 additions & 0 deletions test/reduce/gc.wast.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
(module
(type $0 (struct (field (mut i32)) (field funcref)))
(type $1 (func (result i32)))
(global $global$0 (ref null $0) (struct.new_default $0))
(export "use-global" (func $0))
(func $0 (result i32)
(struct.set $0 0
(global.get $global$0)
(i32.const 42)
)
(struct.get $0 0
(global.get $global$0)
)
)
)