Skip to content

Commit

Permalink
[Coverage] Move SingleByteCoverage out of CountedRegion
Browse files Browse the repository at this point in the history 
`SingleByteCoverage` is not per-region attribute at least.
At the moment, this change moves it into `FunctionRecord`.
  • Loading branch information
@chapuni
chapuni committed Oct 3, 2024
1 parent 4fc08b6 commit 178b57c
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 27 deletions.
27 changes: 12 additions & 15 deletions llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,15 @@ struct CountedRegion : public CounterMappingRegion {
uint64_t ExecutionCount;
uint64_t FalseExecutionCount;
bool Folded;
bool HasSingleByteCoverage;

CountedRegion(const CounterMappingRegion &R, uint64_t ExecutionCount,
bool HasSingleByteCoverage)
CountedRegion(const CounterMappingRegion &R, uint64_t ExecutionCount)
: CounterMappingRegion(R), ExecutionCount(ExecutionCount),
FalseExecutionCount(0), Folded(false),
HasSingleByteCoverage(HasSingleByteCoverage) {}
FalseExecutionCount(0), Folded(false) {}

CountedRegion(const CounterMappingRegion &R, uint64_t ExecutionCount,
uint64_t FalseExecutionCount, bool HasSingleByteCoverage)
uint64_t FalseExecutionCount)
: CounterMappingRegion(R), ExecutionCount(ExecutionCount),
FalseExecutionCount(FalseExecutionCount), Folded(false),
HasSingleByteCoverage(HasSingleByteCoverage) {}
FalseExecutionCount(FalseExecutionCount), Folded(false) {}
};

