X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FInstCount.cpp;h=82b2245a3bb4e590227263394e50375b44079575;hb=2a3876d885e7dd9eab77937187df4b65b2ad887f;hp=9177e4480004704a30f9f85376c0271128f87544;hpb=d0fde30ce850b78371fd1386338350591f9ff494;p=oota-llvm.git

diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp
index 9177e448000..82b2245a3bb 100644
--- a/lib/Analysis/InstCount.cpp
+++ b/lib/Analysis/InstCount.cpp
@@ -1,34 +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 
+// 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/Compiler.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Streams.h"
+#include "llvm/ADT/Statistic.h"
+#include <ostream>
+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"
 
-  class InstCount : public FunctionPass, public InstVisitor<InstCount> {
+
+namespace {
+  class VISIBILITY_HIDDEN InstCount 
+      : public FunctionPass, public InstVisitor<InstCount> {
     friend class InstVisitor<InstCount>;
 
     void visitFunction  (Function &F) { ++TotalFuncs; }
@@ -40,10 +47,13 @@ namespace {
 #include "llvm/Instruction.def"
 
     void visitInstruction(Instruction &I) {
-      std::cerr << "Instruction Count does not know about " << I;
+      cerr << "Instruction Count does not know about " << I;
       abort();
     }
   public:
+    static char ID; // Pass identification, replacement for typeid
+    InstCount() : FunctionPass((intptr_t)&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -53,16 +63,24 @@ namespace {
 
   };
 
-  RegisterAnalysis<InstCount> X("instcount",
-                                "Counts the various types of Instructions");
+  char InstCount::ID = 0;
+  RegisterPass<InstCount> X("instcount",
+                            "Counts the various types of Instructions");
 }
 
+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 + NumMallocInst + NumFreeInst;
   visit(F);
+  unsigned EndMemInsts =
+    NumGetElementPtrInst + NumLoadInst + NumStoreInst + NumCallInst +
+    NumInvokeInst + NumAllocaInst + NumMallocInst + NumFreeInst;
+  TotalMemInst += EndMemInsts-StartMemInsts;
   return false;
 }
-
-} // End llvm namespace