Skip to content

[Coverage] Introduce getBranchCounterPair(). NFC. #112702

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

Merged
merged 15 commits into from
Jan 9, 2025
Merged

[Coverage] Introduce getBranchCounterPair(). NFC. #112702

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fc697f0
[Coverage] Introduce `getBranchCounterPair()`. NFC.
chapuni Oct 16, 2024
ad13691
Rewind changes for folding
chapuni Oct 18, 2024
58feee3
Merge branch 'main' into users/chapuni/cov/single/getpair
chapuni Oct 27, 2024
ab84f17
Introduce skeleton getSwitchImplicitDefaultCounter()
chapuni Oct 27, 2024
9d3c3b0
Merge branch 'main' into users/chapuni/cov/single/getpair
chapuni Dec 21, 2024
dbcf896
getSwitchImplicitDefaultCounterPair
chapuni Dec 21, 2024
19edcd3
Merge branch 'main' into users/chapuni/cov/single/getpair
chapuni Dec 24, 2024
4e41b99
Introduce BranchCounterPair
chapuni Dec 24, 2024
d854fb1
Rewind switch DefaultCase. (to #113112)
chapuni Jan 7, 2025
bac2967
Enable addCounters
chapuni Jan 7, 2025
6bae87d
Get rid of structual bindings
chapuni Jan 8, 2025
c8edf58
Flatten with getBranchCounterPair(SkipCntForOld)
chapuni Jan 8, 2025
f2ba219
Update comments
chapuni Jan 8, 2025
97015cb
Decorate the mock
chapuni Jan 8, 2025
9a40d20
Will be pruned after the migration of SingleByte.
chapuni Jan 9, 2025
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
95 changes: 44 additions & 51 deletions clang/lib/CodeGen/CoverageMappingGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,8 +939,17 @@ struct CounterCoverageMappingBuilder
Counter Skipped;
};

BranchCounterPair getBranchCounterPair(const Stmt *S, Counter ParentCnt) {
BranchCounterPair
getBranchCounterPair(const Stmt *S, Counter ParentCnt,
std::optional<Counter> SkipCntForOld = std::nullopt) {
Counter ExecCnt = getRegionCounter(S);

// The old behavior of SingleByte shouldn't emit Branches.
if (llvm::EnableSingleByteCoverage) {
assert(SkipCntForOld);
return {ExecCnt, *SkipCntForOld};
}

return {ExecCnt, Builder.subtract(ParentCnt, ExecCnt)};
}

Expand Down Expand Up @@ -1601,14 +1610,10 @@ struct CounterCoverageMappingBuilder
llvm::EnableSingleByteCoverage
? getRegionCounter(S->getCond())
: addCounters(ParentCount, BackedgeCount, BC.ContinueCount);
auto BranchCount =
(llvm::EnableSingleByteCoverage
? BranchCounterPair{getRegionCounter(S), Counter::getZero()}
: getBranchCounterPair(S, CondCount));
if (!llvm::EnableSingleByteCoverage) {
assert(BranchCount.Executed.isZero() ||
BranchCount.Executed == BodyCount);
}
auto BranchCount = getBranchCounterPair(S, CondCount, getRegionCounter(S));
assert(BranchCount.Executed.isZero() || BranchCount.Executed == BodyCount ||
llvm::EnableSingleByteCoverage);

propagateCounts(CondCount, S->getCond());
adjustForOutOfOrderTraversal(getEnd(S));

Expand All @@ -1617,10 +1622,10 @@ struct CounterCoverageMappingBuilder
if (Gap)
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), BodyCount);

Counter OutCount = llvm::EnableSingleByteCoverage
? getRegionCounter(S)
: addCounters(BC.BreakCount, BranchCount.Skipped);

