[llvm-commits] [llvm] r82039 - in /llvm/trunk: include/llvm/Analysis/ProfileInfoLoader.h lib/Analysis/ProfileInfoLoader.cpp lib/Analysis/ProfileInfoLoaderPass.cpp lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp
Andreas Neustifter
astifter-llvm at gmx.at
Wed Sep 16 04:35:51 PDT 2009
Author: astifter
Date: Wed Sep 16 06:35:50 2009
New Revision: 82039
URL: http://llvm.org/viewvc/llvm-project?rev=82039&view=rev
Log:
Reapplied r81355 with the problems fixed.
(See http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20090907/086737.html and
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20090907/086746.html)
Modified:
llvm/trunk/include/llvm/Analysis/ProfileInfoLoader.h
llvm/trunk/lib/Analysis/ProfileInfoLoader.cpp
llvm/trunk/lib/Analysis/ProfileInfoLoaderPass.cpp
llvm/trunk/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp
Modified: llvm/trunk/include/llvm/Analysis/ProfileInfoLoader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ProfileInfoLoader.h?rev=82039&r1=82038&r2=82039&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ProfileInfoLoader.h (original)
+++ llvm/trunk/include/llvm/Analysis/ProfileInfoLoader.h Wed Sep 16 06:35:50 2009
@@ -42,6 +42,8 @@
ProfileInfoLoader(const char *ToolName, const std::string &Filename,
Module &M);
+ static const unsigned Uncounted;
+
unsigned getNumExecutions() const { return CommandLines.size(); }
const std::string &getExecution(unsigned i) const { return CommandLines[i]; }
Modified: llvm/trunk/lib/Analysis/ProfileInfoLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ProfileInfoLoader.cpp?rev=82039&r1=82038&r2=82039&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ProfileInfoLoader.cpp (original)
+++ llvm/trunk/lib/Analysis/ProfileInfoLoader.cpp Wed Sep 16 06:35:50 2009
@@ -34,8 +34,8 @@
static unsigned AddCounts(unsigned A, unsigned B) {
// If either value is undefined, use the other.
- if (A == ~0U) return B;
- if (B == ~0U) return A;
+ if (A == ProfileInfoLoader::Uncounted) return B;
+ if (B == ProfileInfoLoader::Uncounted) return A;
return A + B;
}
@@ -64,7 +64,7 @@
// Make sure we have enough space... The space is initialised to -1 to
// facitiltate the loading of missing values for OptimalEdgeProfiling.
if (Data.size() < NumEntries)
- Data.resize(NumEntries, ~0U);
+ Data.resize(NumEntries, ProfileInfoLoader::Uncounted);
// Accumulate the data we just read into the data.
if (!ShouldByteSwap) {
@@ -78,6 +78,8 @@
}
}
+const unsigned ProfileInfoLoader::Uncounted = ~0U;
+
// ProfileInfoLoader ctor - Read the specified profiling data file, exiting the
// program if the file is invalid or broken.
//
Modified: llvm/trunk/lib/Analysis/ProfileInfoLoaderPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ProfileInfoLoaderPass.cpp?rev=82039&r1=82038&r2=82039&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ProfileInfoLoaderPass.cpp (original)
+++ llvm/trunk/lib/Analysis/ProfileInfoLoaderPass.cpp Wed Sep 16 06:35:50 2009
@@ -160,8 +160,13 @@
std::vector<unsigned> &ECs) {
if (ReadCount < ECs.size()) {
double weight = ECs[ReadCount++];
- if (weight != ~0U) {
- EdgeInformation[getFunction(e)][e] += weight;
+ if (weight != ProfileInfoLoader::Uncounted) {
+ // Here the data realm changes from the unsigned of the file to the
+ // double of the ProfileInfo. This conversion is save because we know
+ // that everything thats representable in unsinged is also representable
+ // in double.
+ EdgeInformation[getFunction(e)][e] += (double)weight;
+
DEBUG(errs() << "--Read Edge Counter for " << e
<< " (# "<< (ReadCount-1) << "): "
<< (unsigned)getEdgeWeight(e) << "\n");
@@ -185,9 +190,6 @@
DEBUG(errs()<<"Working on "<<F->getNameStr()<<"\n");
readEdge(getEdge(0,&F->getEntryBlock()), Counters);
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
- // Okay, we have to add a counter of each outgoing edge. If the
- // outgoing edge is not critical don't split it, just insert the counter
- // in the source or destination of the edge.
TerminatorInst *TI = BB->getTerminator();
for (unsigned s = 0, e = TI->getNumSuccessors(); s != e; ++s) {
readEdge(getEdge(BB,TI->getSuccessor(s)), Counters);
@@ -258,7 +260,11 @@
if (F->isDeclaration()) continue;
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
if (ReadCount < Counters.size())
- BlockInformation[F][BB] = Counters[ReadCount++];
+ // Here the data realm changes from the unsigned of the file to the
+ // double of the ProfileInfo. This conversion is save because we know
+ // that everything thats representable in unsinged is also
+ // representable in double.
+ BlockInformation[F][BB] = (double)Counters[ReadCount++];
}
if (ReadCount != Counters.size()) {
errs() << "WARNING: profile information is inconsistent with "
@@ -273,7 +279,11 @@
for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) {
if (F->isDeclaration()) continue;
if (ReadCount < Counters.size())
- FunctionInformation[F] = Counters[ReadCount++];
+ // Here the data realm changes from the unsigned of the file to the
+ // double of the ProfileInfo. This conversion is save because we know
+ // that everything thats representable in unsinged is also
+ // representable in double.
+ FunctionInformation[F] = (double)Counters[ReadCount++];
}
if (ReadCount != Counters.size()) {
errs() << "WARNING: profile information is inconsistent with "
Modified: llvm/trunk/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp?rev=82039&r1=82038&r2=82039&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp Wed Sep 16 06:35:50 2009
@@ -18,6 +18,7 @@
#include "llvm/Pass.h"
#include "llvm/Analysis/Passes.h"
#include "llvm/Analysis/ProfileInfo.h"
+#include "llvm/Analysis/ProfileInfoLoader.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Debug.h"
@@ -113,8 +114,8 @@
NumEdgesInserted = 0;
std::vector<Constant*> Initializer(NumEdges);
- Constant* zeroc = ConstantInt::get(Int32, 0);
- Constant* minusonec = ConstantInt::get(Int32, ProfileInfo::MissingValue);
+ Constant* Zero = ConstantInt::get(Int32, 0);
+ Constant* Uncounted = ConstantInt::get(Int32, ProfileInfoLoader::Uncounted);
// Instrument all of the edges not in MST...
unsigned i = 0;
@@ -144,9 +145,9 @@
if (!std::binary_search(MST.begin(), MST.end(), edge)) {
printEdgeCounter(edge,entry,i);
IncrementCounterInBlock(entry, i, Counters); NumEdgesInserted++;
- Initializer[i++] = (zeroc);
+ Initializer[i++] = (Zero);
} else{
- Initializer[i++] = (minusonec);
+ Initializer[i++] = (Uncounted);
}
// InsertedBlocks contains all blocks that were inserted for splitting an
@@ -167,9 +168,9 @@
if (!std::binary_search(MST.begin(), MST.end(), edge)) {
printEdgeCounter(edge,BB,i);
IncrementCounterInBlock(BB, i, Counters); NumEdgesInserted++;
- Initializer[i++] = (zeroc);
+ Initializer[i++] = (Zero);
} else{
- Initializer[i++] = (minusonec);
+ Initializer[i++] = (Uncounted);
}
}
for (unsigned s = 0, e = TI->getNumSuccessors(); s != e; ++s) {
@@ -195,9 +196,9 @@
printEdgeCounter(edge,Succ,i);
IncrementCounterInBlock(Succ, i, Counters); NumEdgesInserted++;
}
- Initializer[i++] = (zeroc);
+ Initializer[i++] = (Zero);
} else {
- Initializer[i++] = (minusonec);
+ Initializer[i++] = (Uncounted);
}
}
}
More information about the llvm-commits
mailing list