merge <vt-call> and <vt-inline>

Author: mingmingl-llvm

llvm/include/llvm/ProfileData/SampleProf.h

@@ -92,7 +92,7 @@ namespace llvm {
 namespace sampleprof {
 
 constexpr char kBodySampleVTableProfPrefix[] = "<vt-call> ";
-constexpr char kInlinedCallsiteVTablerofPrefix[] = "<vt-inline> ";
+// constexpr char kInlinedCallsiteVTablerofPrefix[] = "<vt-inline> ";
 
 enum SampleProfileFormat {
   SPF_None = 0,
@@ -413,10 +413,6 @@ class SampleRecord {
 
   uint64_t getSamples() const { return NumSamples; }
   const CallTargetMap &getCallTargets() const { return CallTargets; }
-  const TypeCountMap &getVTableAccessCounts() const {
-    return VTableAccessCounts;
-  }
-  TypeCountMap &getVTableAccessCounts() { return VTableAccessCounts; }
   const SortedCallTargetSet getSortedCallTargets() const {
     return sortCallTargets(CallTargets);
   }
@@ -470,8 +466,6 @@ class SampleRecord {
 private:
   uint64_t NumSamples = 0;
   CallTargetMap CallTargets;
-  // The vtable types and their counts in this sample record.
-  TypeCountMap VTableAccessCounts;
 };
 
 raw_ostream &operator<<(raw_ostream &OS, const SampleRecord &Sample);
@@ -825,16 +819,6 @@ class FunctionSamples {
         Func, Num, Weight);
   }
 
-  sampleprof_error addFunctionBodyTypeSamples(const LineLocation &Loc,
-                                              FunctionId Func, uint64_t Num,
-                                              uint64_t Weight = 1) {
-    return BodySamples[Loc].addVTableAccessCount(Func, Num, Weight);
-  }
-
-  TypeCountMap &getFunctionBodyTypeSamples(const LineLocation &Loc) {
-    return BodySamples[Loc].getVTableAccessCounts();
-  }
-
   sampleprof_error addSampleRecord(LineLocation Location,
                                    const SampleRecord &SampleRecord,
                                    uint64_t Weight = 1) {
@@ -962,8 +946,8 @@ class FunctionSamples {
 
   /// Returns the TypeCountMap for inlined callsites at the given \p Loc.
   const TypeCountMap *findCallsiteTypeSamplesAt(const LineLocation &Loc) const {
-    auto Iter = VirtualCallsiteTypes.find(mapIRLocToProfileLoc(Loc));
-    if (Iter == VirtualCallsiteTypes.end())
+    auto Iter = VirtualCallsiteTypeCounts.find(mapIRLocToProfileLoc(Loc));
+    if (Iter == VirtualCallsiteTypeCounts.end())
       return nullptr;
     return &Iter->second;
   }
@@ -1032,12 +1016,12 @@ class FunctionSamples {
   /// Return all the callsite type samples collected in the body of the
   /// function.
   const CallsiteTypeMap &getCallsiteTypeCounts() const {
-    return VirtualCallsiteTypes;
+    return VirtualCallsiteTypeCounts;
   }
 
   /// Returns the type samples for the un-drifted location of \p Loc.
   TypeCountMap &getTypeSamplesAt(const LineLocation &Loc) {
-    return VirtualCallsiteTypes[mapIRLocToProfileLoc(Loc)];
+    return VirtualCallsiteTypeCounts[mapIRLocToProfileLoc(Loc)];
   }
 
   /// Scale \p Other sample counts by \p Weight and add the scaled result to the
@@ -1381,7 +1365,7 @@ class FunctionSamples {
   ///     }
   /// This map will contain two entries. One with two types for line offset 5
   /// and one with one type for line offset 200.
-  CallsiteTypeMap VirtualCallsiteTypes;
+  CallsiteTypeMap VirtualCallsiteTypeCounts;
 
   /// IR to profile location map generated by stale profile matching.
   ///

llvm/lib/ProfileData/SampleProf.cpp

@@ -146,9 +146,6 @@ sampleprof_error SampleRecord::merge(const SampleRecord &Other,
   for (const auto &I : Other.getCallTargets()) {
     mergeSampleProfErrors(Result, addCalledTarget(I.first, I.second, Weight));
   }
-  for (const auto &[TypeName, Count] : Other.getVTableAccessCounts())
-    mergeSampleProfErrors(Result,
-                          addVTableAccessCount(TypeName, Count, Weight));
 
   return Result;
 }
@@ -171,8 +168,6 @@ SampleRecord::serialize(raw_ostream &OS,
     }
     encodeULEB128(CalleeSamples, OS);
   }
-  if (SerializeVTableProf)
-    return serializeTypeMap(VTableAccessCounts, NameTable, OS);
   return sampleprof_error::success;
 }
 
@@ -193,11 +188,6 @@ void SampleRecord::print(raw_ostream &OS, unsigned Indent) const {
     for (const auto &I : getSortedCallTargets())
       OS << " " << I.first << ":" << I.second;
   }
-  if (!VTableAccessCounts.empty()) {
-    OS << ", vtables:";
-    for (const auto [Type, Count] : VTableAccessCounts)
-      OS << " " << Type << ":" << Count;
-  }
   OS << "\n";
 }
 
@@ -216,7 +206,8 @@ sampleprof_error SampleRecord::addCalledTarget(FunctionId F, uint64_t S,
 
 sampleprof_error SampleRecord::addVTableAccessCount(FunctionId F, uint64_t S,
                                                     uint64_t Weight) {
-  return addWeightSample(S, Weight, VTableAccessCounts[F]);
+  return sampleprof_error::success;
+  // return addWeightSample(S, Weight, VTableAccessCounts[F]);
 }
 
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
@@ -229,6 +220,18 @@ raw_ostream &llvm::sampleprof::operator<<(raw_ostream &OS,
   return OS;
 }
 
+template <typename T>
+static void printTypeCountMap(raw_ostream &OS, T Loc,
+                              const TypeCountMap &TypeCountMap) {
+  if (TypeCountMap.empty()) {
+    return;
+  }
+  OS << Loc << ": vtables: ";
+  for (const auto &[Type, Count] : TypeCountMap)
+    OS << Type << ":" << Count << " ";
+  OS << "\n";
+}
+
 /// Print the samples collected for a function on stream \p OS.
 void FunctionSamples::print(raw_ostream &OS, unsigned Indent) const {
   if (getFunctionHash())
@@ -243,7 +246,13 @@ void FunctionSamples::print(raw_ostream &OS, unsigned Indent) const {
     SampleSorter<LineLocation, SampleRecord> SortedBodySamples(BodySamples);
     for (const auto &SI : SortedBodySamples.get()) {
       OS.indent(Indent + 2);
+      const auto &Loc = SI->first;
       OS << SI->first << ": " << SI->second;
+      if (const TypeCountMap *TypeCountMap =
+              this->findCallsiteTypeSamplesAt(Loc)) {
+        OS.indent(Indent + 2);
+        printTypeCountMap(OS, Loc, *TypeCountMap);
+      }
     }
     OS.indent(Indent);
     OS << "}\n";
@@ -264,14 +273,10 @@ void FunctionSamples::print(raw_ostream &OS, unsigned Indent) const {
         FuncSample.print(OS, Indent + 4);
       }
       const LineLocation &Loc = CS->first;
-      auto TypeSamplesIter = VirtualCallsiteTypes.find(Loc);
-      if (TypeSamplesIter != VirtualCallsiteTypes.end()) {
+      auto TypeSamplesIter = VirtualCallsiteTypeCounts.find(Loc);
+      if (TypeSamplesIter != VirtualCallsiteTypeCounts.end()) {
         OS.indent(Indent + 2);
-        OS << Loc << ": vtables: ";
-        for (const auto &TypeSample : TypeSamplesIter->second) {
-          OS << TypeSample.first << ":" << TypeSample.second << " ";
-        }
-        OS << "\n";
+        printTypeCountMap(OS, Loc, TypeSamplesIter->second);
       }
     }
     OS.indent(Indent);

llvm/lib/ProfileData/SampleProfReader.cpp

@@ -197,8 +197,7 @@ enum class LineType {
   CallSiteProfile,
   BodyProfile,
   Metadata,
-  CallTargetTypeProfile,
-  CallSiteTypeProfile,
+  VirtualCallTypeProfile,
 };
 
 static bool parseTypeCountMap(StringRef Input,
@@ -332,13 +331,9 @@ static bool ParseLine(const StringRef &Input, LineType &LineTy, uint32_t &Depth,
       n3 = n4;
     }
   } else if (Rest.starts_with(kBodySampleVTableProfPrefix)) {
-    LineTy = LineType::CallTargetTypeProfile;
+    LineTy = LineType::VirtualCallTypeProfile;
     return parseTypeCountMap(Rest.substr(strlen(kBodySampleVTableProfPrefix)),
                              TypeCountMap);
-  } else if (Rest.starts_with(kInlinedCallsiteVTablerofPrefix)) {
-    LineTy = LineType::CallSiteTypeProfile;
-    return parseTypeCountMap(
-        Rest.substr(strlen(kInlinedCallsiteVTablerofPrefix)), TypeCountMap);
   } else {
     LineTy = LineType::CallSiteProfile;
     size_t n3 = Rest.find_last_of(':');
@@ -445,27 +440,13 @@ std::error_code SampleProfileReaderText::readImpl() {
         break;
       }
 
-      case LineType::CallSiteTypeProfile: {
+      case LineType::VirtualCallTypeProfile: {
         mergeSampleProfErrors(
             Result, InlineStack.back()->addCallsiteVTableTypeProfAt(
                         LineLocation(LineOffset, Discriminator), TypeCountMap));
         break;
       }
 
-      case LineType::CallTargetTypeProfile: {
-        while (InlineStack.size() > Depth) {
-          InlineStack.pop_back();
-        }
-        FunctionSamples &FProfile = *InlineStack.back();
-        for (const auto &name_count : TypeCountMap) {
-          mergeSampleProfErrors(
-              Result, FProfile.addFunctionBodyTypeSamples(
-                          LineLocation(LineOffset, Discriminator),
-                          FunctionId(name_count.first), name_count.second));
-        }
-        break;
-      }
-
       case LineType::BodyProfile: {
         FunctionSamples &FProfile = *InlineStack.back();
         for (const auto &name_count : TargetCountMap) {
@@ -749,14 +730,6 @@ SampleProfileReaderBinary::readProfile(FunctionSamples &FProfile) {
                                       *CalledFunction, *CalledFunctionSamples);
     }
 
-    if (ReadVTableProf) {
-      // read vtable type profiles.
-      if (std::error_code EC =
-              readVTableTypeCountMap(FProfile.getFunctionBodyTypeSamples(
-                  LineLocation(*LineOffset, DiscriminatorVal))))
-        return EC;
-    }
-
     FProfile.addBodySamples(*LineOffset, DiscriminatorVal, *NumSamples);
   }
 

llvm/lib/ProfileData/SampleProfWriter.cpp

@@ -600,16 +600,18 @@ std::error_code SampleProfileWriterText::writeSample(const FunctionSamples &S) {
       OS << " " << J.first << ":" << J.second;
     OS << "\n";
 
-    if (!Sample.getVTableAccessCounts().empty()) {
+    if (const TypeCountMap *Map = S.findCallsiteTypeSamplesAt(Loc);
+        Map && !Map->empty()) {
       OS.indent(Indent + 1);
       Loc.print(OS);
       OS << ": ";
       OS << kBodySampleVTableProfPrefix;
-      for (const auto [TypeName, Count] : Sample.getVTableAccessCounts())
+      for (const auto [TypeName, Count] : *Map) {
         OS << TypeName << ":" << Count << " ";
+      }
       OS << "\n";
+      LineCount++;
     }
-    LineCount++;
   }
 
   SampleSorter<LineLocation, FunctionSamplesMap> SortedCallsiteSamples(
@@ -631,7 +633,7 @@ std::error_code SampleProfileWriterText::writeSample(const FunctionSamples &S) {
       OS.indent(Indent);
       Loc.print(OS);
       OS << ": ";
-      OS << kInlinedCallsiteVTablerofPrefix;
+      OS << kBodySampleVTableProfPrefix;
       for (const auto [TypeId, Count] : *Map) {
         OS << TypeId << ":" << Count << " ";
       }
@@ -698,7 +700,6 @@ void SampleProfileWriterBinary::addNames(const FunctionSamples &S) {
     const SampleRecord &Sample = I.second;
     for (const auto &J : Sample.getCallTargets())
       addName(J.first);
-    addTypeNames(Sample.getVTableAccessCounts());
   }
 
   // Add all the names in callsite types.

llvm/test/tools/llvm-profdata/Inputs/profile-symbol-list-ext.expected

@@ -6,7 +6,8 @@ Samples collected in the function's body {
   5.1: 2150
   6: 4160
   7: 1068
-  9: 4128, calls: _Z3bari:2942 _Z3fooi:1262, vtables: _ZTVbar:2942 _ZTVfoo:1260
+  9: 4128, calls: _Z3bari:2942 _Z3fooi:1262
+  9: vtables: _ZTVbar:2942 _ZTVfoo:1260
 }
 Samples collected in inlined callsites {
   10: inlined callee: inline1: 2000, 0, 1 sampled lines

llvm/test/tools/llvm-profdata/Inputs/sample-profile-ext.proftext

@@ -11,7 +11,7 @@ main:184019:0
   1: 1000
  10: inline2:2000
   1: 2000
- 10: <vt-inline> _ZTVinline1:1000 _ZTVinline2:2000
+ 10: <vt-call> _ZTVinline1:1000 _ZTVinline2:2000
 _Z3bari:20301:1437
  1: 1437
 _Z3fooi:7711:610