[llvm-commits] [llvm] r171746 - in /llvm/trunk: include/llvm/Analysis/CallGraphSCCPass.h include/llvm/CallGraphSCCPass.h include/llvm/Transforms/IPO/InlinerPass.h lib/Analysis/IPA/CallGraphSCCPass.cpp lib/Transforms/IPO/ArgumentPromotion.cpp lib/Transforms/IPO/FunctionAttrs.cpp lib/Transforms/IPO/PruneEH.cpp tools/llvm-stress/llvm-stress.cpp tools/opt/opt.cpp unittests/VMCore/PassManagerTest.cpp

Chandler Carruth chandlerc at gmail.com
Mon Jan 7 07:26:48 PST 2013


Author: chandlerc
Date: Mon Jan  7 09:26:48 2013
New Revision: 171746

URL: http://llvm.org/viewvc/llvm-project?rev=171746&view=rev
Log:
Move CallGraphSCCPass.h into the Analysis tree; that's where the
implementation lives already.

Added:
    llvm/trunk/include/llvm/Analysis/CallGraphSCCPass.h
      - copied, changed from r171741, llvm/trunk/include/llvm/CallGraphSCCPass.h
Removed:
    llvm/trunk/include/llvm/CallGraphSCCPass.h
Modified:
    llvm/trunk/include/llvm/Transforms/IPO/InlinerPass.h
    llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp
    llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
    llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp
    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
    llvm/trunk/tools/llvm-stress/llvm-stress.cpp
    llvm/trunk/tools/opt/opt.cpp
    llvm/trunk/unittests/VMCore/PassManagerTest.cpp

