Revert "[llvm-profdata] Add SaturatingAdd/SaturatingMultiply Helper Functions"

[oota-llvm.git] / include / llvm / ProfileData / SampleProf.h

diff --git a/include/llvm/ProfileData/SampleProf.h b/include/llvm/ProfileData/SampleProf.h
index e46407bde2c5e00a1354070844ff4541cf198a15..d7596d7b1b77340f924978caf5e9024c2957a5cf 100644 (file)
--- a/include/llvm/ProfileData/SampleProf.h
+++ b/include/llvm/ProfileData/SampleProf.h
@@ -11,6 +11,7 @@
 // sample profile data.
 //
 //===----------------------------------------------------------------------===//
+
 #ifndef LLVM_PROFILEDATA_SAMPLEPROF_H_
 #define LLVM_PROFILEDATA_SAMPLEPROF_H_
 
@@ -61,7 +62,7 @@ static inline uint64_t SPMagic() {
          uint64_t('2') << (64 - 56) | uint64_t(0xff);
 }
 
-static inline uint64_t SPVersion() { return 101; }
+static inline uint64_t SPVersion() { return 102; }
 
 /// Represents the relative location of an instruction.
 ///
@@ -74,10 +75,15 @@ static inline uint64_t SPVersion() { return 101; }
 /// (e.g., the two post-increment instructions in "if (p) x++; else y++;").
 struct LineLocation {
   LineLocation(uint32_t L, uint32_t D) : LineOffset(L), Discriminator(D) {}
+  void print(raw_ostream &OS) const;
+  void dump() const;
+
   uint32_t LineOffset;
   uint32_t Discriminator;
 };
 
+raw_ostream &operator<<(raw_ostream &OS, const LineLocation &Loc);
+
 /// Represents the relative location of a callsite.
 ///
 /// Callsite locations are specified by the line offset from the
@@ -87,9 +93,14 @@ struct LineLocation {
 struct CallsiteLocation : public LineLocation {
   CallsiteLocation(uint32_t L, uint32_t D, StringRef N)
       : LineLocation(L, D), CalleeName(N) {}
+  void print(raw_ostream &OS) const;
+  void dump() const;
+
   StringRef CalleeName;
 };
 
+raw_ostream &operator<<(raw_ostream &OS, const CallsiteLocation &Loc);
+
 } // End namespace sampleprof
 
 template <> struct DenseMapInfo<sampleprof::LineLocation> {
@@ -193,11 +204,16 @@ public:
       addCalledTarget(I.first(), I.second);
   }
 
+  void print(raw_ostream &OS, unsigned Indent) const;
+  void dump() const;
+
 private:
   uint64_t NumSamples;
   CallTargetMap CallTargets;
 };
 
+raw_ostream &operator<<(raw_ostream &OS, const SampleRecord &Sample);
+
 typedef DenseMap<LineLocation, SampleRecord> BodySampleMap;
 class FunctionSamples;
 typedef DenseMap<CallsiteLocation, FunctionSamples> CallsiteSampleMap;
@@ -211,6 +227,7 @@ class FunctionSamples {
 public:
   FunctionSamples() : TotalSamples(0), TotalHeadSamples(0) {}
   void print(raw_ostream &OS = dbgs(), unsigned Indent = 0) const;
+  void dump() const;
   void addTotalSamples(uint64_t Num) { TotalSamples += Num; }
   void addHeadSamples(uint64_t Num) { TotalHeadSamples += Num; }
   void addBodySamples(uint32_t LineOffset, uint32_t Discriminator,
@@ -245,7 +262,7 @@ public:
   findFunctionSamplesAt(const CallsiteLocation &Loc) const {
     auto iter = CallsiteSamples.find(Loc);
     if (iter == CallsiteSamples.end()) {
-      return NULL;
+      return nullptr;
     } else {
       return &iter->second;
     }
@@ -322,8 +339,10 @@ private:
   CallsiteSampleMap CallsiteSamples;
 };
 
-} // End namespace sampleprof
+raw_ostream &operator<<(raw_ostream &OS, const FunctionSamples &FS);
 
-} // End namespace llvm
+} // end namespace sampleprof
+
+} // end namespace llvm
 
 #endif // LLVM_PROFILEDATA_SAMPLEPROF_H_