[llvm-commits] CVS: llvm/include/llvm/CodeGen/SelectionDAG.h SelectionDAGNodes.h

[Chris Lattner]

Changes in directory llvm/include/llvm/CodeGen:

SelectionDAG.h updated: 1.66 -> 1.67
SelectionDAGNodes.h updated: 1.71 -> 1.72
---
Log message:

Change the ValueList array for each node to be shared instead of individually
allocated.  Further, in the common case where a node has a single value, just
reference an element from a small array.  This is a small compile-time wi.


---
Diffs of the changes:  (+19 -22)

 SelectionDAG.h      |   13 ++++++++++---
 SelectionDAGNodes.h |   28 +++++++++-------------------
 2 files changed, 19 insertions(+), 22 deletions(-)


Index: llvm/include/llvm/CodeGen/SelectionDAG.h
diff -u llvm/include/llvm/CodeGen/SelectionDAG.h:1.66 llvm/include/llvm/CodeGen/SelectionDAG.h:1.67
--- llvm/include/llvm/CodeGen/SelectionDAG.h:1.66	Tue Nov  8 12:52:57 2005
+++ llvm/include/llvm/CodeGen/SelectionDAG.h	Tue Nov  8 17:30:11 2005
@@ -17,6 +17,7 @@
 
 #include "llvm/CodeGen/SelectionDAGNodes.h"
 #include <map>
+#include <list>
 #include <string> // FIXME remove eventually, turning map into const char* map.
 
 namespace llvm {
@@ -172,7 +173,7 @@
                   SDOperand Callee, bool isTailCall = false) {
     SDNode *NN = new SDNode(isTailCall ? ISD::TAILCALL : ISD::CALL, Chain,
                             Callee);
-    NN->setValueTypes(RetVals);
+    setNodeValueTypes(NN, RetVals);
     AllNodes.push_back(NN);
     return NN;
   }
@@ -186,7 +187,7 @@
     ArgsInRegs.insert(ArgsInRegs.begin(), Callee);
     ArgsInRegs.insert(ArgsInRegs.begin(), Chain);
     SDNode *NN = new SDNode(isTailCall ? ISD::TAILCALL : ISD::CALL, ArgsInRegs);
-    NN->setValueTypes(RetVals);
+    setNodeValueTypes(NN, RetVals);
     AllNodes.push_back(NN);
     return NN;
   }
@@ -356,12 +357,18 @@
   SDNode *AddNonLeafNodeToCSEMaps(SDNode *N);
   void DestroyDeadNode(SDNode *N);
   void DeleteNodeNotInCSEMaps(SDNode *N);
+  void setNodeValueTypes(SDNode *N, std::vector<MVT::ValueType> &RetVals);
+  void setNodeValueTypes(SDNode *N, MVT::ValueType VT1, MVT::ValueType VT2);
+  
   
   /// SimplifySetCC - Try to simplify a setcc built with the specified operands 
   /// and cc.  If unable to simplify it, return a null SDOperand.
   SDOperand SimplifySetCC(MVT::ValueType VT, SDOperand N1,
                           SDOperand N2, ISD::CondCode Cond);
-
+  
+  // List of non-single value types.
+  std::list<std::vector<MVT::ValueType> > VTList;
+  
   // Maps to auto-CSE operations.
   std::map<std::pair<unsigned, MVT::ValueType>, SDNode *> NullaryOps;
   std::map<std::pair<unsigned, std::pair<SDOperand, MVT::ValueType> >,


Index: llvm/include/llvm/CodeGen/SelectionDAGNodes.h
diff -u llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.71 llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.72
--- llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.71	Tue Nov  8 16:06:23 2005
+++ llvm/include/llvm/CodeGen/SelectionDAGNodes.h	Tue Nov  8 17:30:11 2005
@@ -577,11 +577,14 @@
 
 protected:
   friend class SelectionDAG;
+  
+  /// getValueTypeList - Return a pointer to the specified value type.
+  ///
+  static MVT::ValueType *getValueTypeList(MVT::ValueType VT);
 
   SDNode(unsigned NT, MVT::ValueType VT) : NodeType(NT), NodeDepth(1) {
     OperandList = 0; NumOperands = 0;
-    ValueList = new MVT::ValueType[1];
-    ValueList[0] = VT;
+    ValueList = getValueTypeList(VT);
     NumValues = 1;
   }
   SDNode(unsigned NT, SDOperand Op)
@@ -668,7 +671,6 @@
 
   virtual ~SDNode() {
     assert(NumOperands == 0 && "Operand list not cleared before deletion");
-    delete [] ValueList;
   }
 
   /// MorphNodeTo - This clears the return value and operands list, and sets the
@@ -676,7 +678,6 @@
   /// the SelectionDAG class.
   void MorphNodeTo(unsigned Opc) {
     NodeType = Opc;
-    delete [] ValueList;
     ValueList = 0;
     NumValues = 0;
     
@@ -691,24 +692,13 @@
   
   void setValueTypes(MVT::ValueType VT) {
     assert(NumValues == 0 && "Should not have values yet!");
-    ValueList = new MVT::ValueType[1];
-    ValueList[0] = VT;
+    ValueList = getValueTypeList(VT);
     NumValues = 1;
   }
-  void setValueTypes(MVT::ValueType VT1, MVT::ValueType VT2) {
-    assert(NumValues == 0 && "Should not have values yet!");
-    ValueList = new MVT::ValueType[2];
-    ValueList[0] = VT1;
-    ValueList[1] = VT2;
-    NumValues = 2;
-  }
-  void setValueTypes(const std::vector<MVT::ValueType> &VTs) {
+  void setValueTypes(MVT::ValueType *List, unsigned NumVal) {
     assert(NumValues == 0 && "Should not have values yet!");
-    if (VTs.size() == 0) return;  // don't alloc memory.
-    ValueList = new MVT::ValueType[VTs.size()];
-    for (unsigned i = 0, e = VTs.size(); i != e; ++i)
-      ValueList[i] = VTs[i];
-    NumValues = VTs.size();
+    ValueList = List;
+    NumValues = NumVal;
   }
   
   void setOperands(SDOperand Op0) {