[llvm-commits] CVS: llvm/include/llvm/CodeGen/SparcRegInfo.h InstrForest.h InstrSelection.h LiveRange.h

John Criswell criswell at choi.cs.uiuc.edu
Thu Jun 26 16:38:01 PDT 2003


Changes in directory llvm/include/llvm/CodeGen:

SparcRegInfo.h added (r1.5.2.1)
InstrForest.h updated: 1.26.2.1 -> 1.26.2.2
InstrSelection.h updated: 1.23.2.1 -> 1.23.2.2
LiveRange.h updated: 1.19.2.1 -> 1.19.2.2

---
Log message:

Merged with mainline on Thursday, June 26, 2003.
Kept includes of "Config/assert.h" to avoid implicit dependencies on header
files.


---
Diffs of the changes:

Index: llvm/include/llvm/CodeGen/SparcRegInfo.h
diff -c /dev/null llvm/include/llvm/CodeGen/SparcRegInfo.h:1.1
*** /dev/null	Thu Jun 26 16:37:24 2003
--- llvm/include/llvm/CodeGen/SparcRegInfo.h	Fri Aug 31 15:30:42 2001
***************
*** 0 ****
--- 1,169 ----
+ /* Title:   SparcRegClassInfo.h
+    Author:  Ruchira Sasanka
+    Date:    Aug 20, 01
+    Purpose: Contains the description of integer register class of Sparc
+ */
+ 
+ 
+ #ifndef SPARC_INT_REG_CLASS_H
+ #define SPARC_INT_REG_CLASS_H
+ 
+ 
+ #include "llvm/CodeGen/TargetMachine.h"
+ #include <string>
+ 
+ 
+ //-----------------------------------------------------------------------------
+ // Integer Register Class
+ //-----------------------------------------------------------------------------
+ 
+ 
+ // Int register names in same order as enum in class SparcIntRegOrder
+ 
+ static string const IntRegNames[] = 
+   {       "g1", "g2", "g3", "g4", "g5", "g6", "g7",
+     "o0", "o1", "o2", "o3", "o4", "o5",       "o7",
+     "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
+     "i0", "i1", "i2", "i3", "i4", "i5", 
+     "g0", "i6", "i7",  "o6" }; 
+ 
+ 
+ 
+ class SparcIntRegOrder{ 
+ 
+  public:
+ 
+   enum RegsInPrefOrder   // colors possible for a LR (in preferred order)
+    { 
+      // --- following colors are volatile across function calls
+      // %g0 can't be used for coloring - always 0
+                      
+      g1, g2, g3, g4, g5, g6, g7,  //%g1-%g7  
+      o0, o1, o2, o3, o4, o5, o7,  // %o0-%o5, 
+ 
+      // %o6 is sp, 
+      // all %0's can get modified by a call
+ 
+      // --- following colors are NON-volatile across function calls
+       
+      l0, l1, l2, l3, l4, l5, l6, l7,    //  %l0-%l7
+      i0, i1, i2, i3, i4, i5,            // %i0-%i5: i's need not be preserved 
+       
+      // %i6 is the fp - so not allocated
+      // %i7 is the ret address - can be used if saved
+ 
+      // max # of colors reg coloring  can allocate (NumOfAvailRegs)
+ 
+      // --- following colors are not available for allocation within this phase
+      // --- but can appear for pre-colored ranges 
+ 
+      g0, i6, i7,  o6,   
+ 
+      NumOfAllRegs   // place holder to count all possilbe colors
+ 
+    };
+ 
+   // max # of colors reg coloring  can allocate
+   static unsigned int const NumOfAvailRegs = g0;
+ 
+   static unsigned int const StartOfNonVolatileRegs = l0;
+   static unsigned int const StartOfAllRegs = g1;
+ 
+ 
+   static const string  getRegName(const unsigned reg) {
+     assert( reg < NumOfAllRegs );
+     return IntRegNames[reg];
+   }
+ 
+ };
+ 
+ 
+ 
+ class SparcIntRegClass : public MachineRegClassInfo
+ {
+  public:
+ 
+   SparcIntRegClass(unsigned ID) 
+     : MachineRegClassInfo(0, 
+ 			  SparcIntRegOrder::NumOfAvailRegs,
+ 			  SparcIntRegOrder::NumOfAllRegs)
+     {  }
+ 
+   void colorIGNode(IGNode * Node, bool IsColorUsedArr[] ) const;
+ 
+ };
+ 
+ //-----------------------------------------------------------------------------
+ // Float Register Class
+ //-----------------------------------------------------------------------------
+ 
+ static string const FloatRegNames[] = 
+   {    
+     "f0",  "f1",  "f2",  "f3",  "f4",  "f5",  "f6",  "f7",  "f8",  "f9", 
+     "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19",
+     "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29",
+     "f30", "f31", "f32", "f33", "f34", "f35", "f36", "f37", "f38", "f39",
+     "f40", "f41", "f42", "f43", "f44", "f45", "f46", "f47", "f48", "f49",
+     "f50", "f51", "f52", "f53", "f54", "f55", "f56", "f57", "f58", "f59",
+     "f60", "f61", "f62", "f63"
+   };
+ 
+ 
+ class SparcFloatRegOrder{ 
+ 
+  public:
+ 
+   enum RegsInPrefOrder {
+ 
+     f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, 
+     f10, f11, f12, f13, f14, f15, f16, f17, f18, f19,
+     f20, f21, f22, f23, f24, f25, f26, f27, f28, f29,
+     f30, f31, f32, f33, f34, f35, f36, f37, f38, f39,
+     f40, f41, f42, f43, f44, f45, f46, f47, f48, f49,
+     f50, f51, f52, f53, f54, f55, f56, f57, f58, f59,
+     f60, f61, f62, f63
+ 
+   };
+ 
+   // there are 64 regs alltogether but only 32 regs can be allocated at
+   // a time.
+ 
+   static unsigned int const NumOfAvailRegs = 32;
+   static unsigned int const NumOfAllRegs = 64;
+ 
+   static unsigned int const StartOfNonVolatileRegs = f6;
+   static unsigned int const StartOfAllRegs = f0;
+ 
+ 
+   static const string  getRegName(const unsigned reg) {
+     assert( reg < NumOfAllRegs );
+     return FloatRegNames[reg];
+   }
+ 
+ 
+ 
+ };
+ 
+ 
+ class SparcFloatRegClass : public MachineRegClassInfo
+ {
+  private:
+ 
+   int findFloatColor(const IGNode *const Node, unsigned Start,
+ 		     unsigned End, bool IsColorUsedArr[] ) const;
+ 
+  public:
+ 
+   SparcFloatRegClass(unsigned ID) 
+     : MachineRegClassInfo(1, 
+ 			  SparcFloatRegOrder::NumOfAvailRegs,
+ 			  SparcFloatRegOrder::NumOfAllRegs)
+     {  }
+ 
+   void colorIGNode(IGNode * Node, bool IsColorUsedArr[] ) const;
+ 
+ };
+ 
+ 
+ 
+ #endif


