X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FInstCount.cpp;h=3b385d26ba3c07245a6cdfcce01b18ac86a167ee;hb=009da05e750b7bac7e1902fcdc85394de4ea63b3;hp=12d16b081e7b3db6b4b383e92f1e14405c3b054e;hpb=551ccae044b0ff658fe629dd67edd5ffe75d10e8;p=oota-llvm.git

diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp
index 12d16b081e7..3b385d26ba3 100644
--- a/lib/Analysis/InstCount.cpp
+++ b/lib/Analysis/InstCount.cpp
@@ -1,33 +1,39 @@
 //===-- 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 file 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 
+// This pass collects the count of all instructions and reports them
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "instcount"
+#include "llvm/Analysis/Passes.h"
 #include "llvm/Pass.h"
 #include "llvm/Function.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/InstVisitor.h"
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/Statistic.h"
+using namespace llvm;
 
-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");
+STATISTIC(TotalInsts , "Number of instructions (of all types)");
+STATISTIC(TotalBlocks, "Number of basic blocks");
+STATISTIC(TotalFuncs , "Number of non-external functions");
+STATISTIC(TotalMemInst, "Number of memory instructions");
 
 #define HANDLE_INST(N, OPCODE, CLASS) \
-    Statistic<> Num##OPCODE##Inst("instcount", "Number of " #OPCODE " insts");
+  STATISTIC(Num ## OPCODE ## Inst, "Number of " #OPCODE " insts");
 
 #include "llvm/Instruction.def"
 
+
+namespace {
   class InstCount : public FunctionPass, public InstVisitor<InstCount> {
     friend class InstVisitor<InstCount>;
 
@@ -40,29 +46,42 @@ namespace {
 #include "llvm/Instruction.def"
 
     void visitInstruction(Instruction &I) {
-      std::cerr << "Instruction Count does not know about " << I;
-      abort();
+      errs() << "Instruction Count does not know about " << I;
+      llvm_unreachable(0);
     }
   public:
+    static char ID; // Pass identification, replacement for typeid
+    InstCount() : FunctionPass(ID) {
+      initializeInstCountPass(*PassRegistry::getPassRegistry());
+    }
+
     virtual bool runOnFunction(Function &F);
 
     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 {}
 
   };
-
-  RegisterAnalysis<InstCount> X("instcount",
-                                "Counts the various types of Instructions");
 }
 
+char InstCount::ID = 0;
+INITIALIZE_PASS(InstCount, "instcount",
+                "Counts the various types of Instructions", false, true)
+
+FunctionPass *llvm::createInstCountPass() { return new InstCount(); }
+
 // InstCount::run - This is the main Analysis entry point for a
 // function.
 //
 bool InstCount::runOnFunction(Function &F) {
+  unsigned StartMemInsts =
+    NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
+    NumInvokeInst + NumAllocaInst;
   visit(F);
+  unsigned EndMemInsts =
+    NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
+    NumInvokeInst + NumAllocaInst;
+  TotalMemInst += EndMemInsts-StartMemInsts;
   return false;
 }
-
-} // End llvm namespace