[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp PPCHazardRecognizers.h PPCISelDAGToDAG.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPCHazardRecognizers.cpp updated: 1.6 -> 1.7
PPCHazardRecognizers.h updated: 1.3 -> 1.4
PPCISelDAGToDAG.cpp updated: 1.162 -> 1.163
---
Log message:

Change the interface for getting a target HazardRecognizer to be more clean.


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

 PPCHazardRecognizers.cpp |   10 ++++------
 PPCHazardRecognizers.h   |    2 +-
 PPCISelDAGToDAG.cpp      |    7 +++----
 3 files changed, 8 insertions(+), 11 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp
diff -u llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp:1.6 llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp:1.7
--- llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp:1.6	Tue Mar  7 10:26:48 2006
+++ llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp	Tue Mar  7 22:25:59 2006
@@ -50,6 +50,10 @@
 //      e.g. integer divides that only execute in the second slot.
 //
 
+PPCHazardRecognizer970::PPCHazardRecognizer970() {
+  EndDispatchGroup();
+}
+
 void PPCHazardRecognizer970::EndDispatchGroup() {
   DEBUG(std::cerr << "=== Start of dispatch group\n");
   // Pipeline units.
@@ -117,12 +121,6 @@
   return FXU;
 }
 
-
-/// StartBasicBlock - Initiate a new dispatch group.
-void PPCHazardRecognizer970::StartBasicBlock() {
-  EndDispatchGroup();
-}
-
 /// isLoadOfStoredAddress - If we have a load from the previously stored pointer
 /// as indicated by StorePtr1/StorePtr2/StoreSize, return true.
 bool PPCHazardRecognizer970::


Index: llvm/lib/Target/PowerPC/PPCHazardRecognizers.h
diff -u llvm/lib/Target/PowerPC/PPCHazardRecognizers.h:1.3 llvm/lib/Target/PowerPC/PPCHazardRecognizers.h:1.4
--- llvm/lib/Target/PowerPC/PPCHazardRecognizers.h:1.3	Tue Mar  7 10:19:46 2006
+++ llvm/lib/Target/PowerPC/PPCHazardRecognizers.h	Tue Mar  7 22:25:59 2006
@@ -52,7 +52,7 @@
   unsigned  StoreSize;
   
 public:
-  virtual void StartBasicBlock();
+  PPCHazardRecognizer970();
   virtual HazardType getHazardType(SDNode *Node);
   virtual void EmitInstruction(SDNode *Node);
   virtual void AdvanceCycle();


Index: llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.162 llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.163
--- llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp:1.162	Tue Mar  7 00:32:48 2006
+++ llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp	Tue Mar  7 22:25:59 2006
@@ -41,7 +41,6 @@
   class PPCDAGToDAGISel : public SelectionDAGISel {
     PPCTargetLowering PPCLowering;
     unsigned GlobalBaseReg;
-    PPCHazardRecognizer970 PPC970HR;
   public:
     PPCDAGToDAGISel(TargetMachine &TM)
       : SelectionDAGISel(PPCLowering), PPCLowering(TM) {}
@@ -125,12 +124,12 @@
       return "PowerPC DAG->DAG Pattern Instruction Selection";
     } 
     
-    /// GetTargetHazardRecognizer - Return the hazard recognizer to use for this
+    /// CreateTargetHazardRecognizer - Return the hazard recognizer to use for this
     /// target when scheduling the DAG.
-    virtual HazardRecognizer &GetTargetHazardRecognizer() {
+    virtual HazardRecognizer *CreateTargetHazardRecognizer() {
       // Should use subtarget info to pick the right hazard recognizer.  For
       // now, always return a PPC970 recognizer.
-      return PPC970HR; 
+      return new PPCHazardRecognizer970(); 
     }
 
 // Include the pieces autogenerated from the target description.