Account for unaddressed funcs in GlobalEffects #8644
+328
−22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ | |
| // | ||
|
|
||
| #include "ir/effects.h" | ||
| #include "ir/element-utils.h" | ||
| #include "ir/module-utils.h" | ||
| #include "pass.h" | ||
| #include "support/graph_traversal.h" | ||
|
|
@@ -44,6 +45,57 @@ struct FuncInfo { | |
| std::unordered_set<HeapType> indirectCalledTypes; | ||
| }; | ||
|
|
||
| /* | ||
| Only funcs that are 'addressed' may be the target of an indirect call. A | ||
| function is addressed if: | ||
| - It appears in a ref.func expression | ||
| - It appears in an `elem` segment (note that we already ignore `elem declare` | ||
| statements in our IR, but we check separately for funcs that appear in | ||
| `ref.func`). | ||
| - It's exported, because it may flow back to us as a reference. | ||
| - It's imported, which implies it is `elem declare`d. | ||
|
Member
There was a problem hiding this comment. Maybe it's only me but 'it is
Member
Author
There was a problem hiding this comment. Rephrased the comment
|
||
|
|
||
| If a function doesn't meet any of these criteria, it can't be the target of | ||
| an indirect call and we don't need to include its effects in indirect calls. | ||
| */ | ||
| std::unordered_set<Function*> getAddressedFuncs(Module& module) { | ||
| struct AddressedFuncsWalker : WalkerPass<PostWalker<AddressedFuncsWalker>> { | ||
| std::unordered_set<Function*>& addressedFuncs; | ||
|
|
||
| AddressedFuncsWalker(std::unordered_set<Function*>& addressedFuncs) | ||
| : addressedFuncs(addressedFuncs) {} | ||
|
|
||
| void visitRefFunc(RefFunc* refFunc) { | ||
| addressedFuncs.insert(getModule()->getFunction(refFunc->func)); | ||
| } | ||
| }; | ||
|
|
||
| std::unordered_set<Function*> addressedFuncs; | ||
| AddressedFuncsWalker walker(addressedFuncs); | ||
| walker.walkModuleCode(&module); | ||
| walker.walkModule(&module); | ||
|
Member
There was a problem hiding this comment. This isn't going to traverse the module in parallel. You need to call
Member
Author
There was a problem hiding this comment. Done. Included it in the existing pass to avoid having to create a ParallelFunctionAnalysis with the same logic. |
||
|
|
||
| ModuleUtils::iterImportedFunctions( | ||
| module, [&addressedFuncs, &module](Function* import) { | ||
| addressedFuncs.insert(module.getFunction(import->name)); | ||
| }); | ||
|
|
||
| for (const auto& export_ : module.exports) { | ||
| if (export_->kind != ExternalKind::Function) { | ||
| continue; | ||
| } | ||
|
|
||
| addressedFuncs.insert(module.getFunction(*export_->getInternalName())); | ||
| } | ||
|
|
||
| ElementUtils::iterAllElementFunctionNames( | ||
| &module, [&addressedFuncs, &module](Name func) { | ||
| addressedFuncs.insert(module.getFunction(func)); | ||
| }); | ||
|
stevenfontanella marked this conversation as resolved.
Outdated
|
||
|
|
||
| return addressedFuncs; | ||
| } | ||
|
|
||
| std::map<Function*, FuncInfo> analyzeFuncs(Module& module, | ||
| const PassOptions& passOptions) { | ||
| ModuleUtils::ParallelFunctionAnalysis<FuncInfo> analysis( | ||
|
|
@@ -144,6 +196,7 @@ using CallGraph = | |
|
|
||
| CallGraph buildCallGraph(const Module& module, | ||
| const std::map<Function*, FuncInfo>& funcInfos, | ||
| const std::unordered_set<Function*>& addressedFuncs, | ||
| WorldMode worldMode) { | ||
| CallGraph callGraph; | ||
| if (worldMode == WorldMode::Open) { | ||
|
|
@@ -179,16 +232,18 @@ CallGraph buildCallGraph(const Module& module, | |
| } | ||
|
|
||
| // Type -> Function | ||
| if (addressedFuncs.contains(caller)) { | ||
| callGraph[caller->type.getHeapType()].insert(caller); | ||
| } | ||
| } | ||
|
|
||
| // Type -> Type | ||
| // Do a DFS up the type hierarchy for all function implementations. | ||
| // We are essentially walking up each supertype chain and adding edges from | ||
| // super -> subtype, but doing it via DFS to avoid repeated work. | ||
| Graph superTypeGraph(allFunctionTypes.begin(), | ||
| allFunctionTypes.end(), | ||
| [&callGraph](const auto& push, HeapType t) { | ||
| // Not needed except that during lookup we expect the | ||
| // key to exist. | ||
| callGraph[t]; | ||
|
|
@@ -350,8 +405,10 @@ struct GenerateGlobalEffects : public Pass { | |
| std::map<Function*, FuncInfo> funcInfos = | ||
| analyzeFuncs(*module, getPassOptions()); | ||
|
|
||
| auto addressedFuncs = getAddressedFuncs(*module); | ||
|
|
||
| auto callGraph = buildCallGraph( | ||
| *module, funcInfos, addressedFuncs, getPassOptions().worldMode); | ||
|
|
||
| propagateEffects(*module, | ||
| getPassOptions(), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.