[llvm-commits] CVS: llvm/lib/Target/CBackend/CTargetMachine.h Writer.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/CBackend:

CTargetMachine.h updated: 1.15 -> 1.16
Writer.cpp updated: 1.267 -> 1.268
---
Log message:

Completely rearchitect the interface between targets and the pass manager.
This pass:

1. Splits TargetMachine into TargetMachine (generic targets, can be implemented
any way, like the CBE) and LLVMTargetMachine (subclass of TM that is used by
things using libcodegen and other support).
2. Instead of having each target fully populate the passmgr for file or JIT
   output, move all this to common code, and give targets hooks they can
   implement.
3. Commonalize the target population stuff between file emission and JIT
   emission.
4. All (native code) codegen stuff now happens in a FunctionPassManager, which
   paves the way for "fast -O0" stuff in the CFE later, and now LLC could
   lazily stream .bc files from disk to use less memory.
5. There are now many fewer #includes and the targets don't depend on the 
   scalar xforms or libanalysis anymore (but codegen does).
6. Changing common code generator pass ordering stuff no longer requires 
   touching all targets.
7. The JIT now has the option of "-fast" codegen or normal optimized codegen,
   which is now orthogonal to the fact that JIT'ing is being done.


---
Diffs of the changes:  (+8 -6)

 CTargetMachine.h |    8 ++++----
 Writer.cpp       |    6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)


Index: llvm/lib/Target/CBackend/CTargetMachine.h
diff -u llvm/lib/Target/CBackend/CTargetMachine.h:1.15 llvm/lib/Target/CBackend/CTargetMachine.h:1.16
--- llvm/lib/Target/CBackend/CTargetMachine.h:1.15	Sun Sep  3 13:44:02 2006
+++ llvm/lib/Target/CBackend/CTargetMachine.h	Sun Sep  3 23:14:57 2006
@@ -25,14 +25,14 @@
   CTargetMachine(const Module &M, const std::string &FS)
     : DataLayout(&M) {}
 
-  // This is the only thing that actually does anything here.
-  virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out,
-                                   CodeGenFileType FileType, bool Fast);
+  virtual bool WantsWholeFile() const { return true; }
+  virtual bool addPassesToEmitWholeFile(PassManager &PM, std::ostream &Out,
+                                        CodeGenFileType FileType, bool Fast);
 
   // This class always works, but shouldn't be the default in most cases.
   static unsigned getModuleMatchQuality(const Module &M) { return 1; }
   
-  virtual const TargetData       *getTargetData() const { return &DataLayout; }
+  virtual const TargetData *getTargetData() const { return &DataLayout; }
 };
 
 } // End llvm namespace


Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.267 llvm/lib/Target/CBackend/Writer.cpp:1.268
--- llvm/lib/Target/CBackend/Writer.cpp:1.267	Fri Jul 28 15:58:47 2006
+++ llvm/lib/Target/CBackend/Writer.cpp	Sun Sep  3 23:14:57 2006
@@ -2027,8 +2027,10 @@
 //                       External Interface declaration
 //===----------------------------------------------------------------------===//
 
-bool CTargetMachine::addPassesToEmitFile(PassManager &PM, std::ostream &o,
-                                         CodeGenFileType FileType, bool Fast) {
+bool CTargetMachine::addPassesToEmitWholeFile(PassManager &PM,
+                                              std::ostream &o,
+                                              CodeGenFileType FileType,
+                                              bool Fast) {
   if (FileType != TargetMachine::AssemblyFile) return true;
 
   PM.add(createLowerGCPass());