[llvm-commits] CVS: llvm/lib/Bytecode/Reader/ConstantReader.cpp Reader.cpp ReaderInternals.h

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Reader:

ConstantReader.cpp updated: 1.62 -> 1.63
Reader.cpp updated: 1.88 -> 1.89
ReaderInternals.h updated: 1.66 -> 1.67

---
Log message:

Minor speedup to do less linear time searches of  information we already have.
speeds up disassembly of kc++ by .6s



---
Diffs of the changes:  (+12 -10)

Index: llvm/lib/Bytecode/Reader/ConstantReader.cpp
diff -u llvm/lib/Bytecode/Reader/ConstantReader.cpp:1.62 llvm/lib/Bytecode/Reader/ConstantReader.cpp:1.63
--- llvm/lib/Bytecode/Reader/ConstantReader.cpp:1.62	Tue Nov 11 16:41:32 2003
+++ llvm/lib/Bytecode/Reader/ConstantReader.cpp	Wed Nov 19 00:01:12 2003
@@ -168,13 +168,11 @@
       unsigned ArgValSlot, ArgTypeSlot;
       if (read_vbr(Buf, EndBuf, ArgValSlot)) throw Error_readvbr;
       if (read_vbr(Buf, EndBuf, ArgTypeSlot)) throw Error_readvbr;
-      const Type *ArgTy = getType(ArgTypeSlot);
-      
-      BCR_TRACE(4, "CE Arg " << i << ": Type: '" << *ArgTy << "'  slot: "
-                << ArgValSlot << "\n");
+      BCR_TRACE(4, "CE Arg " << i << ": Type: '" << *getType(ArgTypeSlot)
+                << "'  slot: " << ArgValSlot << "\n");
       
       // Get the arg value from its slot if it exists, otherwise a placeholder
-      ArgVec.push_back(getConstantValue(ArgTy, ArgValSlot));
+      ArgVec.push_back(getConstantValue(ArgTypeSlot, ArgValSlot));
     }
     
     // Construct a ConstantExpr of the appropriate kind
@@ -245,12 +243,12 @@
   case Type::ArrayTyID: {
     const ArrayType *AT = cast<ArrayType>(Ty);
     unsigned NumElements = AT->getNumElements();
-
+    unsigned TypeSlot = getTypeSlot(AT->getElementType());
     std::vector<Constant*> Elements;
     while (NumElements--) {   // Read all of the elements of the constant.
       unsigned Slot;
       if (read_vbr(Buf, EndBuf, Slot)) throw Error_readvbr;
-      Elements.push_back(getConstantValue(AT->getElementType(), Slot));
+      Elements.push_back(getConstantValue(TypeSlot, Slot));
     }
     return ConstantArray::get(AT, Elements);
   }


Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.88 llvm/lib/Bytecode/Reader/Reader.cpp:1.89
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.88	Tue Nov 11 16:41:32 2003
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Wed Nov 19 00:01:12 2003
@@ -172,13 +172,14 @@
 /// constant hasn't been parsed yet, a placeholder is defined and used.  Later,
 /// after the real value is parsed, the placeholder is eliminated.
 ///
-Constant *BytecodeParser::getConstantValue(const Type *Ty, unsigned Slot) {
-  if (Value *V = getValue(Ty, Slot, false))
+Constant *BytecodeParser::getConstantValue(unsigned TypeSlot, unsigned Slot) {
+  if (Value *V = getValue(TypeSlot, Slot, false))
     if (Constant *C = dyn_cast<Constant>(V))
       return C;   // If we already have the value parsed, just return it
     else
       throw std::string("Reference of a value is expected to be a constant!");
 
+  const Type *Ty = getType(TypeSlot);
   std::pair<const Type*, unsigned> Key(Ty, Slot);
   GlobalRefsType::iterator I = GlobalRefs.lower_bound(Key);
 


Index: llvm/lib/Bytecode/Reader/ReaderInternals.h
diff -u llvm/lib/Bytecode/Reader/ReaderInternals.h:1.66 llvm/lib/Bytecode/Reader/ReaderInternals.h:1.67
--- llvm/lib/Bytecode/Reader/ReaderInternals.h:1.66	Fri Nov 14 10:34:25 2003
+++ llvm/lib/Bytecode/Reader/ReaderInternals.h	Wed Nov 19 00:01:12 2003
@@ -180,7 +180,10 @@
   Value      *getValue(unsigned TypeID, unsigned num, bool Create = true);
   const Type *getType(unsigned ID);
   BasicBlock *getBasicBlock(unsigned ID);
-  Constant   *getConstantValue(const Type *Ty, unsigned num);
+  Constant   *getConstantValue(unsigned TypeID, unsigned num);
+  Constant   *getConstantValue(const Type *Ty, unsigned num) {
+    return getConstantValue(getTypeSlot(Ty), num);
+  }
 
   unsigned insertValue(Value *V, ValueTable &Table);
   unsigned insertValue(Value *V, unsigned Type, ValueTable &Table);