Skip to content

[BOLT] Optionally turn off hash-based stale matching #167589

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

Draft
wants to merge 1 commit into
base: users/aaupov/spr/main.bolt-optionally-turn-off-hash-based-stale-matching
Choose a base branch
from
Draft

[BOLT] Optionally turn off hash-based stale matching #167589

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
19 changes: 12 additions & 7 deletions bolt/lib/Profile/StaleProfileMatching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ cl::opt<bool> StaleMatchingWithPseudoProbes(
cl::desc("Turns on stale matching with block pseudo probes."),
cl::init(false), cl::ReallyHidden, cl::cat(BoltOptCategory));

cl::opt<bool> StaleMatchingWithHashes(
"stale-matching-with-hashes",
cl::desc("Turns on stale matching with block hashes."),
cl::init(true), cl::ReallyHidden, cl::cat(BoltOptCategory));

} // namespace opts

namespace llvm {
Expand Down Expand Up @@ -726,16 +731,16 @@ size_t matchWeights(BinaryContext &BC,
matchProbe(CSI.InlineTreeNode, CSI.Probe);
}
}
ProfileBlockMatchMap StaleMatchedBlocks = matchBlocks(
BC, *YamlBF, HashFunction, IdToYamlBF, Matcher, BlendedHashes);
for (const auto &[Id, FlowBlockPair] : StaleMatchedBlocks)
// TBD: determine scaling factor
if (!MatchedBlocks.contains(Id))
MatchedBlocks[Id] = FlowBlockPair;
if (opts::StaleMatchingWithHashes)
for (const auto &[Id, FlowBlockPair] : matchBlocks(
BC, *YamlBF, HashFunction, IdToYamlBF, Matcher, BlendedHashes))
// TBD: determine scaling factor
if (!MatchedBlocks.contains(Id))
MatchedBlocks[Id] = FlowBlockPair;

transferEdgeWeights(MatchedBlocks, OutWeight, InWeight, *YamlBF);
}
if (ProbeMatchSpecs.empty()) {
if (opts::StaleMatchingWithHashes && ProbeMatchSpecs.empty()) {
ProfileBlockMatchMap MatchedBlocks = matchBlocks(
BC, YamlBF, HashFunction, IdToYamlBF, Matcher, BlendedHashes);
transferEdgeWeights(MatchedBlocks, OutWeight, InWeight, YamlBF);
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.