Changes For Bug 352

[oota-llvm.git] / lib / Analysis / InstCount.cpp

diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp
index 0d84cc8c4fda3649c556cd79d027c83cb216ede6..12d16b081e7b3db6b4b383e92f1e14405c3b054e 100644 (file)
--- a/lib/Analysis/InstCount.cpp
+++ b/lib/Analysis/InstCount.cpp
@@ -1,25 +1,41 @@
 //===-- InstCount.cpp - Collects the count of all instructions ------------===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
 // This pass collects the count of all instructions and reports them 
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Pass.h"
-#include "llvm/Module.h"
+#include "llvm/Function.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
+
+namespace llvm {
 
 namespace {
+  Statistic<> TotalInsts ("instcount", "Number of instructions (of all types)");
+  Statistic<> TotalBlocks("instcount", "Number of basic blocks");
+  Statistic<> TotalFuncs ("instcount", "Number of non-external functions");
+
 #define HANDLE_INST(N, OPCODE, CLASS) \
     Statistic<> Num##OPCODE##Inst("instcount", "Number of " #OPCODE " insts");
 
 #include "llvm/Instruction.def"
 
-  class InstCount : public Pass, public InstVisitor<InstCount> {
+  class InstCount : public FunctionPass, public InstVisitor<InstCount> {
     friend class InstVisitor<InstCount>;
 
+    void visitFunction  (Function &F) { ++TotalFuncs; }
+    void visitBasicBlock(BasicBlock &BB) { ++TotalBlocks; }
+
 #define HANDLE_INST(N, OPCODE, CLASS) \
-    void visit##OPCODE(CLASS &) { Num##OPCODE##Inst++; }
+    void visit##OPCODE(CLASS &) { ++Num##OPCODE##Inst; ++TotalInsts; }
 
 #include "llvm/Instruction.def"
 
@@ -28,12 +44,12 @@ namespace {
       abort();
     }
   public:
-    virtual bool run(Module &M);
+    virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
     }
-    virtual void print(std::ostream &O, Module *M) const {}
+    virtual void print(std::ostream &O, const Module *M) const {}
 
   };
 
@@ -44,7 +60,9 @@ namespace {
 // InstCount::run - This is the main Analysis entry point for a
 // function.
 //
-bool InstCount::run(Module &M) {
-  visit(M);
+bool InstCount::runOnFunction(Function &F) {
+  visit(F);
   return false;
 }
+
+} // End llvm namespace