/// MCDC Record grouping all information together.
Expand Down Expand Up @@ -702,9 +698,12 @@ struct FunctionRecord {
std::vector<MCDCRecord> MCDCRecords;
/// The number of times this function was executed.
uint64_t ExecutionCount = 0;
bool SingleByteCoverage;

FunctionRecord(StringRef Name, ArrayRef<StringRef> Filenames)
: Name(Name), Filenames(Filenames.begin(), Filenames.end()) {}
FunctionRecord(StringRef Name, ArrayRef<StringRef> Filenames,
bool SingleByteCoverage)
: Name(Name), Filenames(Filenames.begin(), Filenames.end()),
SingleByteCoverage(SingleByteCoverage) {}

FunctionRecord(FunctionRecord &&FR) = default;
FunctionRecord &operator=(FunctionRecord &&) = default;
Expand All @@ -714,11 +713,10 @@ struct FunctionRecord {
}

void pushRegion(CounterMappingRegion Region, uint64_t Count,
uint64_t FalseCount, bool HasSingleByteCoverage) {
uint64_t FalseCount) {
if (Region.Kind == CounterMappingRegion::BranchRegion ||
Region.Kind == CounterMappingRegion::MCDCBranchRegion) {
CountedBranchRegions.emplace_back(Region, Count, FalseCount,
HasSingleByteCoverage);
CountedBranchRegions.emplace_back(Region, Count, FalseCount);
// If both counters are hard-coded to zero, then this region represents a
// constant-folded branch.
if (Region.Count.isZero() && Region.FalseCount.isZero())
Expand All @@ -727,8 +725,7 @@ struct FunctionRecord {
}
if (CountedRegions.empty())
ExecutionCount = Count;
CountedRegions.emplace_back(Region, Count, FalseCount,
HasSingleByteCoverage);
CountedRegions.emplace_back(Region, Count, FalseCount);
}
};

Expand Down
36 changes: 24 additions & 12 deletions llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,7 @@ Error CoverageMapping::loadFunctionRecord(
else
OrigFuncName = getFuncNameWithoutPrefix(OrigFuncName, Record.Filenames[0]);

bool SingleByteCoverage = ProfileReader.hasSingleByteCoverage();
CounterMappingContext Ctx(Record.Expressions);

std::vector<uint64_t> Counts;
Expand Down Expand Up @@ -855,7 +856,7 @@ Error CoverageMapping::loadFunctionRecord(
return Error::success();

MCDCDecisionRecorder MCDCDecisions;
FunctionRecord Function(OrigFuncName, Record.Filenames);
FunctionRecord Function(OrigFuncName, Record.Filenames, SingleByteCoverage);
for (const auto &Region : Record.MappingRegions) {
// MCDCDecisionRegion should be handled first since it overlaps with
// others inside.
Expand All @@ -873,8 +874,7 @@ Error CoverageMapping::loadFunctionRecord(
consumeError(std::move(E));
return Error::success();
}
Function.pushRegion(Region, *ExecutionCount, *AltExecutionCount,
ProfileReader.hasSingleByteCoverage());
Function.pushRegion(Region, *ExecutionCount, *AltExecutionCount);

// Record ExpansionRegion.
if (Region.Kind == CounterMappingRegion::ExpansionRegion) {
Expand Down Expand Up @@ -1270,7 +1270,8 @@ class SegmentBuilder {

/// Combine counts of regions which cover the same area.
static ArrayRef<CountedRegion>
combineRegions(MutableArrayRef<CountedRegion> Regions) {
combineRegions(MutableArrayRef<CountedRegion> Regions,
bool SingleByteCoverage) {
if (Regions.empty())
return Regions;
auto Active = Regions.begin();
Expand All @@ -1297,9 +1298,7 @@ class SegmentBuilder {
// We add counts of the regions of the same kind as the active region
// to handle the both situations.
if (I->Kind == Active->Kind) {
assert(I->HasSingleByteCoverage == Active->HasSingleByteCoverage &&
"Regions are generated in different coverage modes");
if (I->HasSingleByteCoverage)
if (SingleByteCoverage)
Active->ExecutionCount = Active->ExecutionCount || I->ExecutionCount;
else
Active->ExecutionCount += I->ExecutionCount;
Expand All @@ -1311,12 +1310,14 @@ class SegmentBuilder {
public:
/// Build a sorted list of CoverageSegments from a list of Regions.
static std::vector<CoverageSegment>
buildSegments(MutableArrayRef<CountedRegion> Regions) {
buildSegments(MutableArrayRef<CountedRegion> Regions,
bool SingleByteCoverage) {
std::vector<CoverageSegment> Segments;
SegmentBuilder Builder(Segments);

sortNestedRegions(Regions);
ArrayRef<CountedRegion> CombinedRegions = combineRegions(Regions);
ArrayRef<CountedRegion> CombinedRegions =
combineRegions(Regions, SingleByteCoverage);

LLVM_DEBUG({
dbgs() << "Combined regions:\n";
Expand Down Expand Up @@ -1403,10 +1404,14 @@ CoverageData CoverageMapping::getCoverageForFile(StringRef Filename) const {
// the filename, we may get back some records that are not in the file.
ArrayRef<unsigned> RecordIndices =
getImpreciseRecordIndicesForFilename(Filename);
std::optional<bool> SingleByteCoverage;
for (unsigned RecordIndex : RecordIndices) {
const FunctionRecord &Function = Functions[RecordIndex];
auto MainFileID = findMainViewFileID(Filename, Function);
auto FileIDs = gatherFileIDs(Filename, Function);
assert(!SingleByteCoverage ||
*SingleByteCoverage == Function.SingleByteCoverage);
SingleByteCoverage = Function.SingleByteCoverage;
for (const auto &CR : Function.CountedRegions)
if (FileIDs.test(CR.FileID)) {
Regions.push_back(CR);
Expand All @@ -1424,7 +1429,8 @@ CoverageData CoverageMapping::getCoverageForFile(StringRef Filename) const {
}

LLVM_DEBUG(dbgs() << "Emitting segments for file: " << Filename << "\n");
FileCoverage.Segments = SegmentBuilder::buildSegments(Regions);
FileCoverage.Segments =
SegmentBuilder::buildSegments(Regions, *SingleByteCoverage);

return FileCoverage;
}
Expand Down Expand Up @@ -1480,7 +1486,8 @@ CoverageMapping::getCoverageForFunction(const FunctionRecord &Function) const {

LLVM_DEBUG(dbgs() << "Emitting segments for function: " << Function.Name
<< "\n");
FunctionCoverage.Segments = SegmentBuilder::buildSegments(Regions);
FunctionCoverage.Segments =
SegmentBuilder::buildSegments(Regions, Function.SingleByteCoverage);

return FunctionCoverage;
}
Expand All @@ -1490,8 +1497,12 @@ CoverageData CoverageMapping::getCoverageForExpansion(
CoverageData ExpansionCoverage(
Expansion.Function.Filenames[Expansion.FileID]);
std::vector<CountedRegion> Regions;
std::optional<bool> SingleByteCoverage;
for (const auto &CR : Expansion.Function.CountedRegions)
if (CR.FileID == Expansion.FileID) {
assert(!SingleByteCoverage ||
*SingleByteCoverage == Expansion.Function.SingleByteCoverage);
SingleByteCoverage = Expansion.Function.SingleByteCoverage;
Regions.push_back(CR);
if (isExpansion(CR, Expansion.FileID))
ExpansionCoverage.Expansions.emplace_back(CR, Expansion.Function);
Expand All @@ -1503,7 +1514,8 @@ CoverageData CoverageMapping::getCoverageForExpansion(

LLVM_DEBUG(dbgs() << "Emitting segments for expansion of file "
<< Expansion.FileID << "\n");
ExpansionCoverage.Segments = SegmentBuilder::buildSegments(Regions);
ExpansionCoverage.Segments =
SegmentBuilder::buildSegments(Regions, *SingleByteCoverage);

return ExpansionCoverage;
}
Expand Down

0 comments on commit 178b57c

Please sign in to comment.