projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partially address a README by having functionattrs consider calls to
[oota-llvm.git]
/
lib
/
Analysis
/
InstCount.cpp
diff --git
a/lib/Analysis/InstCount.cpp
b/lib/Analysis/InstCount.cpp
index 2dbf0d4f9ed89279ba986d6a3caf3a585ff3cb67..bb2cf53c85efdfa859e6f1a22ff72005edac2e57 100644
(file)
--- a/
lib/Analysis/InstCount.cpp
+++ b/
lib/Analysis/InstCount.cpp
@@
-15,10
+15,10
@@
#include "llvm/Analysis/Passes.h"
#include "llvm/Pass.h"
#include "llvm/Function.h"
#include "llvm/Analysis/Passes.h"
#include "llvm/Pass.h"
#include "llvm/Function.h"
-#include "llvm/Support/
Compiler
.h"
+#include "llvm/Support/
Debug
.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/InstVisitor.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/InstVisitor.h"
-#include "llvm/Support/
Streams
.h"
+#include "llvm/Support/
raw_ostream
.h"
#include "llvm/ADT/Statistic.h"
using namespace llvm;
#include "llvm/ADT/Statistic.h"
using namespace llvm;
@@
-34,8
+34,7
@@
STATISTIC(TotalMemInst, "Number of memory instructions");
namespace {
namespace {
- class VISIBILITY_HIDDEN InstCount
- : public FunctionPass, public InstVisitor<InstCount> {
+ class InstCount : public FunctionPass, public InstVisitor<InstCount> {
friend class InstVisitor<InstCount>;
void visitFunction (Function &F) { ++TotalFuncs; }
friend class InstVisitor<InstCount>;
void visitFunction (Function &F) { ++TotalFuncs; }
@@
-47,8
+46,8
@@
namespace {
#include "llvm/Instruction.def"
void visitInstruction(Instruction &I) {
#include "llvm/Instruction.def"
void visitInstruction(Instruction &I) {
-
cerr
<< "Instruction Count does not know about " << I;
- llvm_unreachable();
+
errs()
<< "Instruction Count does not know about " << I;
+ llvm_unreachable(
0
);
}
public:
static char ID; // Pass identification, replacement for typeid
}
public:
static char ID; // Pass identification, replacement for typeid
@@
-59,7
+58,7
@@
namespace {
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesAll();
}
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesAll();
}
- virtual void print(
std::
ostream &O, const Module *M) const {}
+ virtual void print(
raw_
ostream &O, const Module *M) const {}
};
}
};
}
@@
-76,11
+75,11
@@
FunctionPass *llvm::createInstCountPass() { return new InstCount(); }
bool InstCount::runOnFunction(Function &F) {
unsigned StartMemInsts =
NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
bool InstCount::runOnFunction(Function &F) {
unsigned StartMemInsts =
NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
- NumInvokeInst + NumAllocaInst
+ NumMallocInst + NumFreeInst
;
+ NumInvokeInst + NumAllocaInst;
visit(F);
unsigned EndMemInsts =
NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
visit(F);
unsigned EndMemInsts =
NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
- NumInvokeInst + NumAllocaInst
+ NumMallocInst + NumFreeInst
;
+ NumInvokeInst + NumAllocaInst;
TotalMemInst += EndMemInsts-StartMemInsts;
return false;
}
TotalMemInst += EndMemInsts-StartMemInsts;
return false;
}