[Coverage] Make additional counters available for BranchRegion. NFC. #120930
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
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`.
This aggregates the generation of branch counter pair as `ExecCnt` and `SkipCnt`, to aggregate `CounterExpr::subtract`. At the moment: - This change preserves the behavior of `llvm::EnableSingleByteCoverage`. Almost of SingleByteCoverage will be cleaned up by coming commits. - `getBranchCounterPair()` is not called in `llvm::EnableSingleByteCoverage`. I will implement the new behavior of SingleByteCoverage in it. - `IsCounterEqual(Out, Par)` is introduced instead of `Counter::operator==`. Tweaks would be required for the comparison for additional counters. - Braces around `assert()` is intentional. I will add a statement there. https://discourse.llvm.org/t/rfc-integrating-singlebytecoverage-with-branch-coverage/82492
`CounterPair` can hold `<uint32_t, uint32_t>` instead of current `unsigned`, to hold also the counter number of SkipPath. For now, this change provides the skeleton and only `CounterPair::first` is used. Each counter number can have `None` to suppress emitting counter increment. `second` is initialized as `None` by default, since most `Stmt*` don't have a pair of counters. This change also provides stubs for the verifyer. I'll provide the impl of verifier for `+Asserts` later. `markStmtAsUsed(bool, Stmt*)` may be used to inform that other side counter may not emitted. `markStmtMaybeUsed(S)` may be used for the `Stmt` and its inner will be excluded for emission in the case of skipping by constant folding. I put it into places where I found. `verifyCounterMap()` will check the coverage map the counter map and can be used to report inconsistency. These verifier methods shall be eliminated in `-Asserts`. https://discourse.llvm.org/t/rfc-integrating-singlebytecoverage-with-branch-coverage/82492
…/single/replace' and 'users/chapuni/cov/single/pair' into HEAD
`getBranchCounterPair()` allocates an additional Counter to SkipPath in `SingleByteCoverage`. `IsCounterEqual()` calculates the comparison with rewinding counter replacements. `NumRegionCounters` is updated to take additional counters in account. `incrementProfileCounter()` has a few additiona arguments. - `UseSkipPath=true`, to specify setting counters for SkipPath. It assumes `UseSkipPath=false` is used together. - `UseBoth` may be specified for marking another path. It introduces the same effect as issueing `markStmtAsUsed(!SkipPath, S)`. `llvm-cov` discovers counters in `FalseCount` to allocate `MaxCounterID` for empty profile data.
…cov/single/replace' into users/chapuni/cov/single/nextcount-base
…puni/cov/single/nextcount
Currently `first` is not None by default.
…/single/getpair' into users/chapuni/cov/single/nextcount-base
Conflicts: clang/lib/CodeGen/CoverageMappingGen.cpp
…ingle/nextcount-base
…v/single/nextcount-base
…v/single/nextcount-base
…puni/cov/single/nextcount Conflicts: clang/lib/CodeGen/CoverageMappingGen.cpp
Conflicts: clang/lib/CodeGen/CoverageMappingGen.cpp llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
…puni/cov/single/nextcount Conflicts: clang/lib/CodeGen/CodeGenPGO.cpp clang/lib/CodeGen/CoverageMappingGen.cpp
This was referenced Jan 6, 2025
…v/single/nextcount-base
…puni/cov/single/nextcount
…v/single/nextcount-base
…puni/cov/single/nextcount Conflicts: clang/lib/CodeGen/CoverageMappingGen.cpp
ornata
reviewed
Jan 8, 2025
| @@ -1627,14 +1627,31 @@ class CodeGenFunction : public CodeGenTypeCache { | |||
| } | |||
| void markStmtMaybeUsed(const Stmt *S) { PGO.markStmtMaybeUsed(S); } | |||
|
|
|||
| enum CounterForIncrement { | |||
There was a problem hiding this comment.
is the meaning of "exec counter" and "skip counter" defined anywhere? if not, it would be good to do that here.
| @@ -884,6 +884,9 @@ struct CounterCoverageMappingBuilder | |||
| /// The map of statements to count values. | |||
| llvm::DenseMap<const Stmt *, CounterPair> &CounterMap; | |||
|
|
|||
| CounterExpressionBuilder::SubstMap MapToExpand; | |||
There was a problem hiding this comment.
MapToExpand could use a doxygen comment explaining what it is
…ingle/nextcount-base
…puni/cov/single/nextcount
chapuni
changed the base branch from
users/chapuni/cov/single/nextcount-base
to
main
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.
getBranchCounterPair()allocates an additional Counter to SkipPath inSingleByteCoverage.IsCounterEqual()calculates the comparison with rewinding counter replacements.NumRegionCountersis updated to take additional counters in account.incrementProfileCounter()has a few additiona arguments.UseSkipPath=true, to specify setting counters for SkipPath. It assumesUseSkipPath=falseis used together.UseBothmay be specified for marking another path. It introduces the same effect as issueingmarkStmtAsUsed(!SkipPath, S).llvm-covdiscovers counters inFalseCountto allocateMaxCounterIDfor empty profile data.https://discourse.llvm.org/t/rfc-integrating-singlebytecoverage-with-branch-coverage/82492
Resumes: #112730
Depends on: #112698 #112702 #112724