assert(
!llvm::EnableSingleByteCoverage ||
(BC.BreakCount.isZero() && BranchCount.Skipped == getRegionCounter(S)));
Counter OutCount = addCounters(BC.BreakCount, BranchCount.Skipped);
if (!IsCounterEqual(OutCount, ParentCount)) {
pushRegion(OutCount);
GapRegionCounter = OutCount;
Expand Down Expand Up @@ -1659,19 +1664,16 @@ struct CounterCoverageMappingBuilder
Counter CondCount = llvm::EnableSingleByteCoverage
? getRegionCounter(S->getCond())
: addCounters(BackedgeCount, BC.ContinueCount);
auto BranchCount =
(llvm::EnableSingleByteCoverage
? BranchCounterPair{getRegionCounter(S), Counter::getZero()}
: getBranchCounterPair(S, CondCount));
if (!llvm::EnableSingleByteCoverage) {
assert(BranchCount.Executed.isZero() ||
BranchCount.Executed == BodyCount);
}
auto BranchCount = getBranchCounterPair(S, CondCount, getRegionCounter(S));
assert(BranchCount.Executed.isZero() || BranchCount.Executed == BodyCount ||
llvm::EnableSingleByteCoverage);

propagateCounts(CondCount, S->getCond());

Counter OutCount = llvm::EnableSingleByteCoverage
? getRegionCounter(S)
: addCounters(BC.BreakCount, BranchCount.Skipped);
assert(
!llvm::EnableSingleByteCoverage ||
(BC.BreakCount.isZero() && BranchCount.Skipped == getRegionCounter(S)));
Counter OutCount = addCounters(BC.BreakCount, BranchCount.Skipped);
if (!IsCounterEqual(OutCount, ParentCount)) {
pushRegion(OutCount);
GapRegionCounter = OutCount;
Expand Down Expand Up @@ -1728,14 +1730,9 @@ struct CounterCoverageMappingBuilder
: addCounters(
addCounters(ParentCount, BackedgeCount, BodyBC.ContinueCount),
IncrementBC.ContinueCount);
auto BranchCount =
(llvm::EnableSingleByteCoverage
? BranchCounterPair{getRegionCounter(S), Counter::getZero()}
: getBranchCounterPair(S, CondCount));
if (!llvm::EnableSingleByteCoverage) {
assert(BranchCount.Executed.isZero() ||
BranchCount.Executed == BodyCount);
}
auto BranchCount = getBranchCounterPair(S, CondCount, getRegionCounter(S));
assert(BranchCount.Executed.isZero() || BranchCount.Executed == BodyCount ||
llvm::EnableSingleByteCoverage);

if (const Expr *Cond = S->getCond()) {
propagateCounts(CondCount, Cond);
Expand All @@ -1747,11 +1744,10 @@ struct CounterCoverageMappingBuilder
if (Gap)
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), BodyCount);

Counter OutCount =
llvm::EnableSingleByteCoverage
? getRegionCounter(S)
: addCounters(BodyBC.BreakCount, IncrementBC.BreakCount,
BranchCount.Skipped);
assert(!llvm::EnableSingleByteCoverage ||
(BodyBC.BreakCount.isZero() && IncrementBC.BreakCount.isZero()));
Counter OutCount = addCounters(BodyBC.BreakCount, IncrementBC.BreakCount,
BranchCount.Skipped);
if (!IsCounterEqual(OutCount, ParentCount)) {
pushRegion(OutCount);
GapRegionCounter = OutCount;
Expand Down Expand Up @@ -1789,19 +1785,16 @@ struct CounterCoverageMappingBuilder
if (Gap)
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), BodyCount);

Counter OutCount;
Counter ExitCount;
Counter LoopCount;
if (llvm::EnableSingleByteCoverage)
OutCount = getRegionCounter(S);
else {
LoopCount = addCounters(ParentCount, BackedgeCount, BC.ContinueCount);
auto BranchCount = getBranchCounterPair(S, LoopCount);
ExitCount = BranchCount.Skipped;
assert(BranchCount.Executed.isZero() ||
BranchCount.Executed == BodyCount);
OutCount = addCounters(BC.BreakCount, ExitCount);
}
Counter LoopCount =
addCounters(ParentCount, BackedgeCount, BC.ContinueCount);
auto BranchCount = getBranchCounterPair(S, LoopCount, getRegionCounter(S));
assert(BranchCount.Executed.isZero() || BranchCount.Executed == BodyCount ||
llvm::EnableSingleByteCoverage);
assert(
!llvm::EnableSingleByteCoverage ||
(BC.BreakCount.isZero() && BranchCount.Skipped == getRegionCounter(S)));

Counter OutCount = addCounters(BC.BreakCount, BranchCount.Skipped);
if (!IsCounterEqual(OutCount, ParentCount)) {
pushRegion(OutCount);
GapRegionCounter = OutCount;
Expand All @@ -1811,7 +1804,7 @@ struct CounterCoverageMappingBuilder

// Create Branch Region around condition.
if (!llvm::EnableSingleByteCoverage)
createBranchRegion(S->getCond(), BodyCount, ExitCount);
createBranchRegion(S->getCond(), BodyCount, BranchCount.Skipped);
}

void VisitObjCForCollectionStmt(const ObjCForCollectionStmt *S) {
Expand Down
Loading