[llvm-commits] [llvm] r162992 - in /llvm/trunk: include/llvm/Analysis/ProfileDataLoader.h lib/Analysis/ProfileDataLoader.cpp
Benjamin Kramer
benny.kra at googlemail.com
Fri Aug 31 05:43:07 PDT 2012
Author: d0k
Date: Fri Aug 31 07:43:07 2012
New Revision: 162992
URL: http://llvm.org/viewvc/llvm-project?rev=162992&view=rev
Log:
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.
Modified:
llvm/trunk/include/llvm/Analysis/ProfileDataLoader.h
llvm/trunk/lib/Analysis/ProfileDataLoader.cpp
Modified: llvm/trunk/include/llvm/Analysis/ProfileDataLoader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ProfileDataLoader.h?rev=162992&r1=162991&r2=162992&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ProfileDataLoader.h (original)
+++ llvm/trunk/include/llvm/Analysis/ProfileDataLoader.h Fri Aug 31 07:43:07 2012
@@ -28,11 +28,9 @@
class Function;
class BasicBlock;
-// Helpers for dumping edges to dbgs().
+// Helper for dumping edges to dbgs().
raw_ostream& operator<<(raw_ostream &O, std::pair<const BasicBlock *,
const BasicBlock *> E);
-raw_ostream& operator<<(raw_ostream &O, const BasicBlock *BB);
-raw_ostream& operator<<(raw_ostream &O, const Function *F);
/// \brief The ProfileDataT<FType, BType> class is used to store the mapping of
/// profiling data to control flow edges.
@@ -40,12 +38,12 @@
/// An edge is defined by its source and sink basic blocks.
template<class FType, class BType>
class ProfileDataT {
- public:
+public:
// The profiling information defines an Edge by its source and sink basic
// blocks.
typedef std::pair<const BType*, const BType*> Edge;
- private:
+private:
typedef DenseMap<Edge, unsigned> EdgeWeights;
/// \brief Count the number of times a transition between two blocks is
@@ -55,11 +53,7 @@
/// entry block to indicate how many times the function was entered.
DenseMap<const FType*, EdgeWeights> 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 @@
/// 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 @@
/// getRawEdgeCounts - Return the raw profiling data, this is just a list of
/// numbers with no mappings to edges.
- const SmallVector<unsigned, 32> &getRawEdgeCounts() const { return EdgeCounts; }
+ ArrayRef<unsigned> getRawEdgeCounts() const { return EdgeCounts; }
};
/// createProfileMetadataLoaderPass - This function returns a Pass that loads
Modified: llvm/trunk/lib/Analysis/ProfileDataLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ProfileDataLoader.cpp?rev=162992&r1=162991&r2=162992&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ProfileDataLoader.cpp (original)
+++ llvm/trunk/lib/Analysis/ProfileDataLoader.cpp Fri Aug 31 07:43:07 2012
@@ -24,49 +24,25 @@
#include <cstdlib>
using namespace llvm;
-namespace llvm {
-
-template<>
-char ProfileDataT<Function,BasicBlock>::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<const BasicBlock *,
- const BasicBlock *> E) {
+raw_ostream &llvm::operator<<(raw_ostream &O, std::pair<const BasicBlock *,
+ const BasicBlock *> 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 @@
}
/// ReadProfilingData - Load 'NumEntries' items of type 'T' from file 'F'
-template <typename T, unsigned N>
+template <typename T>
static void ReadProfilingData(const char *ToolName, FILE *F,
- SmallVector<T, N> &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<unsigned, 1> NumEntries(1);
- ReadProfilingData<unsigned, 1>(ToolName, F, NumEntries, 1);
- return ShouldByteSwap ? ByteSwap(NumEntries[0]) : NumEntries[0];
+ unsigned Entry;
+ ReadProfilingData<unsigned>(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 @@
// Read in the data.
SmallVector<unsigned, 8> TempSpace(NumEntries);
- ReadProfilingData<unsigned, 8>(ToolName, F, TempSpace, (size_t)NumEntries);
+ ReadProfilingData<unsigned>(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 @@
// the nearest 4-byte multiple.
SmallVector<char, 8> Args(ArgLength+4);
if (ArgLength)
- ReadProfilingData<char, 8>(ToolName, F, Args, (ArgLength+3) & ~3);
+ ReadProfilingData<char>(ToolName, F, Args.data(), (ArgLength+3) & ~3);
// Store the arguments.
CommandLines.push_back(std::string(&Args[0], &Args[ArgLength]));
@@ -153,7 +129,7 @@
: 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 @@
// 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:
More information about the llvm-commits
mailing list