[MLInliner] Keep track of deleted functions #97348
Merged
Conversation
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
As opposed to using Node::isDead(), which is no longer accurate after llvm#94815. This is only used in diagnostics.
|
@llvm/pr-subscribers-mlgo @llvm/pr-subscribers-llvm-analysis Author: Arthur Eubanks (aeubanks) ChangesAs opposed to using Node::isDead(), which is no longer accurate after #94815. This is only used in diagnostics. Full diff: https://github.com/llvm/llvm-project/pull/97348.diff 2 Files Affected:
diff --git a/llvm/include/llvm/Analysis/MLInlineAdvisor.h b/llvm/include/llvm/Analysis/MLInlineAdvisor.h
index 2aa077fe0e035..0333f457c1a2d 100644
--- a/llvm/include/llvm/Analysis/MLInlineAdvisor.h
+++ b/llvm/include/llvm/Analysis/MLInlineAdvisor.h
@@ -89,6 +89,7 @@ class MLInlineAdvisor : public InlineAdvisor {
int32_t CurrentIRSize = 0;
llvm::SmallPtrSet<const LazyCallGraph::Node *, 1> NodesInLastSCC;
DenseSet<const LazyCallGraph::Node *> AllNodes;
+ DenseSet<Function *> DeadFunctions;
bool ForceStop = false;
ProfileSummaryInfo &PSI;
};
diff --git a/llvm/lib/Analysis/MLInlineAdvisor.cpp b/llvm/lib/Analysis/MLInlineAdvisor.cpp
index 652f0d994b29c..8131acb3f0df3 100644
--- a/llvm/lib/Analysis/MLInlineAdvisor.cpp
+++ b/llvm/lib/Analysis/MLInlineAdvisor.cpp
@@ -311,11 +311,13 @@ void MLInlineAdvisor::onSuccessfulInlining(const MLInlineAdvice &Advice,
int64_t NewCallerAndCalleeEdges =
getCachedFPI(*Caller).DirectCallsToDefinedFunctions;
- if (CalleeWasDeleted)
+ if (CalleeWasDeleted) {
--NodeCount;
- else
+ DeadFunctions.insert(Callee);
+ } else {
NewCallerAndCalleeEdges +=
getCachedFPI(*Callee).DirectCallsToDefinedFunctions;
+ }
EdgeCount += (NewCallerAndCalleeEdges - Advice.CallerAndCalleeEdges);
assert(CurrentIRSize >= 0 && EdgeCount >= 0 && NodeCount >= 0);
}
@@ -493,7 +495,9 @@ void MLInlineAdvisor::print(raw_ostream &OS) const {
OS << "\n";
OS << "[MLInlineAdvisor] FuncLevels:\n";
for (auto I : FunctionLevels)
- OS << (I.first->isDead() ? "<deleted>" : I.first->getFunction().getName())
+ OS << (DeadFunctions.contains(&I.first->getFunction())
+ ? "<deleted>"
+ : I.first->getFunction().getName())
<< " : " << I.second << "\n";
OS << "\n";
|
mtrofin
approved these changes
Jul 1, 2024
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/773 Here is the relevant piece of the build log for the reference: |
lravenclaw
pushed a commit
to lravenclaw/llvm-project
that referenced
this pull request
Jul 3, 2024
As opposed to using Node::isDead(), which is no longer accurate after llvm#94815. This is only used in diagnostics.
kbluck
pushed a commit
to kbluck/llvm-project
that referenced
this pull request
Jul 6, 2024
As opposed to using Node::isDead(), which is no longer accurate after llvm#94815. This is only used in diagnostics.
anton-bannykh
pushed a commit
to Kotlin/llvm-project
that referenced
this pull request
Aug 23, 2024
As opposed to using Node::isDead(), which is no longer accurate after This is only used in diagnostics. (cherry picked from commit ebdb6f4)
anton-bannykh
pushed a commit
to Kotlin/llvm-project
that referenced
this pull request
Aug 23, 2024
As opposed to using Node::isDead(), which is no longer accurate after This is only used in diagnostics. (cherry picked from commit ebdb6f4)
anton-bannykh
pushed a commit
to Kotlin/llvm-project
that referenced
this pull request
Aug 26, 2024
As opposed to using Node::isDead(), which is no longer accurate after This is only used in diagnostics. (cherry picked from commit ebdb6f4)
anton-bannykh
pushed a commit
to Kotlin/llvm-project
that referenced
this pull request
Aug 26, 2024
As opposed to using Node::isDead(), which is no longer accurate after This is only used in diagnostics. (cherry picked from commit ebdb6f4)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As opposed to using Node::isDead(), which is no longer accurate after #94815.
This is only used in diagnostics.