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

Stack switching: fix some optimization passes #7271

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Stack switching: fix some optimization passes #7271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions src/cfg/cfg-traversal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,19 @@ struct CFGWalker : public PostWalker<SubType, VisitorType> {
self->tryStack.pop_back();
}

static void doEndResume(SubType* self, Expression** currp) {
auto* module = self->getModule();
if (!module || module->features.hasExceptionHandling()) {
// This resume might throw, so run the code to handle that.
doEndThrowingInst(self, currp);
}
auto handlerBlocks = BranchUtils::getUniqueTargets(*currp);
// Add branches to the targets.
for (auto target : handlerBlocks) {
self->branches[target].push_back(self->currBasicBlock);
}
}

static bool isReturnCall(Expression* curr) {
switch (curr->_id) {
case Expression::Id::CallId:
Expand Down Expand Up @@ -521,6 +534,20 @@ struct CFGWalker : public PostWalker<SubType, VisitorType> {
self->pushTask(SubType::doEndThrow, currp);
break;
}
case Expression::Id::ResumeId:
case Expression::Id::ResumeThrowId: {
self->pushTask(SubType::doEndResume, currp);
break;
}
case Expression::Id::SuspendId:
case Expression::Id::StackSwitchId: {
auto* module = self->getModule();
if (!module || module->features.hasExceptionHandling()) {
// This might throw, so run the code to handle that.
self->pushTask(SubType::doEndCall, currp);
}
break;
}
default: {
if (Properties::isBranch(curr)) {
self->pushTask(SubType::doEndBranch, currp);
Expand Down
14 changes: 12 additions & 2 deletions src/ir/ReFinalize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,18 @@ void ReFinalize::visitStringSliceWTF(StringSliceWTF* curr) { curr->finalize(); }
void ReFinalize::visitContNew(ContNew* curr) { curr->finalize(); }
void ReFinalize::visitContBind(ContBind* curr) { curr->finalize(); }
void ReFinalize::visitSuspend(Suspend* curr) { curr->finalize(getModule()); }
void ReFinalize::visitResume(Resume* curr) { curr->finalize(); }
void ReFinalize::visitResumeThrow(ResumeThrow* curr) { curr->finalize(); }
void ReFinalize::visitResume(Resume* curr) {
curr->finalize();
for (size_t i = 0; i < curr->handlerBlocks.size(); i++) {
updateBreakValueType(curr->handlerBlocks[i], curr->sentTypes[i]);
}
}
void ReFinalize::visitResumeThrow(ResumeThrow* curr) {
curr->finalize();
for (size_t i = 0; i < curr->handlerBlocks.size(); i++) {
updateBreakValueType(curr->handlerBlocks[i], curr->sentTypes[i]);
}
}
void ReFinalize::visitStackSwitch(StackSwitch* curr) { curr->finalize(); }

void ReFinalize::visitExport(Export* curr) { WASM_UNREACHABLE("unimp"); }
Expand Down
8 changes: 4 additions & 4 deletions src/ir/branch-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ void operateOnScopeNameUsesAndSentTypes(Expression* expr, T func) {
}
}
} else if (auto* r = expr->dynCast<Resume>()) {
for (Index i = 0; i < r->handlerTags.size(); i++) {
auto dest = r->handlerTags[i];
for (Index i = 0; i < r->handlerBlocks.size(); i++) {
auto dest = r->handlerBlocks[i];
if (!dest.isNull() && dest == name) {
func(name, r->sentTypes[i]);
}
}
} else if (auto* r = expr->dynCast<ResumeThrow>()) {
for (Index i = 0; i < r->handlerTags.size(); i++) {
auto dest = r->handlerTags[i];
for (Index i = 0; i < r->handlerBlocks.size(); i++) {
auto dest = r->handlerBlocks[i];
if (!dest.isNull() && dest == name) {
func(name, r->sentTypes[i]);
}
Expand Down
26 changes: 20 additions & 6 deletions src/wasm-interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2617,15 +2617,29 @@ class ConstantExpressionRunner : public ExpressionRunner<SubType> {
}
return ExpressionRunner<SubType>::visitRefAs(curr);
}
Flow visitContNew(ContNew* curr) { WASM_UNREACHABLE("unimplemented"); }
Flow visitContBind(ContBind* curr) { WASM_UNREACHABLE("unimplemented"); }
Flow visitSuspend(Suspend* curr) { WASM_UNREACHABLE("unimplemented"); }
Flow visitResume(Resume* curr) { WASM_UNREACHABLE("unimplemented"); }
Flow visitContNew(ContNew* curr) {
NOTE_ENTER("ContNew");
return Flow(NONCONSTANT_FLOW);
}
Flow visitContBind(ContBind* curr) {
NOTE_ENTER("ContBind");
return Flow(NONCONSTANT_FLOW);
}
Flow visitSuspend(Suspend* curr) {
NOTE_ENTER("Suspend");
return Flow(NONCONSTANT_FLOW);
}
Flow visitResume(Resume* curr) {
NOTE_ENTER("Resume");
return Flow(NONCONSTANT_FLOW);
}
Flow visitResumeThrow(ResumeThrow* curr) {
WASM_UNREACHABLE("unimplemented");
NOTE_ENTER("ResumeThrow");
return Flow(NONCONSTANT_FLOW);
}
Flow visitStackSwitch(StackSwitch* curr) {
WASM_UNREACHABLE("unimplemented");
NOTE_ENTER("StackSwitch");
return Flow(NONCONSTANT_FLOW);
}

void trap(const char* why) override { throw NonconstantException(); }
Expand Down
163 changes: 163 additions & 0 deletions test/lit/passes/stack_switching.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
;;RUN: wasm-opt -all -O3 -Oz %s -S -o - | filecheck %s
Copy link
Member

Choose a reason for hiding this comment

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

Would you be able to break this up into targeted tests for the individual fixed optimization passes? Also, the new test files should be added to the list of ignored tests in scripts/fuzzing.py until scripts/fuzz_opt.py can run cleanly without that.

(module
;; CHECK: (type $function_1 (func (param (ref eq) (ref eq)) (result (ref eq))))
(type $function_1 (func (param (ref eq) (ref eq)) (result (ref eq))))
;; CHECK: (type $closure (sub (struct (field (ref $function_1)))))
(type $closure (sub (struct (field (ref $function_1)))))
;; CHECK: (type $cont (cont $function_1))

;; CHECK: (type $function_2 (func (param (ref eq) (ref eq) (ref eq)) (result (ref eq))))
(type $function_2 (func (param (ref eq) (ref eq) (ref eq)) (result (ref eq))))
;; CHECK: (type $closure_2 (struct (field (ref $function_2))))
(type $closure_2 (struct (field (ref $function_2))))
;; CHECK: (type $handlers (struct (field $value (ref $closure)) (field $exn (ref $closure)) (field $effect (ref $closure_2))))
(type $handlers (struct (field $value (ref $closure)) (field $exn (ref $closure)) (field $effect (ref $closure_2))))
(type $cont (cont $function_1))
;; CHECK: (type $fiber (struct (field $handlers (ref $handlers)) (field $cont (ref $cont))))
(type $fiber (struct (field $handlers (ref $handlers)) (field $cont (ref $cont))))
;; CHECK: (tag $exception (type $8) (param (ref eq)))
(tag $exception (param (ref eq)))
;; CHECK: (tag $effect (type $9) (param (ref eq)) (result (ref eq) (ref eq)))
(tag $effect (param (ref eq)) (result (ref eq) (ref eq)))
;; CHECK: (func $resume (type $10) (param $0 (ref $fiber)) (param $1 (ref $closure)) (param $2 (ref eq)) (result (ref eq))
;; CHECK-NEXT: (local $3 (tuple (ref eq) (ref $cont)))
;; CHECK-NEXT: (local $4 (ref $handlers))
;; CHECK-NEXT: (local $5 (ref $closure_2))
;; CHECK-NEXT: (return_call_ref $function_1
;; CHECK-NEXT: (block $handle_exception (result (ref eq))
;; CHECK-NEXT: (return_call_ref $function_2
;; CHECK-NEXT: (tuple.extract 2 0
;; CHECK-NEXT: (local.tee $3
;; CHECK-NEXT: (block $handle_effect (type $7) (result (ref eq) (ref $cont))
;; CHECK-NEXT: (return_call_ref $function_1
;; CHECK-NEXT: (try_table (result (ref eq)) (catch $exception $handle_exception)
;; CHECK-NEXT: (resume $cont (on $effect $handle_effect)
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: (local.get $2)
;; CHECK-NEXT: (struct.get $fiber $cont
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.tee $1
;; CHECK-NEXT: (struct.get $handlers $value
;; CHECK-NEXT: (struct.get $fiber $handlers
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (struct.get $closure 0
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (struct.new $fiber
;; CHECK-NEXT: (local.tee $4
;; CHECK-NEXT: (struct.get $fiber $handlers
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (tuple.extract 2 1
;; CHECK-NEXT: (local.get $3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.tee $5
;; CHECK-NEXT: (struct.get $handlers $effect
;; CHECK-NEXT: (local.get $4)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (struct.get $closure_2 0
;; CHECK-NEXT: (local.get $5)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.tee $1
;; CHECK-NEXT: (struct.get $handlers $exn
;; CHECK-NEXT: (struct.get $fiber $handlers
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (struct.get $closure 0
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $resume (export "resume") (param $fiber (ref $fiber)) (param $f (ref $closure)) (param $v (ref eq)) (result (ref eq))
(local $g (ref $closure_2))
(local $res (ref eq))
(local $exn (ref eq))
(local $resume_res (tuple (ref eq) (ref $cont)))
(local.set $exn
(block $handle_exception (result (ref eq))
(local.set $resume_res
(block $handle_effect (result (ref eq) (ref $cont))
(local.set $res
(try_table (result (ref eq)) (catch $exception $handle_exception)
(resume $cont (on $effect $handle_effect)
(local.get $f)
(local.get $v)
(struct.get $fiber $cont
(local.get $fiber)
)
)
)
)
(return_call_ref $function_1
(local.get $res)
(local.tee $f
(struct.get $handlers $value
(struct.get $fiber $handlers
(local.get $fiber)
)
)
)
(struct.get $closure 0
(local.get $f)
)
)
)
)
(return_call_ref $function_2
(tuple.extract 2 0
(local.get $resume_res)
)
(struct.new $fiber
(struct.get $fiber $handlers
(local.get $fiber)
)
(tuple.extract 2 1
(local.get $resume_res)
)
)
(local.tee $g
(struct.get $handlers $effect
(struct.get $fiber $handlers
(local.get $fiber)
)
)
)
(struct.get $closure_2 0
(local.get $g)
)
)
)
)
(return_call_ref $function_1
(local.get $exn)
(local.tee $f
(struct.get $handlers $exn
(struct.get $fiber $handlers
(local.get $fiber)
)
)
)
(struct.get $closure 0
(local.get $f)
)
)
)
)