Introduce CounterExpressionBuilder::subst(C, Map) #112698
Merged
Conversation
This file contains 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
This return a counter for each term in the expression replaced by ReplaceMap. At the moment, this doesn't update the Map, so Map is marked as `const`.
|
@llvm/pr-subscribers-pgo Author: NAKAMURA Takumi (chapuni) ChangesThis return a counter for each term in the expression replaced by ReplaceMap. At the moment, this doesn't update the Map, so Map is marked as Full diff: https://github.com/llvm/llvm-project/pull/112698.diff 2 Files Affected:
diff --git a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
index fa07b3a9e8b14f..d6528bd407ef34 100644
--- a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
+++ b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
@@ -34,6 +34,7 @@
#include <cassert>
#include <cstdint>
#include <iterator>
+#include <map>
#include <memory>
#include <sstream>
#include <string>
@@ -213,6 +214,11 @@ class CounterExpressionBuilder {
/// Return a counter that represents the expression that subtracts RHS from
/// LHS.
Counter subtract(Counter LHS, Counter RHS, bool Simplify = true);
+
+ using ReplaceMap = std::map<Counter, Counter>;
+
+ /// Return a counter for each term in the expression replaced by ReplaceMap.
+ Counter replace(Counter C, const ReplaceMap &Map);
};
using LineColPair = std::pair<unsigned, unsigned>;
diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
index c713371da81e40..b50f025d261e13 100644
--- a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
+++ b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
@@ -135,6 +135,38 @@ Counter CounterExpressionBuilder::subtract(Counter LHS, Counter RHS,
return Simplify ? simplify(Cnt) : Cnt;
}
+Counter CounterExpressionBuilder::replace(Counter C, const ReplaceMap &Map) {
+ auto I = Map.find(C);
+
+ // Replace C with the Map even if C is Expression.
+ if (I != Map.end())
+ return I->second;
+
+ // Traverse only Expression.
+ if (!C.isExpression())
+ return C;
+
+ auto CE = Expressions[C.getExpressionID()];
+ auto NewLHS = replace(CE.LHS, Map);
+ auto NewRHS = replace(CE.RHS, Map);
+
+ // Reconstruct Expression with induced subexpressions.
+ switch (CE.Kind) {
+ case CounterExpression::Add:
+ C = add(NewLHS, NewRHS);
+ break;
+ case CounterExpression::Subtract:
+ C = subtract(NewLHS, NewRHS);
+ break;
+ }
+
+ // Reconfirm if the reconstructed expression would hit the Map.
+ if ((I = Map.find(C)) != Map.end())
+ return I->second;
+
+ return C;
+}
+
void CounterMappingContext::dump(const Counter &C, raw_ostream &OS) const {
switch (C.getKind()) {
case Counter::Zero:
|
ornata
reviewed
Oct 18, 2024
ornata
reviewed
Oct 18, 2024
| Counter CounterExpressionBuilder::replace(Counter C, const ReplaceMap &Map) { | ||
| auto I = Map.find(C); | ||
|
|
||
| // Replace C with the Map even if C is Expression. |
There was a problem hiding this comment.
Replace C with the Map...
"replace C with the value found in Map..."?
ornata
reviewed
Oct 18, 2024
| if (I != Map.end()) | ||
| return I->second; | ||
|
|
||
| // Traverse only Expression. |
There was a problem hiding this comment.
Because others (Zero or CounterRef) are not traversable :)
Is this line too naive to you? I could eliminate.
ornata
reviewed
Oct 18, 2024
ornata
reviewed
Oct 18, 2024
| return C; | ||
|
|
||
| auto CE = Expressions[C.getExpressionID()]; | ||
| auto NewLHS = replace(CE.LHS, Map); |
There was a problem hiding this comment.
How deep can this recurse? Should there be a depth limit?
There was a problem hiding this comment.
I suppose at most the number of terms, unless the expression is made buggy with loops. (Then, other CounterExpression stuff would hang or crash, I guess) Would we really check if the expr would not be buggy?
If we should introduce such a check, it may be not depth limit but the set of Seen.
There was a problem hiding this comment.
If we don't want a check, is it possible to add debug output?
chapuni
commented
Oct 18, 2024
| if (I != Map.end()) | ||
| return I->second; | ||
|
|
||
| // Traverse only Expression. |
There was a problem hiding this comment.
Because others (Zero or CounterRef) are not traversable :)
Is this line too naive to you? I could eliminate.
| return C; | ||
|
|
||
| auto CE = Expressions[C.getExpressionID()]; | ||
| auto NewLHS = replace(CE.LHS, Map); |
There was a problem hiding this comment.
I suppose at most the number of terms, unless the expression is made buggy with loops. (Then, other CounterExpression stuff would hang or crash, I guess) Would we really check if the expr would not be buggy?
If we should introduce such a check, it may be not depth limit but the set of Seen.
|
Is |
|
Is it possible to write a unittest for this function? |
chapuni
changed the title
|
@ornata A test added. I'll rewrite CounterExpression stuff in the future to avoid tree traversal. |
ornata
reviewed
Jan 9, 2025
ornata
reviewed
Jan 9, 2025
ornata
reviewed
Jan 9, 2025
ornata
reviewed
Jan 9, 2025
ornata
reviewed
Jan 9, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/11414 Here is the relevant piece of the build log for the reference |
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.
This return a counter for each term in the expression replaced by ReplaceMap.
At the moment, this doesn't update the Map, so Map is marked as
const.