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

[clang][dataflow] HTML logger: Mark iterations that have converged. #68204

Merged
merged 1 commit into from
Oct 4, 2023
+14 −8
Merged

[clang][dataflow] HTML logger: Mark iterations that have converged. #68204

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
20 changes: 12 additions & 8 deletions clang/lib/Analysis/FlowSensitive/HTMLLogger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class HTMLLogger : public Logger {
const CFGBlock *Block;
unsigned Iter;
bool PostVisit;
bool Converged;
};

StreamFactory Streams;
Expand All @@ -159,8 +160,8 @@ class HTMLLogger : public Logger {
const ControlFlowContext *CFG;
// Timeline of iterations of CFG block visitation.
std::vector<Iteration> Iters;
// Number of times each CFG block has been seen.
llvm::DenseMap<const CFGBlock *, llvm::SmallVector<Iteration>> BlockIters;
// Indexes in `Iters` of the iterations for each block.
llvm::DenseMap<const CFGBlock *, llvm::SmallVector<size_t>> BlockIters;
// The messages logged in the current context but not yet written.
std::string ContextLogs;
// The number of elements we have visited within the current CFG block.
Expand Down Expand Up @@ -207,6 +208,7 @@ class HTMLLogger : public Logger {
JOS->attribute("block", blockID(E.Block->getBlockID()));
JOS->attribute("iter", E.Iter);
JOS->attribute("post_visit", E.PostVisit);
JOS->attribute("converged", E.Converged);
});
}
});
Expand All @@ -222,10 +224,10 @@ class HTMLLogger : public Logger {
}

void enterBlock(const CFGBlock &B, bool PostVisit) override {
llvm::SmallVector<Iteration> &BIter = BlockIters[&B];
llvm::SmallVector<size_t> &BIter = BlockIters[&B];
unsigned IterNum = BIter.size() + 1;
BIter.push_back({&B, IterNum, PostVisit});
Iters.push_back({&B, IterNum, PostVisit});
BIter.push_back(Iters.size());
Iters.push_back({&B, IterNum, PostVisit, /*Converged=*/false});
ElementIndex = 0;
}
void enterElement(const CFGElement &E) override {
Expand Down Expand Up @@ -290,7 +292,7 @@ class HTMLLogger : public Logger {
}
});
}
void blockConverged() override { logText("Block converged"); }
void blockConverged() override { Iters.back().Converged = true; }

void logText(llvm::StringRef S) override {
ContextLogs.append(S.begin(), S.end());
Expand All @@ -301,13 +303,15 @@ class HTMLLogger : public Logger {
// Write the CFG block details.
// Currently this is just the list of elements in execution order.
// FIXME: an AST dump would be a useful view, too.
void writeBlock(const CFGBlock &B, llvm::ArrayRef<Iteration> ItersForB) {
void writeBlock(const CFGBlock &B, llvm::ArrayRef<size_t> ItersForB) {
JOS->attributeObject(blockID(B.getBlockID()), [&] {
JOS->attributeArray("iters", [&] {
for (const auto &Iter : ItersForB) {
for (size_t IterIdx : ItersForB) {
const Iteration &Iter = Iters[IterIdx];
JOS->object([&] {
JOS->attribute("iter", Iter.Iter);
JOS->attribute("post_visit", Iter.PostVisit);
JOS->attribute("converged", Iter.Converged);
});
}
});
Expand Down
2 changes: 2 additions & 0 deletions clang/lib/Analysis/FlowSensitive/HTMLLogger.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
{{entry.block}}
<template data-if="entry.post_visit">(post-visit)</template>
<template data-if="!entry.post_visit">({{entry.iter}})</template>
<template data-if="entry.converged"> &#x2192;&#x7c;<!--Rightwards arrow, vertical line--></template>
</div>
</template>
</section>
Expand All @@ -62,6 +63,7 @@
<a class="chooser {{selection.bb}}:{{iter.iter}}" data-iter="{{selection.bb}}:{{iter.iter}}">
<template data-if="iter.post_visit">Post-visit</template>
<template data-if="!iter.post_visit">Iteration {{iter.iter}}</template>
<template data-if="iter.converged"> &#x2192;&#x7c;<!--Rightwards arrow, vertical line--></template>
</a>
</template>
</div>
Expand Down