<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 29, 2016 at 1:13 PM, Xinliang David Li via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: davidxl<br>
Date: Fri Jan 29 15:13:55 2016<br>
New Revision: 259242<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=259242&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=259242&view=rev</a><br>
Log:<br>
Improve test speed (interchange loop, reducing padding)<br>
<br>
Modified:<br>
llvm/trunk/unittests/ProfileData/InstrProfTest.cpp<br>
<br>
Modified: llvm/trunk/unittests/ProfileData/InstrProfTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/InstrProfTest.cpp?rev=259242&r1=259241&r2=259242&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/InstrProfTest.cpp?rev=259242&r1=259241&r2=259242&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/ProfileData/InstrProfTest.cpp (original)<br>
+++ llvm/trunk/unittests/ProfileData/InstrProfTest.cpp Fri Jan 29 15:13:55 2016<br>
@@ -124,6 +124,45 @@ TEST_F(InstrProfTest, get_function_count<br>
ASSERT_TRUE(ErrorEquals(instrprof_error::unknown_function, EC));<br>
}<br>
<br>
+// Profile data is copied from general.proftext<br>
+TEST_F(InstrProfTest, get_profile_summary) {<br>
+ InstrProfRecord Record1("func1", 0x1234, {97531});<br>
+ InstrProfRecord Record2("func2", 0x1234, {0, 0});<br>
+ InstrProfRecord Record3("func3", 0x1234,<br>
+ {2305843009213693952, 1152921504606846976,<br>
+ 576460752303423488, 288230376151711744,<br>
+ 144115188075855872, 72057594037927936});<br>
+ InstrProfRecord Record4("func4", 0x1234, {0});<br>
+ Writer.addRecord(std::move(Record1));<br>
+ Writer.addRecord(std::move(Record2));<br>
+ Writer.addRecord(std::move(Record3));<br>
+ Writer.addRecord(std::move(Record4));<br>
+ auto Profile = Writer.writeBuffer();<br>
+ readProfile(std::move(Profile));<br>
+<br>
+ ProfileSummary &PS = Reader->getSummary();<br>
+ ASSERT_EQ(2305843009213693952U, PS.getMaxFunctionCount());<br>
+ ASSERT_EQ(2305843009213693952U, PS.getMaxBlockCount());<br>
+ ASSERT_EQ(10U, PS.getNumBlocks());<br>
+ ASSERT_EQ(4539628424389557499U, PS.getTotalCount());<br>
+ std::vector<ProfileSummaryEntry> &Details = PS.getDetailedSummary();<br>
+ uint32_t Cutoff = 800000;<br>
+ auto Predicate = [&Cutoff](const ProfileSummaryEntry &PE) {<br>
+ return PE.Cutoff == Cutoff;<br>
+ };<br>
+ auto EightyPerc = std::find_if(Details.begin(), Details.end(), Predicate);<br>
+ Cutoff = 900000;<br>
+ auto NinetyPerc = std::find_if(Details.begin(), Details.end(), Predicate);<br>
+ Cutoff = 950000;<br>
+ auto NinetyFivePerc = std::find_if(Details.begin(), Details.end(), Predicate);<br>
+ Cutoff = 990000;<br>
+ auto NinetyNinePerc = std::find_if(Details.begin(), Details.end(), Predicate);<br>
+ ASSERT_EQ(576460752303423488U, EightyPerc->MinBlockCount);<br>
+ ASSERT_EQ(288230376151711744U, NinetyPerc->MinBlockCount);<br>
+ ASSERT_EQ(288230376151711744U, NinetyFivePerc->MinBlockCount);<br>
+ ASSERT_EQ(72057594037927936U, NinetyNinePerc->MinBlockCount);<br>
+}<br>
+<br>
TEST_F(InstrProfTest, get_icall_data_read_write) {<br>
InstrProfRecord Record1("caller", 0x1234, {1, 2});<br>
InstrProfRecord Record2("callee1", 0x1235, {3, 4});<br>
@@ -716,20 +755,20 @@ TEST_F(InstrProfTest, instr_prof_symtab_<br>
FuncNames2.push_back(OS.str());<br>
}<br>
<br>
- for (int Padding = 0; Padding < 10; Padding++) {<br>
- for (int DoCompression = 0; DoCompression < 2; DoCompression++) {<br>
- // Compressing:<br>
- std::string FuncNameStrings1;<br>
- collectPGOFuncNameStrings(FuncNames1,<br>
- (DoCompression != 0 && zlib::isAvailable()),<br>
- FuncNameStrings1);<br>
-<br>
- // Compressing:<br>
- std::string FuncNameStrings2;<br>
- collectPGOFuncNameStrings(FuncNames2,<br>
- (DoCompression != 0 && zlib::isAvailable()),<br>
- FuncNameStrings2);<br>
+ for (int DoCompression = 0; DoCompression < 2; DoCompression++) {<br></blockquote><div><br></div><div>Would something like this work?</div><div>for (bool DoCompression : {false, true}) ...</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ // Compressing:<br>
+ std::string FuncNameStrings1;<br>
+ collectPGOFuncNameStrings(FuncNames1,<br>
+ (DoCompression != 0 && zlib::isAvailable()),<br>
+ FuncNameStrings1);<br>
+<br>
+ // Compressing:<br>
+ std::string FuncNameStrings2;<br>
+ collectPGOFuncNameStrings(FuncNames2,<br>
+ (DoCompression != 0 && zlib::isAvailable()),<br>
+ FuncNameStrings2);<br>
<br>
+ for (int Padding = 0; Padding < 3; Padding++) {<br>
// Join with paddings:<br>
std::string FuncNameStrings = FuncNameStrings1;<br>
for (int P = 0; P < Padding; P++) {<br>
@@ -743,7 +782,8 @@ TEST_F(InstrProfTest, instr_prof_symtab_<br>
<br>
// Now do the checks:<br>
// First sampling some data points:<br>
- StringRef R = Symtab.getFuncName(IndexedInstrProf::ComputeHash(FuncNames1[0]));<br>
+ StringRef R =<br>
+ Symtab.getFuncName(IndexedInstrProf::ComputeHash(FuncNames1[0]));<br>
ASSERT_EQ(StringRef("func_0"), R);<br>
R = Symtab.getFuncName(IndexedInstrProf::ComputeHash(FuncNames1[1]));<br>
ASSERT_EQ(StringRef("fooooooooooooooo_0"), R);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>