This is an archive of the discontinued LLVM Phabricator instance.

Differential D75630

[PSI] Add tests for is(Hot|Cold)FunctionInCallGraphNthPercentile.
ClosedPublic

Authored by hjyamauchi on Mar 4 2020, 11:11 AM.

Details

Reviewers
davidxl
Commits
rG4b4e5d41ec00: [PSI] Add tests for is(Hot|Cold)FunctionInCallGraphNthPercentile.
Summary

Follow up on D75283.

Also remove the test code that was moved to another test and was to be removed.

Diff Detail

Event Timeline

hjyamauchi created this revision.Mar 4 2020, 11:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 4 2020, 11:11 AM
Herald added a subscriber: eraman. · View Herald Transcript
Harbormaster completed remote builds in B48085: Diff 248259.Mar 4 2020, 11:48 AM
davidxl accepted this revision.Mar 9 2020, 11:31 PM

lgtm

This revision is now accepted and ready to land.Mar 9 2020, 11:31 PM
Closed by commit rG4b4e5d41ec00: [PSI] Add tests for is(Hot|Cold)FunctionInCallGraphNthPercentile. (authored by hjyamauchi). · Explain WhyMar 10 2020, 8:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
unittests/
Analysis/
34 lines

Diff 249398

llvm/unittests/Analysis/ProfileSummaryInfoTest.cpp

Show First 20 Lines • Show All 234 Lines • ▼ Show 20 LinesTEST_F(ProfileSummaryInfoTest, InstrProf) {
EXPECT_TRUE(PSI.isHotCallSite(CS1, &BFI)); EXPECT_TRUE(PSI.isHotCallSite(CS1, &BFI));
EXPECT_FALSE(PSI.isHotCallSite(CS2, &BFI)); EXPECT_FALSE(PSI.isHotCallSite(CS2, &BFI));
// Test that adding an MD_prof metadata with a hot count on CS2 does not // Test that adding an MD_prof metadata with a hot count on CS2 does not
// change its hotness as it has no effect in instrumented profiling. // change its hotness as it has no effect in instrumented profiling.
MDBuilder MDB(M->getContext()); MDBuilder MDB(M->getContext());
CI2->setMetadata(llvm::LLVMContext::MD_prof, MDB.createBranchWeights({400})); CI2->setMetadata(llvm::LLVMContext::MD_prof, MDB.createBranchWeights({400}));
EXPECT_FALSE(PSI.isHotCallSite(CS2, &BFI)); EXPECT_FALSE(PSI.isHotCallSite(CS2, &BFI));
EXPECT_TRUE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(10000, F, BFI));
EXPECT_TRUE(PSI.isFunctionColdInCallGraphNthPercentile(10000, F, BFI));
} }
TEST_F(ProfileSummaryInfoTest, InstrProfNoFuncEntryCount) { TEST_F(ProfileSummaryInfoTest, InstrProfNoFuncEntryCount) {
auto M = makeLLVMModule("InstrProf"); auto M = makeLLVMModule("InstrProf");
Function *F = M->getFunction("l"); Function *F = M->getFunction("l");
ProfileSummaryInfo PSI = buildPSI(M.get()); ProfileSummaryInfo PSI = buildPSI(M.get());
EXPECT_TRUE(PSI.hasProfileSummary()); EXPECT_TRUE(PSI.hasProfileSummary());
EXPECT_TRUE(PSI.hasInstrumentationProfile()); EXPECT_TRUE(PSI.hasInstrumentationProfile());
Show All 9 LinesTEST_F(ProfileSummaryInfoTest, InstrProfNoFuncEntryCount) {
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
} }
TEST_F(ProfileSummaryInfoTest, SampleProf) { TEST_F(ProfileSummaryInfoTest, SampleProf) {
auto M = makeLLVMModule("SampleProfile"); auto M = makeLLVMModule("SampleProfile");
Function *F = M->getFunction("f"); Function *F = M->getFunction("f");
ProfileSummaryInfo PSI = buildPSI(M.get()); ProfileSummaryInfo PSI = buildPSI(M.get());
EXPECT_TRUE(PSI.hasProfileSummary()); EXPECT_TRUE(PSI.hasProfileSummary());
EXPECT_TRUE(PSI.hasSampleProfile()); EXPECT_TRUE(PSI.hasSampleProfile());
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 LinesTEST_F(ProfileSummaryInfoTest, SampleProf) {
EXPECT_FALSE(PSI.isHotCallSite(CS1, &BFI)); EXPECT_FALSE(PSI.isHotCallSite(CS1, &BFI));
EXPECT_TRUE(PSI.isHotCallSite(CS2, &BFI)); EXPECT_TRUE(PSI.isHotCallSite(CS2, &BFI));
// Test that CS2 is considered hot when it gets an MD_prof metadata with // Test that CS2 is considered hot when it gets an MD_prof metadata with
// weights that exceed the hot count threshold. // weights that exceed the hot count threshold.
CI2->setMetadata(llvm::LLVMContext::MD_prof, MDB.createBranchWeights({400})); CI2->setMetadata(llvm::LLVMContext::MD_prof, MDB.createBranchWeights({400}));
EXPECT_TRUE(PSI.isHotCallSite(CS2, &BFI)); EXPECT_TRUE(PSI.isHotCallSite(CS2, &BFI));
{ EXPECT_TRUE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
Function *F = M->getFunction("l"); EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
BlockFrequencyInfo BFI = buildBFI(*F); EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(10000, F, BFI));
BasicBlock &BB0 = F->getEntryBlock(); EXPECT_TRUE(PSI.isFunctionColdInCallGraphNthPercentile(10000, F, BFI));
BasicBlock *BB1 = BB0.getTerminator()->getSuccessor(0);
BasicBlock *BB2 = BB0.getTerminator()->getSuccessor(1);
BasicBlock *BB3 = BB1->getSingleSuccessor();
// Without the entry count, all should return false.
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
}
} }
TEST_F(ProfileSummaryInfoTest, SampleProfNoFuncEntryCount) { TEST_F(ProfileSummaryInfoTest, SampleProfNoFuncEntryCount) {
auto M = makeLLVMModule("SampleProfile"); auto M = makeLLVMModule("SampleProfile");
Function *F = M->getFunction("l"); Function *F = M->getFunction("l");
ProfileSummaryInfo PSI = buildPSI(M.get()); ProfileSummaryInfo PSI = buildPSI(M.get());
EXPECT_TRUE(PSI.hasProfileSummary()); EXPECT_TRUE(PSI.hasProfileSummary());
EXPECT_TRUE(PSI.hasSampleProfile()); EXPECT_TRUE(PSI.hasSampleProfile());
Show All 9 LinesTEST_F(ProfileSummaryInfoTest, SampleProfNoFuncEntryCount) {
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, &BB0, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB1, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB2, &BFI));
EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI)); EXPECT_FALSE(PSI.isHotBlockNthPercentile(990000, BB3, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, &BB0, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB1, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB2, &BFI));
EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI)); EXPECT_FALSE(PSI.isColdBlockNthPercentile(990000, BB3, &BFI));
EXPECT_FALSE(PSI.isFunctionHotInCallGraphNthPercentile(990000, F, BFI));
EXPECT_FALSE(PSI.isFunctionColdInCallGraphNthPercentile(990000, F, BFI));
} }
} // end anonymous namespace } // end anonymous namespace
} // end namespace llvm } // end namespace llvm