6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 04:33:05 +00:00
Code Issues Projects Releases Wiki Activity

Cleanups due to feedback. No functionality change. Patch by Alistair.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162979 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2012-08-31 05:18:31 +00:00
parent 5d60c67318
commit f91e400b21
3 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/llvm/Analysis/ProfileDataLoader.h
View File

@ -16,11 +16,11 @@
#ifndef LLVM_ANALYSIS_PROFILEDATALOADER_H
#define LLVM_ANALYSIS_PROFILEDATALOADER_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include <vector>
#include <string>
#include <map>
namespace llvm {
@ -46,14 +46,14 @@ class ProfileDataT {
typedef std::pair<const BType*, const BType*> Edge;
private:
typedef std::map<Edge, unsigned> EdgeWeights;
typedef DenseMap<Edge, unsigned> EdgeWeights;
/// \brief Count the number of times a transition between two blocks is
/// executed.
///
/// As a special case, we also hold an edge from the null BasicBlock to the
/// entry block to indicate how many times the function was entered.
std::map<const FType*, EdgeWeights> EdgeInformation;
DenseMap<const FType*, EdgeWeights> EdgeInformation;
public:
static char ID; // Class identification, replacement for typeinfo
@ -61,9 +61,9 @@ class ProfileDataT {
~ProfileDataT() {};
/// getFunction() - Returns the Function for an Edge.
static const FType* getFunction(Edge e) {
static const FType *getFunction(Edge e) {
// e.first may be NULL
assert( ((!e.first) || (e.first->getParent() == e.second->getParent()))
assert(((!e.first) || (e.first->getParent() == e.second->getParent()))
&& "A ProfileData::Edge can not be between two functions");
assert(e.second && "A ProfileData::Edge must have a real sink");
return e.second->getParent();
@ -71,18 +71,18 @@ class ProfileDataT {
/// getEdge() - Creates an Edge between two BasicBlocks.
static Edge getEdge(const BType *Src, const BType *Dest) {
return std::make_pair(Src, Dest);
return Edge(Src, Dest);
}
/// getEdgeWeight - Return the number of times that a given edge was
/// executed.
unsigned getEdgeWeight(Edge e) const {
const FType *f = getFunction(e);
assert( (EdgeInformation.find(f) != EdgeInformation.end())
assert((EdgeInformation.find(f) != EdgeInformation.end())
&& "No profiling information for function");
EdgeWeights weights = EdgeInformation.find(f)->second;
assert( (weights.find(e) != weights.end())
assert((weights.find(e) != weights.end())
&& "No profiling information for edge");
return weights.find(e)->second;
}
@ -106,11 +106,11 @@ private:
/// A vector of the command line arguments used when the target program was
/// run to generate profiling data. One entry per program run.
std::vector<std::string> CommandLines;
SmallVector<std::string, 1> CommandLines;
/// The raw values for how many times each edge was traversed, values from
/// multiple program runs are accumulated.
std::vector<unsigned> EdgeCounts;
SmallVector<unsigned, 32> EdgeCounts;
public:
/// ProfileDataLoader ctor - Read the specified profiling data file, exiting
@ -130,13 +130,13 @@ public:
/// getExecution - Return the command line parameters used to generate the
/// i'th set of profiling data.
const std::string& getExecution(unsigned i) const { return CommandLines[i]; }
const std::string &getExecution(unsigned i) const { return CommandLines[i]; }
const std::string& getFileName() const { return Filename; }
const std::string &getFileName() const { return Filename; }
/// getRawEdgeCounts - Return the raw profiling data, this is just a list of
/// numbers with no mappings to edges.
const std::vector<unsigned>& getRawEdgeCounts() const { return EdgeCounts; }
const SmallVector<unsigned, 32> &getRawEdgeCounts() const { return EdgeCounts; }
};
/// createProfileMetadataLoaderPass - This function returns a Pass that loads

68
lib/Analysis/ProfileDataLoader.cpp
View File

@ -12,11 +12,14 @@
//
//===----------------------------------------------------------------------===//
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Module.h"
#include "llvm/InstrTypes.h"
#include "llvm/Analysis/ProfileDataLoader.h"
#include "llvm/Analysis/ProfileDataTypes.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h"
#include <cstdio>
#include <cstdlib>
using namespace llvm;
@ -34,7 +37,8 @@ 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& operator<<(raw_ostream &O, std::pair<const BasicBlock *,
const BasicBlock *> E) {
O << "(";
if (E.first)
@ -54,10 +58,9 @@ raw_ostream& operator<<(raw_ostream &O, std::pair<const BasicBlock *, const Basi
} // namespace llvm
/// ByteSwap - Byteswap 'Var' if 'Really' is true. Required when the compiler
/// host and target have different endianness.
static inline unsigned ByteSwap(unsigned Var, bool Really) {
if (!Really) return Var;
/// 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) |
@ -75,21 +78,19 @@ static unsigned AddCounts(unsigned A, unsigned B) {
// Saturate to the maximum storable value. This could change taken/nottaken
// ratios, but is presumably better than wrapping and thus potentially
// inverting ratios.
unsigned long long tmp = (unsigned long long)A + (unsigned long long)B;
if (tmp > (unsigned long long)ProfileDataLoader::MaxCount)
uint64_t tmp = (uint64_t)A + (uint64_t)B;
if (tmp > (uint64_t)ProfileDataLoader::MaxCount)
tmp = ProfileDataLoader::MaxCount;
return (unsigned)tmp;
}
/// ReadProfilingData - Load 'NumEntries' items of type 'T' from file 'F'
template <typename T>
template <typename T, unsigned N>
static void ReadProfilingData(const char *ToolName, FILE *F,
std::vector<T> &Data, size_t NumEntries) {
SmallVector<T, N> &Data, size_t NumEntries) {
// Read in the block of data...
if (fread(&Data[0], sizeof(T), NumEntries, F) != NumEntries) {
errs() << ToolName << ": profiling data truncated!\n";
perror(0);
exit(1);
report_fatal_error(std::string(ToolName) + ": Profiling data truncated");
}
}
@ -97,46 +98,46 @@ static void ReadProfilingData(const char *ToolName, FILE *F,
/// packet.
static unsigned ReadProfilingNumEntries(const char *ToolName, FILE *F,
bool ShouldByteSwap) {
std::vector<unsigned> NumEntries(1);
ReadProfilingData<unsigned>(ToolName, F, NumEntries, 1);
return ByteSwap(NumEntries[0], ShouldByteSwap);
SmallVector<unsigned, 1> NumEntries(1);
ReadProfilingData<unsigned, 1>(ToolName, F, NumEntries, 1);
return ShouldByteSwap ? ByteSwap(NumEntries[0]) : NumEntries[0];
}
/// ReadProfilingBlock - Read the number of entries in the next profiling data
/// packet and then accumulate the entries into 'Data'.
static void ReadProfilingBlock(const char *ToolName, FILE *F,
bool ShouldByteSwap,
std::vector<unsigned> &Data) {
SmallVector<unsigned, 32> &Data) {
// Read the number of entries...
unsigned NumEntries = ReadProfilingNumEntries(ToolName, F, ShouldByteSwap);
// Read in the data.
std::vector<unsigned> TempSpace(NumEntries);
ReadProfilingData<unsigned>(ToolName, F, TempSpace, (size_t)NumEntries);
SmallVector<unsigned, 8> TempSpace(NumEntries);
ReadProfilingData<unsigned, 8>(ToolName, F, TempSpace, (size_t)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(ByteSwap(TempSpace[i], ShouldByteSwap), Data[i]);
}
for (unsigned i = 0; i < NumEntries; ++i)
Data[i] = AddCounts(ShouldByteSwap ? ByteSwap(TempSpace[i]) : TempSpace[i],
Data[i]);
}
/// ReadProfilingArgBlock - Read the command line arguments that the progam was
/// run with when the current profiling data packet(s) were generated.
static void ReadProfilingArgBlock(const char *ToolName, FILE *F,
bool ShouldByteSwap,
std::vector<std::string> &CommandLines) {
SmallVector<std::string, 1> &CommandLines) {
// Read the number of bytes ...
unsigned ArgLength = ReadProfilingNumEntries(ToolName, F, ShouldByteSwap);
// Read in the arguments (if there are any to read). Round up the length to
// the nearest 4-byte multiple.
std::vector<char> Args(ArgLength+4);
SmallVector<char, 8> Args(ArgLength+4);
if (ArgLength)
ReadProfilingData<char>(ToolName, F, Args, (ArgLength+3) & ~3);
ReadProfilingData<char, 8>(ToolName, F, Args, (ArgLength+3) & ~3);
// Store the arguments.
CommandLines.push_back(std::string(&Args[0], &Args[ArgLength]));
@ -145,17 +146,15 @@ static void ReadProfilingArgBlock(const char *ToolName, FILE *F,
const unsigned ProfileDataLoader::Uncounted = ~0U;
const unsigned ProfileDataLoader::MaxCount = ~0U - 1U;
/// ProfileDataLoader ctor - Read the specified profiling data file, exiting
/// the program if the file is invalid or broken.
/// ProfileDataLoader ctor - Read the specified profiling data file, reporting
/// a fatal error if the file is invalid or broken.
ProfileDataLoader::ProfileDataLoader(const char *ToolName,
const std::string &Filename)
: Filename(Filename) {
FILE *F = fopen(Filename.c_str(), "rb");
if (F == 0) {
errs() << ToolName << ": Error opening '" << Filename << "': ";
perror(0);
exit(1);
}
if (F == 0)
report_fatal_error(std::string(ToolName) + ": Error opening '" +
Filename + "': ");
// Keep reading packets until we run out of them.
unsigned PacketType;
@ -165,7 +164,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 = ByteSwap(PacketType, ShouldByteSwap);
PacketType = ShouldByteSwap ? ByteSwap(PacketType) : PacketType;
switch (PacketType) {
case ArgumentInfo:
@ -177,8 +176,9 @@ ProfileDataLoader::ProfileDataLoader(const char *ToolName,
break;
default:
errs() << ToolName << ": Unknown packet type #" << PacketType << "!\n";
exit(1);
report_fatal_error(std::string(ToolName)
+ ": Unknown profiling packet type");
break;
}
}

30
lib/Analysis/ProfileDataLoaderPass.cpp
View File

@ -15,6 +15,7 @@
//
//===----------------------------------------------------------------------===//
#define DEBUG_TYPE "profile-metadata-loader"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/BasicBlock.h"
#include "llvm/InstrTypes.h"
#include "llvm/Module.h"
@ -30,7 +31,6 @@
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Format.h"
#include "llvm/ADT/Statistic.h"
#include <vector>
using namespace llvm;
STATISTIC(NumEdgesRead, "The # of edges read.");
@ -63,8 +63,8 @@ namespace {
}
virtual void readEdge(unsigned, ProfileData&, ProfileData::Edge,
std::vector<unsigned>&);
virtual unsigned matchEdges(Module&, ProfileData&, std::vector<unsigned>&);
ArrayRef<unsigned>);
virtual unsigned matchEdges(Module&, ProfileData&, ArrayRef<unsigned>);
virtual void setBranchWeightMetadata(Module&, ProfileData&);
virtual bool runOnModule(Module &M);
@ -92,21 +92,21 @@ ModulePass *llvm::createProfileMetadataLoaderPass(const std::string &Filename) {
/// readEdge - Take the value from a profile counter and assign it to an edge.
void ProfileMetadataLoaderPass::readEdge(unsigned ReadCount,
ProfileData &PB, ProfileData::Edge e,
std::vector<unsigned> &Counters) {
if (ReadCount < Counters.size()) {
unsigned weight = Counters[ReadCount];
assert(weight != ProfileDataLoader::Uncounted);
PB.addEdgeWeight(e, weight);
ArrayRef<unsigned> Counters) {
if (ReadCount >= Counters.size()) return;
DEBUG(dbgs() << "-- Read Edge Counter for " << e
<< " (# "<< (ReadCount) << "): "
<< PB.getEdgeWeight(e) << "\n");
}
unsigned weight = Counters[ReadCount];
assert(weight != ProfileDataLoader::Uncounted);
PB.addEdgeWeight(e, weight);
DEBUG(dbgs() << "-- Read Edge Counter for " << e
<< " (# "<< (ReadCount) << "): "
<< PB.getEdgeWeight(e) << "\n");
}
/// matchEdges - Link every profile counter with an edge.
unsigned ProfileMetadataLoaderPass::matchEdges(Module &M, ProfileData &PB,
std::vector<unsigned> &Counters) {
ArrayRef<unsigned> Counters) {
if (Counters.size() == 0) return 0;
unsigned ReadCount = 0;
@ -147,7 +147,7 @@ void ProfileMetadataLoaderPass::setBranchWeightMetadata(Module &M,
// Load the weights of all edges leading from this terminator.
DEBUG(dbgs() << "-- Terminator with " << NumSuccessors
<< " successors:\n");
std::vector<uint32_t> Weights(NumSuccessors);
SmallVector<uint32_t, 4> Weights(NumSuccessors);
for (unsigned s = 0 ; s < NumSuccessors ; ++s) {
ProfileData::Edge edge = PB.getEdge(BB, TI->getSuccessor(s));
Weights[s] = (uint32_t)PB.getEdgeWeight(edge);
@ -172,7 +172,7 @@ bool ProfileMetadataLoaderPass::runOnModule(Module &M) {
ProfileDataLoader PDL("profile-data-loader", Filename);
ProfileData PB;
std::vector<unsigned> Counters = PDL.getRawEdgeCounts();
ArrayRef<unsigned> Counters = PDL.getRawEdgeCounts();
unsigned ReadCount = matchEdges(M, PB, Counters);