X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAnalysis%2FProfileInfoLoaderPass.cpp;h=426bd18746e80a4993010bc139e383d700f8fb3e;hb=95ced11b1a913c0c8ee0efacadddf48da25aef97;hp=be956698793c5b4b0c51ece2001407d4a3cdd50a;hpb=945871df86c4e5e0a12c58f6e12edbd09c813310;p=oota-llvm.git

diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp
index be956698793..426bd18746e 100644
--- a/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -1,10 +1,10 @@
 //===- ProfileInfoLoaderPass.cpp - LLVM Pass to load profile info ---------===//
-// 
+//
 //                     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 implements a concrete implementation of profiling information that
@@ -12,20 +12,24 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/BasicBlock.h"
+#include "llvm/InstrTypes.h"
 #include "llvm/Pass.h"
+#include "llvm/Analysis/Passes.h"
 #include "llvm/Analysis/ProfileInfo.h"
 #include "llvm/Analysis/ProfileInfoLoader.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Streams.h"
 using namespace llvm;
 
 namespace {
   cl::opt<std::string>
   ProfileInfoFilename("profile-info-file", cl::init("llvmprof.out"),
-                      cl::desc(""));
+                      cl::value_desc("filename"),
+                      cl::desc("Profile file loaded by -profile-loader"));
 
-  class LoaderPass : public Pass, public ProfileInfo {
+  class LoaderPass : public ModulePass, public ProfileInfo {
     std::string Filename;
-    std::map<BasicBlock*, unsigned> ExecutionCounts;
   public:
     LoaderPass(const std::string &filename = "")
       : Filename(filename) {
@@ -41,20 +45,16 @@ namespace {
     }
 
     /// run - Load the profile information from the specified file.
-    virtual bool run(Module &M);
-
-    virtual unsigned getExecutionCount(BasicBlock *BB) {
-      std::map<BasicBlock*, unsigned>::iterator I = ExecutionCounts.find(BB);
-      return I != ExecutionCounts.end() ? I->second : 0;
-    }
+    virtual bool runOnModule(Module &M);
   };
- 
-  RegisterOpt<LoaderPass>
+
+  RegisterPass<LoaderPass>
   X("profile-loader", "Load profile information from llvmprof.out");
 
-  RegisterAnalysisGroup<ProfileInfo, LoaderPass> Y;
+  RegisterAnalysisGroup<ProfileInfo> Y(X);
 }  // End of anonymous namespace
 
+ModulePass *llvm::createProfileLoaderPass() { return new LoaderPass(); }
 
 /// createProfileLoaderPass - This function returns a Pass that loads the
 /// profiling information for the module from the specified filename, making it
@@ -63,12 +63,27 @@ Pass *llvm::createProfileLoaderPass(const std::string &Filename) {
   return new LoaderPass(Filename);
 }
 
-bool LoaderPass::run(Module &M) {
-  ProfileInfoLoader PIL("opt", Filename, M);
-  if (PIL.hasAccurateBlockCounts()) {
-    std::vector<std::pair<BasicBlock*, unsigned> > Counts;
-    PIL.getBlockCounts(Counts);
-    ExecutionCounts.insert(Counts.begin(), Counts.end());
+bool LoaderPass::runOnModule(Module &M) {
+  ProfileInfoLoader PIL("profile-loader", Filename, M);
+  EdgeCounts.clear();
+  bool PrintedWarning = false;
+
+  std::vector<std::pair<ProfileInfoLoader::Edge, unsigned> > ECs;
+  PIL.getEdgeCounts(ECs);
+  for (unsigned i = 0, e = ECs.size(); i != e; ++i) {
+    BasicBlock *BB = ECs[i].first.first;
+    unsigned SuccNum = ECs[i].first.second;
+    TerminatorInst *TI = BB->getTerminator();
+    if (SuccNum >= TI->getNumSuccessors()) {
+      if (!PrintedWarning) {
+        cerr << "WARNING: profile information is inconsistent with "
+             << "the current program!\n";
+        PrintedWarning = true;
+      }
+    } else {
+      EdgeCounts[std::make_pair(BB, TI->getSuccessor(SuccNum))]+= ECs[i].second;
+    }
   }
+
   return false;
 }