Index: llvm/include/llvm/CodeGen/InstrForest.h
diff -u llvm/include/llvm/CodeGen/InstrForest.h:1.26.2.1 llvm/include/llvm/CodeGen/InstrForest.h:1.26.2.2
--- llvm/include/llvm/CodeGen/InstrForest.h:1.26.2.1	Mon Jun 23 13:51:50 2003
+++ llvm/include/llvm/CodeGen/InstrForest.h	Thu Jun 26 16:34:44 2003
@@ -24,7 +24,6 @@
 #include "Config/assert.h"
 
 class Constant;
-class BasicBlock;
 class Function;
 class InstrTreeNode;
 class InstrForest;


Index: llvm/include/llvm/CodeGen/InstrSelection.h
diff -u llvm/include/llvm/CodeGen/InstrSelection.h:1.23.2.1 llvm/include/llvm/CodeGen/InstrSelection.h:1.23.2.2
--- llvm/include/llvm/CodeGen/InstrSelection.h:1.23.2.1	Mon Jun 23 13:51:50 2003
+++ llvm/include/llvm/CodeGen/InstrSelection.h	Thu Jun 26 16:34:44 2003
@@ -9,6 +9,7 @@
 
 #include "llvm/Instruction.h"
 #include "Config/assert.h"
+
 class Function;
 class InstrForest;
 class MachineInstr;


Index: llvm/include/llvm/CodeGen/LiveRange.h
diff -u llvm/include/llvm/CodeGen/LiveRange.h:1.19.2.1 llvm/include/llvm/CodeGen/LiveRange.h:1.19.2.2
--- llvm/include/llvm/CodeGen/LiveRange.h:1.19.2.1	Mon Jun 23 13:51:50 2003
+++ llvm/include/llvm/CodeGen/LiveRange.h	Thu Jun 26 16:34:44 2003
@@ -1,4 +1,4 @@
-//===-- LiveRange.h - Store info about a live range --------------*- C++ -*--=//
+//===-- LiveRange.h - Store info about a live range -------------*- C++ -*-===//
 //
 // Implements a live range using a ValueSet. A LiveRange is a simple set
 // of Values. 
@@ -18,7 +18,6 @@
 
 class RegClass;
 class IGNode;
-class Type;
 
 class LiveRange : public ValueSet {
   RegClass *MyRegClass;       // register classs (e.g., int, FP) for this LR





More information about the llvm-commits mailing list