Skip to content
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

CoverageMappingWriter: Emit Decision before Expansion #78966

Merged
merged 3 commits into from
Feb 2, 2024
Merged

CoverageMappingWriter: Emit Decision before Expansion #78966

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
069bf8e
CoverageMappingWriter: Emit `Decision` before `Expansion`
chapuni Jan 21, 2024
f996d78
Add the test to ProfileData/CoverageMappingTest.cpp
chapuni Jan 25, 2024
723c5f5
Simplify
chapuni Jan 28, 2024
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
13 changes: 12 additions & 1 deletion llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,18 @@ void CoverageMappingWriter::write(raw_ostream &OS) {
return LHS.FileID < RHS.FileID;
if (LHS.startLoc() != RHS.startLoc())
return LHS.startLoc() < RHS.startLoc();
return LHS.Kind < RHS.Kind;

// Put `Decision` before `Expansion`.
auto getKindKey = [](CounterMappingRegion::RegionKind Kind) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to make this into a real function, so that its return value can be tested in mock?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it'd not be required till whole reordering would come.

return (Kind == CounterMappingRegion::MCDCDecisionRegion
? 2 * CounterMappingRegion::ExpansionRegion - 1
ornata marked this conversation as resolved.
Show resolved Hide resolved
: 2 * Kind);
};

auto LHSKindKey = getKindKey(LHS.Kind);
chapuni marked this conversation as resolved.
Show resolved Hide resolved
auto RHSKindKey = getKindKey(RHS.Kind);

return LHSKindKey < RHSKindKey;
});

// Write out the fileid -> filename mapping.
Expand Down
36 changes: 36 additions & 0 deletions llvm/unittests/ProfileData/CoverageMappingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,42 @@ TEST_P(CoverageMappingTest, non_code_region_bitmask) {
ASSERT_EQ(1U, Names.size());
}

// Test the order of MCDCDecision before Expansion
TEST_P(CoverageMappingTest, decision_before_expansion) {
startFunction("foo", 0x1234);
addCMR(Counter::getCounter(0), "foo", 3, 23, 5, 2);

// This(4:11) was put after Expansion(4:11) before the fix
addMCDCDecisionCMR(0, 2, "foo", 4, 11, 4, 20);

addExpansionCMR("foo", "A", 4, 11, 4, 12);
addExpansionCMR("foo", "B", 4, 19, 4, 20);
addCMR(Counter::getCounter(0), "A", 1, 14, 1, 17);
addCMR(Counter::getCounter(0), "A", 1, 14, 1, 17);
addMCDCBranchCMR(Counter::getCounter(0), Counter::getCounter(1), 1, 2, 0, "A",
1, 14, 1, 17);
addCMR(Counter::getCounter(1), "B", 1, 14, 1, 17);
addMCDCBranchCMR(Counter::getCounter(1), Counter::getCounter(2), 2, 0, 0, "B",
1, 14, 1, 17);

// InputFunctionCoverageData::Regions is rewritten after the write.
auto InputRegions = InputFunctions.back().Regions;

writeAndReadCoverageRegions();

const auto &OutputRegions = OutputFunctions.back().Regions;

size_t N = ArrayRef(InputRegions).size();
ASSERT_EQ(N, OutputRegions.size());
for (size_t I = 0; I < N; ++I) {
ASSERT_EQ(InputRegions[I].Kind, OutputRegions[I].Kind);
ASSERT_EQ(InputRegions[I].FileID, OutputRegions[I].FileID);
ASSERT_EQ(InputRegions[I].ExpandedFileID, OutputRegions[I].ExpandedFileID);
ASSERT_EQ(InputRegions[I].startLoc(), OutputRegions[I].startLoc());
ASSERT_EQ(InputRegions[I].endLoc(), OutputRegions[I].endLoc());
}
}

TEST_P(CoverageMappingTest, strip_filename_prefix) {
ProfileWriter.addRecord({"file1:func", 0x1234, {0}}, Err);

Expand Down