Skip to content
Open
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
73 changes: 70 additions & 3 deletions src/passes/CodeFolding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
#include "ir/effects.h"
#include "ir/eh-utils.h"
#include "ir/find_all.h"
#include "ir/iteration.h"
#include "ir/label-utils.h"
#include "ir/utils.h"
#include "pass.h"
Expand Down Expand Up @@ -135,6 +136,11 @@ struct CodeFolding
modifieds; // modified code should not be processed
// again, wait for next pass

// Cache of expressions that have branches exiting to targets defined
// outside them. Populated lazily on first access via PostWalker.
std::unordered_set<Expression*> exitingBranchCache_;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
std::unordered_set<Expression*> exitingBranchCache_;
std::unordered_set<Expression*> exitingBranchCache;

We don't use a convention like that for "internal" things.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please move this down to the function that uses it. Then a single comment will work for both (atm the comment appears twice).

bool exitingBranchCachePopulated_ = false;

// walking

void visitExpression(Expression* curr) {
Expand Down Expand Up @@ -299,13 +305,76 @@ struct CodeFolding
returnTails.clear();
unoptimizables.clear();
modifieds.clear();
exitingBranchCache_.clear();
exitingBranchCachePopulated_ = false;
if (needEHFixups) {
EHUtils::handleBlockNestedPops(func, *getModule());
}
}
}

private:
// Check if an expression has branches that exit to targets defined outside
// it. The cache is populated lazily on first call using a PostWalker for
// efficient bottom-up traversal.
bool hasExitingBranches(Expression* expr) {
if (!exitingBranchCachePopulated_) {
populateExitingBranchCache(getFunction()->body);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks like this still scans the entire function. I suggest that we only scan expr itself. That will still avoid re-computing things, but avoid scanning things that we never need to look at.

This does require that the cache store a bool, so we know if we scanned or not, and if we did, if we found branches out or not. But I think that is worth it - usually we will scan very few things.

exitingBranchCachePopulated_ = true;
}
return exitingBranchCache_.count(expr);
}

// Pre-populate the exiting branch cache for all sub-expressions of root
// in a single O(N) bottom-up walk. After this, exitingBranchCache_
// lookups are O(1).
void populateExitingBranchCache(Expression* root) {
struct CachePopulator
: public PostWalker<CachePopulator,
UnifiedExpressionVisitor<CachePopulator>> {
std::unordered_set<Expression*>& cache;
// Track unresolved branch targets at each node. We propagate children's
// targets upward: add uses, remove defs. If any remain, the expression
// has exiting branches.
std::unordered_map<Expression*, std::unordered_set<Name>> targetSets;

CachePopulator(std::unordered_set<Expression*>& cache) : cache(cache) {}

void visitExpression(Expression* curr) {
std::unordered_set<Name> targets;
// Merge children's target sets into ours (move to avoid copies)
ChildIterator children(curr);
for (auto* child : children) {
auto it = targetSets.find(child);
if (it != targetSets.end()) {
if (targets.empty()) {
targets = std::move(it->second);
} else {
targets.merge(it->second);
}
targetSets.erase(it);
}
}
// Add branch uses (names this expression branches to)
BranchUtils::operateOnScopeNameUses(
curr, [&](Name& name) { targets.insert(name); });
// Remove branch defs (names this expression defines as targets)
BranchUtils::operateOnScopeNameDefs(curr, [&](Name& name) {
if (name.is()) {
targets.erase(name);
}
});
bool hasExiting = !targets.empty();
if (hasExiting) {
cache.insert(curr);
targetSets[curr] = std::move(targets);
}
}
};
CachePopulator populator(exitingBranchCache_);
populator.walk(root);
}

// check if we can move a list of items out of another item. we can't do so
// if one of the items has a branch to something inside outOf that is not
// inside that item
Expand Down Expand Up @@ -637,9 +706,7 @@ struct CodeFolding
// TODO: this should not be a problem in
// *non*-terminating tails, but
// double-verify that
if (EffectAnalyzer(
getPassOptions(), *getModule(), newItem)
.hasExternalBreakTargets()) {
if (hasExitingBranches(newItem)) {
return true;
}
return false;
Expand Down
Loading