Copied: llvm/trunk/include/llvm/Analysis/CallGraphSCCPass.h (from r171741, llvm/trunk/include/llvm/CallGraphSCCPass.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/CallGraphSCCPass.h?p2=llvm/trunk/include/llvm/Analysis/CallGraphSCCPass.h&p1=llvm/trunk/include/llvm/CallGraphSCCPass.h&r1=171741&r2=171746&rev=171746&view=diff
==============================================================================
    (empty)

Removed: llvm/trunk/include/llvm/CallGraphSCCPass.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CallGraphSCCPass.h?rev=171745&view=auto
==============================================================================
--- llvm/trunk/include/llvm/CallGraphSCCPass.h (original)
+++ llvm/trunk/include/llvm/CallGraphSCCPass.h (removed)
@@ -1,107 +0,0 @@
-//===- CallGraphSCCPass.h - Pass that operates BU on call graph -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the CallGraphSCCPass class, which is used for passes which
-// are implemented as bottom-up traversals on the call graph.  Because there may
-// be cycles in the call graph, passes of this type operate on the call-graph in
-// SCC order: that is, they process function bottom-up, except for recursive
-// functions, which they process all at once.
-//
-// These passes are inherently interprocedural, and are required to keep the
-// call graph up-to-date if they do anything which could modify it.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CALL_GRAPH_SCC_PASS_H
-#define LLVM_CALL_GRAPH_SCC_PASS_H
-
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/Pass.h"
-
-namespace llvm {
-
-class CallGraphNode;
-class CallGraph;
-class PMStack;
-class CallGraphSCC;
-  
-class CallGraphSCCPass : public Pass {
-public:
-  explicit CallGraphSCCPass(char &pid) : Pass(PT_CallGraphSCC, pid) {}
-
-  /// createPrinterPass - Get a pass that prints the Module
-  /// corresponding to a CallGraph.
-  Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const;
-
-  using llvm::Pass::doInitialization;
-  using llvm::Pass::doFinalization;
-
-  /// doInitialization - This method is called before the SCC's of the program
-  /// has been processed, allowing the pass to do initialization as necessary.
-  virtual bool doInitialization(CallGraph &CG) {
-    return false;
-  }
-
-  /// runOnSCC - This method should be implemented by the subclass to perform
-  /// whatever action is necessary for the specified SCC.  Note that
-  /// non-recursive (or only self-recursive) functions will have an SCC size of
-  /// 1, where recursive portions of the call graph will have SCC size > 1.
-  ///
-  /// SCC passes that add or delete functions to the SCC are required to update
-  /// the SCC list, otherwise stale pointers may be dereferenced.
-  ///
-  virtual bool runOnSCC(CallGraphSCC &SCC) = 0;
-
-  /// doFinalization - This method is called after the SCC's of the program has
-  /// been processed, allowing the pass to do final cleanup as necessary.
-  virtual bool doFinalization(CallGraph &CG) {
-    return false;
-  }
-
-  /// Assign pass manager to manager this pass
-  virtual void assignPassManager(PMStack &PMS,
-                                 PassManagerType PMT);
-
-  ///  Return what kind of Pass Manager can manage this pass.
-  virtual PassManagerType getPotentialPassManagerType() const {
-    return PMT_CallGraphPassManager;
-  }
-
-  /// getAnalysisUsage - For this class, we declare that we require and preserve
-  /// the call graph.  If the derived class implements this method, it should
-  /// always explicitly call the implementation here.
-  virtual void getAnalysisUsage(AnalysisUsage &Info) const;
-};
-
-/// CallGraphSCC - This is a single SCC that a CallGraphSCCPass is run on. 
-class CallGraphSCC {
-  void *Context; // The CGPassManager object that is vending this.
-  std::vector<CallGraphNode*> Nodes;
-public:
-  CallGraphSCC(void *context) : Context(context) {}
-  
-  void initialize(CallGraphNode*const*I, CallGraphNode*const*E) {
-    Nodes.assign(I, E);
-  }
-  
-  bool isSingular() const { return Nodes.size() == 1; }
-  unsigned size() const { return Nodes.size(); }
-  
-  /// ReplaceNode - This informs the SCC and the pass manager that the specified
-  /// Old node has been deleted, and New is to be used in its place.
-  void ReplaceNode(CallGraphNode *Old, CallGraphNode *New);
-  
-  typedef std::vector<CallGraphNode*>::const_iterator iterator;
-  iterator begin() const { return Nodes.begin(); }
-  iterator end() const { return Nodes.end(); }
-};
-
-} // End llvm namespace
-
-#endif

Modified: llvm/trunk/include/llvm/Transforms/IPO/InlinerPass.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/IPO/InlinerPass.h?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/IPO/InlinerPass.h (original)
+++ llvm/trunk/include/llvm/Transforms/IPO/InlinerPass.h Mon Jan  7 09:26:48 2013
@@ -17,7 +17,7 @@
 #ifndef LLVM_TRANSFORMS_IPO_INLINERPASS_H
 #define LLVM_TRANSFORMS_IPO_INLINERPASS_H
 
-#include "llvm/CallGraphSCCPass.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 
 namespace llvm {
   class CallSite;

Modified: llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp (original)
+++ llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp Mon Jan  7 09:26:48 2013
@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "cgscc-passmgr"
-#include "llvm/CallGraphSCCPass.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/ADT/SCCIterator.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/CallGraph.h"

Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Mon Jan  7 09:26:48 2013
@@ -36,7 +36,7 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/CallGraph.h"
-#include "llvm/CallGraphSCCPass.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Instructions.h"

Modified: llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp Mon Jan  7 09:26:48 2013
@@ -26,8 +26,8 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/CallGraph.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Analysis/CaptureTracking.h"
-#include "llvm/CallGraphSCCPass.h"
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/LLVMContext.h"

Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Mon Jan  7 09:26:48 2013
@@ -20,7 +20,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/CallGraph.h"
-#include "llvm/CallGraphSCCPass.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instructions.h"

Modified: llvm/trunk/tools/llvm-stress/llvm-stress.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-stress/llvm-stress.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-stress/llvm-stress.cpp (original)
+++ llvm/trunk/tools/llvm-stress/llvm-stress.cpp Mon Jan  7 09:26:48 2013
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 #include "llvm/IR/LLVMContext.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Assembly/PrintModulePass.h"
-#include "llvm/CallGraphSCCPass.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Module.h"

Modified: llvm/trunk/tools/opt/opt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/tools/opt/opt.cpp (original)
+++ llvm/trunk/tools/opt/opt.cpp Mon Jan  7 09:26:48 2013
@@ -16,12 +16,12 @@
 #include "llvm/ADT/StringSet.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/CallGraph.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Analysis/LoopPass.h"
 #include "llvm/Analysis/RegionPass.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Assembly/PrintModulePass.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/CallGraphSCCPass.h"
 #include "llvm/CodeGen/CommandFlags.h"
 #include "llvm/DebugInfo.h"
 #include "llvm/IR/DataLayout.h"

Modified: llvm/trunk/unittests/VMCore/PassManagerTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/VMCore/PassManagerTest.cpp?rev=171746&r1=171745&r2=171746&view=diff
==============================================================================
--- llvm/trunk/unittests/VMCore/PassManagerTest.cpp (original)
+++ llvm/trunk/unittests/VMCore/PassManagerTest.cpp Mon Jan  7 09:26:48 2013
@@ -9,11 +9,11 @@
 
 #include "llvm/PassManager.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/LoopPass.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Assembly/PrintModulePass.h"
-#include "llvm/CallGraphSCCPass.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/CallingConv.h"
 #include "llvm/IR/Constants.h"





More information about the llvm-commits mailing list