[llvm] r261119 - Add a profile summary class specific to instrumentation profiles.

Xinliang David Li via llvm-commits llvm-commits at lists.llvm.org
Thu May 5 13:04:41 PDT 2016


great, thanks for clearing it up in the code.

David

On Thu, May 5, 2016 at 1:03 PM, Sean Silva <chisophugis at gmail.com> wrote:

>
>
> On Wed, May 4, 2016 at 7:20 PM, Xinliang David Li <xinliangli at gmail.com>
> wrote:
>
>> You are right. Count[0] is not entry count for the function.
>>
>> The code here is to to make the summary compatible with existing
>> 'MaxFunctionCount' for now. Eventually the use of MaxFunctionCount will
>> become obsolete (replaced with other metrics), and this part can be removed.
>>
>
> Thanks for the clarification. I've added a note in r268669.
>
> -- Sean Silva
>
>
>>
>> David
>>
>>
>> On Wed, May 4, 2016 at 5:39 PM, Sean Silva via llvm-commits <
>> llvm-commits at lists.llvm.org> wrote:
>>
>>>
>>>
>>> On Wed, Feb 17, 2016 at 10:18 AM, Easwaran Raman via llvm-commits <
>>> llvm-commits at lists.llvm.org> wrote:
>>>
>>>> Author: eraman
>>>> Date: Wed Feb 17 12:18:47 2016
>>>> New Revision: 261119
>>>>
>>>> URL: http://llvm.org/viewvc/llvm-project?rev=261119&view=rev
>>>> Log:
>>>> Add a profile summary class specific to instrumentation profiles.
>>>>
>>>> Modify ProfileSummary class to make it not instrumented profile
>>>> specific.
>>>> Add a new InstrumentedProfileSummary class that inherits from
>>>> ProfileSummary.
>>>>
>>>> Differential Revision: http://reviews.llvm.org/D17310
>>>>
>>>>
>>>> Modified:
>>>>     llvm/trunk/include/llvm/ProfileData/InstrProf.h
>>>>     llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
>>>>     llvm/trunk/include/llvm/ProfileData/ProfileCommon.h
>>>>     llvm/trunk/lib/ProfileData/InstrProfReader.cpp
>>>>     llvm/trunk/lib/ProfileData/InstrProfWriter.cpp
>>>>     llvm/trunk/lib/ProfileData/ProfileSummary.cpp
>>>>     llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
>>>>     llvm/trunk/unittests/ProfileData/InstrProfTest.cpp
>>>>
>>>> Modified: llvm/trunk/include/llvm/ProfileData/InstrProf.h
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProf.h?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/include/llvm/ProfileData/InstrProf.h (original)
>>>> +++ llvm/trunk/include/llvm/ProfileData/InstrProf.h Wed Feb 17 12:18:47
>>>> 2016
>>>> @@ -757,8 +757,8 @@ struct Summary {
>>>>    void setEntry(uint32_t I, const ProfileSummaryEntry &E) {
>>>>      Entry &ER = getCutoffEntryBase()[I];
>>>>      ER.Cutoff = E.Cutoff;
>>>> -    ER.MinBlockCount = E.MinBlockCount;
>>>> -    ER.NumBlocks = E.NumBlocks;
>>>> +    ER.MinBlockCount = E.MinCount;
>>>> +    ER.NumBlocks = E.NumCounts;
>>>>    }
>>>>
>>>>    Summary(uint32_t Size) { memset(this, 0, Size); }
>>>>
>>>> Modified: llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProfReader.h?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/include/llvm/ProfileData/InstrProfReader.h (original)
>>>> +++ llvm/trunk/include/llvm/ProfileData/InstrProfReader.h Wed Feb 17
>>>> 12:18:47 2016
>>>> @@ -353,7 +353,7 @@ private:
>>>>    /// The index into the profile data.
>>>>    std::unique_ptr<InstrProfReaderIndexBase> Index;
>>>>    /// Profile summary data.
>>>> -  std::unique_ptr<ProfileSummary> Summary;
>>>> +  std::unique_ptr<InstrProfSummary> Summary;
>>>>
>>>>    IndexedInstrProfReader(const IndexedInstrProfReader &) = delete;
>>>>    IndexedInstrProfReader &operator=(const IndexedInstrProfReader &) =
>>>> delete;
>>>> @@ -406,7 +406,7 @@ public:
>>>>    // to be used by llvm-profdata (for dumping). Avoid using this when
>>>>    // the client is the compiler.
>>>>    InstrProfSymtab &getSymtab() override;
>>>> -  ProfileSummary &getSummary() { return *(Summary.get()); }
>>>> +  InstrProfSummary &getSummary() { return *(Summary.get()); }
>>>>  };
>>>>
>>>>  } // end namespace llvm
>>>>
>>>> Modified: llvm/trunk/include/llvm/ProfileData/ProfileCommon.h
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/ProfileCommon.h?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/include/llvm/ProfileData/ProfileCommon.h (original)
>>>> +++ llvm/trunk/include/llvm/ProfileData/ProfileCommon.h Wed Feb 17
>>>> 12:18:47 2016
>>>> @@ -25,59 +25,70 @@ namespace IndexedInstrProf {
>>>>  struct Summary;
>>>>  }
>>>>  struct InstrProfRecord;
>>>> -///// Profile summary computation ////
>>>> -// The 'show' command displays richer summary of the profile data. The
>>>> profile
>>>> -// summary is one or more (Cutoff, MinBlockCount, NumBlocks) triplets.
>>>> Given a
>>>> -// target execution count percentile, we compute the minimum number of
>>>> blocks
>>>> -// needed to reach this target and the minimum execution count of
>>>> these blocks.
>>>> +// The profile summary is one or more (Cutoff, MinCount, NumCounts)
>>>> triplets.
>>>> +// The semantics of counts depend on the type of profile. For
>>>> instrumentation
>>>> +// profile, counts are block counts and for sample profile, counts are
>>>> +// per-line samples. Given a target counts percentile, we compute the
>>>> minimum
>>>> +// number of counts needed to reach this target and the minimum among
>>>> these
>>>> +// counts.
>>>>  struct ProfileSummaryEntry {
>>>> -  uint32_t Cutoff;        ///< The required percentile of total
>>>> execution count.
>>>> -  uint64_t MinBlockCount; ///< The minimum execution count for this
>>>> percentile.
>>>> -  uint64_t NumBlocks;     ///< Number of blocks >= the minumum
>>>> execution count.
>>>> -  ProfileSummaryEntry(uint32_t TheCutoff, uint64_t TheMinBlockCount,
>>>> -                      uint64_t TheNumBlocks)
>>>> -      : Cutoff(TheCutoff), MinBlockCount(TheMinBlockCount),
>>>> -        NumBlocks(TheNumBlocks) {}
>>>> +  uint32_t Cutoff;    ///< The required percentile of counts.
>>>> +  uint64_t MinCount;  ///< The minimum count for this percentile.
>>>> +  uint64_t NumCounts; ///< Number of counts >= the minimum count.
>>>> +  ProfileSummaryEntry(uint32_t TheCutoff, uint64_t TheMinCount,
>>>> +                      uint64_t TheNumCounts)
>>>> +      : Cutoff(TheCutoff), MinCount(TheMinCount),
>>>> NumCounts(TheNumCounts) {}
>>>>  };
>>>>
>>>>  class ProfileSummary {
>>>> -  // We keep track of the number of times a count appears in the
>>>> profile and
>>>> -  // keep the map sorted in the descending order of counts.
>>>> +  // We keep track of the number of times a count (block count or
>>>> samples)
>>>> +  // appears in the profile. The map is kept sorted in the descending
>>>> order of
>>>> +  // counts.
>>>>    std::map<uint64_t, uint32_t, std::greater<uint64_t>>
>>>> CountFrequencies;
>>>> +
>>>> +protected:
>>>>    std::vector<ProfileSummaryEntry> DetailedSummary;
>>>>    std::vector<uint32_t> DetailedSummaryCutoffs;
>>>> -  // Sum of all counts.
>>>> -  uint64_t TotalCount;
>>>> -  uint64_t MaxBlockCount, MaxInternalBlockCount, MaxFunctionCount;
>>>> -  uint32_t NumBlocks, NumFunctions;
>>>> -  inline void addCount(uint64_t Count, bool IsEntry);
>>>> +  uint64_t TotalCount, MaxCount;
>>>> +  uint32_t NumCounts;
>>>> +  ProfileSummary(std::vector<uint32_t> Cutoffs)
>>>> +      : DetailedSummaryCutoffs(Cutoffs), TotalCount(0), MaxCount(0),
>>>> +        NumCounts(0) {}
>>>> +  ProfileSummary() : TotalCount(0), MaxCount(0), NumCounts(0) {}
>>>> +  inline void addCount(uint64_t Count);
>>>>
>>>>  public:
>>>>    static const int Scale = 1000000;
>>>> -  ProfileSummary(std::vector<uint32_t> Cutoffs)
>>>> -      : DetailedSummaryCutoffs(Cutoffs), TotalCount(0),
>>>> MaxBlockCount(0),
>>>> -        MaxInternalBlockCount(0), MaxFunctionCount(0), NumBlocks(0),
>>>> -        NumFunctions(0) {}
>>>> -  ProfileSummary(const IndexedInstrProf::Summary &S);
>>>> -  void addRecord(const InstrProfRecord &);
>>>>    inline std::vector<ProfileSummaryEntry> &getDetailedSummary();
>>>>    void computeDetailedSummary();
>>>> -  uint32_t getNumBlocks() { return NumBlocks; }
>>>> +};
>>>> +
>>>> +class InstrProfSummary : public ProfileSummary {
>>>> +  uint64_t MaxInternalBlockCount, MaxFunctionCount;
>>>> +  uint32_t NumFunctions;
>>>> +  inline void addEntryCount(uint64_t Count);
>>>> +  inline void addInternalCount(uint64_t Count);
>>>> +
>>>> +public:
>>>> +  InstrProfSummary(std::vector<uint32_t> Cutoffs)
>>>> +      : ProfileSummary(Cutoffs), MaxInternalBlockCount(0),
>>>> MaxFunctionCount(0),
>>>> +        NumFunctions(0) {}
>>>> +  InstrProfSummary(const IndexedInstrProf::Summary &S);
>>>> +  void addRecord(const InstrProfRecord &);
>>>> +  uint32_t getNumBlocks() { return NumCounts; }
>>>>    uint64_t getTotalCount() { return TotalCount; }
>>>>    uint32_t getNumFunctions() { return NumFunctions; }
>>>>    uint64_t getMaxFunctionCount() { return MaxFunctionCount; }
>>>> -  uint64_t getMaxBlockCount() { return MaxBlockCount; }
>>>> +  uint64_t getMaxBlockCount() { return MaxCount; }
>>>>    uint64_t getMaxInternalBlockCount() { return MaxInternalBlockCount; }
>>>>  };
>>>>
>>>>  // This is called when a count is seen in the profile.
>>>> -void ProfileSummary::addCount(uint64_t Count, bool IsEntry) {
>>>> +void ProfileSummary::addCount(uint64_t Count) {
>>>>    TotalCount += Count;
>>>> -  if (Count > MaxBlockCount)
>>>> -    MaxBlockCount = Count;
>>>> -  if (!IsEntry && Count > MaxInternalBlockCount)
>>>> -    MaxInternalBlockCount = Count;
>>>> -  NumBlocks++;
>>>> +  if (Count > MaxCount)
>>>> +    MaxCount = Count;
>>>> +  NumCounts++;
>>>>    CountFrequencies[Count]++;
>>>>  }
>>>>
>>>>
>>>> Modified: llvm/trunk/lib/ProfileData/InstrProfReader.cpp
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfReader.cpp?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/lib/ProfileData/InstrProfReader.cpp (original)
>>>> +++ llvm/trunk/lib/ProfileData/InstrProfReader.cpp Wed Feb 17 12:18:47
>>>> 2016
>>>> @@ -589,15 +589,15 @@ IndexedInstrProfReader::readSummary(Inde
>>>>      for (unsigned I = 0; I < SummarySize / sizeof(uint64_t); I++)
>>>>        Dst[I] = endian::byte_swap<uint64_t, little>(Src[I]);
>>>>
>>>> -    // initialize ProfileSummary using the SummaryData from disk.
>>>> -    this->Summary =
>>>> llvm::make_unique<ProfileSummary>(*(SummaryData.get()));
>>>> +    // initialize InstrProfSummary using the SummaryData from disk.
>>>> +    this->Summary =
>>>> llvm::make_unique<InstrProfSummary>(*(SummaryData.get()));
>>>>      return Cur + SummarySize;
>>>>    } else {
>>>>      // For older version of profile data, we need to compute on the
>>>> fly:
>>>>      using namespace IndexedInstrProf;
>>>>      std::vector<uint32_t> Cutoffs(&SummaryCutoffs[0],
>>>>                                    &SummaryCutoffs[NumSummaryCutoffs]);
>>>> -    this->Summary = llvm::make_unique<ProfileSummary>(Cutoffs);
>>>> +    this->Summary = llvm::make_unique<InstrProfSummary>(Cutoffs);
>>>>      this->Summary->computeDetailedSummary();
>>>>      return Cur;
>>>>    }
>>>>
>>>> Modified: llvm/trunk/lib/ProfileData/InstrProfWriter.cpp
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfWriter.cpp?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/lib/ProfileData/InstrProfWriter.cpp (original)
>>>> +++ llvm/trunk/lib/ProfileData/InstrProfWriter.cpp Wed Feb 17 12:18:47
>>>> 2016
>>>> @@ -84,7 +84,7 @@ public:
>>>>    typedef uint64_t offset_type;
>>>>
>>>>    support::endianness ValueProfDataEndianness;
>>>> -  ProfileSummary *TheProfileSummary;
>>>> +  InstrProfSummary *TheProfileSummary;
>>>>
>>>>    InstrProfRecordWriterTrait() :
>>>> ValueProfDataEndianness(support::little) {}
>>>>    static hash_value_type ComputeHash(key_type_ref K) {
>>>> @@ -197,7 +197,7 @@ bool InstrProfWriter::shouldEncodeData(c
>>>>  }
>>>>
>>>>  static void setSummary(IndexedInstrProf::Summary *TheSummary,
>>>> -                       ProfileSummary &PS) {
>>>> +                       InstrProfSummary &PS) {
>>>>    using namespace IndexedInstrProf;
>>>>    std::vector<ProfileSummaryEntry> &Res = PS.getDetailedSummary();
>>>>    TheSummary->NumSummaryFields = Summary::NumKinds;
>>>> @@ -219,7 +219,7 @@ void InstrProfWriter::writeImpl(ProfOStr
>>>>    using namespace IndexedInstrProf;
>>>>    std::vector<uint32_t> Cutoffs(&SummaryCutoffs[0],
>>>>                                  &SummaryCutoffs[NumSummaryCutoffs]);
>>>> -  ProfileSummary PS(Cutoffs);
>>>> +  InstrProfSummary PS(Cutoffs);
>>>>    InfoObj->TheProfileSummary = &PS;
>>>>
>>>>    // Populate the hash table generator.
>>>>
>>>> Modified: llvm/trunk/lib/ProfileData/ProfileSummary.cpp
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/ProfileSummary.cpp?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/lib/ProfileData/ProfileSummary.cpp (original)
>>>> +++ llvm/trunk/lib/ProfileData/ProfileSummary.cpp Wed Feb 17 12:18:47
>>>> 2016
>>>> @@ -16,17 +16,14 @@
>>>>
>>>>  using namespace llvm;
>>>>
>>>> -void ProfileSummary::addRecord(const InstrProfRecord &R) {
>>>> -  NumFunctions++;
>>>> -  if (R.Counts[0] > MaxFunctionCount)
>>>> -    MaxFunctionCount = R.Counts[0];
>>>> -
>>>> -  for (size_t I = 0, E = R.Counts.size(); I < E; ++I)
>>>> -    addCount(R.Counts[I], (I == 0));
>>>> +void InstrProfSummary::addRecord(const InstrProfRecord &R) {
>>>> +  addEntryCount(R.Counts[0]);
>>>>
>>>
>>> Hi Easwaran, David,
>>>
>>> Sorry if this is a silly question, but I remember that in D15540 David
>>> specifically mentioned that in IR profiles we do not necessarily have a
>>> counter for the entry block. What is the justification for Counts[0] as the
>>> "entry count" even in IR instr? The analogous function entry count in
>>> llvm-profdata.cpp is not emitted with an IR profile:
>>> http://llvm.org/klaus/llvm/blob/master/tools/llvm-profdata/llvm-profdata.cpp#L-304
>>>
>>> -- Sean Silva
>>>
>>>
>>>
>>>
>>>> +  for (size_t I = 1, E = R.Counts.size(); I < E; ++I)
>>>> +    addInternalCount(R.Counts[I]);
>>>>  }
>>>>
>>>>  // The argument to this method is a vector of cutoff percentages and
>>>> the return
>>>> -// value is a vector of (Cutoff, MinBlockCount, NumBlocks) triplets.
>>>> +// value is a vector of (Cutoff, MinCount, NumCounts) triplets.
>>>>  void ProfileSummary::computeDetailedSummary() {
>>>>    if (DetailedSummaryCutoffs.empty())
>>>>      return;
>>>> @@ -34,7 +31,7 @@ void ProfileSummary::computeDetailedSumm
>>>>    auto End = CountFrequencies.end();
>>>>    std::sort(DetailedSummaryCutoffs.begin(),
>>>> DetailedSummaryCutoffs.end());
>>>>
>>>> -  uint32_t BlocksSeen = 0;
>>>> +  uint32_t CountsSeen = 0;
>>>>    uint64_t CurrSum = 0, Count = 0;
>>>>
>>>>    for (uint32_t Cutoff : DetailedSummaryCutoffs) {
>>>> @@ -50,26 +47,40 @@ void ProfileSummary::computeDetailedSumm
>>>>        Count = Iter->first;
>>>>        uint32_t Freq = Iter->second;
>>>>        CurrSum += (Count * Freq);
>>>> -      BlocksSeen += Freq;
>>>> +      CountsSeen += Freq;
>>>>        Iter++;
>>>>      }
>>>>      assert(CurrSum >= DesiredCount);
>>>> -    ProfileSummaryEntry PSE = {Cutoff, Count, BlocksSeen};
>>>> +    ProfileSummaryEntry PSE = {Cutoff, Count, CountsSeen};
>>>>      DetailedSummary.push_back(PSE);
>>>>    }
>>>>  }
>>>>
>>>> -ProfileSummary::ProfileSummary(const IndexedInstrProf::Summary &S)
>>>> -    : TotalCount(S.get(IndexedInstrProf::Summary::TotalBlockCount)),
>>>> -      MaxBlockCount(S.get(IndexedInstrProf::Summary::MaxBlockCount)),
>>>> -      MaxInternalBlockCount(
>>>> -          S.get(IndexedInstrProf::Summary::MaxInternalBlockCount)),
>>>> +InstrProfSummary::InstrProfSummary(const IndexedInstrProf::Summary &S)
>>>> +    : ProfileSummary(), MaxInternalBlockCount(S.get(
>>>> +
>>>> IndexedInstrProf::Summary::MaxInternalBlockCount)),
>>>>
>>>>  MaxFunctionCount(S.get(IndexedInstrProf::Summary::MaxFunctionCount)),
>>>> -      NumBlocks(S.get(IndexedInstrProf::Summary::TotalNumBlocks)),
>>>>
>>>>  NumFunctions(S.get(IndexedInstrProf::Summary::TotalNumFunctions)) {
>>>> +
>>>> +  TotalCount = S.get(IndexedInstrProf::Summary::TotalBlockCount);
>>>> +  MaxCount = S.get(IndexedInstrProf::Summary::MaxBlockCount);
>>>> +  NumCounts = S.get(IndexedInstrProf::Summary::TotalNumBlocks);
>>>> +
>>>>    for (unsigned I = 0; I < S.NumCutoffEntries; I++) {
>>>>      const IndexedInstrProf::Summary::Entry &Ent = S.getEntry(I);
>>>>      DetailedSummary.emplace_back((uint32_t)Ent.Cutoff,
>>>> Ent.MinBlockCount,
>>>>                                   Ent.NumBlocks);
>>>>    }
>>>>  }
>>>> +void InstrProfSummary::addEntryCount(uint64_t Count) {
>>>> +  addCount(Count);
>>>> +  NumFunctions++;
>>>> +  if (Count > MaxFunctionCount)
>>>> +    MaxFunctionCount = Count;
>>>> +}
>>>> +
>>>> +void InstrProfSummary::addInternalCount(uint64_t Count) {
>>>> +  addCount(Count);
>>>> +  if (Count > MaxInternalBlockCount)
>>>> +    MaxInternalBlockCount = Count;
>>>> +}
>>>>
>>>> Modified: llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp (original)
>>>> +++ llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp Wed Feb 17
>>>> 12:18:47 2016
>>>> @@ -268,7 +268,7 @@ static int showInstrProfile(std::string
>>>>    if (ShowDetailedSummary && DetailedSummaryCutoffs.empty()) {
>>>>      Cutoffs = {800000, 900000, 950000, 990000, 999000, 999900, 999990};
>>>>    }
>>>> -  ProfileSummary PS(Cutoffs);
>>>> +  InstrProfSummary PS(Cutoffs);
>>>>    if (std::error_code EC = ReaderOrErr.getError())
>>>>      exitWithErrorCode(EC, Filename);
>>>>
>>>> @@ -352,7 +352,7 @@ static int showInstrProfile(std::string
>>>>      OS << "Total number of blocks: " << PS.getNumBlocks() << "\n";
>>>>      OS << "Total count: " << PS.getTotalCount() << "\n";
>>>>      for (auto Entry : PS.getDetailedSummary()) {
>>>> -      OS << Entry.NumBlocks << " blocks with count >= " <<
>>>> Entry.MinBlockCount
>>>> +      OS << Entry.NumCounts << " blocks with count >= " <<
>>>> Entry.MinCount
>>>>           << " account for "
>>>>           << format("%0.6g", (float)Entry.Cutoff /
>>>> ProfileSummary::Scale * 100)
>>>>           << " percentage of the total counts.\n";
>>>>
>>>> Modified: llvm/trunk/unittests/ProfileData/InstrProfTest.cpp
>>>> URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/InstrProfTest.cpp?rev=261119&r1=261118&r2=261119&view=diff
>>>>
>>>> ==============================================================================
>>>> --- llvm/trunk/unittests/ProfileData/InstrProfTest.cpp (original)
>>>> +++ llvm/trunk/unittests/ProfileData/InstrProfTest.cpp Wed Feb 17
>>>> 12:18:47 2016
>>>> @@ -154,7 +154,7 @@ TEST_F(InstrProfTest, get_profile_summar
>>>>    auto Profile = Writer.writeBuffer();
>>>>    readProfile(std::move(Profile));
>>>>
>>>> -  ProfileSummary &PS = Reader->getSummary();
>>>> +  InstrProfSummary &PS = Reader->getSummary();
>>>>    ASSERT_EQ(2305843009213693952U, PS.getMaxFunctionCount());
>>>>    ASSERT_EQ(2305843009213693952U, PS.getMaxBlockCount());
>>>>    ASSERT_EQ(10U, PS.getNumBlocks());
>>>> @@ -171,10 +171,10 @@ TEST_F(InstrProfTest, get_profile_summar
>>>>    auto NinetyFivePerc = std::find_if(Details.begin(), Details.end(),
>>>> Predicate);
>>>>    Cutoff = 990000;
>>>>    auto NinetyNinePerc = std::find_if(Details.begin(), Details.end(),
>>>> Predicate);
>>>> -  ASSERT_EQ(576460752303423488U, EightyPerc->MinBlockCount);
>>>> -  ASSERT_EQ(288230376151711744U, NinetyPerc->MinBlockCount);
>>>> -  ASSERT_EQ(288230376151711744U, NinetyFivePerc->MinBlockCount);
>>>> -  ASSERT_EQ(72057594037927936U, NinetyNinePerc->MinBlockCount);
>>>> +  ASSERT_EQ(576460752303423488U, EightyPerc->MinCount);
>>>> +  ASSERT_EQ(288230376151711744U, NinetyPerc->MinCount);
>>>> +  ASSERT_EQ(288230376151711744U, NinetyFivePerc->MinCount);
>>>> +  ASSERT_EQ(72057594037927936U, NinetyNinePerc->MinCount);
>>>>  }
>>>>
>>>>  TEST_P(MaybeSparseInstrProfTest, get_icall_data_read_write) {
>>>>
>>>>
>>>> _______________________________________________
>>>> llvm-commits mailing list
>>>> llvm-commits at lists.llvm.org
>>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>>
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>
>>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160505/ee992965/attachment.html>


More information about the llvm-commits mailing list