[llvm-commits] [llvm] r96843 - in /llvm/trunk: include/llvm/CodeGen/DAGISelHeader.h utils/TableGen/DAGISelMatcherEmitter.cpp

[Chris Lattner]

Author: lattner
Date: Mon Feb 22 18:59:59 2010
New Revision: 96843

URL: http://llvm.org/viewvc/llvm-project?rev=96843&view=rev
Log:
switch the value# in OPC_CompleteMatch and OPC_EmitNode to use a
VBR encoding for the insanity being perpetrated by the spu backend. 

Modified:
    llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h
    llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp

Modified: llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h?rev=96843&r1=96842&r2=96843&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h (original)
+++ llvm/trunk/include/llvm/CodeGen/DAGISelHeader.h Mon Feb 22 18:59:59 2010
@@ -200,6 +200,24 @@
   return Val;
 }
 
+/// GetVBR - decode a vbr encoding whose top bit is set.
+ALWAYS_INLINE static unsigned
+GetVBR(unsigned Val, const unsigned char *MatcherTable, unsigned &Idx) {
+  assert(Val >= 128 && "Not a VBR");
+  Val &= 127;  // Remove first vbr bit.
+  
+  unsigned Shift = 7;
+  unsigned NextBits;
+  do {
+    NextBits = GetInt1(MatcherTable, Idx);
+    Val |= (NextBits&127) << Shift;
+    Shift += 7;
+  } while (NextBits & 128);
+  
+  return Val;
+}
+
+
 enum BuiltinOpcodes {
   OPC_Push, OPC_Push2,
   OPC_RecordNode,
@@ -691,6 +709,9 @@
       SmallVector<SDValue, 8> Ops;
       for (unsigned i = 0; i != NumOps; ++i) {
         unsigned RecNo = MatcherTable[MatcherIndex++];
+        if (RecNo & 128)
+          RecNo = GetVBR(RecNo, MatcherTable, MatcherIndex);
+        
         assert(RecNo < RecordedNodes.size() && "Invalid CheckSame");
         Ops.push_back(RecordedNodes[RecNo]);
       }
@@ -763,6 +784,9 @@
 
       for (unsigned i = 0; i != NumResults; ++i) {
         unsigned ResSlot = MatcherTable[MatcherIndex++];
+        if (ResSlot & 128)
+          ResSlot = GetVBR(ResSlot, MatcherTable, MatcherIndex);
+        
         assert(ResSlot < RecordedNodes.size() && "Invalid CheckSame");
         SDValue Res = RecordedNodes[ResSlot];
         

Modified: llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp?rev=96843&r1=96842&r2=96843&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp Mon Feb 22 18:59:59 2010
@@ -127,6 +127,25 @@
 };
 } // end anonymous namespace.
 
+/// EmitVBRValue - Emit the specified value as a VBR, returning the number of
+/// bytes emitted.
+static unsigned EmitVBRValue(unsigned Val, raw_ostream &OS) {
+  if (Val <= 127) {
+    OS << Val << ", ";
+    return 1;
+  }
+  
+  unsigned InVal = Val;
+  unsigned NumBytes = 0;
+  while (Val > 128) {
+    OS << (Val&127) << "|128,";
+    Val >>= 7;
+    ++NumBytes;
+  }
+  OS << Val << "/*" << InVal << "*/, ";
+  return NumBytes+1;
+}
+
 /// EmitMatcherOpcodes - Emit bytes for the specified matcher and return
 /// the number of bytes emitted.
 unsigned MatcherTableEmitter::
@@ -309,22 +328,27 @@
       OS << getEnumName(EN->getVT(i)) << ", ";
 
     OS << EN->getNumOperands() << "/*#Ops*/, ";
-    for (unsigned i = 0, e = EN->getNumOperands(); i != e; ++i)
-      OS << EN->getOperand(i) << ", ";
+    unsigned NumOperandBytes = 0;
+    for (unsigned i = 0, e = EN->getNumOperands(); i != e; ++i) {
+      // We emit the operand numbers in VBR encoded format, in case the number
+      // is too large to represent with a byte.
+      NumOperandBytes += EmitVBRValue(EN->getOperand(i), OS);
+    }
     OS << '\n';
-    return 6+EN->getNumVTs()+EN->getNumOperands();
+    return 6+EN->getNumVTs()+NumOperandBytes;
   }
   case MatcherNode::CompleteMatch: {
     const CompleteMatchMatcherNode *CM = cast<CompleteMatchMatcherNode>(N);
     OS << "OPC_CompleteMatch, " << CM->getNumResults() << ", ";
+    unsigned NumResultBytes = 0;
     for (unsigned i = 0, e = CM->getNumResults(); i != e; ++i)
-      OS << CM->getResult(i) << ", ";
+      NumResultBytes += EmitVBRValue(CM->getResult(i), OS);
     OS << '\n';
     OS.PadToColumn(Indent*2) << "// Src: "
       << *CM->getPattern().getSrcPattern() << '\n';
     OS.PadToColumn(Indent*2) << "// Dst: " 
       << *CM->getPattern().getDstPattern() << '\n';
-    return 2+CM->getNumResults();
+    return 2 + NumResultBytes;
   }
   }
   assert(0 && "Unreachable");