remove the random sampling framework, which is not maintained anymore.

If there is interest, it can be resurrected from SVN.  PR4912.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92422 91177308-0d34-0410-b5e6-96231b3b80d8

10 files changed, 6 insertions, 926 deletions

diff --git a/include/llvm/LinkAllPasses.h b/include/llvm/LinkAllPasses.h
index 4aba210421..a7e2e05b93 100644
--- a/include/llvm/LinkAllPasses.h
+++ b/include/llvm/LinkAllPasses.h
@@ -53,7 +53,6 @@ namespace {
       (void) llvm::createLibCallAliasAnalysisPass(0);
       (void) llvm::createScalarEvolutionAliasAnalysisPass();
       (void) llvm::createBlockPlacementPass();
-      (void) llvm::createBlockProfilerPass();
       (void) llvm::createBreakCriticalEdgesPass();
       (void) llvm::createCFGSimplificationPass();
       (void) llvm::createConstantMergePass();
@@ -71,7 +70,6 @@ namespace {
       (void) llvm::createOptimalEdgeProfilerPass();
       (void) llvm::createFunctionInliningPass();
       (void) llvm::createAlwaysInlinerPass();
-      (void) llvm::createFunctionProfilerPass();
       (void) llvm::createGlobalDCEPass();
       (void) llvm::createGlobalOptimizerPass();
       (void) llvm::createGlobalsModRefPass();
@@ -120,8 +118,6 @@ namespace {
       (void) llvm::createTailDuplicationPass();
       (void) llvm::createJumpThreadingPass();
       (void) llvm::createUnifyFunctionExitNodesPass();
-      (void) llvm::createNullProfilerRSPass();
-      (void) llvm::createRSProfilingPass();
       (void) llvm::createInstCountPass();
       (void) llvm::createCodeGenPreparePass();
       (void) llvm::createGVNPass();
diff --git a/include/llvm/Transforms/Instrumentation.h b/include/llvm/Transforms/Instrumentation.h
index 9794ffd429..9c579ac761 100644
--- a/include/llvm/Transforms/Instrumentation.h
+++ b/include/llvm/Transforms/Instrumentation.h
@@ -19,22 +19,12 @@ namespace llvm {
 class ModulePass;
 class FunctionPass;
 
-// Insert function profiling instrumentation
-ModulePass *createFunctionProfilerPass();
-
-// Insert block profiling instrumentation
-ModulePass *createBlockProfilerPass();
-
 // Insert edge profiling instrumentation
 ModulePass *createEdgeProfilerPass();
 
 // Insert optimal edge profiling instrumentation
 ModulePass *createOptimalEdgeProfilerPass();
 
-// Random Sampling Profiling Framework
-ModulePass* createNullProfilerRSPass();
-FunctionPass* createRSProfilingPass();
-
 } // End llvm namespace
 
 #endif
diff --git a/lib/Transforms/Instrumentation/BlockProfiling.cpp b/lib/Transforms/Instrumentation/BlockProfiling.cpp
deleted file mode 100644
index 211a6d628b..0000000000
--- a/lib/Transforms/Instrumentation/BlockProfiling.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//===- BlockProfiling.cpp - Insert counters for block profiling -----------===//
-//
-//                      The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This pass instruments the specified program with counters for basic block or
-// function profiling.  This is the most basic form of profiling, which can tell
-// which blocks are hot, but cannot reliably detect hot paths through the CFG.
-// Block profiling counts the number of times each basic block executes, and
-// function profiling counts the number of times each function is called.
-//
-// Note that this implementation is very naive.  Control equivalent regions of
-// the CFG should not require duplicate counters, but we do put duplicate
-// counters in.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/DerivedTypes.h"
-#include "llvm/Module.h"
-#include "llvm/Pass.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Instrumentation.h"
-#include "RSProfiling.h"
-#include "ProfilingUtils.h"
-using namespace llvm;
-
-namespace {
-  class FunctionProfiler : public RSProfilers_std {
-  public:
-    static char ID;
-    bool runOnModule(Module &M);
-  };
-}
-
-char FunctionProfiler::ID = 0;
-
-static RegisterPass<FunctionProfiler>
-X("insert-function-profiling",
-  "Insert instrumentation for function profiling");
-static RegisterAnalysisGroup<RSProfilers> XG(X);
-
-ModulePass *llvm::createFunctionProfilerPass() {
-  return new FunctionProfiler();
-}
-
-bool FunctionProfiler::runOnModule(Module &M) {
-  Function *Main = M.getFunction("main");
-  if (Main == 0) {
-    errs() << "WARNING: cannot insert function profiling into a module"
-           << " with no main function!\n";
-    return false;  // No main, no instrumentation!
-  }
-
-  unsigned NumFunctions = 0;
-  for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    if (!I->isDeclaration())
-      ++NumFunctions;
-
-  const Type *ATy = ArrayType::get(Type::getInt32Ty(M.getContext()),
-                                   NumFunctions);
-  GlobalVariable *Counters =
-    new GlobalVariable(M, ATy, false, GlobalValue::InternalLinkage,
-                       Constant::getNullValue(ATy), "FuncProfCounters");
-
-  // Instrument all of the functions...
-  unsigned i = 0;
-  for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    if (!I->isDeclaration())
-      // Insert counter at the start of the function
-      IncrementCounterInBlock(&I->getEntryBlock(), i++, Counters);
-
-  // Add the initialization call to main.
-  InsertProfilingInitCall(Main, "llvm_start_func_profiling", Counters);
-  return true;
-}
-
-
-namespace {
-  class BlockProfiler : public RSProfilers_std {
-    bool runOnModule(Module &M);
-  public:
-    static char ID;
-  };
-}
-
-char BlockProfiler::ID = 0;
-static RegisterPass<BlockProfiler>
-Y("insert-block-profiling", "Insert instrumentation for block profiling");
-static RegisterAnalysisGroup<RSProfilers> YG(Y);
-
-ModulePass *llvm::createBlockProfilerPass() { return new BlockProfiler(); }
-
-bool BlockProfiler::runOnModule(Module &M) {
-  Function *Main = M.getFunction("main");
-  if (Main == 0) {
-    errs() << "WARNING: cannot insert block profiling into a module"
-           << " with no main function!\n";
-    return false;  // No main, no instrumentation!
-  }
-
-  unsigned NumBlocks = 0;
-  for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    if (!I->isDeclaration())
-      NumBlocks += I->size();
-
-  const Type *ATy = ArrayType::get(Type::getInt32Ty(M.getContext()), NumBlocks);
-  GlobalVariable *Counters =
-    new GlobalVariable(M, ATy, false, GlobalValue::InternalLinkage,
-                       Constant::getNullValue(ATy), "BlockProfCounters");
-
-  // Instrument all of the blocks...
-  unsigned i = 0;
-  for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
-    if (I->isDeclaration()) continue;
-    for (Function::iterator BB = I->begin(), E = I->end(); BB != E; ++BB)
-      // Insert counter at the start of the block
-      IncrementCounterInBlock(BB, i++, Counters);
-  }
-
-  // Add the initialization call to main.
-  InsertProfilingInitCall(Main, "llvm_start_block_profiling", Counters);
-  return true;
-}
-
diff --git a/lib/Transforms/Instrumentation/CMakeLists.txt b/lib/Transforms/Instrumentation/CMakeLists.txt
index 494928e438..128bf48978 100644
--- a/lib/Transforms/Instrumentation/CMakeLists.txt
+++ b/lib/Transforms/Instrumentation/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_llvm_library(LLVMInstrumentation
-  BlockProfiling.cpp
   EdgeProfiling.cpp
   OptimalEdgeProfiling.cpp
   ProfilingUtils.cpp
-  RSProfiling.cpp
   )
diff --git a/lib/Transforms/Instrumentation/RSProfiling.cpp b/lib/Transforms/Instrumentation/RSProfiling.cpp
deleted file mode 100644
index c08efc1e4b..0000000000
--- a/lib/Transforms/Instrumentation/RSProfiling.cpp
+++ /dev/null
@@ -1,662 +0,0 @@
-//===- RSProfiling.cpp - Various profiling using random sampling ----------===//
-//
-//                      The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// These passes implement a random sampling based profiling.  Different methods
-// of choosing when to sample are supported, as well as different types of
-// profiling.  This is done as two passes.  The first is a sequence of profiling
-// passes which insert profiling into the program, and remember what they 
-// inserted.
-//
-// The second stage duplicates all instructions in a function, ignoring the 
-// profiling code, then connects the two versions togeather at the entry and at
-// backedges.  At each connection point a choice is made as to whether to jump
-// to the profiled code (take a sample) or execute the unprofiled code.
-//
-// It is highly recommended that after this pass one runs mem2reg and adce
-// (instcombine load-vn gdce dse also are good to run afterwards)
-//
-// This design is intended to make the profiling passes independent of the RS
-// framework, but any profiling pass that implements the RSProfiling interface
-// is compatible with the rs framework (and thus can be sampled)
-//
-// TODO: obviously the block and function profiling are almost identical to the
-// existing ones, so they can be unified (esp since these passes are valid
-// without the rs framework).
-// TODO: Fix choice code so that frequency is not hard coded
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Pass.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Instructions.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Intrinsics.h"
-#include "llvm/Transforms/Scalar.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Instrumentation.h"
-#include "RSProfiling.h"
-#include <set>
-#include <map>
-#include <queue>
-using namespace llvm;
-
-namespace {
-  enum RandomMeth {
-    GBV, GBVO, HOSTCC
-  };
-}
-
-static cl::opt<RandomMeth> RandomMethod("profile-randomness",
-    cl::desc("How to randomly choose to profile:"),
-    cl::values(
-               clEnumValN(GBV, "global", "global counter"),
-               clEnumValN(GBVO, "ra_global", 
-                          "register allocated global counter"),
-               clEnumValN(HOSTCC, "rdcc", "cycle counter"),
-               clEnumValEnd));
-  
-namespace {
-  /// NullProfilerRS - The basic profiler that does nothing.  It is the default
-  /// profiler and thus terminates RSProfiler chains.  It is useful for 
-  /// measuring framework overhead
-  class NullProfilerRS : public RSProfilers {
-  public:
-    static char ID; // Pass identification, replacement for typeid
-    bool isProfiling(Value* v) {
-      return false;
-    }
-    bool runOnModule(Module &M) {
-      return false;
-    }
-    void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-  };
-}
-
-static RegisterAnalysisGroup<RSProfilers> A("Profiling passes");
-static RegisterPass<NullProfilerRS> NP("insert-null-profiling-rs",
-                                       "Measure profiling framework overhead");
-static RegisterAnalysisGroup<RSProfilers, true> NPT(NP);
-
-namespace {
-  /// Chooser - Something that chooses when to make a sample of the profiled code
-  class Chooser {
-  public:
-    /// ProcessChoicePoint - is called for each basic block inserted to choose 
-    /// between normal and sample code
-    virtual void ProcessChoicePoint(BasicBlock*) = 0;
-    /// PrepFunction - is called once per function before other work is done.
-    /// This gives the opertunity to insert new allocas and such.
-    virtual void PrepFunction(Function*) = 0;
-    virtual ~Chooser() {}
-  };
-
-  //Things that implement sampling policies
-  //A global value that is read-mod-stored to choose when to sample.
-  //A sample is taken when the global counter hits 0
-  class GlobalRandomCounter : public Chooser {
-    GlobalVariable* Counter;
-    Value* ResetValue;
-    const IntegerType* T;
-  public:
-    GlobalRandomCounter(Module& M, const IntegerType* t, uint64_t resetval);
-    virtual ~GlobalRandomCounter();
-    virtual void PrepFunction(Function* F);
-    virtual void ProcessChoicePoint(BasicBlock* bb);
-  };
-
-  //Same is GRC, but allow register allocation of the global counter
-  class GlobalRandomCounterOpt : public Chooser {
-    GlobalVariable* Counter;
-    Value* ResetValue;
-    AllocaInst* AI;
-    const IntegerType* T;
-  public:
-    GlobalRandomCounterOpt(Module& M, const IntegerType* t, uint64_t resetval);
-    virtual ~GlobalRandomCounterOpt();
-    virtual void PrepFunction(Function* F);
-    virtual void ProcessChoicePoint(BasicBlock* bb);
-  };
-
-  //Use the cycle counter intrinsic as a source of pseudo randomness when
-  //deciding when to sample.
-  class CycleCounter : public Chooser {
-    uint64_t rm;
-    Constant *F;
-  public:
-    CycleCounter(Module& m, uint64_t resetmask);
-    virtual ~CycleCounter();
-    virtual void PrepFunction(Function* F);
-    virtual void ProcessChoicePoint(BasicBlock* bb);
-  };
-
-  /// ProfilerRS - Insert the random sampling framework
-  struct ProfilerRS : public FunctionPass {
-    static char ID; // Pass identification, replacement for typeid
-    ProfilerRS() : FunctionPass(&ID) {}
-
-    std::map<Value*, Value*> TransCache;
-    std::set<BasicBlock*> ChoicePoints;
-    Chooser* c;
-
-    //Translate and duplicate values for the new profile free version of stuff
-    Value* Translate(Value* v);
-    //Duplicate an entire function (with out profiling)
-    void Duplicate(Function& F, RSProfilers& LI);
-    //Called once for each backedge, handle the insertion of choice points and
-    //the interconection of the two versions of the code
-    void ProcessBackEdge(BasicBlock* src, BasicBlock* dst, Function& F);
-    bool runOnFunction(Function& F);
-    bool doInitialization(Module &M);
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const;
-  };
-}
-
-static RegisterPass<ProfilerRS>
-X("insert-rs-profiling-framework",
-  "Insert random sampling instrumentation framework");
-
-char RSProfilers::ID = 0;
-char NullProfilerRS::ID = 0;
-char ProfilerRS::ID = 0;
-
-//Local utilities
-static void ReplacePhiPred(BasicBlock* btarget, 
-                           BasicBlock* bold, BasicBlock* bnew);
-
-static void CollapsePhi(BasicBlock* btarget, BasicBlock* bsrc);
-
-template<class T>
-static void recBackEdge(BasicBlock* bb, T& BackEdges, 
-                        std::map<BasicBlock*, int>& color,
-                        std::map<BasicBlock*, int>& depth,
-                        std::map<BasicBlock*, int>& finish,
-                        int& time);
-
-//find the back edges and where they go to
-template<class T>
-static void getBackEdges(Function& F, T& BackEdges);
-
-
-///////////////////////////////////////
-// Methods of choosing when to profile
-///////////////////////////////////////
-  
-GlobalRandomCounter::GlobalRandomCounter(Module& M, const IntegerType* t,
-                                         uint64_t resetval) : T(t) {
-  ConstantInt* Init = ConstantInt::get(T, resetval); 
-  ResetValue = Init;
-  Counter = new GlobalVariable(M, T, false, GlobalValue::InternalLinkage,
-                               Init, "RandomSteeringCounter");
-}
-
-GlobalRandomCounter::~GlobalRandomCounter() {}
-
-void GlobalRandomCounter::PrepFunction(Function* F) {}
-
-void GlobalRandomCounter::ProcessChoicePoint(BasicBlock* bb) {
-  BranchInst* t = cast<BranchInst>(bb->getTerminator());
-  
-  //decrement counter
-  LoadInst* l = new LoadInst(Counter, "counter", t);
-  
-  ICmpInst* s = new ICmpInst(t, ICmpInst::ICMP_EQ, l,
-                             ConstantInt::get(T, 0), 
-                             "countercc");
-
-  Value* nv = BinaryOperator::CreateSub(l, ConstantInt::get(T, 1),
-                                        "counternew", t);
-  new StoreInst(nv, Counter, t);
-  t->setCondition(s);
-  
-  //reset counter
-  BasicBlock* oldnext = t->getSuccessor(0);
-  BasicBlock* resetblock = BasicBlock::Create(bb->getContext(),
-                                              "reset", oldnext->getParent(), 
-                                              oldnext);
-  TerminatorInst* t2 = BranchInst::Create(oldnext, resetblock);
-  t->setSuccessor(0, resetblock);
-  new StoreInst(ResetValue, Counter, t2);
-  ReplacePhiPred(oldnext, bb, resetblock);
-}
-
-GlobalRandomCounterOpt::GlobalRandomCounterOpt(Module& M, const IntegerType* t,
-                                               uint64_t resetval) 
-  : AI(0), T(t) {
-  ConstantInt* Init = ConstantInt::get(T, resetval);
-  ResetValue  = Init;
-  Counter = new GlobalVariable(M, T, false, GlobalValue::InternalLinkage,
-                               Init, "RandomSteeringCounter");
-}
-
-GlobalRandomCounterOpt::~GlobalRandomCounterOpt() {}
-
-void GlobalRandomCounterOpt::PrepFunction(Function* F) {
-  //make a local temporary to cache the global
-  BasicBlock& bb = F->getEntryBlock();
-  BasicBlock::iterator InsertPt = bb.begin();
-  AI = new AllocaInst(T, 0, "localcounter", InsertPt);
-  LoadInst* l = new LoadInst(Counter, "counterload", InsertPt);
-  new StoreInst(l, AI, InsertPt);
-  
-  //modify all functions and return values to restore the local variable to/from
-  //the global variable
-  for(Function::iterator fib = F->begin(), fie = F->end();
-      fib != fie; ++fib)
-    for(BasicBlock::iterator bib = fib->begin(), bie = fib->end();
-        bib != bie; ++bib)
-      if (isa<CallInst>(bib)) {
-        LoadInst* l = new LoadInst(AI, "counter", bib);
-        new StoreInst(l, Counter, bib);
-        l = new LoadInst(Counter, "counter", ++bib);
-        new StoreInst(l, AI, bib--);
-      } else if (isa<InvokeInst>(bib)) {
-        LoadInst* l = new LoadInst(AI, "counter", bib);
-        new StoreInst(l, Counter, bib);
-        
-        BasicBlock* bb = cast<InvokeInst>(bib)->getNormalDest();
-        BasicBlock::iterator i = bb->getFirstNonPHI();
-        l = new LoadInst(Counter, "counter", i);
-        
-        bb = cast<InvokeInst>(bib)->getUnwindDest();
-        i = bb->getFirstNonPHI();
-        l = new LoadInst(Counter, "counter", i);
-        new StoreInst(l, AI, i);
-      } else if (isa<UnwindInst>(&*bib) || isa<ReturnInst>(&*bib)) {
-        LoadInst* l = new LoadInst(AI, "counter", bib);
-        new StoreInst(l, Counter, bib);
-      }
-}
-
-void GlobalRandomCounterOpt::ProcessChoicePoint(BasicBlock* bb) {
-  BranchInst* t = cast<BranchInst>(bb->getTerminator());
-  
-  //decrement counter
-  LoadInst* l = new LoadInst(AI, "counter", t);
-  
-  ICmpInst* s = new ICmpInst(t, ICmpInst::ICMP_EQ, l,
-                             ConstantInt::get(T, 0), 
-                             "countercc");
-
-  Value* nv = BinaryOperator::CreateSub(l, ConstantInt::get(T, 1),
-                                        "counternew", t);
-  new StoreInst(nv, AI, t);
-  t->setCondition(s);
-  
-  //reset counter
-  BasicBlock* oldnext = t->getSuccessor(0);
-  BasicBlock* resetblock = BasicBlock::Create(bb->getContext(),
-                                              "reset", oldnext->getParent(), 
-                                              oldnext);
-  TerminatorInst* t2 = BranchInst::Create(oldnext, resetblock);
-  t->setSuccessor(0, resetblock);
-  new StoreInst(ResetValue, AI, t2);
-  ReplacePhiPred(oldnext, bb, resetblock);
-}
-
-
-CycleCounter::CycleCounter(Module& m, uint64_t resetmask) : rm(resetmask) {
-  F = Intrinsic::getDeclaration(&m, Intrinsic::readcyclecounter);
-}
-
-CycleCounter::~CycleCounter() {}
-
-void CycleCounter::PrepFunction(Function* F) {}
-
-void CycleCounter::ProcessChoicePoint(BasicBlock* bb) {
-  BranchInst* t = cast<BranchInst>(bb->getTerminator());
-  
-  CallInst* c = CallInst::Create(F, "rdcc", t);
-  BinaryOperator* b = 
-    BinaryOperator::CreateAnd(c,
-                      ConstantInt::get(Type::getInt64Ty(bb->getContext()), rm),
-                              "mrdcc", t);
-  
-  ICmpInst *s = new ICmpInst(t, ICmpInst::ICMP_EQ, b,
-                        ConstantInt::get(Type::getInt64Ty(bb->getContext()), 0), 
-                             "mrdccc");
-
-  t->setCondition(s);
-}
-
-///////////////////////////////////////
-// Profiling:
-///////////////////////////////////////
-bool RSProfilers_std::isProfiling(Value* v) {
-  if (profcode.find(v) != profcode.end())
-    return true;
-  //else
-  RSProfilers& LI = getAnalysis<RSProfilers>();
-  return LI.isProfiling(v);
-}
-
-void RSProfilers_std::IncrementCounterInBlock(BasicBlock *BB, unsigned CounterNum,
-                                          GlobalValue *CounterArray) {
-  // Insert the increment after any alloca or PHI instructions...
-  BasicBlock::iterator InsertPos = BB->getFirstNonPHI();
-  while (isa<AllocaInst>(InsertPos))
-    ++InsertPos;
-  
-  // Create the getelementptr constant expression
-  std::vector<Constant*> Indices(2);
-  Indices[0] = Constant::getNullValue(Type::getInt32Ty(BB->getContext()));
-  Indices[1] = ConstantInt::get(Type::getInt32Ty(BB->getContext()), CounterNum);
-  Constant *ElementPtr =ConstantExpr::getGetElementPtr(CounterArray,
-                                                        &Indices[0], 2);
-  
-  // Load, increment and store the value back.
-  Value *OldVal = new LoadInst(ElementPtr, "OldCounter", InsertPos);
-  profcode.insert(OldVal);
-  Value *NewVal = BinaryOperator::CreateAdd(OldVal,
-                       ConstantInt::get(Type::getInt32Ty(BB->getContext()), 1),
-                                            "NewCounter", InsertPos);
-  profcode.insert(NewVal);
-  profcode.insert(new StoreInst(NewVal, ElementPtr, InsertPos));
-}
-
-void RSProfilers_std::getAnalysisUsage(AnalysisUsage &AU) const {
-  //grab any outstanding profiler, or get the null one
-  AU.addRequired<RSProfilers>();
-}
-
-///////////////////////////////////////
-// RS Framework
-///////////////////////////////////////
-
-Value* ProfilerRS::Translate(Value* v) {
-  if(TransCache[v])
-    return TransCache[v];
-  
-  if (BasicBlock* bb = dyn_cast<BasicBlock>(v)) {
-    if (bb == &bb->getParent()->getEntryBlock())
-      TransCache[bb] = bb; //don't translate entry block
-    else
-      TransCache[bb] = BasicBlock::Create(v->getContext(), 
-                                          "dup_" + bb->getName(),
-                                          bb->getParent(), NULL);
-    return TransCache[bb];
-  } else if (Instruction* i = dyn_cast<Instruction>(v)) {
-    //we have already translated this
-    //do not translate entry block allocas
-    if(&i->getParent()->getParent()->getEntryBlock() == i->getParent()) {
-      TransCache[i] = i;
-      return i;
-    } else {
-      //translate this
-      Instruction* i2 = i->clone();
-      if (i->hasName())
-        i2->setName("dup_" + i->getName());
-      TransCache[i] = i2;
-      //NumNewInst++;
-      for (unsigned x = 0; x < i2->getNumOperands(); ++x)
-        i2->setOperand(x, Translate(i2->getOperand(x)));
-      return i2;
-    }
-  } else if (isa<Function>(v) || isa<Constant>(v) || isa<Argument>(v)) {
-    TransCache[v] = v;
-    return v;
-  }
-  llvm_unreachable("Value not handled");
-  return 0;
-}
-
-void ProfilerRS::Duplicate(Function& F, RSProfilers& LI)
-{
-  //perform a breadth first search, building up a duplicate of the code
-  std::queue<BasicBlock*> worklist;
-  std::set<BasicBlock*> seen;
-  
-  //This loop ensures proper BB order, to help performance
-  for (Function::iterator fib = F.begin(), fie = F.end(); fib != fie; ++fib)
-    worklist.push(fib);
-  while (!worklist.empty()) {
-    Translate(worklist.front());
-    worklist.pop();
-  }
-  
-  //remember than reg2mem created a new entry block we don't want to duplicate
-  worklist.push(F.getEntryBlock().getTerminator()->getSuccessor(0));
-  seen.insert(&F.getEntryBlock());
-  
-  while (!worklist.empty()) {
-    BasicBlock* bb = worklist.front();
-    worklist.pop();
-    if(seen.find(bb) == seen.end()) {
-      BasicBlock* bbtarget = cast<BasicBlock>(Translate(bb));
-      BasicBlock::InstListType& instlist = bbtarget->getInstList();
-      for (BasicBlock::iterator iib = bb->begin(), iie = bb->end(); 
-           iib != iie; ++iib) {
-        //NumOldInst++;
-        if (!LI.isProfiling(&*iib)) {
-          Instruction* i = cast<Instruction>(Translate(iib));
-          instlist.insert(bbtarget->end(), i);
-        }
-      }
-      //updated search state;
-      seen.insert(bb);
-      TerminatorInst* ti = bb->getTerminator();
-      for (unsigned x = 0; x < ti->getNumSuccessors(); ++x) {
-        BasicBlock* bbs = ti->getSuccessor(x);
-        if (seen.find(bbs) == seen.end()) {
-          worklist.push(bbs);
-        }
-      }
-    }
-  }
-}
-
-void ProfilerRS::ProcessBackEdge(BasicBlock* src, BasicBlock* dst, Function& F) {
-  //given a backedge from B -> A, and translations A' and B',
-  //a: insert C and C'
-  //b: add branches in C to A and A' and in C' to A and A'
-  //c: mod terminators@B, replace A with C
-  //d: mod terminators@B', replace A' with C'
-  //e: mod phis@A for pred B to be pred C
-  //       if multiple entries, simplify to one
-  //f: mod phis@A' for pred B' to be pred C'
-  //       if multiple entries, simplify to one
-  //g: for all phis@A with pred C using x
-  //       add in edge from C' using x'
-  //       add in edge from C using x in A'
-  
-  //a:
-  Function::iterator BBN = src; ++BBN;
-  BasicBlock* bbC = BasicBlock::Create(F.getContext(), "choice", &F, BBN);
-  //ChoicePoints.insert(bbC);
-  BBN = cast<BasicBlock>(Translate(src));
-  BasicBlock* bbCp = BasicBlock::Create(F.getContext(), "choice", &F, ++BBN);
-  ChoicePoints.insert(bbCp);
-  
-  //b:
-  BranchInst::Create(cast<BasicBlock>(Translate(dst)), bbC);
-  BranchInst::Create(dst, cast<BasicBlock>(Translate(dst)), 
-              ConstantInt::get(Type::getInt1Ty(src->getContext()), true), bbCp);
-  //c:
-  {
-    TerminatorInst* iB = src->getTerminator();
-    for (unsigned x = 0; x < iB->getNumSuccessors(); ++x)
-      if (iB->getSuccessor(x) == dst)
-        iB->setSuccessor(x, bbC);
-  }
-  //d:
-  {
-    TerminatorInst* iBp = cast<TerminatorInst>(Translate(src->getTerminator()));
-    for (unsigned x = 0; x < iBp->getNumSuccessors(); ++x)
-      if (iBp->getSuccessor(x) == cast<BasicBlock>(Translate(dst)))
-        iBp->setSuccessor(x, bbCp);
-  }
-  //e:
-  ReplacePhiPred(dst, src, bbC);
-  //src could be a switch, in which case we are replacing several edges with one
-  //thus collapse those edges int the Phi
-  CollapsePhi(dst, bbC);
-  //f:
-  ReplacePhiPred(cast<BasicBlock>(Translate(dst)),
-                 cast<BasicBlock>(Translate(src)),bbCp);
-  CollapsePhi(cast<BasicBlock>(Translate(dst)), bbCp);
-  //g:
-  for(BasicBlock::iterator ib = dst->begin(), ie = dst->end(); ib != ie;
-      ++ib)
-    if (PHINode* phi = dyn_cast<PHINode>(&*ib)) {
-      for(unsigned x = 0; x < phi->getNumIncomingValues(); ++x)
-        if(bbC == phi->getIncomingBlock(x)) {
-          phi->addIncoming(Translate(phi->getIncomingValue(x)), bbCp);
-          cast<PHINode>(Translate(phi))->addIncoming(phi->getIncomingValue(x), 
-                                                     bbC);
-        }
-      phi->removeIncomingValue(bbC);
-    }
-}
-
-bool ProfilerRS::runOnFunction(Function& F) {
-  if (!F.isDeclaration()) {
-    std::set<std::pair<BasicBlock*, BasicBlock*> > BackEdges;
-    RSProfilers& LI = getAnalysis<RSProfilers>();
-    
-    getBackEdges(F, BackEdges);
-    Duplicate(F, LI);
-    //assume that stuff worked.  now connect the duplicated basic blocks 
-    //with the originals in such a way as to preserve ssa.  yuk!
-    for (std::set<std::pair<BasicBlock*, BasicBlock*> >::iterator 
-           ib = BackEdges.begin(), ie = BackEdges.end(); ib != ie; ++ib)
-      ProcessBackEdge(ib->first, ib->second, F);
-    
-    //oh, and add the edge from the reg2mem created entry node to the 
-    //duplicated second node
-    TerminatorInst* T = F.getEntryBlock().getTerminator();
-    ReplaceInstWithInst(T, BranchInst::Create(T->getSuccessor(0),
-                                              cast<BasicBlock>(
-                   Translate(T->getSuccessor(0))),
-                      ConstantInt::get(Type::getInt1Ty(F.getContext()), true)));
-    
-    //do whatever is needed now that the function is duplicated
-    c->PrepFunction(&F);
-    
-    //add entry node to choice points
-    ChoicePoints.insert(&F.getEntryBlock());
-    
-    for (std::set<BasicBlock*>::iterator 
-           ii = ChoicePoints.begin(), ie = ChoicePoints.end(); ii != ie; ++ii)
-      c->ProcessChoicePoint(*ii);
-    
-    ChoicePoints.clear();
-    TransCache.clear();
-    
-    return true;
-  }
-  return false;
-}
-
-bool ProfilerRS::doInitialization(Module &M) {
-  switch (RandomMethod) {
-  case GBV:
-    c = new GlobalRandomCounter(M, Type::getInt32Ty(M.getContext()),
-                                (1 << 14) - 1);
-    break;
-  case GBVO:
-    c = new GlobalRandomCounterOpt(M, Type::getInt32Ty(M.getContext()),
-                                   (1 << 14) - 1);
-    break;
-  case HOSTCC:
-    c = new CycleCounter(M, (1 << 14) - 1);
-    break;
-  };
-  return true;
-}
-
-void ProfilerRS::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.addRequired<RSProfilers>();
-  AU.addRequiredID(DemoteRegisterToMemoryID);
-}
-
-///////////////////////////////////////
-// Utilities:
-///////////////////////////////////////
-static void ReplacePhiPred(BasicBlock* btarget, 
-                           BasicBlock* bold, BasicBlock* bnew) {
-  for(BasicBlock::iterator ib = btarget->begin(), ie = btarget->end();
-      ib != ie; ++ib)
-    if (PHINode* phi = dyn_cast<PHINode>(&*ib)) {
-      for(unsigned x = 0; x < phi->getNumIncomingValues(); ++x)
-        if(bold == phi->getIncomingBlock(x))
-          phi->setIncomingBlock(x, bnew);
-    }
-}
-
-static void CollapsePhi(BasicBlock* btarget, BasicBlock* bsrc) {
-  for(BasicBlock::iterator ib = btarget->begin(), ie = btarget->end();
-      ib != ie; ++ib)
-    if (PHINode* phi = dyn_cast<PHINode>(&*ib)) {
-      std::map<BasicBlock*, Value*> counter;
-      for(unsigned i = 0; i < phi->getNumIncomingValues(); ) {
-        if (counter[phi->getIncomingBlock(i)]) {
-          assert(phi->getIncomingValue(i) == counter[phi->getIncomingBlock(i)]);
-          phi->removeIncomingValue(i, false);
-        } else {
-          counter[phi->getIncomingBlock(i)] = phi->getIncomingValue(i);
-          ++i;
-        }
-      }
-    } 
-}
-
-template<class T>
-static void recBackEdge(BasicBlock* bb, T& BackEdges, 
-                        std::map<BasicBlock*, int>& color,
-                        std::map<BasicBlock*, int>& depth,
-                        std::map<BasicBlock*, int>& finish,
-                        int& time)
-{
-  color[bb] = 1;
-  ++time;
-  depth[bb] = time;
-  TerminatorInst* t= bb->getTerminator();
-  for(unsigned i = 0; i < t->getNumSuccessors(); ++i) {
-    BasicBlock* bbnew = t->getSuccessor(i);
-    if (color[bbnew] == 0)
-      recBackEdge(bbnew, BackEdges, color, depth, finish, time);
-    else if (color[bbnew] == 1) {
-      BackEdges.insert(std::make_pair(bb, bbnew));
-      //NumBackEdges++;
-    }
-  }
-  color[bb] = 2;
-  ++time;
-  finish[bb] = time;
-}
-
-
-
-//find the back edges and where they go to
-template<class T>
-static void getBackEdges(Function& F, T& BackEdges) {
-  std::map<BasicBlock*, int> color;
-  std::map<BasicBlock*, int> depth;
-  std::map<BasicBlock*, int> finish;
-  int time = 0;
-  recBackEdge(&F.getEntryBlock(), BackEdges, color, depth, finish, time);
-  DEBUG(errs() << F.getName() << " " << BackEdges.size() << "\n");
-}
-
-
-//Creation functions
-ModulePass* llvm::createNullProfilerRSPass() {
-  return new NullProfilerRS();
-}
-
-FunctionPass* llvm::createRSProfilingPass() {
-  return new ProfilerRS();
-}
diff --git a/lib/Transforms/Instrumentation/RSProfiling.h b/lib/Transforms/Instrumentation/RSProfiling.h
deleted file mode 100644
index 8bbe7c7b28..0000000000
--- a/lib/Transforms/Instrumentation/RSProfiling.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//===- RSProfiling.h - Various profiling using random sampling ----------===//
-//
-//                      The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// See notes in RSProfiling.cpp
-//
-//===----------------------------------------------------------------------===//
-#include "llvm/Transforms/RSProfiling.h"
-#include <set>
-
-namespace llvm {
-  /// RSProfilers_std - a simple support class for profilers that handles most
-  /// of the work of chaining and tracking inserted code.
-  struct RSProfilers_std : public RSProfilers {
-    static char ID;
-    std::set<Value*> profcode;
-    // Lookup up values in profcode
-    virtual bool isProfiling(Value* v);
-    // handles required chaining
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const;
-    // places counter updates in basic blocks and recordes added instructions in
-    // profcode
-    void IncrementCounterInBlock(BasicBlock *BB, unsigned CounterNum,
-                                 GlobalValue *CounterArray);
-  };
-}
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 50e9f24cc1..504d25fc03 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -6167,6 +6167,12 @@ FoldCmpLoadFromIndexedGlobal(GetElementPtrInst *GEP, GlobalVariable *GV,
   
   // TODO: Range check
   // TODO: GEP 0, i, 4
+  
+  //errs() << "XFORM: " << *GV << "\n";
+  //errs() << "\t" << *GEP << "\n";
+  //errs() << "\t " << ICI << "\n\n\n\n";
+  
+  
   return 0;
 }
 
diff --git a/runtime/libprofile/BlockProfiling.c b/runtime/libprofile/BlockProfiling.c
deleted file mode 100644
index db80bffe56..0000000000
--- a/runtime/libprofile/BlockProfiling.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*===-- BlockProfiling.c - Support library for block profiling ------------===*\
-|*
-|*                     The LLVM Compiler Infrastructure
-|*
-|* This file is distributed under the University of Illinois Open Source      
-|* License. See LICENSE.TXT for details.                                      
-|* 
-|*===----------------------------------------------------------------------===*|
-|* 
-|* This file implements the call back routines for the block profiling
-|* instrumentation pass.  This should be used with the -insert-block-profiling
-|* LLVM pass.
-|*
-\*===----------------------------------------------------------------------===*/
-
-#include "Profiling.h"
-#include <stdlib.h>
-
-static unsigned *ArrayStart;
-static unsigned NumElements;
-
-/* BlockProfAtExitHandler - When the program exits, just write out the profiling
- * data.
- */
-static void BlockProfAtExitHandler() {
-  /* Note that if this were doing something more intelligent with the
-   * instrumentation, we could do some computation here to expand what we
-   * collected into simple block profiles. (Or we could do it in llvm-prof.)
-   * Regardless, we directly count each block, so no expansion is necessary.
-   */
-  write_profiling_data(BlockInfo, ArrayStart, NumElements);
-}
-
-
-/* llvm_start_block_profiling - This is the main entry point of the block
- * profiling library.  It is responsible for setting up the atexit handler.
- */
-int llvm_start_block_profiling(int argc, const char **argv,
-                               unsigned *arrayStart, unsigned numElements) {
-  int Ret = save_arguments(argc, argv);
-  ArrayStart = arrayStart;
-  NumElements = numElements;
-  atexit(BlockProfAtExitHandler);
-  return Ret;
-}
diff --git a/runtime/libprofile/FunctionProfiling.c b/runtime/libprofile/FunctionProfiling.c
deleted file mode 100644
index 24aa206130..0000000000
--- a/runtime/libprofile/FunctionProfiling.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*===-- FunctionProfiling.c - Support library for function profiling ------===*\
-|*
-|*                     The LLVM Compiler Infrastructure
-|*
-|* This file is distributed under the University of Illinois Open Source      
-|* License. See LICENSE.TXT for details.                                      
-|* 
-|*===----------------------------------------------------------------------===*|
-|* 
-|* This file implements the call back routines for the function profiling
-|* instrumentation pass.  This should be used with the
-|* -insert-function-profiling LLVM pass.
-|*
-\*===----------------------------------------------------------------------===*/
-
-#include "Profiling.h"
-#include <stdlib.h>
-
-static unsigned *ArrayStart;
-static unsigned NumElements;
-
-/* FuncProfAtExitHandler - When the program exits, just write out the profiling
- * data.
- */
-static void FuncProfAtExitHandler() {
-  /* Just write out the data we collected.
-   */
-  write_profiling_data(FunctionInfo, ArrayStart, NumElements);
-}
-
-
-/* llvm_start_func_profiling - This is the main entry point of the function
- * profiling library.  It is responsible for setting up the atexit handler.
- */
-int llvm_start_func_profiling(int argc, const char **argv,
-                              unsigned *arrayStart, unsigned numElements) {
-  int Ret = save_arguments(argc, argv);
-  ArrayStart = arrayStart;
-  NumElements = numElements;
-  atexit(FuncProfAtExitHandler);
-  return Ret;
-}
diff --git a/runtime/libprofile/exported_symbols.lst b/runtime/libprofile/exported_symbols.lst
index 45c6d5efe5..aafafb68a0 100644
--- a/runtime/libprofile/exported_symbols.lst
+++ b/runtime/libprofile/exported_symbols.lst
@@ -1,6 +1,4 @@
 
-llvm_start_func_profiling
-llvm_start_block_profiling
 llvm_start_edge_profiling
 llvm_start_opt_edge_profiling
 llvm_start_basic_block_tracing