[llvm-commits] CVS: llvm/include/llvm/User.h

[Chris Lattner]

Changes in directory llvm/include/llvm:

User.h updated: 1.32 -> 1.33
---
Log message:

Instead of storing operands as std::vector<Use>, just maintain a pointer
and num operands in the User class.  this allows us to embed the operands
directly in the subclasses if possible.  For example, for binary operators
we store the two operands in the derived class.

The has several effects:
  1. it improves locality because the operands and instruction are together
  2. it makes accesses to operands faster (one less load) if you access them
     through the derived class pointer.  For example this:

Value *GetBinaryOperatorOp(BinaryOperator *I, int i) {
  return I->getOperand(i);
}

Was compiled to:

_Z19GetBinaryOperatorOpPN4llvm14BinaryOperatorEi:
        movl    4(%esp), %edx
        movl    8(%esp), %eax
        sall    $4, %eax
        movl    24(%edx), %ecx
        addl    %ecx, %eax
        movl    (%eax), %eax
        ret

and is now compiled to:

_Z19GetBinaryOperatorOpPN4llvm14BinaryOperatorEi:
        movl    8(%esp), %eax
        movl    4(%esp), %edx
        sall    $4, %eax
        addl    %edx, %eax
        movl    44(%eax), %eax
        ret

Accesses through "Instruction*" are unmodified.

   3. This reduces memory consumption (by about 3%) by eliminating 1 word of 
      vector overhead and a malloc header on a seperate object.
   4. This speeds up gccas about 10% (both debug and release builds) on
      large things (such as 176.gcc).  For example, it takes a debug build
      from 172.9 -> 155.6s and a release gccas from 67.7 -> 61.8s



---
Diffs of the changes:  (+33 -34)

 User.h |   67 ++++++++++++++++++++++++++++++++---------------------------------
 1 files changed, 33 insertions(+), 34 deletions(-)


Index: llvm/include/llvm/User.h
diff -u llvm/include/llvm/User.h:1.32 llvm/include/llvm/User.h:1.33
--- llvm/include/llvm/User.h:1.32	Mon Nov 15 13:02:35 2004
+++ llvm/include/llvm/User.h	Fri Jan 28 18:29:39 2005
@@ -27,45 +27,42 @@
 class User : public Value {
   User(const User &);             // Do not implement
 protected:
-  std::vector<Use> Operands;
-public:
-  User(const Type *Ty, unsigned vty, const std::string &name = "")
-    : Value(Ty, vty, name) {}
+  /// OperandList - This is a pointer to the array of Users for this operand.
+  /// For nodes of fixed arity (e.g. a binary operator) this array will live
+  /// embedded into the derived class.  For nodes of variable arity
+  /// (e.g. ConstantArrays, CallInst, PHINodes, etc), this memory will be
+  /// dynamically allocated and should be destroyed by the classes virtual dtor.
+  Use *OperandList;
+
+  /// NumOperands - The number of values used by this User.
+  ///
+  unsigned NumOperands;
 
-  inline Value *getOperand(unsigned i) { 
-    assert(i < Operands.size() && "getOperand() out of range!");
-    return Operands[i];
-  }
-  inline const Value *getOperand(unsigned i) const {
-    assert(i < Operands.size() && "getOperand() const out of range!");
-    return Operands[i];
-  }
-  inline void setOperand(unsigned i, Value *Val) {
-    assert(i < Operands.size() && "setOperand() out of range!");
-    Operands[i] = Val;
+public:
+  User(const Type *Ty, unsigned vty, Use *OpList, unsigned NumOps, 
+       const std::string &name = "")
+    : Value(Ty, vty, name), OperandList(OpList), NumOperands(NumOps) {}
+
+  Value *getOperand(unsigned i) const { 
+    assert(i < NumOperands && "getOperand() out of range!");
+    return OperandList[i];
+  }
+  void setOperand(unsigned i, Value *Val) {
+    assert(i < NumOperands && "setOperand() out of range!");
+    OperandList[i] = Val;
   }
-  inline unsigned getNumOperands() const { return (unsigned)Operands.size(); }
+  unsigned getNumOperands() const { return NumOperands; }
 
   // ---------------------------------------------------------------------------
   // Operand Iterator interface...
   //
-  typedef std::vector<Use>::iterator       op_iterator;
-  typedef std::vector<Use>::const_iterator const_op_iterator;
+  typedef Use*       op_iterator;
+  typedef const Use* const_op_iterator;
 
-  void op_reserve(unsigned NumElements) { Operands.reserve(NumElements); }
-
-  inline op_iterator       op_begin()       { return Operands.begin(); }
-  inline const_op_iterator op_begin() const { return Operands.begin(); }
-  inline op_iterator       op_end()         { return Operands.end(); }
-  inline const_op_iterator op_end()   const { return Operands.end(); }
-
-  /// op_erase - This method is used to remove one of the arguments from the
-  /// operands list.  Only use this if you know what you are doing.
-  ///
-  op_iterator op_erase(op_iterator I) { return Operands.erase(I); }
-  op_iterator op_erase(op_iterator I, op_iterator E) {
-    return Operands.erase(I, E);
-  }
+  inline op_iterator       op_begin()       { return OperandList; }
+  inline const_op_iterator op_begin() const { return OperandList; }
+  inline op_iterator       op_end()         { return OperandList+NumOperands; }
+  inline const_op_iterator op_end()   const { return OperandList+NumOperands; }
 
   // dropAllReferences() - This function is in charge of "letting go" of all
   // objects that this User refers to.  This allows one to
@@ -75,8 +72,10 @@
   // valid on an object that has "dropped all references", except operator 
   // delete.
   //
-  inline void dropAllReferences() {
-    Operands.clear();
+  void dropAllReferences() {
+    Use *OL = OperandList;
+    for (unsigned i = 0, e = NumOperands; i != e; ++i)
+      OL[i].set(0);
   }
 
   /// replaceUsesOfWith - Replaces all references to the "From" definition with