From cb5f63d7fa717b67a666712a3a0d7eebd4d8fb8b Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Fri, 31 Aug 2012 12:43:07 +0000 Subject: Clean up ProfileDataLoader a bit. - Overloading operator<< for raw_ostream and pointers is dangerous, it alters the behavior of code that includes the header. - Remove unused ID. - Use LLVM's byte swapping helpers instead of a hand-coded. - Make ReadProfilingData work directly on a pointer. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162992 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Analysis/ProfileDataLoader.h | 18 +++------ lib/Analysis/ProfileDataLoader.cpp | 62 ++++++++++--------------------- 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/include/llvm/Analysis/ProfileDataLoader.h b/include/llvm/Analysis/ProfileDataLoader.h index 8c108b6e07..bec9fac770 100644 --- a/include/llvm/Analysis/ProfileDataLoader.h +++ b/include/llvm/Analysis/ProfileDataLoader.h @@ -28,11 +28,9 @@ class ModulePass; class Function; class BasicBlock; -// Helpers for dumping edges to dbgs(). +// Helper for dumping edges to dbgs(). raw_ostream& operator<<(raw_ostream &O, std::pair E); -raw_ostream& operator<<(raw_ostream &O, const BasicBlock *BB); -raw_ostream& operator<<(raw_ostream &O, const Function *F); /// \brief The ProfileDataT class is used to store the mapping of /// profiling data to control flow edges. @@ -40,12 +38,12 @@ raw_ostream& operator<<(raw_ostream &O, const Function *F); /// An edge is defined by its source and sink basic blocks. template class ProfileDataT { - public: +public: // The profiling information defines an Edge by its source and sink basic // blocks. typedef std::pair Edge; - private: +private: typedef DenseMap EdgeWeights; /// \brief Count the number of times a transition between two blocks is @@ -55,11 +53,7 @@ class ProfileDataT { /// entry block to indicate how many times the function was entered. DenseMap EdgeInformation; - public: - static char ID; // Class identification, replacement for typeinfo - ProfileDataT() {}; - ~ProfileDataT() {}; - +public: /// getFunction() - Returns the Function for an Edge. static const FType *getFunction(Edge e) { // e.first may be NULL @@ -90,7 +84,7 @@ class ProfileDataT { /// addEdgeWeight - Add 'weight' to the already stored execution count for /// this edge. void addEdgeWeight(Edge e, unsigned weight) { - EdgeInformation[getFunction(e)][e] += weight; + EdgeInformation[getFunction(e)][e] += weight; } }; @@ -136,7 +130,7 @@ public: /// getRawEdgeCounts - Return the raw profiling data, this is just a list of /// numbers with no mappings to edges. - const SmallVector &getRawEdgeCounts() const { return EdgeCounts; } + ArrayRef getRawEdgeCounts() const { return EdgeCounts; } }; /// createProfileMetadataLoaderPass - This function returns a Pass that loads diff --git a/lib/Analysis/ProfileDataLoader.cpp b/lib/Analysis/ProfileDataLoader.cpp index 01b50384f9..69286efb3c 100644 --- a/lib/Analysis/ProfileDataLoader.cpp +++ b/lib/Analysis/ProfileDataLoader.cpp @@ -24,49 +24,25 @@ #include using namespace llvm; -namespace llvm { - -template<> -char ProfileDataT::ID = 0; - -raw_ostream& operator<<(raw_ostream &O, const Function *F) { - return O << F->getName(); -} - -raw_ostream& operator<<(raw_ostream &O, const BasicBlock *BB) { - return O << BB->getName(); -} - -raw_ostream& operator<<(raw_ostream &O, std::pair E) { +raw_ostream &llvm::operator<<(raw_ostream &O, std::pair E) { O << "("; if (E.first) - O << E.first; + O << E.first->getName(); else O << "0"; O << ","; if (E.second) - O << E.second; + O << E.second->getName(); else O << "0"; return O << ")"; } -} // namespace llvm - -/// ByteSwap - Byteswap 'Var'. Required when the compiler host and target have -/// different endianness. -static inline unsigned ByteSwap(unsigned Var) { - return ((Var & (255U<< 0U)) << 24U) | - ((Var & (255U<< 8U)) << 8U) | - ((Var & (255U<<16U)) >> 8U) | - ((Var & (255U<<24U)) >> 24U); -} - /// AddCounts - Add 'A' and 'B', accounting for the fact that the value of one /// (or both) may not be defined. static unsigned AddCounts(unsigned A, unsigned B) { @@ -85,22 +61,21 @@ static unsigned AddCounts(unsigned A, unsigned B) { } /// ReadProfilingData - Load 'NumEntries' items of type 'T' from file 'F' -template +template static void ReadProfilingData(const char *ToolName, FILE *F, - SmallVector &Data, size_t NumEntries) { + T *Data, size_t NumEntries) { // Read in the block of data... - if (fread(&Data[0], sizeof(T), NumEntries, F) != NumEntries) { - report_fatal_error(std::string(ToolName) + ": Profiling data truncated"); - } + if (fread(Data, sizeof(T), NumEntries, F) != NumEntries) + report_fatal_error(Twine(ToolName) + ": Profiling data truncated"); } /// ReadProfilingNumEntries - Read how many entries are in this profiling data /// packet. static unsigned ReadProfilingNumEntries(const char *ToolName, FILE *F, bool ShouldByteSwap) { - SmallVector NumEntries(1); - ReadProfilingData(ToolName, F, NumEntries, 1); - return ShouldByteSwap ? ByteSwap(NumEntries[0]) : NumEntries[0]; + unsigned Entry; + ReadProfilingData(ToolName, F, &Entry, 1); + return ShouldByteSwap ? ByteSwap_32(Entry) : Entry; } /// ReadProfilingBlock - Read the number of entries in the next profiling data @@ -113,16 +88,17 @@ static void ReadProfilingBlock(const char *ToolName, FILE *F, // Read in the data. SmallVector TempSpace(NumEntries); - ReadProfilingData(ToolName, F, TempSpace, (size_t)NumEntries); + ReadProfilingData(ToolName, F, TempSpace.data(), NumEntries); // Make sure we have enough space ... if (Data.size() < NumEntries) Data.resize(NumEntries, ProfileDataLoader::Uncounted); // Accumulate the data we just read into the existing data. - for (unsigned i = 0; i < NumEntries; ++i) - Data[i] = AddCounts(ShouldByteSwap ? ByteSwap(TempSpace[i]) : TempSpace[i], - Data[i]); + for (unsigned i = 0; i < NumEntries; ++i) { + unsigned Entry = ShouldByteSwap ? ByteSwap_32(TempSpace[i]) : TempSpace[i]; + Data[i] = AddCounts(Entry, Data[i]); + } } /// ReadProfilingArgBlock - Read the command line arguments that the progam was @@ -137,7 +113,7 @@ static void ReadProfilingArgBlock(const char *ToolName, FILE *F, // the nearest 4-byte multiple. SmallVector Args(ArgLength+4); if (ArgLength) - ReadProfilingData(ToolName, F, Args, (ArgLength+3) & ~3); + ReadProfilingData(ToolName, F, Args.data(), (ArgLength+3) & ~3); // Store the arguments. CommandLines.push_back(std::string(&Args[0], &Args[ArgLength])); @@ -153,7 +129,7 @@ ProfileDataLoader::ProfileDataLoader(const char *ToolName, : Filename(Filename) { FILE *F = fopen(Filename.c_str(), "rb"); if (F == 0) - report_fatal_error(std::string(ToolName) + ": Error opening '" + + report_fatal_error(Twine(ToolName) + ": Error opening '" + Filename + "': "); // Keep reading packets until we run out of them. @@ -164,7 +140,7 @@ ProfileDataLoader::ProfileDataLoader(const char *ToolName, // information. This can happen when the compiler host and target have // different endianness. bool ShouldByteSwap = (char)PacketType == 0; - PacketType = ShouldByteSwap ? ByteSwap(PacketType) : PacketType; + PacketType = ShouldByteSwap ? ByteSwap_32(PacketType) : PacketType; switch (PacketType) { case ArgumentInfo: -- cgit v1.2.3